From eb967d7573a8297e493d455dfce2c77319215990 Mon Sep 17 00:00:00 2001
From: wuyouming666 <2265557248@qq.com>
Date: 星期三, 13 九月 2023 08:31:25 +0800
Subject: [PATCH] 注册页面中英文替换 修改电气管理顶部导航栏布局
---
CanadaMes-ui/src/views/Electrical/State.vue | 79 ++++++++++++++++++++++-----------------
1 files changed, 44 insertions(+), 35 deletions(-)
diff --git a/CanadaMes-ui/src/views/Electrical/State.vue b/CanadaMes-ui/src/views/Electrical/State.vue
index 65003de..dda1bad 100644
--- a/CanadaMes-ui/src/views/Electrical/State.vue
+++ b/CanadaMes-ui/src/views/Electrical/State.vue
@@ -2,25 +2,20 @@
<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">璁惧绠＄悊</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/Parameter" tag="el-button" type="text" active-class="blue-button">{{ $t('Parameter') }}</router-link>
+ <router-link to="/Electrical/Action" tag="el-button" type="text" active-class="blue-button">{{ $t('Action') }}</router-link>
+ <router-link to="/Electrical/Sign" tag="el-button" type="text" active-class="blue-button">{{ $t('Sign') }}</router-link>
+ <router-link to="/Electrical/State" tag="el-button" type="text" active-class="blue-button">{{ $t('State') }}</router-link>
+ <router-link to="/Electrical/alarm" tag="el-button" type="text" active-class="blue-button">{{ $t('Alarm') }}</router-link>
</el-breadcrumb>
<div>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 v-model.number="item.value" style="width: 80px;"></el-input>
</div>
@@ -34,14 +29,16 @@
</template>
<script >
-
+import LanguageMixin from '../../lang/LanguageMixin'
let socket;
export default {
name: "State",
+ mixins: [LanguageMixin],
data () {
return {
+ activeButton: '',
record: {
- params: [0, 0, 0, 0, 0, 0, 0, 0, 0,],
+ params: [0, 0, 0, 0, 0, 0, 0, 0, 0, 0,],
xyData: [
{ name: 'D01.State', value: 0 },
{ name: 'D02.State', value: 0 },
@@ -54,18 +51,18 @@
{ name: 'D05.State', value: 0 },
{ name: 'D06.State', value: 0 },
],
- canshu: [
- 'D01.State',
- 'D02.State',
- 'B01.State',
- 'B02.State',
- 'A01.State',
- 'A02.State',
- 'D03.State',
- 'D04.State',
- 'D05.State',
- 'D06.State',
- ],
+ // canshu: [
+ // 'D01.State',
+ // 'D02.State',
+ // 'B01.State',
+ // 'B02.State',
+ // 'A01.State',
+ // 'A02.State',
+ // 'D03.State',
+ // 'D04.State',
+ // 'D05.State',
+ // 'D06.State',
+ // ],
},
@@ -84,6 +81,12 @@
this.init();
},
methods: {
+ onButtonClick() {
+ this.isButtonClicked = true; // 灏嗘寜閽鑹茶缃负钃濊壊
+ setTimeout(() => {
+ this.isButtonClicked = false; // 閲嶇疆鎸夐挳棰滆壊
+ }, 500); // 杩欓噷鐨�500姣鏄牴鎹偍甯屾湜鎸夐挳棰滆壊鎸佺画澶氶暱鏃堕棿鏉ュ畾鐨勶紝鍙互鏍规嵁闇�姹傝繘琛岃皟鏁�
+ },
init () {
let viewname = "State";
@@ -109,14 +112,16 @@
//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 - 1; 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.xyData[0].length - 1; 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.$forceUpdate();
- console.log(this.record.xyData);
- //console.log(this.record.params[0])
- // console.log(this.records.canshu);
}.bind(this);
//鍏抽棴浜嬩欢
@@ -130,9 +135,10 @@
}
},
send () {
- this.messagepack.data = { taskname: "鍓嶇鍒板悗鍙�" };
- socket?.send(JSON.stringify(this.messagepack)); // 灏嗙粍瑁呭ソ鐨刯son鍙戦�佺粰鏈嶅姟绔紝鐢辨湇鍔＄杩涜杞彂
- }
+ this.messagepack.data = this.record.xyData.map((item) => parseInt(item.value)); // 杞崲涓烘暣鏁版暟缁�
+ console.log(this.messagepack);
+ socket?.send(JSON.stringify(this.messagepack));
+ },
}
@@ -175,4 +181,7 @@
#btn_div .el-button {
float: right;
}
+.blue-button {
+ background-color: skyblue;
+}
</style>
--
Gitblit v1.8.0