From cfb75c26838c2e8dacf663e4083484f3b1047ca1 Mon Sep 17 00:00:00 2001
From: Junjie <fallin.jie@qq.com>
Date: 星期四, 06 四月 2023 16:57:47 +0800
Subject: [PATCH] 四向穿梭车地图楼层切换后，显示楼层效果
---
src/main/webapp/views/shuttle.html | 18 ++++++++++++------
1 files changed, 12 insertions(+), 6 deletions(-)
diff --git a/src/main/webapp/views/shuttle.html b/src/main/webapp/views/shuttle.html
index 22252e4..c704efe 100644
--- a/src/main/webapp/views/shuttle.html
+++ b/src/main/webapp/views/shuttle.html
@@ -40,6 +40,8 @@
<th>鐢垫睜娓╁害</th>
<th>閿欒缂栧彿</th>
<th>plc杈撳嚭鐘舵�両O</th>
+ <th>閿欒淇℃伅鐮�</th>
+ <th>plc杈撳叆鐘舵��</th>
<th>褰撳墠鎴栦箣鍓嶄簩缁寸爜</th>
<th>x鍋忕Щ閲�</th>
<th>y鍋忕Щ閲�</th>
@@ -590,13 +592,15 @@
setVal(tr.children("td").eq(3), table[i-1].currentCode);
setVal(tr.children("td").eq(4), table[i-1].batteryPower);
setVal(tr.children("td").eq(5), table[i-1].batteryTemp);
- setVal(tr.children("td").eq(6), table[i-1].statusErrorCode$);
+ setVal(tr.children("td").eq(6), table[i-1].errorCode$);
setVal(tr.children("td").eq(7), table[i-1].plcOutputStatusIO);
- setVal(tr.children("td").eq(8), table[i-1].currentOrBeforeCode);
- setVal(tr.children("td").eq(9), table[i-1].codeOffsetX);
- setVal(tr.children("td").eq(10), table[i-1].codeOffsetY);
- setVal(tr.children("td").eq(11), table[i-1].currentVoltage);
- setVal(tr.children("td").eq(12), table[i-1].currentAnalogValue);
+ setVal(tr.children("td").eq(8), table[i-1].statusErrorCode);
+ setVal(tr.children("td").eq(9), table[i-1].plcInputStatus);
+ setVal(tr.children("td").eq(10), table[i-1].currentOrBeforeCode);
+ setVal(tr.children("td").eq(11), table[i-1].codeOffsetX);
+ setVal(tr.children("td").eq(12), table[i-1].codeOffsetY);
+ setVal(tr.children("td").eq(13), table[i-1].currentVoltage);
+ setVal(tr.children("td").eq(14), table[i-1].currentAnalogValue);
}
} else if (res.code === 403){
window.location.href = baseUrl+"/login";
@@ -707,6 +711,8 @@
" <td></td>\n" +
" <td></td>\n" +
" <td></td>\n" +
+ " <td></td>\n" +
+ " <td></td>\n" +
" </tr>\n";
}
$('#shuttle-state-table tbody').after(html);
--
Gitblit v1.9.1