From afbddf62e45bce6fd9428cddec36382c75cee53a Mon Sep 17 00:00:00 2001
From: wu <731351411@qq.com>
Date: 星期四, 07 十二月 2023 08:38:09 +0800
Subject: [PATCH] Merge branch 'master' of http://10.153.19.25:10101/r/CanadaMes
---
CanadaMes-ui/src/views/Electrical/ManualJog.vue | 13 ++++++++-----
1 files changed, 8 insertions(+), 5 deletions(-)
diff --git a/CanadaMes-ui/src/views/Electrical/ManualJog.vue b/CanadaMes-ui/src/views/Electrical/ManualJog.vue
index 11e6754..9f88e38 100644
--- a/CanadaMes-ui/src/views/Electrical/ManualJog.vue
+++ b/CanadaMes-ui/src/views/Electrical/ManualJog.vue
@@ -51,10 +51,11 @@
<div class="button-row" style="display: flex; justify-content: flex-start;flex-wrap:wrap;">
<div v-for="(item, itemIndex) in dataGroup" :key="itemIndex" style="margin: 10px;">
- <el-button v-if="item.button" :name="item.button.name" :class="getStatusClass(item.button.value)"
- class="action-button" @click="updateButtonValue(dataGroup, itemIndex); submitDataToBackend();">{{
- item.button.name
- }}</el-button>
+ <el-button v-if="item.button" :name="item.button.name"
+ :class="{ 'dow': false, 'op': item.button.value === 1 }" class="action-button"
+ @click="updateButtonValue(dataGroup, itemIndex); submitDataToBackend();">{{
+ item.button.name
+ }}</el-button>
</div>
</div>
</el-card>
@@ -171,6 +172,7 @@
// console.log(parms);
+if(obj.params){
for (let i = 0; i < jsonData2.length; i++) {
let arr = jsonData2[i];
@@ -181,6 +183,7 @@
}
}
+ }
@@ -242,7 +245,7 @@
.action-button {
margin-right: 10px;
- background: #66b1ff;
+ background: #A0A0A0;
color: #FFF;
}
--
Gitblit v1.8.0