From e06745fc25abbc3ad0d3a23592d516b2392f3d3f Mon Sep 17 00:00:00 2001
From: zjj <3272660260@qq.com>
Date: 星期五, 22 八月 2025 13:59:34 +0800
Subject: [PATCH] #
---
src/main/webapp/views/console.html | 12 ---
src/main/webapp/static/js/console.map.js | 97 ++++++++++++++++++-------------
src/main/resources/application.yml | 39 ++++++++++++
3 files changed, 96 insertions(+), 52 deletions(-)
diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml
index 5e452aa..388f6db 100644
--- a/src/main/resources/application.yml
+++ b/src/main/resources/application.yml
@@ -202,7 +202,44 @@
row: 6
bay: 1
lev: 3
-
+ # 鍫嗗灈鏈�3
+ crn[2]:
+ id: 3
+ ip: 10.200.51.189
+ port: 102
+ rack: 0
+ slot: 0
+ # 鍋忕Щ閲忥紝褰撳爢鍨涙満绔欑偣鍒楀彿=1鏃讹紝鍋忕Щ閲�=2
+ offset: 0
+ demo: false
+ # 鍫嗗灈鏈哄叆搴撶珯鐐�
+ crnInStn[0]:
+ devpPlcId: ${wcs-slave.devp[1].id}
+ staNo: 1033
+ row: 11
+ bay: 47
+ lev: 1
+ # 鍫嗗灈鏈哄嚭搴撶珯鐐�
+ crnOutStn[0]:
+ devpPlcId: ${wcs-slave.devp[1].id}
+ staNo: 1031
+ row: 10
+ bay: 47
+ lev: 1
+ # 鍫嗗灈鏈哄叆搴撶珯鐐�
+ crnInStn[1]:
+ devpPlcId: ${wcs-slave.devp[1].id}
+ staNo: 2008
+ row: 11
+ bay: 47
+ lev: 2
+ # 鍫嗗灈鏈哄嚭搴撶珯鐐�
+ crnOutStn[1]:
+ devpPlcId: ${wcs-slave.devp[1].id}
+ staNo: 2008
+ row: 10
+ bay: 47
+ lev: 2
# 杈撻�佺嚎1
devp[0]:
id: 1
diff --git a/src/main/webapp/static/js/console.map.js b/src/main/webapp/static/js/console.map.js
index 083ff4e..1b2e7e4 100644
--- a/src/main/webapp/static/js/console.map.js
+++ b/src/main/webapp/static/js/console.map.js
@@ -78,6 +78,42 @@
"height": 22,
"minBayNo": 1,
"maxBayNo": 47
+ }, {
+ "type": "rack",
+ "id": "rack8",
+ "top": 393,
+ "left": 529,
+ "width": 1000,
+ "height": 22,
+ "minBayNo": 1,
+ "maxBayNo": 47
+ }, {
+ "type": "rack",
+ "id": "rack7",
+ "top": 415,
+ "left": 529,
+ "width": 1000,
+ "height": 22,
+ "minBayNo": 1,
+ "maxBayNo": 47
+ }, {
+ "type": "rack",
+ "id": "rack6",
+ "top": 460,
+ "left": 529,
+ "width": 1000,
+ "height": 22,
+ "minBayNo": 1,
+ "maxBayNo": 47
+ }, {
+ "type": "rack",
+ "id": "rack5",
+ "top": 482,
+ "left": 529,
+ "width": 1000,
+ "height": 22,
+ "minBayNo": 1,
+ "maxBayNo": 47
}],
"rackDescs": [{
"type": "rackDescs",
@@ -125,6 +161,22 @@
"id": "crn-2",
"text": "2",
"top": 325,
+ "left": 490,
+ "width": 93,
+ "height": 22
+ },{
+ "type": "track",
+ "id": "lb_track3",
+ "text": "",
+ "top": 450,
+ "left": 490,
+ "width": 1050,
+ "height": 2
+ }, {
+ "type": "crane",
+ "id": "crn-3",
+ "text": "3",
+ "top": 440,
"left": 490,
"width": 93,
"height": 22
@@ -482,46 +534,9 @@
"top": 749,
"left": 470,
"width": 80,
- "height": 20
- },
- {
- "type": "barcode",
- "id": "barcode-2",
- "text": "",
- "top": 684,
- "left": 470,
- "width": 80,
- "height": 20
- } ,
- {
- "type": "barcode",
- "id": "barcode-3",
- "text": "",
- "top": 64.5,
- "left": 470,
- "width": 80,
- "height": 20
+ "height": 0
}
- ,
- {
- "type": "barcode",
- "id": "barcode-4",
- "text": "",
- "top": 749,
- "left": 560,
- "width": 150,
- "height": 20
- }
- ,
- {
- "type": "barcode",
- "id": "barcode-5",
- "text": "",
- "top": 684,
- "left": 560,
- "width": 150,
- "height": 20
- }
+
]
},{
"type": "floor",
@@ -705,7 +720,7 @@
"top": 749,
"left": 470,
"width": 80,
- "height": 20
+ "height": 0
},
]
@@ -808,7 +823,7 @@
"top": 749,
"left": 470,
"width": 80,
- "height": 20
+ "height": 0
},
]
diff --git a/src/main/webapp/views/console.html b/src/main/webapp/views/console.html
index dcbc329..f5d3645 100644
--- a/src/main/webapp/views/console.html
+++ b/src/main/webapp/views/console.html
@@ -608,18 +608,10 @@
case 1:
case 2:
case 3:
- unit = 35;
+ unit = 20;
offSet = 500;
break;
- case 5:
- unit = 124;
- offSet = 550;
- break;
- case 4:
- case 6:
- unit = 62;
- offSet = 550;
- break;
+
}
if(crns[i].bay === 1){
--
Gitblit v1.9.1