#

zjj

2024-08-21 12f4a6839c831411be43819e4d6487af6933bbbb

#

 src/main/webapp/static/css/render.css

@@ -74,6 +74,15 @@
    background-color: #000000;
    z-index: 5;
}
.barcode {
    position: absolute;
    color: #a19c9c;
    border: 1px solid rgb(108,167,168);
    cursor: pointer;
    text-align: center;
    background-color: rgb(157, 217, 162);
    font-size: 10px;
}
.item {
    border: 1px solid rgb(194,76,65);
    color: rgb(194,76,65);

 src/main/webapp/static/js/console.js

@@ -10,6 +10,8 @@
    tracks = '',
    stn = '',
    stns = '',
    barcode = '',
    barcodeArr = [],
    stnArr = [],
    floorBtn = '',
    floorBtns = '',
@@ -125,6 +127,7 @@

        let stnss = areas[i].stns
        let floor = areas[i].text
        let barcodes = areas[i].barcode
        floorId = areas[i].id
        var position = (i+1)*100
        floorBtn =
@@ -139,6 +142,7 @@
        var n = 1
        stnArr[index] = ''
        total[index] = ''
        barcodeArr[index] = ''
        for (let j = 0; j < stnss.length; j++) {
            if (stnss[j].type == "stn") {
                stn = "<div class='site' id='" + stnss[j].id +
@@ -162,9 +166,18 @@
            }

        }
        for (let k = 0; k < barcodes.length; k++) {
            barcode = "<div class='barcode' id='" + barcodes[k].id +
                "'style='width:" + barcodes[k].width +
                "px;height: " + barcodes[k].height +
                "px;line-height: " + barcodes[k].height +
                "px;top: "+ barcodes[k].top +
                "px;left: "+ barcodes[k].left + "px'>" + "</div>"
            barcodeArr[i] = barcodeArr[i] + barcode
        }

    }
    floorInfo = racks + rackDescs + tracks + crns + stnArr[0] + floorBtnss
    floorInfo = racks + rackDescs + tracks + crns + stnArr[0] + floorBtnss+ barcodeArr[0]

    $(".main-part").append(floorInfo)
    $("#line-total").html(total[0])
@@ -173,7 +186,7 @@
}
function changFloor(e) {
    $(".main-part").empty()  // 清空节点
    floorInfo = racks  + stnArr[e] +rackDescs + crns + tracks + floorBtnss
    floorInfo = racks  + stnArr[e] +rackDescs + crns + tracks + floorBtnss+ barcodeArr[0]
    $(".main-part").append(floorInfo)
    $("#line-total").empty()
    $("#line-total").html(total[e])

 src/main/webapp/static/js/console.map.js

@@ -769,7 +769,56 @@
                "left": 283,
                "width": 184,
                "height": 19
            }]
            }],
            "barcode":[
                {
                    "type": "barcode",
                    "id": "barcode-1",
                    "text": "",
                    "top": 749,
                    "left": 470,
                    "width": 80,
                    "height": 20
                },
                {
                    "type": "barcode",
                    "id": "barcode-2",
                    "text": "",
                    "top": 684,
                    "left": 470,
                    "width": 80,
                    "height": 20
                } ,
                {
                    "type": "barcode",
                    "id": "barcode-3",
                    "text": "",
                    "top": 64.5,
                    "left": 470,
                    "width": 80,
                    "height": 20
                }
                ,
                {
                    "type": "barcode",
                    "id": "barcode-4",
                    "text": "",
                    "top": 749,
                    "left": 560,
                    "width": 150,
                    "height": 20
                }
                ,
                {
                    "type": "barcode",
                    "id": "barcode-5",
                    "text": "",
                    "top": 684,
                    "left": 560,
                    "width": 150,
                    "height": 20
                }
            ]
        }]
    }]
}

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