修改接口异常

src/views/dashboard/components/scadadata/waterLine.vue

@@ -72,6 +72,7 @@ export default {
      * @description 绘制图形
      */
     drawChart(chartData) {
+      console.log('数据结果',chartData)
       const chartReady = this.$echarts.init(this.$refs.chart)
       const options = {
         title: {

src/views/mixins/comMixins.js

@@ -84,10 +84,13 @@ export default {
     getDiffMonth(diffMonth) {
       let result = ''
       const datenow = new Date()
+      const now = new Date()
       // const dateend = [datenow.getFullYear(), (datenow.getMonth() + 1), datenow.getDate()].join('-')
-      datenow.setMonth(datenow.getMonth() - diffMonth)
+      const diff = now.getMonth() - diffMonth
+      datenow.setMonth(diff,1)
       const dyear = datenow.getFullYear()
-      let dmonth = datenow.getMonth() + 1
+      const month = datenow.getMonth()
+      let dmonth = month + 1
       dmonth = dmonth < 10 ? '0' + dmonth : dmonth+''
       // const dday = datenow.getDate()
       // const datestart = dyear + '-' + dmonth + '-' + dday
@@ -96,7 +99,6 @@ export default {
       // result += dateend
       const datestart = dyear + '-' + dmonth
       result += datestart
-      console.log(datestart)
       return result
     },
 

src/views/scadaCraftMap/index.vue

@@ -525,7 +525,7 @@ export default {
       const data = { type: 1 };
       let res = await this.getScadaData(data);
       try {
-        if (res && res.code == 1) {
+        if (res && res.hasOwnProperty('code') && res.code == 1) {
           var scada = (this.scada = {});
           res.result.map((e) => {
             if (e.allocations) {
@@ -536,8 +536,8 @@ export default {
           });
           this.setSide();
         } else {
-          this.$message.error("获取指标失败：" + res.message);
-          console.log("获取指标失败：" + res.message);
+          // this.$message.error("获取指标失败：" + res.message);
+          // console.log("获取指标失败：" + res.message);
           //this.loading = false;
         }
         //获取报警数据
@@ -568,7 +568,7 @@ export default {
 
       getScadaAlarmDataPage(params)
         .then((res) => {
-          if (res.code == 1) {
+          if (res && res.hasOwnProperty('code') && res.code == 1) {
             let result = res.result.records;
             result.forEach((item) => {
               let scadaTime =
@@ -581,7 +581,9 @@ export default {
             this.isOpenAlarmList = this.tableData.length > 0 ? true : false;
           }
         })
-        .catch((ex) => {});
+        .catch((ex) => {
+          
+        });
     },
 
     setSide() {
@@ -623,7 +625,7 @@ export default {
               type: 1,
             },
           }).then((res) => {
-            if (res.code == 1) {
+            if (res && res.hasOwnProperty('code') && res.code == 1) {
               res = res.result;
               for (var item in res) {
                 var di = res[item];
@@ -651,10 +653,16 @@ export default {
                   }
                 }
               }
-              this.nextDo = setTimeout(loadInfo, 1000 * 10); //1分钟一次
+              this.nextDo = setTimeout(loadInfo, 1000 * 10); //10秒一次
               this.setAlarm(res, infos);
-            } else this.$message.error("获取指标失败：" + res.message);
+            } else{
+              // this.$message.error("获取指标失败：" + res.message);
+              this.nextDo = setTimeout(loadInfo, 1000 * 10); //10秒一次
+            }
             //this.loading = false;
+          }).catch(ex=>{
+            this.$message.error("连接异常:" + ex);
+            this.nextDo = setTimeout(loadInfo, 1000 * 10); //10秒一次
           });
           this.getAlarmData();
         };
@@ -667,7 +675,7 @@ export default {
       return new Promise((resolve) => {
         getScadaData(data)
           .then((res) => {
-            if (res.code == 1) {
+            if (res && res.hasOwnProperty('code') && res.code == 1) {
               res.result;
               resolve({
                 code: 1,
@@ -678,7 +686,7 @@ export default {
               resolve({
                 code: 0,
                 result: [],
-                message: res.message,
+                message: '获取数据异常:'+res,
               });
           })
           .catch((ex) => {