Merge branch 'release-sy-v1.0.0' of ssh://gitlab.datameta.com:2224/project/water/shuili-vue into release-sy-v1.0.0

1 year ago · f6ea1ceb30
13 changed files with 68 additions and 40 deletions
--- a/src/api/dike/index.js
+++ b/src/api/dike/index.js
@ -404,11 +404,10 @@ export function getSuperviseStatisticTotal(data){
    data
  })
 }
-
-
 /*************监督检查模块-结束**************/


+
 /*********************病险工程核查*********************/

 // 病险工程核查-新增工程核查项
--- 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 = "/";
        });
      });
    },
--- a/src/views/dike/runManage/dangerWeakProject/inspectProjects/fillReport.vue
+++ b/src/views/dike/runManage/dangerWeakProject/inspectProjects/fillReport.vue
@ -1,4 +1,4 @@
-<!-- 监督检查工程管理 -->
+<!-- 病险工程管理 -->
 <script>
 import { cloneDeep } from "lodash";
 import { uploadFileData } from "@/api/system/upload";
@ -14,7 +14,6 @@ export default {
      activeName: "",
      currentItem: null,
      problemList: [],
-      personnelList: [],
      formData: {
        id: null,
        problemList: [],
--- a/src/views/dike/runManage/dangerWeakProject/inspectReport/reportPage.vue
+++ b/src/views/dike/runManage/dangerWeakProject/inspectReport/reportPage.vue
@ -32,9 +32,9 @@
              </div>
            </div>
            <div class="flex flex-1">
-              <div class="label border-b-r p-10 w-100">水闸名称</div>
+              <div class="label border-b-r p-10 w-100">堤防名称</div>
              <div class="value border-b-r flex-1 p-10">
-                {{ formData.wagaName || "-" }}
+                {{ formData.dikeName || "-" }}
              </div>
            </div>
          </div>
@ -302,7 +302,7 @@ export default {
              }
            }
          }
-          let save = pdf.save("demo.pdf");
+          let save = pdf.save("核查报告.pdf");
          this.loadingInstance.close();
        })
        .catch((e) => {
--- a/src/views/dike/runManage/superVisionInspetion/projectManage/index.vue
+++ b/src/views/dike/runManage/superVisionInspetion/projectManage/index.vue
@ -87,16 +87,9 @@ export default {
    getTableData() {
      getSuperviseWayTaskListData({
        data: {
-          timeView: {
-            timeField: "create_time",
-          },
          name: this.searchTaskName || null,
          engineeringManagementUnit: this.searchManageName || null,
        },
-        params: {
-          orderBy: "create_time",
-          sort: "desc",
-        },
        pageSize: this.pageData.pageSize,
        pageNum: this.pageData.pageNum,
      }).then((res) => {
--- a/src/views/dike/runManage/superVisionInspetion/projectManage/projectReportPage.vue
+++ b/src/views/dike/runManage/superVisionInspetion/projectManage/projectReportPage.vue
@ -323,7 +323,7 @@ export default {
              }
            }
          }
-          let save = pdf.save("demo.pdf");
+          let save = pdf.save("检查报告.pdf");
          this.loadingInstance.close();
        })
        .catch((e) => {
--- a/src/views/dike/runManage/supervisionInspetion/projectManage/index.vue
+++ b/src/views/dike/runManage/supervisionInspetion/projectManage/index.vue
@ -87,16 +87,9 @@ export default {
    getTableData() {
      getSuperviseWayTaskListData({
        data: {
-          timeView: {
-            timeField: "create_time",
-          },
          name: this.searchTaskName || null,
          engineeringManagementUnit: this.searchManageName || null,
        },
-        params: {
-          orderBy: "create_time",
-          sort: "desc",
-        },
        pageSize: this.pageData.pageSize,
        pageNum: this.pageData.pageNum,
      }).then((res) => {
--- a/src/views/dike/runManage/supervisionInspetion/projectManage/projectReportPage.vue
+++ b/src/views/dike/runManage/supervisionInspetion/projectManage/projectReportPage.vue
@ -323,7 +323,7 @@ export default {
              }
            }
          }
-          let save = pdf.save("demo.pdf");
+          let save = pdf.save("检查报告.pdf");
          this.loadingInstance.close();
        })
        .catch((e) => {
--- a/src/views/dike/runManage/waterRainReport/smartAnalyse/index.vue
+++ b/src/views/dike/runManage/waterRainReport/smartAnalyse/index.vue
@ -76,8 +76,8 @@
              <span class="data">{{ analysisData.exceedGateFlowCount }}</span>
            </div>
          </div>
-          <div class="statistical-chart water-level" ref="water-level"></div>
-          <div class="statistical-chart water-flow" ref="water-flow"></div>
+          <div id="water-level" class="statistical-chart water-level" ref="water-level" :style="{'zoom': zoom}"></div>
+          <div id="water-flow" class="statistical-chart water-flow" ref="water-flow" :style="{'zoom': zoom}"></div>
        </div>
      </div>
    </div>
@ -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)
+    };
+  
  }
 };
 </script>
--- a/src/views/sluice/runManage/dangerWeakProject/inspectProjects/fillReport.vue
+++ b/src/views/sluice/runManage/dangerWeakProject/inspectProjects/fillReport.vue
@ -2,7 +2,6 @@
 <script>
 import { cloneDeep } from "lodash";
 import { uploadFileData } from "@/api/system/upload";
-import { listUser } from "@/api/management";
 import {
  getDangerProjectItemsListDetails,
  getDangerTaskReportDetailsData,
--- a/src/views/sluice/runManage/dangerWeakProject/inspectReport/reportPage.vue
+++ b/src/views/sluice/runManage/dangerWeakProject/inspectReport/reportPage.vue
@ -302,7 +302,7 @@ export default {
              }
            }
          }
-          let save = pdf.save("demo.pdf");
+          let save = pdf.save("核查报告.pdf");
          this.loadingInstance.close();
        })
        .catch((e) => {
--- a/src/views/sluice/runManage/supervisionInspetion/projectManage/projectReportPage.vue
+++ b/src/views/sluice/runManage/supervisionInspetion/projectManage/projectReportPage.vue
@ -324,7 +324,7 @@ export default {
              }
            }
          }
-          let save = pdf.save("demo.pdf");
+          let save = pdf.save("检查报告.pdf");
          this.loadingInstance.close();
        })
        .catch((e) => {
--- a/src/views/sluice/runManage/waterRainReport/smartAnalyse/index.vue
+++ b/src/views/sluice/runManage/waterRainReport/smartAnalyse/index.vue
@ -76,8 +76,8 @@
              <span class="data">{{ analysisData.exceedGateFlowCount }}</span>
            </div>
          </div>
-          <div class="statistical-chart water-level" ref="water-level"></div>
-          <div class="statistical-chart water-flow" ref="water-flow"></div>
+          <div id="water-level" class="statistical-chart water-level" ref="water-level" :style="{'zoom': zoom}"></div>
+          <div id="water-flow" class="statistical-chart water-flow" ref="water-flow" :style="{'zoom': zoom}"></div>
        </div>
      </div>
    </div>
@ -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)
+    };
  }
 };
 </script>