From 641b35ed84423990aad5cedeb5039ac98d163370 Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@163.com>
Date: 星期五, 11 九月 2020 13:46:59 +0800
Subject: [PATCH] #

---
 src/main/webapp/views/console.html |   62 +++++++++++++++---------------
 1 files changed, 31 insertions(+), 31 deletions(-)

diff --git a/src/main/webapp/views/console.html b/src/main/webapp/views/console.html
index fd024c3..cd971a3 100644
--- a/src/main/webapp/views/console.html
+++ b/src/main/webapp/views/console.html
@@ -16,7 +16,7 @@
     <style>
         /* layer 娣辫摑鑹叉寜閽慨鏀� */
         /*.layui-layer-lan .layui-layer-btn {*/
-            /*border-top: none;*/
+        /*border-top: none;*/
         /*}*/
         .layui-layer-lan .layui-layer-btn a {
             background: #4476A7;
@@ -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">
@@ -242,21 +242,21 @@
                 <input type="checkbox" name="loading" disabled="disabled" style="width: 1rem">
             </div>
         </div>
-         <div class="form-item" style="width: 20%">
-             <div class="form-item-label">
-                 <span>鑳藉叆</span>
-             </div>
-             <div class="form-item-input">
-                 <input type="checkbox" name="canining" disabled="disabled" style="width: 1rem">
-             </div>
-         </div>
-         <div class="form-item" style="width: 20%">
-             <div class="form-item-label">
-                 <span>鑳藉嚭</span>
-             </div>
-             <div class="form-item-input">
-                 <input type="checkbox" name="canouting" disabled="disabled" style="width: 1rem">
-             </div>
+        <div class="form-item" style="width: 20%">
+            <div class="form-item-label">
+                <span>鑳藉叆</span>
+            </div>
+            <div class="form-item-input">
+                <input type="checkbox" name="canining" disabled="disabled" style="width: 1rem">
+            </div>
+        </div>
+        <div class="form-item" style="width: 20%">
+            <div class="form-item-label">
+                <span>鑳藉嚭</span>
+            </div>
+            <div class="form-item-input">
+                <input type="checkbox" name="canouting" disabled="disabled" style="width: 1rem">
+            </div>
         </div>
 
         <!-- 绗笁琛� -->
@@ -457,7 +457,7 @@
                         parent.systemRunning = false;
                     }
                 } else if (res.code === 403){
-                    window.location.href = baseUrl+"/login";
+                    parent.location.href = baseUrl+"/login";
                 }  else {
                     alert(res.msg);
                 }
@@ -484,7 +484,7 @@
                         parent.systemRunning = false;
                     }
                 } else if (res.code === 403){
-                    window.location.href = baseUrl+"/login";
+                    parent.location.href = baseUrl+"/login";
                 }  else {
                     alert(res.msg);
                 }
@@ -511,7 +511,7 @@
                         }
                     }
                 } else if (res.code === 403){
-                    window.location.href = baseUrl+"/login";
+                    parent.location.href = baseUrl+"/login";
                 }  else {
                     alert(res.msg);
                 }
@@ -532,10 +532,10 @@
                         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 * 30) +'px'}, 1000);
+                        crnEl.animate({left: (crns[i].bay * ($('.item').eq(0).width()+4)) +'px'}, 1000);
                     }
                 } else if (res.code === 403){
-                    window.location.href = baseUrl+"/login";
+                    parent.location.href = baseUrl+"/login";
                 }  else {
                     alert(res.msg);
                 }
@@ -556,7 +556,7 @@
                         $("#code-decoder-data-"+barcodes[i].barcodeId).html(barcodes[i].codeValue);
                     }
                 } else if (res.code === 403){
-                    window.location.href = baseUrl+"/login";
+                    parent.location.href = baseUrl+"/login";
                 }  else {
                     alert(res.msg);
                 }
@@ -679,7 +679,7 @@
 
 
     // 鍙拌溅鐐瑰嚮浜嬩欢
-    $(document).on("click", ".car", function () {
+    $(document).on("click", ".item", function () {
         var value = prompt('鐩爣绔欙細', "1");
         if (value == null) {
             alert('涓嶈兘涓虹┖锛�');

--
Gitblit v1.9.1