From 617c83a35ef0a9f585b33f634588ba3e90f490cb Mon Sep 17 00:00:00 2001
From: ZengTao <2773468879@qq.com>
Date: 星期二, 12 九月 2023 18:26:05 +0800
Subject: [PATCH] Merge branch 'master' of http://10.153.19.25:10101/r/CanadaMes
---
CanadaMes-ui/src/views/Electrical/Sign.vue | 207 +++++++++++++++++++++++----------------------------
1 files changed, 95 insertions(+), 112 deletions(-)
diff --git a/CanadaMes-ui/src/views/Electrical/Sign.vue b/CanadaMes-ui/src/views/Electrical/Sign.vue
index 0dfacd4..3252ddb 100644
--- a/CanadaMes-ui/src/views/Electrical/Sign.vue
+++ b/CanadaMes-ui/src/views/Electrical/Sign.vue
@@ -37,99 +37,99 @@
params: [1, 1, 1, 1, 1, 0, 1, 0, 1, 0, 1, 0, 1, 0, 1, 0, 1, 0, 1, 0, 1, 0, 1, 0, 1, 0, 1, 0, 1, 0, 1, 0,
1, 0, 1, 0, 1, 0, 1, 0, 1, 0, 1, 0, 1, 0, 1, 0, 1, 0, 1, 0, 1, 0, 1, 0, 1, 0, 1, 0, 1, 0, 1, 0, 1, 0, 1,],
xyData: [
- { name: 'D01.SR dec', value: 0 },
- { name: "D01.SR in pos", value: 0 },
- { name: "D02.SR dec", value: 0 },
- { name: "D02.SR in pos", value: 0 },
- { name: "D03.SR into", value: 0 },
- { name: "D03.SR dec", value: 0 },
- { name: 'D03.SR in pos', value: 0 },
- { name: "D04.SR dec", value: 0 },
- { name: "D04.SR in pos", value: 0 },
- { name: "D05.SR dec", value: 0 },
- { name: "D05.SR in pos", value: 0 },
- { name: "D06.SR dec", value: 0 },
- { name: 'D06.SR in pos', value: 0 },
- { name: "B01.SR out dec", value: 0 },
- { name: "B01.SR out in pos", value: 0 },
- { name: "B01.SR in dec", value: 0 },
- { name: "B01.SR in in pos", value: 0 },
- { name: "B01.SR turn on", value: 0 },
- { name: 'B01.SR turn off', value: 0 },
- { name: "B01.SR up", value: 0 },
- { name: "B01.SR down", value: 0 },
- { name: "B02.SR out dec", value: 0 },
- { name: "B02.SR out in pos", value: 0 },
- { name: "B02.SR in dec", value: 0 },
- { name: 'B02.SR in in pos', value: 0 },
- { name: "B02.SR turn on", value: 0 },
- { name: "B02.SR turn off", value: 0 },
- { name: "B02.SR up", value: 0 },
- { name: "B02.SR down", value: 0 },
- { name: "B01.SR out safety", value: 0 },
- { name: "B01.SR in safety", value: 0 },
- { name: "B02.SR out safety", value: 0 },
- { name: "SB.start(+)", value: 0 },
- { name: "SB.stop(1)", value: 0 },
- { name: "SB.reset", value: 0 },
- { name: "SB.auto/manul", value: 0 },
- { name: "SB.pause", value: 0 },
- { name: "SB.emg", value: 0 },
- { name: "D01.SB.start", value: 0 },
- { name: "D06.SB.start", value: 0 },
- { name: "B02.SR in safety", value: 0 },
- { name: "SAFETYDOOR.requset", value: 0 },
- { name: "SAFETYDOOR.confirm", value: 0 },
- { name: "SAFETYDOOR.reset", value: 0 },
- { name: "LED.red", value: 0 },
- { name: "LED.green", value: 0 },
- { name: "LED.yellow", value: 0 },
- { name: "D01.LED.green", value: 0 },
- { name: "D06.LED.green", value: 0 },
- { name: "B01.YV.turn", value: 0 },
- { name: "B01.YV.up down", value: 0 },
- { name: "B01.YV.gassing", value: 0 },
- { name: "B02.YV.turn", value: 0 },
- { name: "B02.YV.up down", value: 0 },
- { name: "B02.YV.gassing", value: 0 },
- { name: "SAFETYDOOR.led", value: 0 },
- { name: "SAFETYDOOR.open", value: 0 },
+ { name: 'D01.SR dec', value: 1 },
+ { name: "D01.SR in pos", value: 1 },
+ { name: "D02.SR dec", value: 1 },
+ { name: "D02.SR in pos", value: 1 },
+ { name: "D03.SR into", value: 1 },
+ { name: "D03.SR dec", value: 1 },
+ { name: 'D03.SR in pos', value: 1 },
+ { name: "D04.SR dec", value: 1 },
+ { name: "D04.SR in pos", value: 1 },
+ { name: "D05.SR dec", value: 1 },
+ { name: "D05.SR in pos", value: 1 },
+ { name: "D06.SR dec", value: 1 },
+ { name: 'D06.SR in pos', value: 1 },
+ { name: "B01.SR out dec", value: 1 },
+ { name: "B01.SR out in pos", value: 1 },
+ { name: "B01.SR in dec", value: 1 },
+ { name: "B01.SR in in pos", value: 1 },
+ { name: "B01.SR turn on", value: 1 },
+ { name: 'B01.SR turn off', value: 1 },
+ { name: "B01.SR up", value: 1 },
+ { name: "B01.SR down", value: 1 },
+ { name: "B02.SR out dec", value: 1 },
+ { name: "B02.SR out in pos", value: 1 },
+ { name: "B02.SR in dec", value: 1 },
+ { name: 'B02.SR in in pos', value: 1 },
+ { name: "B02.SR turn on", value: 1 },
+ { name: "B02.SR turn off", value: 1 },
+ { name: "B02.SR up", value: 1 },
+ { name: "B02.SR down", value: 1 },
+ { name: "B01.SR out safety", value: 1 },
+ { name: "B01.SR in safety", value: 1 },
+ { name: "B02.SR out safety", value: 1 },
+ { name: "SB.start(+)", value: 1 },
+ { name: "SB.stop(1)", value: 1 },
+ { name: "SB.reset", value: 1 },
+ { name: "SB.auto/manul", value: 1 },
+ { name: "SB.pause", value: 1 },
+ { name: "SB.emg", value: 1 },
+ { name: "D01.SB.start", value: 1 },
+ { name: "D06.SB.start", value: 1 },
+ { name: "B02.SR in safety", value: 1 },
+ { name: "SAFETYDOOR.requset", value: 1 },
+ { name: "SAFETYDOOR.confirm", value: 1 },
+ { name: "SAFETYDOOR.reset", value: 1 },
+ { name: "LED.red", value: 1 },
+ { name: "LED.green", value: 1 },
+ { name: "LED.yellow", value: 1 },
+ { name: "D01.LED.green", value: 1 },
+ { name: "D06.LED.green", value: 1 },
+ { name: "B01.YV.turn", value: 1 },
+ { name: "B01.YV.up down", value: 1 },
+ { name: "B01.YV.gassing", value: 1 },
+ { name: "B02.YV.turn", value: 1 },
+ { name: "B02.YV.up down", value: 1 },
+ { name: "B02.YV.gassing", value: 1 },
+ { name: "SAFETYDOOR.led", value: 1 },
+ { name: "SAFETYDOOR.open", value: 1 },
],
- // canshu: [
- // 'D01.SR dec',
- // 'D01.SR in pos',
- // 'D02.SR dec',
- // 'D02.SR in pos',
- // 'D03.SR into',
- // 'D03.SR dec',
- // 'D03.SR in pos',
- // 'D04.SR dec',
- // 'D04.SR in pos',
- // 'D05.SR dec',
- // 'D05.SR in pos',
- // 'D06.SR dec',
- // 'D06.SR in pos',
- // 'B01.SR out dec',
- // 'B01.SR out in pos',
- // 'B01.SR in dec',
- // 'B01.SR in in pos',
- // 'B01.SR turn on',
- // 'B01.SR turn off',
- // 'B01.SR up',
- // 'B01.SR down',
- // 'B02.SR out dec',
- // 'B02.SR out in pos',
- // 'B02.SR in dec',
- // 'B02.SR in in pos',
- // 'B02.SR turn on',
- // 'B02.SR turn off',
- // 'B02.SR up',
- // 'B02.SR down',
- // 'LED.red',
- // 'LED.green',
- // 'LED.yellow',
- // ],
+ canshu: [
+ 'D01.SR dec',
+ 'D01.SR in pos',
+ 'D02.SR dec',
+ 'D02.SR in pos',
+ 'D03.SR into',
+ 'D03.SR dec',
+ 'D03.SR in pos',
+ 'D04.SR dec',
+ 'D04.SR in pos',
+ 'D05.SR dec',
+ 'D05.SR in pos',
+ 'D06.SR dec',
+ 'D06.SR in pos',
+ 'B01.SR out dec',
+ 'B01.SR out in pos',
+ 'B01.SR in dec',
+ 'B01.SR in in pos',
+ 'B01.SR turn on',
+ 'B01.SR turn off',
+ 'B01.SR up',
+ 'B01.SR down',
+ 'B02.SR out dec',
+ 'B02.SR out in pos',
+ 'B02.SR in dec',
+ 'B02.SR in in pos',
+ 'B02.SR turn on',
+ 'B02.SR turn off',
+ 'B02.SR up',
+ 'B02.SR down',
+ 'LED.red',
+ 'LED.green',
+ 'LED.yellow',
+ ],
},
@@ -150,27 +150,12 @@
methods: {
//鏍规嵁璇诲彇PLC鐨勫�硷紝鏍规嵁鍚嶇О鏀瑰彉棰滆壊
getStatusClass (zhuangtai) {
- // if (mc === "LED.green" && zhuangtai === 0) {
- // return "green";
- // }
- // if (mc === "LED.red" && zhuangtai === 0) {
- // return "red";
- // }
- // if (mc === "LED.yellow" && zhuangtai === 0) {
- // return "yellow"
- // }
-
-
if (zhuangtai === 0) {
return "op";
}
else {
return "dow";
}
-
-
-
-
},
init () {
@@ -197,14 +182,16 @@
//console.log("鏀跺埌鏁版嵁====" + msg.data);
let obj = JSON.parse(msg.data);
- //this.$set(this.record.params, 0, obj.params[0]);
this.record.params[0] = obj.sig[0];
- for (let a = 0; a <= this.record.xyData[0] - 1; a++) {
+ for (let a = 0; a < this.record.params[0].length; a++) {
if (!this.record.xyData[a]) {
this.record.xyData[a] = { name: this.record.canshu[a], value: this.record.params[0][a] };
+
} else {
this.record.xyData[a].value = this.record.params[0][a];
+
}
+
}
this.$forceUpdate();
@@ -220,10 +207,6 @@
}
}
},
- send () {
- this.messagepack.data = { taskname: "鍓嶇鍒板悗鍙�" };
- socket?.send(JSON.stringify(this.messagepack)); // 灏嗙粍瑁呭ソ鐨刯son鍙戦�佺粰鏈嶅姟绔紝鐢辨湇鍔＄杩涜杞彂
- }
}
}
--
Gitblit v1.8.0