From 4f47d0af9617511e475879eff74e7788a429d9fd Mon Sep 17 00:00:00 2001 From: whycq <whycq> Date: 星期五, 27 五月 2022 14:55:19 +0800 Subject: [PATCH] # ycq --- src/main/webapp/views/test.html | 27 src/main/webapp/views/render.js | 2122 ++++++++++++++++++++++++++++++++++----------------------- src/main/webapp/static/css/render.css | 14 src/main/webapp/views/pipeline.html | 2 src/main/webapp/views/render.html | 2 src/main/webapp/views/ren.js | 0 6 files changed, 1,306 insertions(+), 861 deletions(-) diff --git a/src/main/webapp/static/css/render.css b/src/main/webapp/static/css/render.css index 6f7e0a4..fec261b 100644 --- a/src/main/webapp/static/css/render.css +++ b/src/main/webapp/static/css/render.css @@ -12,6 +12,7 @@ width: 100%; background-color: rgb(108,167,168); } + .head { height: 10%; width: 100%; @@ -72,12 +73,24 @@ position: absolute; display: inline-block; background-color: #000000; + z-index: 5; } .item { border: 1px solid rgb(194,76,65); color: rgb(194,76,65); height: 100%; width: 100%; +} + +.floorBtn { + position: absolute; + /*border: 1px solid rgb(108, 167, 168);*/ + top: 10px; + color: #000000; + font-size: 24px; + font-weight: 500; + letter-spacing: 5px; + cursor:pointer; } /*鎿嶄綔鏄剧ず鏍�*/ @@ -239,6 +252,7 @@ text-align: center; background-color: rgb(120,255,129); font-size: 14px; + z-index: 9; } /*绌虹珯鐐�*/ .site-k { diff --git a/src/main/webapp/views/pipeline.html b/src/main/webapp/views/pipeline.html index b7a54e0..56decc6 100644 --- a/src/main/webapp/views/pipeline.html +++ b/src/main/webapp/views/pipeline.html @@ -119,8 +119,6 @@ </div> </div> - - </body> <script> // 鍒濆鍖� diff --git a/src/main/webapp/views/ren.js b/src/main/webapp/views/ren.js new file mode 100644 index 0000000..e69de29 --- /dev/null +++ b/src/main/webapp/views/ren.js diff --git a/src/main/webapp/views/render.html b/src/main/webapp/views/render.html index b8c025e..36f5c3f 100644 --- a/src/main/webapp/views/render.html +++ b/src/main/webapp/views/render.html @@ -66,7 +66,7 @@ <div class="body-head">杈撻�佺嚎鐘舵��</div> <div class="state states"> <span>杩愯緭绾挎�绘暟</span> - <span class="line-ss">58</span> + <span id="line-total" class="line-ss"></span> </div> <div class="button"><span>鎵�鏈夌姸鎬�</span></div> <div class="button item-group"> diff --git a/src/main/webapp/views/render.js b/src/main/webapp/views/render.js index e781726..8a80bb0 100644 --- a/src/main/webapp/views/render.js +++ b/src/main/webapp/views/render.js @@ -1,4 +1,4 @@ -firstFloor = { +newData = { "mapName": "鍏嬪姵鏂帥鑿瞁CS", "rackCount": 12, "crnCount": 3, @@ -7,622 +7,622 @@ "minBayNo": 2, "floors": 1, "racks": [ - { - "type": "rack", - "id": "rack12", - "top": 646, - "left": 324, - "width": 887, - "height": 30, - "minBayNo": 2, - "maxBayNo": 52 - }, - { - "type": "rack", - "id": "rack11", - "top": 613, - "left": 324, - "width": 887, - "height": 30, - "minBayNo": 2, - "maxBayNo": 52 - }, - { - "type": "rack", - "id": "rack10", - "top": 516, - "left": 324, - "width": 887, - "height": 30, - "minBayNo": 2, - "maxBayNo": 52 - }, - { - "type": "rack", - "id": "rack9", - "top": 483, - "left": 324, - "width": 887, - "height": 30, - "minBayNo": 2, - "maxBayNo": 52 - }, - { - "type": "rack", - "id": "rack8", - "top": 451, - "left": 324, - "width": 887, - "height": 30, - "minBayNo": 2, - "maxBayNo": 52 - }, - { - "type": "rack", - "id": "rack7", - "top": 418, - "left": 324, - "width": 887, - "height": 30, - "minBayNo": 2, - "maxBayNo": 52 - }, - { - "type": "rack", - "id": "rack6", - "top": 323, - "left": 324, - "width": 887, - "height": 30, - "minBayNo": 2, - "maxBayNo": 52 - }, - { - "type": "rack", - "id": "rack5", - "top": 290, - "left": 324, - "width": 887, - "height": 30, - "minBayNo": 2, - "maxBayNo": 52 - }, - { - "type": "rack", - "id": "rack3", - "top": 225, - "left": 188, - "width": 1023, - "height": 30, - "minBayNo": 2, - "maxBayNo": 60 - }, - { - "type": "rack", - "id": "rack1", - "top": 97, - "left": 188, - "width": 1023, - "height": 30, - "minBayNo": 2, - "maxBayNo": 60 - }, - { - "type": "rack", - "id": "rack4", - "top": 257, - "left": 188, - "width": 1023, - "height": 30, - "minBayNo": 2, - "maxBayNo": 60 - }, - { - "type": "rack", - "id": "rack2", - "top": 129, - "left": 188, - "width": 1023, - "height": 30, - "minBayNo": 2, - "maxBayNo": 60 - } -], + { + "type": "rack", + "id": "rack12", + "top": 646, + "left": 324, + "width": 887, + "height": 30, + "minBayNo": 2, + "maxBayNo": 52 + }, + { + "type": "rack", + "id": "rack11", + "top": 613, + "left": 324, + "width": 887, + "height": 30, + "minBayNo": 2, + "maxBayNo": 52 + }, + { + "type": "rack", + "id": "rack10", + "top": 516, + "left": 324, + "width": 887, + "height": 30, + "minBayNo": 2, + "maxBayNo": 52 + }, + { + "type": "rack", + "id": "rack9", + "top": 483, + "left": 324, + "width": 887, + "height": 30, + "minBayNo": 2, + "maxBayNo": 52 + }, + { + "type": "rack", + "id": "rack8", + "top": 451, + "left": 324, + "width": 887, + "height": 30, + "minBayNo": 2, + "maxBayNo": 52 + }, + { + "type": "rack", + "id": "rack7", + "top": 418, + "left": 324, + "width": 887, + "height": 30, + "minBayNo": 2, + "maxBayNo": 52 + }, + { + "type": "rack", + "id": "rack6", + "top": 323, + "left": 324, + "width": 887, + "height": 30, + "minBayNo": 2, + "maxBayNo": 52 + }, + { + "type": "rack", + "id": "rack5", + "top": 290, + "left": 324, + "width": 887, + "height": 30, + "minBayNo": 2, + "maxBayNo": 52 + }, + { + "type": "rack", + "id": "rack3", + "top": 225, + "left": 188, + "width": 1023, + "height": 30, + "minBayNo": 2, + "maxBayNo": 60 + }, + { + "type": "rack", + "id": "rack1", + "top": 97, + "left": 188, + "width": 1023, + "height": 30, + "minBayNo": 2, + "maxBayNo": 60 + }, + { + "type": "rack", + "id": "rack4", + "top": 257, + "left": 188, + "width": 1023, + "height": 30, + "minBayNo": 2, + "maxBayNo": 60 + }, + { + "type": "rack", + "id": "rack2", + "top": 129, + "left": 188, + "width": 1023, + "height": 30, + "minBayNo": 2, + "maxBayNo": 60 + } + ], "rackDescs": [ - { - "type": "rackDescs", - "id": "lb_desc12", - "text": "#12", - "top": 646, - "left": 260, - "width": 47, - "height": 27 - }, - { - "type": "rackDescs", - "id": "lb_desc11", - "text": "#11", - "top": 618, - "left": 260, - "width": 44, - "height": 27 - }, - { - "type": "rackDescs", - "id": "lb_desc10", - "text": "#10", - "top": 516, - "left": 257, - "width": 49, - "height": 27 - }, - { - "type": "rackDescs", - "id": "lb_desc9", - "text": "#9", - "top": 488, - "left": 257, - "width": 38, - "height": 27 - }, - { - "type": "rackDescs", - "id": "lb_desc8", - "text": "#8", - "top": 449, - "left": 260, - "width": 39, - "height": 27 - }, - { - "type": "rackDescs", - "id": "lb_desc7", - "text": "#7", - "top": 421, - "left": 260, - "width": 37, - "height": 27 - }, - { - "type": "rackDescs", - "id": "lb_desc6", - "text": "#6", - "top": 327, - "left": 260, - "width": 38, - "height": 27 - }, - { - "type": "rackDescs", - "id": "lb_desc5", - "text": "#5", - "top": 291, - "left": 261, - "width": 38, - "height": 27 - }, - { - "type": "rackDescs", - "id": "lb_desc4", - "text": "#4", - "top": 253, - "left": 145, - "width": 38, - "height": 27 - }, - { - "type": "rackDescs", - "id": "lb_desc3", - "text": "#3", - "top": 225, - "left": 145, - "width": 38, - "height": 27 - }, - { - "type": "rackDescs", - "id": "lb_desc2", - "text": "#2", - "top": 128, - "left": 145, - "width": 38, - "height": 27 - }, - { - "type": "rackDescs", - "id": "lb_desc1", - "text": "#1", - "top": 100, - "left": 145, - "width": 35, - "height": 27 - } -], + { + "type": "rackDescs", + "id": "lb_desc12", + "text": "#12", + "top": 646, + "left": 260, + "width": 47, + "height": 27 + }, + { + "type": "rackDescs", + "id": "lb_desc11", + "text": "#11", + "top": 618, + "left": 260, + "width": 44, + "height": 27 + }, + { + "type": "rackDescs", + "id": "lb_desc10", + "text": "#10", + "top": 516, + "left": 257, + "width": 49, + "height": 27 + }, + { + "type": "rackDescs", + "id": "lb_desc9", + "text": "#9", + "top": 488, + "left": 257, + "width": 38, + "height": 27 + }, + { + "type": "rackDescs", + "id": "lb_desc8", + "text": "#8", + "top": 449, + "left": 260, + "width": 39, + "height": 27 + }, + { + "type": "rackDescs", + "id": "lb_desc7", + "text": "#7", + "top": 421, + "left": 260, + "width": 37, + "height": 27 + }, + { + "type": "rackDescs", + "id": "lb_desc6", + "text": "#6", + "top": 327, + "left": 260, + "width": 38, + "height": 27 + }, + { + "type": "rackDescs", + "id": "lb_desc5", + "text": "#5", + "top": 291, + "left": 261, + "width": 38, + "height": 27 + }, + { + "type": "rackDescs", + "id": "lb_desc4", + "text": "#4", + "top": 253, + "left": 145, + "width": 38, + "height": 27 + }, + { + "type": "rackDescs", + "id": "lb_desc3", + "text": "#3", + "top": 225, + "left": 145, + "width": 38, + "height": 27 + }, + { + "type": "rackDescs", + "id": "lb_desc2", + "text": "#2", + "top": 128, + "left": 145, + "width": 38, + "height": 27 + }, + { + "type": "rackDescs", + "id": "lb_desc1", + "text": "#1", + "top": 100, + "left": 145, + "width": 35, + "height": 27 + } + ], "crns": [ - { - "type": "crane", - "id": "crn-1", - "text": "1", - "top": 184, - "left": 777, - "width": 93, - "height": 22 - }, - { - "type": "crane", - "id": "crn-2", - "text": "2", - "top": 378, - "left": 777, - "width": 93, - "height": 22 - }, - { - "type": "crane", - "id": "crn-3", - "text": "3", - "top": 572, - "left": 777, - "width": 93, - "height": 22 - }, - { - "type": "track", - "id": "lb_track2", - "text": "", - "top": 390, - "left": 325, - "width": 1010, - "height": 2 - }, - { - "type": "track", - "id": "lb_track3", - "text": "", - "top": 584, - "left": 325, - "width": 1010, - "height": 2 - }, - { - "type": "track", - "id": "lb_track1", - "text": "", - "top": 197, - "left": 188, - "width": 1148, - "height": 2 - } -], + { + "type": "crane", + "id": "crn-1", + "text": "1", + "top": 184, + "left": 777, + "width": 93, + "height": 22 + }, + { + "type": "crane", + "id": "crn-2", + "text": "2", + "top": 378, + "left": 777, + "width": 93, + "height": 22 + }, + { + "type": "crane", + "id": "crn-3", + "text": "3", + "top": 572, + "left": 777, + "width": 93, + "height": 22 + }, + { + "type": "track", + "id": "lb_track2", + "text": "", + "top": 390, + "left": 325, + "width": 1010, + "height": 2 + }, + { + "type": "track", + "id": "lb_track3", + "text": "", + "top": 584, + "left": 325, + "width": 1010, + "height": 2 + }, + { + "type": "track", + "id": "lb_track1", + "text": "", + "top": 197, + "left": 188, + "width": 1148, + "height": 2 + } + ], "stns": [ - { - "type": "stn", - "id": "site-132", - "text": "132", - "top": 547, - "left": 1399, - "width": 60, - "height": 63 - }, - { - "type": "stn", - "id": "site-126", - "text": "126", - "top": 450, - "left": 1461, - "width": 60, - "height": 63 - }, - { - "type": "stn", - "id": "site-125", - "text": "125", - "top": 450, - "left": 1399, - "width": 60, - "height": 63 - }, - { - "type": "stn", - "id": "site-119", - "text": "119", - "top": 353, - "left": 1461, - "width": 60, - "height": 63 - }, - { - "type": "stn", - "id": "site-118", - "text": "118", - "top": 353, - "left": 1399, - "width": 60, - "height": 63 - }, - { - "type": "stn", - "id": "site-136", - "text": "136", - "top": 611, - "left": 1461, - "width": 120, - "height": 30 - }, - { - "type": "stn", - "id": "site-135", - "text": "135", - "top": 611, - "left": 1399, - "width": 60, - "height": 30 - }, - { - "type": "stn", - "id": "site-134", - "text": "134", - "top": 611, - "left": 1337, - "width": 60, - "height": 30 - }, - { - "type": "stn", - "id": "site-133", - "text": "133", - "top": 611, - "left": 1215, - "width": 120, - "height": 30 - }, - { - "type": "stn", - "id": "site-130", - "text": "130", - "top": 515, - "left": 1461, - "width": 60, - "height": 30 - }, - { - "type": "stn", - "id": "site-129", - "text": "129", - "top": 515, - "left": 1399, - "width": 60, - "height": 30 - }, - { - "type": "stn", - "id": "site-128", - "text": "128", - "top": 515, - "left": 1337, - "width": 60, - "height": 30 - }, - { - "type": "stn", - "id": "site-127", - "text": "127", - "top": 515, - "left": 1215, - "width": 120, - "height": 30 - }, - { - "type": "stn", - "id": "site-131", - "text": "131", - "top": 515, - "left": 1522, - "width": 60, - "height": 30 - }, - { - "type": "stn", - "id": "site-123", - "text": "123", - "top": 418, - "left": 1461, - "width": 60, - "height": 30 - }, - { - "type": "stn", - "id": "site-122", - "text": "122", - "top": 418, - "left": 1399, - "width": 60, - "height": 30 - }, - { - "type": "stn", - "id": "site-121", - "text": "121", - "top": 418, - "left": 1337, - "width": 60, - "height": 30 - }, - { - "type": "stn", - "id": "site-120", - "text": "120", - "top": 418, - "left": 1215, - "width": 120, - "height": 30 - }, - { - "type": "stn", - "id": "site-124", - "text": "124", - "top": 418, - "left": 1522, - "width": 60, - "height": 30 - }, - { - "type": "stn", - "id": "site-112", - "text": "112", - "top": 256, - "left": 1461, - "width": 60, - "height": 63 - }, - { - "type": "stn", - "id": "site-111", - "text": "111", - "top": 256, - "left": 1399, - "width": 60, - "height": 63 - }, - { - "type": "stn", - "id": "site-116", - "text": "116", - "top": 321, - "left": 1461, - "width": 60, - "height": 30 - }, - { - "type": "stn", - "id": "site-115", - "text": "115", - "top": 321, - "left": 1399, - "width": 60, - "height": 30 - }, - { - "type": "stn", - "id": "site-114", - "text": "114", - "top": 321, - "left": 1337, - "width": 60, - "height": 30 - }, - { - "type": "stn", - "id": "site-113", - "text": "113", - "top": 321, - "left": 1215, - "width": 120, - "height": 30 - }, - { - "type": "stn", - "id": "site-117", - "text": "117", - "top": 321, - "left": 1522, - "width": 60, - "height": 30 - }, - { - "type": "stn", - "id": "site-105", - "text": "105", - "top": 159, - "left": 1399, - "width": 60, - "height": 63 - }, - { - "type": "stn", - "id": "site-109", - "text": "109", - "top": 224, - "left": 1461, - "width": 60, - "height": 30 - }, - { - "type": "stn", - "id": "site-108", - "text": "108", - "top": 224, - "left": 1399, - "width": 60, - "height": 30 - }, - { - "type": "stn", - "id": "site-107", - "text": "107", - "top": 224, - "left": 1337, - "width": 60, - "height": 30 - }, - { - "type": "stn", - "id": "site-106", - "text": "106", - "top": 224, - "left": 1215, - "width": 120, - "height": 30 - }, - { - "type": "stn", - "id": "site-104", - "text": "104", - "top": 128, - "left": 1461, - "width": 120, - "height": 30 - }, - { - "type": "stn", - "id": "site-103", - "text": "103", - "top": 128, - "left": 1399, - "width": 60, - "height": 30 - }, - { - "type": "stn", - "id": "site-102", - "text": "102", - "top": 128, - "left": 1337, - "width": 60, - "height": 30 - }, - { - "type": "stn", - "id": "site-101", - "text": "101", - "top": 128, - "left": 1215, - "width": 120, - "height": 30 - }, - { - "type": "stn", - "id": "site-110", - "text": "110", - "top": 224, - "left": 1522, - "width": 60, - "height": 30 - } -] + { + "type": "stn", + "id": "site-132", + "text": "132", + "top": 547, + "left": 1399, + "width": 60, + "height": 63 + }, + { + "type": "stn", + "id": "site-126", + "text": "126", + "top": 450, + "left": 1461, + "width": 60, + "height": 63 + }, + { + "type": "stn", + "id": "site-125", + "text": "125", + "top": 450, + "left": 1399, + "width": 60, + "height": 63 + }, + { + "type": "stn", + "id": "site-119", + "text": "119", + "top": 353, + "left": 1461, + "width": 60, + "height": 63 + }, + { + "type": "stn", + "id": "site-118", + "text": "118", + "top": 353, + "left": 1399, + "width": 60, + "height": 63 + }, + { + "type": "stn", + "id": "site-136", + "text": "136", + "top": 611, + "left": 1461, + "width": 120, + "height": 30 + }, + { + "type": "stn", + "id": "site-135", + "text": "135", + "top": 611, + "left": 1399, + "width": 60, + "height": 30 + }, + { + "type": "stn", + "id": "site-134", + "text": "134", + "top": 611, + "left": 1337, + "width": 60, + "height": 30 + }, + { + "type": "stn", + "id": "site-133", + "text": "133", + "top": 611, + "left": 1215, + "width": 120, + "height": 30 + }, + { + "type": "stn", + "id": "site-130", + "text": "130", + "top": 515, + "left": 1461, + "width": 60, + "height": 30 + }, + { + "type": "stn", + "id": "site-129", + "text": "129", + "top": 515, + "left": 1399, + "width": 60, + "height": 30 + }, + { + "type": "stn", + "id": "site-128", + "text": "128", + "top": 515, + "left": 1337, + "width": 60, + "height": 30 + }, + { + "type": "stn", + "id": "site-127", + "text": "127", + "top": 515, + "left": 1215, + "width": 120, + "height": 30 + }, + { + "type": "stn", + "id": "site-131", + "text": "131", + "top": 515, + "left": 1522, + "width": 60, + "height": 30 + }, + { + "type": "stn", + "id": "site-123", + "text": "123", + "top": 418, + "left": 1461, + "width": 60, + "height": 30 + }, + { + "type": "stn", + "id": "site-122", + "text": "122", + "top": 418, + "left": 1399, + "width": 60, + "height": 30 + }, + { + "type": "stn", + "id": "site-121", + "text": "121", + "top": 418, + "left": 1337, + "width": 60, + "height": 30 + }, + { + "type": "stn", + "id": "site-120", + "text": "120", + "top": 418, + "left": 1215, + "width": 120, + "height": 30 + }, + { + "type": "stn", + "id": "site-124", + "text": "124", + "top": 418, + "left": 1522, + "width": 60, + "height": 30 + }, + { + "type": "stn", + "id": "site-112", + "text": "112", + "top": 256, + "left": 1461, + "width": 60, + "height": 63 + }, + { + "type": "stn", + "id": "site-111", + "text": "111", + "top": 256, + "left": 1399, + "width": 60, + "height": 63 + }, + { + "type": "stn", + "id": "site-116", + "text": "116", + "top": 321, + "left": 1461, + "width": 60, + "height": 30 + }, + { + "type": "stn", + "id": "site-115", + "text": "115", + "top": 321, + "left": 1399, + "width": 60, + "height": 30 + }, + { + "type": "stn", + "id": "site-114", + "text": "114", + "top": 321, + "left": 1337, + "width": 60, + "height": 30 + }, + { + "type": "stn", + "id": "site-113", + "text": "113", + "top": 321, + "left": 1215, + "width": 120, + "height": 30 + }, + { + "type": "stn", + "id": "site-117", + "text": "117", + "top": 321, + "left": 1522, + "width": 60, + "height": 30 + }, + { + "type": "stn", + "id": "site-105", + "text": "105", + "top": 159, + "left": 1399, + "width": 60, + "height": 63 + }, + { + "type": "stn", + "id": "site-109", + "text": "109", + "top": 224, + "left": 1461, + "width": 60, + "height": 30 + }, + { + "type": "stn", + "id": "site-108", + "text": "108", + "top": 224, + "left": 1399, + "width": 60, + "height": 30 + }, + { + "type": "stn", + "id": "site-107", + "text": "107", + "top": 224, + "left": 1337, + "width": 60, + "height": 30 + }, + { + "type": "stn", + "id": "site-106", + "text": "106", + "top": 224, + "left": 1215, + "width": 120, + "height": 30 + }, + { + "type": "stn", + "id": "site-104", + "text": "104", + "top": 128, + "left": 1461, + "width": 120, + "height": 30 + }, + { + "type": "stn", + "id": "site-103", + "text": "103", + "top": 128, + "left": 1399, + "width": 60, + "height": 30 + }, + { + "type": "stn", + "id": "site-102", + "text": "102", + "top": 128, + "left": 1337, + "width": 60, + "height": 30 + }, + { + "type": "stn", + "id": "site-101", + "text": "101", + "top": 128, + "left": 1215, + "width": 120, + "height": 30 + }, + { + "type": "stn", + "id": "site-110", + "text": "110", + "top": 224, + "left": 1522, + "width": 60, + "height": 30 + } + ] } // 搴撲綅鍥� -newData = { +rackData = { "mapName": "WCS_test", "rackCount": 12, "crnCount": 3, @@ -630,128 +630,127 @@ "hpPosition": 1, "minBayNo": 2, "floors": 2, - "floor": 1, "racks": [ { - "type": "rack", - "id": "rack12", - "top": 646, - "left": 324, - "width": 887, - "height": 30, - "minBayNo": 2, - "maxBayNo": 52 - }, + "type": "rack", + "id": "rack12", + "top": 646, + "left": 324, + "width": 887, + "height": 30, + "minBayNo": 2, + "maxBayNo": 52 + }, { - "type": "rack", - "id": "rack11", - "top": 613, - "left": 324, - "width": 887, - "height": 30, - "minBayNo": 2, - "maxBayNo": 52 - }, + "type": "rack", + "id": "rack11", + "top": 613, + "left": 324, + "width": 887, + "height": 30, + "minBayNo": 2, + "maxBayNo": 52 + }, { - "type": "rack", - "id": "rack10", - "top": 516, - "left": 324, - "width": 887, - "height": 30, - "minBayNo": 2, - "maxBayNo": 52 - }, + "type": "rack", + "id": "rack10", + "top": 516, + "left": 324, + "width": 887, + "height": 30, + "minBayNo": 2, + "maxBayNo": 52 + }, { - "type": "rack", - "id": "rack9", - "top": 483, - "left": 324, - "width": 887, - "height": 30, - "minBayNo": 2, - "maxBayNo": 52 - }, + "type": "rack", + "id": "rack9", + "top": 483, + "left": 324, + "width": 887, + "height": 30, + "minBayNo": 2, + "maxBayNo": 52 + }, { - "type": "rack", - "id": "rack8", - "top": 451, - "left": 324, - "width": 887, - "height": 30, - "minBayNo": 2, - "maxBayNo": 52 - }, + "type": "rack", + "id": "rack8", + "top": 451, + "left": 324, + "width": 887, + "height": 30, + "minBayNo": 2, + "maxBayNo": 52 + }, { - "type": "rack", - "id": "rack7", - "top": 418, - "left": 324, - "width": 887, - "height": 30, - "minBayNo": 2, - "maxBayNo": 52 - }, + "type": "rack", + "id": "rack7", + "top": 418, + "left": 324, + "width": 887, + "height": 30, + "minBayNo": 2, + "maxBayNo": 52 + }, { - "type": "rack", - "id": "rack6", - "top": 323, - "left": 324, - "width": 887, - "height": 30, - "minBayNo": 2, - "maxBayNo": 52 - }, + "type": "rack", + "id": "rack6", + "top": 323, + "left": 324, + "width": 887, + "height": 30, + "minBayNo": 2, + "maxBayNo": 52 + }, { - "type": "rack", - "id": "rack5", - "top": 290, - "left": 324, - "width": 887, - "height": 30, - "minBayNo": 2, - "maxBayNo": 52 - }, + "type": "rack", + "id": "rack5", + "top": 290, + "left": 324, + "width": 887, + "height": 30, + "minBayNo": 2, + "maxBayNo": 52 + }, { - "type": "rack", - "id": "rack3", - "top": 225, - "left": 188, - "width": 1023, - "height": 30, - "minBayNo": 2, - "maxBayNo": 60 - }, + "type": "rack", + "id": "rack3", + "top": 225, + "left": 188, + "width": 1023, + "height": 30, + "minBayNo": 2, + "maxBayNo": 60 + }, { - "type": "rack", - "id": "rack1", - "top": 97, - "left": 188, - "width": 1023, - "height": 30, - "minBayNo": 2, - "maxBayNo": 60 - }, + "type": "rack", + "id": "rack1", + "top": 97, + "left": 188, + "width": 1023, + "height": 30, + "minBayNo": 2, + "maxBayNo": 60 + }, { - "type": "rack", - "id": "rack4", - "top": 257, - "left": 188, - "width": 1023, - "height": 30, - "minBayNo": 2, - "maxBayNo": 60 - }, + "type": "rack", + "id": "rack4", + "top": 257, + "left": 188, + "width": 1023, + "height": 30, + "minBayNo": 2, + "maxBayNo": 60 + }, { - "type": "rack", - "id": "rack2", - "top": 129, - "left": 188, - "width": 1023, - "height": 30, - "minBayNo": 2, - "maxBayNo": 60 - }], + "type": "rack", + "id": "rack2", + "top": 129, + "left": 188, + "width": 1023, + "height": 30, + "minBayNo": 2, + "maxBayNo": 60 + }], "rackDescs": [{ "type": "rackDescs", "id": "lb_desc12", @@ -849,31 +848,62 @@ "width": 35, "height": 27 }], - "crns": [{ - "type": "track", - "id": "lb_track2", - "text": "", - "top": 387, - "left": 298, - "width": 1050, - "height": 2 - }, { - "type": "track", - "id": "lb_track3", - "text": "", - "top": 582, - "left": 298, - "width": 1050, - "height": 2 - }, { - "type": "track", - "id": "lb_track1", - "text": "", - "top": 195, - "left": 298, - "width": 1050, - "height": 2 - }], + "crns": [ + { + "type": "crane", + "id": "crn-1", + "text": "1", + "top": 184, + "left": 777, + "width": 93, + "height": 22 + }, + { + "type": "crane", + "id": "crn-2", + "text": "2", + "top": 378, + "left": 777, + "width": 93, + "height": 22 + }, + { + "type": "crane", + "id": "crn-3", + "text": "3", + "top": 572, + "left": 777, + "width": 93, + "height": 22 + }, + { + "type": "track", + "id": "lb_track2", + "text": "", + "top": 387, + "left": 298, + "width": 1050, + "height": 2 + }, + { + "type": "track", + "id": "lb_track3", + "text": "", + "top": 582, + "left": 298, + "width": 1050, + "height": 2 + }, + { + "type": "track", + "id": "lb_track1", + "text": "", + "top": 195, + "left": 298, + "width": 1050, + "height": 2 + } + ], "areas": [{ "type": "Control_floor", "id": "tabControl_floor1", @@ -882,7 +912,8 @@ "left": 22, "width": 302, "height": 403, - "floors": [{ + "floors": [ + { "type": "floor", "id": "page_floor1", "text": "1F", @@ -890,116 +921,455 @@ "left": 22, "width": 276, "height": 395, - "stns": [{ - "type": "stn", - "id": "site-201", - "text": "201", - "top": 165, - "left": 193, - "width": 77, - "height": 30 - }, { - "type": "stn", - "id": "site-202", - "text": "202", - "top": 165, - "left": 112, - "width": 77, - "height": 30 - }, { - "type": "stn", - "id": "site-210", - "text": "210", - "top": 10, - "left": 59, - "width": 51, - "height": 22 - }, { + "stns": [ + { + "type": "stn", + "id": "site-132", + "text": "132", + "top": 547, + "left": 1399, + "width": 60, + "height": 63 + }, + { + "type": "stn", + "id": "site-126", + "text": "126", + "top": 450, + "left": 1461, + "width": 60, + "height": 63 + }, + { + "type": "stn", + "id": "site-125", + "text": "125", + "top": 450, + "left": 1399, + "width": 60, + "height": 63 + }, + { + "type": "stn", + "id": "site-119", + "text": "119", + "top": 353, + "left": 1461, + "width": 60, + "height": 63 + }, + { + "type": "stn", + "id": "site-118", + "text": "118", + "top": 353, + "left": 1399, + "width": 60, + "height": 63 + }, + { + "type": "stn", + "id": "site-136", + "text": "136", + "top": 611, + "left": 1461, + "width": 120, + "height": 30 + }, + { + "type": "stn", + "id": "site-135", + "text": "135", + "top": 611, + "left": 1399, + "width": 60, + "height": 30 + }, + { + "type": "stn", + "id": "site-134", + "text": "134", + "top": 611, + "left": 1337, + "width": 60, + "height": 30 + }, + { + "type": "stn", + "id": "site-133", + "text": "133", + "top": 611, + "left": 1215, + "width": 120, + "height": 30 + }, + { + "type": "stn", + "id": "site-130", + "text": "130", + "top": 515, + "left": 1461, + "width": 60, + "height": 30 + }, + { + "type": "stn", + "id": "site-129", + "text": "129", + "top": 515, + "left": 1399, + "width": 60, + "height": 30 + }, + { + "type": "stn", + "id": "site-128", + "text": "128", + "top": 515, + "left": 1337, + "width": 60, + "height": 30 + }, + { + "type": "stn", + "id": "site-127", + "text": "127", + "top": 515, + "left": 1215, + "width": 120, + "height": 30 + }, + { + "type": "stn", + "id": "site-131", + "text": "131", + "top": 515, + "left": 1522, + "width": 60, + "height": 30 + }, + { + "type": "stn", + "id": "site-123", + "text": "123", + "top": 418, + "left": 1461, + "width": 60, + "height": 30 + }, + { + "type": "stn", + "id": "site-122", + "text": "122", + "top": 418, + "left": 1399, + "width": 60, + "height": 30 + }, + { + "type": "stn", + "id": "site-121", + "text": "121", + "top": 418, + "left": 1337, + "width": 60, + "height": 30 + }, + { + "type": "stn", + "id": "site-120", + "text": "120", + "top": 418, + "left": 1215, + "width": 120, + "height": 30 + }, + { + "type": "stn", + "id": "site-124", + "text": "124", + "top": 418, + "left": 1522, + "width": 60, + "height": 30 + }, + { + "type": "stn", + "id": "site-112", + "text": "112", + "top": 256, + "left": 1461, + "width": 60, + "height": 63 + }, + { + "type": "stn", + "id": "site-111", + "text": "111", + "top": 256, + "left": 1399, + "width": 60, + "height": 63 + }, + { + "type": "stn", + "id": "site-116", + "text": "116", + "top": 321, + "left": 1461, + "width": 60, + "height": 30 + }, + { + "type": "stn", + "id": "site-115", + "text": "115", + "top": 321, + "left": 1399, + "width": 60, + "height": 30 + }, + { + "type": "stn", + "id": "site-114", + "text": "114", + "top": 321, + "left": 1337, + "width": 60, + "height": 30 + }, + { + "type": "stn", + "id": "site-113", + "text": "113", + "top": 321, + "left": 1215, + "width": 120, + "height": 30 + }, + { + "type": "stn", + "id": "site-117", + "text": "117", + "top": 321, + "left": 1522, + "width": 60, + "height": 30 + }, + { + "type": "stn", + "id": "site-105", + "text": "105", + "top": 159, + "left": 1399, + "width": 60, + "height": 63 + }, + { + "type": "stn", + "id": "site-109", + "text": "109", + "top": 224, + "left": 1461, + "width": 60, + "height": 30 + }, + { + "type": "stn", + "id": "site-108", + "text": "108", + "top": 224, + "left": 1399, + "width": 60, + "height": 30 + }, + { + "type": "stn", + "id": "site-107", + "text": "107", + "top": 224, + "left": 1337, + "width": 60, + "height": 30 + }, + { + "type": "stn", + "id": "site-106", + "text": "106", + "top": 224, + "left": 1215, + "width": 120, + "height": 30 + }, + { + "type": "stn", + "id": "site-104", + "text": "104", + "top": 128, + "left": 1461, + "width": 120, + "height": 30 + }, + { + "type": "stn", + "id": "site-103", + "text": "103", + "top": 128, + "left": 1399, + "width": 60, + "height": 30 + }, + { + "type": "stn", + "id": "site-102", + "text": "102", + "top": 128, + "left": 1337, + "width": 60, + "height": 30 + }, + { + "type": "stn", + "id": "site-101", + "text": "101", + "top": 128, + "left": 1215, + "width": 120, + "height": 30 + }, + { + "type": "stn", + "id": "site-110", + "text": "110", + "top": 224, + "left": 1522, + "width": 60, + "height": 30 + }, + { + "type": "stn", + "id": "site-199", + "text": "199", + "top": 150, + "left": 1590, + "width": 60, + "height": 30 + }, + { "type": "track", "id": "lb_trCart1", "text": "RGV杞ㄩ亾", - "top": 2, - "left": 65, + "top": 140, + "left": 1600, "width": 4, - "height": 213 - }, { + "height": 500 + }, + { "type": "track", "id": "lb_trCart2", "text": "RGV杞ㄩ亾", - "top": 2, - "left": 100, + "top": 140, + "left": 1635, "width": 4, - "height": 213 - }, { - "type": "stn", - "id": "site-221", - "text": "221", - "top": 6, - "left": 197, - "width": 77, - "height": 30 - }, { - "type": "stn", - "id": "site-220", - "text": "220", - "top": 6, - "left": 116, - "width": 77, - "height": 30 + "height": 500 + }, + ] + }, + { + "type": "floor", + "id": "page_floor2", + "text": "2F", + "top": 4, + "left": 22, + "width": 276, + "height": 395, + "stns": [ + { + "type": "stn", + "id": "site-201", + "text": "201", + "top": 98, + "left": 1212, + "width": 77, + "height": 30 + }, + { + "type": "stn", + "id": "site-202", + "text": "202", + "top": 98, + "left": 1292, + "width": 77, + "height": 30 + }, + { + "type": "stn", + "id": "site-221", + "text": "221", + "top": 290, + "left": 1212, + "width": 77, + "height": 30 + }, + { + "type": "stn", + "id": "site-220", + "text": "220", + "top": 257, + "left": 1212, + "width": 77, + "height": 30 + }] + }, + { + "type": "floor", + "id": "page_floor3", + "text": "3F", + "top": 4, + "left": 22, + "width": 276, + "height": 395, + "stns": [{ + "type": "stn", + "id": "site-301", + "text": "301", + "top": 98, + "left": 1212, + "width": 77, + "height": 30 + }, { + "type": "stn", + "id": "site-302", + "text": "302", + "top": 130, + "left": 1212, + "width": 77, + "height": 30 + }, { + "type": "stn", + "id": "site-321", + "text": "321", + "top": 225, + "left": 1212, + "width": 77, + "height": 30 + }, { + "type": "stn", + "id": "site-999", + "text": "999", + "top": 323, + "left": 1212, + "width": 77, + "height": 30 + }] }] - }, { - "type": "floor", - "id": "page_floor2", - "text": "2F", - "top": 4, - "left": 22, - "width": 276, - "height": 395, - "stns": [{ - "type": "stn", - "id": "site-301", - "text": "301", - "top": 38, - "left": 196, - "width": 77, - "height": 30 - }, { - "type": "stn", - "id": "site-302", - "text": "302", - "top": 38, - "left": 115, - "width": 77, - "height": 30 - }, { - "type": "stn", - "id": "site-321", - "text": "321", - "top": 197, - "left": 196, - "width": 77, - "height": 30 - }, { - "type": "stn", - "id": "site-320", - "text": "320", - "top": 197, - "left": 115, - "width": 77, - "height": 30 - }] - }] }] } +let total = [], rack = '', racks = '', rackDesc = '',rackDescs = '', crn = '', crns = '',track = '',tracks = '', stn = '', stns = '',stnArr = [],floorBtn = '',floorBtns = '',floorBtnss = '',whycq=''; +let rackss = rackData.racks,rackDescss = rackData.rackDescs,crnss = rackData.crns,areas = rackData.areas[0].floors; +let floorId function getMap() { - let mapName = "<div class='mapName'>" + firstFloor.mapName + "</div>" - let rack = '', racks = '', rackDesc = '', - rackDescs = '', crn = '', crns = '',track = '', - tracks = '', stn = '', stns = ''; - let rackss = firstFloor.racks, - rackDescss = firstFloor.rackDescs, - crnss = firstFloor.crns, - stnss = firstFloor.stns; + let mapName = "<div class='mapName'>" + rackData.mapName + "</div>" // 璐ф灦 for (let i = 0;i < rackss.length;i++) { let btn ='' @@ -1007,7 +1377,7 @@ var maxBayNo = rackss[i].maxBayNo var minBayNo = rackss[i].minBayNo let bLen = maxBayNo / minBayNo - if (firstFloor.hpPosition == 1) { + if (rackData.hpPosition == 1) { for (let j = bLen;j > 0; j--) { btn = "<button class='item' style='width: 34px'>" + maxBayNo + "</button>" btns = btns + btn @@ -1060,19 +1430,57 @@ tracks = tracks + track } } - // 杈撻�佺嚎 绔欑偣 - for (let i = 0;i < stnss.length;i++) { - stn = "<div class='site' id='" + stnss[i].id + - "'style='width:"+ stnss[i].width + - "px;height: "+ stnss[i].height+ - "px;line-height: "+ stnss[i].height+ - "px;top: "+ stnss[i].top + - "px;left: "+ stnss[i].left + - "px'>" + stnss[i].text + "</div>" - stns = stns + stn + // 妤煎眰 + for (let i = 0; i < areas.length;i++) { + let stnss = areas[i].stns + let floor = areas[i].text + floorId = areas[i].id + var position = (i+5)*100 + floorBtn = + "<button class='floorBtn' onclick='changFloor("+i+")' style='left: "+position+"px;'>" + floor +"</button>" + floorBtnss = floorBtnss + floorBtn + // 姣忓眰鐨� 杈撻�佺嚎绔欑偣 + var index = i + var n = 1 + stnArr[index] = '' + total[index] = '' + for (let j = 0; j < stnss.length; j++) { + if (stnss[j].type == "stn") { + stn = "<div class='site' id='" + stnss[j].id + + "'style='width:"+ stnss[j].width + + "px;height: "+ stnss[j].height+ + "px;line-height: "+ stnss[j].height+ + "px;top: "+ stnss[j].top + + "px;left: "+ stnss[j].left + + "px'>" + stnss[j].text + "</div>" + stnArr[i] = stnArr[i] + stn + total[i] = n++ + } else if(stnss[j].type == "track"){ + stn = "<div class='track' id='" + stnss[j].id + + "'style='width:"+ stnss[j].width + + "px;height: "+ stnss[j].height+ + "px;line-height: "+ stnss[j].height+ + "px;top: "+ stnss[j].top + + "px;left: "+ stnss[j].left + + "px'>" + stnss[j].text + "</div>" + stnArr[i] = stnArr[i] + stn + } + + } + } - let whycq = racks + stns + rackDescs + crns + tracks + whycq = racks + stnArr[0] +rackDescs + crns + tracks + floorBtnss $(".main-part").append(whycq) + $("#line-total").html(total[0]) + }; +function changFloor(e) { + $(".main-part").empty() // 娓呯┖鑺傜偣 + whycq = racks + stnArr[e] +rackDescs + crns + tracks + floorBtnss + $(".main-part").append(whycq) + $("#line-total").empty() + $("#line-total").html(total[e]) +} + diff --git a/src/main/webapp/views/test.html b/src/main/webapp/views/test.html index d65a6e7..fcb6b41 100644 --- a/src/main/webapp/views/test.html +++ b/src/main/webapp/views/test.html @@ -3,13 +3,18 @@ <head> <meta charset="UTF-8"> <title>Title</title> + <script src="../static/js/jquery/jquery-3.3.1.min.js"></script> </head> <body> + <div id="ycq"></div> <button onclick="closeBtn()">鍏抽棴</button> <button onclick="openBtn()">寮�濮�</button> + <button id="1" onclick="alt(1)">寮�濮�</button> </body> <script> - var i = 1 + // var abc = 1 + var i ; + i="10" var a = true setInterval(()=>{ addI(); @@ -21,6 +26,26 @@ return; } } + $("#ycq").html(i) + + function alt(e) { + alert(e) + } + + + var arr=[]; //鎵归噺瀹氫箟 + for(var i=0;i<5;i++){ + var index=i; //鍔ㄦ�佸畾涔夊彉閲忓悕 + arr[index]='value-'+i; //鍔ㄦ�佽祴鍊� + } + console.log(arr); + + + + + + + function closeBtn() { -- Gitblit v1.9.1