From 83e988aad14a296487e6550418c67e90c47ba33c Mon Sep 17 00:00:00 2001 From: hxh <762326930@qq.com> Date: Fri, 22 Mar 2024 13:57:57 +0800 Subject: [PATCH 1/3] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8D=E9=80=80=E5=87=BA?= =?UTF-8?q?=E8=B7=B3=E8=BD=AC=E5=9C=B0=E5=9D=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/layout/components/Navbar.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/layout/components/Navbar.vue b/src/layout/components/Navbar.vue index d71f8c5..750c495 100644 --- a/src/layout/components/Navbar.vue +++ b/src/layout/components/Navbar.vue @@ -149,7 +149,7 @@ export default { type: "warning", }).then(() => { this.$store.dispatch("LogOut").then(() => { - location.href = "/index"; + location.href = "/"; }); }); }, From 3cc7008f16d72db5053babb21bba9f5df5d0f562 Mon Sep 17 00:00:00 2001 From: yantingyu <1904823781@qq.com> Date: Fri, 22 Mar 2024 14:12:45 +0800 Subject: [PATCH 2/3] =?UTF-8?q?fix:=20=E3=80=90=E6=B0=B4=E9=97=B8=E3=80=81?= =?UTF-8?q?=E5=A0=A4=E9=98=B2-=E6=B0=B4=E9=9B=A8=E6=83=85=E6=99=BA?= =?UTF-8?q?=E8=83=BD=E5=88=86=E6=9E=90=E3=80=91=E6=8A=98=E7=BA=BF=E5=9B=BE?= =?UTF-8?q?=E6=98=BE=E7=A4=BA=E9=83=A8=E5=88=86=EF=BC=8C=E9=BC=A0=E6=A0=87?= =?UTF-8?q?=E7=A7=BB=E5=85=A5=E5=90=8E=E5=87=BA=E7=8E=B0=E7=82=B9=E4=BD=8D?= =?UTF-8?q?=E5=81=8F=E7=A7=BB?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../waterRainReport/smartAnalyse/index.vue | 32 ++++++++++++--- .../waterRainReport/smartAnalyse/index.vue | 39 +++++++++++++++---- 2 files changed, 58 insertions(+), 13 deletions(-) diff --git a/src/views/dike/runManage/waterRainReport/smartAnalyse/index.vue b/src/views/dike/runManage/waterRainReport/smartAnalyse/index.vue index b889514..f4982b2 100644 --- a/src/views/dike/runManage/waterRainReport/smartAnalyse/index.vue +++ b/src/views/dike/runManage/waterRainReport/smartAnalyse/index.vue @@ -76,8 +76,8 @@ {{ analysisData.exceedGateFlowCount }} -
-
+
+
@@ -114,7 +114,11 @@ export default { exceedWarningCount: 0, // 高于警戒水位次数 exceedRainfallCount: 0, // 降雨量超过50mm/h次数 exceedGateFlowCount: 0 // 当天总过闸流量高于100m³次数 - } + }, + currentDike: null, + zoom: 1, + levelChart:null, + flowChart:null }; }, @@ -163,6 +167,7 @@ export default { }, // 选择一个堤坝数据行 handleRowChange(row) { + this.currentDike = row; getDikeExceedApi(row.dikeCode).then((res) => { if (!res.success) return; const data = res.data; @@ -176,7 +181,9 @@ export default { getRainfallAndGateFlowApi(row.dikeCode).then((res) => { if (!res.success) return; const data = res.data.rainfallAndGateFlowMap; //{2024-03-04:{rainfall: '0.0', gateFlow: '0.0'}......} - this.$echarts.init(this.$refs['water-flow']).setOption({ + if(this.flowChart) this.flowChart.dispose(); + this.flowChart = this.$echarts.init(document.getElementById('water-flow')) + this.flowChart.setOption({ title: { text: '流量监测', textStyle: { @@ -255,12 +262,17 @@ export default { } ] }); + this.$nextTick(() => { + this.flowChart.resize(); + }); }); getWaterLevelInfoApi(row.dikeCode).then((res) => { if (!res.success) return; let data = res.data.waterLevelMap; // {2024-03-04:{waterLevel: '0.0', floodLevel: '12', warningLevel: '38'}.....} - this.$echarts.init(this.$refs['water-level']).setOption({ + if(this.levelChart) this.levelChart.dispose(); + this.levelChart = this.$echarts.init(document.getElementById('water-level')) + this.levelChart.setOption({ title: { text: '水位监测', textStyle: { @@ -333,14 +345,24 @@ export default { } ] }); + this.$nextTick(() => { + this.levelChart.resize(); + }); }); } }, async mounted() { + this.zoom = 1 / document.body.style.zoom; await this.getDikeStatisticalList(); this.getAreasOptions(); this.$refs.table.setCurrentRow(this.tableData[0]); //隐式触发了handleRowChange + + window.onresize = ()=> { + this.zoom = 1 / document.body.style.zoom; + this.handleRowChange(this.currentDike) + }; + } }; diff --git a/src/views/sluice/runManage/waterRainReport/smartAnalyse/index.vue b/src/views/sluice/runManage/waterRainReport/smartAnalyse/index.vue index 6da8619..114f2cc 100644 --- a/src/views/sluice/runManage/waterRainReport/smartAnalyse/index.vue +++ b/src/views/sluice/runManage/waterRainReport/smartAnalyse/index.vue @@ -76,8 +76,8 @@ {{ analysisData.exceedGateFlowCount }} -
-
+
+
@@ -114,7 +114,11 @@ export default { exceedWarningCount: 0, // 高于警戒水位次数 exceedRainfallCount: 0, // 降雨量超过50mm/h次数 exceedGateFlowCount: 0 // 当天总过闸流量高于100m³次数 - } + }, + currentSluice:null, //当前水闸 + zoom: 1, + flowChart: null, + levelChart: null, }; }, @@ -126,7 +130,7 @@ export default { pageNum: this.pageConfig.pageNum, data: { basin: this.basin, - adcd: this.region //区域筛选 + adcd: this.region, //区域筛选 } }; const res = await getSluiceStatisticalListApi(params); @@ -163,6 +167,7 @@ export default { }, // 选择一个水闸数据行 handleRowChange(row) { + this.currentSluice = row; getSluiceExceedApi(row.wagaCode).then((res) => { if (!res.success) return; const data = res.data; @@ -176,7 +181,9 @@ export default { getRainfallAndGateFlowApi(row.wagaCode).then((res) => { if (!res.success) return; const data = res.data.rainfallAndGateFlowMap; //{2024-03-04:{rainfall: '0.0', gateFlow: '0.0'}......} - this.$echarts.init(this.$refs['water-flow']).setOption({ + if(this.flowChart) this.flowChart.dispose(); + this.flowChart = this.$echarts.init(document.getElementById('water-flow')); + this.flowChart.setOption({ title: { text: '流量监测', textStyle: { @@ -186,7 +193,8 @@ export default { } }, tooltip: { - trigger: 'axis' + trigger: 'axis', + // show:false }, legend: { right: 'center', @@ -255,12 +263,17 @@ export default { } ] }); + this.$nextTick(() => { + this.flowChart.resize(); + }); }); getWaterLevelInfoApi(row.wagaCode).then((res) => { if (!res.success) return; let data = res.data.waterLevelMap; // {2024-03-04:{waterLevel: '0.0', floodLevel: '12', warningLevel: '38'}.....} - this.$echarts.init(this.$refs['water-level']).setOption({ + if(this.levelChart) this.flowChart.dispose(); + this.levelChart = this.$echarts.init(document.getElementById('water-level')); + this.levelChart.setOption({ title: { text: '水位监测', textStyle: { @@ -270,7 +283,8 @@ export default { } }, tooltip: { - trigger: 'axis' + trigger: 'axis', + // show:false }, legend: { right: 'center', @@ -333,14 +347,23 @@ export default { } ] }); + this.$nextTick(() => { + this.levelChart.resize(); + }); }); } }, async mounted() { + this.zoom = 1 / document.body.style.zoom; await this.getSluiceStatisticalList(); this.getAreasOptions(); this.$refs.table.setCurrentRow(this.tableData[0]); //隐式触发了handleRowChange + + window.onresize = ()=> { + this.zoom = 1 / document.body.style.zoom; + this.handleRowChange(this.currentSluice) + }; } }; From ef12c24bd1138d90af360cf23b3e9f46d0e684c2 Mon Sep 17 00:00:00 2001 From: panyuyi Date: Fri, 22 Mar 2024 17:25:19 +0800 Subject: [PATCH 3/3] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8D=E7=9B=91=E7=9D=A3?= =?UTF-8?q?=E6=A3=80=E6=9F=A5=E5=92=8C=E7=97=85=E9=99=A9bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api/dike/index.js | 3 +-- .../dangerWeakProject/inspectProjects/fillReport.vue | 3 +-- .../dangerWeakProject/inspectReport/reportPage.vue | 6 +++--- .../runManage/superVisionInspetion/projectManage/index.vue | 7 ------- .../projectManage/projectReportPage.vue | 2 +- .../runManage/supervisionInspetion/projectManage/index.vue | 7 ------- .../projectManage/projectReportPage.vue | 2 +- .../dangerWeakProject/inspectProjects/fillReport.vue | 1 - .../dangerWeakProject/inspectReport/reportPage.vue | 2 +- .../projectManage/projectReportPage.vue | 2 +- 10 files changed, 9 insertions(+), 26 deletions(-) diff --git a/src/api/dike/index.js b/src/api/dike/index.js index 2d7b014..657cf8b 100644 --- a/src/api/dike/index.js +++ b/src/api/dike/index.js @@ -395,11 +395,10 @@ export function getSuperviseStatisticTotal(data){ data }) } - - /*************监督检查模块-结束**************/ + /*********************病险工程核查*********************/ // 病险工程核查-新增工程核查项 diff --git a/src/views/dike/runManage/dangerWeakProject/inspectProjects/fillReport.vue b/src/views/dike/runManage/dangerWeakProject/inspectProjects/fillReport.vue index e83e6a9..96e271b 100644 --- a/src/views/dike/runManage/dangerWeakProject/inspectProjects/fillReport.vue +++ b/src/views/dike/runManage/dangerWeakProject/inspectProjects/fillReport.vue @@ -1,4 +1,4 @@ - +