From 9ff1f1f221aeafc99653c846b2c2442f9c033ee5 Mon Sep 17 00:00:00 2001
From: tqs <56479841@qq.com>
Date: 星期二, 11 十月 2022 08:08:35 +0800
Subject: [PATCH] Merge remote-tracking branch 'gitbit/gzynwcs' into gzynwcs
---
src/main/webapp/views/console.html | 336 ++++++++++++++++++++++++++++++++++++++++++++++++++++---
1 files changed, 317 insertions(+), 19 deletions(-)
diff --git a/src/main/webapp/views/console.html b/src/main/webapp/views/console.html
index f7ac512..17dd713 100644
--- a/src/main/webapp/views/console.html
+++ b/src/main/webapp/views/console.html
@@ -10,6 +10,7 @@
<script src="../static/js/console.map.js"></script>
<script src="../static/js/console.js"></script>
<script src="../static/js/common.js"></script>
+ <script src="info.js"></script>
</head>
@@ -21,13 +22,181 @@
<h6>AUTOMATIC WAREHOUSE WCS MONITORING DIAGRAM</h6>
</div>
<div class="head-right">
- <img src="../static/images/zy-logo.png" alt="涓壃" height="44" width="80">
+ <img src="../static/images/zy-logo.png" alt="wcs" height="44" width="80">
</div>
</div>
<!-- 璐ф灦 + 鍫嗗灈鏈� + 鍏ュ簱绔欑偣 -->
<div class="main-part">
</div>
+
+ <div class="">
+ <div id="loc-0200204" class="loc" style="top:300px; left:200px; width:70px; height: 22px;line-height: 22px;">2-4</div>
+ <div id="loc-0200304" class="loc" style="top:300px; left:272px; width:70px; height: 22px;line-height: 22px;">3-4</div>
+ <div id="loc-0200404" class="loc" style="top:300px; left:344px; width:70px; height: 22px;line-height: 22px;">4-4</div>
+ <div id="loc-0200504" class="loc" style="top:300px; left:416px; width:70px; height: 22px;line-height: 22px;">5-4</div>
+ <div id="loc-0200604" class="loc" style="top:300px; left:488px; width:70px; height: 22px;line-height: 22px;">6-4</div>
+ <div id="loc-0200704" class="loc" style="top:300px; left:560px; width:70px; height: 22px;line-height: 22px;">7-4</div>
+ <div id="loc-0200804" class="loc" style="top:300px; left:632px; width:70px; height: 22px;line-height: 22px;">8-4</div>
+ <div id="loc-0200904" class="loc" style="top:300px; left:704px; width:70px; height: 22px;line-height: 22px;">9-4</div>
+ <div id="loc-0201004" class="loc" style="top:300px; left:776px; width:70px; height: 22px;line-height: 22px;">10-4</div>
+ <div id="loc-0201104" class="loc" style="top:300px; left:848px; width:70px; height: 22px;line-height: 22px;">11-4</div>
+ <div id="loc-0201204" class="loc" style="top:300px; left:920px; width:70px; height: 22px;line-height: 22px;">12-4</div>
+ <div id="loc-0201304" class="loc" style="top:300px; left:992px; width:70px; height: 22px;line-height: 22px;">13-4</div>
+ <div id="loc-0201404" class="loc" style="top:300px; left:1064px; width:70px; height: 22px;line-height: 22px;">14-4</div>
+ <div id="loc-0201504" class="loc" style="top:300px; left:1136px; width:70px; height: 22px;line-height: 22px;">15-4</div>
+ <div id="loc-0201604" class="loc" style="top:300px; left:1208px; width:70px; height: 22px;line-height: 22px;">16-4</div>
+ <div id="loc-0201704" class="loc" style="top:300px; left:1280px; width:70px; height: 22px;line-height: 22px;">17-4</div>
+ <div id="loc-0201804" class="loc" style="top:300px; left:1352px; width:70px; height: 22px;line-height: 22px;">18-4</div>
+ </div>
+ <div class="">
+ <div id="loc-0200203" class="loc" style="top:324px; left:200px; width:70px; height: 22px;line-height: 22px;">2-3</div>
+ <div id="loc-0200303" class="loc" style="top:324px; left:272px; width:70px; height: 22px;line-height: 22px;">3-3</div>
+ <div id="loc-0200403" class="loc" style="top:324px; left:344px; width:70px; height: 22px;line-height: 22px;">4-3</div>
+ <div id="loc-0200503" class="loc" style="top:324px; left:416px; width:70px; height: 22px;line-height: 22px;">5-3</div>
+ <div id="loc-0200603" class="loc" style="top:324px; left:488px; width:70px; height: 22px;line-height: 22px;">6-3</div>
+ <div id="loc-0200703" class="loc" style="top:324px; left:560px; width:70px; height: 22px;line-height: 22px;">7-3</div>
+ <div id="loc-0200803" class="loc" style="top:324px; left:632px; width:70px; height: 22px;line-height: 22px;">8-3</div>
+ <div id="loc-0200903" class="loc" style="top:324px; left:704px; width:70px; height: 22px;line-height: 22px;">9-3</div>
+ <div id="loc-0201003" class="loc" style="top:324px; left:776px; width:70px; height: 22px;line-height: 22px;">10-3</div>
+ <div id="loc-0201103" class="loc" style="top:324px; left:848px; width:70px; height: 22px;line-height: 22px;">11-3</div>
+ <div id="loc-0201203" class="loc" style="top:324px; left:920px; width:70px; height: 22px;line-height: 22px;">12-3</div>
+ <div id="loc-0201303" class="loc" style="top:324px; left:992px; width:70px; height: 22px;line-height: 22px;">13-3</div>
+ <div id="loc-0201403" class="loc" style="top:324px; left:1064px; width:70px; height: 22px;line-height: 22px;">14-3</div>
+ <div id="loc-0201503" class="loc" style="top:324px; left:1136px; width:70px; height: 22px;line-height: 22px;">15-3</div>
+ <div id="loc-0201603" class="loc" style="top:324px; left:1208px; width:70px; height: 22px;line-height: 22px;">16-3</div>
+ <div id="loc-0201703" class="loc" style="top:324px; left:1280px; width:70px; height: 22px;line-height: 22px;">17-3</div>
+ <div id="loc-0201803" class="loc" style="top:324px; left:1352px; width:70px; height: 22px;line-height: 22px;">18-3</div>
+ </div>
+ <div class="">
+ <div id="loc-0200202" class="loc" style="top:348px; left:200px; width:70px; height: 22px;line-height: 22px;">2-2</div>
+ <div id="loc-0200302" class="loc" style="top:348px; left:272px; width:70px; height: 22px;line-height: 22px;">3-2</div>
+ <div id="loc-0200402" class="loc" style="top:348px; left:344px; width:70px; height: 22px;line-height: 22px;">4-2</div>
+ <div id="loc-0200502" class="loc" style="top:348px; left:416px; width:70px; height: 22px;line-height: 22px;">5-2</div>
+ <div id="loc-0200602" class="loc" style="top:348px; left:488px; width:70px; height: 22px;line-height: 22px;">6-2</div>
+ <div id="loc-0200702" class="loc" style="top:348px; left:560px; width:70px; height: 22px;line-height: 22px;">7-2</div>
+ <div id="loc-0200802" class="loc" style="top:348px; left:632px; width:70px; height: 22px;line-height: 22px;">8-2</div>
+ <div id="loc-0200902" class="loc" style="top:348px; left:704px; width:70px; height: 22px;line-height: 22px;">9-2</div>
+ <div id="loc-0201002" class="loc" style="top:348px; left:776px; width:70px; height: 22px;line-height: 22px;">10-2</div>
+ <div id="loc-0201102" class="loc" style="top:348px; left:848px; width:70px; height: 22px;line-height: 22px;">11-2</div>
+ <div id="loc-0201202" class="loc" style="top:348px; left:920px; width:70px; height: 22px;line-height: 22px;">12-2</div>
+ <div id="loc-0201302" class="loc" style="top:348px; left:992px; width:70px; height: 22px;line-height: 22px;">13-2</div>
+ <div id="loc-0201402" class="loc" style="top:348px; left:1064px; width:70px; height: 22px;line-height: 22px;">14-2</div>
+ <div id="loc-0201502" class="loc" style="top:348px; left:1136px; width:70px; height: 22px;line-height: 22px;">15-2</div>
+ <div id="loc-0201602" class="loc" style="top:348px; left:1208px; width:70px; height: 22px;line-height: 22px;">16-2</div>
+ <div id="loc-0201702" class="loc" style="top:348px; left:1280px; width:70px; height: 22px;line-height: 22px;">17-2</div>
+ <div id="loc-0201802" class="loc" 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-0200201" class="loc" style="top:372px; left:200px; width:70px; height: 22px;line-height: 22px;">2-1</div>
+ <div id="loc-0200301" class="loc" style="top:372px; left:272px; width:70px; height: 22px;line-height: 22px;">3-1</div>
+ <div id="loc-0200401" class="loc" style="top:372px; left:344px; width:70px; height: 22px;line-height: 22px;">4-1</div>
+ <div id="loc-0200501" class="loc" style="top:372px; left:416px; width:70px; height: 22px;line-height: 22px;">5-1</div>
+ <div id="loc-0200601" class="loc" style="top:372px; left:488px; width:70px; height: 22px;line-height: 22px;">6-1</div>
+ <div id="loc-0200701" class="loc" style="top:372px; left:560px; width:70px; height: 22px;line-height: 22px;">7-1</div>
+ <div id="loc-0200801" class="loc" style="top:372px; left:632px; width:70px; height: 22px;line-height: 22px;">8-1</div>
+ <div id="loc-0200901" class="loc" style="top:372px; left:704px; width:70px; height: 22px;line-height: 22px;">9-1</div>
+ <div id="loc-0201001" class="loc" style="top:372px; left:776px; width:70px; height: 22px;line-height: 22px;">10-1</div>
+ <div id="loc-0201101" class="loc" style="top:372px; left:848px; width:70px; height: 22px;line-height: 22px;">11-1</div>
+ <div id="loc-0201201" class="loc" style="top:372px; left:920px; width:70px; height: 22px;line-height: 22px;">12-1</div>
+ <div id="loc-0201301" class="loc" style="top:372px; left:992px; width:70px; height: 22px;line-height: 22px;">13-1</div>
+ <div id="loc-0201401" class="loc" style="top:372px; left:1064px; width:70px; height: 22px;line-height: 22px;">14-1</div>
+ <div id="loc-0201501" class="loc" style="top:372px; left:1136px; width:70px; height: 22px;line-height: 22px;">15-1</div>
+ <div id="loc-0201601" class="loc" style="top:372px; left:1208px; width:70px; height: 22px;line-height: 22px;">16-1</div>
+ <div id="loc-0201701" class="loc" style="top:372px; left:1280px; width:70px; height: 22px;line-height: 22px;">17-1</div>
+ <div id="loc-0201801" class="loc" style="top:372px; left:1352px; width:70px; height: 22px;line-height: 22px;">18-1</div>
+
+ <div class="rackDescs" id="lb_desc22" style="top:372px; left:1450px; width:150px;height: 23px;line-height: 23px">2鎺掕揣鏋朵晶瑙嗗浘</div>
+ </div>
+
+ <div class="">
+ <div id="loc-0100204" class="loc" style="top:458px; left:200px; width:70px; height: 22px;line-height: 22px;">2-4</div>
+ <div id="loc-0100304" class="loc" style="top:458px; left:272px; width:70px; height: 22px;line-height: 22px;">3-4</div>
+ <div id="loc-0100404" class="loc" style="top:458px; left:344px; width:70px; height: 22px;line-height: 22px;">4-4</div>
+ <div id="loc-0100504" class="loc" style="top:458px; left:416px; width:70px; height: 22px;line-height: 22px;">5-4</div>
+ <div id="loc-0100604" class="loc" style="top:458px; left:488px; width:70px; height: 22px;line-height: 22px;">6-4</div>
+ <div id="loc-0100704" class="loc" style="top:458px; left:560px; width:70px; height: 22px;line-height: 22px;">7-4</div>
+ <div id="loc-0100804" class="loc" style="top:458px; left:632px; width:70px; height: 22px;line-height: 22px;">8-4</div>
+ <div id="loc-0100904" class="loc" style="top:458px; left:704px; width:70px; height: 22px;line-height: 22px;">9-4</div>
+ <div id="loc-0101004" class="loc" style="top:458px; left:776px; width:70px; height: 22px;line-height: 22px;">10-4</div>
+ <div id="loc-0101104" class="loc" style="top:458px; left:848px; width:70px; height: 22px;line-height: 22px;">11-4</div>
+ <div id="loc-0101204" class="loc" style="top:458px; left:920px; width:70px; height: 22px;line-height: 22px;">12-4</div>
+ <div id="loc-0101304" class="loc" style="top:458px; left:992px; width:70px; height: 22px;line-height: 22px;">13-4</div>
+ <div id="loc-0101404" class="loc" style="top:458px; left:1064px; width:70px; height: 22px;line-height: 22px;">14-4</div>
+ <div id="loc-0101504" class="loc" style="top:458px; left:1136px; width:70px; height: 22px;line-height: 22px;">15-4</div>
+ <div id="loc-0101604" class="loc" style="top:458px; left:1208px; width:70px; height: 22px;line-height: 22px;">16-4</div>
+ <div id="loc-0101704" class="loc" style="top:458px; left:1280px; width:70px; height: 22px;line-height: 22px;">17-4</div>
+ <div id="loc-0101804" class="loc" style="top:458px; left:1352px; width:70px; height: 22px;line-height: 22px;">18-4</div>
+ </div>
+ <div class="">
+ <div id="loc-0100203" class="loc" style="top:482px; left:200px; width:70px; height: 22px;line-height: 22px;">2-3</div>
+ <div id="loc-0100303" class="loc" style="top:482px; left:272px; width:70px; height: 22px;line-height: 22px;">3-3</div>
+ <div id="loc-0100403" class="loc" style="top:482px; left:344px; width:70px; height: 22px;line-height: 22px;">4-3</div>
+ <div id="loc-0100503" class="loc" style="top:482px; left:416px; width:70px; height: 22px;line-height: 22px;">5-3</div>
+ <div id="loc-0100603" class="loc" style="top:482px; left:488px; width:70px; height: 22px;line-height: 22px;">6-3</div>
+ <div id="loc-0100703" class="loc" style="top:482px; left:560px; width:70px; height: 22px;line-height: 22px;">7-3</div>
+ <div id="loc-0100803" class="loc" style="top:482px; left:632px; width:70px; height: 22px;line-height: 22px;">8-3</div>
+ <div id="loc-0100903" class="loc" style="top:482px; left:704px; width:70px; height: 22px;line-height: 22px;">9-3</div>
+ <div id="loc-0101003" class="loc" style="top:482px; left:776px; width:70px; height: 22px;line-height: 22px;">10-3</div>
+ <div id="loc-0101103" class="loc" style="top:482px; left:848px; width:70px; height: 22px;line-height: 22px;">11-3</div>
+ <div id="loc-0101203" class="loc" style="top:482px; left:920px; width:70px; height: 22px;line-height: 22px;">12-3</div>
+ <div id="loc-0101303" class="loc" style="top:482px; left:992px; width:70px; height: 22px;line-height: 22px;">13-3</div>
+ <div id="loc-0101403" class="loc" style="top:482px; left:1064px; width:70px; height: 22px;line-height: 22px;">14-3</div>
+ <div id="loc-0101503" class="loc" style="top:482px; left:1136px; width:70px; height: 22px;line-height: 22px;">15-3</div>
+ <div id="loc-0101603" class="loc" style="top:482px; left:1208px; width:70px; height: 22px;line-height: 22px;">16-3</div>
+ <div id="loc-0101703" class="loc" style="top:482px; left:1280px; width:70px; height: 22px;line-height: 22px;">17-3</div>
+ <div id="loc-0101803" class="loc" style="top:482px; left:1352px; width:70px; height: 22px;line-height: 22px;">18-3</div>
+ </div>
+ <div class="">
+ <div id="loc-0100202" class="loc" style="top:506px; left:200px; width:70px; height: 22px;line-height: 22px;">2-2</div>
+ <div id="loc-0100302" class="loc" style="top:506px; left:272px; width:70px; height: 22px;line-height: 22px;">3-2</div>
+ <div id="loc-0100402" class="loc" style="top:506px; left:344px; width:70px; height: 22px;line-height: 22px;">4-2</div>
+ <div id="loc-0100502" class="loc" style="top:506px; left:416px; width:70px; height: 22px;line-height: 22px;">5-2</div>
+ <div id="loc-0100602" class="loc" style="top:506px; left:488px; width:70px; height: 22px;line-height: 22px;">6-2</div>
+ <div id="loc-0100702" class="loc" style="top:506px; left:560px; width:70px; height: 22px;line-height: 22px;">7-2</div>
+ <div id="loc-0100802" class="loc" style="top:506px; left:632px; width:70px; height: 22px;line-height: 22px;">8-2</div>
+ <div id="loc-0100902" class="loc" style="top:506px; left:704px; width:70px; height: 22px;line-height: 22px;">9-2</div>
+ <div id="loc-0101002" class="loc" style="top:506px; left:776px; width:70px; height: 22px;line-height: 22px;">10-2</div>
+ <div id="loc-0101102" class="loc" style="top:506px; left:848px; width:70px; height: 22px;line-height: 22px;">11-2</div>
+ <div id="loc-0101202" class="loc" style="top:506px; left:920px; width:70px; height: 22px;line-height: 22px;">12-2</div>
+ <div id="loc-0101302" class="loc" style="top:506px; left:992px; width:70px; height: 22px;line-height: 22px;">13-2</div>
+ <div id="loc-0101402" class="loc" style="top:506px; left:1064px; width:70px; height: 22px;line-height: 22px;">14-2</div>
+ <div id="loc-0101502" class="loc" style="top:506px; left:1136px; width:70px; height: 22px;line-height: 22px;">15-2</div>
+ <div id="loc-0101602" class="loc" style="top:506px; left:1208px; width:70px; height: 22px;line-height: 22px;">16-2</div>
+ <div id="loc-0101702" class="loc" style="top:506px; left:1280px; width:70px; height: 22px;line-height: 22px;">17-2</div>
+ <div id="loc-0101802" class="loc" style="top:506px; left:1352px; width:70px; height: 22px;line-height: 22px;">18-2</div>
+ </div>
+ <div class="">
+ <div id="loc-0100201" class="loc" style="top:530px; left:200px; width:70px; height: 22px;line-height: 22px;">2-1</div>
+ <div id="loc-0100301" class="loc" style="top:530px; left:272px; width:70px; height: 22px;line-height: 22px;">3-1</div>
+ <div id="loc-0100401" class="loc" style="top:530px; left:344px; width:70px; height: 22px;line-height: 22px;">4-1</div>
+ <div id="loc-0100501" class="loc" style="top:530px; left:416px; width:70px; height: 22px;line-height: 22px;">5-1</div>
+ <div id="loc-0100601" class="loc" style="top:530px; left:488px; width:70px; height: 22px;line-height: 22px;">6-1</div>
+ <div id="loc-0100701" class="loc" style="top:530px; left:560px; width:70px; height: 22px;line-height: 22px;">7-1</div>
+ <div id="loc-0100801" class="loc" style="top:530px; left:632px; width:70px; height: 22px;line-height: 22px;">8-1</div>
+ <div id="loc-0100901" class="loc" style="top:530px; left:704px; width:70px; height: 22px;line-height: 22px;">9-1</div>
+ <div id="loc-0101001" class="loc" style="top:530px; left:776px; width:70px; height: 22px;line-height: 22px;">10-1</div>
+ <div id="loc-0101101" class="loc" style="top:530px; left:848px; width:70px; height: 22px;line-height: 22px;">11-1</div>
+ <div id="loc-0101201" class="loc" style="top:530px; left:920px; width:70px; height: 22px;line-height: 22px;">12-1</div>
+ <div id="loc-0101301" class="loc" style="top:530px; left:992px; width:70px; height: 22px;line-height: 22px;">13-1</div>
+ <div id="loc-0101401" class="loc" style="top:530px; left:1064px; width:70px; height: 22px;line-height: 22px;">14-1</div>
+ <div id="loc-0101501" class="loc" style="top:530px; left:1136px; width:70px; height: 22px;line-height: 22px;">15-1</div>
+ <div id="loc-0101601" class="loc" style="top:530px; left:1208px; width:70px; height: 22px;line-height: 22px;">16-1</div>
+ <div id="loc-0101701" class="loc" style="top:530px; left:1280px; width:70px; height: 22px;line-height: 22px;">17-1</div>
+ <div id="loc-0101801" class="loc" style="top:530px; left:1352px; width:70px; height: 22px;line-height: 22px;">18-1</div>
+
+ <div class="rackDescs" id="lb_desc11" style="top:530px; left:1450px; width:150px;height: 23px;line-height: 23px">1鎺掕揣鏋朵晶瑙嗗浘</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">
@@ -202,6 +371,52 @@
</div>
<div class="form-item-input">
<input type="text" name="error" value="">
+ </div>
+ </div>
+ </form>
+ </div>
+
+ <!-- 搴撲綅寮圭獥 -->
+ <div id="locWindow" style="display: none;" class="animate__animated animate__fadeIn">
+ <div id="locWindow-head">
+ <div class='detailed'></div>
+ <button></button>
+ </div>
+ <form>
+ <!-- 搴撲綅鍙� -->
+ <div class="form-item">
+ <div class="form-item-label">
+ <span>搴撲綅鍙凤細</span>
+ </div>
+ <div class="form-item-input">
+ <input type="text" name="locNo" value="">
+ </div>
+ </div>
+ <!-- 浜у搧鍨嬪彿 -->
+ <div class="form-item">
+ <div class="form-item-label">
+ <span>浜у搧鍨嬪彿锛�</span>
+ </div>
+ <div class="form-item-input">
+ <input type="text" name="matnr" value="">
+ </div>
+ </div>
+ <!-- PACK鐮� -->
+ <div class="form-item">
+ <div class="form-item-label">
+ <span>PACK鐮侊細</span>
+ </div>
+ <div class="form-item-input">
+ <input type="text" name="zpallet" value="">
+ </div>
+ </div>
+ <!-- PACK鐘舵�� -->
+ <div class="form-item">
+ <div class="form-item-label">
+ <span>PACK鐘舵�侊細</span>
+ </div>
+ <div class="form-item-input">
+ <input type="text" name="packStatus" value="">
</div>
</div>
</form>
@@ -384,10 +599,13 @@
</script>
<script type="text/javascript">
// 寮圭獥绔欑偣淇℃伅
- $('.site').on('click', function () {
+ $('.site').on('click', function (e) {
var id = this.id.split("-")[1];
$("#siteWindow").attr("style", "display:block;");//鏄剧ずdiv
+ $("#siteWindow").css('left', e.pageX+20);
+ $("#siteWindow").css('top', e.pageY+20);
$("#crnWindow").attr("style", "display:none;");
+ $("#locWindow").attr("style", "display:none;");
$(".detailed").empty();
$('.detailed').append(id + '绔欑偣璇︾粏淇℃伅');
$.ajax({
@@ -414,10 +632,13 @@
});
// 鍫嗗灈鏈轰俊鎭�
- $('.machine').on('click', function () {
+ $('.machine').on('click', function (e) {
var id = this.id.split("-")[1];
$("#crnWindow").attr('style', 'display:block;');
+ $("#crnWindow").css('left', e.pageX+20);
+ $("#crnWindow").css('top', e.pageY+20);
$("#siteWindow").attr("style", "display:none;");
+ $("#locWindow").attr("style", "display:none;");
$('.detailed').empty();
$('.detailed').append(id + '鍙峰爢鍨涙満');
$.ajax({
@@ -443,10 +664,64 @@
})
})
+ // 鍫嗗灈鏈轰俊鎭�
+ $('.loc').on('click', function (e) {
+ var id = this.id.split("-")[1];
+ $.ajax({
+ url: baseUrl + "/console/loc/detail",
+ headers: {
+ 'token': localStorage.getItem('token')
+ },
+ data: {
+ locNo: id
+ },
+ method: 'post',
+ success: function (res) {
+ if (res.code === 200) {
+ $("#locWindow").attr('style', 'display:block;');
+ $("#locWindow").css('left', e.pageX+10);
+ $("#locWindow").css('top', e.pageY+10);
+ $("#siteWindow").attr("style", "display:none;");
+ $("#crnWindow").attr("style", "display:none;");
+ $('.detailed').empty();
+ $('.detailed').append('搴撲綅鍙凤細' + id );
+ for (var val in res.data) {
+ switch (res.data[val]) {
+ case "LOC_STAY_OVER" :
+ res.data[val] = "闈欑疆瀹屾垚"
+ break;
+ case "LOC_STAY" :
+ res.data[val] = "鍦ㄥ簱闈欑疆涓�"
+ break;
+ case "LOC_WAIT_TESTINT" :
+ res.data[val] = "鍦ㄥ簱寰呮祴"
+ break;
+ case "LOC_TESTING" :
+ res.data[val] = "鍦ㄥ簱娴嬭瘯涓�"
+ break;
+ case "LOC_ERROR" :
+ res.data[val] = "寮傚父鎶ヨ"
+ break;
+ case "LOC_EMPTY" :
+ res.data[val] = "绌哄簱浣�"
+ break;
+ }
+ var find = $("#locWindow").find(":input[name='" + val + "']");
+ find.val(res.data[val]);
+ }
+ }
+
+ }
+
+ })
+
+
+ })
// 寮圭獥鍏抽棴
$('button').on('click', function () {
$('#siteWindow').attr('style', 'display:none')
$('#crnWindow').attr('style', 'display:none')
+ $('#locWindow').attr('style', 'display:none')
})
@@ -462,6 +737,7 @@
getSystemRunningStatus();
getBarcodeInfo();
getScaleInfo();
+ getLocInfo();
// 瀹炴椂璁块棶
setInterval(function () {
getCrnInfo();
@@ -471,6 +747,7 @@
}, 1000);
setInterval(function () {
getSitesInfo();
+ getLocInfo();
}, 3000);
// 绯荤粺杩愯寮�鍏�
@@ -597,23 +874,10 @@
crns[i].bay = 1
}
// crnEl.animate({left: (crns[i].bay * unit) + 'px'}, 1000);
- // crns[i].bay = 1;
+ // crns[i].bay = 15;
- var offSet = 0;
- switch (i) {
- case 0:
- unit = 34;
- offSet = 337;
- break;
- case 1:
- unit = 68;
- offSet = 337;
- break;
- case 2:
- unit = 17;
- offSet = 337;
- break;
- }
+ unit = 45.9;
+ offSet = 360;
if(crns[i].bay === 1){
crnEl.animate({left: offSet + 'px'}, 1000);
@@ -674,6 +938,40 @@
}
});
}
+ function getInfo() {
+
+ }
+
+ // 搴撲綅瀹炴椂鏁版嵁鑾峰彇
+ 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].locNo);
+ siteEl.attr("class", "loc " + locs[i].packStatus);
+ // debugger
+ // 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) {
--
Gitblit v1.9.1