update

src/App.vue

@@ -67,13 +67,13 @@
       subscribe() {
         setTimeout(() => {
           this.subscribe()
-        }, 30000);
+        }, 20000);
         if (!this.$store.state.observers) {
           let mb = MessageBridge.getInstance();
           let windturbine = [{ key: "/topic/windturbine", action: this.windturbineMessage }];
           let popup = [{ key: "/topic/fault-popup", action: this.faultMessage }];
           let title = [{ key: "/topic/title-info", action: this.titleInfos }];
-          var suggestion = [{ key: "/topic/suggestion", action: this.suggestion }];
+          let suggestion = [{ key: "/topic/suggestion", action: this.suggestion }];
           mb.register(suggestion);
           mb.register(title);
           mb.register(windturbine);

src/components/BasicInformationDetail.vue

@@ -368,7 +368,7 @@
       },
       /* 刷新数据 */
       refreshData() {
-        var bg = BackgroundData.getInstance();
+        let bg = BackgroundData.getInstance();
         let mark = BackgroundData.getInstance().Marks;
         console.log(mark);
         bg.initWinturbineBaseData(this.BasicInfo, this.onMessage);
@@ -379,7 +379,7 @@
       onMessage(msg) {
         this.BasicInfo.BasicInfo.forEach((element) => {
           element.param.forEach((im) => {
-            var val = msg[im.code];
+            let val = msg[im.code];
             if (typeof val !== "undefined") {
               if (im.unit == "万度") {
                 im.value = (val.doubleValue / 10000).toFixed(2);
@@ -424,8 +424,8 @@
         });
       },
       querySearch(queryString, cb) {
-        var restaurants = this.restaurants;
-        var results = queryString
+        let restaurants = this.restaurants;
+        let results = queryString
           ? restaurants.filter(this.createFilter(queryString))
           : restaurants;
         // 调用 callback 返回建议列表的数据
@@ -550,17 +550,17 @@
       /* 控制成功 */
       controlSuccess(msg) {
         console.log(msg);
-        var mss = '';     // 信息
-        var iserror = false;// 是否有控制错误的风机
-        for (var v in msg.data) {
-          var val = msg.data[v];
+        let mss = '';     // 信息
+        let iserror = false;// 是否有控制错误的风机
+        for (let v in msg.data) {
+          let val = msg.data[v];
           if (val.errorCode > 0) {
             iserror = true;
             mss += `${val.windturbineId}  ${this.controlErorCodes[val.errorCode]}\n`;
           }
         }
-        var tp = iserror ? "warning" : "success";
-        var dt = iserror ? 0 : 4500;
+        let tp = iserror ? "warning" : "success";
+        let dt = iserror ? 0 : 4500;
         if (!iserror) {
           mss = "控制成功";
         }

src/components/BoosterStation/mch.vue

@@ -2817,9 +2817,7 @@
 </template>
 <script>
 	import previewPicture from "./previewPicture.vue";
-	import {
-		BoosterStation
-	} from "utils/BoosterStation";
+	import { BoosterStation } from "utils/BoosterStation";
 	export default {
 		components: {
 			previewPicture
@@ -2874,4 +2872,4 @@
 		width: 100%;
 		height: 100%;
 	}
-</style>
+</style>

src/components/BoosterStation/pl2.vue

@@ -4,7 +4,7 @@
 			<el-col :span="24">
 				<previewPicture>
 					<template v-slot:svg>
-<svg class="svg" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink"
+						<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="1853.732px" height="885.063px"
 							viewBox="0 0 1853.732 885.063" enable-background="new 0 0 1853.732 885.063"
 							xml:space="preserve">
@@ -3598,7 +3598,7 @@
 </template>
 <script>
 	import previewPicture from "./previewPicture.vue";
-	import {BoosterStation} from "utils/BoosterStation";
+	import { BoosterStation } from "utils/BoosterStation";
 	export default {
 		components: {
 			previewPicture
@@ -3613,7 +3613,7 @@
 		},
 		created() {
 			this.boosterStation = new BoosterStation();
-	
+
 			this.refreshTPData()
 			this.interval = setInterval(this.refreshTPData, 3000)
 		},
@@ -3622,10 +3622,10 @@
 				clearInterval(this.interval);
 			},
 			refreshTPData() {
-				this.boosterStation.getDatas("PL2_GDC",this.bindValue);
+				this.boosterStation.getDatas("PL2_GDC", this.bindValue);
 			},
-			bindValue(msg){
-				this.ajaxData=msg;
+			bindValue(msg) {
+				this.ajaxData = msg;
 			},
 		}
 	};
@@ -3653,4 +3653,4 @@
 		width: 100%;
 		height: 100%;
 	}
-</style>
+</style>

src/components/BoosterStation/previewPicture.vue

@@ -127,7 +127,7 @@ export default {
       arr,
       num = 0
     ) {
-      var img = new Image();
+      let img = new Image();
 
       // img.src = imgUrl;
       img = document.getElementsByClassName("svg");
@@ -222,15 +222,15 @@ export default {
     },
     // 缩放
     rollImg() {
-      var that = this;
-      // var oImg = document.getElementsByClassName("movableItem")[0];
-      var oImg = this.$refs.bigImage;
+      let that = this;
+      // let oImg = document.getElementsByClassName("movableItem")[0];
+      let oImg = this.$refs.bigImage;
       // console.log(
       // 	"length",
       // 	document.getElementsByClassName("movableItem").length
       // );
       // console.log("oImg", oImg);
-      var _this = this;
+      let _this = this;
 
       function fnWheel(obj, fncc) {
         obj.onmousewheel = fn;
@@ -239,8 +239,8 @@ export default {
         }
 
         function fn(ev) {
-          var oEvent = ev || window.event;
-          var down = true;
+          let oEvent = ev || window.event;
+          let down = true;
           if (oEvent.detail) {
             down = oEvent.detail > 0;
           } else {
@@ -256,17 +256,17 @@ export default {
         }
       }
       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];
+        let oldWidth = this.offsetWidth;
+        let oldHeight = this.offsetHeight;
+        let oldLeft = this.offsetLeft;
+        let oldTop = this.offsetTop;
+        let parent = oEvent.path[2];
         // 获取父元素距离页面可视区域的位置
-        var parentLeft = parent.getBoundingClientRect().left;
-        var parentTop = parent.getBoundingClientRect().top;
+        let parentLeft = parent.getBoundingClientRect().left;
+        let parentTop = parent.getBoundingClientRect().top;
         // 比例 = （点击位置距离可视窗口位置 - 父元素距离可视窗口位置 - 相对定位的left）/ 本身宽度
-        var scaleX = (oEvent.clientX - parentLeft - oldLeft) / oldWidth; //比例
-        var scaleY = (oEvent.clientY - parentTop - oldTop) / oldHeight;
+        let scaleX = (oEvent.clientX - parentLeft - oldLeft) / oldWidth; //比例
+        let scaleY = (oEvent.clientY - parentTop - oldTop) / oldHeight;
 
         let nowWidth = this.style.width.split("p")[0];
         let initWidth = _this.width.split("p")[0];
@@ -314,8 +314,8 @@ export default {
           that.width = parseInt(this.offsetWidth * 1.1) + "px";
           that.height = parseInt(this.offsetHeight * 1.1) + "px";
         }
-        var newWidth = this.offsetWidth;
-        var newHeight = this.offsetHeight;
+        let newWidth = this.offsetWidth;
+        let newHeight = this.offsetHeight;
 
         // 新的相对位置left = 原先的相对位置left - 比例 *（本身新的宽度-旧的宽度）
         this.style.left =
@@ -328,12 +328,12 @@ export default {
     // },
     //拖拽
     drag(ev) {
-      // var ie = document.all;
-      var nn6 = document.getElementById && !document.all;
-      var isdrag = false;
-      var y, x;
-      var nTY, nTX;
-      var oDragObj;
+      // let ie = document.all;
+      let nn6 = document.getElementById && !document.all;
+      let isdrag = false;
+      let y, x;
+      let nTY, nTX;
+      let oDragObj;
 
       function moveMouse(e) {
         if (isdrag) {
@@ -347,8 +347,8 @@ export default {
 
       function initDrag(e) {
         // console.log("点击图片initDrag");
-        var oDragHandle = nn6 ? e.target : event.srcElement;
-        var topElement = "HTML";
+        let oDragHandle = nn6 ? e.target : event.srcElement;
+        let topElement = "HTML";
         while (
           oDragHandle.tagName != topElement &&
           oDragHandle.className != "movableItem"
@@ -384,8 +384,8 @@ export default {
         isdrag = false;
         document.onmousemove = null;
         document.onmouseup = null;
-        var oDragHandle = nn6 ? e.target : event.srcElement;
-        var topElement = "HTML";
+        let oDragHandle = nn6 ? e.target : event.srcElement;
+        let topElement = "HTML";
         while (
           oDragHandle.tagName != topElement &&
           oDragHandle.className != "movableItem"
@@ -405,13 +405,13 @@ export default {
       // window.event ? (window.event.cancelBubble = true) : ev.stopPropagation();
     },
     // 拖拽标记
-    // eslint-disable-next-line no-unused-vars
+    // eslint-disable-next-line no-unused-lets
     dragSign(ev, key) {
-      var nn6 = document.getElementById && !document.all;
-      var isdrag = false;
-      var y, x;
-      var nTY, nTX;
-      var oDragObj;
+      let nn6 = document.getElementById && !document.all;
+      let isdrag = false;
+      let y, x;
+      let nTY, nTX;
+      let oDragObj;
       let _this = this;
 
       function moveMouse(e) {
@@ -422,7 +422,7 @@ export default {
           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
+          // eslint-disable-next-line no-unused-lets
           let height = heightItem[0];
           let top =
             ((nn6
@@ -450,8 +450,8 @@ export default {
       // eslint-disable-next-line no-unused-vars
       function initDrag(e) {
         // console.log("_this", _this);
-        var oDragHandle = nn6 ? e.target : event.srcElement;
-        var topElement = "HTML";
+        let oDragHandle = nn6 ? e.target : event.srcElement;
+        let topElement = "HTML";
         while (
           oDragHandle.tagName != topElement &&
           oDragHandle.className.indexOf("equipment") == -1
@@ -496,8 +496,8 @@ export default {
         isdrag = false;
         document.onmousemove = null;
         document.onmouseup = null;
-        var oDragHandle = nn6 ? e.target : event.srcElement;
-        var topElement = "HTML";
+        let oDragHandle = nn6 ? e.target : event.srcElement;
+        let topElement = "HTML";
         while (
           oDragHandle.tagName != topElement &&
           oDragHandle.className != "equipment"

src/components/BoosterStation/sbq.vue

@@ -4,8 +4,8 @@
 			<el-col :span="24">
 				<previewPicture>
 					<template v-slot:svg>
-						
-<svg class="svg" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink"
+
+						<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="1864.602px" height="860.264px"
 							viewBox="0 0 1864.602 860.264" enable-background="new 0 0 1864.602 860.264"
 							xml:space="preserve">
@@ -3448,7 +3448,7 @@
 									</text>
 									<text transform="matrix(1 0 0 1 18.2708 855.1438)" fill="#FFFFFF"
 										font-family="'MicrosoftYaHei'" font-size="8.6118">
-										MVar
+										kVar
 									</text>
 									<text transform="matrix(1 0 0 1 36.8293 855.1438)" fill="#FFFFFF"
 										font-family="'MicrosoftYaHei'" font-size="10.7648">
@@ -5904,7 +5904,7 @@
 
 <script>
 	import previewPicture from "./previewPicture.vue";
-	import {BoosterStation} from "utils/BoosterStation";
+	import { BoosterStation } from "utils/BoosterStation";
 	export default {
 		components: {
 			previewPicture
@@ -5919,7 +5919,7 @@
 		},
 		created() {
 			this.boosterStation = new BoosterStation();
-	
+
 			this.refreshTPData()
 			this.interval = setInterval(this.refreshTPData, 3000)
 		},
@@ -5928,10 +5928,10 @@
 				clearInterval(this.interval);
 			},
 			refreshTPData() {
-				this.boosterStation.getDatas("SBQ_FDC",this.bindValue);
+				this.boosterStation.getDatas("SBQ_FDC", this.bindValue);
 			},
-			bindValue(msg){
-				this.ajaxData=msg;
+			bindValue(msg) {
+				this.ajaxData = msg;
 			},
 		}
 	};
@@ -5959,4 +5959,4 @@
 		width: 100%;
 		height: 100%;
 	}
-</style>
+</style>

src/components/WindturbineDetailPages.vue

@@ -205,22 +205,24 @@
 
 		methods: {
 			opened() {
-				this.line = "";
-				this.alarmTime = "";
-				this.alarmContent = "";
-				this.BasicInfo = this.UniformCodes.getStationInfos(this.windturbine);
-				this.BasicInfo.windturbineId = this.windturbine.windturbineId;
-				// this.dateDeal(this.BasicInfo)
-				this.$refs.BasicInfo.start(this.BasicInfo);
-				this.initData();
-				this.refreshData();
-				this.refreshTimer = setInterval(this.refreshData, 100)
-				// clearInterval(this.refreshTimer);
+				if (!this.showSvg) {
+					this.line = "";
+					this.alarmTime = "";
+					this.alarmContent = "";
+					this.BasicInfo = this.UniformCodes.getStationInfos(this.windturbine);
+					this.BasicInfo.windturbineId = this.windturbine.windturbineId;
+					// this.dateDeal(this.BasicInfo)
+					this.$refs.BasicInfo.start(this.BasicInfo);
+					this.initData();
+					this.refreshData();
+					this.refreshTimer = setInterval(this.refreshData, 100)
+					// clearInterval(this.refreshTimer);
+				}
 			},
 			closed() {
 				// todo 切换页面的时候应该让上一个页面停止刷新数据（调用end方法）
 				// this.$refs.svgRef.closed();
-				this.$refs.BasicInfo.end();
+				// this.$refs.BasicInfo.end();
 				// this.$refs.BasicInfo.labelChange();
 				this.$emit('close');
 				//clearInterval(this.refreshTimer);
@@ -239,7 +241,7 @@
 				console.log(this.types)
 			},
 			refreshData() {
-				var bg = BackgroundData.getInstance();
+				let bg = BackgroundData.getInstance();
 				bg.initWinturbineBaseData(this.BasicInfo, this.onMessage);
 				this.dateDeal(this.BasicInfo)
 				clearInterval(this.refreshTimer);
@@ -249,7 +251,7 @@
 				// axiios.get(`http://${config.calcUrl}/windturbine/line/${this.windturbine.windturbineId}`)
 				//   .then(msg => this.line = msg.data);
 				api.getWindWarning(this.windturbine.windturbineId, '1', '50').then(msg => {
-					var vs = msg.data;
+					let vs = msg.data;
 					if (vs.length <= 0) return;
 					this.alarmTime = BackgroundData.getInstance().formatDate(vs[0].lastUpdateTime);
 					this.alarmContent = vs[0].alertText;
@@ -262,14 +264,16 @@
 					});
 			},
 			dbClicks(value) {
-				this.$refs.BasicInfo.dbClicks(value,this.windturbine.windturbineId)
+				this.$refs.BasicInfo.dbClicks(value, this.windturbine.windturbineId)
 			},
 		},
 		watch: {
 			'windturbine': {
 				handler: function (json) {
 					if (json) {
-						this.initData()
+						if (!this.showSvg) {
+							this.initData()
+						}
 					}
 				}
 			}

src/components/areaCard.vue

@@ -171,7 +171,7 @@
             /* 右键菜单 */
             contextmenu() {
                 const { remote } = require("electron");
-                var that = this;
+                let that = this;
                 const menuTemplate = [
                     {
                         label: "启动",
@@ -265,12 +265,12 @@
                 menu.popup(remote.getCurrentWindow());
             },
             menuClicked(msg) {
-                var bd = BackgroundData.getInstance();
+                let bd = BackgroundData.getInstance();
                 
                 if (msg.type == "lock") {
                     // 挂牌
-                    var los = this.getSelectedItems();
-                    for (var id in los) {
+                    let los = this.getSelectedItems();
+                    for (let id in los) {
                         los[id].lockType = msg.value;
                     }
                     bd.windturbineControl(
@@ -282,8 +282,8 @@
                     );
                 } else if (msg.type == "send") {
                     // 发送
-                    var vs = this.getSelectedItems(true);
-                    for (var item in los) {
+                    let vs = this.getSelectedItems(true);
+                    for (let item in los) {
                         los[item].controlType = Number(msg.controlType)
                     }
                     bd.windturbineControl(
@@ -296,7 +296,7 @@
                     );
                 } else if (msg.type == "marking") {
                     // 标注
-                    var vvs = this.getSelectedItems();
+                    let vvs = this.getSelectedItems();
                     bd.marking(vvs);
                 }
                 this.clearSelected();
@@ -304,7 +304,7 @@
             /* 获取选中的项目，isControl：是否是控制 */
             getSelectedItems() {
                 // isControl
-                var ls = new Array();
+                let ls = new Array();
                 this.$refs.malfunction.outputSelectedItems(ls);
                 return ls;
             },
@@ -313,9 +313,9 @@
                 this.$refs.malfunction.clearSelected();
             },
             filter(value, windturbineId) {
-                var array = [];
-                var flag = false;
-                for (var i = 0; i < value.length; i++) {
+                let array = [];
+                let flag = false;
+                for (let i = 0; i < value.length; i++) {
                     if (value[i].windturbineId == windturbineId) {
                         flag = true;
                         array.push(flag); // 风机是否已经存在
@@ -331,8 +331,8 @@
                 this.$refs.malfunction.dateClick(id)
             },
             addCard(val) {
-                var active = false;
-                var array = this.filter(this.values, val.windturbineId);
+                let active = false;
+                let array = this.filter(this.values, val.windturbineId);
                 if (!array[0]) {
                     // 维护
                     val.active = active;
@@ -355,14 +355,14 @@
             "$store.getters.windturbinelist": {
                 deep: true,
                 handler: function (json) {
-                    var vs = {};
+                    let vs = {};
                     this.faultList = []
                     this.maintainList = []
                     this.offlineList = []
                     this.listedList = []
                     let arr = Object.keys(json).sort()
-                    for (var id of arr) {
-                        var val = json[id];
+                    for (let id of arr) {
+                        let val = json[id];
                         this.chooseList.forEach(item => {
                             if (item.windturbineId === val.windturbineId) {
                                 val.active = true

src/components/basicDataDetails.vue

@@ -60,12 +60,12 @@
             if ((this.timeValue[1] - this.timeValue[0]) <= 86400000) {
                 this.datas.map(item => {
                     this.xdata.push(dayjs(item.ts).format('HH:mm'))
-                    this.values.push(item.doubleValue.toFixed(2))
+                    this.values.push(item.doubleValue?item.doubleValue.toFixed(2):item.longValue)
                 })
             } else {
                 this.datas.map(item => {
                     this.xdata.push(dayjs(item.ts).format('MM-DD HH:mm'))
-                    this.values.push(item.doubleValue.toFixed(2))
+                    this.values.push(item.doubleValue?item.doubleValue.toFixed(2):item.longValue)
                 })
             }
             this.getEcharts()

src/components/control/areaCard.vue

@@ -177,10 +177,10 @@
                 this.current = current === 0 ? current : current === 1 ? current : 1
             },
             initData: function () {
-                var mb = MessageBridge.getInstance();
+                let mb = MessageBridge.getInstance();
                 mb.unregister({ key: "/topic/suggestion" });
-                var vs = [{ key: "/topic/suggestion", action: this.suggestion }];
-                var vss = [{ key: "/topic/voice-control", action: this.windturbineMessage }];
+                let vs = [{ key: "/topic/suggestion", action: this.suggestion }];
+                let vss = [{ key: "/topic/voice-control", action: this.windturbineMessage }];
                 this.vss = vss
                 mb.register(vs);
                 mb.register(vss);

src/components/control/controlAllArea.vue

@@ -197,8 +197,8 @@
                 })
             },
             initData: function () {
-                var mb = MessageBridge.getInstance();
-                var vss = [{ key: "/topic/voice-control", action: this.windturbineMessage }];
+                let mb = MessageBridge.getInstance();
+                let vss = [{ key: "/topic/voice-control", action: this.windturbineMessage }];
                 mb.register(vss);
             },
             windturbineMessage(msg) {
@@ -280,7 +280,7 @@
             /* 右键菜单 */
             contextmenu() {
                 const remote = require('electron').remote;
-                var that = this;
+                let that = this;
                 let menuTemplate = []
                 if (this.selectValue === '0' || this.selectValue === '1' || this.selectValue === '2' || this.selectValue === '3' || this.selectValue === '4') {
                     menuTemplate = [
@@ -532,17 +532,17 @@
             /* 控制成功 */
             controlSuccess(msg) {
                 console.log(msg);
-                var mss = '';     // 信息
-                var iserror = false;// 是否有控制错误的风机
-                for (var v in msg.data) {
-                    var val = msg.data[v];
+                let mss = '';     // 信息
+                let iserror = false;// 是否有控制错误的风机
+                for (let v in msg.data) {
+                    let val = msg.data[v];
                     if (val.errorCode > 0) {
                         iserror = true;
                         mss += `${val.windturbineId}  ${this.controlErorCodes[val.errorCode]}\n`;
                     }
                 }
-                var tp = iserror ? "warning" : "success";
-                var dt = iserror ? 0 : 4500;
+                let tp = iserror ? "warning" : "success";
+                let dt = iserror ? 0 : 4500;
                 if (!iserror) {
                     mss = "控制成功";
                 }
@@ -642,8 +642,8 @@
                     this.dataList = []
                     this.showList = []
                     let arr = Object.keys(json).sort()
-                    for (var id of arr) {
-                        var val = json[id];
+                    for (let id of arr) {
+                        let val = json[id];
                         this.chooseList.forEach(item => {
                             if (item.windturbineId === val.windturbineId) {
                                 val.active = true

src/components/dataDetails.vue

@@ -34,9 +34,9 @@
         methods: {
             getEcharts() {
                 console.log(document.getElementById('detailEcharts'));
-                var chartDom = document.getElementById('detailEcharts');
-                var myChart = echarts.init(chartDom, '#ffffff');
-                var option;
+                let chartDom = document.getElementById('detailEcharts');
+                let myChart = echarts.init(chartDom, '#ffffff');
+                let option;
                 option = {
                     legend: {
                         show: true,

src/components/focus/focusCard.vue

@@ -61,12 +61,12 @@
 		},
 		methods: {
 			datacontrol() {
-				var mb = MessageBridge.getInstance();
-				var vss = [{ key: "/topic/voice-control", action: this.windturbineMessage }];
+				let mb = MessageBridge.getInstance();
+				let vss = [{ key: "/topic/voice-control", action: this.windturbineMessage }];
 				mb.register(vss);
 			},
 			windturbineMessage(msg) {
-				var bd = BackgroundData.getInstance();
+				let bd = BackgroundData.getInstance();
 				let arr = []
 				if (msg === 'CLOSE') {
 					arr.push(msg)
@@ -94,11 +94,11 @@
 				setInterval(this.refreshData, 2000);
 			},
 			refreshData() {
-				var bd = BackgroundData.getInstance();
-				var list = new Array();
-				var arr = [],
+				let bd = BackgroundData.getInstance();
+				let list = new Array();
+				let arr = [],
 					thisKey = ''
-				for (var v in bd.Recommends) {
+				for (let v in bd.Recommends) {
 					thisKey += v + ',';
 				}
 				axios.get(process.env.VUE_APP_ADAPTERURL + `/ts/latest?keys=` + thisKey)
@@ -120,7 +120,7 @@
 					})
 			},
 			sendMsg: function (vl, index) {
-				var that = this;
+				let that = this;
 				that.timeIndex = 0;
 				that.ajaxDetail(vl, index);
 				that.interval = window.setInterval(function () {
@@ -153,16 +153,16 @@
 						}
 					})
 				if (this.timeIndex == 0) {//一分钟执行一次
-					var date = new Date()
-					var endTs = date.getTime();
-					var starTs = endTs - 28800000;
+					let date = new Date()
+					let endTs = date.getTime();
+					let starTs = endTs - 28800000;
 					const PowerSet = thisKey.find(ele => {
 						return ele.tag == 'PowerSet'
 					});
 					const ActualPower = thisKey.find(ele => {
 						return ele.tag == 'ActualPower'
 					});
-					var PowerSetData = [],
+					let PowerSetData = [],
 						ActualPowerData = [];
 					axios.get(process.env.VUE_APP_ADAPTERURL + `/ts/history/snap?tagName=` + PowerSet.value + '&startTs=' +
 						starTs +

src/components/modeControl/dataDetails.vue

@@ -34,9 +34,9 @@
         methods: {
             getEcharts() {
                 console.log(document.getElementById('modeEcharts'));
-                var chartDom = document.getElementById('modeEcharts');
-                var myChart = echarts.init(chartDom, '#ffffff');
-                var option;
+                let chartDom = document.getElementById('modeEcharts');
+                let myChart = echarts.init(chartDom, '#ffffff');
+                let option;
                 option = {
                     legend: {
                         show: true,

src/components/modeControl/detailPages.vue

@@ -102,8 +102,8 @@
 		},
 		methods: {
 			initData() {
-				var mb = MessageBridge.getInstance();
-				var vs = [{ key: "/topic/title-info", action: this.getMessage }];
+				let mb = MessageBridge.getInstance();
+				let vs = [{ key: "/topic/title-info", action: this.getMessage }];
 				mb.register(vs);
 			},
 			getMessage(msg) {
@@ -169,9 +169,9 @@
 			},
 			totleErtcher(chartData) {
 				console.log(document.getElementById('totleEcharts'));
-				var chartDom = document.getElementById('totleEcharts');
-				var myChart = echarts.init(chartDom, '#ffffff');
-				var option;
+				let chartDom = document.getElementById('totleEcharts');
+				let myChart = echarts.init(chartDom, '#ffffff');
+				let option;
 				option = {
 					legend: {
 						show: true,

src/components/modeControl/modeControl.vue

@@ -18,7 +18,7 @@
             </div>
             <div>
                 <div id="mainEcharts" @dblclick="dbClick()" class="echarts"></div>
-                <div @dblclick="dbClicks()" class="powerContent">
+                <div class="powerContent">
                     <div class="power" @dblclick="dbClicks(showDate.realTimePower,'实际功率')">
                         <div class="powerTitle">实际功率</div>
                         <div class="powerDatas" style="background-color: rgba(75, 85, 174, 1);">
@@ -102,9 +102,9 @@
         },
         methods: {
             initData() {
-                var mb = MessageBridge.getInstance();
-                var vss = [{ key: "/topic/voice-control", action: this.windturbineMessage }];
-                var vs = [{ key: "/topic/title-info", action: this.getEchartss }];
+                let mb = MessageBridge.getInstance();
+                let vss = [{ key: "/topic/voice-control", action: this.windturbineMessage }];
+                let vs = [{ key: "/topic/title-info", action: this.getEchartss }];
                 mb.register(vs);
                 mb.register(vss);
             },
@@ -134,9 +134,9 @@
                 this.getEcharts()
             },
             getEcharts() {
-                var chartDom = document.getElementById('mainEcharts');
-                var myChart = echarts.init(chartDom, '#000000');
-                var option;
+                let chartDom = document.getElementById('mainEcharts');
+                let myChart = echarts.init(chartDom, '#000000');
+                let option;
                 option = {
                     series: [{
                         type: 'gauge',
@@ -257,12 +257,13 @@
                 myChart.setOption(option, true);
             },
             ChangeBar(values) {
-                var bd = BackgroundData.getInstance();
-                var mb = MessageBridge.getInstance();
-                var vss = { key: "/topic/voice-control" };
-                var popup = { key: "/topic/fault-popup" };
+                let bd = BackgroundData.getInstance();
+                let mb = MessageBridge.getInstance();
+                let vss = { key: "/topic/voice-control" };
+                let popup = { key: "/topic/fault-popup" };
                 mb.unregister(popup);
                 mb.unregister(vss);
+                this.$router.push(`/?current=${values}`)
                 if (!bd.LoginUser) {
                     this.$notify({
                         title: "请登录",

src/components/problem/ProblemMatrixCard.vue

@@ -71,9 +71,9 @@
         }
       },
       filter(value, windturbineId) {
-        var array = [];
-        var flag = false;
-        for (var i = 0; i < value.length; i++) {
+        let array = [];
+        let flag = false;
+        for (let i = 0; i < value.length; i++) {
           if (value[i].windturbineId == windturbineId) {
             flag = true;
             array.push(flag); // 风机是否已经存在
@@ -85,8 +85,8 @@
         return array;
       },
       addCard(val) {
-        var active = false;
-        var array = this.filter(this.values, val.windturbineId);
+        let active = false;
+        let array = this.filter(this.values, val.windturbineId);
         if (!array[0]) {
           // 维护
           val.active = active;
@@ -101,7 +101,7 @@
       },
       /* 获取选中的项目 */
       getSelectedItems() {
-        var ls = new Array();
+        let ls = new Array();
         this.values.forEach((item) => {
           if (item.active) {
             ls.push(item);
@@ -124,7 +124,7 @@
       },
 
       isHas(item, ls) {
-        for (var id in ls) {
+        for (let id in ls) {
           if (ls[id].windturbineId == item.windturbineId) {
             return true;
           }
@@ -133,23 +133,23 @@
       },
 
       clear(vs) {
-        var ll = new Array();
+        let ll = new Array();
         this.values.forEach((item) => {
-          var it = vs[item.windturbineId];
+          let it = vs[item.windturbineId];
           if (typeof it === "undefined") {
             ll.push(item);
           }
         });
-        for (var v1 in ll) {
-          var ind = this.values.indexOf(ll[v1]);
+        for (let v1 in ll) {
+          let ind = this.values.indexOf(ll[v1]);
           if (ind < 0) continue;
           this.values.splice(ind, 1);
         }
       },
       dateClick(type){
         console.log(this.cacheDate);
-        var vs = {};
-        var address = ''
+        let vs = {};
+        let address = ''
           switch (type) {
             case 0:
               address = 'MG'
@@ -168,8 +168,8 @@
               break;
           }
           let arr = Object.keys(this.cacheDate).sort()
-          for (var id of arr) {
-            var val = this.cacheDate[id];
+          for (let id of arr) {
+            let val = this.cacheDate[id];
             if (val.windturbineId.substring(0, 2) === address) {
                 this.addCard(val);
                 vs[val.windturbineId] = 0;
@@ -182,8 +182,8 @@
       "$store.getters.windturbinelist": {
         deep: true,
         handler: function (json) {
-          var vs = {};
-          var address = ''
+          let vs = {};
+          let address = ''
           switch (this.type) {
             case 0:
               address = 'MG'
@@ -206,8 +206,8 @@
             this.cacheFlag = true
           }
           let arr = Object.keys(json).sort()
-          for (var id of arr) {
-            var val = json[id];
+          for (let id of arr) {
+            let val = json[id];
             if (this.flag) {
               if (val.windturbineId.substring(0, 2) === address) {
                 this.addCard(val);

src/components/problem/areaCard.vue

@@ -131,8 +131,8 @@
                 this.offlineList = []
                 this.listedList = []
                 let arr = Object.keys(json).sort()
-                for (var id of arr) {
-                    var val = json[id];
+                for (let id of arr) {
+                    let val = json[id];
                     this.chooseList.forEach(item => {
                         if (item.windturbineId === val.windturbineId) {
                             val.active = true
@@ -182,7 +182,7 @@
             /* 右键菜单 */
             contextmenu() {
                 const { remote } = require("electron");
-                var that = this;
+                let that = this;
                 const menuTemplate = [
                     {
                         label: "挂牌",
@@ -237,7 +237,7 @@
                 menu.popup(remote.getCurrentWindow());
             },
             menuClicked(msg) {
-                var bd = BackgroundData.getInstance();
+                let bd = BackgroundData.getInstance();
                 if (!bd.LoginUser) {
                     this.$notify({
                         title: "请登录",
@@ -280,17 +280,17 @@
             /* 控制成功 */
             controlSuccess(msg) {
                 console.log(msg);
-                var mss = '';     // 信息
-                var iserror = false;// 是否有控制错误的风机
-                for (var v in msg.data) {
-                    var val = msg.data[v];
+                let mss = '';     // 信息
+                let iserror = false;// 是否有控制错误的风机
+                for (let v in msg.data) {
+                    let val = msg.data[v];
                     if (val.errorCode > 0) {
                         iserror = true;
                         mss += `${val.windturbineId}  ${this.controlErorCodes[val.errorCode]}\n`;
                     }
                 }
-                var tp = iserror ? "warning" : "success";
-                var dt = iserror ? 0 : 4500;
+                let tp = iserror ? "warning" : "success";
+                let dt = iserror ? 0 : 4500;
                 if (!iserror) {
                     mss = "控制成功";
                 }
@@ -317,9 +317,9 @@
                 });
             },
             filter(value, windturbineId) {
-                var array = [];
-                var flag = false;
-                for (var i = 0; i < value.length; i++) {
+                let array = [];
+                let flag = false;
+                for (let i = 0; i < value.length; i++) {
                     if (value[i].windturbineId == windturbineId) {
                         flag = true;
                         array.push(flag); // 风机是否已经存在
@@ -335,8 +335,8 @@
                 this.$refs.malfunction.dateClick(id)
             },
             addCard(val) {
-                var active = false;
-                var array = this.filter(this.values, val.windturbineId);
+                let active = false;
+                let array = this.filter(this.values, val.windturbineId);
                 if (!array[0]) {
                     // 维护
                     val.active = active;
@@ -369,8 +369,8 @@
                     this.offlineList = []
                     this.listedList = []
                     let arr = Object.keys(json).sort()
-                    for (var id of arr) {
-                        var val = json[id];
+                    for (let id of arr) {
+                        let val = json[id];
                         this.chooseList.forEach(item => {
                             if (item.windturbineId === val.windturbineId) {
                                 val.active = true

src/components/warning/warningCard.vue

@@ -58,8 +58,8 @@
 		},
 		methods: {
 			initData() {
-				var mb = MessageBridge.getInstance();
-				var vs = [{
+				let mb = MessageBridge.getInstance();
+				let vs = [{
 					key: "/topic/fault-popup",
 					action: this.faultMessage
 				}];
@@ -68,15 +68,15 @@
 			faultMessage(json) {
 				let val = json?JSON.parse(json):this.$store.state.warning
 				if (Object.keys(val).length>0) {
-					var sleected = {};
+					let sleected = {};
 					this.values.forEach((it) => {
 						if (it.isSelected) {
 							sleected[it.id] = 0;
 						}
 					});
 					this.values = new Array();
-					for (var v in val) {
-						var vl = val[v];
+					for (let v in val) {
+						let vl = val[v];
 						if (vl.stationId != "QS_FDC" && vl.category1 == "FJ") {
 							vl.alertText = vl.windturbineName + "-" + vl.alertText;
 						}
@@ -109,7 +109,7 @@
 					row.isSelected = false;
 					return;
 				}
-				var bd = BackgroundData.getInstance();
+				let bd = BackgroundData.getInstance();
 				if (!bd.LoginUser) {
 					this.$notify({
 						title: "请登录",
@@ -131,8 +131,8 @@
 					faultID: item.idString,
 					userName: BackgroundData.getInstance().LoginUser.name,
 				}).then(msg => {
-					var mms = msg.data > 0 ? "报警确认成功！" : "报警确认出现错误!";
-					var tp = msg.data > 0 ? "success" : "error";
+					let mms = msg.data > 0 ? "报警确认成功！" : "报警确认出现错误!";
+					let tp = msg.data > 0 ? "success" : "error";
 					msg.data === 0 ? (item.isSelected = false) : '';
 					this.$notify({
 						title: "报警",

src/utils/BackgroundData.js

@@ -136,11 +136,11 @@ export default class BackgroundData {
     /* 数据刷新 */
     refreshTPData() {
         // http://192.168.10.18:8011/ts
-        var val = '';
-        for (var v in this.TopPoint) {
+        let val = '';
+        for (let v in this.TopPoint) {
             val += this.TopPoint[v].pointTag + ',';
         }
-        // api.refreshData(val).then(this.onTPMessage)
+        api.refreshData(val).then(this.onTPMessage)
         // axios.get(process.env.VUE_APP_ADAPTERURL+`/ts/latest?keys=${val}`)
         //     .then(this.onTPMessage)
         //     .catch(err =>
@@ -150,11 +150,11 @@ export default class BackgroundData {
 
     /* 刷新推荐信息 */
     refreshRecommendData() {
-        var val = '';
-        for (var v in this.Recommends) {
+        let val = '';
+        for (let v in this.Recommends) {
             val += v + ',';
         }
-        // api.refreshData(val).then(this.onRDMessage)
+        api.refreshData(val).then(this.onRDMessage)
         // axios.get(process.env.VUE_APP_ADAPTERURL+`/ts/latest?keys=${val}`)
         //     .then(this.onRDMessage)
         //     .catch(err =>
@@ -166,42 +166,42 @@ export default class BackgroundData {
     refreshAlarmData() {
         // http://192.168.10.18:8075/alarm
         // 1、读取一天内的所有open的4级custom报警，作为隐患数据ar
-        var enddt = new Date();
-        var tm = enddt.getTime();
+        let enddt = new Date();
+        let tm = enddt.getTime();
         enddt = new Date(tm + 900000);
-        var startdt = new Date(tm - 86400000);
-        // api.getSnap({
-        //     pagenum:'1',
-        //     pagesize:'500',
-        //     category1:'custom',
-        //     isopened:'1',
-        //     starttime:this.formatDate(startdt),
-        //     endtime:this.formatDate(enddt),
-        // }).then(this.onHiddenProblemsMessage)
-        // api.getSnap({
-        //     pagenum:'1',
-        //     pagesize:'500',
-        //     category1:'windturbine',
-        //     isopened:'1',
-        //     starttime:this.formatDate(startdt),
-        //     endtime:this.formatDate(enddt),
-        // }).then(this.onHiddenProblemsMessage)
-        // api.getSnap({
-        //     pagenum:'1',
-        //     pagesize:'500',
-        //     category1:'SYZ',
-        //     isopened:'1',
-        //     starttime:this.formatDate(startdt),
-        //     endtime:this.formatDate(enddt),
-        // }).then(this.onHiddenProblemsMessage)
+        let startdt = new Date(tm - 86400000);
+        api.getSnap({
+            pagenum:'1',
+            pagesize:'500',
+            category1:'custom',
+            isopened:'1',
+            starttime:this.formatDate(startdt),
+            endtime:this.formatDate(enddt),
+        }).then(this.onHiddenProblemsMessage)
+        api.getSnap({
+            pagenum:'1',
+            pagesize:'500',
+            category1:'windturbine',
+            isopened:'1',
+            starttime:this.formatDate(startdt),
+            endtime:this.formatDate(enddt),
+        }).then(this.onHiddenProblemsMessage)
+        api.getSnap({
+            pagenum:'1',
+            pagesize:'500',
+            category1:'SYZ',
+            isopened:'1',
+            starttime:this.formatDate(startdt),
+            endtime:this.formatDate(enddt),
+        }).then(this.onHiddenProblemsMessage)
     }
 
     /* 获得故障数据 */
     onAccidentsMessage(msg) {
         if (!msg.data) return;
         this.Accidents = new Array();
-        for (var v in msg.data.records) {
-            var val = msg.data.records[v];
+        for (let v in msg.data.records) {
+            let val = msg.data.records[v];
             if (this.isContains(val.alertText, ["跳闸", "开关", "刀闸", "断路器", "合位", "分位"])) {
                 // todo 暂时隐藏事故报警
                 //this.Accidents.push(val);
@@ -220,8 +220,8 @@ export default class BackgroundData {
         if (!msg.data) return;
         this.Defects = new Array();
         this.Failure = new Array();
-        for (var v in msg.data.records) {
-            var val = msg.data.records[v];
+        for (let v in msg.data.records) {
+            let val = msg.data.records[v];
             if (val.alertText.indexOf("故障") > 0) {
                 this.Failure.push(val);
             } else {
@@ -239,8 +239,8 @@ export default class BackgroundData {
     /* 获得标题栏数据 */
     onTPMessage(msg) {
         if (!msg.data) return;
-        for (var v in this.TopPoint) {
-            var val = this.TopPoint[v];
+        for (let v in this.TopPoint) {
+            let val = this.TopPoint[v];
             val.value = msg.data[val.pointTag].doubleValue;
         }
     }
@@ -248,8 +248,8 @@ export default class BackgroundData {
     /* 获得推荐信息数据 */
     onRDMessage(msg) {
         if (!msg.data) return;
-        for (var v in msg.data) {
-            var isact = false;
+        for (let v in msg.data) {
+            let isact = false;
             if (!msg.data[v].doubleValue) {
                 isact = msg.data[v].booleanValue
             } else {
@@ -264,19 +264,19 @@ export default class BackgroundData {
 
     /* 格式化时间 */
     formatDate(time, format = 'YY-MM-DD hh:mm:ss') {
-        var date = new Date(time);
+        let date = new Date(time);
 
-        var year = date.getFullYear(),
+        let year = date.getFullYear(),
             month = date.getMonth() + 1,//月份是从0开始的
             day = date.getDate(),
             hour = date.getHours(),
             min = date.getMinutes(),
             sec = date.getSeconds();
-        var preArr = Array.apply(null, Array(10)).map(function (elem, index) {
+        let preArr = Array.apply(null, Array(10)).map(function (elem, index) {
             return '0' + index;
         });
 
-        var newTime = format.replace(/YY/g, year)
+        let newTime = format.replace(/YY/g, year)
             .replace(/MM/g, preArr[month] || month)
             .replace(/DD/g, preArr[day] || day)
             .replace(/hh/g, preArr[hour] || hour)
@@ -287,7 +287,7 @@ export default class BackgroundData {
 
     /* 判断一个字符串中是否包含第二个字符串列表中的字符 */
     isContains(str, strs) {
-        for (var v in strs) {
+        for (let v in strs) {
             if (str.indexOf(strs[v]) > 0) {
                 return true;
             }
@@ -304,10 +304,10 @@ export default class BackgroundData {
 
     /* 风机控制 */
     windturbineControl(windturbines, isLockOrUnlock, automatic, test ,success, error) {
-        var pairs = {};
-        for (var ind in windturbines) {
-            var wb = windturbines[ind];
-            var ct = {
+        let pairs = {};
+        for (let ind in windturbines) {
+            let wb = windturbines[ind];
+            let ct = {
                 windturbineId: wb.windturbineId,
                 stationId: wb.stationId,
                 projectId: wb.projectId,
@@ -334,10 +334,10 @@ export default class BackgroundData {
 
     /* 系统控制风机，自动下发命令 */
     windturbineControlSystem(windturbines) {
-        var pairs = {};
-        for (var ind in windturbines) {
-            var wb = windturbines[ind];
-            var ct = {
+        let pairs = {};
+        for (let ind in windturbines) {
+            let wb = windturbines[ind];
+            let ct = {
                 windturbineId: wb.windturbineId,
                 stationId: wb.stationId,
                 projectId: wb.projectId,
@@ -365,7 +365,7 @@ export default class BackgroundData {
 
     /* 标记 */
     marking(windturbines) {
-        for (var v in windturbines) {
+        for (let v in windturbines) {
             ++this.MarkIndex;
             this.Marks.push({ title: windturbines[v].windturbineId, id: this.MarkIndex });
         }
@@ -387,8 +387,8 @@ export default class BackgroundData {
         })
     }
     removeCheckouts(mk) {
-        var indx = -1;
-        for (var id in this.checkouts) {
+        let indx = -1;
+        for (let id in this.checkouts) {
             if (this.checkouts[id].windturbineId == mk.windturbineId) {
                 indx = id;
                 break;
@@ -400,8 +400,8 @@ export default class BackgroundData {
 
     /* 移除标记 */
     removeMarked(mk) {
-        var indx = -1;
-        for (var id in this.Marks) {
+        let indx = -1;
+        for (let id in this.Marks) {
             if (this.Marks[id].id == mk.id) {
                 indx = id;
                 break;

src/utils/BoosterStation.js

@@ -1,20 +1,16 @@
-// import { config } from "../../config";
 import axios from 'axios';
-import api from '../api';
-
-export class BoosterStation{
+import api from "api/index";
+export class BoosterStation {
 	tags = {
 		"QS3_FDC": {
 			"qs3uakv110l": { tag: "SLDQ.NX_GD_QSF_DQ_P1_L1_001_AI0001" },
 			"qs3ubkv110": { tag: "SLDQ.NX_GD_QSF_DQ_P1_L1_001_AI0002" },
 			"qs3uckv110": { tag: "SLDQ.NX_GD_QSF_DQ_P1_L1_001_AI0003" },
 			"qs3uabkv110": { tag: "SLDQ.NX_GD_QSF_DQ_P1_L1_001_AI0009" },
-			"qs3fhz110": { tag: "SLDQ.NX_GD_QSF_DQ_P1_L1_001_AI0012" },
 			"qs3uakv110r": { tag: "SLDQ.NX_GD_QSF_DQ_P1_L1_001_AI0001" },
 			"qs3laa110": { tag: "SLDQ.NX_GD_QSF_DQ_P1_L1_001_AI0004" },
 			"qs3pmw110": { tag: "SLDQ.NX_GD_QSF_DQ_P1_L1_001_AI0013" },
 			"qs3qmvar110": { tag: "SLDQ.NX_GD_QSF_DQ_P1_L1_001_AI0014" },
-			"qs3cos110": { tag: "SLDQ.NX_GD_QSF_DQ_P1_L1_001_AI0016" },
 			"qs3uakv35r": { tag: "SLDQ.NX_GD_QSF_DQ_P1_L1_001_AI0053" },
 			"qs3laa35": { tag: "SLDQ.NX_GD_QSF_DQ_P1_L1_001_AI0056" },
 			"qs3pmw35": { tag: "SLDQ.NX_GD_QSF_DQ_P1_L1_001_AI0116" },
@@ -23,13 +19,8 @@ export class BoosterStation{
 			"qs3ubkv35": { tag: "SLDQ.NX_GD_QSF_DQ_P1_L1_001_AI0538" },
 			"qs3uckv35": { tag: "SLDQ.NX_GD_QSF_DQ_P1_L1_001_AI0539" },
 			"qs3uabkv35": { tag: "SLDQ.NX_GD_QSF_DQ_P1_L1_001_AI0573" },
-			"qs3fhz35": { tag: "SLDQ.NX_GD_QSF_DQ_P1_L1_001_AI0639" },
 			"qs3ymwd": { tag: "SLDQ.NX_GD_QSF_DQ_P1_L1_001_AI0162" },
 			"qs3rzwd": { tag: "SLDQ.NX_GD_QSF_DQ_P1_L1_001_AI0161" },
-			"qs3ruakv": { tag: "SLDQ.NX_GD_QSF_DQ_P1_L1_001_AI0059" },
-			"qs3rlaa": { tag: "SLDQ.NX_GD_QSF_DQ_P1_L1_001_AI0062" },
-			"qs3rpmw": { tag: "SLDQ.NX_GD_QSF_DQ_P1_L1_001_AI0123" },
-			"qs3rqmvar": { tag: "SLDQ.NX_GD_QSF_DQ_P1_L1_001_AI0124" },
 			"qs3dw": { tag: "SLDQ.NX_GD_QSF_DQ_P1_L1_001_AI0155" },
 			"qs3uabkvc": { tag: "SLDQ.NX_GD_QSF_DQ_P1_L1_001_AI0573" },
 			"qs3ubckv": { tag: "SLDQ.NX_GD_QSF_DQ_P1_L1_001_AI0574" },
@@ -98,6 +89,18 @@ export class BoosterStation{
 			"dwkubkv": { tag: "DWKDQ.NX_GD_DWKG_DQ_P1_L1_001_AI0042" },
 			"dwkuckv": { tag: "DWKDQ.NX_GD_DWKG_DQ_P1_L1_001_AI0043" },
 			"dwkuabkv": { tag: "DWKDQ.NX_GD_DWKG_DQ_P1_L1_001_AI0004" },
+
+			"dwklaa311": { tag: "DWKDQ.NX_GD_DWKG_DQ_P1_L1_001_AI0008" },
+			"dwkqkvar311": { tag: "DWKDQ.NX_GD_DWKG_DQ_P1_L1_001_AI0009" },
+			"dwklaa312": { tag: "" },
+			"dwkqkvar312": { tag: "" },
+			"dwklaa313": { tag: "DWKDQ.NX_GD_DWKG_DQ_P1_L1_001_AI0013" },
+			"dwkqkvar313": { tag: "DWKDQ.NX_GD_DWKG_DQ_P1_L1_001_AI0014" },
+			"dwklaa314": { tag: "DWKDQ.NX_GD_DWKG_DQ_P1_L1_001_AI0018" },
+			"dwkqkvar314": { tag: "DWKDQ.NX_GD_DWKG_DQ_P1_L1_001_AI0019" },
+			"dwklaa315": { tag: "DWKDQ.NX_GD_DWKG_DQ_P1_L1_001_AI0023" },
+			"dwkqkvar315": { tag: "DWKDQ.NX_GD_DWKG_DQ_P1_L1_001_AI0024" },
+
 			"dwksrdy01": { tag: "DWKGF.NX_GD_DWKG_GF_P1_L1_001_AI0008" },
 			"dwksrdy02": { tag: "DWKGF.NX_GD_DWKG_GF_P1_L1_002_AI0008" },
 			"dwksrdy03": { tag: "DWKGF.NX_GD_DWKG_GF_P1_L1_003_AI0008" },
@@ -235,6 +238,7 @@ export class BoosterStation{
 			"qspmw": { tag: "QSDQ.NX_GD_QSF_DQ_P1_L1_001_AI0330" },
 			"qsqmvar": { tag: "QSDQ.NX_GD_QSF_DQ_P1_L1_001_AI0331" },
 			"qsuxkv": { tag: "QSDQ.NX_GD_QSF_DQ_P1_L1_001_AI0321" },
+			"qsfhz": { tag: "QSDQ.NX_GD_QSF_DQ_P1_L1_001_AI0335" },
 			"qscos": { tag: "QSDQ.NX_GD_QSF_DQ_P1_L1_001_AI0333" },
 			"qslaazb2s": { tag: "QSDQ.NX_GD_QSF_DQ_P1_L1_001_AI0692" },
 			"qspmwzb2s": { tag: "QSDQ.NX_GD_QSF_DQ_P1_L1_001_AI0698" },
@@ -245,7 +249,7 @@ export class BoosterStation{
 			"qsqmvarzb1s": { tag: "QSDQ.NX_GD_QSF_DQ_P1_L1_001_AI0459" },
 			"qscoszb1s": { tag: "QSDQ.NX_GD_QSF_DQ_P1_L1_001_AI0461" },
 			"qsuakvzb2": { tag: "QSDQ.NX_GD_QSF_DQ_P1_L1_001_AI0177" },
-			"qsuabkvzb2": { tag: "QSDQ.NX_GD_QSF_DQ_P1_L1_001_AI0183" },
+			"qsuabkvzb2": { tag: "QSDQ.NX_GD_QSF_DQ_P1_L1_001_AI0162" },
 			"qs3uozb2": { tag: "QSDQ.NX_GD_QSF_DQ_P1_L1_001_AI0005" },
 			"qslaazb2x": { tag: "QSDQ.NX_GD_QSF_DQ_P1_L1_001_AI0708" },
 			"qspmwzb2x": { tag: "QSDQ.NX_GD_QSF_DQ_P1_L1_001_AI0714" },
@@ -255,7 +259,7 @@ export class BoosterStation{
 			"qsrzwdzb2": { tag: "QSDQ.NX_GD_QSF_DQ_P1_L1_001_AI0481" },
 			"qsdwzb2": { tag: "QSDQ.NX_GD_QSF_DQ_P1_L1_001_AI1249" },
 			"qsuakvzb1": { tag: "QSDQ.NX_GD_QSF_DQ_P1_L1_001_AI0161" },
-			"qsuabkvzb1": { tag: "QSDQ.NX_GD_QSF_DQ_P1_L1_001_AI0167" },
+			"qsuabkvzb1": { tag: "QSDQ.NX_GD_QSF_DQ_P1_L1_001_AI0178" },
 			"qs3u0vzb1": { tag: "QSDQ.NX_GD_QSF_DQ_P1_L1_001_AI0006" },
 			"qslaazb1x": { tag: "QSDQ.NX_GD_QSF_DQ_P1_L1_001_AI0468" },
 			"qspmwzb1x": { tag: "QSDQ.NX_GD_QSF_DQ_P1_L1_001_AI0474" },
@@ -605,14 +609,24 @@ export class BoosterStation{
 			"mhsuckvzb1": { tag: "MHSDQ.NX_GD_MHSF_DQ_P1_L1_001_AI0035" },
 			"mhsu0kvzb1": { tag: "MHSDQ.NX_GD_MHSF_DQ_P1_L1_001_AI0040" },
 			"mhsdwzb1": { tag: "MHSDQ.NX_GD_MHSF_DQ_P1_L1_001_AI0217" },
-			"mhsymwdzb1": { tag: "MHSDQ.NX_GD_MHSF_DQ_P1_L1_001_AI0049" },
+			"mhsymwdzb1": { tag: "MHSDQ.NX_GD_MHSF_DQ_P1_L1_001_AI0258" },
 			"mhsrzwdzb1": { tag: "MHSDQ.NX_GD_MHSF_DQ_P1_L1_001_AI0050" },
+			//补
+			"mhsuabkvzb1": { tag: "MHSDQ.NX_GD_MHSF_DQ_P1_L1_001_AI0037" },
+			"mhsubckvzb1": { tag: "MHSDQ.NX_GD_MHSF_DQ_P1_L1_001_AI0038" },
+			"mhsucakvzb1": { tag: "MHSDQ.NX_GD_MHSF_DQ_P1_L1_001_AI0039" },
+			"mhsIaazb1s": { tag: "MHSDQ.NX_GD_MHSF_DQ_P1_L1_001_AI0025" },
+			"mhsPmwzb1s": { tag: "MHSDQ.NX_GD_MHSF_DQ_P1_L1_001_AI0029" },
+			"mhsqmvarzb1s": { tag: "MHSDQ.NX_GD_MHSF_DQ_P1_L1_001_AI0030" },
 			"mhsIaazb1": { tag: "MHSDQ.NX_GD_MHSF_DQ_P1_L1_001_AI0041" },
 			"mhsPmwzb1": { tag: "MHSDQ.NX_GD_MHSF_DQ_P1_L1_001_AI0045" },
 			"mhsqmvarzb1": { tag: "MHSDQ.NX_GD_MHSF_DQ_P1_L1_001_AI0046" },
 			"mhsdwzb2": { tag: "MHSDQ.NX_GD_MHSF_DQ_P1_L1_001_AI0261" },
 			"mhsymwdzb2": { tag: "MHSDQ.NX_GD_MHSF_DQ_P1_L1_001_AI0259" },
 			"mhsrzwdzb2": { tag: "MHSDQ.NX_GD_MHSF_DQ_P1_L1_001_AI0260" },
+			"mhslaazb2s": { tag: "MHSDQ.NX_GD_MHSF_DQ_P1_L1_001_AI0234" },
+			"mhspmwzb2s": { tag: "MHSDQ.NX_GD_MHSF_DQ_P1_L1_001_AI0238" },
+			"mhsqmvarzb2s": { tag: "MHSDQ.NX_GD_MHSF_DQ_P1_L1_001_AI0239" },
 			"mhslaazb2": { tag: "MHSDQ.NX_GD_MHSF_DQ_P1_L1_001_AI0250" },
 			"mhspmwzb2": { tag: "MHSDQ.NX_GD_MHSF_DQ_P1_L1_001_AI0254" },
 			"mhsqmvarzb2": { tag: "MHSDQ.NX_GD_MHSF_DQ_P1_L1_001_AI0255" },
@@ -1303,12 +1317,12 @@ export class BoosterStation{
 			"sbqqmx2": { tag: "SBQNWDQ.NX_GD_SBQF_DQ_P1_L1_001_AI0109" },
 			"sbqlaamx2": { tag: "SBQNWDQ.NX_GD_SBQF_DQ_P1_L1_001_AI0105" },
 			"sbqdwmx2": { tag: "SBQNWDQ.NX_GD_SBQF_DQ_P1_L1_001_AI0563" },
-			"sbquakvzb3": { tag: "SBQDQ.NX_GD_SBQF_DQ_P1_L1_001_AI0609" },
-			"sbqubkvzb3": { tag: "SBQDQ.NX_GD_SBQF_DQ_P1_L1_001_AI0610" },
-			"sbquckvzb3": { tag: "SBQDQ.NX_GD_SBQF_DQ_P1_L1_001_AI0611" },
-			"sbquabkvzb3": { tag: "SBQDQ.NX_GD_SBQF_DQ_P1_L1_001_AI0612" },
-			"sbqubckvzb3": { tag: "SBQDQ.NX_GD_SBQF_DQ_P1_L1_001_AI0613" },
-			"sbqu0kvzb3": { tag: "SBQDQ.NX_GD_SBQF_DQ_P1_L1_001_AI0615" },
+			"sbquakvzb3": { tag: "SBQNWDQ.NX_GD_SBQF_DQ_P1_L1_001_AI0609" },
+			"sbqubkvzb3": { tag: "SBQNWDQ.NX_GD_SBQF_DQ_P1_L1_001_AI0610" },
+			"sbquckvzb3": { tag: "SBQNWDQ.NX_GD_SBQF_DQ_P1_L1_001_AI0611" },
+			"sbquabkvzb3": { tag: "SBQNWDQ.NX_GD_SBQF_DQ_P1_L1_001_AI0612" },
+			"sbqubckvzb3": { tag: "SBQNWDQ.NX_GD_SBQF_DQ_P1_L1_001_AI0613" },
+			"sbqu0kvzb3": { tag: "SBQNWDQ.NX_GD_SBQF_DQ_P1_L1_001_AI0615" },
 			"sbqpkwzb3": { tag: "SBQNWDQ.NX_GD_SBQF_DQ_P1_L1_001_AI0588" },
 			"sbqqkvarzb3": { tag: "SBQNWDQ.NX_GD_SBQF_DQ_P1_L1_001_AI0589" },
 			"sbqlaazb3": { tag: "SBQNWDQ.NX_GD_SBQF_DQ_P1_L1_001_AI0585" },
@@ -1498,12 +1512,17 @@ export class BoosterStation{
 			"xspkw": { tag: "XSDQ.NX_GD_XSF_DQ_P1_L1_001_AI0001" },
 			"xsqkvar": { tag: "XSDQ.NX_GD_XSF_DQ_P1_L1_001_AI0002" },
 			"xsfhz": { tag: "XSDQ.NX_GD_XSF_DQ_P1_L1_001_AI0018" },
-			//右边这块无点
-			"xsuakvzb2z": { tag: "XSDQ.NX_GD_XSF_DQ_P1_L1_001_AI0066" },
-			"xsuabkvzb2z": { tag: "XSDQ.NX_GD_XSF_DQ_P1_L1_001_AI0074" },
+			//右边这块无点,补
+			"xsuakvzb2zs": { tag: "XSDQ.NX_GD_XSF_DQ_P1_L1_001_AI0066" },
+			"xsuabkvzb2zs": { tag: "XSDQ.NX_GD_XSF_DQ_P1_L1_001_AI0074" },
+			"xslaazb2s": { tag: "XSDQ.NX_GD_XSF_DQ_P1_L1_001_AI0093" },
+			"xspmwzb2s": { tag: "XSDQ.NX_GD_XSF_DQ_P1_L1_001_AI0080" },
+			"xsqkvarzb2s": { tag: "XSDQ.NX_GD_XSF_DQ_P1_L1_001_AI0081" },
+			"xsuakvzb2z": { tag: "XSDQ.NX_GD_XSF_DQ_P1_L1_001_AI0090" },
+			"xsuabkvzb2z": { tag: "XSDQ.NX_GD_XSF_DQ_P1_L1_001_AI0098" },
 			"xslaazb2": { tag: "XSDQ.NX_GD_XSF_DQ_P1_L1_001_AI0069" },
-			"xspmwzb2": { tag: "XSDQ.NX_GD_XSF_DQ_P1_L1_001_AI0080" },
-			"xsqkvarzb2": { tag: "XSDQ.NX_GD_XSF_DQ_P1_L1_001_AI0081" },
+			"xspmwzb2": { tag: "XSDQ.NX_GD_XSF_DQ_P1_L1_001_AI0104" },
+			"xsqkvarzb2": { tag: "XSDQ.NX_GD_XSF_DQ_P1_L1_001_AI0105" },
 			"xsuakvzb2y": { tag: "XSDQ.NX_GD_XSF_DQ_P1_L1_001_AI0123" },
 			"xsubkvzb2": { tag: "XSDQ.NX_GD_XSF_DQ_P1_L1_001_AI0124" },
 			"xsuckvzb2": { tag: "XSDQ.NX_GD_XSF_DQ_P1_L1_001_AI0125" },
@@ -1515,9 +1534,15 @@ export class BoosterStation{
 			"xswdzb22": { tag: "XSDQ.NX_GD_XSF_DQ_P1_L1_001_AI0087" },
 			"xsrzwdzb2": { tag: "XSDQ.NX_GD_XSF_DQ_P1_L1_001_AI0088" },
 			"xsdwzb2": { tag: "XSDQ.NX_GD_XSF_DQ_P1_L1_001_AI0089" },
+			//补
+			"xsuakvzb1d": { tag: "XSDQ.NX_GD_XSF_DQ_P1_L1_001_AI0034" },
+			"xsuabkvzb1d": { tag: "XSDQ.NX_GD_XSF_DQ_P1_L1_001_AI0038" },
+			"xslaazb1d": { tag: "XSDQ.NX_GD_XSF_DQ_P1_L1_001_AI0156" },
+			"xspkwzb1d": { tag: "XSDQ.NX_GD_XSF_DQ_P1_L1_001_AI0032" },
+			"xsqkvarzb1d": { tag: "XSDQ.NX_GD_XSF_DQ_P1_L1_001_AI0033" },
 			"xsuakvzb1": { tag: "XSDQ.NX_GD_XSF_DQ_P1_L1_001_AI0021" },
-			"xsuabkvzb1": { tag: "XSDQ.NX_GD_XSF_DQ_P1_L1_001_AI0038" },
-			"xslaazb1": { tag: "XSDQ.NX_GD_XSF_DQ_P1_L1_001_AI0024" },
+			"xsuabkvzb1": { tag: "XSDQ.NX_GD_XSF_DQ_P1_L1_001_AI0402" },
+			"xslaazb1": { tag: "XSDQ.NX_GD_XSF_DQ_P1_L1_001_AI0150" },
 			"xspkwzb1": { tag: "XSDQ.NX_GD_XSF_DQ_P1_L1_001_AI0019" },
 			"xsqkvarzb1": { tag: "XSDQ.NX_GD_XSF_DQ_P1_L1_001_AI0020" },
 			"xsymwd1zb1": { tag: "XSDQ.NX_GD_XSF_DQ_P1_L1_001_AI0028" },
@@ -1536,7 +1561,7 @@ export class BoosterStation{
 			"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_AI0" },
+			"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" },
@@ -1612,7 +1637,7 @@ 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_DI0853" },
+			"xskg3140": { tag: "XSDQ.NX_GD_XSF_DQ_P1_L1_001_DI0583" },
 			"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" },
@@ -1825,35 +1850,35 @@ export class BoosterStation{
 			"xhsc317": { tag: "XHDQ.NX_GD_XHG_DQ_P1_L1_001_DI0030" },
 		}
 	}
-	
-	constructor(){
+
+	constructor() {
 		this.getDatas = this.getDatas.bind(this);
-		this.getTags=this.getTags.bind(this);
+		this.getTags = this.getTags.bind(this);
 	}
 
-	getDatas(station,action){
-		var currentStation = this.tags[station]
-		var tags = this.getTags(currentStation);
-		
-		api.refreshData(tags).then(msg=>{
-			var datas = msg.data;
-			var data = {};
-			for(var v in currentStation){
-				var dt = datas[currentStation[v].tag];
-				if(!dt)continue;
-				data[v]=dt.doubleValue?dt.doubleValue.toFixed(2):(dt.booleanValue?dt.booleanValue:0);
+	getDatas(station, action) {
+		let currentStation = this.tags[station]
+		let tags = this.getTags(currentStation);
+
+		api.refreshData(tags).then(msg => {
+			let datas = msg.data;
+			let data = {};
+			for (let v in currentStation) {
+				let dt = datas[currentStation[v].tag];
+				if (!dt) continue;
+				data[v] = dt.doubleValue ? dt.doubleValue.toFixed(2) : (dt.booleanValue ? dt.booleanValue : 0);
 			}
 			action(data);
 		})
-		.catch(err=>
-			console.error(err)
-		);
+			.catch(err =>
+				console.error(err)
+			);
 	}
-	
-	getTags(station){
-		var tags = "";
-		for(var v in station){
-			tags+= station[v].tag+",";
+
+	getTags(station) {
+		let tags = "";
+		for (let v in station) {
+			tags += station[v].tag + ",";
 		}
 		return tags;
 	}

src/utils/MessageBridge.js

@@ -41,8 +41,8 @@ export default class MessageBridge {
       this.windFlag = (new Date()).getTime()
     }
     if (msg.command != "MESSAGE" || !msg.headers.destination) return;
-    var os = this.getActions(msg.headers.destination);
-    for (var id in os) {
+    let os = this.getActions(msg.headers.destination);
+    for (let id in os) {
       try {
         os[id].action(msg.body, msg.headers);
       } catch (e) { }
@@ -50,11 +50,11 @@ export default class MessageBridge {
   }
 
   getActions(destination) {
-    var list = new Array();
+    let list = new Array();
     if ((this.observers.filter(item => item.key === "/topic/windturbine").length === 0) ||(this.observers.filter(item => item.key === "/topic/suggestion").length === 0) ||(this.observers.filter(item => item.key === "/topic/title-info").length === 0) ) {
       store.commit('observers', false)
     }
-    for (var i in this.observers) {
+    for (let i in this.observers) {
       if (this.observers[i].key == destination) {
         list.push(this.observers[i]);
       }
@@ -64,7 +64,7 @@ export default class MessageBridge {
 
   /* 注册消息 */
   register(msgs) {
-    for (var i in msgs) {
+    for (let i in msgs) {
       this.observers.push(msgs[i]);
     }
   }
@@ -82,6 +82,9 @@ export default class MessageBridge {
 
   reconnect() {
     setTimeout(() => {
+      if ((this.observers.filter(item => item.key === "/topic/windturbine").length === 0) ||(this.observers.filter(item => item.key === "/topic/suggestion").length === 0) ||(this.observers.filter(item => item.key === "/topic/title-info").length === 0) ) {
+        store.commit('observers', false)
+      }
       this.reconnect()
     }, 10000);
     if (((new Date()).getTime() - this.windFlag) > 20000) {
@@ -139,7 +142,7 @@ class WebSocket {
   /* 注册 */
   connectCallBackSubscribe() {
     // console.log(`注册消息${this.settings}`)
-    for (var index in this.settings) {
+    for (let index in this.settings) {
       this.client.subscribe(this.settings[index], frame => this.onmessage(frame));
     }
   }

src/utils/UniformCodes.js

@@ -3956,8 +3956,8 @@ export default class UniformCodes {
 
   /* 获取场站信息 */
   getStationInfos(windturbine) {
-    var val = this.Codes[windturbine.stationId][windturbine.modelId];
-    var codes = "";
+    let val = this.Codes[windturbine.stationId][windturbine.modelId];
+    let codes = "";
     val.BasicInfo.forEach(element => {
       // console.log(element);
       element.param.forEach(itm => {

src/views/CenterPage.vue

@@ -77,12 +77,12 @@
 		},
 		methods: {
 			initData: function () {
-				var mb = MessageBridge.getInstance();
-				var vs = [{ key: "/topic/fault-popup", action: this.faultMessage }];
+				let mb = MessageBridge.getInstance();
+				let vs = [{ key: "/topic/fault-popup", action: this.faultMessage }];
 				mb.register(vs);
 			},
 			faultMessage(msg) {
-				var val = JSON.parse(msg);
+				let val = JSON.parse(msg);
 			},
 			handleClick(value){
 				this.current = value

src/views/ManualPage.vue

@@ -69,12 +69,12 @@
         },
         methods: {
             initData: function () {
-                var mb = MessageBridge.getInstance();
-                var vs = [{ key: "/topic/fault-popup", action: this.faultMessage }];
+                let mb = MessageBridge.getInstance();
+                let vs = [{ key: "/topic/fault-popup", action: this.faultMessage }];
                 mb.register(vs);
             },
             faultMessage(msg) {
-                var val = JSON.parse(msg);
+                let val = JSON.parse(msg);
             },
         },
     }

src/views/StatusBar.vue

@@ -160,7 +160,7 @@
         }
       },
       // refreshData() {
-      //   var bd = BackgroundData.getInstance();
+      //   let bd = BackgroundData.getInstance();
       //   this.hiddenDangerNum = bd.HiddenProblems.length;
       //   this.defectNum = bd.Defects.length;
       //   this.malfunctionNum = bd.Failure.length;

src/views/TitleBar.vue

@@ -196,8 +196,8 @@
     },
     methods: {
       initData() {
-        var mb = MessageBridge.getInstance();
-        var vs = [{ key: "/topic/title-info", action: this.titleInfos }];
+        let mb = MessageBridge.getInstance();
+        let vs = [{ key: "/topic/title-info", action: this.titleInfos }];
         mb.register(vs);
       },
       titleInfos(msg) {
@@ -212,10 +212,10 @@
       },
       // refreshData() {
       //   // todo 计算发电量的时候没有考虑光伏的，后续完善
-      //   var bd = BackgroundData.getInstance();
-      //   var val = bd.TopPoint;
-      //   for (var v in val) {
-      //     var pt = val[v];
+      //   let bd = BackgroundData.getInstance();
+      //   let val = bd.TopPoint;
+      //   for (let v in val) {
+      //     let pt = val[v];
       //     if (pt.pointName == "TotalPower") {
       //       this.totalPower = pt.value.toFixed(2);
       //     } else if (pt.pointName == "DailyPowerGeneration") {
@@ -232,7 +232,7 @@
 
       /* 登录 */
       login() {
-        // var bd = BackgroundData.getInstance();
+        // let bd = BackgroundData.getInstance();
         //   this.loginMessage='正在登录...';
         // bd.login(this.form.name,this.form.psd,this.onLoged);
         api.login({
@@ -256,7 +256,7 @@
           this.loginMessage = msg.message;
           return;
         }
-        var user = msg.data;
+        let user = msg.data;
         this.$store.commit('token', user.token)
         BackgroundData.getInstance().LoginUser = user;
         this.usreName = user.name;