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/ServoManualone.vue | 56 ++++++++++++++++++++++++++++----------------------------
1 files changed, 28 insertions(+), 28 deletions(-)
diff --git a/CanadaMes-ui/src/views/Electrical/ServoManualone.vue b/CanadaMes-ui/src/views/Electrical/ServoManualone.vue
index 3eae7c3..3e7885e 100644
--- a/CanadaMes-ui/src/views/Electrical/ServoManualone.vue
+++ b/CanadaMes-ui/src/views/Electrical/ServoManualone.vue
@@ -8,13 +8,13 @@
active-class="blue-button"
>{{ $t("Alarm") }}</router-link
>
- <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')
@@ -787,34 +787,34 @@
}
// 澶嶄綅鏇存柊
- for (let i = 0; i < jsonData2.length; i++) {
- let arr = jsonData2[i];
- for (let j = 0; j < arr.length; j++) {
- let obj2 = arr[j];
- if (
- obj2.button &&
- (obj2.button.name === "澶嶄綅" || obj2.button.name === "Reset")
- ) {
- obj2.button.value = obj.fuwei[0][i];
- // console.log(obj2.button.value)
- }
- }
- }
+ // for (let i = 0; i < jsonData2.length; i++) {
+ // let arr = jsonData2[i];
+ // for (let j = 0; j < arr.length; j++) {
+ // let obj2 = arr[j];
+ // if (
+ // obj2.button &&
+ // (obj2.button.name === "澶嶄綅" || obj2.button.name === "Reset")
+ // ) {
+ // obj2.button.value = obj.fuwei[0][i];
+ // // console.log(obj2.button.value)
+ // }
+ // }
+ // }
- for (let i = 0; i < jsonData2.length; i++) {
- let arr = jsonData2[i];
- for (let j = 0; j < arr.length; j++) {
- let obj2 = arr[j];
- if (
- obj2.button &&
- (obj2.button.name === "鍥為浂" || obj2.button.name === "Home")
- ) {
- obj2.button.value = obj.huiling[0][i];
- // console.log(obj2.button.value)
- }
- }
- }
+ // for (let i = 0; i < jsonData2.length; i++) {
+ // let arr = jsonData2[i];
+ // for (let j = 0; j < arr.length; j++) {
+ // let obj2 = arr[j];
+ // if (
+ // obj2.button &&
+ // (obj2.button.name === "鍥為浂" || obj2.button.name === "Home")
+ // ) {
+ // obj2.button.value = obj.huiling[0][i];
+ // // console.log(obj2.button.value)
+ // }
+ // }
+ // }
--
Gitblit v1.8.0