diff --git a/src/api/MonitorAssetsOnMap.js b/src/api/MonitorAssetsOnMap.js index 4e53377..4d288f5 100644 --- a/src/api/MonitorAssetsOnMap.js +++ b/src/api/MonitorAssetsOnMap.js @@ -463,4 +463,4 @@ method: 'get', params: query }) -} +} \ No newline at end of file diff --git a/src/api/MonitorAssetsOnMap.js b/src/api/MonitorAssetsOnMap.js index 4e53377..4d288f5 100644 --- a/src/api/MonitorAssetsOnMap.js +++ b/src/api/MonitorAssetsOnMap.js @@ -463,4 +463,4 @@ method: 'get', params: query }) -} +} \ No newline at end of file diff --git a/src/assets/images/pictureOnMap/leftBZ.png b/src/assets/images/pictureOnMap/leftBZ.png new file mode 100644 index 0000000..1af9f89 --- /dev/null +++ b/src/assets/images/pictureOnMap/leftBZ.png Binary files differ diff --git a/src/api/MonitorAssetsOnMap.js b/src/api/MonitorAssetsOnMap.js index 4e53377..4d288f5 100644 --- a/src/api/MonitorAssetsOnMap.js +++ b/src/api/MonitorAssetsOnMap.js @@ -463,4 +463,4 @@ method: 'get', params: query }) -} +} \ No newline at end of file diff --git a/src/assets/images/pictureOnMap/leftBZ.png b/src/assets/images/pictureOnMap/leftBZ.png new file mode 100644 index 0000000..1af9f89 --- /dev/null +++ b/src/assets/images/pictureOnMap/leftBZ.png Binary files differ diff --git a/src/views/pictureOnMap/LayerControl.vue b/src/views/pictureOnMap/LayerControl.vue index 822bc4d..ac19187 100644 --- a/src/views/pictureOnMap/LayerControl.vue +++ b/src/views/pictureOnMap/LayerControl.vue @@ -256,7 +256,7 @@ pipeNetworkFilling:{ title:'管网充满度(%)', data:[ - { name: "0-60", color: "rgba(52,176,0,1)" }, + { name: "0-60", color: "rgba(52,176,0,.1)" }, { name: "60-70", color: "rgba(254,203,0,1)" }, { name: "70-90", color: "rgba(223,1,0,1)" }, { name: ">90", color: "rgba(142,14,11,1)" }, @@ -631,7 +631,7 @@ width:12px; height:12px; margin-right: 5px; - } + } diff --git a/src/api/MonitorAssetsOnMap.js b/src/api/MonitorAssetsOnMap.js index 4e53377..4d288f5 100644 --- a/src/api/MonitorAssetsOnMap.js +++ b/src/api/MonitorAssetsOnMap.js @@ -463,4 +463,4 @@ method: 'get', params: query }) -} +} \ No newline at end of file diff --git a/src/assets/images/pictureOnMap/leftBZ.png b/src/assets/images/pictureOnMap/leftBZ.png new file mode 100644 index 0000000..1af9f89 --- /dev/null +++ b/src/assets/images/pictureOnMap/leftBZ.png Binary files differ diff --git a/src/views/pictureOnMap/LayerControl.vue b/src/views/pictureOnMap/LayerControl.vue index 822bc4d..ac19187 100644 --- a/src/views/pictureOnMap/LayerControl.vue +++ b/src/views/pictureOnMap/LayerControl.vue @@ -256,7 +256,7 @@ pipeNetworkFilling:{ title:'管网充满度(%)', data:[ - { name: "0-60", color: "rgba(52,176,0,1)" }, + { name: "0-60", color: "rgba(52,176,0,.1)" }, { name: "60-70", color: "rgba(254,203,0,1)" }, { name: "70-90", color: "rgba(223,1,0,1)" }, { name: ">90", color: "rgba(142,14,11,1)" }, @@ -631,7 +631,7 @@ width:12px; height:12px; margin-right: 5px; - } + } diff --git a/src/views/pictureOnMap/index.vue b/src/views/pictureOnMap/index.vue index a61c47e..c3196f9 100644 --- a/src/views/pictureOnMap/index.vue +++ b/src/views/pictureOnMap/index.vue @@ -104,6 +104,8 @@ 'plcSewagePumpStation', //plc污水泵站 'plcRainPumpStation', //plc雨水泵站 "plcGateStation",//plc水闸 + + ]); // 基本数据 const arrid = ref([ @@ -453,7 +455,20 @@ // 处理标注 Getproperties.value = properties; - let type = properties ? properties.type : '' || 1; + let type = properties ? properties.type : '' || 1; + // 针对调度辅助决策易渍水点做的判断 + let fzjcArr=['waterlog_community_text','waterloggingPointRelation'] + if(fzjcArr.includes(properties.type)){ + // 调度辅助决策易渍水点上图统一类型 + type=properties._image + if(!Object.keys(properties).includes('stCode')){ + properties.stCode=properties.dataCode + } + if(!Object.keys(properties).includes('id')){ + properties.id=properties.dataId + } + } + let Name = properties ? properties.pointTypeName : '' || ''; // Annotation(properties); console.log('1111', type, layerId); diff --git a/src/api/MonitorAssetsOnMap.js b/src/api/MonitorAssetsOnMap.js index 4e53377..4d288f5 100644 --- a/src/api/MonitorAssetsOnMap.js +++ b/src/api/MonitorAssetsOnMap.js @@ -463,4 +463,4 @@ method: 'get', params: query }) -} +} \ No newline at end of file diff --git a/src/assets/images/pictureOnMap/leftBZ.png b/src/assets/images/pictureOnMap/leftBZ.png new file mode 100644 index 0000000..1af9f89 --- /dev/null +++ b/src/assets/images/pictureOnMap/leftBZ.png Binary files differ diff --git a/src/views/pictureOnMap/LayerControl.vue b/src/views/pictureOnMap/LayerControl.vue index 822bc4d..ac19187 100644 --- a/src/views/pictureOnMap/LayerControl.vue +++ b/src/views/pictureOnMap/LayerControl.vue @@ -256,7 +256,7 @@ pipeNetworkFilling:{ title:'管网充满度(%)', data:[ - { name: "0-60", color: "rgba(52,176,0,1)" }, + { name: "0-60", color: "rgba(52,176,0,.1)" }, { name: "60-70", color: "rgba(254,203,0,1)" }, { name: "70-90", color: "rgba(223,1,0,1)" }, { name: ">90", color: "rgba(142,14,11,1)" }, @@ -631,7 +631,7 @@ width:12px; height:12px; margin-right: 5px; - } + } diff --git a/src/views/pictureOnMap/index.vue b/src/views/pictureOnMap/index.vue index a61c47e..c3196f9 100644 --- a/src/views/pictureOnMap/index.vue +++ b/src/views/pictureOnMap/index.vue @@ -104,6 +104,8 @@ 'plcSewagePumpStation', //plc污水泵站 'plcRainPumpStation', //plc雨水泵站 "plcGateStation",//plc水闸 + + ]); // 基本数据 const arrid = ref([ @@ -453,7 +455,20 @@ // 处理标注 Getproperties.value = properties; - let type = properties ? properties.type : '' || 1; + let type = properties ? properties.type : '' || 1; + // 针对调度辅助决策易渍水点做的判断 + let fzjcArr=['waterlog_community_text','waterloggingPointRelation'] + if(fzjcArr.includes(properties.type)){ + // 调度辅助决策易渍水点上图统一类型 + type=properties._image + if(!Object.keys(properties).includes('stCode')){ + properties.stCode=properties.dataCode + } + if(!Object.keys(properties).includes('id')){ + properties.id=properties.dataId + } + } + let Name = properties ? properties.pointTypeName : '' || ''; // Annotation(properties); console.log('1111', type, layerId); diff --git a/src/views/pictureOnMap/page/FloodControlAndDrainage/Jianceyujin/MonitoringWarningLeft/component/Bzgq.vue b/src/views/pictureOnMap/page/FloodControlAndDrainage/Jianceyujin/MonitoringWarningLeft/component/Bzgq.vue index be8266a..140f6d4 100644 --- a/src/views/pictureOnMap/page/FloodControlAndDrainage/Jianceyujin/MonitoringWarningLeft/component/Bzgq.vue +++ b/src/views/pictureOnMap/page/FloodControlAndDrainage/Jianceyujin/MonitoringWarningLeft/component/Bzgq.vue @@ -2,7 +2,47 @@
-
+
+
+
泵站总数({{sumObj.totalNum}})
+
当前泵机开泵
+
今日总抽排排量
+
超起排水位
+
+
+
+
雨水泵站
+
污水泵站
+
+
+
{{sumObj.rainPumpNum}}
+
{{sumObj.sewagePumpNum}}
+
+
+
{{sumObj.openPumpMachineNum}}/{{sumObj.pumpMachineNum}}
+
+
+
{{sumObj.rainOpenPumpMachineNum}}/{{sumObj.rainPumpMachineNum}}
+
{{sumObj.sewageOpenPumpMachineNum}}/{{sumObj.sewagePumpMachineNum}}
+
+
+
{{sumObj.todayTotalCpl+'万方'}}
+
--
+
+
+
{{sumObj.rainPumpTodayTotalCpl+'万方'}}
+
--
+
{{sumObj.sewagePumpTodayTotalCpl+'万方'}}
+
--
+
+
+
{{sumObj.cqcswNum}}
+
+
+
+ + +
@@ -99,8 +139,13 @@
-
-
{{item.name}}
+
+
{{item.name}}
+
+ (负载: + {{(Number(Number(item.openPumpNum) / Number(item.pumpNumber))*100).toFixed(0)}}% + ) +
@@ -180,6 +225,19 @@ } }); } +// 计算负荷 +function loadFun(item){ + // openPumpNum/pumpNumber + let sum = (Number(Number(item.openPumpNum) / Number(item.pumpNumber))*100) +if(sum<=100&&sum>75){ + return 'rgba(254, 103, 128, 1)' +}else if(sum<=75&&sum>=50){ + return 'rgba(254, 227, 103, 1)' + +}else if(sum<50){ +return 'rgba(0, 247, 251, 1)' +} +} onMounted(() => { gitDataList() gitDataFun() @@ -188,6 +246,75 @@ diff --git a/src/views/pictureOnMap/index.vue b/src/views/pictureOnMap/index.vue index a61c47e..c3196f9 100644 --- a/src/views/pictureOnMap/index.vue +++ b/src/views/pictureOnMap/index.vue @@ -104,6 +104,8 @@ 'plcSewagePumpStation', //plc污水泵站 'plcRainPumpStation', //plc雨水泵站 "plcGateStation",//plc水闸 + + ]); // 基本数据 const arrid = ref([ @@ -453,7 +455,20 @@ // 处理标注 Getproperties.value = properties; - let type = properties ? properties.type : '' || 1; + let type = properties ? properties.type : '' || 1; + // 针对调度辅助决策易渍水点做的判断 + let fzjcArr=['waterlog_community_text','waterloggingPointRelation'] + if(fzjcArr.includes(properties.type)){ + // 调度辅助决策易渍水点上图统一类型 + type=properties._image + if(!Object.keys(properties).includes('stCode')){ + properties.stCode=properties.dataCode + } + if(!Object.keys(properties).includes('id')){ + properties.id=properties.dataId + } + } + let Name = properties ? properties.pointTypeName : '' || ''; // Annotation(properties); console.log('1111', type, layerId); diff --git a/src/views/pictureOnMap/page/FloodControlAndDrainage/Jianceyujin/MonitoringWarningLeft/component/Bzgq.vue b/src/views/pictureOnMap/page/FloodControlAndDrainage/Jianceyujin/MonitoringWarningLeft/component/Bzgq.vue index be8266a..140f6d4 100644 --- a/src/views/pictureOnMap/page/FloodControlAndDrainage/Jianceyujin/MonitoringWarningLeft/component/Bzgq.vue +++ b/src/views/pictureOnMap/page/FloodControlAndDrainage/Jianceyujin/MonitoringWarningLeft/component/Bzgq.vue @@ -2,7 +2,47 @@
-
+
+
+
泵站总数({{sumObj.totalNum}})
+
当前泵机开泵
+
今日总抽排排量
+
超起排水位
+
+
+
+
雨水泵站
+
污水泵站
+
+
+
{{sumObj.rainPumpNum}}
+
{{sumObj.sewagePumpNum}}
+
+
+
{{sumObj.openPumpMachineNum}}/{{sumObj.pumpMachineNum}}
+
+
+
{{sumObj.rainOpenPumpMachineNum}}/{{sumObj.rainPumpMachineNum}}
+
{{sumObj.sewageOpenPumpMachineNum}}/{{sumObj.sewagePumpMachineNum}}
+
+
+
{{sumObj.todayTotalCpl+'万方'}}
+
--
+
+
+
{{sumObj.rainPumpTodayTotalCpl+'万方'}}
+
--
+
{{sumObj.sewagePumpTodayTotalCpl+'万方'}}
+
--
+
+
+
{{sumObj.cqcswNum}}
+
+
+
+ + +
@@ -99,8 +139,13 @@
-
-
{{item.name}}
+
+
{{item.name}}
+
+ (负载: + {{(Number(Number(item.openPumpNum) / Number(item.pumpNumber))*100).toFixed(0)}}% + ) +
@@ -180,6 +225,19 @@ } }); } +// 计算负荷 +function loadFun(item){ + // openPumpNum/pumpNumber + let sum = (Number(Number(item.openPumpNum) / Number(item.pumpNumber))*100) +if(sum<=100&&sum>75){ + return 'rgba(254, 103, 128, 1)' +}else if(sum<=75&&sum>=50){ + return 'rgba(254, 227, 103, 1)' + +}else if(sum<50){ +return 'rgba(0, 247, 251, 1)' +} +} onMounted(() => { gitDataList() gitDataFun() @@ -188,6 +246,75 @@ diff --git a/src/views/pictureOnMap/index.vue b/src/views/pictureOnMap/index.vue index a61c47e..c3196f9 100644 --- a/src/views/pictureOnMap/index.vue +++ b/src/views/pictureOnMap/index.vue @@ -104,6 +104,8 @@ 'plcSewagePumpStation', //plc污水泵站 'plcRainPumpStation', //plc雨水泵站 "plcGateStation",//plc水闸 + + ]); // 基本数据 const arrid = ref([ @@ -453,7 +455,20 @@ // 处理标注 Getproperties.value = properties; - let type = properties ? properties.type : '' || 1; + let type = properties ? properties.type : '' || 1; + // 针对调度辅助决策易渍水点做的判断 + let fzjcArr=['waterlog_community_text','waterloggingPointRelation'] + if(fzjcArr.includes(properties.type)){ + // 调度辅助决策易渍水点上图统一类型 + type=properties._image + if(!Object.keys(properties).includes('stCode')){ + properties.stCode=properties.dataCode + } + if(!Object.keys(properties).includes('id')){ + properties.id=properties.dataId + } + } + let Name = properties ? properties.pointTypeName : '' || ''; // Annotation(properties); console.log('1111', type, layerId); diff --git a/src/views/pictureOnMap/page/FloodControlAndDrainage/Jianceyujin/MonitoringWarningLeft/component/Bzgq.vue b/src/views/pictureOnMap/page/FloodControlAndDrainage/Jianceyujin/MonitoringWarningLeft/component/Bzgq.vue index be8266a..140f6d4 100644 --- a/src/views/pictureOnMap/page/FloodControlAndDrainage/Jianceyujin/MonitoringWarningLeft/component/Bzgq.vue +++ b/src/views/pictureOnMap/page/FloodControlAndDrainage/Jianceyujin/MonitoringWarningLeft/component/Bzgq.vue @@ -2,7 +2,47 @@
-
+
+
+
泵站总数({{sumObj.totalNum}})
+
当前泵机开泵
+
今日总抽排排量
+
超起排水位
+
+
+
+
雨水泵站
+
污水泵站
+
+
+
{{sumObj.rainPumpNum}}
+
{{sumObj.sewagePumpNum}}
+
+
+
{{sumObj.openPumpMachineNum}}/{{sumObj.pumpMachineNum}}
+
+
+
{{sumObj.rainOpenPumpMachineNum}}/{{sumObj.rainPumpMachineNum}}
+
{{sumObj.sewageOpenPumpMachineNum}}/{{sumObj.sewagePumpMachineNum}}
+
+
+
{{sumObj.todayTotalCpl+'万方'}}
+
--
+
+
+
{{sumObj.rainPumpTodayTotalCpl+'万方'}}
+
--
+
{{sumObj.sewagePumpTodayTotalCpl+'万方'}}
+
--
+
+
+
{{sumObj.cqcswNum}}
+
+
+
+ + +
@@ -99,8 +139,13 @@
-
-
{{item.name}}
+
+
{{item.name}}
+
+ (负载: + {{(Number(Number(item.openPumpNum) / Number(item.pumpNumber))*100).toFixed(0)}}% + ) +
@@ -180,6 +225,19 @@ } }); } +// 计算负荷 +function loadFun(item){ + // openPumpNum/pumpNumber + let sum = (Number(Number(item.openPumpNum) / Number(item.pumpNumber))*100) +if(sum<=100&&sum>75){ + return 'rgba(254, 103, 128, 1)' +}else if(sum<=75&&sum>=50){ + return 'rgba(254, 227, 103, 1)' + +}else if(sum<50){ +return 'rgba(0, 247, 251, 1)' +} +} onMounted(() => { gitDataList() gitDataFun() @@ -188,6 +246,75 @@