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/State.vue | 140 ++++++++++++++++++++++++++++------------------
1 files changed, 84 insertions(+), 56 deletions(-)
diff --git a/CanadaMes-ui/src/views/Electrical/State.vue b/CanadaMes-ui/src/views/Electrical/State.vue
index bd0b977..fa4dd52 100644
--- a/CanadaMes-ui/src/views/Electrical/State.vue
+++ b/CanadaMes-ui/src/views/Electrical/State.vue
@@ -2,28 +2,27 @@
<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>State</div>
-
-
+ <div>{{ $t('State') }}</div>
<el-form label-width="100px" style="display: flex;flex-wrap: wrap;" :model="messagepack.data">
- <div id="btn_div">
- <el-button type="primary" @click="send()">Distribute</el-button>
- <!-- <button @click="send()">娴嬭瘯鍙戦��</button> -->
- </div>
+
<div class="kuai_div" v-for="item in this.record.xyData" :key="item.name">
- <el-input style="width: 280px;" class="in_mc" v-model="item.name"></el-input>
- <el-input v-model="item.value" style="width: 80px;"></el-input>
+ <el-input style="width: 60%;" class="in_mc" v-model="item.name" readonly></el-input>
+ <el-input v-model="item.value" readonly="readonly" style="width: 90px;"></el-input>
</div>
-
-
</el-form>
@@ -34,42 +33,35 @@
</template>
<script >
-
+import LanguageMixin from '../../lang/LanguageMixin'
+import data from '../../configuration/State'
let socket;
export default {
name: "State",
+ mixins: [LanguageMixin],
data () {
return {
+ jsonData: data,
+ activeButton: '',
record: {
- params: [0, 0, 0, 0, 0, 0, 0, 0, 0,],
+ params: [1, 1, 1, 1, 1, 1, 1, 1, 1, 1,],
xyData: [
- { name: 'D01.State', value: 0 },
- { name: 'D02.State', value: 0 },
- { name: 'B01.State', value: 0 },
- { name: 'B02.State', value: 0 },
- { name: 'A01.State', value: 0 },
- { name: 'A02.State', value: 0 },
- { name: 'D03.State', value: 0 },
- { name: 'D04.State', value: 0 },
- { name: 'D05.State', value: 0 },
- { name: 'D06.State', value: 0 },
+ { name: 'D01.State', value: "鑷姩" },
+ { name: 'D02.State', value: "鑷姩" },
+ { name: 'B01.State', value: "鑷姩" },
+ { name: 'B02.State', value: "鑷姩" },
+ { name: 'A01.State', value: "鑷姩" },
+ { name: 'A02.State', value: "鑷姩" },
+ { name: 'D03.State', value: "鑷姩" },
+ { name: 'D04.State', value: "鑷姩" },
+ { name: 'D05.State', value: "鑷姩" },
+ { name: 'D06.State', value: "鑷姩" },
],
- canshu: [
- 'D01.State',
- 'D02.State',
- 'B01.State',
- 'B02.State',
- 'A01.State',
- 'A02.State',
- 'D03.State',
- 'D04.State',
- 'D05.State',
- 'D06.State',
- ],
+
},
-
+ localizedRoles: [],
messagepack: {
data: { taskname: "" }
},
@@ -80,10 +72,23 @@
}
},
- created () {
+ // created () {
+ // this.init();
+ // this.replaceChineseWithEnglish();
+ // },
+
+ activated(){
this.init();
- },
+ this.replaceChineseWithEnglish();
+ },
+
methods: {
+ onButtonClick () {
+ this.isButtonClicked = true; // 灏嗘寜閽鑹茶缃负钃濊壊
+ setTimeout(() => {
+ this.isButtonClicked = false; // 閲嶇疆鎸夐挳棰滆壊
+ }, 500); // 杩欓噷鐨�500姣鏄牴鎹偍甯屾湜鎸夐挳棰滆壊鎸佺画澶氶暱鏃堕棿鏉ュ畾鐨勶紝鍙互鏍规嵁闇�姹傝繘琛岃皟鏁�
+ },
init () {
let viewname = "State";
@@ -109,14 +114,21 @@
//console.log("鏀跺埌鏁版嵁====" + msg.data);
let obj = JSON.parse(msg.data);
this.record.params[0] = obj.sta[0];
- for (let a = 0; a <= this.record.params.length; a++) {
- //this.record.xyData[a] = [this.record.params[0][a], this.record.canshu[a]];
- this.record.xyData[a] = { name: this.record.canshu[a], value: this.record.params[0][a] };
+ //灏嗚鍙栧埌鐨凱LC鐨勬暟鎹紝涓庡畾涔夌殑xyData锛岀粍鍚堟垚鏂扮殑鏁扮粍
+ for (let a = 0; a < this.record.params[0].length; a++) {
+
+ this.record.xyData[a].name = this.jsonData.state[a].name;
+ this.record.xyData[a].value = this.record.params[0][a];
+
+ }
+ const language = this.$i18n.locale;
+ if (language === 'en-US') {
+ this.replaceChineseWithEnglish();
+ } else {
+ this.localizedRoles = [...this.record.xyData];
}
this.$forceUpdate();
- console.log(this.record.xyData);
- //console.log(this.record.params[0])
- // console.log(this.records.canshu);
+ this.replaceChineseWithEnglish();
}.bind(this);
//鍏抽棴浜嬩欢
@@ -129,10 +141,14 @@
}
}
},
- send () {
- this.messagepack.data = { taskname: "鍓嶇鍒板悗鍙�" };
- socket?.send(JSON.stringify(this.messagepack)); // 灏嗙粍瑁呭ソ鐨刯son鍙戦�佺粰鏈嶅姟绔紝鐢辨湇鍔＄杩涜杞彂
- }
+ //璇█杞崲
+ replaceChineseWithEnglish () {
+ const translation = this.$t('dvstate');
+ const translation1 = this.$t('Statelang');
+ this.record.xyData = this.record.xyData.map(item => { return { name: translation1[item.name] || item.name, value: translation[item.value] || item.value }; });
+ //console.log(translation);
+ },
+
}
@@ -144,18 +160,26 @@
</script>
-<style>
+<style scoped>
+/* * {
+ margin: 0px;
+ padding: 0px;
+} */
+
.kuai_div {
width: 30%;
margin-bottom: 15px;
}
+
.el-input {
border: none;
.el-input__inner {
+ text-align: center;
border: 1 solid black;
+ padding: 0 10px;
}
@@ -175,4 +199,8 @@
#btn_div .el-button {
float: right;
}
+
+.blue-button {
+ background-color: skyblue;
+}
</style>
--
Gitblit v1.8.0