#
mrzhssss
2022-09-20 eb042ef5746efa687aceec8f00e00bdecaa0e8e6
#
2个文件已修改
10 ■■■■■ 已修改文件
src/main/java/com/zy/asrs/controller/ConsoleController.java 1 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/webapp/views/console.html 9 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/java/com/zy/asrs/controller/ConsoleController.java
@@ -107,6 +107,7 @@
            vo.setSiteId(String.valueOf(entry.getKey())); // 站点编号
            vo.setWorkNo(staProtocol.getWorkNo()); // 工作号
            vo.setSiteStatus(SiteStatusType.process(staProtocol));  // 状态
            vo.setNearbySta(staProtocol.getNearbySta());
            vos.add(vo);
        }
        return R.ok().add(vos);
src/main/webapp/views/console.html
@@ -567,8 +567,9 @@
                        } 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) {
@@ -599,7 +600,7 @@
                            crns[i].bay = 1
                        }
                        // crnEl.animate({left: (crns[i].bay * unit) + 'px'}, 1000);
                        crns[i].bay = 15;
                        // crns[i].bay = 15;
                        var offSet = 0;
                        unit = 60;
@@ -698,7 +699,7 @@
    // 小车偏移动画
    function carAnimate(id, target) {
        var targetTop = 122;
        if (id === 8) {
        if (id === 16 || id === '16' || id === '016') {
            switch (target) {
                case 1:
                    targetTop += 160;