风电场站，光伏场站切换右侧菜单选择场站不变，样式bug更新

src/views/Home/Home.vue

@@ -923,7 +923,7 @@ export default {
   .model-bg {
     width: 100%;
     min-height: 135px;
-    background-color: rgba(3, 5, 9, 0.5);
+    // background-color: rgba(3, 5, 9, 0.5);
     border-radius: 6px;
     display: flex;
     flex-direction: column;

src/views/Home/components/map.vue

@@ -411,7 +411,7 @@
                     <el-col :span="7"><span>MW</span></el-col>
                   </el-row>
                 </div>
-                <div class="item">
+                <!-- <div class="item">
                   <el-row>
                     <el-col :span="8"><span>风机台数</span></el-col>
                     <el-col :span="9"
@@ -421,7 +421,7 @@
                     >
                     <el-col :span="7"><span>台</span></el-col>
                   </el-row>
-                </div>
+                </div> -->
               </div>
             </div>
             <div
@@ -2324,7 +2324,7 @@ p {
     .model-bg {
       width: 100%;
       min-height: 135px;
-      background-color: rgba(3, 5, 9, 0.5);
+    //   background-color: rgba(3, 5, 9, 0.5);
       border-radius: 6px;
       display: flex;
       flex-direction: column;
@@ -2396,10 +2396,12 @@ p {
           top: 270px;
         }
         &.box2 {
-          top: 500px;
+        //   top: 500px;
+          top: 450px;
         }
         &.box3 {
-          top: 730px;
+        //   top: 730px;
+          top: 690px;
         }
         .energy-system-content {
           padding: 5px 5px 15px 5px;

src/views/economicsOperation/thematicAnalysis/MTBF/index.vue

@@ -67,7 +67,7 @@
         <div class="leftContent line-left">
           <span>{{ selectValue }}</span>
         </div>
-        <div class="rightContent right"></div>
+        <div class="rightContent floatRight"></div>
       </div>
       <div class="economicTable">
         <el-table
@@ -132,7 +132,7 @@
                       </el-tooltip>
                     </div>
                     <div v-else class="box-item">--</div>
-                    <div style="flex: 0 0 auto;line-height: 1;">
+                    <div style="flex: 0 0 auto; line-height: 1">
                       <Bottom
                         class="botSvg"
                         v-if="
@@ -433,6 +433,9 @@ export default {
       margin-top: 13px;
       background: url("../../../../assets/imgs/title_right_bg.png");
     }
+    .floatRight {
+      float: right;
+    }
   }
 
   .search {

src/views/economicsOperation/thematicAnalysis/failure/index.vue

@@ -67,7 +67,7 @@
         <div class="leftContent left">
           <span>{{ selectValue }}</span>
         </div>
-        <div class="rightContent right"></div>
+        <div class="rightContent floatRight"></div>
       </div>
       <div class="economicTable">
         <el-table
@@ -132,7 +132,7 @@
                       </el-tooltip>
                     </div>
                     <div v-else class="box-item">--</div>
-                    <div style="flex: 0 0 auto;line-height: 1;">
+                    <div style="flex: 0 0 auto; line-height: 1">
                       <Bottom
                         class="botSvg"
                         v-if="
@@ -519,6 +519,9 @@ export default {
       margin-top: 13px;
       background: url("../../../../assets/imgs/title_right_bg.png");
     }
+    .floatRight {
+      float: right;
+    }
   }
 
   .search {

src/views/economicsOperation/thematicAnalysis/generation/index.vue

@@ -67,7 +67,7 @@
         <div class="leftContent left">
           <span>{{ selectValue }}</span>
         </div>
-        <div class="rightContent right"></div>
+        <div class="rightContent floatRight"></div>
       </div>
       <div class="economicTable">
         <el-table
@@ -132,7 +132,7 @@
                       </el-tooltip>
                     </div>
                     <div v-else class="box-item">--</div>
-                    <div style="flex: 0 0 auto;line-height: 1;">
+                    <div style="flex: 0 0 auto; line-height: 1">
                       <Bottom
                         class="botSvg"
                         v-if="
@@ -433,6 +433,9 @@ export default {
       margin-top: 13px;
       background: url("../../../../assets/imgs/title_right_bg.png");
     }
+    .floatRight {
+      float: right;
+    }
   }
 
   .search {

src/views/economicsOperation/thematicAnalysis/reset/index.vue

@@ -83,7 +83,7 @@
         <div class="leftContent left">
           <span>{{ selectValue }}</span>
         </div>
-        <div class="rightContent right"></div>
+        <div class="rightContent floatRight"></div>
       </div>
       <div class="economicTable">
         <el-table
@@ -556,6 +556,9 @@ export default {
       margin-top: 13px;
       background: url("../../../../assets/imgs/title_right_bg.png");
     }
+    .floatRight {
+      float: right;
+    }
   }
 
   .search {

src/views/economicsOperation/thematicAnalysis/windEnergy/index.vue

@@ -48,7 +48,7 @@
         <div class="leftContent left">
           <span>{{ tabIndex == -1 ? "风能利用率" : "光能利用率" }}</span>
         </div>
-        <div class="rightContent right"></div>
+        <div class="rightContent floatRight"></div>
       </div>
       <div class="economicTable">
         <el-table
@@ -113,7 +113,7 @@
                       </el-tooltip>
                     </div>
                     <div v-else class="box-item">--</div>
-                    <div style="flex: 0 0 auto;line-height: 1;">
+                    <div style="flex: 0 0 auto; line-height: 1">
                       <Bottom
                         class="botSvg"
                         v-if="
@@ -383,6 +383,9 @@ export default {
       margin-top: 13px;
       background: url("../../../../assets/imgs/title_right_bg.png");
     }
+    .floatRight {
+      float: right;
+    }
   }
 
   .search {

src/views/stateMonitor/factoryMonitor/components/headerButton.vue

@@ -114,11 +114,18 @@ export default {
       currentPage: 1,
       // 每页大小 默认每页10条数据
       pageSize: 13,
+      localWpinfo: {},
+      localCompanyid: "",
     };
   },
   created() {
     //获取区域公司
     this.getOrganizationList();
+    this.localWpinfo = JSON.parse(localStorage.getItem("wpInfo"))
+      ? JSON.parse(localStorage.getItem("wpInfo"))
+      : {};
+    this.localCompanyid = localStorage.getItem("companyId");
+    // console.log(localWpid);
   },
   methods: {
     //获取区域公司
@@ -128,7 +135,12 @@ export default {
           return { label: item.aname, value: item.nemCode, ...item };
         });
         this.OrganizationList = [...this.OrganizationList, ...company];
-        this.checkNode = this.OrganizationList[0].value;
+        this.checkNode = this.localCompanyid
+          ? this.localCompanyid
+          : this.OrganizationList[0].value;
+        if (!this.localCompanyid) {
+          localStorage.setItem("companyId", this.OrganizationList[0].value);
+        }
         this.getStationList();
       });
     },
@@ -152,20 +164,45 @@ export default {
       });
       if (data.data.length) {
         this.allPowerStation = data.data;
+        let index = Object.keys(this.localWpinfo).length
+          ? this.allPowerStation.findIndex(
+              (item) => item.nemCode == this.localWpinfo.wpid
+            )
+          : -1;
+        if (index >= this.pageSize) {
+          this.currentPage = 2;
+        }
+        if (index == -1) {
+          this.localWpinfo = {};
+          this.localCompanyid = "";
+          localStorage.removeItem("wpInfo");
+          localStorage.removeItem("companyId");
+        }
         this.pageTotal = data.data.length;
         this.pageData = this.queryByPage();
-        this.stationCode = this.pageData[0].nemCode;
-        this.stationName = this.pageData[0].name;
+        this.stationCode = Object.keys(this.localWpinfo).length
+          ? this.localWpinfo.wpid
+          : this.pageData[0].nemCode;
+        this.stationName = Object.keys(this.localWpinfo).length
+          ? this.localWpinfo.wpname
+          : this.pageData[0].name;
         if (this.showType) {
           this.getProject(this.stationCode);
         } else {
           this.$emit(
             "renderData",
             this.checkNode,
-            this.pageData[0].nemCode,
+            this.stationCode,
             this.pageData[0].name
           );
         }
+        if (!Object.keys(this.localWpinfo).length) {
+          this.localWpinfo = {
+            wpid: this.pageData[0].nemCode,
+            wpname: this.pageData[0].name,
+          };
+          localStorage.setItem("wpInfo", JSON.stringify(this.localWpinfo));
+        }
       } else {
         this.allPowerStation = [];
         this.pageTotal = 0;
@@ -214,6 +251,10 @@ export default {
     companyChanged(val) {
       this.checkNode = val;
       this.currentPage = 1;
+      this.localCompanyid = val;
+      localStorage.setItem("companyId", val);
+      localStorage.removeItem("wpInfo");
+      this.localWpinfo = {};
       this.getStationList();
     },
     //期次切换
@@ -237,6 +278,8 @@ export default {
           this.stationName
         );
       }
+      this.localWpinfo = { wpid: val, wpname: this.stationName };
+      localStorage.setItem("wpId", JSON.stringify(this.localWpinfo));
     },
     // 实现分页的方法
     queryByPage() {
@@ -248,6 +291,14 @@ export default {
       return this.allPowerStation.slice(start, end);
     },
   },
+  watch: {
+    type: {
+      handler(oldVal, newVal) {
+        console.log(oldVal, newVal);
+      },
+      immediate: true,
+    },
+  },
 };
 </script>
 <style lang="less" scoped>

src/views/stateMonitor/factoryMonitor/photovoltaic/lightDataTarget/index.vue

@@ -250,6 +250,7 @@ export default {
         this.GetWtTargetsList();
       } else {
         clearInterval(this.timer);
+        this.loading = false;
         this.timer = null;
         this.total = 0;
         this.newTableList = [];

src/views/stateMonitor/factoryMonitor/photovoltaic/lightGeomorphologicMap/components/sy-map.vue

@@ -149,91 +149,91 @@ export default {
           y: "360",
         },
         {
-          name: "#13",
+          name: "13方阵",
           x: "1415",
           y: "195",
           type: 3,
         },
         {
-          name: "#14",
+          name: "14方阵",
           x: "1430",
           y: "325",
           type: 3,
         },
         {
-          name: "#15",
+          name: "15方阵",
           x: "1440",
           y: "465",
           type: 3,
         },
         {
-          name: "#01",
+          name: "1方阵",
           x: "1215",
           y: "215",
           type: 3,
         },
         {
-          name: "#05",
+          name: "5方阵",
           x: "1215",
           y: "325",
           type: 3,
         },
         {
-          name: "#10",
+          name: "10方阵",
           x: "1220",
           y: "465",
           type: 3,
         },
         {
-          name: "#12",
+          name: "12方阵",
           x: "1135",
           y: "555",
           type: 3,
         },
         {
-          name: "#04",
+          name: "4方阵",
           x: "1005",
           y: "315",
           type: 3,
         },
         {
-          name: "#09",
+          name: "9方阵",
           x: "995",
           y: "455",
           type: 3,
         },
         {
-          name: "#03",
+          name: "3方阵",
           x: "785",
           y: "315",
           type: 3,
         },
         {
-          name: "#08",
+          name: "8方阵",
           x: "765",
           y: "455",
           type: 3,
         },
         {
-          name: "#02",
+          name: "2方阵",
           x: "580",
           y: "310",
           type: 3,
         },
         {
-          name: "#07",
+          name: "7方阵",
           x: "545",
           y: "455",
           type: 3,
         },
         {
-          name: "#11",
+          name: "11方阵",
           x: "605",
           y: "540",
           type: 3,
         },
         {
-          name: "#06",
+          name: "6方阵",
           x: "325",
           y: "450",
           type: 3,

src/views/stateMonitor/factoryMonitor/windPowerPlant/DataTarget/index.vue

@@ -240,6 +240,7 @@ export default {
         this.stationCode = wpid;
         this.GetWtTargetsList();
       } else {
+        this.loading = false;
         clearInterval(this.timer);
         this.timer = null;
         this.total = 0;
@@ -265,6 +266,7 @@ export default {
           }
         });
       } else {
+        this.loading = false;
         this.stationData = [];
       }
     },

src/views/stateMonitor/factoryMonitor/windPowerPlant/windhome/index.vue

@@ -642,6 +642,7 @@ export default {
         },
       ],
       firstFlag: false,
+      localWpid: "",
     };
   },
   computed: {
@@ -695,7 +696,6 @@ export default {
     },
   },
   created() {
-    // this.getSingleMatrix(true);
   },
   mounted() {
     if (document.getElementById("ifrId")) {
@@ -729,9 +729,9 @@ export default {
       this.contrastList = [];
     },
     renderData(company, wpid) {
-      if (wpid) {
+      if (this.localWpid || wpid) {
         this.company = company;
-        this.stationCode = wpid;
+        this.stationCode = this.localWpid || wpid;
         this.getSingleMatrix(true);
         this.getPowerStationAssets();
         this.getBarValuesFDL();