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] = [];