From 3a1b33b1ab558591cf9c8acc5aa6585d6ccd6473 Mon Sep 17 00:00:00 2001 From: Junjie <fallin.jie@qq.com> Date: 星期五, 14 四月 2023 16:52:17 +0800 Subject: [PATCH] 穿梭车状态和提升机状态显示更新 --- src/main/webapp/views/console.html | 84 +++++++++++++++++++++++++++++++++++++----- 1 files changed, 74 insertions(+), 10 deletions(-) diff --git a/src/main/webapp/views/console.html b/src/main/webapp/views/console.html index 6a6ff76..5e0b60a 100644 --- a/src/main/webapp/views/console.html +++ b/src/main/webapp/views/console.html @@ -59,13 +59,7 @@ <!-- 鍥涘悜绌挎杞︾姸鎬� --> <div class="line-status"> <div class="body-head">绌挎杞︾姸鎬�</div> - <div class="state"> - <span>鍥涘悜绌挎杞� 1</span> - <span class="state-ss shuttle-idle">绌洪棽</span> - </div> - <div class="state"> - <span>鍥涘悜绌挎杞� 2</span> - <span class="state-ss shuttle-idle">绌洪棽</span> + <div id="shuttle-status-box"> </div> <div class="button"><span>鎵�鏈夌姸鎬�</span></div> <div class="button item-group"> @@ -75,20 +69,21 @@ <span class="shuttle-charging">鍏呯數涓�</span> <span class="shuttle-charging-waiting">鍏呯數浠诲姟绛夊緟纭</span> <span class="shuttle-fixing">鏁呴殰淇涓�</span> + <span class="shuttle-offline">绂荤嚎</span> </div> </div> <!-- 鎻愬崌鏈虹姸鎬� --> <div class="line-status"> <div class="body-head">鎻愬崌鏈虹姸鎬�</div> - <div class="state states"> - <span>鎻愬崌鏈�</span> - <span class="state-ss shuttle-idle">绌洪棽</span> + <div id="lift-status-box"> + </div> <div class="button"><span>鎵�鏈夌姸鎬�</span></div> <div class="button item-group"> <span class="lift-idle">绌洪棽</span> <span class="lift-working">浣滀笟涓�</span> <span class="lift-waiting">绛夊緟纭</span> + <span class="lift-offline">绂荤嚎</span> </div> </div> <!-- 杈撻�佺嚎鐘舵�� --> @@ -418,7 +413,44 @@ setInterval(() => { getShuttleStateInfo() + getLiftStateInfo() },1000) + + // 鎻愬崌鏈轰俊鎭〃鑾峰彇 + function getLiftStateInfo() { + $.ajax({ + url: baseUrl+ "/lift/table/lift/state", + headers: {'token': localStorage.getItem('token')}, + method: 'POST', + success: function (res) { + $("#lift-status-box").empty() + res.data.forEach((item,index) => { + let liftStatusClass = "lift-idle" + switch (item.status) { + case 1://绌洪棽 + liftStatusClass = "lift-idle"; + break + case 2://浣滀笟涓� + liftStatusClass = "lift-working"; + break + case 3://绛夊緟纭 + liftStatusClass = "lift-waiting"; + break + case 4://绂荤嚎 + liftStatusClass = "lift-offline"; + break + default: + liftStatusClass = "lift-idle" + } + let liftStatus = '<div class="state states">' + + '<span>鎻愬崌鏈� ' + item.liftNo + '</span>' + + '<span class="state-ss ' + liftStatusClass + '">' + item.protocolStatus$ + '</span></div>'; + $("#lift-status-box").append(liftStatus) + + }) + } + }); + } // 鍥涘悜绌挎杞︿俊鎭〃鑾峰彇 function getShuttleStateInfo() { @@ -427,7 +459,39 @@ headers: {'token': localStorage.getItem('token')}, method: 'POST', success: function (res) { + $("#shuttle-status-box").empty() res.data.forEach((item,index) => { + let shuttleStatusClass = "shuttle-idle" + switch (item.status) { + case 1://绌洪棽 + shuttleStatusClass = "shuttle-idle"; + break + case 2://浣滀笟涓� + shuttleStatusClass = "shuttle-working"; + break + case 3://绛夊緟纭 + shuttleStatusClass = "shuttle-waiting"; + break + case 4://鍏呯數涓� + shuttleStatusClass = "shuttle-charging"; + break + case 5://鍏呯數浠诲姟绛夊緟纭 + shuttleStatusClass = "shuttle-charging-waiting"; + break + case 6://鏁呴殰淇涓� + shuttleStatusClass = "shuttle-fixing"; + break + case 7://绂荤嚎 + shuttleStatusClass = "shuttle-offline"; + break + default: + shuttleStatusClass = "shuttle-idle" + } + let shuttleStatus = '<div class="state">' + + '<span>鍥涘悜绌挎杞� ' + item.shuttleNo + '</span>' + + '<span class="state-ss ' + shuttleStatusClass + '">' + item.status$ + '</span></div>'; + $("#shuttle-status-box").append(shuttleStatus) + if(item.locNoLev != currentLev){ //鍥涘悜绌挎杞︽ゼ灞傚拰褰撳墠鍦板浘妤煎眰涓嶄竴鑷达紝鍒犻櫎璇ヨ溅杈� $("#sxcar-" + item.shuttleNo).remove() -- Gitblit v1.9.1