Merge branch 'master' of http://124.70.43.205:3000/xieshengjie/jn_sis_zhfx

src/components/coms/btn/btn-group-double.vue

@@ -3,34 +3,90 @@
     <div class="select">
       <div class="lable">公司：</div>
       <div class="search-input">
-        <el-select v-model="selectValue" @change="handleChange(selectValue)" placeholder="请选择" popper-class="select">
-          <el-option v-for="item in gsGroups" :key="item.id" :value="item.id" :label="item.name">
+        <el-select
+          v-model="selectVal"
+          @change="handleChange(selectValue)"
+          placeholder="请选择"
+          popper-class="select"
+        >
+          <el-option
+            v-for="item in gsGroups"
+            :key="item.id"
+            :value="item.id"
+            :label="item.name"
+          >
           </el-option>
         </el-select>
       </div>
       <div class="model-switch" v-if="showFlag">
-        <div class="model-item" :class="{ active: !switchFlag }" @click="handleClick('风场')">风场</div>
-        <div class="model-item" :class="{ active: switchFlag }" @click="handleClick('光伏')">光伏</div>
+        <div
+          class="model-item"
+          :class="{ active: !switchFlag }"
+          @click="handleClick('风场')"
+        >
+          风场
+        </div>
+        <div
+          class="model-item"
+          :class="{ active: switchFlag }"
+          @click="handleClick('光伏')"
+        >
+          光伏
+        </div>
       </div>
-      <div class="btn-group-with-icon-list" v-if="!switchFlag && btnGroups[0].icon">
-        <i v-if="btnGroups[0].icon != '' && btnGroups[0].icon.indexOf('fa fa') >= 0" :class="btnGroups[0].icon"></i>
-        <span v-if="btnGroups[0].icon != '' && btnGroups[0].icon.indexOf('svg-') >= 0"
-          class="svg-icon svg-icon-gray svg-icon-md">
+      <div
+        class="btn-group-with-icon-list"
+        v-if="!switchFlag && btnGroups[0].icon"
+      >
+        <i
+          v-if="
+            btnGroups[0].icon != '' && btnGroups[0].icon.indexOf('fa fa') >= 0
+          "
+          :class="btnGroups[0].icon"
+        ></i>
+        <span
+          v-if="
+            btnGroups[0].icon != '' && btnGroups[0].icon.indexOf('svg-') >= 0
+          "
+          class="svg-icon svg-icon-gray svg-icon-md"
+        >
           <SvgIcon :svgid="btnGroups[0].icon"></SvgIcon>
         </span>
-        <a href="javascript:;" v-for="(btn, index) of btnGroups[0].btns" :key="btn" @click="click(0, index)"
-          :class="{ active: activeIndex == index && activeRow == 0 }">
+        <a
+          href="javascript:;"
+          v-for="(btn, index) of btnGroups[0].btns"
+          :key="btn"
+          @click="click(0, index)"
+          :class="{ active: activeIndex == index && activeRow == 0 }"
+        >
           {{ btn.text }}
         </a>
       </div>
-      <div class="btn-group-with-icon-list" v-if="switchFlag && btnGroups[1].icon">
-        <i v-if="btnGroups[1].icon != '' && btnGroups[1].icon.indexOf('fa fa') >= 0" :class="btnGroups[1].icon"></i>
-        <span v-if="btnGroups[1].icon != '' && btnGroups[1].icon.indexOf('svg-') >= 0"
-          class="svg-icon svg-icon-gray svg-icon-md">
+      <div
+        class="btn-group-with-icon-list"
+        v-if="switchFlag && btnGroups[1].icon"
+      >
+        <i
+          v-if="
+            btnGroups[1].icon != '' && btnGroups[1].icon.indexOf('fa fa') >= 0
+          "
+          :class="btnGroups[1].icon"
+        ></i>
+        <span
+          v-if="
+            btnGroups[1].icon != '' && btnGroups[1].icon.indexOf('svg-') >= 0
+          "
+          class="svg-icon svg-icon-gray svg-icon-md"
+        >
           <SvgIcon :svgid="btnGroups[1].icon"></SvgIcon>
         </span>
-        <a href="javascript:;" v-for="(btn, index) of btnGroups[1].btns" :key="btn" @click="click(1, index)"
-          :class="{ active: activeIndex == index && activeRow == 1 }">
+        <a
+          href="javascript:;"
+          v-for="(btn, index) of btnGroups[1].btns"
+          :key="btn"
+          @click="click(1, index)"
+          :class="{ active: activeIndex == index && activeRow == 1 }"
+        >
           {{ btn.text }}
         </a>
       </div>
@@ -54,7 +110,7 @@ export default {
     gsGroups: Array,
     wpId: {
       type: String,
-      default: '',
+      default: "",
     },
     // 默认选择第几组
     rowIndex: {
@@ -85,6 +141,7 @@ export default {
       activeRow: 0,
       activeIndex: 0,
       switchFlag: false,
+      selectVal: "",
     };
   },
   // 函数
@@ -95,11 +152,11 @@ export default {
       this.$emit("select", this.btnGroups[i].btns[index]);
     },
     handleChange(val) {
-      this.$emit('selectChange', val);
+      this.$emit("selectChange", val);
     },
     handleClick(data) {
-      this.$emit('GfFdChange', data);
-      this.switchFlag = !this.switchFlag
+      this.$emit("GfFdChange", data);
+      this.switchFlag = !this.switchFlag;
     },
   },
   // 生命周期钩子
@@ -114,12 +171,13 @@ export default {
   },
   mounted() {
     // 渲染后
+    this.selectVal = this.selectValue;
     this.activeRow = this.rowIndex;
     this.activeIndex = this.index;
-    if (this.wpId.includes('GDC')) {
-      this.switchFlag = true
-    } else if(this.wpId.includes('FDC')) {
-      this.switchFlag = false
+    if (this.wpId.includes("GDC")) {
+      this.switchFlag = true;
+    } else if (this.wpId.includes("FDC")) {
+      this.switchFlag = false;
     }
   },
   beforeUpdate() {

src/store/index.js

@@ -11,7 +11,7 @@ const state = {
   themeName: localStorage.getItem("themeName") || "dark", // 主题
   menuData: [],
   windturbineMap: {},
-  moudleName: "",
+  moudleName: localStorage.getItem("ModuleName")||'',
 };
 
 //改变状态的方法`
@@ -44,7 +44,8 @@ const actions = {
     context.commit("changeMenuData", str);
   },
   changeModuleName(context, str) {
-    context.commit("changeModuleName", str);
+      context.commit("changeModuleName", str);
+       localStorage.setItem("ModuleName", str);
   },
 };
 

src/views/WindSite/WindSite.vue

@@ -38,6 +38,7 @@
 
 <script>
 import SvgIcon from "@com/coms/icon/svg-icon.vue";
+import store from "@store/index.js";
 export default {
   // 名称
   name: "WindSite",
@@ -128,6 +129,7 @@ export default {
       ],
     };
   },
+  computed: {},
   // 函数
   methods: {
     clickMenu: function (index) {
@@ -137,7 +139,16 @@ export default {
   },
 
   created() {
-    this.menuDatas.forEach((ele) => {
+    let currentPath = this.$route.path.split("/");
+    this.menuDatas.forEach((ele, index) => {
+      if (this.$store.state.moudleName == "") {
+        if (ele.path.split("/")[3] == currentPath[3]) {
+          this.$store.dispatch("changeModuleName", ele.text);
+        }
+      }
+      if (ele.text == this.$store.state.moudleName) {
+        this.activeIndex = index;
+      }
       ele.path = ele.path + "/" + this.$route.params.wpId;
     });
   },

src/views/WindSite/pages/Matrix.vue

@@ -598,13 +598,21 @@ export default {
               });
             });
             this.options = arrList;
-            if (this.selectValue === "") {
-              this.selectValue = arrList[0].label || "";
-              this.showList = allData[arrList[0].label] || [];
-            } else {
-              this.showList = allData[this.selectValue] || [];
-            }
+            // if (this.selectValue === "") {
+            this.selectValue = arrList[0].label || "";
+            this.showList = allData[arrList[0].label] || [];
+            // }
+            // else {
+            //   this.showList = allData[this.selectValue] || [];
+            // }
             this.allData = allData;
+          } else if (res.code == 500) {
+            this.jzMap = [];
+            this.fczbmaps = [];
+            this.options = [];
+            this.selectValue = "";
+            this.showList = [];
+            this.allData = {};
           }
         });
     },
@@ -714,6 +722,7 @@ export default {
         } else {
           that.requestData();
         }
+        that.getGS();
       }, that.$store.state.websocketTimeSec);
     });
   },
@@ -733,7 +742,8 @@ export default {
       } else {
         this.requestData();
       }
-      this.renderBtnActiveIndex();
+      this.getGS();
+      //   this.renderBtnActiveIndex();
     },
   },
 };