Merge branch 'baiyanting1' of http://124.70.43.205:3000/xieshengjie/jn_sis_zhfx into new-power

src/views/stateMonitor/DetailMatrix/index.vue

@@ -739,15 +739,22 @@ export default {
           type: this.tabIndex.toString(),
         })
         .then((res) => {
+          this.BASE.closeLoading();
           if (Object.values(res.data.data).length) {
-            this.BASE.closeLoading();
             let sourceMap = res.data.data;
 
             this.sourceMap = sourceMap;
+            if (first) {
+              const tempWtArray = this.chunkArray(this.sourceMap.powerVos, 3);
+              this.showMatrixList = tempWtArray[0];
+              for (let i = 1; i < tempWtArray.length; i++) {
+                setTimeout(() => {
+                  this.showMatrixList.push(...tempWtArray[i]);
+                }, 5);
+              }
+            }
             if (this.fillFjzt != "all") {
               this.handleClick(this.fillFjzt);
-            } else {
-              this.showMatrixList = this.sourceMap.powerVos;
             }
           } else {
             this.sourceMap = {};
@@ -812,7 +819,6 @@ export default {
 
       //   console.log(11, tempWtArray);
       //   console.log(22, sourceMap);
-      this.loading = false;
       this.showMatrixList = JSON.parse(JSON.stringify(this.sourceMap.powerVos));
       let matrixList = this.sourceMap.powerVos;
       if (this.fillFjzt !== "all") {
@@ -1022,13 +1028,6 @@ export default {
       } else {
         this.showMatrixList = this.sourceMap.powerVos;
       }
-      //   const tempWtArray = this.chunkArray(this.showMatrixList, 3);
-      //   this.showMatrixList = tempWtArray[0];
-      //   for (let i = 1; i < tempWtArray.length; i++) {
-      //     setTimeout(() => {
-      //       this.showMatrixList.push(...tempWtArray[i]);
-      //     }, 5);
-      //   }
     },
 
     // 点击左侧数据弹出曲线