From 731d32992d51e945bbeb7402d1a9acd87ced9e9d Mon Sep 17 00:00:00 2001
From: ZengTao <2773468879@qq.com>
Date: 星期五, 08 九月 2023 17:25:49 +0800
Subject: [PATCH] Merge branch 'master' of http://10.153.19.150:10101/r/CanadaMes
---
CanadaMes-ui/src/views/Electrical/State.vue | 69 ++++++++++++++++++----------------
1 files changed, 36 insertions(+), 33 deletions(-)
diff --git a/CanadaMes-ui/src/views/Electrical/State.vue b/CanadaMes-ui/src/views/Electrical/State.vue
index bd0b977..c9a3310 100644
--- a/CanadaMes-ui/src/views/Electrical/State.vue
+++ b/CanadaMes-ui/src/views/Electrical/State.vue
@@ -3,24 +3,21 @@
<!--闈㈠寘灞戝鑸尯鍩�-->
<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>
+ <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>
</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 +31,15 @@
</template>
<script >
-
+import LanguageMixin from '../../lang/LanguageMixin'
let socket;
export default {
name: "State",
+ mixins: [LanguageMixin],
data () {
return {
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 +52,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',
+ // ],
},
@@ -109,14 +107,15 @@
//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] };
+ 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,8 +129,12 @@
}
},
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));
+ },
+ handleChange (index, value) {
+ this.record.xyData[index].value = value;
}
}
--
Gitblit v1.8.0