From 78f453c10dfb7856c3da390aa8a3912eed2eac25 Mon Sep 17 00:00:00 2001
From: whycq <whycq>
Date: 星期一, 11 七月 2022 11:11:12 +0800
Subject: [PATCH] # ycq

---
 src/main/webapp/views/console.html | 1204 ++++++++++++++++----------------------------------------
 1 files changed, 356 insertions(+), 848 deletions(-)

diff --git a/src/main/webapp/views/console.html b/src/main/webapp/views/console.html
index e6f6ac4..fde6b24 100644
--- a/src/main/webapp/views/console.html
+++ b/src/main/webapp/views/console.html
@@ -1,786 +1,344 @@
 <!DOCTYPE html>
-<html>
+<html lang="en">
 <head>
-    <meta charset="utf-8">
-    <title>WCS鎺у埗涓績</title>
-    <!--<link rel="stylesheet" type="text/css" href="../static/css/common.css">-->
-    <link rel="stylesheet" href="../static/css/console.css">
-    <!--		<link rel="stylesheet" type="text/css" href="../static/css/normalize.css">-->
-    <link rel="stylesheet" href="../static/css/animate.min.css">
-
-
+    <meta charset="UTF-8">
+    <title>鑷姩浠撳簱wcs绯荤粺</title>
+    <link rel="stylesheet" href="../static/css/render.css">
     <script src="../static/js/jquery/jquery-3.3.1.min.js"></script>
     <script src="../static/js/layer/layer.js"></script>
-    <script type="text/javascript" src="../static/js/common.js"></script>
+    <!--鍦板浘json-->
+    <script src="../static/js/console.map.js"></script>
+    <script src="../static/js/console.js"></script>
+    <script src="../static/js/common.js"></script>
+
 
 </head>
 <body>
-<div id="root">
-    <div class="head">
-        <div class="head-left">
-            <h1>鑷姩浠撳簱WCS鐩戞帶鍥�</h1>
-            <h6>AUTOMATIC WAREHOUSE WCS MONITORING DIAGRAM</h6>
+    <div id="main">
+        <div class="head">
+            <div class="head-left">
+                <h1>鑷姩浠撳簱WCS鐩戞帶鍥�</h1>
+                <h6>AUTOMATIC WAREHOUSE WCS MONITORING DIAGRAM</h6>
+            </div>
+            <div class="head-right">
+                <img src="../static/images/zy-logo.png" alt="涓壃" height="44" width="80">
+            </div>
         </div>
-        <div class="head-right">
-            <img src="../static/images/zy-logo.png" alt="涓壃" height="44" width="80">
+        <!-- 璐ф灦 + 鍫嗗灈鏈� + 鍏ュ簱绔欑偣 -->
+        <div class="main-part">
+
+        </div>
+        <div id="body">
+            <!-- 鎬诲紑鍏� -->
+            <div class="system-state">
+                <div class="body-head">鎬诲紑鍏�</div>
+                <div class="switch">
+                    <div id="system-icon" class="system-icon-open" onclick="systemSwitch()"></div>
+                    <div class="switch_r">
+                        <p>绯荤粺鐘舵��</p>
+                        <p id="system-run-desc">绯荤粺杩愯涓�</p>
+                    </div>
+                </div>
+            </div>
+            <!-- 鍫嗗灈鏈虹姸鎬� -->
+            <div class="machine-status">
+                <div class="body-head">鍫嗗灈鏈虹姸鎬�</div>
+                <div class="state">
+                    <span>鍫嗗灈鏈� 1</span>
+                    <span class="state-ss machine-put-flag	">鍏ュ簱</span>
+                </div>
+                <div class="state">
+                    <span>鍫嗗灈鏈� 2</span>
+                    <span class="state-ss machine-auto-flag	">鑷姩</span>
+
+                </div>
+                <div class="button"><span>鎵�鏈夌姸鎬�</span></div>
+                <div class="button item-group">
+                    <span class="machine-put-flag">鍏ュ簱</span>
+                    <span class="machine-take-flag">鍑哄簱</span>
+                    <span class="machine-stock-move-flag">搴撳埌搴�</span>
+                    <span class="machine-site-move-flag">绔欏埌绔�</span>
+                    <span class="machine-p-move-flag">PToP</span>
+                    <span class="machine-error-flag">寮傚父</span>
+                    <span class="machine-auto-flag">鑷姩</span>
+                    <span class="machine-unauto-flag">闈炶嚜鍔�/鎵嬪姩</span>
+                </div>
+            </div>
+            <div class="line-status">
+                <div class="body-head">杈撻�佺嚎鐘舵��</div>
+                <div class="state states">
+                    <span>杩愯緭绾挎�绘暟</span>
+                    <span id="line-total" class="line-ss"></span>
+                </div>
+                <div class="button"><span>鎵�鏈夌姸鎬�</span></div>
+                <div class="button item-group">
+                    <span class="site-auto-run-id">鑷姩+鏈夌墿+ID</span>
+                    <span class="site-auto-run">鑷姩+鏈夌墿</span>
+                    <span class="site-auto-id">鑷姩+ID</span>
+                    <span class="site-auto">鑷姩</span>
+                    <span class="site-unauto">闈炶嚜鍔�/鎵嬪姩</span>
+                </div>
+            </div>
+            <div class="bar-code">
+                <div class="body-head" id="code">鏉$爜鎵弿鍣�</div>
+                <div class="tablebox">
+                    <div class="table-head">
+                        <li><span>鏉$爜鍚嶇О</span><span class="right">鎵爜鏃堕棿</span></li>
+                    </div>
+                    <div id="barcode1" class="table-body">
+
+                    </div>
+                </div>
+                <div class="tablebox">
+                    <div class="table-head">
+                        <li><span>鏉$爜鍚嶇О</span><span class="right">鎵爜鏃堕棿</span></li>
+                    </div>
+                    <div id="barcode2" class="table-body">
+
+                    </div>
+                </div>
+                <div class="tablebox">
+                    <div class="table-head">
+                        <li><span>鏉$爜鍚嶇О</span><span class="right">鎵爜鏃堕棿</span></li>
+                    </div>
+                    <div id="barcode3" class="table-body">
+
+                    </div>
+                </div>
+            </div>
+        </div>
+        <!-- 鍫嗗灈鏈哄脊绐� -->
+        <div id="crnWindow" style="display: none;" class="animate__animated animate__fadeIn">
+            <div id="crnWindow-head">
+                <div class='detailed'></div>
+                <button></button>
+            </div>
+            <form>
+                <!-- 鍫嗗灈鏈哄彿 -->
+                <div class="form-item">
+                    <div class="form-item-label" style>
+                        <span>鍫嗗灈鏈哄彿锛�</span>
+                    </div>
+                    <div class="form-item-input">
+                        <input type="text" name="crnNo" value="">
+                    </div>
+                </div>
+                <!-- 宸ヤ綔鍙� -->
+                <div class="form-item">
+                    <div class="form-item-label">
+                        <span>宸ヤ綔鍙凤細</span>
+                    </div>
+                    <div class="form-item-input">
+                        <input type="text" name="workNo" value="">
+                    </div>
+                </div>
+                <!-- 绔欐簮 -->
+                <div class="form-item">
+                    <div class="form-item-label">
+                        <span>绔欐簮锛�</span>
+                    </div>
+                    <div class="form-item-input">
+                        <input type="text" name="sourceStaNo" value="">
+                    </div>
+                </div>
+                <!-- 鐩爣绔� -->
+                <div class="form-item">
+                    <div class="form-item-label">
+                        <span>鐩爣绔欙細</span>
+                    </div>
+                    <div class="form-item-input">
+                        <input type="text" name="staNo" value="">
+                    </div>
+                </div>
+                <!-- 宸ヤ綔鐘舵�� -->
+                <div class="form-item">
+                    <div class="form-item-label">
+                        <span>宸ヤ綔鐘舵�侊細</span>
+                    </div>
+                    <div class="form-item-input">
+                        <input type="text" name="wrkSts" value="">
+                    </div>
+                </div>
+                <!-- 鍑哄叆绫诲瀷 -->
+                <div class="form-item">
+                    <div class="form-item-label">
+                        <span>鍑哄叆绫诲瀷锛�</span>
+                    </div>
+                    <div class="form-item-input">
+                        <input type="text" name="ioType" value="">
+                    </div>
+                </div>
+                <!-- 婧愬簱浣� -->
+                <div class="form-item">
+                    <div class="form-item-label">
+                        <span>婧愬簱浣嶏細</span>
+                    </div>
+                    <div class="form-item-input">
+                        <input type="text" name="sourceLocNo" value="">
+                    </div>
+                </div>
+                <!-- 鐩爣搴撲綅 -->
+                <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="crnStatus" value="">
+                    </div>
+                </div>
+                <!-- 寮傚父 -->
+                <div class="form-item">
+                    <div class="form-item-label">
+                        <span>寮傚父锛�</span>
+                    </div>
+                    <div class="form-item-input">
+                        <input type="text" name="error" value="">
+                    </div>
+                </div>
+            </form>
+        </div>
+        <!-- 杈撻�佽澶囧脊绐� -->
+        <div id="siteWindow" style="display: none;" class="animate__animated animate__fadeIn">
+            <!-- 琛ㄥご -->
+            <div id="siteWindow-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="siteId" value="">
+                    </div>
+                </div>
+                <!-- 宸ヤ綔鍙� -->
+                <div class="form-item">
+                    <div class="form-item-label">
+                        <span>宸ヤ綔鍙凤細</span>
+                    </div>
+                    <div class="form-item-input">
+                        <input type="text" name="workNo" value="">
+                    </div>
+                </div>
+                <!-- 宸ヤ綔鐘舵�� -->
+                <div class="form-item">
+                    <div class="form-item-label">
+                        <span>宸ヤ綔鐘舵�侊細</span>
+                    </div>
+                    <div class="form-item-input">
+                        <input type="text" name="wrkSts" value="">
+                    </div>
+                </div>
+                <!-- 鑷姩 -->
+                <div class="form-item-checkbox">
+                    <div class="form-item-label-checkbox">
+                        <span>鑷姩</span>
+                    </div>
+                    <div class="form-item-input-checkbox">
+                        <input type="checkbox" name="autoing">
+                    </div>
+                </div>
+                <!-- 鏈夌墿 -->
+                <div class="form-item-checkbox">
+                    <div class="form-item-label-checkbox">
+                        <span>鏈夌墿</span>
+                    </div>
+                    <div class="form-item-input-checkbox">
+                        <input type="checkbox" name="loading">
+                    </div>
+                </div>
+                <!-- 鑳藉叆 -->
+                <div class="form-item-checkbox">
+                    <div class="form-item-label-checkbox">
+                        <span>鑳藉叆</span>
+                    </div>
+                    <div class="form-item-input-checkbox">
+                        <input type="checkbox" name="canining">
+                    </div>
+                </div>
+                <!-- 鑳藉嚭 -->
+                <div class="form-item-checkbox">
+                    <div class="form-item-label-checkbox">
+                        <span>鑳藉嚭</span>
+                    </div>
+                    <div class="form-item-input-checkbox">
+                        <input type="checkbox" name="canouting">
+                    </div>
+                </div>
+                <!-- 鍑哄叆绫诲瀷 -->
+                <div class="form-item">
+                    <div class="form-item-label">
+                        <span>鍑哄叆绫诲瀷锛�</span>
+                    </div>
+                    <div class="form-item-input">
+                        <input type="text" name="ioType" value="">
+                    </div>
+                </div>
+                <!-- 婧愮珯 -->
+                <div class="form-item">
+                    <div class="form-item-label">
+                        <span>婧愮珯锛�</span>
+                    </div>
+                    <div class="form-item-input">
+                        <input type="text" name="sourceStaNo" value="">
+                    </div>
+                </div>
+                <!-- 鐩爣绔� -->
+                <div class="form-item">
+                    <div class="form-item-label">
+                        <span>鐩爣绔欙細</span>
+                    </div>
+                    <div class="form-item-input">
+                        <input type="text" name="staNo" value="">
+                    </div>
+                </div>
+                <!-- 婧愬簱浣� -->
+                <div class="form-item">
+                    <div class="form-item-label">
+                        <span>婧愬簱浣嶏細</span>
+                    </div>
+                    <div class="form-item-input">
+                        <input type="text" name="sourceLocNo" value="">
+                    </div>
+                </div>
+                <!-- 鐩爣搴撲綅 -->
+                <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>
+
+            </form>
         </div>
     </div>
-
-    <!-- 璐ф灦 + 鍫嗗灈鏈� + 鍏ュ簱绔欑偣 -->
-    <div class="main-part">
-        <!-- 绗竴缁� -->
-        <div class="lane">
-            <!-- 璐ф灦 -->
-            <div class="stock-group">
-                <button class="item" style="margin-left: 82px">60</button>
-                <button class="item">58</button>
-                <button class="item">56</button>
-                <button class="item">54</button>
-                <button class="item">52</button>
-                <button class="item">50</button>
-                <button class="item">48</button>
-                <button class="item">46</button>
-                <button class="item">44</button>
-                <button class="item">42</button>
-                <button class="item">40</button>
-                <button class="item">38</button>
-                <button class="item">36</button>
-                <button class="item">34</button>
-                <button class="item">32</button>
-                <button class="item">30</button>
-                <button class="item">28</button>
-                <button class="item">26</button>
-                <button class="item">24</button>
-                <button class="item">22</button>
-                <button class="item">20</button>
-                <button class="item">18</button>
-                <button class="item">16</button>
-                <button class="item">14</button>
-                <button class="item">12</button>
-                <button class="item">10</button>
-                <button class="item">8</button>
-                <button class="item">6</button>
-                <button class="item">4</button>
-                <button class="item">2</button>
-
-
-            </div>
-            <div class="stock-group">
-
-                <button class="item" style="margin-left: 82px">60</button>
-                <button class="item">58</button>
-                <button class="item">56</button>
-                <button class="item">54</button>
-                <button class="item">52</button>
-                <button class="item">50</button>
-                <button class="item">48</button>
-                <button class="item">46</button>
-                <button class="item">44</button>
-                <button class="item">42</button>
-                <button class="item">40</button>
-                <button class="item">38</button>
-                <button class="item">36</button>
-                <button class="item">34</button>
-                <button class="item">32</button>
-                <button class="item">30</button>
-                <button class="item">28</button>
-                <button class="item">26</button>
-                <button class="item">24</button>
-                <button class="item">22</button>
-                <button class="item">20</button>
-                <button class="item">18</button>
-                <button class="item">16</button>
-                <button class="item">14</button>
-                <button class="item">12</button>
-                <button class="item">10</button>
-                <button class="item">8</button>
-                <button class="item">6</button>
-                <button class="item">4</button>
-                <button class="item">2</button>
-                <div id="site-101" class="site" style="">101</div>
-            </div>
-            <!-- 鍫嗗灈鏈� -->
-            <div class="crn">
-                <hr class="pathway">
-                <div id="crn-1" class="machine"></div>
-            </div>
-            <!-- 璐ф灦 -->
-            <div class="stock-group">
-
-                <button class="item" style="margin-left: 82px">60</button>
-                <button class="item">58</button>
-                <button class="item">56</button>
-                <button class="item">54</button>
-                <button class="item">52</button>
-                <button class="item">50</button>
-                <button class="item">48</button>
-                <button class="item">46</button>
-                <button class="item">44</button>
-                <button class="item">42</button>
-                <button class="item">40</button>
-                <button class="item">38</button>
-                <button class="item">36</button>
-                <button class="item">34</button>
-                <button class="item">32</button>
-                <button class="item">30</button>
-                <button class="item">28</button>
-                <button class="item">26</button>
-                <button class="item">24</button>
-                <button class="item">22</button>
-                <button class="item">20</button>
-                <button class="item">18</button>
-                <button class="item">16</button>
-                <button class="item">14</button>
-                <button class="item">12</button>
-                <button class="item">10</button>
-                <button class="item">8</button>
-                <button class="item">6</button>
-                <button class="item">4</button>
-                <button class="item">2</button>
-                <div id="site-106" class="site" style="">106</div>
-            </div>
-            <div class="stock-group">
-                <button class="item" style="margin-left: 82px">60</button>
-                <button class="item">58</button>
-                <button class="item">56</button>
-                <button class="item">54</button>
-                <button class="item">52</button>
-                <button class="item">50</button>
-                <button class="item">48</button>
-                <button class="item">46</button>
-                <button class="item">44</button>
-                <button class="item">42</button>
-                <button class="item">40</button>
-                <button class="item">38</button>
-                <button class="item">36</button>
-                <button class="item">34</button>
-                <button class="item">32</button>
-                <button class="item">30</button>
-                <button class="item">28</button>
-                <button class="item">26</button>
-                <button class="item">24</button>
-                <button class="item">22</button>
-                <button class="item">20</button>
-                <button class="item">18</button>
-                <button class="item">16</button>
-                <button class="item">14</button>
-                <button class="item">12</button>
-                <button class="item">10</button>
-                <button class="item">8</button>
-                <button class="item">6</button>
-                <button class="item">4</button>
-                <button class="item">2</button>
-            </div>
-        </div>
-        <!-- 绗簩缁� -->
-        <div class="lane">
-            <span class="row-no"></span>
-            <!-- 璐ф灦 -->
-            <div class="stock-group">
-                <button class="item" style="margin-left: 193px">52</button>
-                <button class="item">50</button>
-                <button class="item">48</button>
-                <button class="item">46</button>
-                <button class="item">44</button>
-                <button class="item">42</button>
-                <button class="item">40</button>
-                <button class="item">38</button>
-                <button class="item">36</button>
-                <button class="item">34</button>
-                <button class="item">32</button>
-                <button class="item">30</button>
-                <button class="item">28</button>
-                <button class="item">26</button>
-                <button class="item">24</button>
-                <button class="item">22</button>
-                <button class="item">20</button>
-                <button class="item">18</button>
-                <button class="item">16</button>
-                <button class="item">14</button>
-                <button class="item">12</button>
-                <button class="item">10</button>
-                <button class="item">8</button>
-                <button class="item">6</button>
-                <button class="item">4</button>
-                <button class="item">2</button>
-            </div>
-            <div class="stock-group">
-
-                <button class="item" style="margin-left: 193px">52</button>
-                <button class="item">50</button>
-                <button class="item">48</button>
-                <button class="item">46</button>
-                <button class="item">44</button>
-                <button class="item">42</button>
-                <button class="item">40</button>
-                <button class="item">38</button>
-                <button class="item">36</button>
-                <button class="item">34</button>
-                <button class="item">32</button>
-                <button class="item">30</button>
-                <button class="item">28</button>
-                <button class="item">26</button>
-                <button class="item">24</button>
-                <button class="item">22</button>
-                <button class="item">20</button>
-                <button class="item">18</button>
-                <button class="item">16</button>
-                <button class="item">14</button>
-                <button class="item">12</button>
-                <button class="item">10</button>
-                <button class="item">8</button>
-                <button class="item">6</button>
-                <button class="item">4</button>
-                <button class="item">2</button>
-                <div id="site-113" class="site" style="">113</div>
-            </div>
-            <!-- 鍫嗗灈鏈� -->
-            <div class="crn" style="margin-left: 108px">
-                <hr class="pathway">
-                <div id="crn-2" class="machine"></div>
-            </div>
-            <!-- 璐ф灦 -->
-            <div class="stock-group">
-                <button class="item" style="margin-left: 193px">52</button>
-                <button class="item">50</button>
-                <button class="item">48</button>
-                <button class="item">46</button>
-                <button class="item">44</button>
-                <button class="item">42</button>
-                <button class="item">40</button>
-                <button class="item">38</button>
-                <button class="item">36</button>
-                <button class="item">34</button>
-                <button class="item">32</button>
-                <button class="item">30</button>
-                <button class="item">28</button>
-                <button class="item">26</button>
-                <button class="item">24</button>
-                <button class="item">22</button>
-                <button class="item">20</button>
-                <button class="item">18</button>
-                <button class="item">16</button>
-                <button class="item">14</button>
-                <button class="item">12</button>
-                <button class="item">10</button>
-                <button class="item">8</button>
-                <button class="item">6</button>
-                <button class="item">4</button>
-                <button class="item">2</button>
-                <div id="site-120" class="site" style="">120</div>
-
-            </div>
-            <div class="stock-group">
-
-                <button class="item" style="margin-left: 193px">52</button>
-                <button class="item">50</button>
-                <button class="item">48</button>
-                <button class="item">46</button>
-                <button class="item">44</button>
-                <button class="item">42</button>
-                <button class="item">40</button>
-                <button class="item">38</button>
-                <button class="item">36</button>
-                <button class="item">34</button>
-                <button class="item">32</button>
-                <button class="item">30</button>
-                <button class="item">28</button>
-                <button class="item">26</button>
-                <button class="item">24</button>
-                <button class="item">22</button>
-                <button class="item">20</button>
-                <button class="item">18</button>
-                <button class="item">16</button>
-                <button class="item">14</button>
-                <button class="item">12</button>
-                <button class="item">10</button>
-                <button class="item">8</button>
-                <button class="item">6</button>
-                <button class="item">4</button>
-                <button class="item">2</button>
-            </div>
-        </div>
-        <!--绗笁缁�-->
-        <div class="lane">
-            <span class="row-no"></span>
-            <!-- 璐ф灦 -->
-            <div class="stock-group">
-                <button class="item" style="margin-left: 193px">52</button>
-                <button class="item">50</button>
-                <button class="item">48</button>
-                <button class="item">46</button>
-                <button class="item">44</button>
-                <button class="item">42</button>
-                <button class="item">40</button>
-                <button class="item">38</button>
-                <button class="item">36</button>
-                <button class="item">34</button>
-                <button class="item">32</button>
-                <button class="item">30</button>
-                <button class="item">28</button>
-                <button class="item">26</button>
-                <button class="item">24</button>
-                <button class="item">22</button>
-                <button class="item">20</button>
-                <button class="item">18</button>
-                <button class="item">16</button>
-                <button class="item">14</button>
-                <button class="item">12</button>
-                <button class="item">10</button>
-                <button class="item">8</button>
-                <button class="item">6</button>
-                <button class="item">4</button>
-                <button class="item">2</button>
-            </div>
-            <div class="stock-group">
-                <button class="item" style="margin-left: 193px">52</button>
-                <button class="item">50</button>
-                <button class="item">48</button>
-                <button class="item">46</button>
-                <button class="item">44</button>
-                <button class="item">42</button>
-                <button class="item">40</button>
-                <button class="item">38</button>
-                <button class="item">36</button>
-                <button class="item">34</button>
-                <button class="item">32</button>
-                <button class="item">30</button>
-                <button class="item">28</button>
-                <button class="item">26</button>
-                <button class="item">24</button>
-                <button class="item">22</button>
-                <button class="item">20</button>
-                <button class="item">18</button>
-                <button class="item">16</button>
-                <button class="item">14</button>
-                <button class="item">12</button>
-                <button class="item">10</button>
-                <button class="item">8</button>
-                <button class="item">6</button>
-                <button class="item">4</button>
-                <button class="item">2</button>
-                <div id="site-127" class="site" style="">127</div>
-
-            </div>
-            <!-- 鍫嗗灈鏈� -->
-            <div class="crn" style="margin-left: 108px">
-                <hr class="pathway">
-                <div id="crn-3" class="machine"></div>
-            </div>
-            <!-- 璐ф灦 -->
-            <div class="stock-group">
-                <button class="item" style="margin-left: 193px">52</button>
-                <button class="item">50</button>
-                <button class="item">48</button>
-                <button class="item">46</button>
-                <button class="item">44</button>
-                <button class="item">42</button>
-                <button class="item">40</button>
-                <button class="item">38</button>
-                <button class="item">36</button>
-                <button class="item">34</button>
-                <button class="item">32</button>
-                <button class="item">30</button>
-                <button class="item">28</button>
-                <button class="item">26</button>
-                <button class="item">24</button>
-                <button class="item">22</button>
-                <button class="item">20</button>
-                <button class="item">18</button>
-                <button class="item">16</button>
-                <button class="item">14</button>
-                <button class="item">12</button>
-                <button class="item">10</button>
-                <button class="item">8</button>
-                <button class="item">6</button>
-                <button class="item">4</button>
-                <button class="item">2</button>
-                <div id="site-133" class="site" style="">133</div>
-
-            </div>
-            <div class="stock-group">
-                <button class="item" style="margin-left: 193px">52</button>
-                <button class="item">50</button>
-                <button class="item">48</button>
-                <button class="item">46</button>
-                <button class="item">44</button>
-                <button class="item">42</button>
-                <button class="item">40</button>
-                <button class="item">38</button>
-                <button class="item">36</button>
-                <button class="item">34</button>
-                <button class="item">32</button>
-                <button class="item">30</button>
-                <button class="item">28</button>
-                <button class="item">26</button>
-                <button class="item">24</button>
-                <button class="item">22</button>
-                <button class="item">20</button>
-                <button class="item">18</button>
-                <button class="item">16</button>
-                <button class="item">14</button>
-                <button class="item">12</button>
-                <button class="item">10</button>
-                <button class="item">8</button>
-                <button class="item">6</button>
-                <button class="item">4</button>
-                <button class="item">2</button>
-            </div>
-        </div>
-    </div>
-    <!--绗�1鍒楋紙瀹藉害 70px锛� -->
-    <div class="site-row site-row-1">
-        <div class="site-k" style="height:39px;width:70px;"></div>
-        <div id="site-102" class="site" style="height: 18px;line-height: 18px;">102</div>
-        <div id="site-107" class="site" style="height: 18px;line-height: 18px;margin-top: 20px">107</div>
-        <div id="site-114" class="site" style="height: 18px;line-height: 18px;margin-top: 68px">114</div>
-        <div id="site-121" class="site" style="height: 18px;line-height: 18px;margin-top: 20px">121</div>
-        <div id="site-128" class="site" style="height: 18px;line-height: 18px;margin-top: 68px">128</div>
-        <div id="site-134" class="site" style="height: 18px;line-height: 18px;margin-top: 20px">134</div>
-    </div>
-    <div class="site-row site-row-2">
-        <div class="site-k" style="height:39px;width:70px;"></div>
-        <div id="site-103" class="site" style="height: 18px;line-height: 18px;">103</div>
-        <div id="site-105" class="site" style="height: 18px;line-height: 18px">105</div>
-        <div id="site-108" class="site" style="height: 18px;line-height: 18px">108</div>
-        <div id="site-111" class="site" style="height: 66px;line-height: 66px">111</div>
-        <div id="site-115" class="site" style="height: 18px;line-height: 18px">115</div>
-        <div id="site-118" class="site" style="height: 18px;line-height: 18px">118</div>
-        <div id="site-122" class="site" style="height: 18px;line-height: 18px">122</div>
-        <div id="site-125" class="site" style="height: 66px;line-height: 66px">125</div>
-        <div id="site-129" class="site" style="height: 18px;line-height: 18px">129</div>
-        <div id="site-132" class="site" style="height: 18px;line-height: 18px">132</div>
-        <div id="site-135" class="site" style="height: 18px;line-height: 18px">135</div>
-    </div>
-    <div class="site-row site-row-3">
-        <div class="site-k" style="height:39px;width:70px;"></div>
-        <div id="site-104" class="site" style="height: 18px;line-height: 18px;width:162px;">104</div>
-        <div id="site-109" class="site" style="height: 18px;line-height: 18px; margin-top: 20px">109</div>
-        <div id="site-112" class="site" style="height: 66px;line-height: 68px">112</div>
-        <div id="site-116" class="site" style="height: 18px;line-height: 18px;">116</div>
-        <div id="site-119" class="site" style="height: 18px;line-height: 18px">119</div>
-        <div id="site-123" class="site" style="height: 18px;line-height: 18px">123</div>
-        <div id="site-126" class="site" style="height: 66px;line-height: 68px">126</div>
-        <div id="site-130" class="site" style="height: 18px;line-height: 18px">130</div>
-        <div id="site-136" class="site" style="height: 18px;line-height: 18px;width:162px; margin-top: 20px">136</div>
-    </div>
-    <div class="site-row site-row-4">
-        <div id="site-110" class="site" style="height: 18px;line-height: 18px;">110</div>
-        <div id="site-117" class="site" style="height: 18px;line-height: 18px; margin-top: 68px">117</div>
-        <div id="site-124" class="site" style="height: 18px;line-height: 18px; margin-top: 20px">124</div>
-        <div id="site-131" class="site" style="height: 18px;line-height: 18px; margin-top: 68px">131</div>
-    </div>
-</div>
-<!--搴曢儴-->
-<div id="body">
-    <!-- 鎬诲紑鍏� -->
-    <div class="system-state">
-        <div class="body-head">鎬诲紑鍏�</div>
-        <div class="switch">
-            <div id="system-icon" class="system-icon-open" onclick="systemSwitch()"></div>
-            <div class="switch_r">
-                <p>绯荤粺鐘舵��</p>
-                <p id="system-run-desc">绯荤粺杩愯涓�</p>
-            </div>
-        </div>
-    </div>
-    <!-- 鍫嗗灈鏈虹姸鎬� -->
-    <div class="machine-status">
-        <div class="body-head">鍫嗗灈鏈虹姸鎬�</div>
-        <div class="state">
-            <span>鍫嗗灈鏈� 1</span>
-            <span class="state-ss machine-put-flag	">鍏ュ簱</span>
-        </div>
-        <div class="state">
-            <span>鍫嗗灈鏈� 2</span>
-            <span class="state-ss machine-auto-flag	">鑷姩</span>
-
-        </div>
-        <div class="button"><span>鎵�鏈夌姸鎬�</span></div>
-        <div class="button item-group">
-            <span class="machine-put-flag">鍏ュ簱</span>
-            <span class="machine-take-flag">鍑哄簱</span>
-            <span class="machine-stock-move-flag">搴撳埌搴�</span>
-            <span class="machine-site-move-flag">绔欏埌绔�</span>
-            <span class="machine-p-move-flag">PToP</span>
-            <span class="machine-error-flag">寮傚父</span>
-            <span class="machine-auto-flag">鑷姩</span>
-            <span class="machine-unauto-flag">闈炶嚜鍔�/鎵嬪姩</span>
-        </div>
-    </div>
-    <div class="line-status">
-        <div class="body-head">杈撻�佺嚎鐘舵��</div>
-        <div class="state states">
-            <span>杩愯緭绾挎�绘暟</span>
-            <span class="line-ss">58</span>
-        </div>
-        <div class="button"><span>鎵�鏈夌姸鎬�</span></div>
-        <div class="button item-group">
-            <span class="site-auto-run-id">鑷姩+鏈夌墿+ID</span>
-            <span class="site-auto-run">鑷姩+鏈夌墿</span>
-            <span class="site-auto-id">鑷姩+ID</span>
-            <span class="site-auto">鑷姩</span>
-            <span class="site-unauto">闈炶嚜鍔�/鎵嬪姩</span>
-        </div>
-    </div>
-    <div class="bar-code">
-        <div class="body-head" id="code">鏉$爜鎵弿鍣�</div>
-        <div class="tablebox">
-            <div class="table-head">
-                <li><span>鏉$爜鍚嶇О</span><span class="right">鎵爜鏃堕棿</span></li>
-            </div>
-            <div id="barcode1" class="table-body">
-
-            </div>
-        </div>
-        <div class="tablebox">
-            <div class="table-head">
-                <li><span>鏉$爜鍚嶇О</span><span class="right">鎵爜鏃堕棿</span></li>
-            </div>
-            <div id="barcode2" class="table-body">
-
-            </div>
-        </div>
-        <div class="tablebox">
-            <div class="table-head">
-                <li><span>鏉$爜鍚嶇О</span><span class="right">鎵爜鏃堕棿</span></li>
-            </div>
-            <div id="barcode3" class="table-body">
-
-            </div>
-        </div>
-    </div>
-</div>
-<!-- 鍫嗗灈鏈哄脊绐� -->
-<div id="crnWindow" style="display: none;" class="animate__animated animate__fadeIn">
-    <div id="crnWindow-head">
-        <div class='detailed'></div>
-        <button></button>
-    </div>
-    <form>
-        <!-- 鍫嗗灈鏈哄彿 -->
-        <div class="form-item">
-            <div class="form-item-label" style>
-                <span>鍫嗗灈鏈哄彿锛�</span>
-            </div>
-            <div class="form-item-input">
-                <input type="text" name="crnNo" value="">
-            </div>
-        </div>
-        <!-- 宸ヤ綔鍙� -->
-        <div class="form-item">
-            <div class="form-item-label">
-                <span>宸ヤ綔鍙凤細</span>
-            </div>
-            <div class="form-item-input">
-                <input type="text" name="workNo" value="">
-            </div>
-        </div>
-        <!-- 绔欐簮 -->
-        <div class="form-item">
-            <div class="form-item-label">
-                <span>绔欐簮锛�</span>
-            </div>
-            <div class="form-item-input">
-                <input type="text" name="sourceStaNo" value="">
-            </div>
-        </div>
-        <!-- 鐩爣绔� -->
-        <div class="form-item">
-            <div class="form-item-label">
-                <span>鐩爣绔欙細</span>
-            </div>
-            <div class="form-item-input">
-                <input type="text" name="staNo" value="">
-            </div>
-        </div>
-        <!-- 宸ヤ綔鐘舵�� -->
-        <div class="form-item">
-            <div class="form-item-label">
-                <span>宸ヤ綔鐘舵�侊細</span>
-            </div>
-            <div class="form-item-input">
-                <input type="text" name="wrkSts" value="">
-            </div>
-        </div>
-        <!-- 鍑哄叆绫诲瀷 -->
-        <div class="form-item">
-            <div class="form-item-label">
-                <span>鍑哄叆绫诲瀷锛�</span>
-            </div>
-            <div class="form-item-input">
-                <input type="text" name="ioType" value="">
-            </div>
-        </div>
-        <!-- 婧愬簱浣� -->
-        <div class="form-item">
-            <div class="form-item-label">
-                <span>婧愬簱浣嶏細</span>
-            </div>
-            <div class="form-item-input">
-                <input type="text" name="sourceLocNo" value="">
-            </div>
-        </div>
-        <!-- 鐩爣搴撲綅 -->
-        <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="crnStatus" value="">
-            </div>
-        </div>
-        <!-- 寮傚父 -->
-        <div class="form-item">
-            <div class="form-item-label">
-                <span>寮傚父锛�</span>
-            </div>
-            <div class="form-item-input">
-                <input type="text" name="error" value="">
-            </div>
-        </div>
-    </form>
-</div>
-<!-- 杈撻�佽澶囧脊绐� -->
-<div id="siteWindow" style="display: none;" class="animate__animated animate__fadeIn">
-    <!-- 琛ㄥご -->
-    <div id="siteWindow-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="siteId" value="">
-            </div>
-        </div>
-        <!-- 宸ヤ綔鍙� -->
-        <div class="form-item">
-            <div class="form-item-label">
-                <span>宸ヤ綔鍙凤細</span>
-            </div>
-            <div class="form-item-input">
-                <input type="text" name="workNo" value="">
-            </div>
-        </div>
-        <!-- 宸ヤ綔鐘舵�� -->
-        <div class="form-item">
-            <div class="form-item-label">
-                <span>宸ヤ綔鐘舵�侊細</span>
-            </div>
-            <div class="form-item-input">
-                <input type="text" name="wrkSts" value="">
-            </div>
-        </div>
-        <!-- 鑷姩 -->
-        <div class="form-item-checkbox">
-            <div class="form-item-label-checkbox">
-                <span>鑷姩</span>
-            </div>
-            <div class="form-item-input-checkbox">
-                <input type="checkbox" name="autoing">
-            </div>
-        </div>
-        <!-- 鏈夌墿 -->
-        <div class="form-item-checkbox">
-            <div class="form-item-label-checkbox">
-                <span>鏈夌墿</span>
-            </div>
-            <div class="form-item-input-checkbox">
-                <input type="checkbox" name="loading">
-            </div>
-        </div>
-        <!-- 鑳藉叆 -->
-        <div class="form-item-checkbox">
-            <div class="form-item-label-checkbox">
-                <span>鑳藉叆</span>
-            </div>
-            <div class="form-item-input-checkbox">
-                <input type="checkbox" name="canining">
-            </div>
-        </div>
-        <!-- 鑳藉嚭 -->
-        <div class="form-item-checkbox">
-            <div class="form-item-label-checkbox">
-                <span>鑳藉嚭</span>
-            </div>
-            <div class="form-item-input-checkbox">
-                <input type="checkbox" name="canouting">
-            </div>
-        </div>
-        <!-- 鍑哄叆绫诲瀷 -->
-        <div class="form-item">
-            <div class="form-item-label">
-                <span>鍑哄叆绫诲瀷锛�</span>
-            </div>
-            <div class="form-item-input">
-                <input type="text" name="ioType" value="">
-            </div>
-        </div>
-        <!-- 婧愮珯 -->
-        <div class="form-item">
-            <div class="form-item-label">
-                <span>婧愮珯锛�</span>
-            </div>
-            <div class="form-item-input">
-                <input type="text" name="sourceStaNo" value="">
-            </div>
-        </div>
-        <!-- 鐩爣绔� -->
-        <div class="form-item">
-            <div class="form-item-label">
-                <span>鐩爣绔欙細</span>
-            </div>
-            <div class="form-item-input">
-                <input type="text" name="staNo" value="">
-            </div>
-        </div>
-        <!-- 婧愬簱浣� -->
-        <div class="form-item">
-            <div class="form-item-label">
-                <span>婧愬簱浣嶏細</span>
-            </div>
-            <div class="form-item-input">
-                <input type="text" name="sourceLocNo" value="">
-            </div>
-        </div>
-        <!-- 鐩爣搴撲綅 -->
-        <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>
-
-    </form>
-</div>
-
-</div>
-
 
 </body>
+
 </html>
 <script>
-    var tData = []
-    var tData1 = []
-    var tData2 = []
-    var tData3 = []
-
+    getMap();
+</script>
+<script>
+    setInterval(function () {
+        getCodeData();
+        renderBarCode();
+    }, 1000)
+    var tData = [],tData1 = [],tData2 = [],tData3 = [];
     function getCodeData() {
         $.ajax({
             url: baseUrl + '/console/barcode/output/site',
@@ -804,19 +362,11 @@
                         tData1 = tData.slice(-15)
                         tData2 = tData.slice(-10)
                         tData3 = tData.slice(-5)
-
                     }
                 }
             }
         })
     }
-
-    setInterval(function () {
-        getCodeData();
-        renderBarCode();
-    }, 1000)
-
-
     function renderBarCode() {
         for (var i = 0; i < tData1.length; i++) {
             var str1 = '<li><span>' + tData1[i].barcode + '</span><span class="right">' + tData1[i].time + '</span></li>'
@@ -1036,16 +586,41 @@
             headers: {'token': localStorage.getItem('token')},
             method: 'POST',
             success: function (res) {
+                // console.log(res)
                 if (res.code === 200) {
                     var crns = res.data;
                     for (var i = 0; i < crns.length; i++) {
                         var crnEl = $("#crn-" + crns[i].crnId);
                         crnEl.attr("class", "machine " + crns[i].crnStatus);
-                        var unit = ($('.item').eq(0).width() + 13) / 2;
+                        var unit = 0;//($('.item').eq(0).width() + 13) / 2;
                         if (crns[i].bay < 0) {
-                            crns[i].bay = 0
+                            crns[i].bay = 1
                         }
-                        crnEl.animate({left: (crns[i].bay * unit) + 'px'}, 1000);
+                        // crnEl.animate({left: (crns[i].bay * unit) + 'px'}, 1000);
+                        // crns[i].bay = 1;
+
+                        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;
+                        }
+
+                        if(crns[i].bay === 1){
+                            crnEl.animate({left: offSet + 'px'}, 1000);
+                        } else {
+                            crnEl.animate({left: (offSet - unit + (crns[i].bay * unit)) + 'px'}, 1000);
+                        }
+
                     }
                 } else if (res.code === 403) {
                     parent.location.href = baseUrl + "/login";
@@ -1102,6 +677,7 @@
 
     // 鍫嗗灈鏈哄亸绉诲姩鐢�
     function crnAnimate(id, leftVal) {
+        // console.log(crn1Position)
         switch (id) {
             case 1:
                 $("#crn-1").animate({left: leftVal + 'px'}, 1000);
@@ -1127,74 +703,6 @@
                 break
         }
     }
-
-    // 椤甸潰鐐瑰嚮浜嬩欢鐩戝惉 ---------------------------------------------------------
-
-    // 杈撻�佽澶囩偣鍑讳簨浠�
-    // $('.site').on('click', function () {
-    // 	var id = this.id.split("-")[1];
-    // 	if (id === undefined) {
-    // 		return;
-    // 	}
-    // 	layer.open({
-    // 		title: id + " 绔欑偣淇℃伅璇︽儏",
-    // 		closeBtn: 0,
-    // 		skin: 'layui-layer-lan',
-    // 		offset: '180px',
-    // 		type: 1,
-    // 		shadeClose: true,
-    // 		content: $('#siteWindow'),
-    // 		area: ['35rem', '18rem'],
-    // 		btn: ['纭畾', '鍏抽棴'],
-    // 		success: function(layero, index){
-    // 			http.post(baseUrl+"/console/site/detail", {siteId: id}, function (res) {
-    // 				for (var val in res.data) {
-    // 					var find = $("#siteWindow").find(":input[name='" + val + "']");
-    // 					if (find[0].type==='text') {
-    // 						find.val(res.data[val]);
-    // 					} else if (find[0].type === 'checkbox') {
-    // 						find.attr("checked", res.data[val] === 'Y');
-    // 					}
-    // 				}
-    // 			})
-    // 		},
-    // 		end: function () {
-    // 			$(':input', $("#siteWindow")).val('').removeAttr('checked').removeAttr('selected');
-    // 		}
-    // 	});
-    // });
-
-    // 鍫嗗灈鏈虹偣鍑讳簨浠�
-    // $('.machine').on('click', function () {
-    // 	var id = this.id.split("-")[1];
-    // 	layer.open({
-    // 		title: id+"鍙峰爢鍨涙満",
-    // 		skin: 'layui-layer-lan',
-    // 		closeBtn: 0,
-    // 		type: 1,
-    // 		offset: '150px',
-    // 		shadeClose: true,
-    // 		content: $("#crnWindow"),
-    // 		area: ['40rem', '20rem'],
-    // 		btn: ['纭畾', '鍏抽棴'],
-    // 		success: function(layero, index){
-    // 			http.post(baseUrl+"/console/crn/detail", {crnNo: id}, function (res) {
-    // 				for (var val in res.data) {
-    // 					var find = $("#crnWindow").find(":input[name='" + val + "']");
-    // 					if (find[0].type==='text') {
-    // 						find.val(res.data[val]);
-    // 					} else if (find[0].type === 'checkbox') {
-    // 						find.attr("checked", res.data[val] === 'Y');
-    // 					}
-    // 				}
-    // 			})
-    // 		},
-    // 		end: function () {
-    // 			$(':input', $("#crnWindow")).val('').removeAttr('checked').removeAttr('selected');
-    // 		}
-    // 	});
-    // });
-
 
     // 灏忚溅鍋忕Щ鍔ㄧ敾
     function carAnimate(id, target) {

--
Gitblit v1.9.1