From 3bed56034d0a79b2748edb747b463a2cf42bc5a5 Mon Sep 17 00:00:00 2001
From: wuyouming666 <2265557248@qq.com>
Date: 星期一, 04 十二月 2023 09:04:11 +0800
Subject: [PATCH] 更新测试后电气管理
---
CanadaMes-ui/src/views/Electrical/Sign.vue | 236 +++++++++++++++++++++++-----------------------------------
1 files changed, 94 insertions(+), 142 deletions(-)
diff --git a/CanadaMes-ui/src/views/Electrical/Sign.vue b/CanadaMes-ui/src/views/Electrical/Sign.vue
index c96d683..4ee28d3 100644
--- a/CanadaMes-ui/src/views/Electrical/Sign.vue
+++ b/CanadaMes-ui/src/views/Electrical/Sign.vue
@@ -2,21 +2,26 @@
<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">Electrical</el-button>
- <router-link to="/Electrical/Parameter" tag="el-button" type="text">Parameter</router-link>
- <router-link to="/Electrical/Action" tag="el-button" type="text">Action</router-link>
- <router-link to="/Electrical/Sign" tag="el-button" type="text">Sign</router-link>
- <router-link to="/Electrical/State" tag="el-button" type="text">State</router-link>
- <router-link to="/Electrical/alarm" tag="el-button" type="text">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>
+ <router-link to="/Electrical/Servomanual" tag="el-button" type="text" active-class="blue-button">{{ $t('Servo Manual')
+ }}</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, item.name)">
- <!-- <el-input v-model="item.value" style="width: 280px;" class="in_mc"></el-input> -->
- </el-col>
- <el-input v-model="item.name" style="width: 280px;" class="in_mc"></el-input>
+ <el-col class="deng" :class="getStatusClass(item.value)"></el-col>
+ <el-input v-model="item.name" style="width: 100%;" class="in_mc"></el-input>
</div>
@@ -26,109 +31,20 @@
</template>
<script >
+import LanguageMixin from '../../lang/LanguageMixin'
+import data from '../../configuration/Sign'
let socket;
export default {
name: "Sign",
+ mixins: [LanguageMixin],
data () {
return {
+ 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 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 },
-
- ],
- // 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: [],
},
@@ -143,33 +59,36 @@
}
},
created () {
- this.init();
+
+ //this.showdata();
},
+ activated(){
+ this.init();
+
+ },
methods: {
- getStatusClass (zhuangtai, mc) {
+ showdata () {
+ console.log(1111);
+ console.log(this.jsonData.sign[0].name);
+ // console.log(this.record.xyData);
+ },
- if (mc === "LED.green" && zhuangtai === 0) {
- return "green";
- }
- if (mc === "LED.red" && zhuangtai === 0) {
- return "red";
- }
- if (mc === "LED.yellow" && zhuangtai === 0) {
- return "yellow"
- }
-
-
+ onButtonClick () {
+ this.isButtonClicked = true; // 灏嗘寜閽鑹茶缃负钃濊壊
+ setTimeout(() => {
+ this.isButtonClicked = false; // 閲嶇疆鎸夐挳棰滆壊
+ }, 500); // 杩欓噷鐨�500姣鏄牴鎹偍甯屾湜鎸夐挳棰滆壊鎸佺画澶氶暱鏃堕棿鏉ュ畾鐨勶紝鍙互鏍规嵁闇�姹傝繘琛岃皟鏁�
+ },
+ //鏍规嵁璇诲彇PLC鐨勫�硷紝鏍规嵁鍚嶇О鏀瑰彉棰滆壊
+ getStatusClass (zhuangtai) {
+ // console.log(this.record.xyData);
if (zhuangtai === 0) {
return "op";
}
else {
return "dow";
}
-
-
-
-
},
init () {
@@ -196,17 +115,30 @@
//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.params.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.record.xyData = this.jsonData.sign;
+ console.log(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') {
+ this.replaceChineseWithEnglish();
+ } else {
+ this.localizedRoles = [...this.record.xyData];
+ }
this.$forceUpdate();
+ this.replaceChineseWithEnglish();
}.bind(this);
//鍏抽棴浜嬩欢
@@ -219,9 +151,16 @@
}
}
},
- send () {
- this.messagepack.data = { taskname: "鍓嶇鍒板悗鍙�" };
- socket?.send(JSON.stringify(this.messagepack)); // 灏嗙粍瑁呭ソ鐨刯son鍙戦�佺粰鏈嶅姟绔紝鐢辨湇鍔＄杩涜杞彂
+ //璇█杞崲
+ replaceChineseWithEnglish () {
+
+ const translation = this.$t('Signlang');
+
+ if (translation != null) {
+ this.record.xyData = this.record.xyData.map(item => { return { name: translation[item.name] || item.name, value: item.value }; });
+ //console.log(translation);
+ }
+
}
}
@@ -233,16 +172,21 @@
</script>
-<style>
+<style >
* {
margin: 0;
padding: 0;
}
-/* .neir {
+.app {
height: 100%;
+}
+
+.neir {
+ /* height: 580px; */
+ height: 90%;
overflow-y: auto;
-} */
+}
.el-input__inner {
text-align: center;
@@ -251,7 +195,7 @@
.kuai_sb {
text-align: center;
- width: 25%;
+ width: 15%;
margin-bottom: 15px;
}
@@ -276,8 +220,8 @@
background: #A0A0A0;
border: 0.1875em solid white;
border-radius: 50%;
- height: 5em;
- width: 5em;
+ height: 4em;
+ width: 4em;
box-shadow: 0.375em 0.375em 0 0 rgba(214, 214, 214, 0.125);
}
@@ -300,4 +244,12 @@
.yellow {
background-color: yellow;
}
+
+.blue-button {
+ background-color: skyblue;
+}
+
+.dark-theme {
+ display: none;
+}
</style>
\ No newline at end of file
--
Gitblit v1.8.0