Merge remote-tracking branch 'remotes/origin/tjj2' into yx

src/App.vue

@@ -1,5 +1,7 @@
 <template>
-  <div v-if="!showSisView && isLogined" class="main">
+  <!-- <div v-if="!showSisView && isLogined" class="main"> -->
+    <div  class="main">
+    <!-- <div v-if="token !==''" class="main"> -->
     <div class="header-body">
       <div class="header-title">
         <svg
@@ -233,7 +235,7 @@ l16.229-16.229l16.229,16.229l42.867-42.867C115.034,45.228,109.133,42.189,102.956
         </svg>
       </div>
       <div class="header-menu-body">
-        <Header @onMenuClick="HeaderMenuClick" />
+        <Header v-if="!showSisView && isLogined" @onMenuClick="HeaderMenuClick" />
       </div>
     </div>
     <div
@@ -242,14 +244,19 @@ l16.229-16.229l16.229,16.229l42.867-42.867C115.034,45.228,109.133,42.189,102.956
       @mouseenter="showMenu"
       @mouseleave="hideMenu"
     >
-      <Menu :root="root" />
+      <Menu v-if="!showSisView && isLogined" :root="root" />
     </div>
     <div class="main-body">
       <router-view />
     </div>
   </div>
-  <login-page v-if="!showSisView && !isLogined" @onLogin="login" />
-  <sisView v-if="showSisView" />
+  <!-- <login-page v-if="!showSisView && !isLogined" @onLogin="login" /> -->
+   <!-- <div v-else-if="token == ''">
+    {{token}}
+ <login-page  @onLogin="login" />
+   </div> -->
+ 
+  <!-- <sisView v-if="showSisView" /> -->
 </template>
 
 <script>
@@ -259,13 +266,13 @@ import Header from "@/views/layout/Header.vue";
 
 import { mapMutations } from "vuex";
 
-import LoginPage from "./views/layout/login-page.vue";
+// import LoginPage from "./views/layout/login-page.vue";
 import sisView from "./views/sisView/index.vue";
 export default {
   components: {
     Menu,
     Header,
-    LoginPage,
+    // LoginPage,
     sisView,
   },
 
@@ -275,6 +282,7 @@ export default {
       // 当前子系统
       root: "",
       isLogined: true,
+      token:localStorage.getItem("token"),
       showSisView: false,
       memuCloseTimeout: null,
     };
@@ -282,33 +290,38 @@ export default {
 
   created() {
     let that = this;
-    that.$nextTick(() => {
-      that.API.requestData({
-        isMust: false, // 请求是否携带 token ，默认为 true ，可缺省
-        method: "POST", // 请求方式，默认为 GET ，可缺省
-        subUrl: "admin/loginvue", // 请求接口地址，必传项
-        data: {
-          username: "admin",
-          password: "admin",
-        },
-        success(res) {
-          localStorage.setItem("authToken", res.data.authToken);
-          localStorage.setItem("username", res.data.user.laborName);
 
-          that.API.requestData({
-            method: "POST", // 请求方式，默认为 GET ，可缺省
-            subUrl: "admin/usermenu", // 请求接口地址，必传项
-            success() {
-              // that.BASE.showMsg({
-              //   msg: "登陆成功",
-              //   type: "success",
-              // });
-              // that.$router.push('/'); // 跳转到首页
-            },
-          });
-        },
-      });
-    });
+    console.log("token:",that.token)
+    that.$nextTick(()=>{
+      //判断页面是否登录
+    })
+    // that.$nextTick(() => {
+    //   that.API.requestData({
+    //     isMust: false, // 请求是否携带 token ，默认为 true ，可缺省
+    //     method: "POST", // 请求方式，默认为 GET ，可缺省
+    //     subUrl: "admin/loginvue", // 请求接口地址，必传项
+    //     data: {
+    //       username: "admin",
+    //       password: "admin",
+    //     },
+    //     success(res) {
+    //       localStorage.setItem("authToken", res.data.authToken);
+    //       localStorage.setItem("username", res.data.user.laborName);
+
+    //       that.API.requestData({
+    //         method: "POST", // 请求方式，默认为 GET ，可缺省
+    //         subUrl: "admin/usermenu", // 请求接口地址，必传项
+    //         success() {
+    //           that.BASE.showMsg({
+    //             msg: "登陆成功",
+    //             type: "success",
+    //           });
+    //           that.$router.push('/'); // 跳转到首页
+    //         },
+    //       });
+    //     },
+    //   });
+    // });
   },
 
   methods: {
@@ -327,13 +340,27 @@ export default {
       }, 500);
     },
     login(params) {
-      if (params.username && params.password) this.isLogined = true;
+      // if (params.username && params.password ) 
+      // {
+      //   this.isLogined = true;
+      //   }else{
+      //  this.isLogined=false
+      // }
+       if (params.username && params.password && params.token ) 
+      {
+        // this.isLogined = true;
+        this.token = params.token
+        }
+      console.log('params:',params)
+      // this.$router.push('/monitor/home')
     },
   },
 
   watch: {
     $route(res) {
+      console.log('resRoute:',res)
       this.showSisView = res.fullPath === "/sisView";
+      this.isLogined = res.path !=='/login'
     },
   },
 };

src/main.js

@@ -4,6 +4,7 @@ import router from './router';
 import store from './store';
 import 'font-awesome/css/font-awesome.min.css';
 
+
 // 引入 element-ui
 import ElementPlus from 'element-plus';
 import 'element-plus/dist/index.css';

src/router/index.js

@@ -5,6 +5,12 @@ import {
 import Home from "../views/Home/Home.vue"
 
 const routes = [{
+	path: "/login",
+	name: "Login",
+	component: () =>
+		import( /* webpackChunkName: "Login" */ "../views/layout/login-page.vue"),
+},
+{
 	path: "/",
 	redirect: "/monitor/home"
 },
@@ -738,6 +744,18 @@ const routes = [{
 		import( /* webpackChunkName: "xdgl" */ "../views/warn/xdgl.vue"),
 }, // 报警中心-升压站报警
 {
+	path: "/others/alarmCenter/ztzhjl",
+	name: "ztzhjl",
+	component: () =>
+		import( /* webpackChunkName: "ztzhjl" */ "../views/warn/ztzhjl.vue"),
+},
+{
+	path: "/others/alarmCenter/czjl",
+	name: "czjl",
+	component: () =>
+		import( /* webpackChunkName: "czjl" */ "../views/warn/czjl.vue"),
+},
+{
 	path: "/others/alarmCenter/boosterAlarm",
 	name: "boosterAlarm",
 	component: () => import("../views/alarmCenter/boosterAlarm.vue")
@@ -856,5 +874,18 @@ const router = createRouter({
 router.beforeEach((to, from, next) => {
 	next();
 });
+router.beforeEach((to, from, next) => {
+	if (to.path === '/login') {
+		next()
+	} else {
+		let authToken = localStorage.getItem('authToken')
+		console.log('authToken:', authToken)
+		if (authToken === null || authToken === "") {
+			next({ path: '/login' })
+		} else {
+			next()
+		}
+	}
+})
 
 export default router;

src/views/NewPages/alarm-center-1.vue

@@ -72,6 +72,7 @@
           <div class="bar">
             <div
               class="bar-percent"
+              @click="showChart()"
               :style="{
                 width:
                   (scope.data.count &&
@@ -87,6 +88,7 @@
           <div class="bar">
             <div
               class="bar-percent"
+              @click="showChart()"
               :style="{
                 width:
                   (scope.data.count &&
@@ -102,17 +104,57 @@
         </template>
       </table-3>
     </panel-3>
+    <el-dialog
+      :title="'对比'"
+      v-model="dialogVisible"
+      width="70%"
+      top="10vh"
+      custom-class="modal"
+      :close-on-click-modal="false"
+    >
+      <multiple-y-line-chart-normal
+        height="500px"
+        :list="Powertrend"
+        :yAxises="PowertrendYAxises"
+        :showLegend="true"
+      />
+    </el-dialog>
   </div>
 </template>
 
 <script>
 import Panel3 from "../../components/coms/panel/panel3.vue";
 import Table3 from "../../components/coms/table/table3.vue";
+import MultipleYLineChartNormal from "../../components/chart/line/multiple-y-line-chart-normal.vue";
 export default {
-  components: { Panel3, Table3 },
+  components: { Panel3, Table3, MultipleYLineChartNormal },
   data() {
     return {
+      dialogVisible: false,
       wpvalue: "",
+      Powertrend: [
+        {
+          title: "",
+          yAxisIndex: 0, // 使用单位
+          value: [],
+        },
+      ],
+      PowertrendYAxises: [
+        {
+          name: "功率",
+          min: 0,
+          max: null,
+          unit: "(万kWh)",
+          position: "left",
+        },
+        {
+          name: "风速",
+          min: 0,
+          max: 25,
+          unit: "(m/s)",
+          position: "right",
+        },
+      ],
       wpoptions: "",
       options: [],
       cascaderOptions: [],
@@ -214,6 +256,250 @@ export default {
     });
   },
   methods: {
+    //对比
+    showChart() {
+      let that = this;
+      that.dialogVisible = true;
+      let Powertrend = [
+        {
+          title: "实发功率",
+          smooth: true,
+          value: [],
+        },
+        {
+          title: "理论功率",
+          smooth: true,
+          value: [],
+        },
+        {
+          title: "保证功率",
+          smooth: true,
+          value: [],
+        },
+        {
+          title: "4小时预测功率",
+          smooth: true,
+          value: [],
+        },
+        {
+          title: "24小时预测功率",
+          smooth: true,
+          value: [],
+        },
+        {
+          title: "平均风速",
+          smooth: true,
+          value: [],
+        },
+      ];
+      let glKey = ["value2", "value1", "value5", "value4", "value7", "value6"];
+      let resData = {
+        glvos: [
+          {
+            time: 1631721600000,
+            timestr: null,
+            value1: 17,
+            value2: 9.18,
+            value3: 11,
+            value4: 7.27,
+            value5: 16,
+            value6: 1.95,
+            value7: 0,
+            value8: null,
+            value9: 31,
+            value10: null,
+            value11: null,
+            value12: null,
+            value13: null,
+            speed: null,
+            name: null,
+            url: null,
+            aName: null,
+            desc: null,
+            datefomat: null,
+            minRange: null,
+            pointInterval: null,
+            year: null,
+            month: null,
+            day: null,
+            id: null,
+            hours: null,
+            minutes: null,
+            seconds: null,
+            beginDate: null,
+            endDate: null,
+            beginDateDay: null,
+            endDateDay: null,
+            value: null,
+            valueObjVo: null,
+          },
+          {
+            time: 1631725200000,
+            timestr: null,
+            value1: 14,
+            value2: 5.17,
+            value3: 8,
+            value4: 0.1,
+            value5: 12,
+            value6: 2.49,
+            value7: 11.94,
+            value8: null,
+            value9: 29,
+            value10: null,
+            value11: null,
+            value12: null,
+            value13: null,
+            speed: null,
+            name: null,
+            url: null,
+            aName: null,
+            desc: null,
+            datefomat: null,
+            minRange: null,
+            pointInterval: null,
+            year: null,
+            month: null,
+            day: null,
+            id: null,
+            hours: null,
+            minutes: null,
+            seconds: null,
+            beginDate: null,
+            endDate: null,
+            beginDateDay: null,
+            endDateDay: null,
+            value: null,
+            valueObjVo: null,
+          },
+          {
+            time: 1631728800000,
+            timestr: null,
+            value1: 13,
+            value2: 5.07,
+            value3: 8,
+            value4: 0.07,
+            value5: 11,
+            value6: 2.32,
+            value7: 0,
+            value8: null,
+            value9: 26,
+            value10: null,
+            value11: null,
+            value12: null,
+            value13: null,
+            speed: null,
+            name: null,
+            url: null,
+            aName: null,
+            desc: null,
+            datefomat: null,
+            minRange: null,
+            pointInterval: null,
+            year: null,
+            month: null,
+            day: null,
+            id: null,
+            hours: null,
+            minutes: null,
+            seconds: null,
+            beginDate: null,
+            endDate: null,
+            beginDateDay: null,
+            endDateDay: null,
+            value: null,
+            valueObjVo: null,
+          },
+          {
+            time: 1631732400000,
+            timestr: null,
+            value1: 11,
+            value2: 3.3,
+            value3: 6,
+            value4: 0,
+            value5: 9,
+            value6: 2.28,
+            value7: 0,
+            value8: null,
+            value9: 21,
+            value10: null,
+            value11: null,
+            value12: null,
+            value13: null,
+            speed: null,
+            name: null,
+            url: null,
+            aName: null,
+            desc: null,
+            datefomat: null,
+            minRange: null,
+            pointInterval: null,
+            year: null,
+            month: null,
+            day: null,
+            id: null,
+            hours: null,
+            minutes: null,
+            seconds: null,
+            beginDate: null,
+            endDate: null,
+            beginDateDay: null,
+            endDateDay: null,
+            value: null,
+            valueObjVo: null,
+          },
+          {
+            time: 1631736000000,
+            timestr: null,
+            value1: 3.91,
+            value2: 1.67,
+            value3: 1.91,
+            value4: 0.3,
+            value5: 2.91,
+            value6: 1.88,
+            value7: 0,
+            value8: null,
+            value9: 9,
+            value10: null,
+            value11: null,
+            value12: null,
+            value13: null,
+            speed: null,
+            name: null,
+            url: null,
+            aName: null,
+            desc: null,
+            datefomat: null,
+            minRange: null,
+            pointInterval: null,
+            year: null,
+            month: null,
+            day: null,
+            id: null,
+            hours: null,
+            minutes: null,
+            seconds: null,
+            beginDate: null,
+            endDate: null,
+            beginDateDay: null,
+            endDateDay: null,
+            value: null,
+            valueObjVo: null,
+          },
+         
+        ],
+     
+      };
+      glKey.forEach((keyEle, keyIndex) => {
+        resData.glvos.forEach((cEle) => {
+          Powertrend[keyIndex].value.push({
+            text: new Date(cEle.time).formatDate("hh:mm"),
+            value: cEle[keyEle],
+          });
+        });
+      });
+
+      that.Powertrend = Powertrend;
+    },
     tabSelect(tab) {},
 
     async search() {
@@ -251,7 +537,7 @@ export default {
       this.column = arr;
       this.searchData();
     },
-    
+
     async searchData() {
       const { data } = await this.API.requestData({
         baseURL: "http://192.168.1.18:8075/",
@@ -264,7 +550,7 @@ export default {
       });
       ////////
       const resData = data.data;
-      console.log('resData:',resData)
+      console.log("resData:", resData);
       // const resData =this.resdata;
       const column = this.columnObj;
       let dataAll = []; // 总数据集合
@@ -346,7 +632,7 @@ export default {
           root[f].fobj = fobj;
         }
       }
-      console.log('cascaderOptions:',cascaderOptions)
+      console.log("cascaderOptions:", cascaderOptions);
       this.cascaderOptions = cascaderOptions;
     },
   },

src/views/Others/index.vue

@@ -171,7 +171,7 @@ export default {
         },
         { name: "限电事件", key: "xd", url: "/others/alarmCenter/xdgl" },
         { name: "停机事件", key: "tj", url: "/others/alarmCenter/tjsj" },
-        { name: "状态转换记录", key: "", url: "" },
+        { name: "状态转换记录", key: "zt", url: "/others/alarmCenter/ztzhjl" },
         {
           name: "风机告警",
           key: "fjgj",
@@ -182,7 +182,7 @@ export default {
           key: "fjyj",
           url: "/others/alarmCenter/alarmcenter",
         },
-        { name: "操作记录", key: "", url: "" },
+        { name: "操作记录", key: "cz", url: "/others/alarmCenter/czjl" },
       ],
       tableData1: {
         column: [

src/views/WindSite/components/boosterstation/BoosterStation.js

@@ -375,13 +375,17 @@ export class BoosterStation {
 		"NSS_FDC": {
 			"nssuakv2j": { tag: "NSSDQN.NX_GD_NSSF_DQ_P1_L1_001_AI0001" },
 			"nssuabkv2j": { tag: "NSSDQN.NX_GD_NSSF_DQ_P1_L1_001_AI0004" },
+			"nss3uov2j": { tag: "NSSDQN.NX_GD_NSSF_DQ_P1_L1_001_AI0244" },
+			"nssfhz2j": { tag: "NSSDQN.NX_GD_NSSF_DQ_P1_L1_001_AI0313" },
 			"nsslaa2j": { tag: "NSSDQN.NX_GD_NSSF_DQ_P1_L1_001_AI0009" },
 			"nsspmw2j": { tag: "NSSDQN.NX_GD_NSSF_DQ_P1_L1_001_AI0012" },
 			"nssqmvar2j": { tag: "NSSDQN.NX_GD_NSSF_DQ_P1_L1_001_AI0013" },
+			"nssuxkv2j": { tag: "NSSDQN.NX_GD_NSSF_DQ_P1_L1_001_AI0320" },
 			"nsscos2j": { tag: "NSSDQN.NX_GD_NSSF_DQ_P1_L1_001_AI0319" },
 			"nsslaa2jy": { tag: "NSSDQN.NX_GD_NSSF_DQ_P1_L1_001_AI0014" },
 			"nsspmw2jy": { tag: "NSSDQN.NX_GD_NSSF_DQ_P1_L1_001_AI0017" },
 			"nssqmvar2jy": { tag: "NSSDQN.NX_GD_NSSF_DQ_P1_L1_001_AI0018" },
+			"nssuxkv2jy": { tag: "NSSDQN.NX_GD_NSSF_DQ_P1_L1_001_AI0328" },
 			"nsscos2jy": { tag: "NSSDQN.NX_GD_NSSF_DQ_P1_L1_001_AI0327" },
 			"nsslaa2y": { tag: "NSSDQN.NX_GD_NSSF_DQ_P1_L1_001_AI0031" },
 			"nsspkw2y": { tag: "NSSDQN.NX_GD_NSSF_DQ_P1_L1_001_AI0032" },
@@ -389,7 +393,8 @@ export class BoosterStation {
 			"nsscos2y": { tag: "NSSDQN.NX_GD_NSSF_DQ_P1_L1_001_AI0298" },
 			"nssuakv2y": { tag: "NSSDQN.NX_GD_NSSF_DQ_P1_L1_001_AI0082" },
 			"nssuabkv2y": { tag: "NSSDQN.NX_GD_NSSF_DQ_P1_L1_001_AI0085" },
-			"nssfhz2y": { tag: "NSSDQN.NX_GD_NSSF_DQ_P1_L1_001_AI0323" },
+			"nss3uov2y": { tag: "NSSDQN.NX_GD_NSSF_DQ_P1_L1_001_AI0257" },
+			"nssfhz2y": { tag: "NSSDQN.NX_GD_NSSF_DQ_P1_L1_001_AI0251" },
 			"nssuakv1zb": { tag: "NSSDQN.NX_GD_NSSF_DQ_P1_L1_001_AI0082" },
 			"nssuabkv1zb": { tag: "NSSDQN.NX_GD_NSSF_DQ_P1_L1_001_AI0085" },
 			"nsslaa1zbs": { tag: "NSSDQN.NX_GD_NSSF_DQ_P1_L1_001_AI0022" },
@@ -405,6 +410,8 @@ export class BoosterStation {
 			"nsscos1zbx": { tag: "NSSDQN.NX_GD_NSSF_DQ_P1_L1_001_AI0273" },
 			"nssuakv2zb": { tag: "NSSDQN.NX_GD_NSSF_DQ_P1_L1_001_AI0086" },
 			"nssuabkv2zb": { tag: "NSSDQN.NX_GD_NSSF_DQ_P1_L1_001_AI0089" },
+			"nss3uo2zb": { tag: "NSSDQN.NX_GD_NSSF_DQ_P1_L1_001_AI0282" },
+			"nssfhz2zb": { tag: "NSSDQN.NX_GD_NSSF_DQ_P1_L1_001_AI0276" },
 			"nsslaa2zbs": { tag: "NSSDQN.NX_GD_NSSF_DQ_P1_L1_001_AI0025" },
 			"nsspmw2zbs": { tag: "NSSDQN.NX_GD_NSSF_DQ_P1_L1_001_AI0026" },
 			"nssqmvar2zbs": { tag: "NSSDQN.NX_GD_NSSF_DQ_P1_L1_001_AI0027" },
@@ -418,6 +425,8 @@ export class BoosterStation {
 			"nsscos2zbx": { tag: "NSSDQN.NX_GD_NSSF_DQ_P1_L1_001_AI0286" },
 			"nssuakv3zb": { tag: "NSSDQN.NX_GD_NSSF_DQ_P1_L1_001_AI0090" },
 			"nssuabkv3zb": { tag: "NSSDQN.NX_GD_NSSF_DQ_P1_L1_001_AI0093" },
+			"nss3uov3zb": { tag: "NSSDQN.NX_GD_NSSF_DQ_P1_L1_001_AI0307" },
+			"nssfhz3zb": { tag: "NSSDQN.NX_GD_NSSF_DQ_P1_L1_001_AI0301" },
 			"nssdw3zb": { tag: "NSSDQN.NX_GD_NSSF_DQ_P1_L1_001_AI0039" },
 			"nssymwd3zb1": { tag: "NSSDQN.NX_GD_NSSF_DQ_P1_L1_001_AI0299" },
 			"nssymwd3zb2": { tag: "NSSDQN.NX_GD_NSSF_DQ_P1_L1_001_AI0300" },
@@ -435,6 +444,7 @@ export class BoosterStation {
 			"nsspmwjd3": { tag: "NSSDQN.NX_GD_NSSF_DQ_P1_L1_001_AI0047" },
 			"nssqmvarjd3": { tag: "NSSDQN.NX_GD_NSSF_DQ_P1_L1_001_AI0048" },
 			"nsslaadr1": { tag: "NSSDQN.NX_GD_NSSF_DQ_P1_L1_001_AI0049" },
+			"nsspmwdr1": { tag: "NSSDQN.NX_GD_NSSF_DQ_P1_L1_001_AI0184" },
 			"nssqmvardr1": { tag: "NSSDQN.NX_GD_NSSF_DQ_P1_L1_001_AI0050" },
 			"nsslaadk1": { tag: "NSSDQN.NX_GD_NSSF_DQ_P1_L1_001_AI0051" },
 			"nsspmwdk1": { tag: "NSSDQN.NX_GD_NSSF_DQ_P1_L1_001_AI0052" },
@@ -452,6 +462,7 @@ export class BoosterStation {
 			"nsspmwjd6": { tag: "NSSDQN.NX_GD_NSSF_DQ_P1_L1_001_AI0061" },
 			"nssqmvarjd6": { tag: "NSSDQN.NX_GD_NSSF_DQ_P1_L1_001_AI0062" },
 			"nsslaadr2": { tag: "NSSDQN.NX_GD_NSSF_DQ_P1_L1_001_AI0063" },
+			"nsspmwdr2": { tag: "NSSDQN.NX_GD_NSSF_DQ_P1_L1_001_AI0195" },
 			"nssqmvardr2": { tag: "NSSDQN.NX_GD_NSSF_DQ_P1_L1_001_AI0064" },
 			"nsslaadk2": { tag: "NSSDQN.NX_GD_NSSF_DQ_P1_L1_001_AI0065" },
 			"nsspmwdk2": { tag: "NSSDQN.NX_GD_NSSF_DQ_P1_L1_001_AI0066" },
@@ -469,6 +480,7 @@ export class BoosterStation {
 			"nsspmwjd9": { tag: "NSSDQN.NX_GD_NSSF_DQ_P1_L1_001_AI0075" },
 			"nssqmvarjd9": { tag: "NSSDQN.NX_GD_NSSF_DQ_P1_L1_001_AI0076" },
 			"nsslaadr3": { tag: "NSSDQN.NX_GD_NSSF_DQ_P1_L1_001_AI0077" },
+			"nsspmwdr3": { tag: "NSSDQN.NX_GD_NSSF_DQ_P1_L1_001_AI0206" },
 			"nssqmvardr3": { tag: "NSSDQN.NX_GD_NSSF_DQ_P1_L1_001_AI0078" },
 			"nsslaadk3": { tag: "NSSDQN.NX_GD_NSSF_DQ_P1_L1_001_AI0079" },
 			"nsspmwdk3": { tag: "NSSDQN.NX_GD_NSSF_DQ_P1_L1_001_AI0080" },
@@ -1558,20 +1570,20 @@ export class BoosterStation {
 			"xslaazy1": { tag: "XSDQ.NX_GD_XSF_DQ_P1_L1_001_AI0384" },
 			"xspkwzy1": { tag: "XSDQ.NX_GD_XSF_DQ_P1_L1_001_AI0396" },
 			"xsqkvarzy1": { tag: "XSDQ.NX_GD_XSF_DQ_P1_L1_001_AI0397" },
-			"xsuakvzb2x": { tag: "XSDQ.NX_GD_XSF_DQ_P1_L1_001_AI0267" },
-			"xsubkvzb2x": { tag: "XSDQ.NX_GD_XSF_DQ_P1_L1_001_AI0268" },
-			"xsuckvzb2x": { tag: "XSDQ.NX_GD_XSF_DQ_P1_L1_001_AI0269" },
-			"xsuabkvzb2x": { tag: "XSDQ.NX_GD_XSF_DQ_P1_L1_001_AI0275" },
-			"xsubckvzb2x": { tag: "XSDQ.NX_GD_XSF_DQ_P1_L1_001_AI0276" },
-			"xsucakvzb2x": { tag: "XSDQ.NX_GD_XSF_DQ_P1_L1_001_AI0277" },
-			"xs3u0vzb2x": { tag: "XSDQ.NX_GD_XSF_DQ_P1_L1_001_AI0274" },
-			"xsuakvzb1x": { tag: "XSDQ.NX_GD_XSF_DQ_P1_L1_001_AI0229" },
-			"xsubkvzb1x": { tag: "XSDQ.NX_GD_XSF_DQ_P1_L1_001_AI0230" },
-			"xsuckvzb1x": { tag: "XSDQ.NX_GD_XSF_DQ_P1_L1_001_AI0231" },
-			"xsuabkvzb1x": { tag: "XSDQ.NX_GD_XSF_DQ_P1_L1_001_AI0237" },
-			"xsubckvzb1x": { tag: "XSDQ.NX_GD_XSF_DQ_P1_L1_001_AI0238" },
-			"xsucakvzb1x": { tag: "XSDQ.NX_GD_XSF_DQ_P1_L1_001_AI0239" },
-			"xs3u0vzb1x": { tag: "XSDQ.NX_GD_XSF_DQ_P1_L1_001_AI0236" },
+			"xsuakvzb2x": { tag: "XSDQ.NX_GD_XSF_DQ_P1_L1_001_AI0139" },
+			"xsubkvzb2x": { tag: "XSDQ.NX_GD_XSF_DQ_P1_L1_001_AI0140" },
+			"xsuckvzb2x": { tag: "XSDQ.NX_GD_XSF_DQ_P1_L1_001_AI0141" },
+			"xsuabkvzb2x": { tag: "XSDQ.NX_GD_XSF_DQ_P1_L1_001_AI0142" },
+			"xsubckvzb2x": { tag: "XSDQ.NX_GD_XSF_DQ_P1_L1_001_AI0143" },
+			"xsucakvzb2x": { tag: "XSDQ.NX_GD_XSF_DQ_P1_L1_001_AI0144" },
+			"xs3u0vzb2x": { tag: "XSDQ.NX_GD_XSF_DQ_P1_L1_001_AI0145" },
+			"xsuakvzb1x": { tag: "XSDQ.NX_GD_XSF_DQ_P1_L1_001_AI0131" },
+			"xsubkvzb1x": { tag: "XSDQ.NX_GD_XSF_DQ_P1_L1_001_AI0132" },
+			"xsuckvzb1x": { tag: "XSDQ.NX_GD_XSF_DQ_P1_L1_001_AI0133" },
+			"xsuabkvzb1x": { tag: "XSDQ.NX_GD_XSF_DQ_P1_L1_001_AI0134" },
+			"xsubckvzb1x": { tag: "XSDQ.NX_GD_XSF_DQ_P1_L1_001_AI0135" },
+			"xsucakvzb1x": { tag: "XSDQ.NX_GD_XSF_DQ_P1_L1_001_AI0136" },
+			"xs3u0vzb1x": { tag: "XSDQ.NX_GD_XSF_DQ_P1_L1_001_AI0137" },
 			"xsuakvby1": { tag: "XSDQ.NX_GD_XSF_DQ_P1_L1_001_AI0286" },
 			"xsuabkvby1": { tag: "XSDQ.NX_GD_XSF_DQ_P1_L1_001_AI0294" },
 			"xslaaby1": { tag: "XSDQ.NX_GD_XSF_DQ_P1_L1_001_AI0289" },
@@ -1641,19 +1653,20 @@ export class BoosterStation {
 			"xskg3215": { tag: "XSDQ.NX_GD_XSF_DQ_P1_L1_001_DI1514" },
 			"xskg3210": { tag: "XSDQ.NX_GD_XSF_DQ_P1_L1_001_DI1516" },
 			"xskg3150": { tag: "XSDQ.NX_GD_XSF_DQ_P1_L1_001_DI0918" },
-			"xskg3140": { tag: "XSDQ.NX_GD_XSF_DQ_P1_L1_001_DI0583" },
+			"xskg3140": { tag: "XSDQ.NX_GD_XSF_DQ_P1_L1_001_DI0853" },
 			"xskg3130": { tag: "XSDQ.NX_GD_XSF_DQ_P1_L1_001_DI0983" },
 			"xskg319pt": { tag: "XSDQ.NX_GD_XSF_DQ_P1_L1_001_DI0670" },
 			"xskg31105": { tag: "XSDQ.NX_GD_XSF_DQ_P1_L1_001_DI1366" },
 			"xskg3115": { tag: "XSDQ.NX_GD_XSF_DQ_P1_L1_001_DI1364" },
 			"xskg3110": { tag: "XSDQ.NX_GD_XSF_DQ_P1_L1_001_DI1371" },
-			"xsdlq111": { tag: "XSDQ.NX_GD_XSF_DQ_P1_L1_001_DI0033" },
+			"xsdlq111": { tag: "XSDQ.NX_GD_XSF_DQ_P1_L1_001_DI0034" },
 			"xsdlq102": { tag: "XSDQ.NX_GD_XSF_DQ_P1_L1_001_DI0308" },
 			"xsdlq101": { tag: "XSDQ.NX_GD_XSF_DQ_P1_L1_001_DI0169" },
 			"xsdlq302": { tag: "XSDQ.NX_GD_XSF_DQ_P1_L1_001_DI0331" },
 			"xsdlq301": { tag: "XSDQ.NX_GD_XSF_DQ_P1_L1_001_DI0192" },
 			"xsdlq312": { tag: "XSDQ.NX_GD_XSF_DQ_P1_L1_001_DI1629" },
-			"xsdlq324": { tag: "XSDQ.NX_GD_XSF_DQ_P1_L1_001_DI1261" },
+			"xsdlq324": { tag: "XSDQ.NX_GD_XSF_DQ_P1_L1_001_DI1274" },
+			"xsdlq323": { tag: "XSDQ.NX_GD_XSF_DQ_P1_L1_001_DI1209" },
 			"xsdlq322": { tag: "XSDQ.NX_GD_XSF_DQ_P1_L1_001_DI1144" },
 			"xsdlq321": { tag: "XSDQ.NX_GD_XSF_DQ_P1_L1_001_DI1499" },
 			"xsdlq315": { tag: "XSDQ.NX_GD_XSF_DQ_P1_L1_001_DI0914" },
@@ -1663,7 +1676,8 @@ export class BoosterStation {
 			"xssc302": { tag: "XSDQ.NX_GD_XSF_DQ_P1_L1_001_DI0333" },
 			"xssc301": { tag: "XSDQ.NX_GD_XSF_DQ_P1_L1_001_DI0194" },
 			"xssc312": { tag: "XSDQ.NX_GD_XSF_DQ_P1_L1_001_DI1631" },
-			"xssc324": { tag: "XSDQ.NX_GD_XSF_DQ_P1_L1_001_DI1261" },
+			"xssc324": { tag: "XSDQ.NX_GD_XSF_DQ_P1_L1_001_DI1276" },
+			"xssc323": { tag: "XSDQ.NX_GD_XSF_DQ_P1_L1_001_DI1211" },
 			"xssc322": { tag: "XSDQ.NX_GD_XSF_DQ_P1_L1_001_DI1146" },
 			"xssc321": { tag: "XSDQ.NX_GD_XSF_DQ_P1_L1_001_DI1501" },
 			"xssc315": { tag: "XSDQ.NX_GD_XSF_DQ_P1_L1_001_DI0916" },
@@ -1857,57 +1871,127 @@ export class BoosterStation {
 			'hzjuab':{tag: "HZJDQ.NX_GD_HZJG_DQ_P1_L1_001_AI0049"},
 			'hzjubc':{tag: "HZJDQ.NX_GD_HZJG_DQ_P1_L1_001_AI0050"},
 			'hzjuca':{tag: "HZJDQ.NX_GD_HZJG_DQ_P1_L1_001_AI0051"},
-			'hzjsc105':{tag: "HZJDQ.NX_GD_HZJG_DQ_P1_L1_001_DI0312"},
-			'hzjkg1055':{tag: "HZJDQ.NX_GD_HZJG_DQ_P1_L1_001_DI0323"},
-			'hzjkg10505':{tag: "HZJDQ.NX_GD_HZJG_DQ_P1_L1_001_DI0339"},
-			'hzjkg10503':{tag: "HZJDQ.NX_GD_HZJG_DQ_P1_L1_001_DI0341"},
-			'hzjkg1053':{tag: "HZJDQ.NX_GD_HZJG_DQ_P1_L1_001_DI0331"},
-			'hzjkg1050':{tag: "HZJDQ.NX_GD_HZJG_DQ_P1_L1_001_DI0343"},
-			'hzjkg1050150':{tag: "HZJDQ.NX_GD_HZJG_DQ_P1_L1_001_DI0681"},
-			'hzjkg1050350':{tag: "HZJDQ.NX_GD_HZJG_DQ_P1_L1_001_DI0683"},
 			'hzjla':{tag: "HZJDQ.NX_GD_HZJG_DQ_P1_L1_001_AI0046"},
 			'hzjp':{tag: "HZJDQ.NX_GD_HZJG_DQ_P1_L1_001_AI0052"},
 			'hzjq':{tag: "HZJDQ.NX_GD_HZJG_DQ_P1_L1_001_AI0053"},
+			'hzjuab2':{tag: "HZJDQ.NX_GD_HZJG_DQ_P1_L1_001_AI0017"},
+			'hzjubc2':{tag: "HZJDQ.NX_GD_HZJG_DQ_P1_L1_001_AI0018"},
+			'hzjuca2':{tag: "HZJDQ.NX_GD_HZJG_DQ_P1_L1_001_AI0019"},
 			'hzjdw':{tag: "HZJDQ.NX_GD_HZJG_DQ_P1_L1_001_AI0002"},
 			'hzjyw1':{tag: "HZJDQ.NX_GD_HZJG_DQ_P1_L1_001_AI0139"},
 			'hzjyw2':{tag: "HZJDQ.NX_GD_HZJG_DQ_P1_L1_001_AI0140"},
 			'hzjrw':{tag: "HZJDQ.NX_GD_HZJG_DQ_P1_L1_001_AI0141"},
-			'hzjuab2':{tag: "HZJDQ.NX_GD_HZJG_DQ_P1_L1_001_AI0017"},
-			'hzjubc2':{tag: "HZJDQ.NX_GD_HZJG_DQ_P1_L1_001_AI0018"},
-			'hzjuca2':{tag: "HZJDQ.NX_GD_HZJG_DQ_P1_L1_001_AI0019"},
-			'hzjdlq361':{tag: "HZJDQ.NX_GD_HZJG_DQ_P1_L1_001_DI1092"},
-			'hzjsc361':{tag: "HZJDQ.NX_GD_HZJG_DQ_P1_L1_001_DI1090"},
-			'hzjkg361':{tag: "HZJDQ.NX_GD_HZJG_DQ_P1_L1_001_DI1091"},
 			'hzjla361':{tag: "HZJDQ.NX_GD_HZJG_DQ_P1_L1_001_AI0295"},
 			'hzjp361':{tag: "HZJDQ.NX_GD_HZJG_DQ_P1_L1_001_AI0284"},
 			'hzjq361':{tag: "HZJDQ.NX_GD_HZJG_DQ_P1_L1_001_AI0285"},
-			'hzjdlq362':{tag: "HZJDQ.NX_GD_HZJG_DQ_P1_L1_001_DI1302"},
-			'hzjsc362':{tag: "HZJDQ.NX_GD_HZJG_DQ_P1_L1_001_DI1300"},
-			'hzjkg362':{tag: "HZJDQ.NX_GD_HZJG_DQ_P1_L1_001_DI1301"},
 			'hzjla362':{tag: "HZJDQ.NX_GD_HZJG_DQ_P1_L1_001_AI0339"},
 			'hzjp362':{tag: "HZJDQ.NX_GD_HZJG_DQ_P1_L1_001_AI0340"},
 			'hzjq362':{tag: "HZJDQ.NX_GD_HZJG_DQ_P1_L1_001_AI0341"},
-			'hzjdlq363':{tag: "HZJDQ.NX_GD_HZJG_DQ_P1_L1_001_DI1512"},
-			'hzjsc363':{tag: "HZJDQ.NX_GD_HZJG_DQ_P1_L1_001_DI1510"},
-			'hzjkg363':{tag: "HZJDQ.NX_GD_HZJG_DQ_P1_L1_001_DI1511"},
 			'hzjla363':{tag: "HZJDQ.NX_GD_HZJG_DQ_P1_L1_001_AI0383"},
 			'hzjp363':{tag: "HZJDQ.NX_GD_HZJG_DQ_P1_L1_001_AI0372"},
 			'hzjq363':{tag: "HZJDQ.NX_GD_HZJG_DQ_P1_L1_001_AI0373"},
-			'hzjdlq364':{tag: "HZJDQ.NX_GD_HZJG_DQ_P1_L1_001_DI1725"},
-			'hzjsc364':{tag: "HZJDQ.NX_GD_HZJG_DQ_P1_L1_001_DI1723"},
-			'hzjkg3640':{tag: "HZJDQ.NX_GD_HZJG_DQ_P1_L1_001_DI1727"},
-			'hzjkg3643':{tag: "HZJDQ.NX_GD_HZJG_DQ_P1_L1_001_DI1720"},
-			'hzjkg36403':{tag: "HZJDQ.NX_GD_HZJG_DQ_P1_L1_001_DI1721"},
-			'hzjdlq3645':{tag: "HZJDQ.NX_GD_HZJG_DQ_P1_L1_001_DI1719"},
 			'hzjla364':{tag: "HZJDQ.NX_GD_HZJG_DQ_P1_L1_001_AI0433"},
 			'hzjp364':{tag: "HZJDQ.NX_GD_HZJG_DQ_P1_L1_001_AI0421"},
 			'hzjq364':{tag: "HZJDQ.NX_GD_HZJG_DQ_P1_L1_001_AI0422"},
-			'hzjsc369':{tag: "HZJDQ.NX_GD_HZJG_DQ_P1_L1_001_DI0129"},
-			'hzjdlq305':{tag: "HZJDQ.NX_GD_HZJG_DQ_P1_L1_001_DI0497"},
-			'hzjsc305':{tag: "HZJDQ.NX_GD_HZJG_DQ_P1_L1_001_DI0495"},
 			'hzjla305':{tag: "HZJDQ.NX_GD_HZJG_DQ_P1_L1_001_AI0046"},
 			'hzjp305':{tag: "HZJDQ.NX_GD_HZJG_DQ_P1_L1_001_AI0052"},
-			'hzjq305':{tag: "HZJDQ.NX_GD_HZJG_DQ_P1_L1_001_AI0053"}
+			'hzjq305':{tag: "HZJDQ.NX_GD_HZJG_DQ_P1_L1_001_AI0053"},
+			'hzjsrdy1':{tag: "HZJGF.NX_GD_HZJG_XB_P1_L1_001_AI0025"},
+			'hzjsrdy2':{tag: "HZJGF.NX_GD_HZJG_XB_P1_L1_002_AI0025"},
+			'hzjsrdy3':{tag: "HZJGF.NX_GD_HZJG_XB_P1_L1_003_AI0025"},
+			'hzjsrdy4':{tag: "HZJGF.NX_GD_HZJG_XB_P1_L1_004_AI0025"},
+			'hzjsrdy5':{tag: "HZJGF.NX_GD_HZJG_XB_P1_L1_005_AI0025"},
+			'hzjsrdy6':{tag: "HZJGF.NX_GD_HZJG_XB_P1_L1_006_AI0025"},
+			'hzjsrdy7':{tag: "HZJGF.NX_GD_HZJG_XB_P1_L1_007_AI0025"},
+			'hzjsrdy8':{tag: "HZJGF.NX_GD_HZJG_XB_P1_L2_008_AI0025"},
+			'hzjsrdy9':{tag: "HZJGF.NX_GD_HZJG_XB_P1_L2_009_AI0025"},
+			'hzjsrdy10':{tag: "HZJGF.NX_GD_HZJG_XB_P1_L2_010_AI0025"},
+			'hzjsrdy11':{tag: "HZJGF.NX_GD_HZJG_XB_P1_L2_011_AI0025"},
+			'hzjsrdy12':{tag: "HZJGF.NX_GD_HZJG_XB_P1_L2_012_AI0025"},
+			'hzjsrdy13':{tag: "HZJGF.NX_GD_HZJG_XB_P1_L2_013_AI0025"},
+			'hzjsrdy14':{tag: "HZJGF.NX_GD_HZJG_XB_P1_L2_014_AI0025"},
+			'hzjscgl1':{tag: "HZJGF.NX_GD_HZJG_XB_P1_L1_001_AI0053"},
+			'hzjscgl2':{tag: "HZJGF.NX_GD_HZJG_XB_P1_L1_002_AI0053"},
+			'hzjscgl3':{tag: "HZJGF.NX_GD_HZJG_XB_P1_L1_003_AI0053"},
+			'hzjscgl4':{tag: "HZJGF.NX_GD_HZJG_XB_P1_L1_004_AI0053"},
+			'hzjscgl5':{tag: "HZJGF.NX_GD_HZJG_XB_P1_L1_005_AI0053"},
+			'hzjscgl6':{tag: "HZJGF.NX_GD_HZJG_XB_P1_L1_006_AI0053"},
+			'hzjscgl7':{tag: "HZJGF.NX_GD_HZJG_XB_P1_L1_007_AI0053"},
+			'hzjscgl8':{tag: "HZJGF.NX_GD_HZJG_XB_P1_L2_008_AI0053"},
+			'hzjscgl9':{tag: "HZJGF.NX_GD_HZJG_XB_P1_L2_009_AI0053"},
+			'hzjscgl10':{tag: "HZJGF.NX_GD_HZJG_XB_P1_L2_010_AI0053"},
+			'hzjscgl11':{tag: "HZJGF.NX_GD_HZJG_XB_P1_L2_011_AI0053"},
+			'hzjscgl12':{tag: "HZJGF.NX_GD_HZJG_XB_P1_L2_012_AI0053"},
+			'hzjscgl13':{tag: "HZJGF.NX_GD_HZJG_XB_P1_L2_013_AI0053"},
+			'hzjscgl14':{tag: "HZJGF.NX_GD_HZJG_XB_P1_L2_014_AI0053"},
+			'hzjrfdl1':{tag: "HZJGF.NX_GD_HZJG_XB_P1_L1_001_AI0009"},
+			'hzjrfdl2':{tag: "HZJGF.NX_GD_HZJG_XB_P1_L1_002_AI0009"},
+			'hzjrfdl3':{tag: "HZJGF.NX_GD_HZJG_XB_P1_L1_003_AI0009"},
+			'hzjrfdl4':{tag: "HZJGF.NX_GD_HZJG_XB_P1_L1_004_AI0009"},
+			'hzjrfdl5':{tag: "HZJGF.NX_GD_HZJG_XB_P1_L1_005_AI0009"},
+			'hzjrfdl6':{tag: "HZJGF.NX_GD_HZJG_XB_P1_L1_006_AI0009"},
+			'hzjrfdl7':{tag: "HZJGF.NX_GD_HZJG_XB_P1_L1_007_AI0009"},
+			'hzjrfdl8':{tag: "HZJGF.NX_GD_HZJG_XB_P1_L2_008_AI0009"},
+			'hzjrfdl9':{tag: "HZJGF.NX_GD_HZJG_XB_P1_L2_009_AI0009"},
+			'hzjrfdl10':{tag: "HZJGF.NX_GD_HZJG_XB_P1_L2_010_AI0009"},
+			'hzjrfdl11':{tag: "HZJGF.NX_GD_HZJG_XB_P1_L2_011_AI0009"},
+			'hzjrfdl12':{tag: "HZJGF.NX_GD_HZJG_XB_P1_L2_012_AI0009"},
+			'hzjrfdl13':{tag: "HZJGF.NX_GD_HZJG_XB_P1_L2_013_AI0009"},
+			'hzjrfdl14':{tag: "HZJGF.NX_GD_HZJG_XB_P1_L2_014_AI0009"},
+			'hzjzfdl1':{tag: "HZJGF.NX_GD_HZJG_XB_P1_L1_001_AI0010"},
+			'hzjzfdl2':{tag: "HZJGF.NX_GD_HZJG_XB_P1_L1_002_AI0010"},
+			'hzjzfdl3':{tag: "HZJGF.NX_GD_HZJG_XB_P1_L1_003_AI0010"},
+			'hzjzfdl4':{tag: "HZJGF.NX_GD_HZJG_XB_P1_L1_004_AI0010"},
+			'hzjzfdl5':{tag: "HZJGF.NX_GD_HZJG_XB_P1_L1_005_AI0010"},
+			'hzjzfdl6':{tag: "HZJGF.NX_GD_HZJG_XB_P1_L1_006_AI0010"},
+			'hzjzfdl7':{tag: "HZJGF.NX_GD_HZJG_XB_P1_L1_007_AI0010"},
+			'hzjzfdl8':{tag: "HZJGF.NX_GD_HZJG_XB_P1_L2_008_AI0010"},
+			'hzjzfdl9':{tag: "HZJGF.NX_GD_HZJG_XB_P1_L2_009_AI0010"},
+			'hzjzfdl10':{tag: "HZJGF.NX_GD_HZJG_XB_P1_L2_010_AI0010"},
+			'hzjzfdl11':{tag: "HZJGF.NX_GD_HZJG_XB_P1_L2_011_AI0010"},
+			'hzjzfdl12':{tag: "HZJGF.NX_GD_HZJG_XB_P1_L2_012_AI0010"},
+			'hzjzfdl13':{tag: "HZJGF.NX_GD_HZJG_XB_P1_L2_013_AI0010"},
+			'hzjzfdl14':{tag: "HZJGF.NX_GD_HZJG_XB_P1_L2_014_AI0010"},			
+			'hzjkg1055':{tag: "HZJDQ.NX_GD_HZJG_DQ_P1_L1_001_DI0323"},
+			'hzjkg10505':{tag: "HZJDQ.NX_GD_HZJG_DQ_P1_L1_001_DI0339"},
+			'hzjkg10503':{tag: "HZJDQ.NX_GD_HZJG_DQ_P1_L1_001_DI0341"},
+			'hzjkg1053':{tag: "HZJDQ.NX_GD_HZJG_DQ_P1_L1_001_DI0331"},
+			'hzjkg1050150':{tag: "HZJDQ.NX_GD_HZJG_DQ_P1_L1_001_DI0681"},
+			'hzjkg1050':{tag: "HZJDQ.NX_GD_HZJG_DQ_P1_L1_001_DI0343"},
+			'hzjkg1050350':{tag: "HZJDQ.NX_GD_HZJG_DQ_P1_L1_001_DI0683"},
+			'hzjkg361':{tag: "HZJDQ.NX_GD_HZJG_DQ_P1_L1_001_DI1091"},
+			'hzjkg362':{tag: "HZJDQ.NX_GD_HZJG_DQ_P1_L1_001_DI1301"},
+			'hzjkg363':{tag: "HZJDQ.NX_GD_HZJG_DQ_P1_L1_001_DI1511"},
+			'hzjkg3640':{tag: "HZJDQ.NX_GD_HZJG_DQ_P1_L1_001_DI1727"},
+			'hzjkg3643':{tag: "HZJDQ.NX_GD_HZJG_DQ_P1_L1_001_DI1720"},
+			'hzjkg36403':{tag: "HZJDQ.NX_GD_HZJG_DQ_P1_L1_001_DI1721"},
+			'hzjdlq105':{tag: "HZJDQ.NX_GD_HZJG_DQ_P1_L1_001_DI0312"},
+			'hzjdlq361':{tag: "HZJDQ.NX_GD_HZJG_DQ_P1_L1_001_DI1092"},
+			'hzjdlq3611':{tag: "HZJGF.NX_GD_HZJG_XB_P1_L1_001_AI0024"},
+			'hzjdlq3612':{tag: "HZJGF.NX_GD_HZJG_XB_P1_L1_002_AI0024"},
+			'hzjdlq3613':{tag: "HZJGF.NX_GD_HZJG_XB_P1_L1_003_AI0024"},
+			'hzjdlq3614':{tag: "HZJGF.NX_GD_HZJG_XB_P1_L1_004_AI0024"},
+			'hzjdlq3615':{tag: "HZJGF.NX_GD_HZJG_XB_P1_L1_005_AI0024"},
+			'hzjdlq3616':{tag: "HZJGF.NX_GD_HZJG_XB_P1_L1_006_AI0024"},
+			'hzjdlq3617':{tag: "HZJGF.NX_GD_HZJG_XB_P1_L1_007_AI0024"},
+			'hzjdlq362':{tag: "HZJDQ.NX_GD_HZJG_DQ_P1_L1_001_DI1302"},
+			'hzjdlq3628':{tag: "HZJGF.NX_GD_HZJG_XB_P1_L2_008_AI0024"},
+			'hzjdlq3629':{tag: "HZJGF.NX_GD_HZJG_XB_P1_L2_009_AI0024"},
+			'hzjdlq36210':{tag: "HZJGF.NX_GD_HZJG_XB_P1_L2_010_AI0024"},
+			'hzjdlq36211':{tag: "HZJGF.NX_GD_HZJG_XB_P1_L2_011_AI0024"},
+			'hzjdlq36212':{tag: "HZJGF.NX_GD_HZJG_XB_P1_L2_012_AI0024"},
+			'hzjdlq36213':{tag: "HZJGF.NX_GD_HZJG_XB_P1_L2_013_AI0024"},
+			'hzjdlq36214':{tag: "HZJGF.NX_GD_HZJG_XB_P1_L2_014_AI0024"},
+			'hzjdlq363':{tag: "HZJDQ.NX_GD_HZJG_DQ_P1_L1_001_DI1512"},
+			'hzjdlq364':{tag: "HZJDQ.NX_GD_HZJG_DQ_P1_L1_001_DI1725"},
+			'hzjdlq3645':{tag: "HZJDQ.NX_GD_HZJG_DQ_P1_L1_001_DI1719"},
+			'hzjdlq305':{tag: "HZJDQ.NX_GD_HZJG_DQ_P1_L1_001_DI0497"},
+			'hzjsc361':{tag: "HZJDQ.NX_GD_HZJG_DQ_P1_L1_001_DI1090"},
+			'hzjsc362':{tag: "HZJDQ.NX_GD_HZJG_DQ_P1_L1_001_DI1300"},
+			'hzjsc363':{tag: "HZJDQ.NX_GD_HZJG_DQ_P1_L1_001_DI1510"},
+			'hzjsc364':{tag: "HZJDQ.NX_GD_HZJG_DQ_P1_L1_001_DI1723"},
+			'hzjsc369':{tag: "HZJDQ.NX_GD_HZJG_DQ_P1_L1_001_DI0129"},
+			'hzjsc305':{tag: "HZJDQ.NX_GD_HZJG_DQ_P1_L1_001_DI0495"}
 		}
 	}
 

src/views/WindSite/components/boosterstation/mch/previewPicture.vue

@@ -1,697 +0,0 @@
-<template>
-	<div class="pop-up-main">
-		<div class="paln-box">
-			<div class="movableItem" :style="{width:width,height:height}" @mousewheel="rollImg($event)"
-				@mousedown="drag($event,1)" ref="bigImage">
-				<!-- 图片不可选中 或不可拖拽到新标签打开-->
-				<slot name="svg" oncontextmenu="return false;" onselectstart="return false;" draggable="false"></slot>
-				<template v-if="isEdit &&iconWidth">
-					<img ref="signImage" :src="iconImgUrl" @mousedown="dragSign($event,key)"
-						v-for="(item,key) in equipment" :key="key"
-						:style="{top:equipment[key].top+'%',left:equipment[key].left+'%',width:iconWidth,height:iconHeight}"
-						class="equipment" />
-				</template>
-				<el-popover width="200" placement="bottom-start" trigger="hover" :close-delay="100" content="暂无描述"
-					v-else-if="!isEdit&&iconWidth &&arrIcon.length==equipment.length " v-for="(item,key) in equipment"
-					:key="key" popper-class="preview-popover">
-					<!-- &&arrIcon.length==equipment.length -->
-					<template>
-						<div v-if="equipment[key].describe" class="describe">
-							<p class="describe-top">{{equipment[key].describe.deviceName}}</p>
-							<p class="describe-center">{{equipment[key].describe.remark}}</p>
-							<p class="describe-bottom">{{equipment[key].describe.location}}</p>
-						</div>
-					</template>
-					<!-- <img oncontextmenu="return false;" onselectstart="return false;" draggable="false" slot="reference"
-						ref="signImage" :src="$baseUrl + equipment[key].iconImgUrl"
-						:style="{top:equipment[key].top+'%',left:equipment[key].left+'%',width:arrIcon[key].iconWidth,height:arrIcon[key].iconHeight}"
-						class="equipment" /> -->
-				</el-popover>
-			</div>
-		</div>
-	</div>
-</template>
-<script>
-	export default {
-		props: {
-			equipment: {
-				type: Array,
-				default: () => {
-					return [{
-						iconImgUrl: "",
-						top: 0,
-						left: 0,
-					}, ];
-				},
-			},
-			isEdit: {
-				default: false,
-			},
-			imgUrl: {},
-		},
-
-		data() {
-			return {
-				// 定时器
-				timer: "",
-				// 图片加载失败
-				imgOnerror: false,
-				imgIndex: 0,
-				isChange: true,
-				// 图片显示默认大小
-				width: "1400px",
-				height: "850px",
-				// 可缩小倍数,为空则可无限缩小
-				minification: 3,
-				// 可放大倍数 为空则可无限放大
-				magnification: "",
-				bigMaxWidth: 1600,
-				bigMaxHeight: 800,
-
-				// 小图标信息
-				iconImgUrl: "",
-				iconWidth: "",
-				// 存储每个小图标处理好的宽高
-				iconHeight: "",
-				arrIcon: [],
-				iconMaxWidth: 32,
-				iconMaxHeight: 32,
-				tog: 1,
-			};
-		},
-		methods: {
-			// 获取图片大小
-			getImgInfo(
-				imgUrl,
-				MaxWidth,
-				MaxHeight,
-				StrWidth,
-				StrHeight,
-				Array = false,
-				arr,
-				num = 0
-			) {
-				var img = new Image();
-
-				// img.src = imgUrl;
-				img = document.getElementsByClassName("svg")
-				let _this = this;
-				img.onerror = () => {
-					// console.log("加载失败！！", _this.arrIcon.length);
-					console.log(imgUrl, MaxWidth, MaxHeight, StrWidth, StrHeight);
-					_this.imgOnerror = true;
-					_this.imgIndex =
-						_this.arrIcon.length - 1 < 0 ? 0 : _this.arrIcon.length - 1;
-					this.timer = setTimeout(() => {
-						if (num <= 5) {
-							_this.getImgInfo(
-								imgUrl,
-								MaxWidth,
-								MaxHeight,
-								StrWidth,
-								StrHeight,
-								Array,
-								arr,
-								num + 1
-							);
-						}
-						clearInterval(this.timer);
-					}, 2000);
-				};
-				img.onload = function(e) {
-					//  显示时 初始 最大宽度
-					let maxWidth = MaxWidth;
-					//  显示时 初始 最大高度
-					let maxHeight = MaxHeight;
-					if (
-						e.path[0].naturalWidth <= maxWidth &&
-						e.path[0].naturalHeight <= maxHeight
-					) {
-						_this[StrWidth] = e.path[0].naturalWidth + "px";
-						_this[StrHeight] = e.path[0].naturalHeight + "px";
-					} else {
-						_this[StrWidth] = e.path[0].naturalWidth + "px";
-						_this[StrHeight] = e.path[0].naturalHeight + "px";
-						if (
-							e.path[0].naturalWidth > maxWidth &&
-							e.path[0].naturalHeight <= maxHeight
-						) {
-							let ratio = e.path[0].naturalWidth / e.path[0].naturalHeight;
-							_this[StrWidth] = "1600px";
-							_this[StrHeight] = maxWidth / ratio + "px";
-						} else if (
-							e.path[0].naturalWidth <= maxWidth &&
-							e.path[0].naturalHeight > maxHeight
-						) {
-							let ratio = e.path[0].naturalWidth / e.path[0].naturalHeight;
-							_this[StrWidth] = maxHeight * ratio + "px";
-							_this[StrHeight] = "800px";
-						} else if (
-							e.path[0].naturalWidth > maxWidth &&
-							e.path[0].naturalHeight > maxHeight
-						) {
-							let ratio = e.path[0].naturalWidth / e.path[0].naturalHeight;
-							let w = maxWidth;
-							let h = w / ratio;
-							if (h > maxHeight) {
-								let ratio2 = w / h;
-								h = maxHeight;
-								w = h * ratio2;
-							}
-							_this[StrWidth] = w + "px";
-							_this[StrHeight] = h + "px";
-						}
-					}
-					if (Array) {
-						_this[arr].push({
-							iconWidth: _this[StrWidth],
-							iconHeight: _this[StrHeight],
-						});
-						console.log(
-							"tow#################################arrIcon",
-							_this[arr].length
-						);
-					}
-					// _this[StrWidth] = `${e.path[0].naturalWidth}px`;
-					// _this[StrHeight] = `${e.path[0].naturalHeight}px`;
-					// vm.$set(vm.imgInfo, "width", img.width);
-					// vm.$set(vm.imgInfo, "height", img.height);
-					// console.log("打印图片信息", imgUrl, _this[StrWidth], _this[StrHeight]); // 打印图片信息
-
-					// console.log("打印图片信息", e.path[0].naturalHeight); // 打印图片信息
-					// console.log("打印图片信息", e); // 打印图片信息
-					// console.log("打印图片信息this.width", _this[StrWidth]); // 打印图片信息
-					// console.log("打印图片信息this.height", _this[StrHeight]); // 打印图片信息
-				};
-			},
-			// 缩放
-			rollImg() {
-				var that = this;
-				// var oImg = document.getElementsByClassName("movableItem")[0];
-				var oImg = this.$refs.bigImage;
-				console.log(
-					"length",
-					document.getElementsByClassName("movableItem").length
-				);
-				console.log("oImg", oImg);
-				var _this = this;
-
-				function fnWheel(obj, fncc) {
-					obj.onmousewheel = fn;
-					if (obj.addEventListener) {
-						obj.addEventListener("DOMMouseScroll", fn, false);
-					}
-
-					function fn(ev) {
-						var oEvent = ev || window.event;
-						var down = true;
-						if (oEvent.detail) {
-							down = oEvent.detail > 0;
-						} else {
-							down = oEvent.wheelDelta < 0;
-						}
-						if (fncc) {
-							fncc.call(this, down, oEvent);
-						}
-						if (oEvent.preventDefault) {
-							oEvent.preventDefault();
-						}
-						return false;
-					}
-				}
-				fnWheel(oImg, function(down, oEvent) {
-					var oldWidth = this.offsetWidth;
-					var oldHeight = this.offsetHeight;
-					var oldLeft = this.offsetLeft;
-					var oldTop = this.offsetTop;
-					var parent = oEvent.path[2];
-					// 获取父元素距离页面可视区域的位置
-					var parentLeft = parent.getBoundingClientRect().left;
-					var parentTop = parent.getBoundingClientRect().top;
-					// 比例 = （点击位置距离可视窗口位置 - 父元素距离可视窗口位置 - 相对定位的left）/ 本身宽度
-					var scaleX = (oEvent.clientX - parentLeft - oldLeft) / oldWidth; //比例
-					var scaleY = (oEvent.clientY - parentTop - oldTop) / oldHeight;
-
-					let nowWidth = this.style.width.split("p")[0];
-					let initWidth = _this.width.split("p")[0];
-					let initHeight = _this.height.split("p")[0];
-
-					let miniFlag = true;
-					let magniFlag = true;
-					if (_this.minification) {
-						// 限制缩小范围
-						if (nowWidth <= parseInt(initWidth / _this.minification)) {
-							miniFlag = false;
-							console.log("限制缩小范围");
-							console.log(
-								"限制缩小范围",
-								nowWidth,
-								parseInt(initWidth / _this.minification)
-							);
-							this.style.width = parseInt(initWidth / _this.minification) + "px";
-							this.style.height =
-								parseInt(initHeight / _this.minification) + "px";
-						}
-						if (_this.magnification) {
-							// 限制放大范围
-							if (nowWidth >= parseInt(initWidth * _this.magnification)) {
-								magniFlag = false;
-								console.log("限制放大范围");
-								this.style.width =
-									parseInt(initWidth * _this.magnification) + "px";
-								this.style.height =
-									parseInt(initHeight * _this.magnification) + "px";
-							}
-						}
-					}
-
-					if (down && miniFlag) {
-						console.log("缩小");
-						this.style.width = parseInt(this.offsetWidth * 0.9) + "px";
-						this.style.height = parseInt(this.offsetHeight * 0.9) + "px";
-						
-						that.width = parseInt(this.offsetWidth * 0.9) + "px";
-						that.height = parseInt(this.offsetHeight * 0.9) + "px";
-					} else if (!down && magniFlag) {
-						console.log("放大");
-						this.style.width = parseInt(this.offsetWidth * 1.1) + "px";
-						this.style.height = parseInt(this.offsetHeight * 1.1) + "px";
-						that.width = parseInt(this.offsetWidth * 1.1) + "px";
-						that.height = parseInt(this.offsetHeight * 1.1) + "px";
-					}
-					var newWidth = this.offsetWidth;
-					var newHeight = this.offsetHeight;
-
-					// 新的相对位置left = 原先的相对位置left - 比例 *（本身新的宽度-旧的宽度）
-					this.style.left =
-						Math.round(this.offsetLeft - scaleX * (newWidth - oldWidth)) + "px";
-					this.style.top =
-						Math.round(this.offsetTop - scaleY * (newHeight - oldHeight)) + "px";
-				});
-				// console.log(that.width)
-			},
-			// },
-			//拖拽
-			drag(ev) {
-				// var ie = document.all;
-				// console.log(ev / 0);
-
-				var nn6 = document.getElementById && !document.all;
-				var isdrag = false;
-				var y, x;
-				var nTY, nTX;
-				var oDragObj;
-
-				function moveMouse(e) {
-					if (isdrag) {
-						oDragObj.style.top =
-							(nn6 ? nTY + e.clientY - y : nTY + event.clientY - y) + "px";
-						oDragObj.style.left =
-							(nn6 ? nTX + e.clientX - x : nTX + event.clientX - x) + "px";
-						return false;
-					}
-				}
-
-				function initDrag(e) {
-					// console.log("点击图片initDrag");
-					var oDragHandle = nn6 ? e.target : event.srcElement;
-					var topElement = "HTML";
-					while (
-						oDragHandle.tagName != topElement &&
-						oDragHandle.className != "movableItem"
-					) {
-						oDragHandle = nn6 ?
-							oDragHandle.parentNode :
-							oDragHandle.parentElement;
-					}
-					if (oDragHandle.className == "movableItem") {
-						isdrag = true;
-						oDragObj = oDragHandle;
-						// 父元素宽高
-						let width = e.path[2].offsetWidth;
-						let height = e.path[2].offsetHeight;
-						// 这里判断第一次获取不到style 样式 默认为 居中50%
-						if (oDragObj.style.top == "") {
-							// nTY = parseInt((50 * height) / 100 + 0);
-							nTY = 0;
-							nTX = parseInt((50 * width) / 100 + 0);
-						} else {
-							nTY = parseInt(oDragObj.style.top + 0);
-							nTX = parseInt(oDragObj.style.left + 0);
-						}
-						y = nn6 ? e.clientY : event.clientY;
-						x = nn6 ? e.clientX : event.clientX;
-						oDragObj.style.cursor = "move";
-						document.onmousemove = moveMouse;
-						return false;
-					}
-				}
-				document.onmousemove = initDrag;
-				// document.onmouseup = new Function("isdrag=false");
-				document.onmouseup = function(e) {
-					isdrag = false;
-					document.onmousemove = null;
-					document.onmouseup = null;
-					var oDragHandle = nn6 ? e.target : event.srcElement;
-					var topElement = "HTML";
-					while (
-						oDragHandle.tagName != topElement &&
-						oDragHandle.className != "movableItem"
-					) {
-						oDragHandle = nn6 ?
-							oDragHandle.parentNode :
-							oDragHandle.parentElement;
-					}
-					if (oDragHandle.className == "movableItem") {
-						oDragObj = oDragHandle;
-						oDragObj.style.cursor = "Default";
-					}
-				};
-				ev = event || window.event;
-
-				// 取消事件冒泡行为
-				// window.event ? (window.event.cancelBubble = true) : ev.stopPropagation();
-			},
-			// 拖拽标记
-			// eslint-disable-next-line no-unused-vars
-			dragSign(ev, key) {
-				var nn6 = document.getElementById && !document.all;
-				var isdrag = false;
-				var y, x;
-				var nTY, nTX;
-				var oDragObj;
-				let _this = this;
-
-				function moveMouse(e) {
-
-					if (isdrag) {
-						this.equipmentKey = key;
-						// console.log("thisequipmentKey", this.equipmentKey);
-
-						let widthItem = e.path[1].style.width.split("p");
-						let heightItem = e.path[1].style.height.split("p");
-						let width = widthItem[0];
-						// eslint-disable-next-line no-unused-vars
-						let height = heightItem[0];
-						let top =
-							((nn6 ?
-									(nTY / 100) * height + e.clientY - y :
-									(nTY / 100) * height + event.clientY - y) /
-								height) *
-							100;
-						let left =
-							((nn6 ?
-									(nTX / 100) * width + e.clientX - x :
-									(nTX / 100) * width + event.clientX - x) /
-								width) *
-							100;
-
-						if (top >= 0 && top <= 100) {
-							_this.equipment[key].top = top;
-						}
-						if (left >= 0 && left <= 100) {
-							_this.equipment[key].left = left;
-						}
-
-						return false;
-					}
-				}
-				// eslint-disable-next-line no-unused-vars
-				function initDrag(e) {
-					// console.log("_this", _this);
-					var oDragHandle = nn6 ? e.target : event.srcElement;
-					var topElement = "HTML";
-					while (
-						oDragHandle.tagName != topElement &&
-						oDragHandle.className.indexOf("equipment") == -1
-					) {
-						oDragHandle = nn6 ?
-							oDragHandle.parentNode :
-							oDragHandle.parentElement;
-					}
-					if (oDragHandle.className.indexOf("equipment") != -1) {
-						isdrag = true;
-						oDragObj = oDragHandle;
-						// 父元素宽高
-						let width = e.path[1].offsetWidth;
-						let height = e.path[1].offsetHeight;
-						// console.log(width, height);
-						console.log("oDragObj.style", oDragObj.style);
-						// 这里判断第一次获取不到style 样式 默认为 居中50%
-						if (oDragObj.style.top == "") {
-							nTY = parseInt((50 * height) / 100 + 0);
-							nTX = parseInt((50 * width) / 100 + 0);
-						} else if (oDragObj.style.top.indexOf("%") != -1) {
-							nTY = oDragObj.style.top.split("%")[0];
-							nTX = oDragObj.style.left.split("%")[0];
-						} else {
-							nTY = parseInt(oDragObj.style.top + 0);
-							nTX = parseInt(oDragObj.style.left + 0);
-						}
-						y = nn6 ? e.clientY : event.clientY;
-						x = nn6 ? e.clientX : event.clientX;
-
-						oDragObj.style.cursor = "move";
-						document.onmousemove = moveMouse;
-						return false;
-					}
-				}
-
-				// document.onmousedown = initDrag;
-				document.onmousemove = initDrag;
-
-				document.onmouseup = function(e) {
-					isdrag = false;
-					document.onmousemove = null;
-					document.onmouseup = null;
-					var oDragHandle = nn6 ? e.target : event.srcElement;
-					var topElement = "HTML";
-					while (
-						oDragHandle.tagName != topElement &&
-						oDragHandle.className != "equipment"
-					) {
-						oDragHandle = nn6 ?
-							oDragHandle.parentNode :
-							oDragHandle.parentElement;
-					}
-					if (oDragHandle.className == "equipment") {
-						oDragObj = oDragHandle;
-						oDragObj.style.cursor = "Default";
-					}
-				};
-
-				// _this.equipmentKey = key;
-				// _this.equipment[_this.equipmentKey].left = l;
-				// _this.equipment[_this.equipmentKey].top = t;
-				ev = event || window.event;
-
-				// 取消事件冒泡行为
-				window.event ? (window.event.cancelBubble = true) : ev.stopPropagation();
-			},
-		},
-		
-		watch: {
-			equipment() {
-				if (this.equipment.length != 0) {
-					this.arrIcon = [];
-					let finish = true;
-					this.equipment.filter((item) => {
-						if (!item.iconImgUrl) {
-							finish = false;
-						}
-						return true;
-					});
-					console.log("finish", finish);
-					if (finish) {
-						this.equipment.filter((item, index) => {
-							if (index >= this.imgIndex) {
-								console.log("iconImgUrl", this.equipment[index].iconImgUrl);
-								this.getImgInfo(
-									this.$baseUrl + item.iconImgUrl,
-									this.iconMaxWidth,
-									this.iconMaxHeight,
-									"iconWidth",
-									"iconHeight",
-									true,
-									"arrIcon"
-								);
-							}
-							// console.log("22filter", index);
-							return true;
-						});
-					}
-				}
-			},
-		},
-		created() {
-			this.getImgInfo(
-				this.imgUrl,
-				this.bigMaxWidth,
-				this.bigMaxHeight,
-				"width",
-				"height"
-			);
-			if (this.equipment.length != 0) {
-				this.arrIcon = [];
-				let finish = true;
-				this.equipment.filter((item) => {
-					if (!item.iconImgUrl) {
-						finish = false;
-					}
-					return true;
-				});
-				// console.log("finish", finish);
-				if (finish) {
-					this.equipment.filter((item, index) => {
-						if (index >= this.imgIndex) {
-							console.log("iconImgUrl", this.equipment[index].iconImgUrl);
-							this.getImgInfo(
-								this.$baseUrl + item.iconImgUrl,
-								this.iconMaxWidth,
-								this.iconMaxHeight,
-								"iconWidth",
-								"iconHeight",
-								true,
-								"arrIcon"
-							);
-						}
-						// console.log("22filter", index);
-						return true;
-					});
-				}
-			}
-
-			this.iconImgUrl = JSON.parse(
-				JSON.stringify(this.$baseUrl + this.equipment[0].iconImgUrl)
-			);
-			// console.log("imgUrl", this.imgUrl);
-			// console.log("equipment", this.equipment);
-			// //禁止鼠标右键
-			// document.oncontextmenu = function() {
-			//   return false;
-			// };
-		},
-	};
-</script>
-<style lang="less">
-	.preview-popover {
-		background-color: #d3edf7dd;
-		padding: 12px;
-
-		.popper__arrow::after {
-			border-bottom-color: #d3edf7dd !important;
-		}
-
-		.describe {
-			p {
-				padding-bottom: 5px;
-
-				&:last-child {
-					padding-bottom: 0px;
-				}
-			}
-
-			.describe-top {
-				// color: sandybrown;
-				// color: red;
-				color: rgb(21, 110, 110);
-			}
-
-			.describe-center {
-				color: rgb(79, 21, 206);
-			}
-
-			.describe-bottom {
-				color: rgb(30, 31, 29);
-			}
-		}
-	}
-</style>
-<style lang="less" scoped>
-	.pop-up-main {
-		width: 100%;
-		height: calc(100vh - 10vh);
-		overflow-y:hidden ;
-
-		.paln-box {
-			width: 100%;
-			height: 100%;
-			position: relative;
-
-			.movableItem {
-				position: absolute;
-				// top: 75%;
-				left: 50%;
-				transform: translate(-50%, -10%);
-
-				img,
-				.svg {
-					z-index: 1;
-					width: 100%;
-					height: 100%;
-				}
-
-				.equipment {
-					position: absolute;
-					top: 0;
-					left: 0;
-					transform: translate(-50%, -50%);
-					z-index: 2;
-					font-size: 40px;
-					// color: red;
-					// background: blue;
-					zoom: 1;
-				}
-			}
-
-			.shuaxin {
-				position: absolute;
-				z-index: 2;
-				font-size: 40px;
-				top: 20px;
-				left: 20px;
-				cursor: pointer;
-
-				&:hover {
-					color: yellowgreen;
-				}
-			}
-
-			.equipment {
-				color: white;
-			}
-
-			&/deep/.el-button {
-				z-index: 2;
-				position: absolute;
-				bottom: 60px;
-				right: 20px;
-				width: 60px;
-				height: 35px;
-
-				span {
-					display: inline-block;
-					position: absolute;
-					top: 50%;
-					left: 50%;
-					transform: translate(-50%, -50%);
-				}
-
-				i {
-					display: inline-block;
-					position: absolute;
-					top: 50%;
-					left: 25%;
-					transform: translate(-50%, -50%);
-				}
-			}
-		}
-	}
-
-	// body {
-	// 		height: 100%;
-	// 		overflow: hidden;
-	// 		margin: 0;
-	// 		padding: 0;
-	// 	}
-</style>

src/views/WindSite/components/boosterstation/nss.vue

@@ -892,7 +892,7 @@
 								</g>
 								<text transform="matrix(1 0 0 1 1377.4387 168.2646)" fill="#FFFFFF"
 									font-family="'MicrosoftYaHei'" font-size="11.9907">
-									103-01
+									103-02
 								</text>
 								<g>
 									<line fill="none" stroke="#40B9B0" stroke-width="2.5" stroke-miterlimit="10"
@@ -970,7 +970,7 @@
 								</g>
 								<text transform="matrix(1 0 0 1 1151.2805 169.2646)" fill="#FFFFFF"
 									font-family="'MicrosoftYaHei'" font-size="11.9907">
-									121-01
+									121-02
 								</text>
 								<g>
 									<line fill="none" stroke="#40B9B0" stroke-width="2.5" stroke-miterlimit="10"
@@ -1564,7 +1564,7 @@
 								</text>
 								<text transform="matrix(1 0 0 1 928.1072 482.0693)" fill="#FFFFFF"
 									font-family="'MicrosoftYaHei'" font-size="11.9907">
-									302-1
+									302-2
 								</text>
 								<g>
 									<line fill="none" stroke="#40B9B0" stroke-width="2.5" stroke-miterlimit="10"
@@ -1652,7 +1652,7 @@
 								</text>
 								<text transform="matrix(1 0 0 1 1508.7219 482.0693)" fill="#FFFFFF"
 									font-family="'MicrosoftYaHei'" font-size="11.9907">
-									303-1
+									303-5
 								</text>
 								<g>
 									<line fill="none" stroke="#40B9B0" stroke-width="2.5" stroke-miterlimit="10"
@@ -2347,7 +2347,7 @@
 								</text>
 								<text transform="matrix(1 0 0 1 1029.9426 550.1611)" fill="#FFFFFF"
 									font-family="'MicrosoftYaHei'" font-size="11.9907">
-									-1
+									-2
 								</text>
 								<text transform="matrix(1 0 0 1 1029.9426 663.8584)" fill="#FFFFFF"
 									font-family="'MicrosoftYaHei'" font-size="11.9907">
@@ -2462,7 +2462,7 @@
 								</text>
 								<text transform="matrix(1 0 0 1 1430.5168 550.1611)" fill="#FFFFFF"
 									font-family="'MicrosoftYaHei'" font-size="11.9907">
-									-1
+									-5
 								</text>
 								<g>
 									<line fill="none" stroke="#40B9B0" stroke-width="2.5" stroke-miterlimit="10"
@@ -2624,7 +2624,7 @@
 								</text>
 								<text transform="matrix(1 0 0 1 1513.0168 550.1611)" fill="#FFFFFF"
 									font-family="'MicrosoftYaHei'" font-size="11.9907">
-									-1
+									-5
 								</text>
 								<text transform="matrix(1 0 0 1 1513.0168 663.8584)" fill="#FFFFFF"
 									font-family="'MicrosoftYaHei'" font-size="11.9907">
@@ -2667,7 +2667,7 @@
 								</text>
 								<text transform="matrix(1 0 0 1 1594.011 550.1611)" fill="#FFFFFF"
 									font-family="'MicrosoftYaHei'" font-size="11.9907">
-									-1
+									-5
 								</text>
 								<text transform="matrix(1 0 0 1 1594.011 663.8584)" fill="#FFFFFF"
 									font-family="'MicrosoftYaHei'" font-size="11.9907">
@@ -2710,7 +2710,7 @@
 								</text>
 								<text transform="matrix(1 0 0 1 1677.3254 550.1611)" fill="#FFFFFF"
 									font-family="'MicrosoftYaHei'" font-size="11.9907">
-									-1
+									-5
 								</text>
 								<text transform="matrix(1 0 0 1 1677.3254 663.8584)" fill="#FFFFFF"
 									font-family="'MicrosoftYaHei'" font-size="11.9907">
@@ -2793,7 +2793,7 @@
 								</text>
 								<text transform="matrix(1 0 0 1 1840.761 550.1611)" fill="#FFFFFF"
 									font-family="'MicrosoftYaHei'" font-size="11.9907">
-									-1
+									-5
 								</text>
 								<rect x="1828.559" y="521.988" fill="#CAA51A" width="2.25" height="11.584" />
 								<rect x="1828.564" y="556.988" fill="#CAA51A" width="2.25" height="131.657" />
@@ -4883,15 +4883,15 @@
 								</text>
 								<text transform="matrix(1 0 0 1 71.3203 106.0535)" fill="#1A823B"
 									font-family="'MicrosoftYaHei'" font-size="9.463">
-									{{ ajaxData.nssuakv2j }}
+									{{ ajaxData.nssuabkv2j }}
 								</text>
 								<text transform="matrix(1 0 0 1 71.3203 126.7195)" fill="#1A823B"
 									font-family="'MicrosoftYaHei'" font-size="9.463">
-									-.--
+									{{ ajaxData.nss3uov2j }}
 								</text>
 								<text transform="matrix(1 0 0 1 71.3203 148.2234)" fill="#1A823B"
 									font-family="'MicrosoftYaHei'" font-size="9.463">
-									-.--
+									{{ ajaxData.nssfhz2j }}
 								</text>
 						
 								<text transform="matrix(1 0 0 1 487.9116 73.7937)" fill="#1A823B"
@@ -4908,7 +4908,7 @@
 								</text>
 								<text transform="matrix(1 0 0 1 487.9111 133.4753)" fill="#1A823B"
 									font-family="'MicrosoftYaHei'" font-size="9.463">
-									-.--
+									{{ ajaxData.nssuxkv2j }}
 								</text>
 								<text transform="matrix(1 0 0 1 487.9111 154.1511)" fill="#1A823B"
 									font-family="'MicrosoftYaHei'" font-size="9.463">
@@ -4929,11 +4929,11 @@
 								</text>
 								<text transform="matrix(1 0 0 1 1060.2441 133.4753)" fill="#1A823B"
 									font-family="'MicrosoftYaHei'" font-size="9.463">
-									-.--
+									{{ ajaxData.nssqmvar2jy }}
 								</text>
 								<text transform="matrix(1 0 0 1 1060.2441 154.1511)" fill="#1A823B"
 									font-family="'MicrosoftYaHei'" font-size="9.463">
-									{{ ajaxData.nsscos2jy }}
+									{{ ajaxData.nssuxkv2jy }}
 								</text>
 						
 								<text transform="matrix(1 0 0 1 1640.2461 95.1296)" fill="#1A823B"
@@ -4963,7 +4963,7 @@
 								</text>
 								<text transform="matrix(1 0 0 1 1779.5313 136.4949)" fill="#1A823B"
 									font-family="'MicrosoftYaHei'" font-size="9.463">
-									-.--
+									{{ ajaxData.nss3uov2y }}
 								</text>
 								<text transform="matrix(1 0 0 1 1779.5313 157.9988)" fill="#1A823B"
 									font-family="'MicrosoftYaHei'" font-size="9.463">
@@ -5042,11 +5042,11 @@
 								</text>
 								<text transform="matrix(1 0 0 1 711.8931 451.7683)" fill="#1A823B"
 									font-family="'MicrosoftYaHei'" font-size="9.463">
-									-.--
+									{{ ajaxData.nss3uo2zb }}
 								</text>
 								<text transform="matrix(1 0 0 1 711.8931 472.0867)" fill="#1A823B"
 									font-family="'MicrosoftYaHei'" font-size="9.463">
-									-.--
+									{{ ajaxData.nssfhz2zb }}
 								</text>
 						
 								<text transform="matrix(1 0 0 1 1106.2656 281.4167)" fill="#1A823B"
@@ -5104,11 +5104,11 @@
 								</text>
 								<text transform="matrix(1 0 0 1 1352.8184 451.7683)" fill="#1A823B"
 									font-family="'MicrosoftYaHei'" font-size="9.463">
-									-.--
+									{{ ajaxData.nss3uov3zb }}
 								</text>
 								<text transform="matrix(1 0 0 1 1352.8184 472.0867)" fill="#1A823B"
 									font-family="'MicrosoftYaHei'" font-size="9.463">
-									-.--
+									{{ ajaxData.nssfhz3zb }}
 								</text>
 						
 								<text transform="matrix(1 0 0 1 1649.1641 362.2957)" fill="#1A823B"
@@ -5189,7 +5189,7 @@
 									</text>
 									<text transform="matrix(1 0 0 1 365.4609 867.3298)" fill="#FFFFFF"
 										font-family="'MicrosoftYaHei'" font-size="10.7648">
-										-.--
+										{{ ajaxData.nsspmwdr1 }}
 									</text>
 									<text transform="matrix(1 0 0 1 360.4941 893.1804)" fill="#FFFFFF"
 										font-family="'MicrosoftYaHei'" font-size="10.7648">
@@ -5273,7 +5273,7 @@
 									</text>
 									<text transform="matrix(1 0 0 1 1019.9316 867.3298)" fill="#FFFFFF"
 										font-family="'MicrosoftYaHei'" font-size="10.7648">
-										-.--
+										{{ ajaxData.nsspmwdr2 }}
 									</text>
 									<text transform="matrix(1 0 0 1 1014.9648 893.1804)" fill="#FFFFFF"
 										font-family="'MicrosoftYaHei'" font-size="10.7648">
@@ -5357,7 +5357,7 @@
 									</text>
 									<text transform="matrix(1 0 0 1 1671.2656 867.3298)" fill="#FFFFFF"
 										font-family="'MicrosoftYaHei'" font-size="10.7648">
-										-.--
+										{{ ajaxData.nsspmwdr3 }}
 									</text>
 									<text transform="matrix(1 0 0 1 1666.2988 893.1804)" fill="#FFFFFF"
 										font-family="'MicrosoftYaHei'" font-size="10.7648">

src/views/WindSite/components/boosterstation/xs.vue

@@ -7798,64 +7798,14 @@
           </g>
           <g>
             <g v-if="ajaxData.xskg11101" id="_1_">
-              <line
-                fill="none"
-                stroke="#AAAAAA"
-                stroke-width="2"
-                stroke-miterlimit="10"
-                x1="778.589"
-                y1="156.168"
-                x2="778.589"
-                y2="173.055"
-              ></line>
-              <path
-                fill="#AAAAAA"
-                d="M764.964,165.107c0,1.436-1.166,2.604-2.602,2.604c-1.434,0-2.602-1.167-2.602-2.604
-				c0-1.436,1.168-2.602,2.602-2.602C763.798,162.505,764.964,163.675,764.964,165.107 M766.866,165.107
-				c0-2.486-2.016-4.505-4.504-4.505s-4.506,2.019-4.506,4.505c0,2.487,2.019,4.506,4.506,4.506
-				C764.85,169.613,766.866,167.595,766.866,165.107L766.866,165.107z"
-              ></path>
-
-              <line
-                fill="none"
-                stroke="#AAAAAA"
-                stroke-width="2"
-                stroke-miterlimit="10"
-                x1="778.362"
-                y1="165.107"
-                x2="765.894"
-                y2="165.107"
-              ></line>
+              <line fill="none" stroke="#AAAAAA" stroke-width="2" stroke-miterlimit="10" x1="778.589" y1="156.168" x2="778.589" y2="173.055" ></line>
+              <path fill="#AAAAAA" d="M764.964,165.107c0,1.436-1.166,2.604-2.602,2.604c-1.434,0-2.602-1.167-2.602-2.604 c0-1.436,1.168-2.602,2.602-2.602C763.798,162.505,764.964,163.675,764.964,165.107 M766.866,165.107 c0-2.486-2.016-4.505-4.504-4.505s-4.506,2.019-4.506,4.505c0,2.487,2.019,4.506,4.506,4.506 C764.85,169.613,766.866,167.595,766.866,165.107L766.866,165.107z" ></path> 
+              <line fill="none" stroke="#AAAAAA" stroke-width="2" stroke-miterlimit="10" x1="778.362" y1="165.107" x2="765.894" y2="165.107" ></line>
             </g>
             <g v-if="ajaxData.xskg11101 == false" id="_1_">
-              <line
-                fill="none"
-                stroke="#AAAAAA"
-                stroke-width="2"
-                stroke-miterlimit="10"
-                x1="778.589"
-                y1="156.168"
-                x2="778.589"
-                y2="173.055"
-              ></line>
-              <path
-                fill="#AAAAAA"
-                d="M764.964,165.107c0,1.436-1.166,2.604-2.604,2.604c-1.434,0-2.6-1.167-2.6-2.604
-				c0-1.436,1.166-2.602,2.6-2.602C763.798,162.506,764.964,163.675,764.964,165.107 M766.866,165.107
-				c0-2.486-2.016-4.505-4.506-4.505c-2.484,0-4.504,2.019-4.504,4.505c0,2.487,2.019,4.506,4.504,4.506
-				C764.851,169.613,766.866,167.595,766.866,165.107L766.866,165.107z"
-              ></path>
-
-              <line
-                fill="none"
-                stroke="#AAAAAA"
-                stroke-width="2"
-                stroke-miterlimit="10"
-                x1="776.476"
-                y1="171.422"
-                x2="765.894"
-                y2="164.609"
-              ></line>
+              <line fill="none" stroke="#AAAAAA" stroke-width="2" stroke-miterlimit="10" x1="778.589" y1="156.168" x2="778.589" y2="173.055" ></line>
+              <path fill="#AAAAAA" d="M764.964,165.107c0,1.436-1.166,2.604-2.604,2.604c-1.434,0-2.6-1.167-2.6-2.604 c0-1.436,1.166-2.602,2.6-2.602C763.798,162.506,764.964,163.675,764.964,165.107 M766.866,165.107 c0-2.486-2.016-4.505-4.506-4.505c-2.484,0-4.504,2.019-4.504,4.505c0,2.487,2.019,4.506,4.504,4.506 C764.851,169.613,766.866,167.595,766.866,165.107L766.866,165.107z" ></path> 
+              <line fill="none" stroke="#AAAAAA" stroke-width="2" stroke-miterlimit="10" x1="776.476" y1="171.422" x2="765.894" y2="164.609" ></line>
             </g>
           </g>
           <g>

src/views/WindSite/components/generalappearance/dwk.vue

@@ -6,7 +6,7 @@
 					<template v-slot:svg>
 						<svg class="svg" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink"
 							version="1.0" id="图层_1" x="0px" y="0px" width="1301.168px" height="430.334px"
-							viewBox="0 0 1301.168 430.334" enable-background="new 0 0 1301.168 430.334"
+							viewBox="0 80 1301.168 430.334" enable-background="new 0 0 1301.168 430.334"
 							xml:space="preserve">
 							<g id="other">
 								<polygon fill="#B21F63" points="649.044,42.542 655.062,24.751 661.081,42.542  ">

src/views/WindSite/components/generalappearance/mch.vue

@@ -4,7 +4,7 @@
 			<el-col :span="24">
 				<previewPicture v-if="datas">
 					<template v-slot:svg>
-						<svg class="svg" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" version="1.0" id="图层_1" x="0px" y="0px" width="1564.422px" height="595.279px" viewBox="0 0 1564.422 595.279" enable-background="new 0 0 1564.422 595.279" xml:space="preserve">
+						<svg class="svg" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" version="1.0" id="图层_1" x="0px" y="0px" width="1564.422px" height="595.279px" viewBox="0 80 1564.422 595.279" enable-background="new 0 0 1564.422 595.279" xml:space="preserve">
 						<g id="other">
 							<rect x="353.733" y="199.787" opacity="0.9" fill="#1B2522" enable-background="new    " width="80.861" height="12.989"></rect>
 							<g>

src/views/WindSite/components/generalappearance/nss.vue

@@ -4,7 +4,7 @@
       <el-col :span="24">
         <previewPicture v-if="datas">
           <template v-slot:svg>
-            <svg class="svg" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" version="1.1" id="图层_1" x="0px" y="0px" width="1497.576px" height="815.74px" viewBox="0 50 1497.576 815.74" enable-background="new 0 0 1497.576 815.74" xml:space="preserve">
+            <svg class="svg" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" version="1.1" id="图层_1" x="0px" y="0px" width="1497.576px" height="815.74px" viewBox="-60 110 1580.576 815.74" enable-background="new 0 0 1497.576 815.74" xml:space="preserve">
             <g id="other">
             	<g>
             		<text transform="matrix(1 0 0 1 36.5847 21.1748)" fill="#FFFFFF" font-family="'MicrosoftYaHeiLight'" font-size="12.3679">运</text>
@@ -3748,7 +3748,7 @@ export default {
 }
 
 .svg {
-  width: 100%;
+  width: 85%;
   height: 100%;
 }
 </style>

src/views/WindSite/components/generalappearance/pl1.vue

@@ -4,7 +4,7 @@
 			<el-col :span="24">
 				<previewPicture v-if="datas">
 					<template v-slot:svg>
-						<svg class="svg" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" version="1.0" id="图层_1" x="0px" y="0px" width="1478.901px" height="468.245px" viewBox="0 0 1478.901 468.245" enable-background="new 0 0 1478.901 468.245" xml:space="preserve">
+						<svg class="svg" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" version="1.0" id="图层_1" x="0px" y="0px" width="1478.901px" height="468.245px" viewBox="0 50 1478.901 468.245" enable-background="new 0 0 1478.901 468.245" xml:space="preserve">
 						<g id="other">
 							<polygon fill="#B7065C" points="742.185,41.53 748.204,23.739 754.222,41.53  "></polygon>
 							<rect x="747.516" y="41.53" fill="#B7065C" width="1.375" height="71.024"></rect>

src/views/WindSite/components/generalappearance/pl2.vue

@@ -4,7 +4,7 @@
 			<el-col :span="24">
 				<previewPicture v-if="datas">
 					<template v-slot:svg>
-						<svg class="svg" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" version="1.0" id="图层_1" x="0px" y="0px" width="1249.89px" height="557.684px" viewBox="0 0 1249.89 557.684" enable-background="new 0 0 1249.89 557.684" xml:space="preserve">
+						<svg class="svg" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" version="1.0" id="图层_1" x="0px" y="0px" width="1249.89px" height="557.684px" viewBox="0 80 1249.89 557.684" enable-background="new 0 0 1249.89 557.684" xml:space="preserve">
 						<g id="other">
 							<rect x="13.945" y="271.406" opacity="0.9" fill="#162320" width="186.348" height="12.99"></rect>
 							<rect x="233.76" y="173.236" opacity="0.9" fill="#162320" width="186.348" height="12.99"></rect>

src/views/WindSite/components/generalappearance/sbq.vue

@@ -4,7 +4,7 @@
       <el-col :span="24">
         <previewPicture v-if="datas">
           <template v-slot:svg>
-            <svg class="svg" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" version="1.1" id="图层_1" x="0px" y="0px" width="1794px" height="788px" viewBox="0 50 1794 788" enable-background="new 0 0 1794 788" xml:space="preserve">
+            <svg class="svg" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" version="1.1" id="图层_1" x="0px" y="0px" width="1794px" height="788px" viewBox="0 86 1794 788" enable-background="new 0 0 1794 788" xml:space="preserve">
             <g id="other">
             	<g opacity="0.6">
             		<path opacity="0.4" fill="#114832" enable-background="new    " d="M44.605,133.222c0,0.709-0.574,1.281-1.283,1.281H8.933    c-0.709,0-1.283-0.572-1.283-1.281v-22.84c0-0.709,0.574-1.281,1.283-1.281h34.392c0.709,0,1.282,0.572,1.282,1.281    L44.605,133.222L44.605,133.222z"></path>

src/views/WindSite/components/generalappearance/xh.vue

@@ -6,7 +6,7 @@
 					<template v-slot:svg>
 						<svg class="svg" version="1.0" id="图层_1" xmlns="http://www.w3.org/2000/svg"
 							xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px" width="1374px" height="557.86px"
-							viewBox="0 0 1374 557.86" enable-background="new 0 0 1374 557.86" xml:space="preserve">
+							viewBox="0 90 1374 557.86" enable-background="new 0 0 1374 557.86" xml:space="preserve">
 							<g id="other">
 								<polygon fill="#B6065C" points="1314.454,24.469 1322.343,5.755 1330.232,24.472 	" />
 								<rect x="1321.816" y="24.5" fill="#B6065C" width="1.375" height="49.073" />

src/views/WindSite/components/generalappearance/xs.vue

@@ -14,7 +14,7 @@
               y="0px"
               width="1399.132px"
               height="800px"
-              viewBox="0 0 1399.132 629.341"
+              viewBox="0 65 1399.132 629.341"
               enable-background="new 0 0 1399.132 629.341"
               xml:space="preserve"
             >

src/views/WindSite/pages/BoosterStation.vue

@@ -41,12 +41,13 @@
     <!-- 马场湖 -->
     <MCH class="booster-station-body" v-if="wpId === 'MCH_GDC'" />
 	
+	<!-- 海子井 -->
+	<HZJ class="booster-station-body" v-if="wpId === 'HZJ_GDC'" />
   </div>
 </template>
 
 <script>
 import BtnGroup2 from "@com/coms/btn/btn-group-double.vue";
-// import bsx6 from "../components/bsx6.vue";
 import MHS from "../components/boosterstation/mhs.vue";
 import NSS from "../components/boosterstation/nss.vue";
 import QS from "../components/boosterstation/qs.vue";
@@ -58,13 +59,12 @@ import PL1 from "../components/boosterstation/pl1.vue";
 import PL2 from "../components/boosterstation/pl2.vue";
 import XH from "../components/boosterstation/pl2.vue";
 import MCH from "../components/boosterstation/mch.vue";
-
+import HZJ from "../components/boosterstation/hzj.vue";
 export default {
   // 名称
   name: "BoosterStation",
   // 使用组件
   components: {
-    // bsx6,
     BtnGroup2,
     MHS,
     NSS,
@@ -77,6 +77,7 @@ export default {
     PL2,
     XH,
     MCH,
+	HZJ
   },
   // 数据
   data() {

src/views/layout/login-page.vue

@@ -5,32 +5,114 @@
         <el-input v-model="username" placeholder="请输入登录名"></el-input>
       </el-form-item>
       <el-form-item class="mg-b-8">
-        <el-input v-model="password" placeholder="请输入密码" show-password></el-input>
+        <el-input
+          v-model="password"
+          placeholder="请输入密码"
+          show-password
+        ></el-input>
       </el-form-item>
     </el-form>
-    <button style="width:100%;" class="btn" @click="Login">登陆</button>
+    <button style="width:100%;" class="btn" @click="Login">登录</button>
   </div>
 </template>
 <script>
 export default {
-  setup() {},
   data() {
     return {
       username: "",
       password: "",
+      token: "",
     };
   },
+  props: { token: "" },
   emits: {
     onLogin: null,
   },
   methods: {
     Login() {
-      this.$emit("onLogin", {
-        username: this.username,
-        password: this.password,
-      });
+      let that = this;
+      if (that.username !== "" && that.password !== "") {
+        that.API.requestData({
+          isMust: false, // 请求是否携带 token ，默认为 true ，可缺省
+          baseURL: "http://192.168.10.44:8082",
+          method: "POST", // 请求方式，默认为 GET ，可缺省
+          subUrl: "sys/login", // 请求接口地址，必传项
+          data: {
+            username: that.username,
+            password: that.password,
+          },
+          success(res) {
+            console.log("res:", res);
+            if (res.data.authToken && res.data.user.laborName) {
+              localStorage.setItem("authToken", res.data.authToken);
+              localStorage.setItem("username", res.data.user.laborName);
+              
+              that.BASE.showMsg({
+                msg: "登录成功",
+                type: "success",
+              });
+              that.$router.push("/"); // 跳转到首页
+            } else {
+              that.BASE.showMsg({
+                type: "error",
+                msg: "输入的账号或密码错误",
+              });
+            }
+          },
+        });
+        // that.$router.push('/monitor/home')
+        // console.log(that.username,"---",that.password)
+      } else {
+        that.BASE.showMsg({
+          type: "warning",
+          msg: "请输入完整的账号或密码",
+        });
+      }
+
+      //       localStorage.setItem("token",'2222')
+      //           that.token=localStorage.getItem('token')
+      // console.log("token:",that.token)
+      // that.$emit("onLogin", {
+      //   username: that.username,
+      //   password: that.password,
+      //   token:that.token
+      // });
+
+      // console.log("token:",that.token)
+      // that.$router.push('/')
     },
   },
+  created() {
+    // console.log("username:", that.username, "----", "password:", that.password);
+    //  that.$nextTick(() => {
+    //   that.API.requestData({
+    //     isMust: false, // 请求是否携带 token ，默认为 true ，可缺省
+    //     baseURL:"http://192.168.10.44:8082",
+    //     method: "POST", // 请求方式，默认为 GET ，可缺省
+    //     subUrl: "admin/loginvue", // 请求接口地址，必传项
+    //     data: {
+    //       username: that.username,
+    //       password: that.password,
+    //     },
+    //     success(res) {
+    //       localStorage.setItem("authToken", res.data.authToken);
+    //       localStorage.setItem("username", res.data.user.laborName);
+
+    //       // that.API.requestData({
+    //       //   method: "POST", // 请求方式，默认为 GET ，可缺省
+    //       //   subUrl: "admin/usermenu", // 请求接口地址，必传项
+    //       //   success() {
+    //       //     that.BASE.showMsg({
+    //       //       msg: "登陆成功",
+    //       //       type: "success",
+    //       //     });
+    //       //     that.$router.push('/'); // 跳转到首页
+    //       //   },
+    //       // });
+    //     },
+    //   });
+    // });
+  },
 };
 </script>
 

src/views/report/ExportExcel.vue

@@ -198,13 +198,13 @@
 						},
 						success(res) {
 							if (res.code == 200) {
-								if (thisIndex!=undefined) {//一键导出
+								if (thisIndex!=undefined) {//单击导出
 									if (that.templateId == 1) {//模板1
 										that.export(res.data, 0, that.zipNames[thisIndex]);
 									} else if (that.templateId == 2) {//模板2
 										that.exportMuban2(res.data, 0, that.zipNames[thisIndex]);
 									}
-								} else {//单击导出
+								} else {//一键导出
 									if (that.templateId == 1) {
 										that.export(res.data, 0, that.zipNames[_index], ++_index);
 									} else if (that.templateId == 2) {
@@ -325,7 +325,7 @@
 						}
 					}else{
 						that.exportMuban2(data, _index, excelName);
-						if (that.stations.length == deepIndex && _index == 1) { //当长度一致时，向zip塞值，_index只让执行第一次
+						if (that.stations.length && _index == 1) { //当长度一致时，向zip塞值，_index只让执行第一次
 							var thisPath = that.paths,
 								thisPathName = that.pathName;
 							that.tempArrayS = [];

src/views/warn/czjl.vue

@@ -0,0 +1,279 @@
+<template>
+  <div class="knowledge-2">
+    <div class="query mg-b-8">
+      <div class="query-items">
+        <div class="query-item">
+          <div class="lable">场站：</div>
+          <div class="search-input">
+            <el-select v-model="wpId" clearable placeholder="请选择" popper-class="select" @change="(wpId) => { getWt(wpId, true); }">
+              <el-option v-for="item in wpArray" :key="item.id" :value="item.id" :label="item.name" />
+            </el-select>
+          </div>
+        </div>
+        <div class="query-item">
+          <div class="lable">风机：</div>
+          <div class="search-input">
+            <el-select v-model="wtId" clearable placeholder="请选择" popper-class="select">
+              <el-option v-for="item in wtArray" :key="item.id" :value="item.id" :label="item.name" />
+            </el-select>
+          </div>
+        </div>
+        <div class="query-item">
+          <div class="lable">类型：</div>
+          <div class="search-input">
+            <el-select v-model="type" clearable placeholder="请选择" popper-class="select">
+              <el-option v-for="item in typeArray" :key="item.id" :value="item.id" :label="item.name" />
+            </el-select>
+          </div>
+        </div>
+        <div class="query-item">
+          <div class="query-item">
+            <div class="lable">开始日期：</div>
+            <div class="search-input">
+              <el-date-picker v-model="value1" @change="BeginChange(value1)" type="date" value-format="YYYY-MM-DD"
+                placeholder="选择日期" popper-class="date-select">
+              </el-date-picker>
+            </div>
+          </div>
+          <div class="query-item">
+            <div class="lable">结束日期：</div>
+            <div class="search-input">
+              <el-date-picker v-model="value2" @change="EndChange(value2)" type="date" value-format="YYYY-MM-DD"
+                placeholder="选择日期" popper-class="date-select">
+              </el-date-picker>
+              <div class="unit svg-icon svg-icon-gray">
+                <svg-icon :svgid="''" />
+              </div>
+            </div>
+          </div>
+        </div>
+      </div>
+      <div class="query-actions" style="margin-right: 1500px">
+        <button class="btn green" @click="onClickSearch">查询的</button>
+      </div>
+    </div>
+    <div>
+      <ComTable :data="tableData" height="85vh"></ComTable>
+    </div>
+  </div>
+</template>
+
+<script>
+import ComTable from "@com/coms/table/table.vue";
+
+export default {
+  components: { ComTable },
+  data () {
+    return {
+      value1: "",
+      value2: "",
+      wpId: "",
+      wpArray: [],
+      wpName: "",
+      wtId: "",
+      type: "",
+      typeArray: [
+
+        {
+          id: 4,
+          name: '维护'
+        },
+        {
+          id: 2,
+          name: '故障'
+        }],
+      tableData: {
+        column: [
+          {
+            name: "场站",
+            field: "wpName",
+            is_num: true,
+            is_light: false,
+          },
+          {
+            name: "机组",
+            field: "wtName",
+            is_num: false,
+            is_light: false,
+          },
+          {
+            name: "开始时刻",
+            field: "stopTime",
+            is_num: false,
+            is_light: false,
+          },
+          {
+            name: "结束时刻",
+            field: "startTime",
+            is_num: false,
+            is_light: false,
+          },
+          {
+            name: "停机小时数(h)",
+            field: "stopHours",
+            is_num: false,
+            is_light: false,
+          },
+          {
+            name: "状态",
+            field: "statusName",
+            is_num: false,
+            is_light: false,
+          },
+          {
+            name: "停机类型",
+            field: "warnDesc",
+            is_num: false,
+            is_light: false,
+          },
+          {
+            name: "损失电量(kWh)",
+            field: "lossPower",
+            is_num: false,
+            is_light: false,
+          },
+          {
+            name: "报警信息",
+            field: "handleWay",
+            is_num: false,
+            is_light: false,
+          },
+        ],
+        data: [],
+      },
+    };
+  },
+  created () {
+    // this.requestSafeList();
+    this.value1 = new Date((new Date().getTime() - 3600 * 1000 * 24)).formatDate("yyyy-MM-dd");
+    this.value2 = this.getTime(2);
+    this.getWp();
+    this.requestSafeList();
+  },
+  methods: {
+    getTime (val) { //时间戳处理，val=1是默认开始时间（当前月第一天），val=2是默认结束时间（今天）
+      var date = new Date();
+      var year = date.getFullYear(),
+        month = date.getMonth() + 1,
+        day = date.getDate();
+      month >= 1 && month <= 9 ? (month = '0' + month) : '';
+      day >= 0 && day <= 9 ? (day = '0' + day) : '';
+      var begin = year + '-' + month + '-01';
+      var end = year + '-' + month + '-' + day;
+      if (val == 1) {
+        return begin;
+      } else if (val == 2) {
+        return end;
+      }
+    },
+    // 获取风场
+    getWp (reGetWp) {
+      let that = this;
+      that.API.requestData({
+        baseURL: "http://10.155.32.4:9001",
+        subUrl: "benchmarking/wplist",
+        success (res) {
+          that.wpArray = res.data;
+          that.wpId = res.data[0].id;
+          that.wpName = res.data[0].wpName;
+          that.getWt(that.wpId, reGetWp);
+        }
+      });
+    },
+
+    // 获取风机
+    getWt (wpid, reGetWp) {
+      let that = this;
+      if (that.wpId) {
+        that.API.requestData({
+          method: "GET",
+          baseURL: "http://10.155.32.4:9001",
+          subUrl: "benchmarking/wtList",
+          data: {
+            wpid
+          },
+          success (res) {
+            that.wtArray = res.data;
+            // that.wtId = res.data[0].id;
+          }
+        });
+      }
+    },
+    BeginChange (vl) {
+      this.value1 = vl;
+    },
+    EndChange (vl) {
+      this.value2 = vl;
+    },
+    typeChange (vl) {
+      this.type = vl;
+    },
+    // 搜索按钮
+    onClickSearch () {
+      this.requestSafeList();
+    },
+    // 获取停机事件
+    requestSafeList () {
+      let that = this;
+
+      let data = {
+        tablepar: {
+          pageNum: 1,
+          pageSize: 1000,
+        },
+        beginDate: that.value1,
+        endDate: that.value2,
+        wpId: that.wpId,
+      };
+
+      if (that.wtId != '') data.wtId = that.wtId;
+      if (that.type != '') data.type = that.type;
+
+      this.API.requestData({
+        method: "POST",
+        subUrl: "/event/getShutdownevent",
+        data,
+        success (res) {
+          if (res.code == 200) {
+            that.tableData.data = [];
+            if (res.data.list.length) {
+              let data = res.data.list;
+              for (var i = 0; i < data.length; i++) {
+                let obj = {
+                  wpName: data[i].wpName,
+                  wtName: data[i].wtName,
+                  stopTime: new Date(data[i].stopTime).formatDate("yyyy-MM-dd hh:mm:ss"),
+
+                  stopHours: data[i].stopHours,
+                  statusName: data[i].statusName,
+                  warnDesc: data[i].warnDesc,
+                  lossPower: data[i].lossPower,
+                  handleWay: data[i].handleWay,
+
+                };
+                if (data[i].startTime) obj.startTime = new Date(data[i].startTime).formatDate("yyyy-MM-dd hh:mm:ss");
+                that.tableData.data.push(obj);
+              }
+            }
+
+          }
+        },
+      });
+    },
+  },
+};
+</script>
+
+<style lang="less" scope>
+@titleGray: #9ca5a8;
+@rowGray: #606769;
+@darkBack: #536268;
+.knowledge-2 {
+  .el-select {
+    width: 200px;
+  }
+  .el-input {
+    width: 200px;
+  }
+}
+</style>

src/views/warn/xdgl.vue

@@ -34,6 +34,7 @@
 			</div>
 			<div class="query-actions" style="margin-right: 1500px">
 				<button class="btn green" @click="onClickSearch">查询</button>
+				<button class="btn green" @click="exportCsv">导出</button>
 			</div>
 		</div>
 		<div>
@@ -83,10 +84,10 @@
 
 <script>
 	import ComTable from "@com/coms/table/table.vue";
-
+	import Papa from 'papaparse';
 	export default {
 		components: {
-			ComTable
+			ComTable,Papa
 		},
 		data() {
 			const that = this;
@@ -251,6 +252,23 @@
 			this.requestSafeList();
 		},
 		methods: {
+			exportCsv() {
+				var csv = Papa.unparse(this.tableData);
+				//定义文件内容，类型必须为Blob 否则createObjectURL会报错
+				let content = new Blob([csv]);
+				//生成url对象
+				let urlObject = window.URL || window.webkitURL || window;
+				let url = urlObject.createObjectURL(content);
+				//生成<a></a>DOM元素
+				let el = document.createElement("a");
+				//链接赋值
+				el.href = url;
+				el.download = "限电事件.cvs";
+				//必须点击否则不会下载
+				el.click();
+				//移除链接释放资源
+				urlObject.revokeObjectURL(url);
+			},
 			getTime(val) { //时间戳处理，val=1是默认开始时间（当前月第一天），val=2是默认结束时间（今天）
 				var date = new Date();
 				var year = date.getFullYear(),

src/views/warn/ztzhjl.vue

@@ -0,0 +1,279 @@
+<template>
+	<div class="knowledge-2">
+		<div class="query mg-b-8">
+			<div class="query-items">
+				<div class="query-item">
+					<div class="lable">场站：</div>
+					<div class="search-input">
+						<el-select v-model="wpId" clearable placeholder="请选择" popper-class="select"
+							@change="(wpId) => { getWt(wpId, true); }">
+							<el-option v-for="item in wpArray" :key="item.id" :value="item.id" :label="item.name" />
+						</el-select>
+					</div>
+				</div>
+				<div class="query-item">
+					<div class="lable">风机：</div>
+					<div class="search-input">
+						<el-select v-model="wtId" clearable placeholder="请选择" popper-class="select">
+							<el-option v-for="item in wtArray" :key="item.id" :value="item.id" :label="item.name" />
+						</el-select>
+					</div>
+				</div>
+				<div class="query-item">
+					<div class="lable">类型：</div>
+					<div class="search-input">
+						<el-select v-model="type" clearable placeholder="请选择" popper-class="select">
+							<el-option v-for="item in typeArray" :key="item.id" :value="item.id" :label="item.name" />
+						</el-select>
+					</div>
+				</div>
+				<div class="query-item">
+					<div class="query-item">
+						<div class="lable">开始日期：</div>
+						<div class="search-input">
+							<el-date-picker v-model="value1" @change="BeginChange(value1)" type="date"
+								value-format="YYYY-MM-DD" placeholder="选择日期" popper-class="date-select">
+							</el-date-picker>
+						</div>
+					</div>
+					<div class="query-item">
+						<div class="lable">结束日期：</div>
+						<div class="search-input">
+							<el-date-picker v-model="value2" @change="EndChange(value2)" type="date"
+								value-format="YYYY-MM-DD" placeholder="选择日期" popper-class="date-select">
+							</el-date-picker>
+							<div class="unit svg-icon svg-icon-gray">
+								<svg-icon :svgid="''" />
+							</div>
+						</div>
+					</div>
+				</div>
+			</div>
+			<div class="query-actions" style="margin-right: 1500px">
+				<button class="btn green" @click="onClickSearch">查询</button>
+				<button class="btn green" @click="exportCsv">导出</button>
+			</div>
+		</div>
+		<el-row :type="'flex'" class="content">
+			<el-col :span="12">
+				<ComTable :data="tableData" height="85vh"></ComTable>
+			</el-col>
+			<el-col :span="12">
+
+			</el-col>
+		</el-row>
+	</div>
+</template>
+
+<script>
+	import ComTable from "@com/coms/table/table.vue";
+	import Papa from 'papaparse';
+	export default {
+		components: {
+			ComTable,
+			Papa
+		},
+		data() {
+			return {
+				value1: "",
+				value2: "",
+				wpId: "",
+				wpArray: [],
+				wpName: "",
+				wtId: "",
+				type: "",
+				typeArray: [
+
+					{
+						id: 4,
+						name: '维护'
+					},
+					{
+						id: 2,
+						name: '故障'
+					}
+				],
+				tableData: {
+					column: [{
+							name: "编号",
+							field: "index",
+							is_num: false,
+							is_light: false,
+						},
+						{
+							name: "转换时间",
+							field: "time",
+							is_num: false,
+							is_light: false,
+						},
+						{
+							name: "转换前类型",
+							field: "qType",
+							is_num: false,
+							is_light: false,
+						},
+						{
+							name: "转换后类型",
+							field: "hType",
+							is_num: false,
+							is_light: false,
+						}, {
+							name: "关联风机",
+							field: "glfj",
+							is_num: false,
+							is_light: false,
+						}
+					],
+					data: [],
+				},
+			};
+		},
+		created() {
+			// this.requestSafeList();
+			this.value1 = new Date((new Date().getTime() - 3600 * 1000 * 24)).formatDate("yyyy-MM-dd");
+			this.value2 = this.getTime(2);
+			this.getWp();
+			this.requestSafeList();
+		},
+		methods: {
+			exportCsv() {
+				var csv = Papa.unparse(this.tableData);
+				//定义文件内容，类型必须为Blob 否则createObjectURL会报错
+				let content = new Blob([csv]);
+				//生成url对象
+				let urlObject = window.URL || window.webkitURL || window;
+				let url = urlObject.createObjectURL(content);
+				//生成<a></a>DOM元素
+				let el = document.createElement("a");
+				//链接赋值
+				el.href = url;
+				el.download = "文件导出.cvs";
+				//必须点击否则不会下载
+				el.click();
+				//移除链接释放资源
+				urlObject.revokeObjectURL(url);
+			},
+			getTime(val) { //时间戳处理，val=1是默认开始时间（当前月第一天），val=2是默认结束时间（今天）
+				var date = new Date();
+				var year = date.getFullYear(),
+					month = date.getMonth() + 1,
+					day = date.getDate();
+				month >= 1 && month <= 9 ? (month = '0' + month) : '';
+				day >= 0 && day <= 9 ? (day = '0' + day) : '';
+				var begin = year + '-' + month + '-01';
+				var end = year + '-' + month + '-' + day;
+				if (val == 1) {
+					return begin;
+				} else if (val == 2) {
+					return end;
+				}
+			},
+			// 获取风场
+			getWp(reGetWp) {
+				let that = this;
+				that.API.requestData({
+					baseURL: "http://10.155.32.4:9001",
+					subUrl: "benchmarking/wplist",
+					success(res) {
+						that.wpArray = res.data;
+						that.wpId = res.data[0].id;
+						that.wpName = res.data[0].wpName;
+						that.getWt(that.wpId, reGetWp);
+					}
+				});
+			},
+
+			// 获取风机
+			getWt(wpid, reGetWp) {
+				let that = this;
+				if (that.wpId) {
+					that.API.requestData({
+						method: "GET",
+						baseURL: "http://10.155.32.4:9001",
+						subUrl: "benchmarking/wtList",
+						data: {
+							wpid
+						},
+						success(res) {
+							that.wtArray = res.data;
+							// that.wtId = res.data[0].id;
+						}
+					});
+				}
+			},
+			BeginChange(vl) {
+				this.value1 = vl;
+			},
+			EndChange(vl) {
+				this.value2 = vl;
+			},
+			typeChange(vl) {
+				this.type = vl;
+			},
+			// 搜索按钮
+			onClickSearch() {
+				this.requestSafeList();
+			},
+			// 获取停机事件
+			requestSafeList() {
+				let that = this;
+
+				let data = {
+					tablepar: {
+						pageNum: 1,
+						pageSize: 1000,
+					},
+					beginDate: that.value1,
+					endDate: that.value2,
+					wpId: that.wpId,
+				};
+
+				if (that.wtId != '') data.wtId = that.wtId;
+				if (that.type != '') data.type = that.type;
+
+				this.API.requestData({
+					method: "POST",
+					subUrl: "/event/getShutdownevent",
+					data,
+					success(res) {
+						if (res.code == 200) {
+							that.tableData.data = [];
+							if (res.data.list.length) {
+								let data = res.data.list;
+								// for (var i = 0; i < data.length; i++) {
+								// 	let obj = {
+								// 		index: i,
+								// 		time: data[i].,
+								// 		qType: data[i].,
+								// 		hType: new Date(data[i].stopTime).formatDate("yyyy-MM-dd hh:mm:ss"),
+								// 		glfj: data[i].,
+								// 	};
+								// 	if (data[i].startTime) obj.startTime = new Date(data[i].startTime).formatDate(
+								// 		"yyyy-MM-dd hh:mm:ss");
+								// 	that.tableData.data.push(obj);
+								// }
+							}
+
+						}
+					},
+				});
+			},
+		},
+	};
+</script>
+
+<style lang="less" scope>
+	@titleGray: #9ca5a8;
+	@rowGray: #606769;
+	@darkBack: #536268;
+
+	.knowledge-2 {
+		.el-select {
+			width: 200px;
+		}
+
+		.el-input {
+			width: 200px;
+		}
+	}
+</style>