#

zjj

2024-11-20 1db2fb1739982ce77e16c04fccb200f04467bb22

 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">
@@ -568,7 +568,7 @@
                            siteEl.html(sites[i].siteId);
                        }

                        if (sites[i].siteId === '16' || sites[i].siteId === '016') {
                        if (sites[i].siteId === '1' || sites[i].siteId === '2' || sites[i].siteId === '3') {

                            carAnimate(Number(sites[i].siteId), Number(sites[i].nearbySta));
                        }
@@ -602,11 +602,25 @@
                        }
                        // crnEl.animate({left: (crns[i].bay * unit) + 'px'}, 1000);
                        // crns[i].bay = 15;

                        var offSet = 0;
                        unit = 60;
                        offSet = 325;

                        switch (i) {
                            case 0:
                            case 1:
                            case 2:
                            case 3:
                                unit = 35;
                                offSet = 500;
                                break;
                            case 5:
                                unit = 124;
                                offSet = 550;
                                break;
                            case 4:
                            case 6:
                                unit = 62;
                                offSet = 550;
                                break;
                        }

                        if(crns[i].bay === 1){
                            crnEl.animate({left: offSet + 'px'}, 1000);
@@ -634,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";
@@ -701,37 +715,43 @@
    function carAnimate(id, target) {
        // debugger
        var targetTop = 0;
        if (id === 16 || id === '16' || id === '016') {
        if (id === 1 || id === '1' || id === '2' || id === 2 || id === '3' || id === 3) {
            switch (target) {
                case 1:
                    targetTop += 827;
                    targetTop += 792;
                    break;
                case 2:
                    targetTop += 765;
                    targetTop += 771;
                    break;
                case 3:
                    targetTop += 651;
                    targetTop += 727;
                    break;
                case 4:
                    targetTop += 589;
                    targetTop += 706;
                    break;
                case 5:
                    targetTop += 505;
                    targetTop += 662;
                    break;
                case 6:
                    targetTop += 443;
                    targetTop += 620;
                    break;
                case 7:
                    targetTop += 362;
                    targetTop += 578;
                    break;
                case 8:
                    targetTop += 297;
                    targetTop += 530;
                    break;
                case 9:
                    targetTop += 243;
                    targetTop += 190;
                    break;
                case 10:
                    targetTop += 129;
                    targetTop += 147;
                    break;
                case 11:
                    targetTop += 107;
                    break;
                case 12:
                    targetTop += 63;
                    break;
                default:
                    return;
@@ -740,7 +760,7 @@
            return;
        }

        $("#site-0" + id).animate({top: targetTop + 'px'}, 1000);
        $("#site-" + id).animate({top: targetTop + 'px'}, 1000);
    }