From e4e6c1a0e34cbd5aca446018d19166497d8d7814 Mon Sep 17 00:00:00 2001
From: admin <52323@qq.com>
Date: 星期五, 15 九月 2023 11:38:12 +0800
Subject: [PATCH] Merge branch 'master' of http://10.153.19.25:10101/r/CanadaMes
---
CanadaMes-ui/src/views/Electrical/State.vue | 97 ++++++++++++++++++++++++++++--------------------
1 files changed, 57 insertions(+), 40 deletions(-)
diff --git a/CanadaMes-ui/src/views/Electrical/State.vue b/CanadaMes-ui/src/views/Electrical/State.vue
index daaed80..fdf7dd0 100644
--- a/CanadaMes-ui/src/views/Electrical/State.vue
+++ b/CanadaMes-ui/src/views/Electrical/State.vue
@@ -2,22 +2,22 @@
<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">{{ $t('Electrical') }}</el-button>
- <router-link to="/Electrical/Parameter" tag="el-button" type="text">{{ $t('Parameter') }}</router-link>
- <router-link to="/Electrical/Action" tag="el-button" type="text">{{ $t('Action') }}</router-link>
- <router-link to="/Electrical/Sign" tag="el-button" type="text">{{ $t('Sign') }}</router-link>
- <router-link to="/Electrical/State" tag="el-button" type="text">{{ $t('State') }}</router-link>
- <router-link to="/Electrical/alarm" tag="el-button" type="text">{{ $t('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>
+
</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.number="item.value" style="width: 80px;"></el-input>
+ <el-input style="width: 280px;" class="in_mc" v-model="item.name" readonly></el-input>
+ <el-input v-model="item.value" readonly="readonly" style="width: 90px;"></el-input>
</div>
@@ -38,36 +38,26 @@
mixins: [LanguageMixin],
data () {
return {
+ activeButton: '',
record: {
- params: [0, 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,8 +70,15 @@
},
created () {
this.init();
+ this.replaceChineseWithEnglish();
},
methods: {
+ onButtonClick () {
+ this.isButtonClicked = true; // 灏嗘寜閽鑹茶缃负钃濊壊
+ setTimeout(() => {
+ this.isButtonClicked = false; // 閲嶇疆鎸夐挳棰滆壊
+ }, 500); // 杩欓噷鐨�500姣鏄牴鎹偍甯屾湜鎸夐挳棰滆壊鎸佺画澶氶暱鏃堕棿鏉ュ畾鐨勶紝鍙互鏍规嵁闇�姹傝繘琛岃皟鏁�
+ },
init () {
let viewname = "State";
@@ -108,7 +105,7 @@
let obj = JSON.parse(msg.data);
this.record.params[0] = obj.sta[0];
//灏嗚鍙栧埌鐨凱LC鐨勬暟鎹紝涓庡畾涔夌殑xyData锛岀粍鍚堟垚鏂扮殑鏁扮粍
- for (let a = 0; a <= this.record.xyData[0].length - 1; a++) {
+ 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 {
@@ -116,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);
@@ -129,11 +133,13 @@
}
}
},
- 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);
},
+
}
@@ -145,7 +151,12 @@
</script>
-<style>
+<style scoped>
+/* * {
+ margin: 0px;
+ padding: 0px;
+} */
+
.kuai_div {
width: 30%;
margin-bottom: 15px;
@@ -156,7 +167,9 @@
.el-input__inner {
+ text-align: center;
border: 1 solid black;
+ padding: 0 10px;
}
@@ -176,4 +189,8 @@
#btn_div .el-button {
float: right;
}
+
+.blue-button {
+ background-color: skyblue;
+}
</style>
--
Gitblit v1.8.0