From 617c83a35ef0a9f585b33f634588ba3e90f490cb Mon Sep 17 00:00:00 2001
From: ZengTao <2773468879@qq.com>
Date: 星期二, 12 九月 2023 18:26:05 +0800
Subject: [PATCH] Merge branch 'master' of http://10.153.19.25:10101/r/CanadaMes
---
CanadaMes-ui/src/views/Electrical/State.vue | 36 +++++++++++++++++++++++-------------
1 files changed, 23 insertions(+), 13 deletions(-)
diff --git a/CanadaMes-ui/src/views/Electrical/State.vue b/CanadaMes-ui/src/views/Electrical/State.vue
index daaed80..9cfb3b3 100644
--- a/CanadaMes-ui/src/views/Electrical/State.vue
+++ b/CanadaMes-ui/src/views/Electrical/State.vue
@@ -17,7 +17,7 @@
<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 v-model="item.value" readonly="readonly" style="width: 80px;"></el-input>
</div>
@@ -39,18 +39,18 @@
data () {
return {
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',
@@ -107,8 +107,9 @@
//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.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 {
@@ -134,6 +135,15 @@
console.log(this.messagepack);
socket?.send(JSON.stringify(this.messagepack));
},
+ valuezhi (zhi) {
+ if (zhi == 1) {
+ return "鑷姩";
+ }
+ else {
+ return "鎵嬪姩";
+ }
+ }
+
}
--
Gitblit v1.8.0