pang.jiabao
2025-11-10 6e1a29fbb8b364337d1f14693a4b573ef4ab43dc
wcs界面完善
8个文件已修改
1203 ■■■■ 已修改文件
src/main/java/com/zy/core/thread/SiemensDevpThread.java 24 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/resources/application.yml 192 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/webapp/static/css/crn.css 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/webapp/static/css/index.css 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/webapp/static/js/console.map.js 957 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/webapp/views/console.html 12 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/webapp/views/crn.html 12 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/webapp/views/render/asda.css 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/java/com/zy/core/thread/SiemensDevpThread.java
@@ -25,10 +25,7 @@
import lombok.extern.slf4j.Slf4j;
import java.text.MessageFormat;
import java.util.ArrayList;
import java.util.Date;
import java.util.List;
import java.util.Map;
import java.util.*;
import java.util.concurrent.ConcurrentHashMap;
/**
@@ -44,12 +41,23 @@
    private Map<Integer, StaProtocol> station = new ConcurrentHashMap<>();
    private short heartBeatVal = 1;
    private StaError1 staError1;
    public static final ArrayList<Integer> staNos = new ArrayList<Integer>() {{
        add(101);add(102);add(103);add(104);add(105);add(106);add(107);add(108);
    }};
    public static final ArrayList<Integer> staNos;
    static {
        ArrayList<Integer> list = new ArrayList<>();
        for (int i = 1; i <= 48; i++) {
            list.add(1000 + i);
        }
        for (int i = 9; i <= 40; i++) {
            list.add(1100 + i);
        }
        list.add(1701);
        list.add(1702);
        staNos = list; // 不可修改,安全
    }
    public static final ArrayList<Integer> BarcodeList = new ArrayList<Integer>() {{
        add(1); add(2);
        add(1); add(2);add(3); add(4);add(5); add(6);add(7); add(8);
    }};
    public static final ArrayList<Integer> staNosErrList = new ArrayList<Integer>() {{
        add(104); add(106);
src/main/resources/application.yml
@@ -41,7 +41,7 @@
  # 双深
  doubleDeep: true
  # 双深库位排号
  doubleLocs: 1,4,5,8
  doubleLocs: 1,4,5,8,9,12,13,16,17,20,21,24,25,28,29,32
  # 一个堆垛机负责的货架排数
  groupCount: 4
@@ -72,6 +72,150 @@
  # 堆垛机2
  crn[1]:
    id: 2
    ip: 192.168.5.20
    port: 102
    rack: 0
    slot: 0
    # 偏移量,当堆垛机站点列号=1时,偏移量=2
    offset: 2
    demo: false
    # 堆垛机入库站点
    crnInStn[0]:
      devpPlcId: ${wcs-slave.devp[0].id}
      staNo: 106
      row: 6
      bay: 1
      lev: 1
    # 堆垛机出库站点
    crnOutStn[0]:
      devpPlcId: ${wcs-slave.devp[0].id}
      staNo: 108
      row: 7
      bay: 1
      lev: 1
  # 堆垛机3
  crn[2]:
    id: 3
    ip: 192.168.5.20
    port: 102
    rack: 0
    slot: 0
    # 偏移量,当堆垛机站点列号=1时,偏移量=2
    offset: 2
    demo: false
    # 堆垛机入库站点
    crnInStn[0]:
      devpPlcId: ${wcs-slave.devp[0].id}
      staNo: 106
      row: 6
      bay: 1
      lev: 1
    # 堆垛机出库站点
    crnOutStn[0]:
      devpPlcId: ${wcs-slave.devp[0].id}
      staNo: 108
      row: 7
      bay: 1
      lev: 1
  # 堆垛机4
  crn[3]:
    id: 4
    ip: 192.168.5.20
    port: 102
    rack: 0
    slot: 0
    # 偏移量,当堆垛机站点列号=1时,偏移量=2
    offset: 2
    demo: false
    # 堆垛机入库站点
    crnInStn[0]:
      devpPlcId: ${wcs-slave.devp[0].id}
      staNo: 106
      row: 6
      bay: 1
      lev: 1
    # 堆垛机出库站点
    crnOutStn[0]:
      devpPlcId: ${wcs-slave.devp[0].id}
      staNo: 108
      row: 7
      bay: 1
      lev: 1
  # 堆垛机5
  crn[4]:
    id: 5
    ip: 192.168.5.20
    port: 102
    rack: 0
    slot: 0
    # 偏移量,当堆垛机站点列号=1时,偏移量=2
    offset: 2
    demo: false
    # 堆垛机入库站点
    crnInStn[0]:
      devpPlcId: ${wcs-slave.devp[0].id}
      staNo: 106
      row: 6
      bay: 1
      lev: 1
    # 堆垛机出库站点
    crnOutStn[0]:
      devpPlcId: ${wcs-slave.devp[0].id}
      staNo: 108
      row: 7
      bay: 1
      lev: 1
  # 堆垛机6
  crn[5]:
    id: 6
    ip: 192.168.5.20
    port: 102
    rack: 0
    slot: 0
    # 偏移量,当堆垛机站点列号=1时,偏移量=2
    offset: 2
    demo: false
    # 堆垛机入库站点
    crnInStn[0]:
      devpPlcId: ${wcs-slave.devp[0].id}
      staNo: 106
      row: 6
      bay: 1
      lev: 1
    # 堆垛机出库站点
    crnOutStn[0]:
      devpPlcId: ${wcs-slave.devp[0].id}
      staNo: 108
      row: 7
      bay: 1
      lev: 1
  # 堆垛机7
  crn[6]:
    id: 7
    ip: 192.168.5.20
    port: 102
    rack: 0
    slot: 0
    # 偏移量,当堆垛机站点列号=1时,偏移量=2
    offset: 2
    demo: false
    # 堆垛机入库站点
    crnInStn[0]:
      devpPlcId: ${wcs-slave.devp[0].id}
      staNo: 106
      row: 6
      bay: 1
      lev: 1
    # 堆垛机出库站点
    crnOutStn[0]:
      devpPlcId: ${wcs-slave.devp[0].id}
      staNo: 108
      row: 7
      bay: 1
      lev: 1
  # 堆垛机8
  crn[7]:
    id: 8
    ip: 192.168.5.20
    port: 102
    rack: 0
@@ -156,6 +300,36 @@
    id: 2
    ip: 192.168.5.43
    port: 51236
  # 条码扫描仪3
  barcode[2]:
    id: 3
    ip: 192.168.5.43
    port: 51236
  # 条码扫描仪4
  barcode[3]:
    id: 4
    ip: 192.168.5.43
    port: 51236
  # 条码扫描仪5
  barcode[4]:
    id: 5
    ip: 192.168.5.43
    port: 51236
  # 条码扫描仪6
  barcode[5]:
    id: 6
    ip: 192.168.5.43
    port: 51236
  # 条码扫描仪7
  barcode[6]:
    id: 7
    ip: 192.168.5.43
    port: 51236
  # 条码扫描仪8
  barcode[7]:
    id: 8
    ip: 192.168.5.43
    port: 51236
  # LED1
  led[0]:
@@ -188,4 +362,20 @@
    port: 5005
    devpPlcId: ${wcs-slave.devp[0].id}
    staArr: 107
    crnId: 2
  # LED5
  led[4]:
    id: 5
    ip: 192.168.5.107
    port: 5005
    devpPlcId: ${wcs-slave.devp[0].id}
    staArr: 107
    crnId: 2
  # LED6
  led[5]:
    id: 6
    ip: 192.168.5.107
    port: 5005
    devpPlcId: ${wcs-slave.devp[0].id}
    staArr: 107
    crnId: 2
src/main/webapp/static/css/crn.css
@@ -83,7 +83,7 @@
.crn-msg {
    /*overflow: auto;*/
    margin-top: 10px;
    height: 23%;
    height: 30%;
    background-color: #fff;
    border-radius: 5px;
    box-shadow: 0 0 3px rgba(0,0,0,.3);
src/main/webapp/static/css/index.css
@@ -30,7 +30,7 @@
}
.sidebar {
    width: 8%;
    width: 6%;
    height: 40%;
    line-height: 90px;
    position: fixed;
src/main/webapp/static/js/console.map.js
@@ -3,286 +3,489 @@
    "rackCount": 8,
    "crnCount": 2,
    "stbCount": 18,
    "hpPosition": 0,
    "hpPosition": 1,
    "minBayNo": 1,
    "floors": 1,
    "racks": [
    {
        "type": "rack",
        "id": "rack1",
        "top": 189,
        "left": 400,
        "width": 1350,
        "height": 23,
        "minBayNo": 1,
        "maxBayNo": 27
    },
    {
        "type": "rack",
        "id": "rack8",
        "top": 457,
        "left": 400,
        "width": 1350,
        "height": 23,
        "minBayNo": 1,
        "maxBayNo": 27
    },
    {
        "type": "rack",
        "id": "rack7",
        "top": 430,
        "left": 400,
        "width": 1350,
        "height": 23,
        "minBayNo": 1,
        "maxBayNo": 27
    },
    {
        "type": "rack",
        "id": "rack6",
        "top": 365,
        "left": 400,
        "width": 1350,
        "height": 23,
        "minBayNo": 1,
        "maxBayNo": 27
    },
    {
        "type": "rack",
        "id": "rack5",
        "top": 338,
        "left": 400,
        "width": 1350,
        "height": 23,
        "minBayNo": 1,
        "maxBayNo": 27
    },
    {
        "type": "rack",
        "id": "rack4",
        "top": 311,
        "left": 400,
        "width": 1350,
        "height": 23,
        "minBayNo": 1,
        "maxBayNo": 27
    },
    {
        "type": "rack",
        "id": "rack3",
        "top": 283,
        "left": 400,
        "width": 1350,
        "height": 23,
        "minBayNo": 1,
        "maxBayNo": 27
    },
    {
        "type": "rack",
        "id": "rack2",
        "top": 217,
        "left": 400,
        "width": 1350,
        "height": 23,
        "minBayNo": 1,
        "maxBayNo": 27
    },
    {
        "type": "rack",
        "id": "rack9",
        "top": 500,
        "left": 300,
        "width": 1500,
        "height": 23,
        "minBayNo": 1,
        "maxBayNo": 32
    },
    {
        "type": "rack",
        "id": "rack10",
        "top": 570,
        "left": 300,
        "width": 656,
        "height": 23,
        "minBayNo": 1,
        "maxBayNo": 14
    },
    {
        "type": "rack",
        "id": "rack11",
        "top": 570,
        "left": 1143,
        "width": 656,
        "height": 23,
        "minBayNo": 19,
        "maxBayNo": 14
    }
],
        {
            "type": "rack",
            "id": "rack1",
            "top": 5,
            "left": 410,
            "width": 1140,
            "height": 20,
            "minBayNo": 1,
            "maxBayNo": 25
        },
        {
            "type": "rack",
            "id": "rack2",
            "top": 20,
            "left": 410,
            "width": 1140,
            "height": 20,
            "minBayNo": 1,
            "maxBayNo": 25
        },
        {
            "type": "rack",
            "id": "rack3",
            "top": 55,
            "left": 410,
            "width": 1140,
            "height": 20,
            "minBayNo": 1,
            "maxBayNo": 25
        },
        {
            "type": "rack",
            "id": "rack4",
            "top": 70,
            "left": 410,
            "width": 1140,
            "height": 20,
            "minBayNo": 1,
            "maxBayNo": 25
        },
        {
            "type": "rack",
            "id": "rack5",
            "top": 90,
            "left": 410,
            "width": 1140,
            "height": 20,
            "minBayNo": 1,
            "maxBayNo": 25
        },
        {
            "type": "rack",
            "id": "rack6",
            "top": 105,
            "left": 410,
            "width": 1140,
            "height": 20,
            "minBayNo": 1,
            "maxBayNo": 25
        },
        {
            "type": "rack",
            "id": "rack7",
            "top": 140,
            "left": 410,
            "width": 1140,
            "height": 20,
            "minBayNo": 1,
            "maxBayNo": 25
        },
        {
            "type": "rack",
            "id": "rack8",
            "top": 155,
            "left": 410,
            "width": 1140,
            "height": 20,
            "minBayNo": 1,
            "maxBayNo": 25
        },
        {
            "type": "rack",
            "id": "rack9",
            "top": 175,
            "left": 410,
            "width": 1140,
            "height": 20,
            "minBayNo": 1,
            "maxBayNo": 25
        },
        {
            "type": "rack",
            "id": "rack10",
            "top": 190,
            "left": 410,
            "width": 1140,
            "height": 20,
            "minBayNo": 1,
            "maxBayNo": 25
        },
        {
            "type": "rack",
            "id": "rack11",
            "top": 225,
            "left": 410,
            "width": 1140,
            "height": 20,
            "minBayNo": 1,
            "maxBayNo": 25
        },
        {
            "type": "rack",
            "id": "rack12",
            "top": 240,
            "left": 410,
            "width": 1140,
            "height": 20,
            "minBayNo": 1,
            "maxBayNo": 25
        },
        {
            "type": "rack",
            "id": "rack13",
            "top": 260,
            "left": 410,
            "width": 1140,
            "height": 20,
            "minBayNo": 1,
            "maxBayNo": 25
        },
        {
            "type": "rack",
            "id": "rack14",
            "top": 275,
            "left": 410,
            "width": 1140,
            "height": 20,
            "minBayNo": 1,
            "maxBayNo": 25
        },
        {
            "type": "rack",
            "id": "rack15",
            "top": 310,
            "left": 410,
            "width": 1140,
            "height": 20,
            "minBayNo": 1,
            "maxBayNo": 25
        },
        {
            "type": "rack",
            "id": "rack16",
            "top": 325,
            "left": 410,
            "width": 1140,
            "height": 20,
            "minBayNo": 1,
            "maxBayNo": 25
        },
        {
            "type": "rack",
            "id": "rack17",
            "top": 345,
            "left": 410,
            "width": 1140,
            "height": 20,
            "minBayNo": 1,
            "maxBayNo": 25
        },
        {
            "type": "rack",
            "id": "rack18",
            "top": 360,
            "left": 410,
            "width": 1140,
            "height": 20,
            "minBayNo": 1,
            "maxBayNo": 25
        },
        {
            "type": "rack",
            "id": "rack19",
            "top": 395,
            "left": 410,
            "width": 1140,
            "height": 20,
            "minBayNo": 1,
            "maxBayNo": 25
        },
        {
            "type": "rack",
            "id": "rack20",
            "top": 410,
            "left": 410,
            "width": 1140,
            "height": 20,
            "minBayNo": 1,
            "maxBayNo": 25
        },
        {
            "type": "rack",
            "id": "rack21",
            "top": 430,
            "left": 410,
            "width": 1140,
            "height": 20,
            "minBayNo": 1,
            "maxBayNo": 25
        },
        {
            "type": "rack",
            "id": "rack22",
            "top": 445,
            "left": 410,
            "width": 1140,
            "height": 20,
            "minBayNo": 1,
            "maxBayNo": 25
        },
        {
            "type": "rack",
            "id": "rack23",
            "top": 480,
            "left": 410,
            "width": 1140,
            "height": 20,
            "minBayNo": 1,
            "maxBayNo": 25
        },
        {
            "type": "rack",
            "id": "rack24",
            "top": 495,
            "left": 410,
            "width": 1140,
            "height": 20,
            "minBayNo": 1,
            "maxBayNo": 25
        },
        {
            "type": "rack",
            "id": "rack25",
            "top": 515,
            "left": 410,
            "width": 1140,
            "height": 20,
            "minBayNo": 1,
            "maxBayNo": 25
        },
        {
            "type": "rack",
            "id": "rack26",
            "top": 530,
            "left": 410,
            "width": 1140,
            "height": 20,
            "minBayNo": 1,
            "maxBayNo": 25
        },
        {
            "type": "rack",
            "id": "rack27",
            "top": 565,
            "left": 410,
            "width": 1140,
            "height": 20,
            "minBayNo": 1,
            "maxBayNo": 25
        },
        {
            "type": "rack",
            "id": "rack28",
            "top": 580,
            "left": 410,
            "width": 1140,
            "height": 20,
            "minBayNo": 1,
            "maxBayNo": 25
        },
        {
            "type": "rack",
            "id": "rack29",
            "top": 600,
            "left": 410,
            "width": 1140,
            "height": 20,
            "minBayNo": 1,
            "maxBayNo": 25
        },
        {
            "type": "rack",
            "id": "rack30",
            "top": 615,
            "left": 410,
            "width": 1140,
            "height": 20,
            "minBayNo": 1,
            "maxBayNo": 25
        },
        {
            "type": "rack",
            "id": "rack31",
            "top": 650,
            "left": 410,
            "width": 1140,
            "height": 20,
            "minBayNo": 1,
            "maxBayNo": 25
        },
        {
            "type": "rack",
            "id": "rack32",
            "top": 665,
            "left": 410,
            "width": 1140,
            "height": 20,
            "minBayNo": 1,
            "maxBayNo": 25
        }
    ],
    "rackDescs": [
        {
            "type": "rackDescs",
            "id": "lb_desc14",
            "text": "》》》入库",
            "top": 339,
            "left": 303,
            "width": 100,
            "height": 23
        },
        {
            "type": "rackDescs",
            "id": "lb_desc13",
            "text": "》》》入库",
            "top": 312,
            "left": 303,
            "width": 100,
            "height": 23
        },
        {
            "type": "rackDescs",
            "id": "lb_desc12",
            "text": "《《《 出库",
            "top": 459,
            "left": 303,
            "width": 100,
            "height": 23
        },
        {
            "type": "rackDescs",
            "id": "lb_desc11",
            "text": "《《《 出库",
            "top": 190,
            "left": 303,
            "width": 100,
            "height": 23
        },
        {
            "type": "rackDescs",
            "id": "lb_desc10",
            "text": "#10",
            "top": 570,
            "left": 1800,
            "id": "lb_desc01",
            "text": "#01",
            "top": 0,
            "left": 1555,
            "width": 33,
            "height": 23
        },
        {
        },{
            "type": "rackDescs",
            "id": "lb_desc9",
            "text": "#9",
            "top": 500,
            "left": 1800,
            "id": "lb_desc32",
            "text": "#32",
            "top": 675,
            "left": 1555,
            "width": 33,
            "height": 23
        },
    {
        "type": "rackDescs",
        "id": "lb_desc8",
        "text": "#8",
        "top": 460,
        "left": 1750,
        "width": 33,
        "height": 23
    },
    {
        "type": "rackDescs",
        "id": "lb_desc7",
        "text": "#7",
        "top": 430,
        "left": 1750,
        "width": 33,
        "height": 23
    },
    {
        "type": "rackDescs",
        "id": "lb_desc6",
        "text": "#6",
        "top": 370,
        "left": 1750,
        "width": 33,
        "height": 23
    },
    {
        "type": "rackDescs",
        "id": "lb_desc5",
        "text": "#5",
        "top": 340,
        "left": 1750,
        "width": 33,
        "height": 23
    },
    {
        "type": "rackDescs",
        "id": "lb_desc4",
        "text": "#4",
        "top": 310,
        "left": 1750,
        "width": 33,
        "height": 23
    },
    {
        "type": "rackDescs",
        "id": "lb_desc3",
        "text": "#3",
        "top": 280,
        "left": 1750,
        "width": 33,
        "height": 23
    },
    {
        "type": "rackDescs",
        "id": "lb_desc2",
        "text": "#2",
        "top": 218,
        "left": 1750,
        "width": 33,
        "height": 23
    },
    {
        "type": "rackDescs",
        "id": "lb_desc1",
        "text": "#1",
        "top": 190,
        "left": 1750,
        "width": 33,
        "height": 23
    }
        }
],
    "crns": [
        {
            "type": "track",
            "id": "lb_track1",
            "text": "",
            "top": 50,
            "left": 410,
            "width": 1140,
            "height": 1
        },{
            "type": "track",
            "id": "lb_track2",
            "text": "",
            "top": 135,
            "left": 410,
            "width": 1140,
            "height": 1
        },{
            "type": "track",
            "id": "lb_track3",
            "text": "",
            "top": 220,
            "left": 410,
            "width": 1140,
            "height": 1
        },{
            "type": "track",
            "id": "lb_track4",
            "text": "",
            "top": 305,
            "left": 410,
            "width": 1140,
            "height": 1
        },{
            "type": "track",
            "id": "lb_track5",
            "text": "",
            "top": 390,
            "left": 410,
            "width": 1140,
            "height": 1
        },{
            "type": "track",
            "id": "lb_track6",
            "text": "",
            "top": 475,
            "left": 410,
            "width": 1140,
            "height": 1
        },
        {
            "type": "track",
            "id": "lb_track7",
            "text": "",
            "top": 560,
            "left": 410,
            "width": 1140,
            "height": 1
        },{
            "type": "track",
            "id": "lb_track8",
            "text": "",
            "top": 645,
            "left": 410,
            "width": 1140,
            "height": 1
        },
    {
        "type": "crane",
        "id": "crn-1",
        "text": "1",
        "top": 250,
        "left": 350,
        "width": 101,
        "height": 32
    },
    {
        "type": "track",
        "id": "lb_track3",
        "text": "",
        "top": 265,
        "top": 40,
        "left": 400,
        "width": 1350,
        "height": 1
        "width": 52,
        "height": 20
    },
    {
        "type": "crane",
        "id": "crn-2",
        "text": "2",
        "top": 393,
        "left": 350,
        "width": 101,
        "height": 29
    },
    {
        "type": "track",
        "id": "lb_track4",
        "text": "",
        "top": 408,
        "left": 400,
        "width": 1350,
        "height": 1
    }
        {
            "type": "crane",
            "id": "crn-2",
            "text": "2",
            "top": 125,
            "left": 400,
            "width": 52,
            "height": 20
        },
        {
            "type": "crane",
            "id": "crn-3",
            "text": "3",
            "top": 210,
            "left": 400,
            "width": 52,
            "height": 20
        },
        {
            "type": "crane",
            "id": "crn-4",
            "text": "4",
            "top": 295,
            "left": 400,
            "width": 52,
            "height": 20
        },
        {
            "type": "crane",
            "id": "crn-5",
            "text": "5",
            "top": 380,
            "left": 400,
            "width": 52,
            "height": 20
        },
        {
            "type": "crane",
            "id": "crn-6",
            "text": "6",
            "top": 465,
            "left": 400,
            "width": 52,
            "height": 20
        },
        {
            "type": "crane",
            "id": "crn-7",
            "text": "7",
            "top": 550,
            "left": 400,
            "width": 52,
            "height": 20
        },
        {
            "type": "crane",
            "id": "crn-8",
            "text": "8",
            "top": 635,
            "left": 400,
            "width": 52,
            "height": 20
        }
],
    "areas": [
    {
@@ -305,76 +508,184 @@
                "stns": [
                    {
                        "type": "stn",
                        "id": "site-101",
                        "text": "101",
                        "top": 218,
                        "left": 260,
                        "width": 65,
                        "height": 22
                    },
                    {
                        "id": "site-1009",
                        "text": "1009",
                        "top": 21,
                        "left": 1550,
                        "width": 60,
                        "font-size": 13,
                        "height": 20
                    }, {
                        "type": "stn",
                        "id": "site-102",
                        "text": "102",
                        "top": 218,
                        "left": 330,
                        "width": 68,
                        "height": 22
                    },
                    {
                        "id": "site-1109",
                        "text": "1109",
                        "top": 21,
                        "left": 1611,
                        "width": 60,
                        "font-size": 13,
                        "height": 20
                    }, {
                        "type": "stn",
                        "id": "site-103",
                        "text": "103",
                        "top": 284,
                        "left": 260,
                        "width": 65,
                        "height": 22
                    },
                    {
                        "id": "site-1010",
                        "text": "1010",
                        "top": 60,
                        "left": 1550,
                        "width": 60,
                        "font-size": 13,
                        "height": 20
                    }, {
                        "type": "stn",
                        "id": "site-104",
                        "text": "104",
                        "top": 284,
                        "left": 330,
                        "width": 68,
                        "height": 22
                    },
                    {
                        "id": "site-1110",
                        "text": "1110",
                        "top": 60,
                        "left": 1611,
                        "width": 60,
                        "font-size": 13,
                        "height": 20
                    }, {
                        "type": "stn",
                        "id": "site-105",
                        "text": "105",
                        "top": 367,
                        "left": 260,
                        "width": 65,
                        "height": 22
                    },
                    {
                        "id": "site-1011",
                        "text": "1011",
                        "top": 105,
                        "left": 1550,
                        "width": 60,
                        "font-size": 13,
                        "height": 20
                    },{
                        "type": "stn",
                        "id": "site-106",
                        "text": "106",
                        "top": 367,
                        "left": 330,
                        "width": 68,
                        "height": 22
                    },
                    {
                        "id": "site-1111",
                        "text": "1111",
                        "top": 105,
                        "left": 1611,
                        "width": 60,
                        "font-size": 13,
                        "height": 20
                    }, {
                        "type": "stn",
                        "id": "site-107",
                        "text": "107",
                        "top": 431,
                        "left": 260,
                        "width": 65,
                        "height": 22
                    },
                    {
                        "id": "site-1012",
                        "text": "1012",
                        "top": 145,
                        "left": 1550,
                        "width": 60,
                        "font-size": 13,
                        "height": 20
                    },{
                        "type": "stn",
                        "id": "site-108",
                        "text": "108",
                        "top": 431,
                        "left": 330,
                        "width": 68,
                        "height": 22
                        "id": "site-1112",
                        "text": "1112",
                        "top": 145,
                        "left": 1611,
                        "width": 60,
                        "font-size": 13,
                        "height": 20
                    }, {
                        "type": "stn",
                        "id": "site-1013",
                        "text": "1013",
                        "top": 190,
                        "left": 1550,
                        "width": 60,
                        "font-size": 13,
                        "height": 20
                    },{
                        "type": "stn",
                        "id": "site-1113",
                        "text": "1113",
                        "top": 190,
                        "left": 1611,
                        "width": 60,
                        "font-size": 13,
                        "height": 20
                    }
                    ,{"type": "stn", "id": "site-1014", "text": "1014", "top": 230, "left": 1550, "width": 60, "font-size": 13, "height": 20}
                    ,{"type": "stn", "id": "site-1114", "text": "1114", "top": 230, "left": 1611, "width": 60, "font-size": 13, "height": 20}
                    ,{"type": "stn", "id": "site-1015", "text": "1015", "top": 275, "left": 1550, "width": 60, "font-size": 13, "height": 20}
                    ,{"type": "stn", "id": "site-1115", "text": "1115", "top": 275, "left": 1611, "width": 60, "font-size": 13, "height": 20}
                    ,{"type": "stn", "id": "site-1016", "text": "1016", "top": 315, "left": 1550, "width": 60, "font-size": 13, "height": 20}
                    ,{"type": "stn", "id": "site-1116", "text": "1116", "top": 315, "left": 1611, "width": 60, "font-size": 13, "height": 20}
                    ,{"type": "stn", "id": "site-1017", "text": "1017", "top": 360, "left": 1550, "width": 60, "font-size": 13, "height": 20}
                    ,{"type": "stn", "id": "site-1117", "text": "1117", "top": 360, "left": 1611, "width": 60, "font-size": 13, "height": 20}
                    ,{"type": "stn", "id": "site-1701", "text": "1701", "top": 360, "left": 1672, "width": 60, "font-size": 13, "height": 20}
                    ,{"type": "stn", "id": "site-1002", "text": "1002", "top": 360, "left": 1733, "width": 60, "font-size": 13, "height": 20}
                    ,{"type": "stn", "id": "site-1001", "text": "1001", "top": 360, "left": 1794, "width": 60, "font-size": 13, "height": 20}
                    ,{"type": "stn", "id": "site-1018", "text": "1018", "top": 400, "left": 1550, "width": 60, "font-size": 13, "height": 20}
                    ,{"type": "stn", "id": "site-1118", "text": "1118", "top": 400, "left": 1611, "width": 60, "font-size": 13, "height": 20}
                    ,{"type": "stn", "id": "site-1019", "text": "1019", "top": 445, "left": 1550, "width": 60, "font-size": 13, "height": 20}
                    ,{"type": "stn", "id": "site-1119", "text": "1119", "top": 445, "left": 1611, "width": 60, "font-size": 13, "height": 20}
                    ,{"type": "stn", "id": "site-1004", "text": "1004", "top": 445, "left": 1733, "width": 60, "font-size": 13, "height": 20}
                    ,{"type": "stn", "id": "site-1003", "text": "1003", "top": 445, "left": 1794, "width": 60, "font-size": 13, "height": 20}
                    ,{"type": "stn", "id": "site-1020", "text": "1020", "top": 485, "left": 1550, "width": 60, "font-size": 13, "height": 20}
                    ,{"type": "stn", "id": "site-1120", "text": "1120", "top": 485, "left": 1611, "width": 60, "font-size": 13, "height": 20}
                    ,{"type": "stn", "id": "site-1021", "text": "1021", "top": 530, "left": 1550, "width": 60, "font-size": 13, "height": 20}
                    ,{"type": "stn", "id": "site-1121", "text": "1121", "top": 530, "left": 1611, "width": 60, "font-size": 13, "height": 20}
                    ,{"type": "stn", "id": "site-1006", "text": "1006", "top": 530, "left": 1733, "width": 60, "font-size": 13, "height": 20}
                    ,{"type": "stn", "id": "site-1005", "text": "1005", "top": 530, "left": 1794, "width": 60, "font-size": 13, "height": 20}
                    ,{"type": "stn", "id": "site-1022", "text": "1022", "top": 570, "left": 1550, "width": 60, "font-size": 13, "height": 20}
                    ,{"type": "stn", "id": "site-1122", "text": "1122", "top": 570, "left": 1611, "width": 60, "font-size": 13, "height": 20}
                    ,{"type": "stn", "id": "site-1023", "text": "1023", "top": 615, "left": 1550, "width": 60, "font-size": 13, "height": 20}
                    ,{"type": "stn", "id": "site-1123", "text": "1123", "top": 615, "left": 1611, "width": 60, "font-size": 13, "height": 20}
                    ,{"type": "stn", "id": "site-1008", "text": "1008", "top": 615, "left": 1733, "width": 60, "font-size": 13, "height": 20}
                    ,{"type": "stn", "id": "site-1007", "text": "1007", "top": 615, "left": 1794, "width": 60, "font-size": 13, "height": 20}
                    ,{"type": "stn", "id": "site-1024", "text": "1024", "top": 655, "left": 1550, "width": 60, "font-size": 13, "height": 20}
                    ,{"type": "stn", "id": "site-1124", "text": "1124", "top": 655, "left": 1611, "width": 60, "font-size": 13, "height": 20}
                    ,{"type": "stn", "id": "site-1125", "text": "1125", "top": 21, "left": 289, "width": 60, "font-size": 13, "height": 20}
                    ,{"type": "stn", "id": "site-1025", "text": "1025", "top": 21, "left": 350, "width": 60, "font-size": 13, "height": 20}
                    ,{"type": "stn", "id": "site-1126", "text": "1126", "top": 61, "left": 289, "width": 60, "font-size": 13, "height": 20}
                    ,{"type": "stn", "id": "site-1026", "text": "1026", "top": 61, "left": 350, "width": 60, "font-size": 13, "height": 20}
                    ,{"type": "stn", "id": "site-1127", "text": "1127", "top": 106, "left": 289, "width": 60, "font-size": 13, "height": 20}
                    ,{"type": "stn", "id": "site-1027", "text": "1027", "top": 106, "left": 350, "width": 60, "font-size": 13, "height": 20}
                    ,{"type": "stn", "id": "site-1128", "text": "1128", "top": 146, "left": 289, "width": 60, "font-size": 13, "height": 20}
                    ,{"type": "stn", "id": "site-1028", "text": "1028", "top": 146, "left": 350, "width": 60, "font-size": 13, "height": 20}
                    ,{"type": "stn", "id": "site-1042", "text": "1042", "top": 191, "left": 106, "width": 60, "font-size": 13, "height": 20}
                    ,{"type": "stn", "id": "site-1041", "text": "1041", "top": 191, "left": 167, "width": 60, "font-size": 13, "height": 20}
                    ,{"type": "stn", "id": "site-1702", "text": "1702", "top": 191, "left": 228, "width": 60, "font-size": 13, "height": 20}
                    ,{"type": "stn", "id": "site-1129", "text": "1129", "top": 191, "left": 289, "width": 60, "font-size": 13, "height": 20}
                    ,{"type": "stn", "id": "site-1029", "text": "1029", "top": 191, "left": 350, "width": 60, "font-size": 13, "height": 20}
                    ,{"type": "stn", "id": "site-1130", "text": "1130", "top": 231, "left": 289, "width": 60, "font-size": 13, "height": 20}
                    ,{"type": "stn", "id": "site-1030", "text": "1030", "top": 231, "left": 350, "width": 60, "font-size": 13, "height": 20}
                    ,{"type": "stn", "id": "site-1131", "text": "1131", "top": 276, "left": 289, "width": 60, "font-size": 13, "height": 20}
                    ,{"type": "stn", "id": "site-1031", "text": "1031", "top": 276, "left": 350, "width": 60, "font-size": 13, "height": 20}
                    ,{"type": "stn", "id": "site-1044", "text": "1044", "top": 316, "left": 106, "width": 60, "font-size": 13, "height": 20}
                    ,{"type": "stn", "id": "site-1043", "text": "1043", "top": 316, "left": 167, "width": 60, "font-size": 13, "height": 20}
                    ,{"type": "stn", "id": "site-1132", "text": "1132", "top": 316, "left": 289, "width": 60, "font-size": 13, "height": 20}
                    ,{"type": "stn", "id": "site-1032", "text": "1032", "top": 316, "left": 350, "width": 60, "font-size": 13, "height": 20}
                    ,{"type": "stn", "id": "site-1133", "text": "1133", "top": 361, "left": 289, "width": 60, "font-size": 13, "height": 20}
                    ,{"type": "stn", "id": "site-1033", "text": "1033", "top": 361, "left": 350, "width": 60, "font-size": 13, "height": 20}
                    ,{"type": "stn", "id": "site-1134", "text": "1134", "top": 401, "left": 289, "width": 60, "font-size": 13, "height": 20}
                    ,{"type": "stn", "id": "site-1034", "text": "1034", "top": 401, "left": 350, "width": 60, "font-size": 13, "height": 20}
                    ,{"type": "stn", "id": "site-1135", "text": "1135", "top": 446, "left": 289, "width": 60, "font-size": 13, "height": 20}
                    ,{"type": "stn", "id": "site-1035", "text": "1035", "top": 446, "left": 350, "width": 60, "font-size": 13, "height": 20}
                    ,{"type": "stn", "id": "site-1046", "text": "1046", "top": 486, "left": 106, "width": 60, "font-size": 13, "height": 20}
                    ,{"type": "stn", "id": "site-1045", "text": "1045", "top": 486, "left": 167, "width": 60, "font-size": 13, "height": 20}
                    ,{"type": "stn", "id": "site-1136", "text": "1136", "top": 486, "left": 289, "width": 60, "font-size": 13, "height": 20}
                    ,{"type": "stn", "id": "site-1036", "text": "1036", "top": 486, "left": 350, "width": 60, "font-size": 13, "height": 20}
                    ,{"type": "stn", "id": "site-1137", "text": "1137", "top": 531, "left": 289, "width": 60, "font-size": 13, "height": 20}
                    ,{"type": "stn", "id": "site-1037", "text": "1037", "top": 531, "left": 350, "width": 60, "font-size": 13, "height": 20}
                    ,{"type": "stn", "id": "site-1048", "text": "1048", "top": 571, "left": 106, "width": 60, "font-size": 13, "height": 20}
                    ,{"type": "stn", "id": "site-1047", "text": "1047", "top": 571, "left": 167, "width": 60, "font-size": 13, "height": 20}
                    ,{"type": "stn", "id": "site-1138", "text": "1138", "top": 571, "left": 289, "width": 60, "font-size": 13, "height": 20}
                    ,{"type": "stn", "id": "site-1038", "text": "1038", "top": 571, "left": 350, "width": 60, "font-size": 13, "height": 20}
                    ,{"type": "stn", "id": "site-1139", "text": "1139", "top": 616, "left": 289, "width": 60, "font-size": 13, "height": 20}
                    ,{"type": "stn", "id": "site-1039", "text": "1039", "top": 616, "left": 350, "width": 60, "font-size": 13, "height": 20}
                    ,{"type": "stn", "id": "site-1140", "text": "1140", "top": 656, "left": 289, "width": 60, "font-size": 13, "height": 20}
                    ,{"type": "stn", "id": "site-1040", "text": "1040", "top": 656, "left": 350, "width": 60, "font-size": 13, "height": 20}
                ]
            }
        ]
src/main/webapp/views/console.html
@@ -10,15 +10,19 @@
    <script src="../static/js/console.map.js"></script>
    <script src="../static/js/console.js"></script>
    <script src="../static/js/common.js"></script>
    <style>
         .site{
             font-size: 12px;
         }
    </style>
</head>
<body>
    <div id="main">
        <div class="head">
            <div class="head-left">
                <h1>自动仓库WCS监控图</h1>
                <h6>AUTOMATIC WAREHOUSE WCS MONITORING DIAGRAM</h6>
                <h1>立体库WCS监控图</h1>
                <h6>THREE-DIMENSIONAL WAREHOUSE WCS MONITORING MAP</h6>
            </div>
<!--            <div class="head-right">-->
<!--                <img src="../static/images/zy-logo.png" alt="中扬" height="44" width="80">-->
@@ -600,7 +604,7 @@
                            crns[i].bay = 1
                        }
                        var offSet = 350;
                        var offSet = 410;
                        if(crns[i].bay === 1){
                            crnEl.animate({left: offSet + 'px'}, 1000);
src/main/webapp/views/crn.html
@@ -142,10 +142,14 @@
                <div id="crn-select" class="operator-item" style="width: 55%">
                    <span class="select-title">堆垛机号</span>
                    <div class="select-container" style="padding: 20px 0;">
                        <label><input type="radio" name="crnSelect" value="1" checked>&nbsp;1号堆垛机</label>
                        <label><input type="radio" name="crnSelect" value="2">&nbsp;2号堆垛机</label>
<!--                        <label><input type="radio" name="crnSelect" value="3">&nbsp;3号堆垛机</label>-->
<!--                        <label><input type="radio" name="crnSelect" value="4">&nbsp;4号堆垛机</label>-->
                        <label><input type="radio" name="crnSelect" value="1" checked>1号堆垛机</label>
                        <label><input type="radio" name="crnSelect" value="2">2号堆垛机</label>
                        <label><input type="radio" name="crnSelect" value="3">3号堆垛机</label>
                        <label><input type="radio" name="crnSelect" value="4">4号堆垛机</label>
                        <label><input type="radio" name="crnSelect" value="5">5号堆垛机</label>
                        <label><input type="radio" name="crnSelect" value="6">6号堆垛机</label>
                        <label><input type="radio" name="crnSelect" value="7">7号堆垛机</label>
                        <label><input type="radio" name="crnSelect" value="8">8号堆垛机</label>
                    </div>
                </div>
                <!-- 源站/源库位 选择 -->
src/main/webapp/views/render/asda.css
@@ -7,7 +7,7 @@
}
.sidebar {
    width: 8%;
    width: 6%;
    height: 40%;
    line-height: 5.625em;
    position: fixed;