From bcf86e7323837ff6e2c9cd6bb25b9d29907e34ed Mon Sep 17 00:00:00 2001
From: clll <1320612696@qq.com>
Date: 星期五, 03 十一月 2023 17:03:43 +0800
Subject: [PATCH] 添加sign界面添加状态，判断改地址是否启用
---
CanadaMes-ui/src/views/Electrical/Sign.vue | 126 +++-----------------
springboot-vue3/src/main/java/com/example/springboot/component/Plcsign.java | 2
CanadaMes-ui/src/configuration/Sign.json | 228 ++++++++++++++++++++++++++++---------
3 files changed, 195 insertions(+), 161 deletions(-)
diff --git a/CanadaMes-ui/src/configuration/Sign.json b/CanadaMes-ui/src/configuration/Sign.json
index 838f46c..c634375 100644
--- a/CanadaMes-ui/src/configuration/Sign.json
+++ b/CanadaMes-ui/src/configuration/Sign.json
@@ -1,175 +1,289 @@
{
"sign": [
{
- "name": "D01.SR dec"
+ "name": "D01.SR dec",
+ "value": "1",
+ "state": "1"
},
{
- "name": "D01.SR in pos"
+ "name": "D01.SR in pos",
+ "value": "0",
+ "state": "1"
},
{
- "name": "D02.SR dec"
+ "name": "D02.SR dec",
+ "value": "0",
+ "state": "1"
},
{
- "name": "D02.SR in pos"
+ "name": "D02.SR in pos",
+ "value": "1",
+ "state": "1"
},
{
- "name": "D03.SR into"
+ "name": "D03.SR into",
+ "value": "1",
+ "state": "1"
},
{
- "name": "D03.SR dec"
+ "name": "D03.SR dec",
+ "value": "1",
+ "state": "1"
},
{
- "name": "D03.SR in pos"
+ "name": "D03.SR in pos",
+ "value": "1",
+ "state": "1"
},
{
- "name": "D04.SR dec"
+ "name": "D04.SR dec",
+ "value": "1",
+ "state": "1"
},
{
- "name": "D04.SR in pos"
+ "name": "D04.SR in pos",
+ "value": "1",
+ "state": "1"
},
{
- "name": "D05.SR dec"
+ "name": "D05.SR dec",
+ "value": "1",
+ "state": "1"
},
{
- "name": "D05.SR in pos"
+ "name": "D05.SR in pos",
+ "value": "1",
+ "state": "1"
},
{
- "name": "D06.SR dec"
+ "name": "D06.SR dec",
+ "value": "1",
+ "state": "1"
},
{
- "name": "D06.SR in pos"
+ "name": "D06.SR in pos",
+ "value": "1",
+ "state": "1"
},
{
- "name": "B01.SR out dec"
+ "name": "B01.SR out dec",
+ "value": "1",
+ "state": "1"
},
{
- "name": "B01.SR out in pos"
+ "name": "B01.SR out in pos",
+ "value": "1",
+ "state": "1"
},
{
- "name": "B01.SR in dec"
+ "name": "B01.SR in dec",
+ "value": "1",
+ "state": "1"
},
{
- "name": "B01.SR in in pos"
+ "name": "B01.SR in in pos",
+ "value": "1",
+ "state": "1"
},
{
- "name": "B01.SR turn on"
+ "name": "B01.SR turn on",
+ "value": "1",
+ "state": "1"
},
{
- "name": "B01.SR turn off"
+ "name": "B01.SR turn off",
+ "value": "1",
+ "state": "1"
},
{
- "name": "B01.SR up"
+ "name": "B01.SR up",
+ "value": "1",
+ "state": "1"
},
{
- "name": "B01.SR down"
+ "name": "B01.SR down",
+ "value": "1",
+ "state": "1"
},
{
- "name": "B02.SR out dec"
+ "name": "B02.SR out dec",
+ "value": "1",
+ "state": "1"
},
{
- "name": "B02.SR out in pos"
+ "name": "B02.SR out in pos",
+ "value": "1",
+ "state": "1"
},
{
- "name": "B02.SR in dec"
+ "name": "B02.SR in dec",
+ "value": "1",
+ "state": "1"
},
{
- "name": "B02.SR in in pos"
+ "name": "B02.SR in in pos",
+ "value": "1",
+ "state": "1"
},
{
- "name": "B02.SR turn on"
+ "name": "B02.SR turn on",
+ "value": "1",
+ "state": "1"
},
{
- "name": "B02.SR turn off"
+ "name": "B02.SR turn off",
+ "value": "1",
+ "state": "1"
},
{
- "name": "B02.SR up"
+ "name": "B02.SR up",
+ "value": "1",
+ "state": "1"
},
{
- "name": "B02.SR down"
+ "name": "B02.SR down",
+ "value": "1",
+ "state": "1"
},
{
- "name": "B01.SR out safety"
+ "name": "B01.SR out safety",
+ "value": "1",
+ "state": "1"
},
{
- "name": "B01.SR in safety"
+ "name": "B01.SR in safety",
+ "value": "1",
+ "state": "1"
},
{
- "name": "B02.SR out safety"
+ "name": "B02.SR out safety",
+ "value": "1",
+ "state": "1"
},
{
- "name": "SB.start(+)"
+ "name": "SB.start(+)",
+ "value": "1",
+ "state": "1"
},
{
- "name": "SB.stop(1)"
+ "name": "SB.stop(1)",
+ "value": "1",
+ "state": "1"
},
{
- "name": "SB.reset"
+ "name": "SB.reset",
+ "value": "1",
+ "state": "1"
},
{
- "name": "SB.auto/manul"
+ "name": "SB.auto/manul",
+ "value": "1",
+ "state": "1"
},
{
- "name": "SB.pause"
+ "name": "SB.pause",
+ "value": "1",
+ "state": "1"
},
{
- "name": "SB.emg"
+ "name": "SB.emg",
+ "value": "1",
+ "state": "1"
},
{
- "name": "D01.SB.start"
+ "name": "D01.SB.start",
+ "value": "1",
+ "state": "1"
},
{
- "name": "D06.SB.start"
+ "name": "D06.SB.start",
+ "value": "1",
+ "state": "1"
},
{
- "name": "B02.SR in safety"
+ "name": "B02.SR in safety",
+ "value": "1",
+ "state": "1"
},
{
- "name": "SAFETYDOOR.requset"
+ "name": "SAFETYDOOR.requset",
+ "value": "1",
+ "state": "1"
},
{
- "name": "SAFETYDOOR.confirm"
+ "name": "SAFETYDOOR.confirm",
+ "value": "1",
+ "state": "1"
},
{
- "name": "SAFETYDOOR.reset"
+ "name": "SAFETYDOOR.reset",
+ "value": "1",
+ "state": "1"
},
{
- "name": "LED.red"
+ "name": "LED.red",
+ "value": "1",
+ "state": "1"
},
{
- "name": "LED.green"
+ "name": "LED.green",
+ "value": "1",
+ "state": "1"
},
{
- "name": "LED.yellow"
+ "name": "LED.yellow",
+ "value": "1",
+ "state": "1"
},
{
- "name": "D01.LED.green"
+ "name": "D01.LED.green",
+ "value": "1",
+ "state": "1"
},
{
- "name": "D06.LED.green"
+ "name": "D06.LED.green",
+ "value": "1",
+ "state": "1"
},
{
- "name": "B01.YV.turn"
+ "name": "B01.YV.turn",
+ "value": "1",
+ "state": "1"
},
{
- "name": "B01.YV.up down"
+ "name": "B01.YV.up down",
+ "value": "1",
+ "state": "1"
},
{
- "name": "B01.YV.gassing"
+ "name": "B01.YV.gassing",
+ "value": "1",
+ "state": "1"
},
{
- "name": "B02.YV.turn"
+ "name": "B02.YV.turn",
+ "value": "1",
+ "state": "1"
},
{
- "name": "B02.YV.up down"
+ "name": "B02.YV.up down",
+ "value": "1",
+ "state": "1"
},
{
- "name": "B02.YV.gassing"
+ "name": "B02.YV.gassing",
+ "value": "1",
+ "state": "1"
},
{
- "name": "SAFETYDOOR.led"
+ "name": "SAFETYDOOR.led",
+ "value": "1",
+ "state": "1"
},
{
- "name": "SAFETYDOOR.open"
+ "name": "SAFETYDOOR.open",
+ "value": "1",
+ "state": "1"
}
],
"address": [
diff --git a/CanadaMes-ui/src/views/Electrical/Sign.vue b/CanadaMes-ui/src/views/Electrical/Sign.vue
index c315db8..a3151cf 100644
--- a/CanadaMes-ui/src/views/Electrical/Sign.vue
+++ b/CanadaMes-ui/src/views/Electrical/Sign.vue
@@ -19,8 +19,7 @@
<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)">
- </el-col>
+ <el-col class="deng" :class="getStatusClass(item.value)"></el-col>
<el-input v-model="item.name" style="width: 280px;" class="in_mc"></el-input>
</div>
@@ -42,104 +41,9 @@
jsonData: data,
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 dec222', 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',
- ],
-
+ //瀹氫箟鏁扮粍
+ params: [],
+ xyData: [],
},
@@ -173,6 +77,7 @@
},
//鏍规嵁璇诲彇PLC鐨勫�硷紝鏍规嵁鍚嶇О鏀瑰彉棰滆壊
getStatusClass (zhuangtai) {
+ // console.log(this.record.xyData);
if (zhuangtai === 0) {
return "op";
}
@@ -206,10 +111,20 @@
//console.log("鏀跺埌鏁版嵁====" + msg.data);
let obj = JSON.parse(msg.data);
this.record.params[0] = obj.sig[0];
- for (let a = 0; a < this.record.params[0].length; a++) {
- this.record.xyData[a].name = this.jsonData.sign[a].name;
+
+ this.record.xyData = this.jsonData.sign;
+
+ for (let a = 0; a < this.record.xyData.length; a++) {
this.record.xyData[a].value = this.record.params[0][a];
+
}
+
+ this.record.xyData = this.jsonData.sign.filter(item => {
+ return item.state != 0;
+ }
+
+ );
+
const language = this.$i18n.locale;
if (language === 'en-US') {
@@ -234,7 +149,8 @@
//璇█杞崲
replaceChineseWithEnglish () {
const translation = this.$t('Signlang');
- this.record.xyData = this.record.xyData.map(item => { return { name: translation[item.name] || item.name, value: item.value, unit: item.unit }; });
+
+ this.record.xyData = this.record.xyData.map(item => { return { name: translation[item.name] || item.name, value: item.value }; });
//console.log(translation);
}
}
@@ -323,4 +239,8 @@
.blue-button {
background-color: skyblue;
}
+
+.dark-theme {
+ display: none;
+}
</style>
\ No newline at end of file
diff --git a/springboot-vue3/src/main/java/com/example/springboot/component/Plcsign.java b/springboot-vue3/src/main/java/com/example/springboot/component/Plcsign.java
index 9b19442..0e503c4 100644
--- a/springboot-vue3/src/main/java/com/example/springboot/component/Plcsign.java
+++ b/springboot-vue3/src/main/java/com/example/springboot/component/Plcsign.java
@@ -73,7 +73,7 @@
// List<Boolean> plclist = S7control.getinstance().ReadBits("DB102.0.0", 44);
// List<Boolean> plclist2 = S7control.getinstance().ReadBits("DB102.5.5", 13);
- Boolean[] values = { true, false, true, false, true, false, true, false,
+ Boolean[] values = { true, true, true, true, true, false, true, false,
true, false, true, false, true, false,
true, false, true, false, true, false, true, false, true, false, true, false,
true, false, true, false, true,
--
Gitblit v1.8.0