#

zjj

2024-08-21 12f4a6839c831411be43819e4d6487af6933bbbb

 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";