From 7f1806c6a01318f3b1eff38da7c7c41ae82ff8c0 Mon Sep 17 00:00:00 2001
From: wu <731351411@qq.com>
Date: 星期一, 11 十二月 2023 13:19:52 +0800
Subject: [PATCH] Merge branch 'master' of http://10.153.19.25:10101/r/CanadaMes
---
CanadaMes-ui/src/views/Electrical/ManualJog.vue | 22 +++++++++++-----------
1 files changed, 11 insertions(+), 11 deletions(-)
diff --git a/CanadaMes-ui/src/views/Electrical/ManualJog.vue b/CanadaMes-ui/src/views/Electrical/ManualJog.vue
index 8ec18ea..eb10eca 100644
--- a/CanadaMes-ui/src/views/Electrical/ManualJog.vue
+++ b/CanadaMes-ui/src/views/Electrical/ManualJog.vue
@@ -49,8 +49,8 @@
</el-breadcrumb>
- <el-row :gutter="1">
- <el-col :span="24" v-for="(dataGroup, groupIndex) in jsonData" :key="groupIndex">
+ <el-row :gutter="40" style="width:100%;">
+ <el-col :span="18" v-for="(dataGroup, groupIndex) in jsonData" :key="groupIndex">
<el-card class="json-block" style="width:100%;">
<div class="button-row" style="display: flex; justify-content: flex-start;flex-wrap:wrap;">
@@ -128,16 +128,16 @@
},
//鏍规嵁璇诲彇PLC鐨勫�硷紝鏍规嵁鍚嶇О鏀瑰彉棰滆壊1鎵撳紑锛�0鍏抽棴
- getStatusClass (zhuangtai) {
-// console.log(zhuangtai);
- if (zhuangtai === 1) {
- return "op";
- }
- else {
- return "dow";
- }
+// getStatusClass (zhuangtai) {
+// // console.log(zhuangtai);
+// if (zhuangtai === 1) {
+// return "op";
+// }
+// else {
+// return "dow";
+// }
- },
+// },
initWebSocket () {
let viewname = "ManualJog";
--
Gitblit v1.8.0