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