From a21582607b88104e66f7dc91a5038b3f59ed9f1a Mon Sep 17 00:00:00 2001
From: wuyouming666 <2265557248@qq.com>
Date: 星期三, 13 九月 2023 17:12:00 +0800
Subject: [PATCH] Merge branch 'master' of http://10.153.19.25:10101/r/CanadaMes
---
CanadaMes-ui/src/views/Electrical/State.vue | 44 +++++++++++++++++++++++++++-----------------
1 files changed, 27 insertions(+), 17 deletions(-)
diff --git a/CanadaMes-ui/src/views/Electrical/State.vue b/CanadaMes-ui/src/views/Electrical/State.vue
index e0507ec..7098e1b 100644
--- a/CanadaMes-ui/src/views/Electrical/State.vue
+++ b/CanadaMes-ui/src/views/Electrical/State.vue
@@ -2,20 +2,22 @@
<div class="app">
<!--闈㈠寘灞戝鑸尯鍩�-->
<el-breadcrumb separator-class="el-icon-arrow-right" class="el-breadcrumb">
+
<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>State</div>
+ <div>{{ $t('State') }}</div>
<el-form label-width="100px" style="display: flex;flex-wrap: wrap;" :model="messagepack.data">
<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" readonly="readonly" style="width: 80px;"></el-input>
+ <el-input v-model="item.value" readonly="readonly" style="width: 90px;"></el-input>
</div>
@@ -55,7 +57,7 @@
},
-
+ localizedRoles: [],
messagepack: {
data: { taskname: "" }
},
@@ -68,9 +70,10 @@
},
created () {
this.init();
+ this.replaceChineseWithEnglish();
},
methods: {
- onButtonClick() {
+ onButtonClick () {
this.isButtonClicked = true; // 灏嗘寜閽鑹茶缃负钃濊壊
setTimeout(() => {
this.isButtonClicked = false; // 閲嶇疆鎸夐挳棰滆壊
@@ -101,7 +104,6 @@
//console.log("鏀跺埌鏁版嵁====" + msg.data);
let obj = JSON.parse(msg.data);
this.record.params[0] = obj.sta[0];
- console.log(this.record.params[0]);
//灏嗚鍙栧埌鐨凱LC鐨勬暟鎹紝涓庡畾涔夌殑xyData锛岀粍鍚堟垚鏂扮殑鏁扮粍
for (let a = 0; a < this.record.params[0].length; a++) {
if (!this.record.xyData[a]) {
@@ -111,6 +113,13 @@
}
}
+ const language = this.$i18n.locale;
+ if (language === 'en-US') {
+ this.replaceChineseWithEnglish();
+ } else {
+ this.localizedRoles = [...this.record.xyData];
+ }
+ //console.log(this.localizedRoles);
this.$forceUpdate();
}.bind(this);
@@ -124,19 +133,12 @@
}
}
},
- send () {
- this.messagepack.data = this.record.xyData.map((item) => parseInt(item.value)); // 杞崲涓烘暣鏁版暟缁�
- console.log(this.messagepack);
- socket?.send(JSON.stringify(this.messagepack));
+ //璇█杞崲
+ replaceChineseWithEnglish () {
+ const translation = this.$t('dvstate');
+ this.record.xyData = this.record.xyData.map(item => { return { name: item.name, value: translation[item.value] || item.value }; });
+ console.log(translation);
},
- valuezhi (zhi) {
- if (zhi == 1) {
- return "鑷姩";
- }
- else {
- return "鎵嬪姩";
- }
- }
}
@@ -150,6 +152,11 @@
</script>
<style>
+* {
+ margin: 0px;
+ padding: 0px;
+}
+
.kuai_div {
width: 30%;
margin-bottom: 15px;
@@ -160,7 +167,9 @@
.el-input__inner {
+ text-align: center;
border: 1 solid black;
+ padding: 0 10px;
}
@@ -180,6 +189,7 @@
#btn_div .el-button {
float: right;
}
+
.blue-button {
background-color: skyblue;
}
--
Gitblit v1.8.0