diff --git a/src/views/pictureOnMap/index.vue b/src/views/pictureOnMap/index.vue index 5823b2f..b0eaa08 100644 --- a/src/views/pictureOnMap/index.vue +++ b/src/views/pictureOnMap/index.vue @@ -279,6 +279,9 @@ type = "rainwater_pipeline_quality"; dialogConfig.RefName = "jiancefenxiGWFX"; } + + if (Name == "排口水质") { + } let params = { dataCode: type, scene: specificFun(type) || "basis_monitor", diff --git a/src/views/pictureOnMap/index.vue b/src/views/pictureOnMap/index.vue index 5823b2f..b0eaa08 100644 --- a/src/views/pictureOnMap/index.vue +++ b/src/views/pictureOnMap/index.vue @@ -279,6 +279,9 @@ type = "rainwater_pipeline_quality"; dialogConfig.RefName = "jiancefenxiGWFX"; } + + if (Name == "排口水质") { + } let params = { dataCode: type, scene: specificFun(type) || "basis_monitor", diff --git a/src/views/pictureOnMap/page/DrainageSystem/YSIndex.vue b/src/views/pictureOnMap/page/DrainageSystem/YSIndex.vue index ab2e36e..2003971 100644 --- a/src/views/pictureOnMap/page/DrainageSystem/YSIndex.vue +++ b/src/views/pictureOnMap/page/DrainageSystem/YSIndex.vue @@ -804,6 +804,11 @@ AllData.RightShow = true; } } + // 排口水质/流量 + if (Row.properties.pointType == "outlet_quality" || "outlet_water_level") { + // 定位雨水系统二级菜单下右侧排口信息echarts列表 + bus.emit("SZEchartsScrollTop", Row.properties); + } } // } } diff --git a/src/views/pictureOnMap/index.vue b/src/views/pictureOnMap/index.vue index 5823b2f..b0eaa08 100644 --- a/src/views/pictureOnMap/index.vue +++ b/src/views/pictureOnMap/index.vue @@ -279,6 +279,9 @@ type = "rainwater_pipeline_quality"; dialogConfig.RefName = "jiancefenxiGWFX"; } + + if (Name == "排口水质") { + } let params = { dataCode: type, scene: specificFun(type) || "basis_monitor", diff --git a/src/views/pictureOnMap/page/DrainageSystem/YSIndex.vue b/src/views/pictureOnMap/page/DrainageSystem/YSIndex.vue index ab2e36e..2003971 100644 --- a/src/views/pictureOnMap/page/DrainageSystem/YSIndex.vue +++ b/src/views/pictureOnMap/page/DrainageSystem/YSIndex.vue @@ -804,6 +804,11 @@ AllData.RightShow = true; } } + // 排口水质/流量 + if (Row.properties.pointType == "outlet_quality" || "outlet_water_level") { + // 定位雨水系统二级菜单下右侧排口信息echarts列表 + bus.emit("SZEchartsScrollTop", Row.properties); + } } // } } diff --git a/src/views/pictureOnMap/page/DrainageSystem/YSIndex_right2.vue b/src/views/pictureOnMap/page/DrainageSystem/YSIndex_right2.vue index fea3dc3..4453800 100644 --- a/src/views/pictureOnMap/page/DrainageSystem/YSIndex_right2.vue +++ b/src/views/pictureOnMap/page/DrainageSystem/YSIndex_right2.vue @@ -4,311 +4,324 @@
历史水质
- - - - - + + + +
- - +
- - - - -
-
-
-
{{item.stName}}
-
- + + + +
+
+
+
{{ item.stName }}
+
+ +
- +
+ 暂无数据 +
-
- 暂无数据 -
-
-
-
-
-
{{item.stName}}
-
- - +
+
+
+
{{ item.stName }}
+
+ + +
- +
+ 暂无数据 +
-
- 暂无数据 - -
-
- -
@@ -316,12 +329,12 @@ #YSIndex_right2 { width: 100%; height: 100%; - - .historySZ{ + + .historySZ { height: calc((100% - 30px) / 3); - } - #Charts,#history { + #Charts, + #history { width: calc(100% - 10px); height: calc(100% - 32px); @@ -331,12 +344,10 @@ overflow-y: auto; } .eachLake { -height: calc((100% - 30px) / 2); + height: calc((100% - 30px) / 2); } - :deep(.el-select .el-input__inner){ + :deep(.el-select .el-input__inner) { color: #fff; - } - } diff --git a/src/views/pictureOnMap/index.vue b/src/views/pictureOnMap/index.vue index 5823b2f..b0eaa08 100644 --- a/src/views/pictureOnMap/index.vue +++ b/src/views/pictureOnMap/index.vue @@ -279,6 +279,9 @@ type = "rainwater_pipeline_quality"; dialogConfig.RefName = "jiancefenxiGWFX"; } + + if (Name == "排口水质") { + } let params = { dataCode: type, scene: specificFun(type) || "basis_monitor", diff --git a/src/views/pictureOnMap/page/DrainageSystem/YSIndex.vue b/src/views/pictureOnMap/page/DrainageSystem/YSIndex.vue index ab2e36e..2003971 100644 --- a/src/views/pictureOnMap/page/DrainageSystem/YSIndex.vue +++ b/src/views/pictureOnMap/page/DrainageSystem/YSIndex.vue @@ -804,6 +804,11 @@ AllData.RightShow = true; } } + // 排口水质/流量 + if (Row.properties.pointType == "outlet_quality" || "outlet_water_level") { + // 定位雨水系统二级菜单下右侧排口信息echarts列表 + bus.emit("SZEchartsScrollTop", Row.properties); + } } // } } diff --git a/src/views/pictureOnMap/page/DrainageSystem/YSIndex_right2.vue b/src/views/pictureOnMap/page/DrainageSystem/YSIndex_right2.vue index fea3dc3..4453800 100644 --- a/src/views/pictureOnMap/page/DrainageSystem/YSIndex_right2.vue +++ b/src/views/pictureOnMap/page/DrainageSystem/YSIndex_right2.vue @@ -4,311 +4,324 @@
历史水质
- - - - - + + + +
- - +
- - - - -
-
-
-
{{item.stName}}
-
- + + + +
+
+
+
{{ item.stName }}
+
+ +
- +
+ 暂无数据 +
-
- 暂无数据 -
-
-
-
-
-
{{item.stName}}
-
- - +
+
+
+
{{ item.stName }}
+
+ + +
- +
+ 暂无数据 +
-
- 暂无数据 - -
-
- -
@@ -316,12 +329,12 @@ #YSIndex_right2 { width: 100%; height: 100%; - - .historySZ{ + + .historySZ { height: calc((100% - 30px) / 3); - } - #Charts,#history { + #Charts, + #history { width: calc(100% - 10px); height: calc(100% - 32px); @@ -331,12 +344,10 @@ overflow-y: auto; } .eachLake { -height: calc((100% - 30px) / 2); + height: calc((100% - 30px) / 2); } - :deep(.el-select .el-input__inner){ + :deep(.el-select .el-input__inner) { color: #fff; - } - } diff --git a/vite.config.js b/vite.config.js index a6b0a22..f7906cb 100644 --- a/vite.config.js +++ b/vite.config.js @@ -6,9 +6,9 @@ const Timestamp = new Date().getTime(); //随机时间戳 // let ipLink = 'https://dhgx.wh-nf.cn:8201/prod-api'; -// let ipLink = 'http://192.168.16.135:9100'; +let ipLink = 'https://server1.wh-nf.cn:8201/prod-api'; // let ipLink = 'http://192.168.16.124:9100'; -let ipLink = 'http://192.168.20.43:9100'; // 刘总 +// let ipLink = 'http://192.168.20.43:9100'; // 刘总 /* */ // https://vitejs.dev/config/ export default defineConfig(({ mode, command }) => {