#

tqs

2023-03-06 398a0ea330d94bc4df491dd43d7a98662c6a5157

 src/main/webapp/views/console.html

@@ -80,28 +80,28 @@
                </div>
            </div>
            <div class="bar-code">
                <div class="body-head" id="code">条码扫描器</div>
                <div class="body-head" id="code">磅秤</div>
                <div class="tablebox">
                    <div class="table-head">
                        <li><span>条码名称</span><span class="right">扫码时间</span></li>
                        <li><span>磅秤编号-磅秤重量</span><span class="right">称重时间</span></li>
                    </div>
                    <div id="barcode1" class="table-body">
                    <div id="scale1" class="table-body">

                    </div>
                </div>
                <div class="tablebox">
                    <div class="table-head">
                        <li><span>条码名称</span><span class="right">扫码时间</span></li>
                        <li><span>磅秤编号-磅秤重量</span><span class="right">称重时间</span></li>
                    </div>
                    <div id="barcode2" class="table-body">
                    <div id="scale2" class="table-body">

                    </div>
                </div>
                <div class="tablebox">
                    <div class="table-head">
                        <li><span>条码名称</span><span class="right">扫码时间</span></li>
                        <li><span>磅秤编号-磅秤重量</span><span class="right">称重时间</span></li>
                    </div>
                    <div id="barcode3" class="table-body">
                    <div id="scale3" class="table-body">

                    </div>
                </div>
@@ -370,16 +370,16 @@
    }
    function renderBarCode() {
        for (var i = 0; i < tData1.length; i++) {
            var str1 = '<li><span>' + tData1[i].barcode + '</span><span class="right">' + tData1[i].time + '</span></li>'
            $('#barcode1').append(str1)
            var str1 = '<li><span>' + tData1[i].id +'-'+ tData1[i].scale +'kg'+ '</span><span class="right">' + tData1[i].time + '</span></li>'
            $('#scale1').append(str1)
        }
        for (var j = 0; j < tData2.length; j++) {
            var str2 = '<li><span>' + tData2[j].barcode + '</span><span class="right">' + tData2[j].time + '</span></li>'
            $('#barcode2').append(str2)
            var str2 = '<li><span>' + tData2[j].id +'-'+ tData1[i].scale +'kg'+ '</span><span class="right">' + tData2[j].time + '</span></li>'
            $('#scale2').append(str2)
        }
        for (var k = 0; k < tData3.length; k++) {
            var str3 = '<li><span>' + tData3[k].barcode + '</span><span class="right">' + tData3[k].time + '</span></li>'
            $('#barcode3').append(str3)
            var str3 = '<li><span>' + tData3[k].id +'-'+ tData1[i].scale +'kg'+ '</span><span class="right">' + tData3[k].time + '</span></li>'
            $('#scale3').append(str3)
        }
    }
</script>
@@ -595,29 +595,15 @@
                    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 = 20.6;//($('.item').eq(0).width() + 13) / 2;
                        if (crns[i].bay < 0) {
                            crns[i].bay = 1
                            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;
                        }

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