Merge branch 'release-sy-v1.0.0' into 'dev'

fix: 修复报错问题

See merge request project/water/shuili-vue!173

src/views/reservoir/safeOperation/components/BaseInfo.vue

@@ -585,6 +585,15 @@ export default {
       ],
     };
   },
+  watch: {
+    resCode: {
+      handler(val) {
+        console.log("resCode-watch >>>>>  ", val);
+        this.initData();
+      },
+      immediate: true,
+    },
+  },
   created() {
     console.log("baseInfo-page created");
     this.initData();

src/views/reservoir/safeOperation/components/EngineSafe.vue

@@ -91,7 +91,7 @@ export default {
   },
   data() {
     return {
-      dateRange: null,
+      dateRange: "0",
       filterText: "",
       currentNode: null,
       myChart: null,
@@ -103,14 +103,21 @@ export default {
         value: "key",
       },
       paramsData: {
-        startTime: "",
-        endTime: "",
+        startTime: dayjs().subtract(1, "month").format("YYYY-MM-DD HH:mm:ss"),
+        endTime: dayjs().format("YYYY-MM-DD HH:mm:ss"),
       },
     };
   },
   created() {},
   mounted() {},
   watch: {
+    resCode: {
+      handler(val) {
+        console.log("resCode-watch >>>>>  ", val);
+        // this.getTableData();
+      },
+      immediate: true,
+    },
     filterText(val) {
       this.$refs.tree.filter(val);
     },
@@ -226,7 +233,7 @@ export default {
         return;
       }
       getReservoirCZEchartsData({
-        elementType: "WATER_LEVEL",
+        elementType: this.currentNode.mpType,
         stcd: this.currentNode.stcd,
         resCode: this.resCode,
         startTime: this.paramsData.startTime,
@@ -245,6 +252,7 @@ export default {
       this.getTableData();
     },
     handleClickTreeNode(data, node) {
+      console.log("data >>>>>  ", data);
       if (node.isLeaf && data.value) {
         this.currentNode = data;
         this.getTableData();

src/views/reservoir/safeOperation/components/EnvirQuality.vue

@@ -133,13 +133,24 @@ export default {
   mounted() {
     this.initData();
   },
+  watch: {
+    resCode: {
+      handler(val) {
+        console.log("resCode-watch >>>>>  ", val);
+        this.initData();
+      },
+      immediate: true,
+    },
+  },
   methods: {
     initData() {
       getReservoirFlagCZData(this.resCode).then((res) => {
-        getReservoirCZDetailData(res.data.stcd).then((res2) => {
-          this.czInfo = res2.data;
-          this.getTableData();
-        });
+        if (res.data?.stcd) {
+          getReservoirCZDetailData(res.data.stcd).then((res2) => {
+            this.czInfo = res2.data;
+            this.getTableData();
+          });
+        }
       });
     },
     getTableData() {

src/views/reservoir/safeOperation/components/MonitorWarning.vue

@@ -119,6 +119,15 @@ export default {
       tableData: [],
     };
   },
+  watch: {
+    resCode: {
+      handler(val) {
+        console.log("resCode-watch >>>>>  ", val);
+        this.getTableData();
+      },
+      immediate: true,
+    },
+  },
   created() {
     this.getTableData();
   },

src/views/reservoir/safeOperation/components/ProjectDetail.vue

@@ -51,7 +51,18 @@ export default {
       activeTab: "1",
     };
   },
-  created() {},
+  // watch: {
+  //   resCode: {
+  //     handler(val) {
+  //       console.log("resCode-watch >>>>>  ", val);
+  //       this.initData();
+  //     },
+  //     immediate: true,
+  //   },
+  // },
+  created() {
+    console.warn("created ???????? ");
+  },
   methods: {
     handleGetResInfo(data) {
       this.$emit("getResInfo", data);

src/views/reservoir/safeOperation/components/WaterRain.vue

@@ -127,6 +127,15 @@ export default {
       detailData: null,
     };
   },
+  watch: {
+    resCode: {
+      handler(val) {
+        console.log("resCode-watch >>>>>  ", val);
+        this.initData();
+      },
+      immediate: true,
+    },
+  },
   created() {},
   mounted() {
     this.initData();
@@ -134,11 +143,13 @@ export default {
   methods: {
     initData() {
       getReservoirFlagCZData(this.resCode).then((res) => {
-        getReservoirCZDetailData(res.data.stcd).then((res2) => {
-          console.log("res2 >>>>>  ", res2);
-          this.czInfo = res2.data;
-          this.getTableData();
-        });
+        if (res.data?.stcd) {
+          getReservoirCZDetailData(res.data.stcd).then((res2) => {
+            console.log("res2 >>>>>  ", res2);
+            this.czInfo = res2.data;
+            this.getTableData();
+          });
+        }
       });
     },
     getTableData() {

src/views/reservoir/safeOperation/index.vue

@@ -71,11 +71,9 @@
 
     <!-- 弹窗 -->
     <el-dialog
-      :title="
-        `${resInfoData && resInfoData.resName}(${
-          resInfoData && resInfoData.resCode
-        })` || '弹窗'
-      "
+      :title="`${(resInfoData && resInfoData.resName) || '未知'}(${
+        (resInfoData && resInfoData.resCode) || '??'
+      })`"
       :visible.sync="showDialog"
       :destroy-on-close="true"
       width="1080px"
@@ -268,16 +266,13 @@ export default {
     },
 
     openDialog(e) {
-      console.log("openDialog >>>>>  ", e);
+      console.log("打开弹窗获取resCode >>>>>  ", e);
       let code = e;
-      devRun(() => {
-        code = "440111000034";
-      });
-      this.commonResCode = code;
+      // devRun(() => {
+      //   code = "440111000008";
+      // });
+      this.commonResCode = code.toString();
       this.showDialog = true;
-      this.$nextTick(() => {
-        // this.$refs.detailRef.initData(code);
-      });
     },
     // 点击
     handleClickTree(data, node) {

src/views/reservoir/safeOperation/js/initEcharts.js

@@ -1,6 +1,7 @@
 // 折线图
 export const initLineOptions = (data) => {
   const { markLine, xaxis, yaxis } = data
+  if(!xaxis || !yaxis || !yaxis.length) return {}
   let yAxis = yaxis.map(v => {
     return {
       type: 'value',
@@ -25,9 +26,7 @@ export const initLineOptions = (data) => {
   })
 
   if(markLine && markLine.length && series.length){
-    console.log('series >>>>>  ', series.find(v => v.yAxisIndex === 1))
     let seriesItem = series.find(v => v.yAxisIndex === 1) || series[0]
-    console.log('seriesItem >>>>>  ', seriesItem)
     let colors = ['#f8afaf', '#bae4dd']
     let markLineData = markLine.map((v,i) => {
       return {