-
@@ -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/page/DrainageSystem/components/Paikoucharts.vue b/src/views/pictureOnMap/page/DrainageSystem/components/Paikoucharts.vue
index c48ca1e..7185eb7 100644
--- a/src/views/pictureOnMap/page/DrainageSystem/components/Paikoucharts.vue
+++ b/src/views/pictureOnMap/page/DrainageSystem/components/Paikoucharts.vue
@@ -8,8 +8,8 @@
const id = guid();
const myChart = shallowRef("");
import * as echarts from "echarts";
-import { nowSize } from '@/utils/util.js';
-import moment from 'moment';
+import { nowSize } from "@/utils/util.js";
+import moment from "moment";
const props = defineProps({
//刷新标志
@@ -45,7 +45,7 @@
watch(
() => props.refresh,
(value) => {
- console.log("???????");
+ // console.log("???????");
//先销毁实例
myChart.value && myChart.value.dispose();
init();
@@ -80,7 +80,6 @@
axisLabel: {
show: true,
color: "#409eff",
-
},
axisLine: {
lineStyle: {
@@ -134,7 +133,7 @@
// },
];
- console.log("获取的Y轴的数据", props.yAxisarr);
+ // console.log("获取的Y轴的数据", props.yAxisarr);
// 处理多个y轴遍历展示
if (props.yAxisarr) {
@@ -152,7 +151,7 @@
},
name: p.lineName,
yAxis: Number(p.lineValue),
-
+
label: {
formatter: `${p.lineValue}-${p.lineName}`,
color: p.lineColor,
@@ -166,7 +165,7 @@
marklinedata.push(arr);
});
- console.log("marklinedata", marklinedata);
+ // console.log("marklinedata", marklinedata);
props.yAxisarr.map((item, index) => {
let obj = {
name: item.dataName,
@@ -174,7 +173,7 @@
axisLabel: {
show: true,
color: colorarr[index],
- formatter: function (value) {
+ formatter: function (value) {
return value.toFixed(2); // 保留两位小数
},
},
@@ -249,8 +248,8 @@
},
tooltip: {
trigger: "axis",
- backgroundColor: '#004284',
- borderColor: '#0B9BFF',
+ backgroundColor: "#004284",
+ borderColor: "#0B9BFF",
borderRadius: 6, // 设置圆角大小
feature: {
mark: { show: true },
@@ -259,24 +258,23 @@
restore: { show: true },
saveAsImage: { show: true },
},
- formatter: function (params) {
- let res = params[0].name + '
';
- params.forEach(function (item) {
- // 对每个数据项的数值进行格式化，保留两位小数
- let text= `
+ formatter: function (params) {
+ let res = params[0].name + "
";
+ params.forEach(function (item) {
+ // 对每个数据项的数值进行格式化，保留两位小数
+ let text = `
${item.marker}${item.seriesName}
- ${(item.value == null ? '-' : Number(item.value).toFixed(2))}
-
`
- res +=text ;
- });
- return res;
- },
- textStyle: {
+
${item.value == null ? "-" : Number(item.value).toFixed(2)}
+
`;
+ res += text;
+ });
+ return res;
+ },
+ textStyle: {
// 字体颜色
- color: 'white',
+ color: "white",
// 字体大小
fontSize: nowSize(14, 1920),
-
},
axisPointer: {
type: "cross",
@@ -298,13 +296,13 @@
type: "category",
data: props.XAxis,
axisLabel: {
- color: 'rgba(255,255,255,1)',
- fontSize: nowSize(12, 1920),
- fontFamily: 'AlibabaPuHuiTi',
- formatter: function (value) {
- return moment(value).format('HH:MM');
+ color: "rgba(255,255,255,1)",
+ fontSize: nowSize(12, 1920),
+ fontFamily: "AlibabaPuHuiTi",
+ formatter: function (value) {
+ return moment(value).format("HH:MM");
+ },
},
- },
axisPointer: {
type: "shadow",
},
diff --git a/src/views/pictureOnMap/page/components/DialogTabs/component/MonitoringAnalysisChart.vue b/src/views/pictureOnMap/page/components/DialogTabs/component/MonitoringAnalysisChart.vue
index 4adccc8..497c620 100644
--- a/src/views/pictureOnMap/page/components/DialogTabs/component/MonitoringAnalysisChart.vue
+++ b/src/views/pictureOnMap/page/components/DialogTabs/component/MonitoringAnalysisChart.vue
@@ -60,7 +60,7 @@
watch(
() => props.refresh,
(value) => {
- console.log("???????");
+ // console.log("???????");
//先销毁实例
myChart.value && myChart.value.dispose();
init();
diff --git a/src/views/pictureOnMap/page/components/DialogTabs/component/shuikujianceEcharts.vue b/src/views/pictureOnMap/page/components/DialogTabs/component/shuikujianceEcharts.vue
index 5fcff38..a61fcdc 100644
--- a/src/views/pictureOnMap/page/components/DialogTabs/component/shuikujianceEcharts.vue
+++ b/src/views/pictureOnMap/page/components/DialogTabs/component/shuikujianceEcharts.vue
@@ -43,7 +43,7 @@
watch(
() => props.refresh,
(value) => {
- console.log("???????");
+ // console.log("???????");
//先销毁实例
myChart.value && myChart.value.dispose();
init();
@@ -131,7 +131,7 @@
// },
];
- console.log("获取的Y轴的数据", props.yAxisarr);
+ // console.log("获取的Y轴的数据", props.yAxisarr);
// 处理多个y轴遍历展示
if (props.yAxisarr) {
@@ -162,7 +162,7 @@
marklinedata.push(arr);
});
- console.log("marklinedata", marklinedata);
+ // console.log("marklinedata", marklinedata);
props.yAxisarr.map((item, index) => {
let obj = {
name: item.dataName + item.unit,
diff --git "a/public/static/libs/mapbox/images/\346\263\265\347\253\231\350\247\206\351\242\221_icon.png" "b/public/static/libs/mapbox/images/\346\263\265\347\253\231\350\247\206\351\242\221_icon.png"
new file mode 100644
index 0000000..137456f
--- /dev/null
+++ "b/public/static/libs/mapbox/images/\346\263\265\347\253\231\350\247\206\351\242\221_icon.png"
Binary files differ
diff --git "a/public/static/libs/mapbox/images/\346\270\215\346\260\264\347\202\271\350\247\206\351\242\221_icon.png" "b/public/static/libs/mapbox/images/\346\270\215\346\260\264\347\202\271\350\247\206\351\242\221_icon.png"
new file mode 100644
index 0000000..9dfe0c0
--- /dev/null
+++ "b/public/static/libs/mapbox/images/\346\270\215\346\260\264\347\202\271\350\247\206\351\242\221_icon.png"
Binary files differ
diff --git "a/public/static/libs/mapbox/images/\346\270\257\346\270\240\350\247\206\351\242\221_icon.png" "b/public/static/libs/mapbox/images/\346\270\257\346\270\240\350\247\206\351\242\221_icon.png"
new file mode 100644
index 0000000..1c2197e
--- /dev/null
+++ "b/public/static/libs/mapbox/images/\346\270\257\346\270\240\350\247\206\351\242\221_icon.png"
Binary files differ
diff --git a/public/static/libs/mapbox/style/wh_dhgx.json b/public/static/libs/mapbox/style/wh_dhgx.json
index c451a27..e2793c4 100644
--- a/public/static/libs/mapbox/style/wh_dhgx.json
+++ b/public/static/libs/mapbox/style/wh_dhgx.json
@@ -77,6 +77,10 @@
{"name": "晴天出流", "url": "/static/libs/mapbox/images/雨水-晴天出流.png"},
{"name": "污水混入", "url": "/static/libs/mapbox/images/雨水-污水混入.png"},
+ {"name": "泵站视频", "url": "/static/libs/mapbox/images/泵站视频_icon.png"},
+ {"name": "渍水点视频", "url": "/static/libs/mapbox/images/渍水点视频_icon.png"},
+ {"name": "港渠视频", "url": "/static/libs/mapbox/images/港渠视频_icon.png"},
+
{"name": "地", "url": "/static/libs/mapbox/images/地.png"},
{"name": "堵", "url": "/static/libs/mapbox/images/堵.png"},
{"name": "异", "url": "/static/libs/mapbox/images/异.png"},
@@ -1209,7 +1213,7 @@
"layout": {
"icon-image": [
"match",
- ["get", "_image"],
+ ["get", "_image"],
"rain","雨量站扎点@2x",
"waterlog_point","排渍调度",
"port_channel_info","港渠扎点@2x",
@@ -1223,6 +1227,7 @@
"sewage_factory_info","污水处理厂扎点@2x",
"channel_water_level","港渠水位扎点@2x",
"outlet_quality","排口水质扎点@2x",
+ "outlet_quality_city","排口水质扎点@2x",
"channel_quality","港渠水质扎点@2x",
"outlet_info","排口扎点@2x",
"outlet_info1","排口扎点@2x",
@@ -1235,6 +1240,7 @@
"storage_tank_info1","调蓄池扎点@2x",
"1_调蓄池","调蓄池扎点@2x",
"outlet_water_level","排口水质扎点@2x",
+ "outlet_water_level_city","排口水质扎点@2x",
"region_info","分区信息扎点@2x",
"rain_water_pump_station_info","雨水泵站扎点@2x",
"rain_water_pump_station_info1","雨水泵站扎点@2x",
@@ -1261,20 +1267,24 @@
"clickPoint", "selectedLocation",
"temporary", "selectedLocation",
- "QTCL","晴",
- "WSHR","混",
- "DXSZR","地",
+ "gangqu_video", "港渠视频",
+ "water_logging_video", "渍水点视频",
+ "pump_video", "泵站视频",
- "GJMY","溢",
- "GWMG","满",
- "GWGSWYX","高",
- "GJMYFX","溢",
+ "QTCL","晴",
+ "WSHR","混",
+ "DXSZR","地",
- "YSHR","混",
- "YDFX","堵",
- "SZYC","异",
+ "GJMY","溢",
+ "GWMG","满",
+ "GWGSWYX","高",
+ "GJMYFX","溢",
- "tran"
+ "YSHR","混",
+ "YDFX","堵",
+ "SZYC","异",
+
+ "tran"
],
"icon-allow-overlap": true,
"icon-anchor": "center",
@@ -1293,6 +1303,9 @@
"YSHR",0.7,
"YDFX",0.7,
"SZYC",0.7,
+ "gangqu_video",0.7,
+ "water_logging_video",0.7,
+ "pump_video",0.7,
1
],
"text-field": "{name}",
@@ -1651,6 +1664,15 @@
"layerName": ["pipeline_info1", "pipeline_point1"],
"filter": [["雨水"], ["雨水"], ["雨水"]]
},
+ "outlet_water_level": {
+ "layerName": ["point"],
+ "filter": [["outlet_water_level","outlet_water_level_city"]]
+ },
+
+ "outlet_quality": {
+ "layerName": ["point"],
+ "filter": [["outlet_quality","outlet_quality_city"]]
+ },
"花山镇":{"layerName": ["村", "村_text"], "filter": [["花山镇"],["花山镇"]]},
"滨湖街":{"layerName": ["村", "村_text"], "filter": [["滨湖街"],["滨湖街"]]},
diff --git a/src/views/pictureOnMap/LayerControl.vue b/src/views/pictureOnMap/LayerControl.vue
index cf0c595..dc81682 100644
--- a/src/views/pictureOnMap/LayerControl.vue
+++ b/src/views/pictureOnMap/LayerControl.vue
@@ -154,6 +154,25 @@
],
},*/
{
+ value: "视频",
+ label: "视频",
+ class: "target-class",
+ children: [
+ {
+ value: "gangqu_video",
+ label: "港渠视频",
+ },
+ {
+ value: "water_logging_video",
+ label: "渍水点视频",
+ },
+ {
+ value: "pump_video",
+ label: "泵站视频",
+ }
+ ],
+ },
+ {
value: "监测点",
label: "监测点",
class: "target-class",
diff --git a/src/views/pictureOnMap/index.vue b/src/views/pictureOnMap/index.vue
index 5823b2f..4b84aaf 100644
--- a/src/views/pictureOnMap/index.vue
+++ b/src/views/pictureOnMap/index.vue
@@ -92,7 +92,9 @@
"waterlogging", // 渍水监测点（注意：这里编码没有后缀，可能是特例或故意为之）
"rain", // 雨量站
"rainwater_pipeline_quality", // 雨水管网水质
+ "rainwater_pipeline_quality_city", // 雨水管网水质
"sewage_pipeline_quality", // 污水管网水质
+ "sewage_pipeline_quality_city", // 污水管网水质
"rainwater_pipeline_quality_area", // 接驳口
"rainwater_pipeline_water_level", // 雨水管网液位
"reservoir_water_level", //水库水位
@@ -101,6 +103,7 @@
"sewageStation", //污水厂
"gateStation", //闸门
"pump_water_level", //泵站液位
+ "outlet_water_level_city", //排口流量
]);
// 基本数据
const arrid = ref([
@@ -279,6 +282,16 @@
type = "rainwater_pipeline_quality";
dialogConfig.RefName = "jiancefenxiGWFX";
}
+ if (type == "outlet_water_level_city") {
+ type = "outlet_water_level";
+ }
+ if (type == "rainwater_pipeline_quality_city") {
+ type = "rainwater_pipeline_quality";
+ }
+ if (type == "sewage_pipeline_quality_city") {
+ type = "sewage_pipeline_quality";
+ }
+
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 @@
-
-
+