From cc1805535ded83ed24b4a9c96317026e5541dffe Mon Sep 17 00:00:00 2001
From: 18516761980 <56479841@qq.com>
Date: 星期六, 13 八月 2022 11:09:31 +0800
Subject: [PATCH] #
---
src/main/webapp/views/console.html | 200 ++++++++++++++++++++++++++++++++++++++++++++++++++
1 files changed, 200 insertions(+), 0 deletions(-)
diff --git a/src/main/webapp/views/console.html b/src/main/webapp/views/console.html
index f7ac512..85d0c78 100644
--- a/src/main/webapp/views/console.html
+++ b/src/main/webapp/views/console.html
@@ -28,6 +28,174 @@
<div class="main-part">
</div>
+
+ <div class="">
+ <div id="loc-0100204" class="site" style="top:300px; left:200px; width:70px; height: 22px;line-height: 22px;">2-4</div>
+ <div id="loc-0100304" class="site" style="top:300px; left:272px; width:70px; height: 22px;line-height: 22px;">3-4</div>
+ <div id="loc-0100404" class="site" style="top:300px; left:344px; width:70px; height: 22px;line-height: 22px;">4-4</div>
+ <div id="loc-0100504" class="site" style="top:300px; left:416px; width:70px; height: 22px;line-height: 22px;">5-4</div>
+ <div id="loc-0100604" class="site" style="top:300px; left:488px; width:70px; height: 22px;line-height: 22px;">6-4</div>
+ <div id="loc-0100704" class="site" style="top:300px; left:560px; width:70px; height: 22px;line-height: 22px;">7-4</div>
+ <div id="loc-0100804" class="site" style="top:300px; left:632px; width:70px; height: 22px;line-height: 22px;">8-4</div>
+ <div id="loc-0100904" class="site" style="top:300px; left:704px; width:70px; height: 22px;line-height: 22px;">9-4</div>
+ <div id="loc-0101004" class="site" style="top:300px; left:776px; width:70px; height: 22px;line-height: 22px;">10-4</div>
+ <div id="loc-0101104" class="site" style="top:300px; left:848px; width:70px; height: 22px;line-height: 22px;">11-4</div>
+ <div id="loc-0101204" class="site" style="top:300px; left:920px; width:70px; height: 22px;line-height: 22px;">12-4</div>
+ <div id="loc-0101304" class="site" style="top:300px; left:992px; width:70px; height: 22px;line-height: 22px;">13-4</div>
+ <div id="loc-0101404" class="site" style="top:300px; left:1064px; width:70px; height: 22px;line-height: 22px;">14-4</div>
+ <div id="loc-0101504" class="site" style="top:300px; left:1136px; width:70px; height: 22px;line-height: 22px;">15-4</div>
+ <div id="loc-0101604" class="site" style="top:300px; left:1208px; width:70px; height: 22px;line-height: 22px;">16-4</div>
+ <div id="loc-0101704" class="site" style="top:300px; left:1280px; width:70px; height: 22px;line-height: 22px;">17-4</div>
+ <div id="loc-0101804" class="site" style="top:300px; left:1352px; width:70px; height: 22px;line-height: 22px;">18-4</div>
+ </div>
+ <div class="">
+ <div id="loc-0100203" class="site" style="top:324px; left:200px; width:70px; height: 22px;line-height: 22px;">2-3</div>
+ <div id="loc-0100303" class="site" style="top:324px; left:272px; width:70px; height: 22px;line-height: 22px;">3-3</div>
+ <div id="loc-0100403" class="site" style="top:324px; left:344px; width:70px; height: 22px;line-height: 22px;">4-3</div>
+ <div id="loc-0100503" class="site" style="top:324px; left:416px; width:70px; height: 22px;line-height: 22px;">5-3</div>
+ <div id="loc-0100603" class="site" style="top:324px; left:488px; width:70px; height: 22px;line-height: 22px;">6-3</div>
+ <div id="loc-0100703" class="site" style="top:324px; left:560px; width:70px; height: 22px;line-height: 22px;">7-3</div>
+ <div id="loc-0100803" class="site" style="top:324px; left:632px; width:70px; height: 22px;line-height: 22px;">8-3</div>
+ <div id="loc-0100903" class="site" style="top:324px; left:704px; width:70px; height: 22px;line-height: 22px;">9-3</div>
+ <div id="loc-0101003" class="site" style="top:324px; left:776px; width:70px; height: 22px;line-height: 22px;">10-3</div>
+ <div id="loc-0101103" class="site" style="top:324px; left:848px; width:70px; height: 22px;line-height: 22px;">11-3</div>
+ <div id="loc-0101203" class="site" style="top:324px; left:920px; width:70px; height: 22px;line-height: 22px;">12-3</div>
+ <div id="loc-0101303" class="site" style="top:324px; left:992px; width:70px; height: 22px;line-height: 22px;">13-3</div>
+ <div id="loc-0101403" class="site" style="top:324px; left:1064px; width:70px; height: 22px;line-height: 22px;">14-3</div>
+ <div id="loc-0101503" class="site" style="top:324px; left:1136px; width:70px; height: 22px;line-height: 22px;">15-3</div>
+ <div id="loc-0101603" class="site" style="top:324px; left:1208px; width:70px; height: 22px;line-height: 22px;">16-3</div>
+ <div id="loc-0101703" class="site" style="top:324px; left:1280px; width:70px; height: 22px;line-height: 22px;">17-3</div>
+ <div id="loc-0101803" class="site" style="top:324px; left:1352px; width:70px; height: 22px;line-height: 22px;">18-3</div>
+ </div>
+ <div class="">
+ <div id="loc-0100202" class="site" style="top:348px; left:200px; width:70px; height: 22px;line-height: 22px;">2-2</div>
+ <div id="loc-0100302" class="site" style="top:348px; left:272px; width:70px; height: 22px;line-height: 22px;">3-2</div>
+ <div id="loc-0100402" class="site" style="top:348px; left:344px; width:70px; height: 22px;line-height: 22px;">4-2</div>
+ <div id="loc-0100502" class="site" style="top:348px; left:416px; width:70px; height: 22px;line-height: 22px;">5-2</div>
+ <div id="loc-0100602" class="site" style="top:348px; left:488px; width:70px; height: 22px;line-height: 22px;">6-2</div>
+ <div id="loc-0100702" class="site" style="top:348px; left:560px; width:70px; height: 22px;line-height: 22px;">7-2</div>
+ <div id="loc-0100802" class="site" style="top:348px; left:632px; width:70px; height: 22px;line-height: 22px;">8-2</div>
+ <div id="loc-0100902" class="site" style="top:348px; left:704px; width:70px; height: 22px;line-height: 22px;">9-2</div>
+ <div id="loc-0101002" class="site" style="top:348px; left:776px; width:70px; height: 22px;line-height: 22px;">10-2</div>
+ <div id="loc-0101102" class="site" style="top:348px; left:848px; width:70px; height: 22px;line-height: 22px;">11-2</div>
+ <div id="loc-0101202" class="site" style="top:348px; left:920px; width:70px; height: 22px;line-height: 22px;">12-2</div>
+ <div id="loc-0101302" class="site" style="top:348px; left:992px; width:70px; height: 22px;line-height: 22px;">13-2</div>
+ <div id="loc-0101402" class="site" style="top:348px; left:1064px; width:70px; height: 22px;line-height: 22px;">14-2</div>
+ <div id="loc-0101502" class="site" style="top:348px; left:1136px; width:70px; height: 22px;line-height: 22px;">15-2</div>
+ <div id="loc-0101602" class="site" style="top:348px; left:1208px; width:70px; height: 22px;line-height: 22px;">16-2</div>
+ <div id="loc-0101702" class="site" style="top:348px; left:1280px; width:70px; height: 22px;line-height: 22px;">17-2</div>
+ <div id="loc-0101802" class="site" style="top:348px; left:1352px; width:70px; height: 22px;line-height: 22px;">18-2</div>
+ </div>
+ <div class="" style="text-align: center;">
+ <div id="loc-0100201" class="site" style="top:372px; left:200px; width:70px; height: 22px;line-height: 22px;">2-1</div>
+ <div id="loc-0100301" class="site" style="top:372px; left:272px; width:70px; height: 22px;line-height: 22px;">3-1</div>
+ <div id="loc-0100401" class="site" style="top:372px; left:344px; width:70px; height: 22px;line-height: 22px;">4-1</div>
+ <div id="loc-0100501" class="site" style="top:372px; left:416px; width:70px; height: 22px;line-height: 22px;">5-1</div>
+ <div id="loc-0100601" class="site" style="top:372px; left:488px; width:70px; height: 22px;line-height: 22px;">6-1</div>
+ <div id="loc-0100701" class="site" style="top:372px; left:560px; width:70px; height: 22px;line-height: 22px;">7-1</div>
+ <div id="loc-0100801" class="site" style="top:372px; left:632px; width:70px; height: 22px;line-height: 22px;">8-1</div>
+ <div id="loc-0100901" class="site" style="top:372px; left:704px; width:70px; height: 22px;line-height: 22px;">9-1</div>
+ <div id="loc-0101001" class="site" style="top:372px; left:776px; width:70px; height: 22px;line-height: 22px;">10-1</div>
+ <div id="loc-0101101" class="site" style="top:372px; left:848px; width:70px; height: 22px;line-height: 22px;">11-1</div>
+ <div id="loc-0101201" class="site" style="top:372px; left:920px; width:70px; height: 22px;line-height: 22px;">12-1</div>
+ <div id="loc-0101301" class="site" style="top:372px; left:992px; width:70px; height: 22px;line-height: 22px;">13-1</div>
+ <div id="loc-0101401" class="site" style="top:372px; left:1064px; width:70px; height: 22px;line-height: 22px;">14-1</div>
+ <div id="loc-0101501" class="site" style="top:372px; left:1136px; width:70px; height: 22px;line-height: 22px;">15-1</div>
+ <div id="loc-0101601" class="site" style="top:372px; left:1208px; width:70px; height: 22px;line-height: 22px;">16-1</div>
+ <div id="loc-0101701" class="site" style="top:372px; left:1280px; width:70px; height: 22px;line-height: 22px;">17-1</div>
+ <div id="loc-0101801" class="site" style="top:372px; left:1352px; width:70px; height: 22px;line-height: 22px;">18-1</div>
+
+ <div class="rackDescs" id="lb_desc11" style="top:372px; left:1450px; width:150px;height: 23px;line-height: 23px">1鎺掕揣鏋朵晶瑙嗗浘</div>
+ </div>
+
+ <div class="">
+ <div id="loc-0200204" class="site" style="top:458px; left:200px; width:70px; height: 22px;line-height: 22px;">2-4</div>
+ <div id="loc-0200304" class="site" style="top:458px; left:272px; width:70px; height: 22px;line-height: 22px;">3-4</div>
+ <div id="loc-0200404" class="site" style="top:458px; left:344px; width:70px; height: 22px;line-height: 22px;">4-4</div>
+ <div id="loc-0200504" class="site" style="top:458px; left:416px; width:70px; height: 22px;line-height: 22px;">5-4</div>
+ <div id="loc-0200604" class="site" style="top:458px; left:488px; width:70px; height: 22px;line-height: 22px;">6-4</div>
+ <div id="loc-0200704" class="site" style="top:458px; left:560px; width:70px; height: 22px;line-height: 22px;">7-4</div>
+ <div id="loc-0200804" class="site" style="top:458px; left:632px; width:70px; height: 22px;line-height: 22px;">8-4</div>
+ <div id="loc-0200904" class="site" style="top:458px; left:704px; width:70px; height: 22px;line-height: 22px;">9-4</div>
+ <div id="loc-0201004" class="site" style="top:458px; left:776px; width:70px; height: 22px;line-height: 22px;">10-4</div>
+ <div id="loc-0201104" class="site" style="top:458px; left:848px; width:70px; height: 22px;line-height: 22px;">11-4</div>
+ <div id="loc-0201204" class="site" style="top:458px; left:920px; width:70px; height: 22px;line-height: 22px;">12-4</div>
+ <div id="loc-0201304" class="site" style="top:458px; left:992px; width:70px; height: 22px;line-height: 22px;">13-4</div>
+ <div id="loc-0201404" class="site" style="top:458px; left:1064px; width:70px; height: 22px;line-height: 22px;">14-4</div>
+ <div id="loc-0201504" class="site" style="top:458px; left:1136px; width:70px; height: 22px;line-height: 22px;">15-4</div>
+ <div id="loc-0201604" class="site" style="top:458px; left:1208px; width:70px; height: 22px;line-height: 22px;">16-4</div>
+ <div id="loc-0201704" class="site" style="top:458px; left:1280px; width:70px; height: 22px;line-height: 22px;">17-4</div>
+ <div id="loc-0201804" class="site" style="top:458px; left:1352px; width:70px; height: 22px;line-height: 22px;">18-4</div>
+ </div>
+ <div class="">
+ <div id="loc-0200203" class="site" style="top:482px; left:200px; width:70px; height: 22px;line-height: 22px;">2-3</div>
+ <div id="loc-0200303" class="site" style="top:482px; left:272px; width:70px; height: 22px;line-height: 22px;">3-3</div>
+ <div id="loc-0200403" class="site" style="top:482px; left:344px; width:70px; height: 22px;line-height: 22px;">4-3</div>
+ <div id="loc-0200503" class="site" style="top:482px; left:416px; width:70px; height: 22px;line-height: 22px;">5-3</div>
+ <div id="loc-0200603" class="site" style="top:482px; left:488px; width:70px; height: 22px;line-height: 22px;">6-3</div>
+ <div id="loc-0200703" class="site" style="top:482px; left:560px; width:70px; height: 22px;line-height: 22px;">7-3</div>
+ <div id="loc-0200803" class="site" style="top:482px; left:632px; width:70px; height: 22px;line-height: 22px;">8-3</div>
+ <div id="loc-0200903" class="site" style="top:482px; left:704px; width:70px; height: 22px;line-height: 22px;">9-3</div>
+ <div id="loc-0201003" class="site" style="top:482px; left:776px; width:70px; height: 22px;line-height: 22px;">10-3</div>
+ <div id="loc-0201103" class="site" style="top:482px; left:848px; width:70px; height: 22px;line-height: 22px;">11-3</div>
+ <div id="loc-0201203" class="site" style="top:482px; left:920px; width:70px; height: 22px;line-height: 22px;">12-3</div>
+ <div id="loc-0201303" class="site" style="top:482px; left:992px; width:70px; height: 22px;line-height: 22px;">13-3</div>
+ <div id="loc-0201403" class="site" style="top:482px; left:1064px; width:70px; height: 22px;line-height: 22px;">14-3</div>
+ <div id="loc-0201503" class="site" style="top:482px; left:1136px; width:70px; height: 22px;line-height: 22px;">15-3</div>
+ <div id="loc-0201603" class="site" style="top:482px; left:1208px; width:70px; height: 22px;line-height: 22px;">16-3</div>
+ <div id="loc-0201703" class="site" style="top:482px; left:1280px; width:70px; height: 22px;line-height: 22px;">17-3</div>
+ <div id="loc-0201803" class="site" style="top:482px; left:1352px; width:70px; height: 22px;line-height: 22px;">18-3</div>
+ </div>
+ <div class="">
+ <div id="loc-0200202" class="site" style="top:506px; left:200px; width:70px; height: 22px;line-height: 22px;">2-2</div>
+ <div id="loc-0200302" class="site" style="top:506px; left:272px; width:70px; height: 22px;line-height: 22px;">3-2</div>
+ <div id="loc-0200402" class="site" style="top:506px; left:344px; width:70px; height: 22px;line-height: 22px;">4-2</div>
+ <div id="loc-0200502" class="site" style="top:506px; left:416px; width:70px; height: 22px;line-height: 22px;">5-2</div>
+ <div id="loc-0200602" class="site" style="top:506px; left:488px; width:70px; height: 22px;line-height: 22px;">6-2</div>
+ <div id="loc-0200702" class="site" style="top:506px; left:560px; width:70px; height: 22px;line-height: 22px;">7-2</div>
+ <div id="loc-0200802" class="site" style="top:506px; left:632px; width:70px; height: 22px;line-height: 22px;">8-2</div>
+ <div id="loc-0200902" class="site" style="top:506px; left:704px; width:70px; height: 22px;line-height: 22px;">9-2</div>
+ <div id="loc-0201002" class="site" style="top:506px; left:776px; width:70px; height: 22px;line-height: 22px;">10-2</div>
+ <div id="loc-0201102" class="site" style="top:506px; left:848px; width:70px; height: 22px;line-height: 22px;">11-2</div>
+ <div id="loc-0201202" class="site" style="top:506px; left:920px; width:70px; height: 22px;line-height: 22px;">12-2</div>
+ <div id="loc-0201302" class="site" style="top:506px; left:992px; width:70px; height: 22px;line-height: 22px;">13-2</div>
+ <div id="loc-0201402" class="site" style="top:506px; left:1064px; width:70px; height: 22px;line-height: 22px;">14-2</div>
+ <div id="loc-0201502" class="site" style="top:506px; left:1136px; width:70px; height: 22px;line-height: 22px;">15-2</div>
+ <div id="loc-0201602" class="site" style="top:506px; left:1208px; width:70px; height: 22px;line-height: 22px;">16-2</div>
+ <div id="loc-0201702" class="site" style="top:506px; left:1280px; width:70px; height: 22px;line-height: 22px;">17-2</div>
+ <div id="loc-0201802" class="site" style="top:506px; left:1352px; width:70px; height: 22px;line-height: 22px;">18-2</div>
+ </div>
+ <div class="">
+ <div id="loc-0200201" class="site" style="top:530px; left:200px; width:70px; height: 22px;line-height: 22px;">2-1</div>
+ <div id="loc-0200301" class="site" style="top:530px; left:272px; width:70px; height: 22px;line-height: 22px;">3-1</div>
+ <div id="loc-0200401" class="site" style="top:530px; left:344px; width:70px; height: 22px;line-height: 22px;">4-1</div>
+ <div id="loc-0200501" class="site" style="top:530px; left:416px; width:70px; height: 22px;line-height: 22px;">5-1</div>
+ <div id="loc-0200601" class="site" style="top:530px; left:488px; width:70px; height: 22px;line-height: 22px;">6-1</div>
+ <div id="loc-0200701" class="site" style="top:530px; left:560px; width:70px; height: 22px;line-height: 22px;">7-1</div>
+ <div id="loc-0200801" class="site" style="top:530px; left:632px; width:70px; height: 22px;line-height: 22px;">8-1</div>
+ <div id="loc-0200901" class="site" style="top:530px; left:704px; width:70px; height: 22px;line-height: 22px;">9-1</div>
+ <div id="loc-0201001" class="site" style="top:530px; left:776px; width:70px; height: 22px;line-height: 22px;">10-1</div>
+ <div id="loc-0201101" class="site" style="top:530px; left:848px; width:70px; height: 22px;line-height: 22px;">11-1</div>
+ <div id="loc-0201201" class="site" style="top:530px; left:920px; width:70px; height: 22px;line-height: 22px;">12-1</div>
+ <div id="loc-0201301" class="site" style="top:530px; left:992px; width:70px; height: 22px;line-height: 22px;">13-1</div>
+ <div id="loc-0201401" class="site" style="top:530px; left:1064px; width:70px; height: 22px;line-height: 22px;">14-1</div>
+ <div id="loc-0201501" class="site" style="top:530px; left:1136px; width:70px; height: 22px;line-height: 22px;">15-1</div>
+ <div id="loc-0201601" class="site" style="top:530px; left:1208px; width:70px; height: 22px;line-height: 22px;">16-1</div>
+ <div id="loc-0201701" class="site" style="top:530px; left:1280px; width:70px; height: 22px;line-height: 22px;">17-1</div>
+ <div id="loc-0201801" class="site" style="top:530px; left:1352px; width:70px; height: 22px;line-height: 22px;">18-1</div>
+
+ <div class="rackDescs" id="lb_desc22" style="top:530px; left:1450px; width:150px;height: 23px;line-height: 23px">2鎺掕揣鏋朵晶瑙嗗浘</div>
+ </div>
+
+ <div class="button item-group">
+ <span class="site machine-auto-flag" style="color:#FFFFFF; top:600px; left:300px">绌哄簱浣�</span>
+ <span class="site machine-stock-move-flag" style="color:#FFFFFF; top:600px; left:364px">鍦ㄥ簱寰呮祴</span>
+ <span class="site machine-site-move-flag" style="color:#FFFFFF; top:600px; left:442px">鍦ㄥ簱娴嬭瘯涓�</span>
+ <span class="site machine-take-flag" style="color:#FFFFFF; top:600px; left:534px">鍦ㄥ簱闈欑疆涓�</span>
+ <span class="site machine-put-flag" style="color:#FFFFFF; top:600px; left:626px">闈欑疆瀹屾垚</span>
+ <span class="site machine-error-flag" style="color:#FFFFFF; top:600px; left:696px">寮傚父鎶ヨ</span>
+ </div>
+
<div id="body">
<!-- 鎬诲紑鍏� -->
<div class="system-state">
@@ -462,6 +630,7 @@
getSystemRunningStatus();
getBarcodeInfo();
getScaleInfo();
+ getLocInfo();
// 瀹炴椂璁块棶
setInterval(function () {
getCrnInfo();
@@ -471,6 +640,7 @@
}, 1000);
setInterval(function () {
getSitesInfo();
+ getLocInfo();
}, 3000);
// 绯荤粺杩愯寮�鍏�
@@ -675,6 +845,36 @@
});
}
+ // 搴撲綅瀹炴椂鏁版嵁鑾峰彇
+ function getLocInfo() {
+ $.ajax({
+ url: baseUrl + "/console/latest/data/loc",
+ headers: {'token': localStorage.getItem('token')},
+ method: 'POST',
+ success: function (res) {
+ if (res.code === 200) {
+ var locs = res.data;
+ for (var i = 0; i < locs.length; i++) {
+ var siteEl = $("#loc-" + locs[i].siteId);
+ siteEl.attr("class", "site " + locs[i].siteStatus);
+ // if (locs[i].workNo != null && locs[i].workNo > 0) {
+ // siteEl.html(locs[i].siteId + "[" + locs[i].workNo + "]");
+ // } else {
+ // siteEl.html(locs[i].siteId);
+ // }
+ // if (i + 1 === 8) {
+ // carAnimate(i + 1, Number(locs[i].nearbySta));
+ // }
+ }
+ } else if (res.code === 403) {
+ parent.location.href = baseUrl + "/login";
+ } else {
+ console.log(res.msg);
+ }
+ }
+ });
+ }
+
// 鍫嗗灈鏈哄亸绉诲姩鐢�
function crnAnimate(id, leftVal) {
// console.log(crn1Position)
--
Gitblit v1.9.1