From 85784d74c87c95d6f6994be691166dba3a3a32b6 Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@163.com>
Date: 星期二, 01 九月 2020 15:35:32 +0800
Subject: [PATCH] #

---
 src/main/webapp/views/console.html |   50 ++++++++++++++++++++++++--------------------------
 1 files changed, 24 insertions(+), 26 deletions(-)

diff --git a/src/main/webapp/views/console.html b/src/main/webapp/views/console.html
index b5f6220..4a38662 100644
--- a/src/main/webapp/views/console.html
+++ b/src/main/webapp/views/console.html
@@ -51,14 +51,14 @@
             <div class="tips-item">
                 <label>鍫嗗灈鏈虹姸鎬侀鑹�:&nbsp;</label>
                 <div class="item-group">
-                    <span class="machine-put">鍏ュ簱</span>
-                    <span class="machine-take">鍑哄簱</span>
-                    <span class="machine-stock-move">搴撳埌搴�</span>
-                    <span class="machine-site-move">绔欏埌绔�</span>
-                    <span class="machine-p-move">PToP</span>
-                    <span class="machine-error">寮傚父</span>
-                    <span class="machine-auto">鑷姩</span>
-                    <span class="machine-unauto">闈炶嚜鍔�/鎵嬪姩</span>
+                    <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="tips-item">
@@ -79,15 +79,16 @@
     <!----------- 宸ュ叿鏍� ---------->
     <!-- 鍏ュ簱鍙� -->
     <div class="cargo-put"></div>
-    <!-- 鎵爜鍣� -->
-    <div id="code-decoder-1" class="code-decoder">
-        <span id="code-decoder-data-1" class="code-decoder-data">0</span>
-    </div>
 
-    <!-- 鎵爜鍣� -->
-    <div id="code-decoder-2" class="code-decoder">
-        <span id="code-decoder-data-2" class="code-decoder-data">0</span>
-    </div>
+<!--    &lt;!&ndash; 鎵爜鍣� 1&ndash;&gt;-->
+<!--    <div id="code-decoder-1" class="code-decoder">-->
+<!--        <span id="code-decoder-data-1" class="code-decoder-data">0</span>-->
+<!--    </div>-->
+
+<!--    &lt;!&ndash; 鎵爜鍣� 2&ndash;&gt;-->
+<!--    <div id="code-decoder-2" class="code-decoder">-->
+<!--        <span id="code-decoder-data-2" class="code-decoder-data">0</span>-->
+<!--    </div>-->
 
 
     <!----------- 宸﹁緭閫佺嚎 ---------->
@@ -108,7 +109,6 @@
             <!-- 璐ф灦 -->
             <div class="stock-group">
                 <div id="site-2" class="site" style="">2</div>
-                <button class="item">1</button>
                 <button class="item">2</button>
                 <button class="item">3</button>
                 <button class="item">4</button>
@@ -169,7 +169,6 @@
             <!-- 璐ф灦 -->
             <div class="stock-group">
                 <div id="site-4" class="site" style="">4</div>
-                <button class="item">1</button>
                 <button class="item">2</button>
                 <button class="item">3</button>
                 <button class="item">4</button>
@@ -227,7 +226,6 @@
             <!-- 璐ф灦 -->
             <div class="stock-group">
                 <div id="site-6" class="site" style="">6</div>
-                <button class="item">1</button>
                 <button class="item">2</button>
                 <button class="item">3</button>
                 <button class="item">4</button>
@@ -288,7 +286,6 @@
             <!-- 璐ф灦 -->
             <div class="stock-group">
                 <div id="site-8" class="site" style="">8</div>
-                <button class="item">1</button>
                 <button class="item">2</button>
                 <button class="item">3</button>
                 <button class="item">4</button>
@@ -610,7 +607,7 @@
                 } else if (res.code === 403){
                     window.location.href = baseUrl+"/login";
                 }  else {
-                    alert(res.msg);
+                    console.log(res.msg);
                 }
             }
         });
@@ -637,7 +634,7 @@
                 } else if (res.code === 403){
                     window.location.href = baseUrl+"/login";
                 }  else {
-                    alert(res.msg);
+                    console.log(res.msg);
                 }
             }
         });
@@ -664,7 +661,7 @@
                 } else if (res.code === 403){
                     window.location.href = baseUrl+"/login";
                 }  else {
-                    alert(res.msg);
+                    console.log(res.msg);
                 }
             }
         });
@@ -683,12 +680,13 @@
                         var crnEl = $("#crn-"+crns[i].crnId);
                         crnEl.attr("class", "machine " + crns[i].crnStatus);
                         // crnAnimate(crns[i].crnId, crns[i].offset);
-                        crnEl.animate({left: (crns[i].bay * ($('.item').eq(0).width()+4)) +'px'}, 1000);
+                        var unit = $('.item').eq(0).width()+4;
+                        crnEl.animate({left: (crns[i].bay * unit + 20) +'px'}, 1000);
                     }
                 } else if (res.code === 403){
                     window.location.href = baseUrl+"/login";
                 }  else {
-                    alert(res.msg);
+                    console.log(res.msg);
                 }
             }
         });
@@ -709,7 +707,7 @@
                 } else if (res.code === 403){
                     window.location.href = baseUrl+"/login";
                 }  else {
-                    alert(res.msg);
+                    console.log(res.msg);
                 }
             }
         });

--
Gitblit v1.9.1