#
whycq
2022-08-30 b42f93b96fbbdc10392905f86e4438f9cd6e236a
#
2个文件已修改
109 ■■■■■ 已修改文件
src/main/webapp/static/js/console.js 61 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/webapp/static/js/console.map.js 48 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/webapp/static/js/console.js
@@ -25,36 +25,59 @@
    for (let i = 0;i < rackss.length;i++) {
        let bay ='' // 单个库位
        let bays = '' // 库位集合
        let bayWidth = rackss[i].width / (rackss[i].maxBayNo / rackss[i].minBayNo)
        let maxBayNo = rackss[i].maxBayNo // 最大库位号
        let minBayNo = rackss[i].minBayNo // 最小库位号
        let bLen = maxBayNo / minBayNo // 库位个数
        let bLen
        let interval // 间隔数
        if (maxBayNo<35) {
            interval = 1
            bLen = maxBayNo / interval // 库位个数
        } else {
            interval = 2
            bLen = maxBayNo / interval // 库位个数
        }
        let bayWidth // 单个库位宽度
        let bNum // 库位号码
        // hpPosition 0 表示货架序号 左->右 1 表示货架序号 右->左
        if (minBayNo % 2 == 0) { // 从2开始
            if(interval == 1) {
                bLen = bLen - 1
            } else if (interval == 2) {
                if (maxBayNo % 2 == 0) { // 偶数
                    bLen = bLen
                } else { // 奇数
                    maxBayNo = maxBayNo + 1
                    bLen = maxBayNo / interval // 库位个数
                }
            }
        } else { // 从1开始
            if(interval == 1) {
                bLen = bLen
            } else if (interval == 2) {
                if (maxBayNo % 2 == 0) { // 偶数
                    bLen = bLen
                } else { // 奇数
                    bLen = bLen + 1
                }
            }
        }
        bayWidth = rackss[i].width / bLen
        // hpPosition 0 表示货架序号 左->右 1 表示货架序号 左<-右
        if (mapInfo.hpPosition == 1) {
            bNum = maxBayNo
            for (let j = bLen; j > 0; j--) {
                bay = "<button class='item' style='width: "+ bayWidth +"px'>" + bNum + "</button>"
                bays = bays + bay
                bNum = bNum - minBayNo;
                bNum = bNum - interval;
            }
        }else {
            if (minBayNo % 2 == 0) {
                bNum = minBayNo
                for (let j = 0; j < bLen; j++) {
                    bay = "<button class='item' style='width: "+ bayWidth +"px'>" + bNum + "</button>"
                    bays = bays + bay
                    bNum = bNum + minBayNo;
                }
            } else {
                bNum = minBayNo + 1
                for (let j = 0; j < bLen; j++) {
                    bay = "<button class='item' style='width: "+ bayWidth +"px'>" + bNum + "</button>"
                    bays = bays + bay
                    bNum = bNum + minBayNo;
                }
            bNum = minBayNo
            for (let j = 0; j < bLen; j++) {
                bay = "<button class='item' style='width: "+ bayWidth +"px'>" + bNum + "</button>"
                bays = bays + bay
                bNum = bNum + interval;
            }
        }
        rack = "<div class='rack' id='" + rackss[i].id +
src/main/webapp/static/js/console.map.js
@@ -14,8 +14,8 @@
            "left": 430,
            "width": 1020,
            "height": 24,
            "minBayNo": 1,
            "maxBayNo": 30
            "minBayNo": 2,
            "maxBayNo": 31
        },
        {
            "type": "rack",
@@ -24,8 +24,8 @@
            "left": 430,
            "width": 1020,
            "height": 24,
            "minBayNo": 1,
            "maxBayNo": 30
            "minBayNo": 2,
            "maxBayNo": 31
        },
        {
            "type": "rack",
@@ -34,8 +34,8 @@
            "left": 430,
            "width": 1020,
            "height": 24,
            "minBayNo": 1,
            "maxBayNo": 30
            "minBayNo": 2,
            "maxBayNo": 31
        },
        {
            "type": "rack",
@@ -44,8 +44,8 @@
            "left": 430,
            "width": 1020,
            "height": 24,
            "minBayNo": 1,
            "maxBayNo": 30
            "minBayNo": 2,
            "maxBayNo": 31
        },
        {
            "type": "rack",
@@ -54,8 +54,8 @@
            "left": 430,
            "width": 1088,
            "height": 24,
            "minBayNo": 1,
            "maxBayNo": 16
            "minBayNo": 2,
            "maxBayNo": 17
        },
        {
            "type": "rack",
@@ -64,8 +64,8 @@
            "left": 430,
            "width": 1088,
            "height": 24,
            "minBayNo": 1,
            "maxBayNo": 16
            "minBayNo": 2,
            "maxBayNo": 17
        },
        {
            "type": "rack",
@@ -74,8 +74,8 @@
            "left": 430,
            "width": 1088,
            "height": 24,
            "minBayNo": 1,
            "maxBayNo": 16
            "minBayNo": 2,
            "maxBayNo": 17
        },
        {
            "type": "rack",
@@ -84,8 +84,8 @@
            "left": 430,
            "width": 1088,
            "height": 24,
            "minBayNo": 1,
            "maxBayNo": 16
            "minBayNo": 2,
            "maxBayNo": 17
        },
        {
            "type": "rack",
@@ -134,8 +134,8 @@
            "left": 430,
            "width": 1020,
            "height": 24,
            "minBayNo": 1,
            "maxBayNo": 23
            "minBayNo": 2,
            "maxBayNo": 24
        },
        {
            "type": "rack",
@@ -144,8 +144,8 @@
            "left": 430,
            "width": 1020,
            "height": 24,
            "minBayNo": 1,
            "maxBayNo": 23
            "minBayNo": 2,
            "maxBayNo": 24
        },
        {
            "type": "rack",
@@ -154,8 +154,8 @@
            "left": 430,
            "width": 1020,
            "height": 24,
            "minBayNo": 1,
            "maxBayNo": 23
            "minBayNo": 2,
            "maxBayNo": 24
        },
        {
            "type": "rack",
@@ -164,8 +164,8 @@
            "left": 430,
            "width": 1020,
            "height": 24,
            "minBayNo": 1,
            "maxBayNo": 23
            "minBayNo": 2,
            "maxBayNo": 24
        },
    ],
    "rackDescs": [