Browse Source

2023-03-14 fix

1. fix pv && wswind -> pv || wswind
moccus 1 year ago
parent
commit
0e94157f59
2 changed files with 96 additions and 887 deletions
  1. 91 885
      src/components/check/areaCard.vue
  2. 5 2
      src/components/control/controlAllArea.vue

File diff suppressed because it is too large
+ 91 - 885
src/components/check/areaCard.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 = [];