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/Parameter.vue | 55 +++++++++++++++++++++++++++++++++++++------------------
1 files changed, 37 insertions(+), 18 deletions(-)
diff --git a/CanadaMes-ui/src/views/Electrical/Parameter.vue b/CanadaMes-ui/src/views/Electrical/Parameter.vue
index 8dfa62b..40c48ee 100644
--- a/CanadaMes-ui/src/views/Electrical/Parameter.vue
+++ b/CanadaMes-ui/src/views/Electrical/Parameter.vue
@@ -2,13 +2,11 @@
<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">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>
+ <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>Parameter</div>
@@ -20,10 +18,11 @@
</div>
<div class="kuai_div" v-for="(item, index) in record.xyData" :key="index">
<el-input style="width: 280px; border:none;" class="in_mc" v-model="item.name" readonly></el-input>
- <span style="margin-right: 5px; width: 50px;">{{ item.value }}</span>
- <span style="margin-right: 5px; font-size: 14px;">|</span>
- <input v-model="item.value2" type="number"
- style="width: 30px; margin-right: 5px; margin-top: 5px; font-size: 16px;">
+
+ <span style="margin-right: 5px; width: 50px;">{{ item.value }}</span>
+ <span style="margin-right: 5px; font-size: 14px;color: red;">|</span>
+ <input v-model="item.value2" type="number" style="width: 43px; margin-right: 5px; margin-top: 5px; font-size: 16px;">
+
</div>
</el-form>
</div>
@@ -31,11 +30,13 @@
<script>
let socket;
-
+import LanguageMixin from '../../lang/LanguageMixin'
export default {
name: "Parameter",
+ mixins: [LanguageMixin],
data () {
return {
+ activeButton: '',
record: {
params: [100, 200, 10, 10, 10, 10],
xyData: [
@@ -70,6 +71,9 @@
this.isButtonDisabled = true;
},
methods: {
+ setActiveButton(buttonName) {
+ this.activeButton = buttonName;
+ },
initWebSocket () {
let viewname = "Parameter";
@@ -98,13 +102,23 @@
}
let obj = JSON.parse(msg.data);
+
+
+ if (obj.params && obj.state){
+
+
+
+
this.record.params[0] = obj.params[0];
this.record.state = obj.state[0];
+ if (obj.state && obj.state.length > 0) {
+ let isButtonDisabled = this.record.state.includes(1);
+ this.isButtonDisabled = isButtonDisabled;
- let isButtonDisabled = this.record.state.includes(1);
+
// 鍒ゆ柇state涓槸鍚﹀瓨鍦�1
//console.log(isButtonDisabled)
- this.isButtonDisabled = isButtonDisabled; // 灏嗗垽鏂粨鏋滀繚瀛樺埌鍙橀噺isButtonDisabled涓�
+ // 灏嗗垽鏂粨鏋滀繚瀛樺埌鍙橀噺isButtonDisabled涓�
for (let a = 0; a <= this.record.params[0].length - 1; a++) {
if (!this.record.xyData[a]) {
@@ -113,7 +127,8 @@
this.record.xyData[a].value = this.record.params[0][a];
}
}
-
+ }
+ }
//console.log(this.record.xyData);
this.$forceUpdate();
};
@@ -141,14 +156,15 @@
};
</script>
-<style>
+<style scoped>
.kuai_div {
- width: calc(100% / 3);
+ width: calc(100% / 2);
margin-bottom: 15px;
}
.el-input__inner {
border: 1px solid black;
+ border: none;
}
.in_mc {
@@ -156,7 +172,10 @@
border: none;
}
-
+.blue-button {
+ background-color: skyblue;
+
+}
#btn_div {
width: 100%;
}
--
Gitblit v1.8.0