diff --git a/src/components/Map/MapBox.vue b/src/components/Map/MapBox.vue index 9248dd0..fddadda 100644 --- a/src/components/Map/MapBox.vue +++ b/src/components/Map/MapBox.vue @@ -402,15 +402,21 @@ .flat() .filter(i => i.geometry) .map(item => ({ ...item })), - v => v.pointType + (v.connectType ? +'_' + v.connectType : '') + v => v.pointType + (v.connectType ? '_' + v.connectType : '') ), }, //车辆 - /* cheliang: { + cheliang: { method: supervisionRealinformationList, fields: { lng: 'longitude', lat: 'latitude', name: 'plateNumber' }, - groupMethod: data => _.groupBy(data.supervisionRealinformationList.filter(i => i.longitude && i.latitude).map(item => ({...item,type:item.vehicleCategory+item.status})), v => v.type), - },*/ + groupMethod: data => + _.groupBy( + data.supervisionRealinformationList + .filter(i => i.longitude && i.latitude) + .map(item => ({ ...item, type: item.vehicleCategory + item.status })), + v => v.type + ), + }, }; let keys = Object.keys(params || data_default_params); const results = await Promise.all( diff --git a/src/components/Map/MapBox.vue b/src/components/Map/MapBox.vue index 9248dd0..fddadda 100644 --- a/src/components/Map/MapBox.vue +++ b/src/components/Map/MapBox.vue @@ -402,15 +402,21 @@ .flat() .filter(i => i.geometry) .map(item => ({ ...item })), - v => v.pointType + (v.connectType ? +'_' + v.connectType : '') + v => v.pointType + (v.connectType ? '_' + v.connectType : '') ), }, //车辆 - /* cheliang: { + cheliang: { method: supervisionRealinformationList, fields: { lng: 'longitude', lat: 'latitude', name: 'plateNumber' }, - groupMethod: data => _.groupBy(data.supervisionRealinformationList.filter(i => i.longitude && i.latitude).map(item => ({...item,type:item.vehicleCategory+item.status})), v => v.type), - },*/ + groupMethod: data => + _.groupBy( + data.supervisionRealinformationList + .filter(i => i.longitude && i.latitude) + .map(item => ({ ...item, type: item.vehicleCategory + item.status })), + v => v.type + ), + }, }; let keys = Object.keys(params || data_default_params); const results = await Promise.all( diff --git a/src/views/pictureOnMap/page/FloodControlAndDrainage/index.vue b/src/views/pictureOnMap/page/FloodControlAndDrainage/index.vue index ee81573..f269d78 100644 --- a/src/views/pictureOnMap/page/FloodControlAndDrainage/index.vue +++ b/src/views/pictureOnMap/page/FloodControlAndDrainage/index.vue @@ -56,8 +56,8 @@ value: "Pailaodiaodu", keys: [ { key: "waterlogging", visible: false }, - { key: "泵车离线", visible: false }, - { key: "泵车在线", visible: false }, + { key: "泵车离线", visible: true }, + { key: "泵车在线", visible: true }, ], }, {