Merge remote-tracking branch 'origin/mdqdwcs' into mdqdwcs-auto

whycq

2025-01-02 00620a6917d2c4b0df1f62366a489cfe6aed8be1

 src/main/webapp/views/console.html

@@ -21,13 +21,16 @@
                <h6>AUTOMATIC WAREHOUSE WCS MONITORING DIAGRAM</h6>
            </div>
            <div class="head-right">
                <img src="../static/images/zy-logo.png" alt="中扬" height="44" width="80">
                <img src="../static/images/RMLogo.png" alt="润美" height="44">
            </div>
        </div>
        <!-- 货架 + 堆垛机 + 入库站点 -->
        <div class="main-part">
        <div style="width: 1000px;height: 800px;overflow: hidden">
            <!-- 货架 + 堆垛机 + 入库站点 -->
            <div class="main-part">

            </div>
        </div>

        <div id="body">
            <!-- 总开关 -->
            <div class="system-state">
@@ -566,8 +569,10 @@
                        } else {
                            siteEl.html(sites[i].siteId);
                        }
                        if (i + 1 === 8) {
                            carAnimate(i + 1, Number(sites[i].nearbySta));

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

                            carAnimate(Number(sites[i].siteId), Number(sites[i].nearbySta));
                        }
                    }
                } else if (res.code === 403) {
@@ -586,37 +591,30 @@
            headers: {'token': localStorage.getItem('token')},
            method: 'POST',
            success: function (res) {
                // console.log(res)
                if (res.code === 200) {
                    var crns = res.data;
                    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;
                        if (crns[i].bay < 0) {
                        var unit = 0;
                        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 = 1;

                        var offSet = 0;
                        switch (i) {
                            case 0:
                                unit = 34;
                                offSet = 337;
                                break;
                            case 1:
                                unit = 68;
                                offSet = 337;
                                break;
                            case 2:
                                unit = 17;
                                offSet = 337;
                                break;
                        }
                        unit = -28.5;
                        offSet = 1552;


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

                        } else {
                            crnEl.animate({left: (offSet - unit + (crns[i].bay * unit)) + 'px'}, 1000);
                        }
@@ -641,7 +639,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";
@@ -706,23 +704,39 @@

    // 小车偏移动画
    function carAnimate(id, target) {
        var targetTop = 122;
        if (id === 8) {
        // debugger
        var targetTop = 0;
        if (id === 16 || id === '16' || id === '016') {
            switch (target) {
                case 1:
                    targetTop += 160;
                    targetTop += 827;
                    break;
                case 2:
                    targetTop += 140;
                    targetTop += 765;
                    break;
                case 3:
                    targetTop += 80;
                    targetTop += 651;
                    break;
                case 4:
                    targetTop += 40;
                    targetTop += 589;
                    break;
                case 5:
                    targetTop += 505;
                    break;
                case 6:
                    targetTop += 443;
                    break;
                case 7:
                    targetTop += 0;
                    targetTop += 362;
                    break;
                case 8:
                    targetTop += 297;
                    break;
                case 9:
                    targetTop += 243;
                    break;
                case 10:
                    targetTop += 129;
                    break;
                default:
                    return;
@@ -730,7 +744,8 @@
        } else {
            return;
        }
        $("#site-" + id).animate({top: targetTop + 'px'}, 1000);

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