diff --git "a/public/static/libs/mapbox/images/\346\263\265\350\275\246\345\234\250\347\272\277.png" "b/public/static/libs/mapbox/images/\346\263\265\350\275\246\345\234\250\347\272\277.png" index 07fa179..de23f52 100644 --- "a/public/static/libs/mapbox/images/\346\263\265\350\275\246\345\234\250\347\272\277.png" +++ "b/public/static/libs/mapbox/images/\346\263\265\350\275\246\345\234\250\347\272\277.png" Binary files differ diff --git "a/public/static/libs/mapbox/images/\346\263\265\350\275\246\345\234\250\347\272\277.png" "b/public/static/libs/mapbox/images/\346\263\265\350\275\246\345\234\250\347\272\277.png" index 07fa179..de23f52 100644 --- "a/public/static/libs/mapbox/images/\346\263\265\350\275\246\345\234\250\347\272\277.png" +++ "b/public/static/libs/mapbox/images/\346\263\265\350\275\246\345\234\250\347\272\277.png" Binary files differ diff --git "a/public/static/libs/mapbox/images/\346\263\265\350\275\246\347\246\273\347\272\277.png" "b/public/static/libs/mapbox/images/\346\263\265\350\275\246\347\246\273\347\272\277.png" index 9afe894..af9fff2 100644 --- "a/public/static/libs/mapbox/images/\346\263\265\350\275\246\347\246\273\347\272\277.png" +++ "b/public/static/libs/mapbox/images/\346\263\265\350\275\246\347\246\273\347\272\277.png" Binary files differ diff --git "a/public/static/libs/mapbox/images/\346\263\265\350\275\246\345\234\250\347\272\277.png" "b/public/static/libs/mapbox/images/\346\263\265\350\275\246\345\234\250\347\272\277.png" index 07fa179..de23f52 100644 --- "a/public/static/libs/mapbox/images/\346\263\265\350\275\246\345\234\250\347\272\277.png" +++ "b/public/static/libs/mapbox/images/\346\263\265\350\275\246\345\234\250\347\272\277.png" Binary files differ diff --git "a/public/static/libs/mapbox/images/\346\263\265\350\275\246\347\246\273\347\272\277.png" "b/public/static/libs/mapbox/images/\346\263\265\350\275\246\347\246\273\347\272\277.png" index 9afe894..af9fff2 100644 --- "a/public/static/libs/mapbox/images/\346\263\265\350\275\246\347\246\273\347\272\277.png" +++ "b/public/static/libs/mapbox/images/\346\263\265\350\275\246\347\246\273\347\272\277.png" Binary files differ diff --git a/src/api/FloodControlAndDrainage.js b/src/api/FloodControlAndDrainage.js index 971e705..86078ff 100644 --- a/src/api/FloodControlAndDrainage.js +++ b/src/api/FloodControlAndDrainage.js @@ -463,4 +463,11 @@ params }); } +export function pumpStationStatistics(params) { + return request({ + url: '/business/drainageMap/pumpStationStatistics', + method: 'get', + params + }); +} // ``````````EDN````````````````````` \ No newline at end of file diff --git "a/public/static/libs/mapbox/images/\346\263\265\350\275\246\345\234\250\347\272\277.png" "b/public/static/libs/mapbox/images/\346\263\265\350\275\246\345\234\250\347\272\277.png" index 07fa179..de23f52 100644 --- "a/public/static/libs/mapbox/images/\346\263\265\350\275\246\345\234\250\347\272\277.png" +++ "b/public/static/libs/mapbox/images/\346\263\265\350\275\246\345\234\250\347\272\277.png" Binary files differ diff --git "a/public/static/libs/mapbox/images/\346\263\265\350\275\246\347\246\273\347\272\277.png" "b/public/static/libs/mapbox/images/\346\263\265\350\275\246\347\246\273\347\272\277.png" index 9afe894..af9fff2 100644 --- "a/public/static/libs/mapbox/images/\346\263\265\350\275\246\347\246\273\347\272\277.png" +++ "b/public/static/libs/mapbox/images/\346\263\265\350\275\246\347\246\273\347\272\277.png" Binary files differ diff --git a/src/api/FloodControlAndDrainage.js b/src/api/FloodControlAndDrainage.js index 971e705..86078ff 100644 --- a/src/api/FloodControlAndDrainage.js +++ b/src/api/FloodControlAndDrainage.js @@ -463,4 +463,11 @@ params }); } +export function pumpStationStatistics(params) { + return request({ + url: '/business/drainageMap/pumpStationStatistics', + method: 'get', + params + }); +} // ``````````EDN````````````````````` \ No newline at end of file diff --git a/src/components/Map/MapBox.vue b/src/components/Map/MapBox.vue index cb99f34..7335434 100644 --- a/src/components/Map/MapBox.vue +++ b/src/components/Map/MapBox.vue @@ -448,10 +448,10 @@ let outlet = relationDataList.filter(i => i.dataCode == keys[1])[0]; outlet && outletRouteMethod({id:String(outlet.dataId)},false); - let lake = relationDataList.filter(i => i.dataCode == keys[2])[0]; - let features = newfiberMap.map.getSource("point")._data.features.filter(i => i.properties.id == lake.relationId && i.properties.type == keys[2]).map(i => _.cloneDeep(i)); + let relationIds = relationDataList.filter(i => [keys[2],keys[3]].includes( i.dataCode)).map(i => i.relationId).filter(Boolean); + let features = newfiberMap.map.getSource("point")._data.features.filter(i => relationIds.includes(i.properties.id) && ([keys[2],keys[3]].includes(i.properties.type))).map(i => _.cloneDeep(i)); features.forEach(k => (k.properties.type = undefined)) - lake && busEmit(setGeoJSON.key, { json: turf.featureCollection(features), key: keys[0] }); + relationIds && busEmit(setGeoJSON.key, { json: turf.featureCollection(features), key: keys[0] }); busEmit(setLayerVisible.key, { layername: keys[0], isCheck: true }); } @@ -817,13 +817,16 @@ const { setLayerVisible, beansToMap } = events_params; const fullnessColor = (value) => { value = Number(value); - const colors = [{value:0,color:"rgba(52,176,0,1)"},{value:60,color:"rgba(254,203,0,1)"},{value:70,color:"rgba(223,1,0,1)"},{value:90,color:"rgba(142,14,11,1)"}]; + const colors = [{value:0,color:"rgba(52,176,0,0)"},{value:60,color:"rgba(254,203,0,1)"},{value:70,color:"rgba(223,1,0,1)"},{value:90,color:"rgba(142,14,11,1)"}]; return (colors.filter((i,idx) => idx!= colors.length-1 && i.value{ return (({ lake_water_level:()=>{ return `${item.siteData[0].valueName}：【${item.siteData[0].value}${item.siteData[0].unit}】` + }, + waterlogging:()=>{ + return `${item.name}\n${item.siteData[0].valueName}：【${item.siteData[0].value}${item.siteData[0].unit}】` } })[item.pointType] || (()=> item.name))(); } diff --git "a/public/static/libs/mapbox/images/\346\263\265\350\275\246\345\234\250\347\272\277.png" "b/public/static/libs/mapbox/images/\346\263\265\350\275\246\345\234\250\347\272\277.png" index 07fa179..de23f52 100644 --- "a/public/static/libs/mapbox/images/\346\263\265\350\275\246\345\234\250\347\272\277.png" +++ "b/public/static/libs/mapbox/images/\346\263\265\350\275\246\345\234\250\347\272\277.png" Binary files differ diff --git "a/public/static/libs/mapbox/images/\346\263\265\350\275\246\347\246\273\347\272\277.png" "b/public/static/libs/mapbox/images/\346\263\265\350\275\246\347\246\273\347\272\277.png" index 9afe894..af9fff2 100644 --- "a/public/static/libs/mapbox/images/\346\263\265\350\275\246\347\246\273\347\272\277.png" +++ "b/public/static/libs/mapbox/images/\346\263\265\350\275\246\347\246\273\347\272\277.png" Binary files differ diff --git a/src/api/FloodControlAndDrainage.js b/src/api/FloodControlAndDrainage.js index 971e705..86078ff 100644 --- a/src/api/FloodControlAndDrainage.js +++ b/src/api/FloodControlAndDrainage.js @@ -463,4 +463,11 @@ params }); } +export function pumpStationStatistics(params) { + return request({ + url: '/business/drainageMap/pumpStationStatistics', + method: 'get', + params + }); +} // ``````````EDN````````````````````` \ No newline at end of file diff --git a/src/components/Map/MapBox.vue b/src/components/Map/MapBox.vue index cb99f34..7335434 100644 --- a/src/components/Map/MapBox.vue +++ b/src/components/Map/MapBox.vue @@ -448,10 +448,10 @@ let outlet = relationDataList.filter(i => i.dataCode == keys[1])[0]; outlet && outletRouteMethod({id:String(outlet.dataId)},false); - let lake = relationDataList.filter(i => i.dataCode == keys[2])[0]; - let features = newfiberMap.map.getSource("point")._data.features.filter(i => i.properties.id == lake.relationId && i.properties.type == keys[2]).map(i => _.cloneDeep(i)); + let relationIds = relationDataList.filter(i => [keys[2],keys[3]].includes( i.dataCode)).map(i => i.relationId).filter(Boolean); + let features = newfiberMap.map.getSource("point")._data.features.filter(i => relationIds.includes(i.properties.id) && ([keys[2],keys[3]].includes(i.properties.type))).map(i => _.cloneDeep(i)); features.forEach(k => (k.properties.type = undefined)) - lake && busEmit(setGeoJSON.key, { json: turf.featureCollection(features), key: keys[0] }); + relationIds && busEmit(setGeoJSON.key, { json: turf.featureCollection(features), key: keys[0] }); busEmit(setLayerVisible.key, { layername: keys[0], isCheck: true }); } @@ -817,13 +817,16 @@ const { setLayerVisible, beansToMap } = events_params; const fullnessColor = (value) => { value = Number(value); - const colors = [{value:0,color:"rgba(52,176,0,1)"},{value:60,color:"rgba(254,203,0,1)"},{value:70,color:"rgba(223,1,0,1)"},{value:90,color:"rgba(142,14,11,1)"}]; + const colors = [{value:0,color:"rgba(52,176,0,0)"},{value:60,color:"rgba(254,203,0,1)"},{value:70,color:"rgba(223,1,0,1)"},{value:90,color:"rgba(142,14,11,1)"}]; return (colors.filter((i,idx) => idx!= colors.length-1 && i.value{ return (({ lake_water_level:()=>{ return `${item.siteData[0].valueName}：【${item.siteData[0].value}${item.siteData[0].unit}】` + }, + waterlogging:()=>{ + return `${item.name}\n${item.siteData[0].valueName}：【${item.siteData[0].value}${item.siteData[0].unit}】` } })[item.pointType] || (()=> item.name))(); } diff --git a/src/views/pictureOnMap/LayerControl.vue b/src/views/pictureOnMap/LayerControl.vue index 694822a..ac19187 100644 --- a/src/views/pictureOnMap/LayerControl.vue +++ b/src/views/pictureOnMap/LayerControl.vue @@ -4,7 +4,7 @@ class="layericon" @click="allData.showControlBox = !allData.showControlBox" > -
返回
+
返回
i.dataCode == keys[1])[0]; outlet && outletRouteMethod({id:String(outlet.dataId)},false); - let lake = relationDataList.filter(i => i.dataCode == keys[2])[0]; - let features = newfiberMap.map.getSource("point")._data.features.filter(i => i.properties.id == lake.relationId && i.properties.type == keys[2]).map(i => _.cloneDeep(i)); + let relationIds = relationDataList.filter(i => [keys[2],keys[3]].includes( i.dataCode)).map(i => i.relationId).filter(Boolean); + let features = newfiberMap.map.getSource("point")._data.features.filter(i => relationIds.includes(i.properties.id) && ([keys[2],keys[3]].includes(i.properties.type))).map(i => _.cloneDeep(i)); features.forEach(k => (k.properties.type = undefined)) - lake && busEmit(setGeoJSON.key, { json: turf.featureCollection(features), key: keys[0] }); + relationIds && busEmit(setGeoJSON.key, { json: turf.featureCollection(features), key: keys[0] }); busEmit(setLayerVisible.key, { layername: keys[0], isCheck: true }); } @@ -817,13 +817,16 @@ const { setLayerVisible, beansToMap } = events_params; const fullnessColor = (value) => { value = Number(value); - const colors = [{value:0,color:"rgba(52,176,0,1)"},{value:60,color:"rgba(254,203,0,1)"},{value:70,color:"rgba(223,1,0,1)"},{value:90,color:"rgba(142,14,11,1)"}]; + const colors = [{value:0,color:"rgba(52,176,0,0)"},{value:60,color:"rgba(254,203,0,1)"},{value:70,color:"rgba(223,1,0,1)"},{value:90,color:"rgba(142,14,11,1)"}]; return (colors.filter((i,idx) => idx!= colors.length-1 && i.value{ return (({ lake_water_level:()=>{ return `${item.siteData[0].valueName}：【${item.siteData[0].value}${item.siteData[0].unit}】` + }, + waterlogging:()=>{ + return `${item.name}\n${item.siteData[0].valueName}：【${item.siteData[0].value}${item.siteData[0].unit}】` } })[item.pointType] || (()=> item.name))(); } diff --git a/src/views/pictureOnMap/LayerControl.vue b/src/views/pictureOnMap/LayerControl.vue index 694822a..ac19187 100644 --- a/src/views/pictureOnMap/LayerControl.vue +++ b/src/views/pictureOnMap/LayerControl.vue @@ -4,7 +4,7 @@ class="layericon" @click="allData.showControlBox = !allData.showControlBox" >
-
返回
+
返回
i.dataCode == keys[1])[0]; outlet && outletRouteMethod({id:String(outlet.dataId)},false); - let lake = relationDataList.filter(i => i.dataCode == keys[2])[0]; - let features = newfiberMap.map.getSource("point")._data.features.filter(i => i.properties.id == lake.relationId && i.properties.type == keys[2]).map(i => _.cloneDeep(i)); + let relationIds = relationDataList.filter(i => [keys[2],keys[3]].includes( i.dataCode)).map(i => i.relationId).filter(Boolean); + let features = newfiberMap.map.getSource("point")._data.features.filter(i => relationIds.includes(i.properties.id) && ([keys[2],keys[3]].includes(i.properties.type))).map(i => _.cloneDeep(i)); features.forEach(k => (k.properties.type = undefined)) - lake && busEmit(setGeoJSON.key, { json: turf.featureCollection(features), key: keys[0] }); + relationIds && busEmit(setGeoJSON.key, { json: turf.featureCollection(features), key: keys[0] }); busEmit(setLayerVisible.key, { layername: keys[0], isCheck: true }); } @@ -817,13 +817,16 @@ const { setLayerVisible, beansToMap } = events_params; const fullnessColor = (value) => { value = Number(value); - const colors = [{value:0,color:"rgba(52,176,0,1)"},{value:60,color:"rgba(254,203,0,1)"},{value:70,color:"rgba(223,1,0,1)"},{value:90,color:"rgba(142,14,11,1)"}]; + const colors = [{value:0,color:"rgba(52,176,0,0)"},{value:60,color:"rgba(254,203,0,1)"},{value:70,color:"rgba(223,1,0,1)"},{value:90,color:"rgba(142,14,11,1)"}]; return (colors.filter((i,idx) => idx!= colors.length-1 && i.value{ return (({ lake_water_level:()=>{ return `${item.siteData[0].valueName}：【${item.siteData[0].value}${item.siteData[0].unit}】` + }, + waterlogging:()=>{ + return `${item.name}\n${item.siteData[0].valueName}：【${item.siteData[0].value}${item.siteData[0].unit}】` } })[item.pointType] || (()=> item.name))(); } diff --git a/src/views/pictureOnMap/LayerControl.vue b/src/views/pictureOnMap/LayerControl.vue index 694822a..ac19187 100644 --- a/src/views/pictureOnMap/LayerControl.vue +++ b/src/views/pictureOnMap/LayerControl.vue @@ -4,7 +4,7 @@ class="layericon" @click="allData.showControlBox = !allData.showControlBox" >
-
返回
+
返回
-->
{{i.label}} -
{{i.num}}
+
({{i.num}}{{i.uit}})
@@ -27,19 +27,27 @@ import bus from "@/bus"; import { drainageDispatchMonitorData, + pumpStationStatistics } from '@/api/FloodControlAndDrainage.js'; -const classData=[ - {label:'开泵',value:'1',num:'(0/34)'}, - {label:'今日抽排量',value:'2',num:'(0万方)'}, - {label:'实时抽排量',value:'3',num:'(0万方)'}, - {label:'指令响应',value:'4',num:'(0/0)'}, - {label:'语音提醒',value:'5',num:'(0/0)'}, -] +const classData=reactive([ + {label:'开泵',name:'pumpOn',num:'',uit:''}, + {label:'今日抽排量',name:'todayDisplacement',num:'',uit:'万方'}, + {label:'昨日抽排量',name:'yestodayDisplacement',num:'',uit:'万方'}, + {label:'指令响应',name:'commandedResponse',num:'',uit:''}, + {label:'语音提醒',name:'voiceReminder',num:'',uit:''}, +]) const tabActive=ref(1) const listData=ref([]) function gitDataFun() { + pumpStationStatistics().then(res => { + if (res && res.code == 200) { + classData.forEach(i=>{ + i.num=res.data[i.name] + }) + } + }); let params={ monitorType:'bzgq' } diff --git "a/public/static/libs/mapbox/images/\346\263\265\350\275\246\345\234\250\347\272\277.png" "b/public/static/libs/mapbox/images/\346\263\265\350\275\246\345\234\250\347\272\277.png" index 07fa179..de23f52 100644 --- "a/public/static/libs/mapbox/images/\346\263\265\350\275\246\345\234\250\347\272\277.png" +++ "b/public/static/libs/mapbox/images/\346\263\265\350\275\246\345\234\250\347\272\277.png" Binary files differ diff --git "a/public/static/libs/mapbox/images/\346\263\265\350\275\246\347\246\273\347\272\277.png" "b/public/static/libs/mapbox/images/\346\263\265\350\275\246\347\246\273\347\272\277.png" index 9afe894..af9fff2 100644 --- "a/public/static/libs/mapbox/images/\346\263\265\350\275\246\347\246\273\347\272\277.png" +++ "b/public/static/libs/mapbox/images/\346\263\265\350\275\246\347\246\273\347\272\277.png" Binary files differ diff --git a/src/api/FloodControlAndDrainage.js b/src/api/FloodControlAndDrainage.js index 971e705..86078ff 100644 --- a/src/api/FloodControlAndDrainage.js +++ b/src/api/FloodControlAndDrainage.js @@ -463,4 +463,11 @@ params }); } +export function pumpStationStatistics(params) { + return request({ + url: '/business/drainageMap/pumpStationStatistics', + method: 'get', + params + }); +} // ``````````EDN````````````````````` \ No newline at end of file diff --git a/src/components/Map/MapBox.vue b/src/components/Map/MapBox.vue index cb99f34..7335434 100644 --- a/src/components/Map/MapBox.vue +++ b/src/components/Map/MapBox.vue @@ -448,10 +448,10 @@ let outlet = relationDataList.filter(i => i.dataCode == keys[1])[0]; outlet && outletRouteMethod({id:String(outlet.dataId)},false); - let lake = relationDataList.filter(i => i.dataCode == keys[2])[0]; - let features = newfiberMap.map.getSource("point")._data.features.filter(i => i.properties.id == lake.relationId && i.properties.type == keys[2]).map(i => _.cloneDeep(i)); + let relationIds = relationDataList.filter(i => [keys[2],keys[3]].includes( i.dataCode)).map(i => i.relationId).filter(Boolean); + let features = newfiberMap.map.getSource("point")._data.features.filter(i => relationIds.includes(i.properties.id) && ([keys[2],keys[3]].includes(i.properties.type))).map(i => _.cloneDeep(i)); features.forEach(k => (k.properties.type = undefined)) - lake && busEmit(setGeoJSON.key, { json: turf.featureCollection(features), key: keys[0] }); + relationIds && busEmit(setGeoJSON.key, { json: turf.featureCollection(features), key: keys[0] }); busEmit(setLayerVisible.key, { layername: keys[0], isCheck: true }); } @@ -817,13 +817,16 @@ const { setLayerVisible, beansToMap } = events_params; const fullnessColor = (value) => { value = Number(value); - const colors = [{value:0,color:"rgba(52,176,0,1)"},{value:60,color:"rgba(254,203,0,1)"},{value:70,color:"rgba(223,1,0,1)"},{value:90,color:"rgba(142,14,11,1)"}]; + const colors = [{value:0,color:"rgba(52,176,0,0)"},{value:60,color:"rgba(254,203,0,1)"},{value:70,color:"rgba(223,1,0,1)"},{value:90,color:"rgba(142,14,11,1)"}]; return (colors.filter((i,idx) => idx!= colors.length-1 && i.value{ return (({ lake_water_level:()=>{ return `${item.siteData[0].valueName}：【${item.siteData[0].value}${item.siteData[0].unit}】` + }, + waterlogging:()=>{ + return `${item.name}\n${item.siteData[0].valueName}：【${item.siteData[0].value}${item.siteData[0].unit}】` } })[item.pointType] || (()=> item.name))(); } diff --git a/src/views/pictureOnMap/LayerControl.vue b/src/views/pictureOnMap/LayerControl.vue index 694822a..ac19187 100644 --- a/src/views/pictureOnMap/LayerControl.vue +++ b/src/views/pictureOnMap/LayerControl.vue @@ -4,7 +4,7 @@ class="layericon" @click="allData.showControlBox = !allData.showControlBox" >
-
返回
+
返回
-->
{{i.label}} -
{{i.num}}
+
({{i.num}}{{i.uit}})
@@ -27,19 +27,27 @@ import bus from "@/bus"; import { drainageDispatchMonitorData, + pumpStationStatistics } from '@/api/FloodControlAndDrainage.js'; -const classData=[ - {label:'开泵',value:'1',num:'(0/34)'}, - {label:'今日抽排量',value:'2',num:'(0万方)'}, - {label:'实时抽排量',value:'3',num:'(0万方)'}, - {label:'指令响应',value:'4',num:'(0/0)'}, - {label:'语音提醒',value:'5',num:'(0/0)'}, -] +const classData=reactive([ + {label:'开泵',name:'pumpOn',num:'',uit:''}, + {label:'今日抽排量',name:'todayDisplacement',num:'',uit:'万方'}, + {label:'昨日抽排量',name:'yestodayDisplacement',num:'',uit:'万方'}, + {label:'指令响应',name:'commandedResponse',num:'',uit:''}, + {label:'语音提醒',name:'voiceReminder',num:'',uit:''}, +]) const tabActive=ref(1) const listData=ref([]) function gitDataFun() { + pumpStationStatistics().then(res => { + if (res && res.code == 200) { + classData.forEach(i=>{ + i.num=res.data[i.name] + }) + } + }); let params={ monitorType:'bzgq' } diff --git a/src/views/pictureOnMap/page/FloodControlAndDrainage/Pailaodiaodu/MonitoringWarningRigh/components/bzdd.vue b/src/views/pictureOnMap/page/FloodControlAndDrainage/Pailaodiaodu/MonitoringWarningRigh/components/bzdd.vue index 12a909e..0c6db71 100644 --- a/src/views/pictureOnMap/page/FloodControlAndDrainage/Pailaodiaodu/MonitoringWarningRigh/components/bzdd.vue +++ b/src/views/pictureOnMap/page/FloodControlAndDrainage/Pailaodiaodu/MonitoringWarningRigh/components/bzdd.vue @@ -105,6 +105,7 @@ const tableData=ref([]) function gitData() { let params={ + id:bzData.value.id, code:bzData.value.stCode } watchAreaDutyPumpScheduling(params).then(res => { diff --git "a/public/static/libs/mapbox/images/\346\263\265\350\275\246\345\234\250\347\272\277.png" "b/public/static/libs/mapbox/images/\346\263\265\350\275\246\345\234\250\347\272\277.png" index 07fa179..de23f52 100644 --- "a/public/static/libs/mapbox/images/\346\263\265\350\275\246\345\234\250\347\272\277.png" +++ "b/public/static/libs/mapbox/images/\346\263\265\350\275\246\345\234\250\347\272\277.png" Binary files differ diff --git "a/public/static/libs/mapbox/images/\346\263\265\350\275\246\347\246\273\347\272\277.png" "b/public/static/libs/mapbox/images/\346\263\265\350\275\246\347\246\273\347\272\277.png" index 9afe894..af9fff2 100644 --- "a/public/static/libs/mapbox/images/\346\263\265\350\275\246\347\246\273\347\272\277.png" +++ "b/public/static/libs/mapbox/images/\346\263\265\350\275\246\347\246\273\347\272\277.png" Binary files differ diff --git a/src/api/FloodControlAndDrainage.js b/src/api/FloodControlAndDrainage.js index 971e705..86078ff 100644 --- a/src/api/FloodControlAndDrainage.js +++ b/src/api/FloodControlAndDrainage.js @@ -463,4 +463,11 @@ params }); } +export function pumpStationStatistics(params) { + return request({ + url: '/business/drainageMap/pumpStationStatistics', + method: 'get', + params + }); +} // ``````````EDN````````````````````` \ No newline at end of file diff --git a/src/components/Map/MapBox.vue b/src/components/Map/MapBox.vue index cb99f34..7335434 100644 --- a/src/components/Map/MapBox.vue +++ b/src/components/Map/MapBox.vue @@ -448,10 +448,10 @@ let outlet = relationDataList.filter(i => i.dataCode == keys[1])[0]; outlet && outletRouteMethod({id:String(outlet.dataId)},false); - let lake = relationDataList.filter(i => i.dataCode == keys[2])[0]; - let features = newfiberMap.map.getSource("point")._data.features.filter(i => i.properties.id == lake.relationId && i.properties.type == keys[2]).map(i => _.cloneDeep(i)); + let relationIds = relationDataList.filter(i => [keys[2],keys[3]].includes( i.dataCode)).map(i => i.relationId).filter(Boolean); + let features = newfiberMap.map.getSource("point")._data.features.filter(i => relationIds.includes(i.properties.id) && ([keys[2],keys[3]].includes(i.properties.type))).map(i => _.cloneDeep(i)); features.forEach(k => (k.properties.type = undefined)) - lake && busEmit(setGeoJSON.key, { json: turf.featureCollection(features), key: keys[0] }); + relationIds && busEmit(setGeoJSON.key, { json: turf.featureCollection(features), key: keys[0] }); busEmit(setLayerVisible.key, { layername: keys[0], isCheck: true }); } @@ -817,13 +817,16 @@ const { setLayerVisible, beansToMap } = events_params; const fullnessColor = (value) => { value = Number(value); - const colors = [{value:0,color:"rgba(52,176,0,1)"},{value:60,color:"rgba(254,203,0,1)"},{value:70,color:"rgba(223,1,0,1)"},{value:90,color:"rgba(142,14,11,1)"}]; + const colors = [{value:0,color:"rgba(52,176,0,0)"},{value:60,color:"rgba(254,203,0,1)"},{value:70,color:"rgba(223,1,0,1)"},{value:90,color:"rgba(142,14,11,1)"}]; return (colors.filter((i,idx) => idx!= colors.length-1 && i.value{ return (({ lake_water_level:()=>{ return `${item.siteData[0].valueName}：【${item.siteData[0].value}${item.siteData[0].unit}】` + }, + waterlogging:()=>{ + return `${item.name}\n${item.siteData[0].valueName}：【${item.siteData[0].value}${item.siteData[0].unit}】` } })[item.pointType] || (()=> item.name))(); } diff --git a/src/views/pictureOnMap/LayerControl.vue b/src/views/pictureOnMap/LayerControl.vue index 694822a..ac19187 100644 --- a/src/views/pictureOnMap/LayerControl.vue +++ b/src/views/pictureOnMap/LayerControl.vue @@ -4,7 +4,7 @@ class="layericon" @click="allData.showControlBox = !allData.showControlBox" >
-
返回
+
返回
-->
{{i.label}} -
{{i.num}}
+
({{i.num}}{{i.uit}})
@@ -27,19 +27,27 @@ import bus from "@/bus"; import { drainageDispatchMonitorData, + pumpStationStatistics } from '@/api/FloodControlAndDrainage.js'; -const classData=[ - {label:'开泵',value:'1',num:'(0/34)'}, - {label:'今日抽排量',value:'2',num:'(0万方)'}, - {label:'实时抽排量',value:'3',num:'(0万方)'}, - {label:'指令响应',value:'4',num:'(0/0)'}, - {label:'语音提醒',value:'5',num:'(0/0)'}, -] +const classData=reactive([ + {label:'开泵',name:'pumpOn',num:'',uit:''}, + {label:'今日抽排量',name:'todayDisplacement',num:'',uit:'万方'}, + {label:'昨日抽排量',name:'yestodayDisplacement',num:'',uit:'万方'}, + {label:'指令响应',name:'commandedResponse',num:'',uit:''}, + {label:'语音提醒',name:'voiceReminder',num:'',uit:''}, +]) const tabActive=ref(1) const listData=ref([]) function gitDataFun() { + pumpStationStatistics().then(res => { + if (res && res.code == 200) { + classData.forEach(i=>{ + i.num=res.data[i.name] + }) + } + }); let params={ monitorType:'bzgq' } diff --git a/src/views/pictureOnMap/page/FloodControlAndDrainage/Pailaodiaodu/MonitoringWarningRigh/components/bzdd.vue b/src/views/pictureOnMap/page/FloodControlAndDrainage/Pailaodiaodu/MonitoringWarningRigh/components/bzdd.vue index 12a909e..0c6db71 100644 --- a/src/views/pictureOnMap/page/FloodControlAndDrainage/Pailaodiaodu/MonitoringWarningRigh/components/bzdd.vue +++ b/src/views/pictureOnMap/page/FloodControlAndDrainage/Pailaodiaodu/MonitoringWarningRigh/components/bzdd.vue @@ -105,6 +105,7 @@ const tableData=ref([]) function gitData() { let params={ + id:bzData.value.id, code:bzData.value.stCode } watchAreaDutyPumpScheduling(params).then(res => { diff --git a/src/views/pictureOnMap/page/FloodControlAndDrainage/index.vue b/src/views/pictureOnMap/page/FloodControlAndDrainage/index.vue index 586a56a..58cddc8 100644 --- a/src/views/pictureOnMap/page/FloodControlAndDrainage/index.vue +++ b/src/views/pictureOnMap/page/FloodControlAndDrainage/index.vue @@ -142,13 +142,12 @@ }; const TabClick = (item) => { const { setLayerVisible } = events_params; + bus.emit("clearTemporaryData"); + bus.emit("set_area_parent",null); + closeAllLayer(); newfiberMap.map.easeTo(newfiberMap.config_.params.init); activeSublevel.value = item.value; - closeAllLayer(); - item.keys && - item.keys - .filter((i) => i.visible) - .forEach((i) => bus.emit(setLayerVisible.key, { layername: i.key, isCheck: true })); + item.keys && item.keys.filter((i) => i.visible).forEach((i) => bus.emit(setLayerVisible.key, { layername: i.key, isCheck: true })); }; const closeAllLayer = () => { @@ -216,6 +215,10 @@ return munberTimg; // return leftd + "天" + lefth + "时" + leftm + "分" + lefts + "秒"; //返回倒计时的字符串 } +const init = ()=> { + bus.emit("clearTemporaryData"); + TabClick(tabArr.value.filter(i => i.value == activeSublevel.value)[0]); +} onMounted(() => { getPsLevel(); @@ -223,7 +226,7 @@ getPsLevel(); }); - const init = ()=> TabClick(tabArr.value.filter(i => i.value == activeSublevel.value)[0]); + init(); bus.on(mapInitBusName,init); }); diff --git "a/public/static/libs/mapbox/images/\346\263\265\350\275\246\345\234\250\347\272\277.png" "b/public/static/libs/mapbox/images/\346\263\265\350\275\246\345\234\250\347\272\277.png" index 07fa179..de23f52 100644 --- "a/public/static/libs/mapbox/images/\346\263\265\350\275\246\345\234\250\347\272\277.png" +++ "b/public/static/libs/mapbox/images/\346\263\265\350\275\246\345\234\250\347\272\277.png" Binary files differ diff --git "a/public/static/libs/mapbox/images/\346\263\265\350\275\246\347\246\273\347\272\277.png" "b/public/static/libs/mapbox/images/\346\263\265\350\275\246\347\246\273\347\272\277.png" index 9afe894..af9fff2 100644 --- "a/public/static/libs/mapbox/images/\346\263\265\350\275\246\347\246\273\347\272\277.png" +++ "b/public/static/libs/mapbox/images/\346\263\265\350\275\246\347\246\273\347\272\277.png" Binary files differ diff --git a/src/api/FloodControlAndDrainage.js b/src/api/FloodControlAndDrainage.js index 971e705..86078ff 100644 --- a/src/api/FloodControlAndDrainage.js +++ b/src/api/FloodControlAndDrainage.js @@ -463,4 +463,11 @@ params }); } +export function pumpStationStatistics(params) { + return request({ + url: '/business/drainageMap/pumpStationStatistics', + method: 'get', + params + }); +} // ``````````EDN````````````````````` \ No newline at end of file diff --git a/src/components/Map/MapBox.vue b/src/components/Map/MapBox.vue index cb99f34..7335434 100644 --- a/src/components/Map/MapBox.vue +++ b/src/components/Map/MapBox.vue @@ -448,10 +448,10 @@ let outlet = relationDataList.filter(i => i.dataCode == keys[1])[0]; outlet && outletRouteMethod({id:String(outlet.dataId)},false); - let lake = relationDataList.filter(i => i.dataCode == keys[2])[0]; - let features = newfiberMap.map.getSource("point")._data.features.filter(i => i.properties.id == lake.relationId && i.properties.type == keys[2]).map(i => _.cloneDeep(i)); + let relationIds = relationDataList.filter(i => [keys[2],keys[3]].includes( i.dataCode)).map(i => i.relationId).filter(Boolean); + let features = newfiberMap.map.getSource("point")._data.features.filter(i => relationIds.includes(i.properties.id) && ([keys[2],keys[3]].includes(i.properties.type))).map(i => _.cloneDeep(i)); features.forEach(k => (k.properties.type = undefined)) - lake && busEmit(setGeoJSON.key, { json: turf.featureCollection(features), key: keys[0] }); + relationIds && busEmit(setGeoJSON.key, { json: turf.featureCollection(features), key: keys[0] }); busEmit(setLayerVisible.key, { layername: keys[0], isCheck: true }); } @@ -817,13 +817,16 @@ const { setLayerVisible, beansToMap } = events_params; const fullnessColor = (value) => { value = Number(value); - const colors = [{value:0,color:"rgba(52,176,0,1)"},{value:60,color:"rgba(254,203,0,1)"},{value:70,color:"rgba(223,1,0,1)"},{value:90,color:"rgba(142,14,11,1)"}]; + const colors = [{value:0,color:"rgba(52,176,0,0)"},{value:60,color:"rgba(254,203,0,1)"},{value:70,color:"rgba(223,1,0,1)"},{value:90,color:"rgba(142,14,11,1)"}]; return (colors.filter((i,idx) => idx!= colors.length-1 && i.value{ return (({ lake_water_level:()=>{ return `${item.siteData[0].valueName}：【${item.siteData[0].value}${item.siteData[0].unit}】` + }, + waterlogging:()=>{ + return `${item.name}\n${item.siteData[0].valueName}：【${item.siteData[0].value}${item.siteData[0].unit}】` } })[item.pointType] || (()=> item.name))(); } diff --git a/src/views/pictureOnMap/LayerControl.vue b/src/views/pictureOnMap/LayerControl.vue index 694822a..ac19187 100644 --- a/src/views/pictureOnMap/LayerControl.vue +++ b/src/views/pictureOnMap/LayerControl.vue @@ -4,7 +4,7 @@ class="layericon" @click="allData.showControlBox = !allData.showControlBox" >
-
返回
+
返回
-->
{{i.label}} -
{{i.num}}
+
({{i.num}}{{i.uit}})
@@ -27,19 +27,27 @@ import bus from "@/bus"; import { drainageDispatchMonitorData, + pumpStationStatistics } from '@/api/FloodControlAndDrainage.js'; -const classData=[ - {label:'开泵',value:'1',num:'(0/34)'}, - {label:'今日抽排量',value:'2',num:'(0万方)'}, - {label:'实时抽排量',value:'3',num:'(0万方)'}, - {label:'指令响应',value:'4',num:'(0/0)'}, - {label:'语音提醒',value:'5',num:'(0/0)'}, -] +const classData=reactive([ + {label:'开泵',name:'pumpOn',num:'',uit:''}, + {label:'今日抽排量',name:'todayDisplacement',num:'',uit:'万方'}, + {label:'昨日抽排量',name:'yestodayDisplacement',num:'',uit:'万方'}, + {label:'指令响应',name:'commandedResponse',num:'',uit:''}, + {label:'语音提醒',name:'voiceReminder',num:'',uit:''}, +]) const tabActive=ref(1) const listData=ref([]) function gitDataFun() { + pumpStationStatistics().then(res => { + if (res && res.code == 200) { + classData.forEach(i=>{ + i.num=res.data[i.name] + }) + } + }); let params={ monitorType:'bzgq' } diff --git a/src/views/pictureOnMap/page/FloodControlAndDrainage/Pailaodiaodu/MonitoringWarningRigh/components/bzdd.vue b/src/views/pictureOnMap/page/FloodControlAndDrainage/Pailaodiaodu/MonitoringWarningRigh/components/bzdd.vue index 12a909e..0c6db71 100644 --- a/src/views/pictureOnMap/page/FloodControlAndDrainage/Pailaodiaodu/MonitoringWarningRigh/components/bzdd.vue +++ b/src/views/pictureOnMap/page/FloodControlAndDrainage/Pailaodiaodu/MonitoringWarningRigh/components/bzdd.vue @@ -105,6 +105,7 @@ const tableData=ref([]) function gitData() { let params={ + id:bzData.value.id, code:bzData.value.stCode } watchAreaDutyPumpScheduling(params).then(res => { diff --git a/src/views/pictureOnMap/page/FloodControlAndDrainage/index.vue b/src/views/pictureOnMap/page/FloodControlAndDrainage/index.vue index 586a56a..58cddc8 100644 --- a/src/views/pictureOnMap/page/FloodControlAndDrainage/index.vue +++ b/src/views/pictureOnMap/page/FloodControlAndDrainage/index.vue @@ -142,13 +142,12 @@ }; const TabClick = (item) => { const { setLayerVisible } = events_params; + bus.emit("clearTemporaryData"); + bus.emit("set_area_parent",null); + closeAllLayer(); newfiberMap.map.easeTo(newfiberMap.config_.params.init); activeSublevel.value = item.value; - closeAllLayer(); - item.keys && - item.keys - .filter((i) => i.visible) - .forEach((i) => bus.emit(setLayerVisible.key, { layername: i.key, isCheck: true })); + item.keys && item.keys.filter((i) => i.visible).forEach((i) => bus.emit(setLayerVisible.key, { layername: i.key, isCheck: true })); }; const closeAllLayer = () => { @@ -216,6 +215,10 @@ return munberTimg; // return leftd + "天" + lefth + "时" + leftm + "分" + lefts + "秒"; //返回倒计时的字符串 } +const init = ()=> { + bus.emit("clearTemporaryData"); + TabClick(tabArr.value.filter(i => i.value == activeSublevel.value)[0]); +} onMounted(() => { getPsLevel(); @@ -223,7 +226,7 @@ getPsLevel(); }); - const init = ()=> TabClick(tabArr.value.filter(i => i.value == activeSublevel.value)[0]); + init(); bus.on(mapInitBusName,init); }); diff --git a/src/views/pictureOnMap/page/components/DialogTabs/component/bengzhandiaodu.vue b/src/views/pictureOnMap/page/components/DialogTabs/component/bengzhandiaodu.vue new file mode 100644 index 0000000..90de5a0 --- /dev/null +++ b/src/views/pictureOnMap/page/components/DialogTabs/component/bengzhandiaodu.vue @@ -0,0 +1,29 @@ + + + + + \ No newline at end of file