From ff6fd31ba5a4b6a6e74096786ff6d61293d15c73 Mon Sep 17 00:00:00 2001
From: ZengTao <2773468879@qq.com>
Date: 星期一, 04 十二月 2023 09:08:57 +0800
Subject: [PATCH] Merge branch 'master' of http://10.153.19.25:10101/r/CanadaMes
---
CanadaMes-ui/src/views/Electrical/State.vue | 51 ++++++++++++++++++++++++++++++---------------------
1 files changed, 30 insertions(+), 21 deletions(-)
diff --git a/CanadaMes-ui/src/views/Electrical/State.vue b/CanadaMes-ui/src/views/Electrical/State.vue
index 4a2c16e..fa4dd52 100644
--- a/CanadaMes-ui/src/views/Electrical/State.vue
+++ b/CanadaMes-ui/src/views/Electrical/State.vue
@@ -3,24 +3,26 @@
<!--闈㈠寘灞戝鑸尯鍩�-->
<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>
-
+ <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>{{ $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: 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>
@@ -32,12 +34,14 @@
<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: [1, 1, 1, 1, 1, 1, 1, 1, 1, 1,],
@@ -53,7 +57,7 @@
{ name: 'D05.State', value: "鑷姩" },
{ name: 'D06.State', value: "鑷姩" },
],
-
+
},
@@ -68,10 +72,16 @@
}
},
- created () {
+ // created () {
+ // this.init();
+ // this.replaceChineseWithEnglish();
+ // },
+
+ activated(){
this.init();
this.replaceChineseWithEnglish();
- },
+ },
+
methods: {
onButtonClick () {
this.isButtonClicked = true; // 灏嗘寜閽鑹茶缃负钃濊壊
@@ -106,11 +116,9 @@
this.record.params[0] = obj.sta[0];
//灏嗚鍙栧埌鐨凱LC鐨勬暟鎹紝涓庡畾涔夌殑xyData锛岀粍鍚堟垚鏂扮殑鏁扮粍
for (let a = 0; a < this.record.params[0].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[a].name = this.jsonData.state[a].name;
+ this.record.xyData[a].value = this.record.params[0][a];
}
const language = this.$i18n.locale;
@@ -119,8 +127,8 @@
} else {
this.localizedRoles = [...this.record.xyData];
}
- //console.log(this.localizedRoles);
this.$forceUpdate();
+ this.replaceChineseWithEnglish();
}.bind(this);
//鍏抽棴浜嬩欢
@@ -136,8 +144,9 @@
//璇█杞崲
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);
+ 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);
},
--
Gitblit v1.8.0