2023-03-14 fix

1. fix 矩阵不出来的问题

src/components/allMatrices.vue

@@ -729,8 +729,11 @@ export default {
         let wswind = JSON.parse(window.sessionStorage.getItem('wind'))
         let pv = JSON.parse(window.sessionStorage.getItem('pv'))
         let msg = {}
-        if (wswind && pv) {
-            msg = {...wswind, ...pv}
+        if (wswind || pv) {
+            msg = {...wswind}
+            if(pv) {
+              msg = {...msg, ...pv}
+            }
             let stationArr = [];
             for (const key in this.stationObj) {
                 this.stationObj[key] = [];
@@ -744,9 +747,9 @@ export default {
                 //风机
                 if (val.stationId) {
                     if (val.lockValue === 9) {
-                    val.lockValues = this.lockValues.filter(
-                        (item) => val.windturbineId === item.windturbineID
-                    )[0]?.value;
+                      val.lockValues = this.lockValues.filter(
+                          (item) => val.windturbineId === item.windturbineID
+                      )[0]?.value;
                     }
                     this.chooseList.forEach((item) => {
                         if (item.windturbineId === val.windturbineId) {
@@ -754,11 +757,11 @@ export default {
                         }
                     });
                     if (this.current === "all") {
-                    this.stationObj[val.stationId]?.push(val);
+                      this.stationObj[val.stationId]?.push(val);
                     } else {
-                    if (this.current === val.stationId) {
-                        this.stationObj[val.stationId]?.push(val);
-                    }
+                      if (this.current === val.stationId) {
+                          this.stationObj[val.stationId]?.push(val);
+                      }
                     }
                 }
                 // 光伏

src/components/stationSvgDetailPages.vue

@@ -21,7 +21,7 @@
             "
             @click="handleTypeChange(item)"
           >
-            {{ item.stationName ||  item.name }}
+            {{ item.name }}
           </div>
           <div
             v-else
@@ -34,46 +34,55 @@
             "
             @click="handleTypeChange(item)"
           >
-            {{ item.stationName ||  item.name  }}
+            {{ item.name }}
           </div>
         </div>
       </div>
     </template>
     <div>
-      <Cl
-        ref="svgRef"
-        v-if="currentStation == 'CL_FDC' || currentStation == 'CL_SYZ'"
-      />
-      <KB
-        ref="svgRef"
-        v-if="currentStation == 'KB_FDC' || currentStation == 'KB_SYZ'"
-      />
-      <DX
-        ref="svgRef"
-        v-if="currentStation == 'DX_FDC' || currentStation == 'DX_SYZ'"
-      />
-      <SY
-        ref="svgRef"
-        v-if="currentStation == 'SY_FDC' || currentStation == 'SY_SYZ'"
-      />
+      <nss ref="svgRef" v-if="currentStation=='NSS_FDC'||currentStation=='NSS_SYZ'" />
+			<mhs ref="svgRef" v-if="currentStation=='MHS_FDC'||currentStation=='MHS_SYZ'" />
+			<qs ref="svgRef" v-if="currentStation=='QS_FDC'||currentStation=='QS_SYZ'" />
+			<sbq ref="svgRef" v-if="currentStation=='SBQ_FDC'||currentStation=='SBQ_SYZ'" />
+			<xs ref="svgRef" v-if="currentStation=='XS_FDC'||currentStation=='XS_SYZ'" />
+			<pl1 ref="svgRef" v-if="currentStation=='PL1_GDC'||currentStation=='PL_SYZ'" />
+			<pl2 ref="svgRef" v-if="currentStation=='PL2_GDC'||currentStation=='PL2_SYZ'" />
+			<dwk ref="svgRef" v-if="currentStation=='DWK_GDC'||currentStation=='DWK_SYZ'" />
+			<mch ref="svgRef" v-if="currentStation=='MCH_GDC'||currentStation=='MCH_SYZ'" />
+			<xh ref="svgRef" v-if="currentStation=='XH_GDC'||currentStation=='XH_SYZ'" />
+			<sbdl ref="svgRef" v-if="currentStation=='QS3_FDC'||currentStation=='QS3_SYZ'" />
     </div>
   </el-dialog>
 </template>
 
 <script>
-import Cl from "./BoosterStation/cl.vue";
-import KB from "./BoosterStation/kb.vue";
-import DX from "./BoosterStation/dx.vue";
-import SY from "./BoosterStation/sy.vue";
+	import Dwk from "./BoosterStation/dwk.vue";
+	import Sbdl from "./BoosterStation/sbdl.vue";
+	import Nss from "./BoosterStation/nss.vue";
+	import Mhs from "./BoosterStation/mhs.vue";
+	import Qs from "./BoosterStation/qs.vue";
+	import Pl1 from "./BoosterStation/pl1.vue";
+	import Pl2 from "./BoosterStation/pl2.vue";
+	import Mch from "./BoosterStation/mch.vue";
+	import Xs from "./BoosterStation/xs.vue";
+	import Xh from "./BoosterStation/xh.vue";
+	import Sbq from "./BoosterStation/sbq.vue";
 export default {
   components: {
-    Cl,
-    KB,
-    DX,
-    SY,
+    Dwk,
+			Sbdl,
+			Nss,
+			Mhs,
+			Qs,
+			Pl1,
+			Pl2,
+			Mch,
+			Xs,
+			Xh,
+			Sbq
   },
   props: {
-    svgWeb: {
+    currentStation: {
       type: String,
       default: "",
     },
@@ -82,7 +91,7 @@ export default {
     return {
       BasicInfo: {},
       line: "",
-      currentStation: "",
+      // currentStation: "",
       alarmTime: "",
       alarmContent: "",
       alarms: [],
@@ -103,10 +112,10 @@ export default {
       //clearInterval(this.refreshTimer);
     },
     opened() {
-      this.currentStation = this.svgWeb?this.svgWeb:this.$store.state.stationList[0].id;
+      // this.currentStation = this.currentStation?this.currentStation:this.$store.state.stationList[0].id;
       this.stationList = this.$store.state.stationList;
 	  this.$nextTick(() => {
-           this.$refs.svgRef.opened();
+          //  this.$refs.svgRef.opened();
         });
     },
     dbClicks(value) {