From 28a7821e43bd5763739fe67384cfea6693b3500b Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@163.com>
Date: 星期二, 08 九月 2020 13:19:26 +0800
Subject: [PATCH] Merge branches 'gdwcs' and 'jswcs' of https://gitee.com/luxiaotao1123/zy-wcs into jswcs

---
 src/main/webapp/views/console.html |   58 ++++++++++++++++++++++++++++------------------------------
 1 files changed, 28 insertions(+), 30 deletions(-)

diff --git a/src/main/webapp/views/console.html b/src/main/webapp/views/console.html
index 8ab9945..57c5e84 100644
--- a/src/main/webapp/views/console.html
+++ b/src/main/webapp/views/console.html
@@ -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);
                 }
             }
         });
@@ -662,9 +659,9 @@
                         }
                     }
                 } else if (res.code === 403){
-                    window.location.href = baseUrl+"/login";
+                    parent.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);
                 }
             }
         });
@@ -829,17 +827,17 @@
     }
 
 
-    // 鍙拌溅鐐瑰嚮浜嬩欢
-    $(document).on("click", ".item", function () {
-        var value = prompt('鐩爣绔欙細', "1");
-        if (value == null) {
-            alert('涓嶈兘涓虹┖锛�');
-        } else if (value === '') {
-            alert('涓嶈兘涓虹┖锛�');
-        } else {
-            carAnimate(8, Number(value));
-        }
-    })
+    // // 鍙拌溅鐐瑰嚮浜嬩欢
+    // $(document).on("click", ".item", function () {
+    //     var value = prompt('鐩爣绔欙細', "1");
+    //     if (value == null) {
+    //         alert('涓嶈兘涓虹┖锛�');
+    //     } else if (value === '') {
+    //         alert('涓嶈兘涓虹┖锛�');
+    //     } else {
+    //         carAnimate(8, Number(value));
+    //     }
+    // })
 
 </script>
 </html>
\ No newline at end of file

--
Gitblit v1.9.1