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

src/views/stateMonitor/DetailMatrix/index.vue

@@ -752,8 +752,7 @@ export default {
                   this.showMatrixList.push(...tempWtArray[i]);
                 }, 5);
               }
-            }
-            if (this.fillFjzt != "all") {
+            } else {
               this.handleClick(this.fillFjzt);
             }
           } else {
@@ -1021,9 +1020,9 @@ export default {
               });
             });
             break;
-          //   case "all":
-          //     this.showMatrixList = this.sourceMap.powerVos;
-          //     break;
+          case "all":
+            this.showMatrixList = this.sourceMap.powerVos;
+            break;
         }
       } else {
         this.showMatrixList = this.sourceMap.powerVos;