From 24b27647f24c5dde68fb3df5214b79795665ca3d Mon Sep 17 00:00:00 2001
From: whycq <10027870+whycq@user.noreply.gitee.com>
Date: 星期四, 20 四月 2023 13:47:54 +0800
Subject: [PATCH] #
---
src/main/webapp/views/console.html | 4
src/main/webapp/static/js/console.js | 18 ++
src/main/webapp/static/js/console.map.js | 418 ++++++---------------------------------------------
pom.xml | 2
src/main/resources/application.yml | 2
5 files changed, 71 insertions(+), 373 deletions(-)
diff --git a/pom.xml b/pom.xml
index 4723ca1..072cf2d 100644
--- a/pom.xml
+++ b/pom.xml
@@ -185,7 +185,7 @@
</dependencies>
<build>
- <finalName>jfwcs</finalName>
+ <finalName>kdywcs</finalName>
<plugins>
<plugin>
<groupId>org.springframework.boot</groupId>
diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml
index 13e806f..44ebfa9 100644
--- a/src/main/resources/application.yml
+++ b/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://10.10.10.200:1433;databasename=nbjfasrs
+ url: jdbc:sqlserver://127.0.0.1:1433;databasename=kdyasrs
# url: jdbc:sqlserver://192.168.4.15:1433;databasename=nbjfasrs
username: sa
password: sa@123
diff --git a/src/main/webapp/static/js/console.js b/src/main/webapp/static/js/console.js
index f731681..25325ad 100644
--- a/src/main/webapp/static/js/console.js
+++ b/src/main/webapp/static/js/console.js
@@ -74,6 +74,24 @@
}else {
bNum = minBayNo
for (let j = 0; j < bLen; j++) {
+ if (i === 0) {
+ if (j === 15 || j === 16) {
+ bay = "<button class='item' style='width: "+ 80 +"px'>" + bNum + "</button>"
+ bays = bays + bay
+ bNum = bNum + interval;
+ continue
+ }
+ bay = "<button class='item' style='width: "+ bayWidth +"px'>" + bNum + "</button>"
+ bays = bays + bay
+ bNum = bNum + interval;
+ continue
+ }
+ if (j === 15) {
+ bay = "<button class='item' style='margin-left: 160px;width: "+ bayWidth +"px'>" + (bNum + 4) + "</button>"
+ bays = bays + bay
+ bNum = bNum + interval + 4;
+ continue
+ }
bay = "<button class='item' style='width: "+ bayWidth +"px'>" + bNum + "</button>"
bays = bays + bay
bNum = bNum + interval;
diff --git a/src/main/webapp/static/js/console.map.js b/src/main/webapp/static/js/console.map.js
index 9e43f59..0fc208b 100644
--- a/src/main/webapp/static/js/console.map.js
+++ b/src/main/webapp/static/js/console.map.js
@@ -10,82 +10,22 @@
{
"type": "rack",
"id": "rack1",
- "top": 150,
- "left": 441,
- "width": 934,
- "height": 22,
+ "top": 324,
+ "left": 208,
+ "width": 1600,
+ "height": 26,
"minBayNo": 2,
- "maxBayNo": 56
+ "maxBayNo": 54
},
{
"type": "rack",
"id": "rack2",
- "top": 170,
- "left": 441,
- "width": 900,
- "height": 22,
+ "top": 386,
+ "left": 208,
+ "width": 1600,
+ "height": 26,
"minBayNo": 2,
"maxBayNo": 54
- },
- {
- "type": "rack",
- "id": "rack3",
- "top": 224,
- "left": 441,
- "width": 932,
- "height": 22,
- "minBayNo": 2,
- "maxBayNo": 56
- },
- {
- "type": "rack",
- "id": "rack4",
- "top": 244,
- "left": 441,
- "width": 932,
- "height": 22,
- "minBayNo": 2,
- "maxBayNo": 56
- },
- {
- "type": "rack",
- "id": "rack5",
- "top": 280,
- "left": 441,
- "width": 932,
- "height": 22,
- "minBayNo": 2,
- "maxBayNo": 56
- },
- {
- "type": "rack",
- "id": "rack6",
- "top": 300,
- "left": 441,
- "width": 932,
- "height": 22,
- "minBayNo": 2,
- "maxBayNo": 56
- },
- {
- "type": "rack",
- "id": "rack7",
- "top": 356,
- "left": 441,
- "width": 900,
- "height": 22,
- "minBayNo": 2,
- "maxBayNo": 54
- },
- {
- "type": "rack",
- "id": "rack8",
- "top": 378,
- "left": 441,
- "width": 934,
- "height": 22,
- "minBayNo": 2,
- "maxBayNo": 56
},
],
"rackDescs": [
@@ -93,53 +33,17 @@
"type": "rackDescs",
"id": "lb_desc1",
"text": "#1",
- "top": 150,
- "left": 1380,
+ "top": 324,
+ "left": 1794,
"width": 30,
"height": 23
},
{
"type": "rackDescs",
- "id": "lb_desc3",
- "text": "#3",
- "top": 223,
- "left": 1380,
- "width": 30,
- "height": 23
- },
- {
- "type": "rackDescs",
- "id": "lb_desc4",
- "text": "#4",
- "top": 245,
- "left": 1380,
- "width": 30,
- "height": 23
- },
- {
- "type": "rackDescs",
- "id": "lb_desc5",
- "text": "#5",
- "top": 280,
- "left": 1380,
- "width": 30,
- "height": 23
- },
- {
- "type": "rackDescs",
- "id": "lb_desc6",
- "text": "#6",
- "top": 300,
- "left": 1380,
- "width": 30,
- "height": 23
- },
- {
- "type": "rackDescs",
- "id": "lb_desc8",
- "text": "#8",
- "top": 380,
- "left": 1380,
+ "id": "lb_desc2",
+ "text": "#2",
+ "top": 388,
+ "left": 1794,
"width": 30,
"height": 23
},
@@ -149,38 +53,20 @@
"type": "track",
"id": "lb_track1",
"text": "",
- "top": 212,
- "left": 370,
- "width": 1060,
- "height": 2
- },
- {
- "type": "track",
- "id": "lb_track2",
- "text": "",
- "top": 342,
- "left": 370,
- "width": 1060,
+ "top": 370,
+ "left": 154,
+ "width": 1700,
"height": 2
},
{
"type": "crane",
"id": "crn-1",
"text": "1",
- "top": 200,
+ "top": 358,
"left": 805,
"width": 93,
"height": 22
},
- {
- "type": "crane",
- "id": "crn-2",
- "text": "2",
- "top": 330,
- "left": 805,
- "width": 93,
- "height": 22
- }
],
"areas": [
@@ -204,262 +90,60 @@
"stns": [
{
"type": "stn",
- "id": "site-102",
- "text": "102",
- "top": 359,
- "left": 1342,
- "width": 70,
- "height": 20
+ "id": "site-100",
+ "text": "100",
+ "top": 386,
+ "left": 1098,
+ "width": 78,
+ "height": 24
},
{
"type": "stn",
"id": "site-101",
"text": "101",
- "top": 359,
- "left": 1413,
- "width": 70,
- "height": 20
+ "top": 386,
+ "left": 1178,
+ "width": 78,
+ "height": 24
},
{
"type": "stn",
- "id": "site-100",
- "text": "100",
- "top": 359,
- "left": 1484,
- "width": 70,
- "height": 20
- },
- {
- "type": "stn",
- "id": "site-106",
- "text": "106",
- "top": 172,
- "left": 1342,
- "width": 70,
- "height": 20
- },
- {
- "type": "stn",
- "id": "site-105",
- "text": "105",
- "top": 172,
- "left": 1413,
- "width": 70,
- "height": 20
- },
- {
- "type": "stn",
- "id": "site-104",
- "text": "104",
- "top": 172,
- "left": 1484,
- "width": 70,
- "height": 20
+ "id": "site-102",
+ "text": "102",
+ "top": 412,
+ "left": 1098,
+ "width": 78,
+ "height": 24
},
{
"type": "stn",
"id": "site-103",
"text": "103",
- "top": 172,
- "left": 1555,
- "width": 70,
- "height": 20
+ "top": 412,
+ "left": 1178,
+ "width": 78,
+ "height": 24
},
{
"type": "stn",
- "id": "site-112",
- "text": "112",
- "top": 358,
- "left": 403,
- "width": 70,
- "height": 20
+ "id": "site-104",
+ "text": "104",
+ "top": 438,
+ "left": 1098,
+ "width": 78,
+ "height": 24
},
{
"type": "stn",
- "id": "site-111",
- "text": "111",
- "top": 358,
- "left": 332,
- "width": 70,
- "height": 20
- },
- {
- "type": "stn",
- "id": "site-110",
- "text": "110",
- "top": 358,
- "left": 261,
- "width": 70,
- "height": 20
- },
- {
- "type": "stn",
- "id": "site-116",
- "text": "116",
- "top": 173,
- "left": 403,
- "width": 70,
- "height": 20
- },
- {
- "type": "stn",
- "id": "site-115",
- "text": "115",
- "top": 173,
- "left": 332,
- "width": 70,
- "height": 20
- },
- {
- "type": "stn",
- "id": "site-114",
- "text": "114",
- "top": 173,
- "left": 261,
- "width": 70,
- "height": 20
- },
- {
- "type": "stn",
- "id": "site-113",
- "text": "113",
- "top": 173,
- "left": 190,
- "width": 70,
- "height": 20
+ "id": "site-105",
+ "text": "105",
+ "top": 438,
+ "left": 1178,
+ "width": 78,
+ "height": 24
},
]
},
- {
- "type": "floor",
- "id": "page_floor2",
- "text": "2F",
- "top": 4,
- "left": 22,
- "width": 1819,
- "height": 668,
- "stns": [
- {
- "type": "stn",
- "id": "site-202",
- "text": "202",
- "top": 358,
- "left": 403,
- "width": 70,
- "height": 20
- },
- {
- "type": "stn",
- "id": "site-201",
- "text": "201",
- "top": 358,
- "left": 332,
- "width": 70,
- "height": 20
- },
- {
- "type": "stn",
- "id": "site-200",
- "text": "200",
- "top": 358,
- "left": 261,
- "width": 70,
- "height": 20
- },
- {
- "type": "stn",
- "id": "site-205",
- "text": "205",
- "top": 173,
- "left": 403,
- "width": 70,
- "height": 20
- },
- {
- "type": "stn",
- "id": "site-204",
- "text": "204",
- "top": 173,
- "left": 332,
- "width": 70,
- "height": 20
- },
- {
- "type": "stn",
- "id": "site-203",
- "text": "203",
- "top": 173,
- "left": 261,
- "width": 70,
- "height": 20
- },
- ]
- },
- {
- "type": "floor",
- "id": "page_floor3",
- "text": "3F",
- "top": 4,
- "left": 22,
- "width": 1819,
- "height": 668,
- "stns": [
- {
- "type": "stn",
- "id": "site-302",
- "text": "302",
- "top": 358,
- "left": 403,
- "width": 70,
- "height": 20
- },
- {
- "type": "stn",
- "id": "site-301",
- "text": "301",
- "top": 358,
- "left": 332,
- "width": 70,
- "height": 20
- },
- {
- "type": "stn",
- "id": "site-300",
- "text": "300",
- "top": 358,
- "left": 261,
- "width": 70,
- "height": 20
- },
- {
- "type": "stn",
- "id": "site-305",
- "text": "305",
- "top": 173,
- "left": 403,
- "width": 70,
- "height": 20
- },
- {
- "type": "stn",
- "id": "site-304",
- "text": "304",
- "top": 173,
- "left": 332,
- "width": 70,
- "height": 20
- },
- {
- "type": "stn",
- "id": "site-303",
- "text": "303",
- "top": 173,
- "left": 261,
- "width": 70,
- "height": 20
- },
- ]
- }
]
}
diff --git a/src/main/webapp/views/console.html b/src/main/webapp/views/console.html
index 2c3a110..00696c5 100644
--- a/src/main/webapp/views/console.html
+++ b/src/main/webapp/views/console.html
@@ -28,10 +28,6 @@
<div class="main-part">
</div>
- <div style="width: 100px;height: 40px;background-color: rgb(108,167,168);position: absolute;
- left: 374px;top:133px;z-index: 999"></div>
- <div style="width: 100px;height: 40px;background-color: rgb(108,167,168);position: absolute;
- left: 374px;top:380px;z-index: 999"></div>
<div id="body">
<!-- 鎬诲紑鍏� -->
<div class="system-state">
--
Gitblit v1.9.1