Browse Source

2023-03-14 fix

1. fix pv && wswind -> pv || wswind
moccus 1 year ago
parent
commit
7bbf7ebe2c
1 changed files with 5 additions and 2 deletions
  1. 5 2
      src/components/control/controlAllArea.vue

+ 5 - 2
src/components/control/controlAllArea.vue

@@ -853,8 +853,11 @@ export default {
         let wswind = JSON.parse(window.sessionStorage.getItem('windSbq'))
         let pv = JSON.parse(window.sessionStorage.getItem('pvSbq'))
         let msg = {}
-        if (wswind && pv) {
-            msg = {...wswind, ...pv}
+        if (wswind || pv) {
+            msg = {...wswind}
+            if(pv){
+              msg = {...msg, ...pv}
+            }
             this.windturbinelist = msg;
             this.$store.commit("windturbinelist", msg);
             this.dataList = [];