From d75d7d7d76fe16e133f793cc31bfaea17a10cd24 Mon Sep 17 00:00:00 2001
From: wuyouming666 <2265557248@qq.com>
Date: 星期一, 27 十一月 2023 13:39:59 +0800
Subject: [PATCH] Merge branch 'master' of http://10.153.19.25:10101/r/CanadaMes
---
CanadaMes-ui/src/views/Electrical/Sign.vue | 129 ++++++++----------------------------------
1 files changed, 25 insertions(+), 104 deletions(-)
diff --git a/CanadaMes-ui/src/views/Electrical/Sign.vue b/CanadaMes-ui/src/views/Electrical/Sign.vue
index c315db8..3ee386e 100644
--- a/CanadaMes-ui/src/views/Electrical/Sign.vue
+++ b/CanadaMes-ui/src/views/Electrical/Sign.vue
@@ -13,14 +13,14 @@
}}</router-link>
<router-link to="/Electrical/Sign" tag="el-button" type="text" active-class="blue-button">{{ $t('Sign')
}}</router-link>
-
+ <router-link to="/Electrical/Servomanual" tag="el-button" type="text" active-class="blue-button">{{ $t('Servo Manual')
+ }}</router-link>
</el-breadcrumb>
<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 +42,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 +78,7 @@
},
//鏍规嵁璇诲彇PLC鐨勫�硷紝鏍规嵁鍚嶇О鏀瑰彉棰滆壊
getStatusClass (zhuangtai) {
+ // console.log(this.record.xyData);
if (zhuangtai === 0) {
return "op";
}
@@ -206,10 +112,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 +150,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 +240,8 @@
.blue-button {
background-color: skyblue;
}
+
+.dark-theme {
+ display: none;
+}
</style>
\ No newline at end of file
--
Gitblit v1.8.0