From 0ece3ba8c92df0438af52b8de6b9225d8ada4103 Mon Sep 17 00:00:00 2001
From: wu <731351411@qq.com>
Date: 星期四, 30 十一月 2023 08:46:34 +0800
Subject: [PATCH] Merge branch 'master' of http://10.153.19.25:10101/r/CanadaMes
---
CanadaMes-ui/src/views/Electrical/Parameter.vue | 117 +++++++++++++++++++++++++++++++++++++++-------------------
1 files changed, 78 insertions(+), 39 deletions(-)
diff --git a/CanadaMes-ui/src/views/Electrical/Parameter.vue b/CanadaMes-ui/src/views/Electrical/Parameter.vue
index 0ef74f9..94a34d4 100644
--- a/CanadaMes-ui/src/views/Electrical/Parameter.vue
+++ b/CanadaMes-ui/src/views/Electrical/Parameter.vue
@@ -2,55 +2,64 @@
<div class="app">
<!-- 闈㈠寘灞戝鑸尯鍩� -->
<el-breadcrumb separator-class="el-icon-arrow-right" class="el-breadcrumb">
- <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>
+ <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>
+ <router-link to="/Electrical/Servomanual" tag="el-button" type="text" active-class="blue-button">{{
+ $t('ServoManual')
+ }}</router-link>
</el-breadcrumb>
<div>Parameter</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()" id="xiafa" :disabled="isButtonDisabled">涓嬪彂鍙傛暟</el-button>
+ <el-button type="primary" @click="send()" id="xiafa" :disabled="isButtonDisabled">{{ $t('Distribute parameters')
+ }}</el-button>
</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; font-size: 14px;color: red;">|</span>
+ <input type="number" style="width: 43px; margin-right: 5px; margin-top: 5px; font-size: 16px;">
+ <span style="margin-right: 5px; width: 50px;">{{ item.unit }}</span>
+
</div>
</el-form>
+
+ <div>
+
+ </div>
</div>
</template>
<script>
+
let socket;
import LanguageMixin from '../../lang/LanguageMixin'
+import data from '../../configuration/Parameter'
export default {
name: "Parameter",
mixins: [LanguageMixin],
data () {
return {
+ jsonData: data,
+ dialogVisible: true,
+ password: '',
activeButton: '',
record: {
params: [100, 200, 10, 10, 10, 10],
xyData: [
- { name: "conveyor Velocity(Auto FAST)", value: 0, value2: 0 },
- { name: "conveyor Velocity(Auto SLOW)", value: 0, value2: 0 },
- { name: "conveyor Velocity(Manual)", value: 0, value2: 0 },
- { name: "A01 A02 TURN JOG Velocity", value: 0, value2: 0 },
- { name: "A01 A02 TRAVEL JOG Velocity", value: 0, value2: 0 },
- { name: "B01 B02 TRAVEL JOG Velocity", value: 0, value2: 0 },
- { name: "A01 A02 TURN POS Velocity AUTO", value: 0, value2: 0 },
- { name: "A01 A02 TURN POS Velocity manual", value: 0, value2: 0 },
- { name: "A01 A02 TRAVEL POS Velocity AUTO", value: 0, value2: 0 },
- { name: "A01 A02 TRAVEL POS Velocity manual", value: 0, value2: 0 },
- { name: "B01 B02 TRAVEL POS Velocity AUTO", value: 0, value2: 0 },
- { name: "B01 B02 TRAVEL POS Velocity manual", value: 0, value2: 0 }
+
],
canshu: []
},
@@ -68,9 +77,13 @@
created () {
this.initWebSocket();
this.isButtonDisabled = true;
+
+
},
methods: {
- setActiveButton(buttonName) {
+
+
+ setActiveButton (buttonName) {
this.activeButton = buttonName;
},
initWebSocket () {
@@ -101,24 +114,40 @@
}
let obj = JSON.parse(msg.data);
- this.record.params[0] = obj.params[0];
- this.record.state = obj.state[0];
- let isButtonDisabled = this.record.state.includes(1);
- // 鍒ゆ柇state涓槸鍚﹀瓨鍦�1
- //console.log(isButtonDisabled)
- this.isButtonDisabled = isButtonDisabled; // 灏嗗垽鏂粨鏋滀繚瀛樺埌鍙橀噺isButtonDisabled涓�
- for (let a = 0; a <= this.record.params[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];
+ 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;
+
+
+ this.record.xyData = this.jsonData.para;
+
+ for (let a = 0; a < this.record.xyData.length; a++) {
+ this.record.xyData[a].value = this.record.params[0][a];
+
+ }
+
+ this.record.xyData = this.jsonData.para.filter(item => {
+ return item.state != 0;
+ }
+
+ );
+ const language = this.$i18n.locale;
+ if (language === 'en-US') {
+ this.replaceChineseWithEnglish();
+ } else {
+ this.localizedRoles = [...this.record.xyData];
+ }
}
}
-
- //console.log(this.record.xyData);
this.$forceUpdate();
+ this.replaceChineseWithEnglish();
};
// 鍏抽棴浜嬩欢
@@ -139,20 +168,29 @@
},
handleChange (index, value) {
this.record.xyData[index].value = value;
- }
+ },
+ //璇█杞崲
+ replaceChineseWithEnglish () {
+ const translation = this.$t('langparameter');
+ this.record.xyData = this.record.xyData.map(item => { return { name: translation[item.name] || item.name, value: item.value, unit: item.unit }; });
+ //console.log(translation);
+ },
}
};
</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;
}
+
+.special-class {}
.in_mc {
@@ -161,8 +199,9 @@
.blue-button {
background-color: skyblue;
- color: #fff;
+
}
+
#btn_div {
width: 100%;
}
--
Gitblit v1.8.0