From aa3d08ed6cea76bd1dfbb8c4d919b33538544977 Mon Sep 17 00:00:00 2001
From: whycq <10027870+whycq@user.noreply.gitee.com>
Date: 星期六, 03 十二月 2022 12:59:10 +0800
Subject: [PATCH] #
---
src/main/webapp/static/js/console.map.js | 30 ++--------
src/main/resources/application.yml | 128 +-----------------------------------------
2 files changed, 10 insertions(+), 148 deletions(-)
diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml
index 9073cba..36d4881 100644
--- a/src/main/resources/application.yml
+++ b/src/main/resources/application.yml
@@ -35,14 +35,14 @@
enable: false
wms:
- url: localhost:8080/lfdwms
+ url: localhost:8080/nbjfwms
# 涓嬩綅鏈洪厤缃�
wcs-slave:
# 鍙屾繁
doubleDeep: true
# 鍙屾繁搴撲綅鎺掑彿
- doubleLocs: 9,12,15,18
+ doubleLocs: 1,4,5,8
# 涓�涓爢鍨涙満璐熻矗鐨勮揣鏋舵帓鏁�
groupCount: 4
# 鍫嗗灈鏈�1
@@ -58,8 +58,8 @@
# 鍫嗗灈鏈哄叆搴撶珯鐐�
crnInStn[0]:
devpPlcId: ${wcs-slave.devp[0].id}
- staNo: 105
- row: 1
+ staNo: 102
+ row: 2
bay: 1
lev: 1
# 鍫嗗灈鏈哄嚭搴撶珯鐐�
@@ -91,126 +91,6 @@
devpPlcId: ${wcs-slave.devp[0].id}
staNo: 114
row: 4
- bay: 1
- lev: 1
- # 鍫嗗灈鏈�3
- crn[2]:
- id: 3
- ip: 10.10.10.121
- port: 102
- rack: 0
- slot: 0
- # 鍋忕Щ閲忥紝褰撳爢鍨涙満绔欑偣鍒楀彿=1鏃讹紝鍋忕Щ閲�=2
- offset: 2
- demo: false
- # 鍫嗗灈鏈哄叆搴撶珯鐐�
- crnInStn[0]:
- devpPlcId: ${wcs-slave.devp[0].id}
- staNo: 121
- row: 5
- bay: 1
- lev: 1
- # 鍫嗗灈鏈哄嚭搴撶珯鐐�
- crnOutStn[0]:
- devpPlcId: ${wcs-slave.devp[0].id}
- staNo: 122
- row: 6
- bay: 1
- lev: 1
- # 鍫嗗灈鏈�4
- crn[3]:
- id: 4
- ip: 10.10.10.121
- port: 102
- rack: 0
- slot: 0
- # 鍋忕Щ閲忥紝褰撳爢鍨涙満绔欑偣鍒楀彿=1鏃讹紝鍋忕Щ閲�=2
- offset: 2
- demo: false
- # 鍫嗗灈鏈哄叆搴撶珯鐐�
- crnInStn[0]:
- devpPlcId: ${wcs-slave.devp[0].id}
- staNo: 129
- row: 7
- bay: 1
- lev: 1
- # 鍫嗗灈鏈哄嚭搴撶珯鐐�
- crnOutStn[0]:
- devpPlcId: ${wcs-slave.devp[0].id}
- staNo: 130
- row: 8
- bay: 1
- lev: 1
- # 鍫嗗灈鏈�5
- crn[4]:
- id: 5
- ip: 10.10.10.121
- port: 102
- rack: 0
- slot: 0
- # 鍋忕Щ閲忥紝褰撳爢鍨涙満绔欑偣鍒楀彿=1鏃讹紝鍋忕Щ閲�=2
- offset: 2
- demo: false
- # 鍫嗗灈鏈哄叆搴撶珯鐐�
- crnInStn[0]:
- devpPlcId: ${wcs-slave.devp[0].id}
- staNo: 202
- row: 10
- bay: 1
- lev: 1
- # 鍫嗗灈鏈哄嚭搴撶珯鐐�
- crnOutStn[0]:
- devpPlcId: ${wcs-slave.devp[0].id}
- staNo: 203
- row: 11
- bay: 1
- lev: 1
- # 鍫嗗灈鏈�6
- crn[5]:
- id: 6
- ip: 10.10.10.121
- port: 102
- rack: 0
- slot: 0
- # 鍋忕Щ閲忥紝褰撳爢鍨涙満绔欑偣鍒楀彿=1鏃讹紝鍋忕Щ閲�=2
- offset: 2
- demo: false
- # 鍫嗗灈鏈哄叆搴撶珯鐐�
- crnInStn[0]:
- devpPlcId: ${wcs-slave.devp[0].id}
- staNo: 208
- row: 13
- bay: 1
- lev: 1
- # 鍫嗗灈鏈哄嚭搴撶珯鐐�
- crnOutStn[0]:
- devpPlcId: ${wcs-slave.devp[0].id}
- staNo: 209
- row: 14
- bay: 1
- lev: 1
- # 鍫嗗灈鏈�7
- crn[6]:
- id: 7
- ip: 10.10.10.121
- port: 102
- rack: 0
- slot: 0
- # 鍋忕Щ閲忥紝褰撳爢鍨涙満绔欑偣鍒楀彿=1鏃讹紝鍋忕Щ閲�=2
- offset: 2
- demo: false
- # 鍫嗗灈鏈哄叆搴撶珯鐐�
- crnInStn[0]:
- devpPlcId: ${wcs-slave.devp[0].id}
- staNo: 214
- row: 16
- bay: 1
- lev: 1
- # 鍫嗗灈鏈哄嚭搴撶珯鐐�
- crnOutStn[0]:
- devpPlcId: ${wcs-slave.devp[0].id}
- staNo: 215
- row: 17
bay: 1
lev: 1
# 杈撻�佺嚎1
diff --git a/src/main/webapp/static/js/console.map.js b/src/main/webapp/static/js/console.map.js
index 19fd069..39b1a19 100644
--- a/src/main/webapp/static/js/console.map.js
+++ b/src/main/webapp/static/js/console.map.js
@@ -321,19 +321,10 @@
},
{
"type": "stn",
- "id": "site-206",
- "text": "206",
- "top": 358,
- "left": 1342,
- "width": 89,
- "height": 20
- },
- {
- "type": "stn",
"id": "site-205",
"text": "205",
"top": 358,
- "left": 1432,
+ "left": 1342,
"width": 89,
"height": 20
},
@@ -342,7 +333,7 @@
"id": "site-204",
"text": "204",
"top": 358,
- "left": 1522,
+ "left": 1432,
"width": 89,
"height": 20
},
@@ -351,7 +342,7 @@
"id": "site-203",
"text": "203",
"top": 358,
- "left": 1612,
+ "left": 1522,
"width": 89,
"height": 20
},
@@ -395,19 +386,10 @@
},
{
"type": "stn",
- "id": "site-306",
- "text": "306",
- "top": 358,
- "left": 1342,
- "width": 89,
- "height": 20
- },
- {
- "type": "stn",
"id": "site-305",
"text": "305",
"top": 358,
- "left": 1432,
+ "left": 1342,
"width": 89,
"height": 20
},
@@ -416,7 +398,7 @@
"id": "site-304",
"text": "304",
"top": 358,
- "left": 1522,
+ "left": 1432,
"width": 89,
"height": 20
},
@@ -425,7 +407,7 @@
"id": "site-303",
"text": "303",
"top": 358,
- "left": 1612,
+ "left": 1522,
"width": 89,
"height": 20
},
--
Gitblit v1.9.1