From 991581410c848c8328e5c058c7aa9c859c1a8d96 Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@163.com>
Date: 星期一, 17 八月 2020 16:14:45 +0800
Subject: [PATCH] #

---
 src/main/webapp/views/console.html |   25 ++++++++++++++++---------
 1 files changed, 16 insertions(+), 9 deletions(-)

diff --git a/src/main/webapp/views/console.html b/src/main/webapp/views/console.html
index 2124b17..5514d63 100644
--- a/src/main/webapp/views/console.html
+++ b/src/main/webapp/views/console.html
@@ -183,6 +183,7 @@
                 <button class="item">34</button>
                 <div class="site site-none">&nbsp;&nbsp;&nbsp;&nbsp;</div>
             </div>
+            <span class="row-no">2#</span>
         </div>
     </div>
 </main>
@@ -197,7 +198,7 @@
                 <span>璁惧鍙�</span>
             </div>
             <div class="form-item-input">
-                <input type="text" name="devpNo" value="" disabled="disabled" style="width: 4rem">
+                <input type="text" name="siteId" value="" disabled="disabled" style="width: 4rem">
             </div>
         </div>
         <div class="form-item" style="width: 25%">
@@ -213,7 +214,7 @@
                 <span>宸ヤ綔鐘舵��</span>
             </div>
             <div class="form-item-input">
-                <input type="text" name="workStatus" value="" disabled="disabled" style="width: 10rem">
+                <input type="text" name="wrkSts" value="" disabled="disabled" style="width: 10rem">
             </div>
         </div>
 
@@ -283,7 +284,7 @@
                 <span>婧愬簱浣�</span>
             </div>
             <div class="form-item-input">
-                <input type="text" name="sourceStock" value="" disabled="disabled" style="width: 8rem">
+                <input type="text" name="sourceLocNo" value="" disabled="disabled" style="width: 8rem">
             </div>
         </div>
         <div class="form-item" style="width: 40%">
@@ -291,7 +292,7 @@
                 <span>鐩爣搴撲綅</span>
             </div>
             <div class="form-item-input">
-                <input type="text" name="stock" value="" disabled="disabled" style="width: 8rem">
+                <input type="text" name="locNo" value="" disabled="disabled" style="width: 8rem">
             </div>
         </div>
     </form>
@@ -340,7 +341,7 @@
                 <span>宸ヤ綔鐘舵��</span>
             </div>
             <div class="form-item-input">
-                <input type="text" name="workStatus" value="" disabled="disabled" style="width: 10rem">
+                <input type="text" name="wrkSts" value="" disabled="disabled" style="width: 10rem">
             </div>
         </div>
         <div class="form-item" style="width: 45%">
@@ -358,7 +359,7 @@
                 <span>婧愬簱浣�</span>
             </div>
             <div class="form-item-input">
-                <input type="text" name="sourceStock" value="" disabled="disabled" style="width: 10rem">
+                <input type="text" name="sourceLocNo" value="" disabled="disabled" style="width: 10rem">
             </div>
         </div>
         <div class="form-item" style="width: 45%">
@@ -366,7 +367,7 @@
                 <span>鐩爣搴撲綅</span>
             </div>
             <div class="form-item-input">
-                <input type="text" name="stock" value="" disabled="disabled" style="width: 10rem">
+                <input type="text" name="locNo" value="" disabled="disabled" style="width: 10rem">
             </div>
         </div>
 
@@ -404,7 +405,7 @@
         getCrnInfo();
         getSystemRunningStatus();
         getBarcodeInfo()
-    }, 500);
+    }, 1000);
     setInterval(function () {
         getSitesInfo();
     }, 3000);
@@ -494,7 +495,13 @@
                 if (res.code === 200){
                     var sites = res.data;
                     for (var i = 0; i < sites.length; i++){
-                        $("#site-"+sites[i].siteId).attr("class", "site " + sites[i].siteStatus);
+                        var siteEl = $("#site-"+sites[i].siteId);
+                        siteEl.attr("class", "site " + sites[i].siteStatus);
+                        if (sites[i].workNo != null && sites[i].workNo>0) {
+                            siteEl.html(sites[i].siteId + "[" + sites[i].workNo + "]");
+                        } else {
+                            siteEl.html(sites[i].siteId);
+                        }
                     }
                 } else if (res.code === 403){
                     window.location.href = baseUrl+"/login";

--
Gitblit v1.9.1