From 12f4a6839c831411be43819e4d6487af6933bbbb Mon Sep 17 00:00:00 2001
From: zjj <3272660260@qq.com>
Date: 星期三, 21 八月 2024 17:49:39 +0800
Subject: [PATCH] #

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

diff --git a/src/main/webapp/views/console.html b/src/main/webapp/views/console.html
index 91ea99a..dcbc329 100644
--- a/src/main/webapp/views/console.html
+++ b/src/main/webapp/views/console.html
@@ -41,72 +41,72 @@
                 </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 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 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="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 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>-->
+<!--                </div>-->
+<!--            </div>-->
+<!--        </div>-->
         <!-- 鍫嗗灈鏈哄脊绐� -->
         <div id="crnWindow" style="display: none;" class="animate__animated animate__fadeIn">
             <div id="crnWindow-head">
@@ -648,7 +648,7 @@
                 if (res.code === 200) {
                     var barcodes = res.data;
                     for (var i = 0; i < barcodes.length; i++) {
-                        $("#code-decoder-data-" + barcodes[i].barcodeId).html(barcodes[i].codeValue);
+                        $("#barcode-"+barcodes[i].barcodeId).html(barcodes[i].codeValue ? barcodes[i].codeValue : "--");
                     }
                 } else if (res.code === 403) {
                     parent.location.href = baseUrl + "/login";

--
Gitblit v1.9.1