diff --git a/src/components/Echarts/pieChart_1.js b/src/components/Echarts/pieChart_1.js index db79f45..62bb3b7 100644 --- a/src/components/Echarts/pieChart_1.js +++ b/src/components/Echarts/pieChart_1.js @@ -1242,7 +1242,6 @@ series: { name: '', type: 'bar', - // prettier-ignore data: [], }, }, diff --git a/src/components/Echarts/pieChart_1.js b/src/components/Echarts/pieChart_1.js index db79f45..62bb3b7 100644 --- a/src/components/Echarts/pieChart_1.js +++ b/src/components/Echarts/pieChart_1.js @@ -1242,7 +1242,6 @@ series: { name: '', type: 'bar', - // prettier-ignore data: [], }, }, diff --git a/src/views/project/processControl/constructionPermits/index.vue b/src/views/project/processControl/constructionPermits/index.vue index 2b880f6..e81f51f 100644 --- a/src/views/project/processControl/constructionPermits/index.vue +++ b/src/views/project/processControl/constructionPermits/index.vue @@ -180,7 +180,9 @@ 取 消 保 存 提 交 - 驳 回 + 驳 回 通 过 diff --git a/src/components/Echarts/pieChart_1.js b/src/components/Echarts/pieChart_1.js index db79f45..62bb3b7 100644 --- a/src/components/Echarts/pieChart_1.js +++ b/src/components/Echarts/pieChart_1.js @@ -1242,7 +1242,6 @@ series: { name: '', type: 'bar', - // prettier-ignore data: [], }, }, diff --git a/src/views/project/processControl/constructionPermits/index.vue b/src/views/project/processControl/constructionPermits/index.vue index 2b880f6..e81f51f 100644 --- a/src/views/project/processControl/constructionPermits/index.vue +++ b/src/views/project/processControl/constructionPermits/index.vue @@ -180,7 +180,9 @@ 取 消 保 存 提 交 - 驳 回 + 驳 回 通 过 diff --git a/src/views/project/projectManage/projectDesign.vue b/src/views/project/projectManage/projectDesign.vue index def53be..583c183 100644 --- a/src/views/project/projectManage/projectDesign.vue +++ b/src/views/project/projectManage/projectDesign.vue @@ -5,7 +5,7 @@ - + diff --git a/src/components/Echarts/pieChart_1.js b/src/components/Echarts/pieChart_1.js index db79f45..62bb3b7 100644 --- a/src/components/Echarts/pieChart_1.js +++ b/src/components/Echarts/pieChart_1.js @@ -1242,7 +1242,6 @@ series: { name: '', type: 'bar', - // prettier-ignore data: [], }, }, diff --git a/src/views/project/processControl/constructionPermits/index.vue b/src/views/project/processControl/constructionPermits/index.vue index 2b880f6..e81f51f 100644 --- a/src/views/project/processControl/constructionPermits/index.vue +++ b/src/views/project/processControl/constructionPermits/index.vue @@ -180,7 +180,9 @@ 取 消 保 存 提 交 - 驳 回 + 驳 回 通 过 diff --git a/src/views/project/projectManage/projectDesign.vue b/src/views/project/projectManage/projectDesign.vue index def53be..583c183 100644 --- a/src/views/project/projectManage/projectDesign.vue +++ b/src/views/project/projectManage/projectDesign.vue @@ -5,7 +5,7 @@ - + diff --git a/src/views/sponeScreen/HaiMianScreen/index.vue b/src/views/sponeScreen/HaiMianScreen/index.vue index 3fa881b..a6f5c63 100644 --- a/src/views/sponeScreen/HaiMianScreen/index.vue +++ b/src/views/sponeScreen/HaiMianScreen/index.vue @@ -207,7 +207,8 @@ properties.type == 'YSBZ' || properties.type == 'WSBZ' || properties.type == 'combineBengZhan' || - properties.type == 'sewageFactory' + properties.type == 'sewageFactory' || + properties.type == 'waterLoging' ) { bus.emit('popupcontent', { popupShow: true, diff --git a/src/components/Echarts/pieChart_1.js b/src/components/Echarts/pieChart_1.js index db79f45..62bb3b7 100644 --- a/src/components/Echarts/pieChart_1.js +++ b/src/components/Echarts/pieChart_1.js @@ -1242,7 +1242,6 @@ series: { name: '', type: 'bar', - // prettier-ignore data: [], }, }, diff --git a/src/views/project/processControl/constructionPermits/index.vue b/src/views/project/processControl/constructionPermits/index.vue index 2b880f6..e81f51f 100644 --- a/src/views/project/processControl/constructionPermits/index.vue +++ b/src/views/project/processControl/constructionPermits/index.vue @@ -180,7 +180,9 @@ 取 消 保 存 提 交 - 驳 回 + 驳 回 通 过 diff --git a/src/views/project/projectManage/projectDesign.vue b/src/views/project/projectManage/projectDesign.vue index def53be..583c183 100644 --- a/src/views/project/projectManage/projectDesign.vue +++ b/src/views/project/projectManage/projectDesign.vue @@ -5,7 +5,7 @@ - + diff --git a/src/views/sponeScreen/HaiMianScreen/index.vue b/src/views/sponeScreen/HaiMianScreen/index.vue index 3fa881b..a6f5c63 100644 --- a/src/views/sponeScreen/HaiMianScreen/index.vue +++ b/src/views/sponeScreen/HaiMianScreen/index.vue @@ -207,7 +207,8 @@ properties.type == 'YSBZ' || properties.type == 'WSBZ' || properties.type == 'combineBengZhan' || - properties.type == 'sewageFactory' + properties.type == 'sewageFactory' || + properties.type == 'waterLoging' ) { bus.emit('popupcontent', { popupShow: true, diff --git a/src/views/sponeScreen/gisMF/cesiumPopup.vue b/src/views/sponeScreen/gisMF/cesiumPopup.vue index 43b9b7e..9e04bd0 100644 --- a/src/views/sponeScreen/gisMF/cesiumPopup.vue +++ b/src/views/sponeScreen/gisMF/cesiumPopup.vue @@ -6,6 +6,7 @@
{{ allData.dataList.sewageName }}
{{ allData.dataList.roadName }}
{{ allData.dataList.stName }}
+
{{ allData.dataList.waterloggingName }}
@@ -70,63 +71,25 @@ 查看工况图 - -
-
-
-
排口编码：
-
{{ allData.dataList.pointNumber }}
-
所在道路：
-
{{ allData.dataList.roadName }}
-
- -
-
管点材质：
-
{{ allData.dataList.pointTexture }}
-
地面高程：
-
{{ allData.dataList.groundElevation }}m
-
-
-
井底深度：
-
{{ allData.dataList.bottomBuriedDepth }}
-
普查单位：
-
{{ allData.dataList.operationalUnits }}
-
-
-
-
-
-
-
内涝地址：
-
{{ allData.dataList.address }}
-
行政辖区：
-
{{ allData.dataList.jurisdiction }}
+
+
+
+
+ +
+ 搜索
-
-
所属街道：
-
{{ allData.dataList.belongsStreet }}
-
风险级别：
-
{{ allData.dataList.riskLevel }}
-
-
-
内涝原因：
-
{{ allData.dataList.originTypeName }}
-
积水次数 ：
-
{{ allData.dataList.yearHappenCount }}次
-
-
-
最大深度：
-
{{ allData.dataList.yearMaxDepth }}mm
-
退水时长 ：
-
{{ allData.dataList.yearMaxHour }}h
-
+
@@ -204,6 +167,32 @@ }); } +// 积水点 +let chartJSD = null; +function changeDateJSD() { + setTimeout(() => { + if (!!chartJSD) chartJSD.dispose(); + chartJSD = echarts.init(document.getElementById('chartHistoryJSD')); + chartOption.popupRainTrend.legend.data = ['水深']; + chartOption.popupRainTrend.yAxis.name = 'm'; + chartOption.popupRainTrend.xAxis.data = ['2024-07-12 12:30:20', '2024-07-12 13:30:20', '2024-07-12 14:30:20', '2024-07-12 15:30:20']; + chartOption.popupRainTrend.xAxis.boundaryGap = true; + chartOption.popupRainTrend.series.name = '水深'; + chartOption.popupRainTrend.series.barWidth = 10; + chartOption.popupRainTrend.series.data = [0.23, 0.3, 0.25, 0.18]; + // 设置鼠标滚轮放大缩小展示数据区间 + // chartOption.popupRainTrend.dataZoom = [{ type: 'inside', startValue: propertyMonitorXList.value[propertyMonitorXList.value.length / 2] }]; + // if (propertyMonitorXList.value.length > 0) { + // chartOption.popupRainTrend.graphic.invisible = true; //暂无数据 + // } else { + // chartOption.popupRainTrend.graphic.invisible = false; //暂无数据 + // } + chartOption.popupRainTrend.graphic.invisible = true; //暂无数据 + chartJSD.clear(); + chartJSD.setOption(chartOption.popupRainTrend); + }); +} + // 雨量站弹窗内容 const changeDate = () => { getSuperViseData(); @@ -363,6 +352,7 @@ allData.popupShow = true; if (allData.dataList.siteType == 'rain') changeDate(); //雨量站曲线图 if (allData.dataList.type == 'waterCourse') changeDateSW(); //河道水位计 + if (allData.dataList.type == 'waterLoging') changeDateJSD(); //内涝积水点 }); }); onBeforeUnmount(() => { @@ -385,7 +375,8 @@ background: #003b6d; border: 1px solid #6acefe; #chartPopupRainC, - #chartHistoryZM { + #chartHistoryZM, + #chartHistoryJSD { width: 400px; height: 200px; margin-top: 10px;