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 | 65 ++++++++------------------------
1 files changed, 16 insertions(+), 49 deletions(-)
diff --git a/CanadaMes-ui/src/views/Electrical/Parameter.vue b/CanadaMes-ui/src/views/Electrical/Parameter.vue
index 5fcdbab..94a34d4 100644
--- a/CanadaMes-ui/src/views/Electrical/Parameter.vue
+++ b/CanadaMes-ui/src/views/Electrical/Parameter.vue
@@ -12,8 +12,9 @@
}}</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('Servo Manual')
- }}</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>
@@ -29,8 +30,7 @@
<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;">
+ <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>
@@ -59,18 +59,7 @@
record: {
params: [100, 200, 10, 10, 10, 10],
xyData: [
- { name: "conveyor Velocity(Auto FAST)", value: 0, value2: 0, unit: "m/min" },
- { name: "conveyor Velocity(Auto SLOW)", value: 0, value2: 0, unit: "m/min" },
- { name: "conveyor Velocity(Manual)", value: 0, value2: 0, unit: "m/min" },
- { name: "A01 A02 TURN JOG Velocity", value: 0, value2: 0, unit: "mm/S" },
- { name: "A01 A02 TRAVEL JOG Velocity", value: 0, value2: 0, unit: "mm/S" },
- { name: "B01 B02 TRAVEL JOG Velocity", value: 0, value2: 0, unit: "mm/S" },
- { name: "A01 A02 TURN POS Velocity AUTO", value: 0, value2: 0, unit: "mm/S" },
- { name: "A01 A02 TURN POS Velocity manual", value: 0, value2: 0, unit: "mm/S" },
- { name: "A01 A02 TRAVEL POS Velocity AUTO", value: 0, value2: 0, unit: "mm/S" },
- { name: "A01 A02 TRAVEL POS Velocity manual", value: 0, value2: 0, unit: "mm/S" },
- { name: "B01 B02 TRAVEL POS Velocity AUTO", value: 0, value2: 0, unit: "mm/S" },
- { name: "B01 B02 TRAVEL POS Velocity manual", value: 0, value2: 0, unit: "mm/S" }
+
],
canshu: []
},
@@ -89,14 +78,9 @@
this.initWebSocket();
this.isButtonDisabled = true;
+
},
methods: {
- showdata () {
- console.log(1111);
- console.log(this.jsonData.para[0].name);
- // console.log(this.record.xyData);
-
- },
setActiveButton (buttonName) {
@@ -135,8 +119,6 @@
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) {
@@ -144,31 +126,18 @@
this.isButtonDisabled = isButtonDisabled;
- // 鍒ゆ柇state涓槸鍚﹀瓨鍦�1
- //console.log(isButtonDisabled)
- // 灏嗗垽鏂粨鏋滀繚瀛樺埌鍙橀噺isButtonDisabled涓�
+ this.record.xyData = this.jsonData.para;
- for (let a = 0; a <= this.record.params[0].length - 1; a++) {
- // this.record.xyData[a] =
- // {
- // name: this.jsonData.para[a].name,
- // value: this.jsonData.para[a].read,
- // value2: this.jsonData.para[a].sending,
- // unit: this.jsonData.para[a].unit
- // };
+ for (let a = 0; a < this.record.xyData.length; a++) {
+ this.record.xyData[a].value = this.record.params[0][a];
- // if (!this.xyData[a]) {
- this.record.xyData[a] =
- {
- name: this.jsonData.para[a].name,
- value: this.record.params[0][a],
- unit: this.jsonData.para[a].unit
- };
}
- // else {
- // this.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();
@@ -220,10 +189,8 @@
border: 1px solid black;
border: none;
}
-.special-class{
-
-}
+.special-class {}
.in_mc {
--
Gitblit v1.8.0