diff --git a/src/assets/images/pictureOnMap/SLFX2.png b/src/assets/images/pictureOnMap/SLFX2.png new file mode 100644 index 0000000..8ac1aec --- /dev/null +++ b/src/assets/images/pictureOnMap/SLFX2.png Binary files differ diff --git a/src/assets/images/pictureOnMap/SLFX2.png b/src/assets/images/pictureOnMap/SLFX2.png new file mode 100644 index 0000000..8ac1aec --- /dev/null +++ b/src/assets/images/pictureOnMap/SLFX2.png Binary files differ diff --git a/src/views/pictureOnMap/page/DrainageSystem/BengZhanRight.vue b/src/views/pictureOnMap/page/DrainageSystem/BengZhanRight.vue new file mode 100644 index 0000000..712198c --- /dev/null +++ b/src/views/pictureOnMap/page/DrainageSystem/BengZhanRight.vue @@ -0,0 +1,343 @@ + + + + + diff --git a/src/assets/images/pictureOnMap/SLFX2.png b/src/assets/images/pictureOnMap/SLFX2.png new file mode 100644 index 0000000..8ac1aec --- /dev/null +++ b/src/assets/images/pictureOnMap/SLFX2.png Binary files differ diff --git a/src/views/pictureOnMap/page/DrainageSystem/BengZhanRight.vue b/src/views/pictureOnMap/page/DrainageSystem/BengZhanRight.vue new file mode 100644 index 0000000..712198c --- /dev/null +++ b/src/views/pictureOnMap/page/DrainageSystem/BengZhanRight.vue @@ -0,0 +1,343 @@ + + + + + diff --git a/src/views/pictureOnMap/page/DrainageSystem/WSIndex.vue b/src/views/pictureOnMap/page/DrainageSystem/WSIndex.vue index 82fc747..ee688a1 100644 --- a/src/views/pictureOnMap/page/DrainageSystem/WSIndex.vue +++ b/src/views/pictureOnMap/page/DrainageSystem/WSIndex.vue @@ -106,10 +106,15 @@ +
@@ -226,6 +231,19 @@
+ + +
+ 泵站信息 +
+
@@ -258,6 +276,7 @@ waterRegionCode: "", //分区编号 RightShow: false, //右侧面板是否显示--基于是否选择站点进行判断 RightShowID: "", + RightShowType: "", TitleName: [ { abbreviation: "一级分区", //分区缩写-动态 @@ -393,6 +412,7 @@ console.log(item); AllData.RightShow = false; AllData.RightShowID = ""; + AllData.RightShowType = ""; // 赋值需要进行echarts数据请求的数据 AllData.regionGrade = item.grade; AllData.regionName = item.Name; @@ -530,6 +550,7 @@ // 片区 AllData.RightShow = false; AllData.RightShowID = false; + AllData.RightShowType = "排水分区"; // if (!!!Row.properties.pid) return; // 原本是判断没有pid就不请求↑↑↑,现在gis图层数据改变,从而使用层级来判断↓↓↓ if (Row.properties.level == "4") return; @@ -626,15 +647,17 @@ }); } else if (Row.layerId == "point") { // 点位 - if (Row.properties.pointType == "sewage_pipeline_quality") { - if (AllData.RightShowID == Row.properties.id) { - // 说明是同样的一个点点了两次,所以进行关闭 - AllData.RightShow = false; - AllData.RightShowID = ""; - } else { + if (AllData.RightShowID == Row.properties.id) { + // 说明是同样的一个点点了两次,所以进行关闭 + AllData.RightShow = false; + AllData.RightShowID = ""; + } else { + // 管点 + if (Row.properties.pointType == "sewage_pipeline_quality") { AllData.ClicksiteName = Row.properties.name; - AllData.RightShow = true; AllData.RightShowID = Row.properties.id; + AllData.RightShowType = "sewage_pipeline_quality"; + AllData.RightShow = true; // Row.properties.wellCode // 获取管网信息 console.log("Row", Row); @@ -680,6 +703,36 @@ GetRightCharts(Row.properties); // }, 900); } + // 泵站 + if (Row.properties.pointType == "sewage_pump_station_info") { + if (Row.properties.id == "") { + // 不展示 + AllData.ClicksiteName = ""; + AllData.RightShow = false; + AllData.RightShowID = ""; + AllData.RightShowType = ""; + } else { + AllData.ClicksiteName = Row.properties.name; + AllData.RightShowID = Row.properties.id; + AllData.RightShowType = "sewage_pump_station_info"; + AllData.RightShow = true; + } + } + // 污水处理厂 + if (Row.properties.pointType == "sewage_factory_info") { + if (Row.properties.id == "") { + // 不展示 + AllData.ClicksiteName = ""; + AllData.RightShow = false; + AllData.RightShowID = ""; + AllData.RightShowType = ""; + } else { + AllData.ClicksiteName = Row.properties.name; + AllData.RightShowID = Row.properties.id; + AllData.RightShowType = "sewage_factory_info"; + AllData.RightShow = true; + } + } } } }; diff --git a/src/assets/images/pictureOnMap/SLFX2.png b/src/assets/images/pictureOnMap/SLFX2.png new file mode 100644 index 0000000..8ac1aec --- /dev/null +++ b/src/assets/images/pictureOnMap/SLFX2.png Binary files differ diff --git a/src/views/pictureOnMap/page/DrainageSystem/BengZhanRight.vue b/src/views/pictureOnMap/page/DrainageSystem/BengZhanRight.vue new file mode 100644 index 0000000..712198c --- /dev/null +++ b/src/views/pictureOnMap/page/DrainageSystem/BengZhanRight.vue @@ -0,0 +1,343 @@ + + + + + diff --git a/src/views/pictureOnMap/page/DrainageSystem/WSIndex.vue b/src/views/pictureOnMap/page/DrainageSystem/WSIndex.vue index 82fc747..ee688a1 100644 --- a/src/views/pictureOnMap/page/DrainageSystem/WSIndex.vue +++ b/src/views/pictureOnMap/page/DrainageSystem/WSIndex.vue @@ -106,10 +106,15 @@ +
@@ -226,6 +231,19 @@
+ + +
+ 泵站信息 +
+
@@ -258,6 +276,7 @@ waterRegionCode: "", //分区编号 RightShow: false, //右侧面板是否显示--基于是否选择站点进行判断 RightShowID: "", + RightShowType: "", TitleName: [ { abbreviation: "一级分区", //分区缩写-动态 @@ -393,6 +412,7 @@ console.log(item); AllData.RightShow = false; AllData.RightShowID = ""; + AllData.RightShowType = ""; // 赋值需要进行echarts数据请求的数据 AllData.regionGrade = item.grade; AllData.regionName = item.Name; @@ -530,6 +550,7 @@ // 片区 AllData.RightShow = false; AllData.RightShowID = false; + AllData.RightShowType = "排水分区"; // if (!!!Row.properties.pid) return; // 原本是判断没有pid就不请求↑↑↑,现在gis图层数据改变,从而使用层级来判断↓↓↓ if (Row.properties.level == "4") return; @@ -626,15 +647,17 @@ }); } else if (Row.layerId == "point") { // 点位 - if (Row.properties.pointType == "sewage_pipeline_quality") { - if (AllData.RightShowID == Row.properties.id) { - // 说明是同样的一个点点了两次,所以进行关闭 - AllData.RightShow = false; - AllData.RightShowID = ""; - } else { + if (AllData.RightShowID == Row.properties.id) { + // 说明是同样的一个点点了两次,所以进行关闭 + AllData.RightShow = false; + AllData.RightShowID = ""; + } else { + // 管点 + if (Row.properties.pointType == "sewage_pipeline_quality") { AllData.ClicksiteName = Row.properties.name; - AllData.RightShow = true; AllData.RightShowID = Row.properties.id; + AllData.RightShowType = "sewage_pipeline_quality"; + AllData.RightShow = true; // Row.properties.wellCode // 获取管网信息 console.log("Row", Row); @@ -680,6 +703,36 @@ GetRightCharts(Row.properties); // }, 900); } + // 泵站 + if (Row.properties.pointType == "sewage_pump_station_info") { + if (Row.properties.id == "") { + // 不展示 + AllData.ClicksiteName = ""; + AllData.RightShow = false; + AllData.RightShowID = ""; + AllData.RightShowType = ""; + } else { + AllData.ClicksiteName = Row.properties.name; + AllData.RightShowID = Row.properties.id; + AllData.RightShowType = "sewage_pump_station_info"; + AllData.RightShow = true; + } + } + // 污水处理厂 + if (Row.properties.pointType == "sewage_factory_info") { + if (Row.properties.id == "") { + // 不展示 + AllData.ClicksiteName = ""; + AllData.RightShow = false; + AllData.RightShowID = ""; + AllData.RightShowType = ""; + } else { + AllData.ClicksiteName = Row.properties.name; + AllData.RightShowID = Row.properties.id; + AllData.RightShowType = "sewage_factory_info"; + AllData.RightShow = true; + } + } } } }; diff --git a/src/views/pictureOnMap/page/DrainageSystem/YSIndex.vue b/src/views/pictureOnMap/page/DrainageSystem/YSIndex.vue index ee70b19..d286774 100644 --- a/src/views/pictureOnMap/page/DrainageSystem/YSIndex.vue +++ b/src/views/pictureOnMap/page/DrainageSystem/YSIndex.vue @@ -122,10 +122,15 @@ +
@@ -256,6 +261,7 @@
+
+ + +
+ +
+ {{ AllData.ClicksiteName }} +
+ +
+ +
+
+
@@ -303,6 +332,7 @@ import RightCharts from "./components/RightCharts.vue"; import YSRight from "./YSIndex_right.vue"; import YSRight2 from "./YSIndex_right2.vue"; +import BengZhanInfo from "./BengZhanRight.vue"; // 面板控制组件 import PanelDisplayHidden from "@/views/pictureOnMap/page/components/PanelDisplayHidden.vue"; const showPanel = ref(false); //面板展开收起 @@ -317,6 +347,7 @@ waterRegionCode: "", //分区编号 RightShow: false, //右侧面板是否显示--基于是否选择站点进行判断 RightShowID: "", + RightShowType: "", TitleName: [ { abbreviation: "一级分区", //分区缩写-动态 @@ -453,6 +484,7 @@ console.log(item); AllData.RightShow = false; AllData.RightShowID = ""; + AllData.RightShowType = ""; // 赋值需要进行echarts数据请求的数据 AllData.regionGrade = item.grade; AllData.regionName = item.Name; @@ -590,6 +622,7 @@ // 片区 AllData.RightShow = false; AllData.RightShowID = false; + AllData.RightShowType = "排水分区"; // if (!!!Row.properties.pid) return; // 原本是判断没有pid就不请求↑↑↑,现在gis图层数据改变,从而使用层级来判断↓↓↓ if (Row.properties.level == "4") return; @@ -686,15 +719,18 @@ }); } else if (Row.layerId == "point") { // 点位 - if (Row.properties.pointType == "rainwater_pipeline_quality") { - if (AllData.RightShowID == Row.properties.id) { - // 说明是同样的一个点点了两次,所以进行关闭 - AllData.RightShow = false; - AllData.RightShowID = ""; - } else { + if (AllData.RightShowID == Row.properties.id) { + // 说明是同样的一个点点了两次,所以进行关闭 + AllData.RightShow = false; + AllData.RightShowID = ""; + AllData.RightShowType = ""; + } else { + // 管点 + if (Row.properties.pointType == "rainwater_pipeline_quality") { AllData.ClicksiteName = Row.properties.name; - AllData.RightShow = true; AllData.RightShowID = Row.properties.id; + AllData.RightShowType = "rainwater_pipeline_quality"; + AllData.RightShow = true; // Row.properties.wellCode // 获取管网信息 if (!!Row.properties.wellCode) { @@ -746,7 +782,23 @@ GetRightCharts(Row.properties); // }, 900); } + // 泵站 + if (Row.properties.pointType == "rain_water_pump_station_info") { + if (Row.properties.id == "") { + // 不展示 + AllData.ClicksiteName = ""; + AllData.RightShow = false; + AllData.RightShowID = ""; + AllData.RightShowType = ""; + } else { + AllData.RightShowType = "rain_water_pump_station_info"; + AllData.ClicksiteName = Row.properties.name; + AllData.RightShowID = Row.properties.id; + AllData.RightShow = true; + } + } } + // } } }; @@ -801,7 +853,7 @@ } if (AllData.regionGrade == "two") { // 二级Ecahrts 名称 - debugger; + // debugger; AllData.chartData2.yAxis_Name = "问题管网"; AllData.TjData2 = Number( res.data.pipelineLengthList.reduce(