From ddf4e077b77a990c6b7960eb77f2b95e2d475a0b Mon Sep 17 00:00:00 2001
From: lsh <lsh@163.com>
Date: 星期五, 26 四月 2024 15:39:50 +0800
Subject: [PATCH] #
---
src/main/webapp/static/js/console.map.js | 582 +++++++++++++++++++++++++++++-----------------------
src/main/resources/application.yml | 24 ++
2 files changed, 351 insertions(+), 255 deletions(-)
diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml
index 0bf3931..80543e2 100644
--- a/src/main/resources/application.yml
+++ b/src/main/resources/application.yml
@@ -92,6 +92,30 @@
row: 5
bay: 2
lev: 1
+ # 鍫嗗灈鏈�3
+ crn[2]:
+ id: 3
+ ip: 10.10.10.110
+ port: 102
+ rack: 0
+ slot: 0
+ # 鍋忕Щ閲忥紝褰撳爢鍨涙満绔欑偣鍒楀彿=1鏃讹紝鍋忕Щ閲�=2
+ offset: 2
+ demo: false
+ # 鍫嗗灈鏈哄叆搴撶珯鐐�
+ crnInStn[0]:
+ devpPlcId: ${wcs-slave.devp[0].id}
+ staNo: 107
+ row: 4
+ bay: 1
+ lev: 1
+ # 鍫嗗灈鏈哄嚭搴撶珯鐐�
+ crnOutStn[0]:
+ devpPlcId: ${wcs-slave.devp[0].id}
+ staNo: 102
+ row: 5
+ bay: 2
+ lev: 1
# 杈撻�佺嚎1
devp[0]:
diff --git a/src/main/webapp/static/js/console.map.js b/src/main/webapp/static/js/console.map.js
index 76cde21..a7e1e4c 100644
--- a/src/main/webapp/static/js/console.map.js
+++ b/src/main/webapp/static/js/console.map.js
@@ -1,275 +1,347 @@
mapInfo = {
"mapName": "SXJZWCS",
- "rackCount": 5,
- "crnCount": 2,
- "stbCount": 13,
+ "rackCount": 16,
+ "crnCount": 4,
+ "stbCount": 16,
"hpPosition": 0,
- "minBayNo": 1,
+ "minBayNo": 2,
"floors": 1,
- "racks": [
- {
- "type": "rack",
- "id": "rack3",
- "top": 278,
- "left": 463,
- "width": 846,
- "height": 24,
- "minBayNo": 1,
- "maxBayNo": 29
- },
- {
- "type": "rack",
- "id": "rack4",
- "top": 305,
- "left": 463,
- "width": 846,
- "height": 24,
- "minBayNo": 1,
- "maxBayNo": 29
- },
- {
- "type": "rack",
- "id": "rack5",
- "top": 363,
- "left": 480,
- "width": 829,
- "height": 24,
- "minBayNo": 1,
- "maxBayNo": 28
- },
- {
- "type": "rack",
- "id": "rack1",
- "top": 168,
- "left": 463,
- "width": 846,
- "height": 24,
- "minBayNo": 1,
- "maxBayNo": 29
- },
- {
- "type": "rack",
- "id": "rack2",
- "top": 226,
- "left": 463,
- "width": 846,
- "height": 24,
- "minBayNo": 1,
- "maxBayNo": 29
- }
- ],
- "rackDescs": [
- {
- "type": "rackDescs",
- "id": "lb_desc2",
- "text": "#5",
- "top": 393,
- "left": 1246,
- "width": 32,
- "height": 23
- },
- {
- "type": "rackDescs",
- "id": "lb_desc1",
- "text": "#1",
- "top": 142,
- "left": 1249,
- "width": 30,
- "height": 23
- }
- ],
+ "racks": [{
+ "type": "rack",
+ "id": "rack1",
+ "top": 45,
+ "left": 650,
+ "width": 917,
+ "height": 22,
+ "minBayNo": 2,
+ "maxBayNo": 29
+ }, {
+ "type": "rack",
+ "id": "rack2",
+ "top": 67,
+ "left": 650,
+ "width": 917,
+ "height": 22,
+ "minBayNo": 2,
+ "maxBayNo": 29
+ }, {
+ "type": "rack",
+ "id": "rack3",
+ "top": 115,
+ "left": 650,
+ "width": 917,
+ "height": 22,
+ "minBayNo": 2,
+ "maxBayNo": 29
+ }, {
+ "type": "rack",
+ "id": "rack4",
+ "top": 137,
+ "left": 650,
+ "width": 917,
+ "height": 22,
+ "minBayNo": 2,
+ "maxBayNo": 29
+ }, {
+ "type": "rack",
+ "id": "rack5",
+ "top": 159,
+ "left": 650,
+ "width": 917,
+ "height": 22,
+ "minBayNo": 2,
+ "maxBayNo": 29
+ }, {
+ "type": "rack",
+ "id": "rack6",
+ "top": 181,
+ "left": 650,
+ "width": 917,
+ "height": 22,
+ "minBayNo": 2,
+ "maxBayNo": 29
+ }, {
+ "type": "rack",
+ "id": "rack7",
+ "top": 229,
+ "left": 650,
+ "width": 917,
+ "height": 22,
+ "minBayNo": 2,
+ "maxBayNo": 29
+ }, {
+ "type": "rack",
+ "id": "rack8",
+ "top": 251,
+ "left": 650,
+ "width": 917,
+ "height": 22,
+ "minBayNo": 2,
+ "maxBayNo": 29
+ }, {
+ "type": "rack",
+ "id": "rack9",
+ "top": 273,
+ "left": 650,
+ "width": 917,
+ "height": 22,
+ "minBayNo": 2,
+ "maxBayNo": 29
+ }, {
+ "type": "rack",
+ "id": "rack10",
+ "top": 295,
+ "left": 650,
+ "width": 917,
+ "height": 22,
+ "minBayNo": 2,
+ "maxBayNo": 29
+ }, {
+ "type": "rack",
+ "id": "rack11",
+ "top": 343,
+ "left": 650,
+ "width": 917,
+ "height": 22,
+ "minBayNo": 2,
+ "maxBayNo": 29
+ }, {
+ "type": "rack",
+ "id": "rack12",
+ "top": 365,
+ "left": 650,
+ "width": 917,
+ "height": 22,
+ "minBayNo": 2,
+ "maxBayNo": 29
+ }],
+ "rackDescs": [{
+ "type": "rackDescs",
+ "id": "lb_desc16",
+ "text": "#1",
+ "top": 45,
+ "left": 1570,
+ "width": 30,
+ "height": 23
+ }, {
+ "type": "rackDescs",
+ "id": "lb_desc1",
+ "text": "#12",
+ "top": 365,
+ "left": 1570,
+ "width": 41,
+ "height": 23
+ }, {
+ "type": "rackDescs",
+ "id": "lb_desc100",
+ "text": "<=鍑哄簱<=",
+ "top": 48,
+ "left": 550,
+ "width": 100,
+ "height": 23
+ }, {
+ "type": "rackDescs",
+ "id": "lb_desc103",
+ "text": "=>鍏ュ簱=>",
+ "top": 138,
+ "left": 550,
+ "width": 100,
+ "height": 23
+ }, {
+ "type": "rackDescs",
+ "id": "lb_desc103",
+ "text": "<=鍑哄簱<=",
+ "top": 162,
+ "left": 550,
+ "width": 100,
+ "height": 23
+ }],
"crns": [{
"type": "crane",
"id": "crn-1",
"text": "1",
- "top": 199,
- "left": 606,
+ "top": 96,
+ "left": 739,
"width": 93,
"height": 22
- },
- {
- "type": "crane",
- "id": "crn-2",
- "text": "2",
- "top": 336,
- "left": 606,
- "width": 93,
- "height": 22
- },{
+ }, {
"type": "track",
"id": "lb_track1",
"text": "",
- "top": 210,
- "left": 386,
- "width": 943,
+ "top": 106,
+ "left": 573,
+ "width": 1042,
"height": 2
+ }, {
+ "type": "crane",
+ "id": "crn-2",
+ "text": "2",
+ "top": 210,
+ "left": 739,
+ "width": 93,
+ "height": 22
}, {
"type": "track",
"id": "lb_track2",
"text": "",
- "top": 347,
- "left": 386,
- "width": 943,
+ "top": 220,
+ "left": 573,
+ "width": 1042,
"height": 2
- }
- ],
- "areas": [
- {
- "type": "Control_floor",
- "id": "tabControl_floor1",
- "text": "妤煎眰",
- "top": 89,
- "left": 99,
- "width": 1569,
- "height": 593,
- "floors": [
- {
- "type": "floor",
- "id": "page_floor1",
- "text": "1F",
- "top": 4,
- "left": 22,
- "width": 1543,
- "height": 585,
- "stns": [
- {
- "type": "stn",
- "id": "site-100",
- "text": "100",
- "top": 415,
- "left": 402,
- "width": 60,
- "height": 24
- },
- {
- "type": "stn",
- "id": "site-105",
- "text": "105",
- "top": 415,
- "left": 341,
- "width": 60,
- "height": 24
- },
- {
- "type": "stn",
- "id": "site-1000",
- "text": "1000",
- "top": 330,
- "left": 279,
- "width": 60,
- "height": 24
- },
- {
- "type": "track",
- "id": "lb_trCart11",
- "text": "",
- "top": 157,
- "left": 283,
- "width": 4,
- "height": 267
- },
- {
- "type": "track",
- "id": "lb_trCart12",
- "text": "",
- "top": 157,
- "left": 330,
- "width": 4,
- "height": 267
- },
- {
- "type": "stn",
- "id": "site-102",
- "text": "102",
- "top": 363,
- "left": 402,
- "width": 60,
- "height": 24
- },
- {
- "type": "stn",
- "id": "site-103",
- "text": "103",
- "top": 363,
- "left": 341,
- "width": 60,
- "height": 24
- },
- {
- "type": "stn",
- "id": "site-107",
- "text": "107",
- "top": 305,
- "left": 402,
- "width": 60,
- "height": 24
- },
- {
- "type": "stn",
- "id": "site-106",
- "text": "106",
- "top": 305,
- "left": 341,
- "width": 60,
- "height": 24
- },
- {
- "type": "stn",
- "id": "site-109",
- "text": "109",
- "top": 226,
- "left": 402,
- "width": 60,
- "height": 24
- },
- {
- "type": "stn",
- "id": "site-108",
- "text": "108",
- "top": 226,
- "left": 341,
- "width": 60,
- "height": 24
- },
- {
- "type": "stn",
- "id": "site-111",
- "text": "111",
- "top": 168,
- "left": 402,
- "width": 60,
- "height": 24
- },
- {
- "type": "stn",
- "id": "site-104",
- "text": "104",
- "top": 389,
- "left": 341,
- "width": 60,
- "height": 24
- },
- {
- "type": "stn",
- "id": "site-101",
- "text": "101",
- "top": 389,
- "left": 402,
- "width": 60,
- "height": 24
- },
- {
- "type": "stn",
- "id": "site-110",
- "text": "110",
- "top": 168,
- "left": 341,
- "width": 60,
- "height": 24
- }
- ]
- }
- ]
- }
- ]
+ }, {
+ "type": "crane",
+ "id": "crn-3",
+ "text": "3",
+ "top": 324,
+ "left": 739,
+ "width": 93,
+ "height": 22
+ }, {
+ "type": "track",
+ "id": "lb_track3",
+ "text": "",
+ "top": 334,
+ "left": 573,
+ "width": 1042,
+ "height": 2
+ }],
+ "areas": [{
+ "type": "Control_floor",
+ "id": "tabControl_floor1",
+ "text": "妤煎眰",
+ "top": 68,
+ "left": 80,
+ "width": 1400,
+ "height": 680,
+ "floors": [{
+ "type": "floor",
+ "id": "page_floor1",
+ "text": "1F",
+ "top": 4,
+ "left": 22,
+ "width": 1374,
+ "height": 672,
+ "stns": [{
+ "type": "stn",
+ "id": "site-100",
+ "text": "100",
+ "top": 69,
+ "left": 601,
+ "width": 49,
+ "height": 20
+ }, {
+ "type": "stn",
+ "id": "site-101",
+ "text": "101",
+ "top": 69,
+ "left": 550,
+ "width": 49,
+ "height": 20
+ }, {
+ "type": "stn",
+ "id": "site-102",
+ "text": "102",
+ "top": 90,
+ "left": 550,
+ "width": 49,
+ "height": 24
+ }, {
+ "type": "stn",
+ "id": "site-103",
+ "text": "103",
+ "top": 115,
+ "left": 550,
+ "width": 49,
+ "height": 20
+ }, {
+ "type": "stn",
+ "id": "site-104",
+ "text": "104",
+ "top": 115,
+ "left": 601,
+ "width": 49,
+ "height": 20
+ }, {
+ "type": "stn",
+ "id": "site-200",
+ "text": "200",
+ "top": 183,
+ "left": 601,
+ "width": 49,
+ "height": 20
+ }, {
+ "type": "stn",
+ "id": "site-201",
+ "text": "201",
+ "top": 183,
+ "left": 550,
+ "width": 49,
+ "height": 20
+ }, {
+ "type": "stn",
+ "id": "site-202",
+ "text": "202",
+ "top": 204,
+ "left": 550,
+ "width": 49,
+ "height": 26
+ }, {
+ "type": "stn",
+ "id": "site-203",
+ "text": "203",
+ "top": 231,
+ "left": 550,
+ "width": 49,
+ "height": 20
+ }, {
+ "type": "stn",
+ "id": "site-204",
+ "text": "204",
+ "top": 231,
+ "left": 601,
+ "width": 49,
+ "height": 20
+ }, {
+ "type": "stn",
+ "id": "site-300",
+ "text": "300",
+ "top": 297,
+ "left": 601,
+ "width": 49,
+ "height": 20
+ }, {
+ "type": "stn",
+ "id": "site-301",
+ "text": "301",
+ "top": 297,
+ "left": 550,
+ "width": 49,
+ "height": 20
+ }, {
+ "type": "stn",
+ "id": "site-302",
+ "text": "302",
+ "top": 318,
+ "left": 550,
+ "width": 49,
+ "height": 26
+ }, {
+ "type": "stn",
+ "id": "site-303",
+ "text": "303",
+ "top": 345,
+ "left": 550,
+ "width": 49,
+ "height": 20
+ }, {
+ "type": "stn",
+ "id": "site-304",
+ "text": "304",
+ "top": 345,
+ "left": 601,
+ "width": 49,
+ "height": 20
+ }]
+ }]
+ }]
}
\ No newline at end of file
--
Gitblit v1.9.1