#

Junjie

2025-09-03 a856988f6717ef034f58ab925f784e97de6937f1

 src/main/webapp/views/console.html

@@ -66,9 +66,13 @@
            </div>
            <div class="line-status">
                <div class="body-head">输送线状态</div>
                <div class="state states">
                <div class="state">
                    <span>运输线总数</span>
                    <span id="line-total" class="line-ss"></span>
                </div>
                <div class="state">
                    <span>输送线任务 <span id="devpTaskStackOver"></span></span>
                    <span id="devpWorkingCount" class="line-ss"></span>
                </div>
                <div class="button"><span>所有状态</span></div>
                <div class="button item-group">
@@ -461,12 +465,14 @@
    getSitesInfo();
    getCrnInfo();
    getSystemRunningStatus();
    getDevpTaskCount();
    getBarcodeInfo();
    getScaleInfo();
    // 实时访问
    setInterval(function () {
        getCrnInfo();
        getSystemRunningStatus();
        getDevpTaskCount();
        getBarcodeInfo();
        getScaleInfo();
    }, 1000);
@@ -550,6 +556,26 @@
        });
    }

    function getDevpTaskCount() {
        $.ajax({
            url: baseUrl + "/console/devpTaskCount",
            headers: {'token': localStorage.getItem('token')},
            method: 'POST',
            success: function (res) {
                if (res.code === 200) {
                    let devpTaskStackOver = res.data.devpTaskStackOver
                    let devpWorkingCount = res.data.devpWorkingCount
                    $("#devpTaskStackOver").html(devpTaskStackOver);
                    $("#devpWorkingCount").html(devpWorkingCount);
                } else if (res.code === 403) {
                    parent.location.href = baseUrl + "/login";
                } else {
                    console.log(res.msg);
                }
            }
        });
    }

    // 输送设备实时数据获取
    function getSitesInfo() {
        $.ajax({
@@ -595,24 +621,40 @@
                    for (var i = 0; i < crns.length; i++) {
                        var crnEl = $("#crn-" + crns[i].crnId);
                        crnEl.attr("class", "machine " + crns[i].crnStatus);
                        var unit = 0;//($('.item').eq(0).width() + 13) / 2;
                        var unit = 35;//($('.item').eq(0).width() + 13) / 2;

                        if (crns[i].bay < 0 || crns[i].bay === -2) {
                            crns[i].bay = 1
                        }
                        // crnEl.animate({left: (crns[i].bay * unit) + 'px'}, 1000);
                        // crns[i].bay = 15;
                        var offSet = 800;
                        // 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;
                        // }

                        var offSet = 0;
                        unit = 60;
                        offSet = 550;
                        crnEl.animate({left: offSet + 'px'}, 1000);


                        if(crns[i].bay === 1){
                            crnEl.animate({left: offSet + 'px'}, 1000);
                        } else {
                            crnEl.animate({left: (offSet - unit + (crns[i].bay * unit)) + 'px'}, 1000);
                        }
                        // if(crns[i].bay === 1){
                        //     crnEl.animate({left: offSet + 'px'}, 1000);
                        // } else {
                        //     crnEl.animate({left: (offSet - unit + (crns[i].bay * unit)) + 'px'}, 1000);
                        // }

                    }
                } else if (res.code === 403) {