From e4e6c1a0e34cbd5aca446018d19166497d8d7814 Mon Sep 17 00:00:00 2001
From: admin <52323@qq.com>
Date: 星期五, 15 九月 2023 11:38:12 +0800
Subject: [PATCH] Merge branch 'master' of http://10.153.19.25:10101/r/CanadaMes
---
CanadaMes-ui/src/views/Electrical/Sign.vue | 237 +++++++++++++++++++++++++++++------------------------------
1 files changed, 116 insertions(+), 121 deletions(-)
diff --git a/CanadaMes-ui/src/views/Electrical/Sign.vue b/CanadaMes-ui/src/views/Electrical/Sign.vue
index 0dfacd4..11e52a9 100644
--- a/CanadaMes-ui/src/views/Electrical/Sign.vue
+++ b/CanadaMes-ui/src/views/Electrical/Sign.vue
@@ -2,15 +2,16 @@
<div class="app">
<!--闈㈠寘灞戝鑸尯鍩�-->
<el-breadcrumb separator-class="el-icon-arrow-right" class="el-breadcrumb">
- <router-link to="/home" tag="el-button" type="text">{{ $t('langHome') }}</router-link>
- <el-button type="text">{{ $t('Electrical') }}</el-button>
- <router-link to="/Electrical/Parameter" tag="el-button" type="text">{{ $t('Parameter') }}</router-link>
- <router-link to="/Electrical/Action" tag="el-button" type="text">{{ $t('Action') }}</router-link>
- <router-link to="/Electrical/Sign" tag="el-button" type="text">{{ $t('Sign') }}</router-link>
- <router-link to="/Electrical/State" tag="el-button" type="text">{{ $t('State') }}</router-link>
- <router-link to="/Electrical/alarm" tag="el-button" type="text">{{ $t('Alarm') }}</router-link>
+
+ <router-link to="/Electrical/alarm" tag="el-button" type="text" active-class="blue-button">{{ $t('Alarm') }}</router-link>
+ <router-link to="/Electrical/State" tag="el-button" type="text" active-class="blue-button">{{ $t('State') }}</router-link>
+ <router-link to="/Electrical/Action" tag="el-button" type="text" active-class="blue-button">{{ $t('Action') }}</router-link>
+ <router-link to="/Electrical/Parameter" tag="el-button" type="text" active-class="blue-button">{{ $t('Parameter') }}</router-link>
+ <router-link to="/Electrical/Sign" tag="el-button" type="text" active-class="blue-button">{{ $t('Sign') }}</router-link>
+
+
</el-breadcrumb>
- <div>Sign</div>
+ <div>{{ $t('Sign') }}</div>
<div style="padding-right: 30px;display: flex;flex-wrap: wrap;" class="neir">
<div class="kuai_sb" v-for="item in record.xyData" :key="item.name">
<el-col class="deng" :class="getStatusClass(item.value)">
@@ -32,104 +33,105 @@
mixins: [LanguageMixin],
data () {
return {
+ activeButton: '',
record: {
//瀹氫箟鏁扮粍锛屽苟娣诲姞榛樿鍊�
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',
+ ],
},
@@ -148,29 +150,20 @@
this.init();
},
methods: {
+ onButtonClick () {
+ this.isButtonClicked = true; // 灏嗘寜閽鑹茶缃负钃濊壊
+ setTimeout(() => {
+ this.isButtonClicked = false; // 閲嶇疆鎸夐挳棰滆壊
+ }, 500); // 杩欓噷鐨�500姣鏄牴鎹偍甯屾湜鎸夐挳棰滆壊鎸佺画澶氶暱鏃堕棿鏉ュ畾鐨勶紝鍙互鏍规嵁闇�姹傝繘琛岃皟鏁�
+ },
//鏍规嵁璇诲彇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 +190,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 +215,6 @@
}
}
},
- send () {
- this.messagepack.data = { taskname: "鍓嶇鍒板悗鍙�" };
- socket?.send(JSON.stringify(this.messagepack)); // 灏嗙粍瑁呭ソ鐨刯son鍙戦�佺粰鏈嶅姟绔紝鐢辨湇鍔＄杩涜杞彂
- }
}
}
@@ -234,7 +225,7 @@
</script>
-<style>
+<style >
* {
margin: 0;
padding: 0;
@@ -306,4 +297,8 @@
.yellow {
background-color: yellow;
}
+
+.blue-button {
+ background-color: skyblue;
+}
</style>
\ No newline at end of file
--
Gitblit v1.8.0