From 12ae82141c1d6ed1a55922aae128ccfefb5b35dd Mon Sep 17 00:00:00 2001
From: wu <731351411@qq.com>
Date: 星期三, 24 一月 2024 13:34:06 +0800
Subject: [PATCH] Merge branch 'master' of http://10.153.19.25:10101/r/CanadaMes
---
CanadaMes-ui/src/views/Electrical/ManualonePosition.vue | 55 +++++++++++++++++++++++++++++++++++++++++++------------
1 files changed, 43 insertions(+), 12 deletions(-)
diff --git a/CanadaMes-ui/src/views/Electrical/ManualonePosition.vue b/CanadaMes-ui/src/views/Electrical/ManualonePosition.vue
index 79d41fa..e6f8a34 100644
--- a/CanadaMes-ui/src/views/Electrical/ManualonePosition.vue
+++ b/CanadaMes-ui/src/views/Electrical/ManualonePosition.vue
@@ -3,8 +3,8 @@
<el-breadcrumb separator-class="el-icon-arrow-right" class="el-breadcrumb">
<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/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')
@@ -641,18 +641,49 @@
}
- for (let i = 0; i < jsonData2.length; i++) {
- let arr4 = jsonData2[i];
- for (let j = 0; j < arr4.length; j++) {
- let obj4 = arr4[j];
- if (obj4.button && (obj4.button.name.includes("鍚姩") || obj4.button.name.includes("Start"))) {
- obj4.button.value = obj.qidong[0][i];
- // console.log(obj2.button.value)
- }
- }
+ // for (let i = 0; i < jsonData2.length; i++) {
+ // let arr4 = jsonData2[i];
+ // for (let j = 0; j < arr4.length; j++) {
+ // let obj4 = arr4[j];
+ // if (obj4.button && (obj4.button.name.includes("鍚姩") || obj4.button.name.includes("Start"))) {
+ // obj4.button.value = obj.qidong[0][i];
+ // // console.log(obj2.button.value)
+ // }
+ // }
- }
+ // }
+
+ // for (let i = 0; i < jsonData2.length; i++) {
+ // let arr4 = jsonData2[i];
+ // for (let j = 0; j < arr4.length; j++) {
+ // let obj4 = arr4[j];
+ // if (obj4.button && (obj4.button.name.includes("澶嶄綅") || obj4.button.name.includes("Reast"))) {
+ // obj4.button.value = obj.fuwei[0][i];
+ // // console.log(obj2.button.value)
+ // }
+ // }
+
+
+ // }
+
+ // for (let i = 0; i < jsonData2.length; i++) {
+ // let arr4 = jsonData2[i];
+ // for (let j = 0; j < arr4.length; j++) {
+ // let obj4 = arr4[j];
+ // if (obj4.button && (obj4.button.name.includes("鍥為浂") || obj4.button.name.includes("Home"))) {
+ // obj4.button.value = obj.huiling[0][i];
+ // // console.log(obj2.button.value)
+ // }
+ // }
+
+
+ // }
+
+
+
+
+
for (let i = 2; i < jsonData2.length; i++) {
let arr2 = jsonData2[i];
for (let j = 2; j < arr2.length; j++) {
--
Gitblit v1.8.0