#
whycq
2022-10-12 76fff6bbd6ef4f2ff99ab3ae5d6c3e290fee3c21
#
2个文件已修改
36 ■■■■ 已修改文件
src/main/resources/application.yml 6 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/webapp/static/js/console.map.js 30 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/resources/application.yml
@@ -8,7 +8,7 @@
    name: @pom.build.finalName@
  datasource:
    driver-class-name: com.microsoft.sqlserver.jdbc.SQLServerDriver
    url: jdbc:sqlserver://localhost:1433;databasename=hylyasrs
    url: jdbc:sqlserver://10.10.10.210:1433;databasename=hylyasrs
    username: sa
    password: sa@123
  mvc:
@@ -34,7 +34,7 @@
  enable: false
wms:
  url: localhost:8081/lywms
  url: 10.10.10.210:8080/lywms
# 下位机配置
wcs-slave:
@@ -281,7 +281,7 @@
    ip: 10.10.10.204
    port: 5005
    devpPlcId: ${wcs-slave.devp[0].id}
    staArr: 203
    staArr: 204
  # LED5
  led[4]:
    id: 5
src/main/webapp/static/js/console.map.js
@@ -279,18 +279,9 @@
        },
        {
            "type": "rackDescs",
            "id": "lb_desc13",
            "text": "#13",
            "id": "lb_desc16",
            "text": "#16",
            "top": 514,
            "left": 1460,
            "width": 41,
            "height": 23
        },
        {
            "type": "rackDescs",
            "id": "lb_desc14",
            "text": "#14",
            "top": 540,
            "left": 1460,
            "width": 41,
            "height": 23
@@ -299,6 +290,15 @@
            "type": "rackDescs",
            "id": "lb_desc15",
            "text": "#15",
            "top": 540,
            "left": 1460,
            "width": 41,
            "height": 23
        },
        {
            "type": "rackDescs",
            "id": "lb_desc14",
            "text": "#14",
            "top": 610,
            "left": 1460,
            "width": 41,
@@ -306,8 +306,8 @@
        },
        {
            "type": "rackDescs",
            "id": "lb_desc16",
            "text": "#16",
            "id": "lb_desc13",
            "text": "#13",
            "top": 636,
            "left": 1460,
            "width": 41,
@@ -638,7 +638,7 @@
                            "type": "stn",
                            "id": "site-401",
                            "text": "401",
                            "top": 538,
                            "top": 612,
                            "left": 326,
                            "width": 100,
                            "height": 24
@@ -647,7 +647,7 @@
                            "type": "stn",
                            "id": "site-402",
                            "text": "402",
                            "top": 538,
                            "top": 612,
                            "left": 224,
                            "width": 100,
                            "height": 24