From 962c3a2d98cb40347d1ea0540c80a63972d1ea5b Mon Sep 17 00:00:00 2001
From: zhang <zc857179121@qq.com>
Date: 星期一, 16 六月 2025 17:03:25 +0800
Subject: [PATCH] 1
---
src/main/webapp/static/wcs/js/console3.map.js | 2
src/main/webapp/static/wcs/js/console2.map.js | 2
src/main/webapp/static/wcs/js/common.js | 2
src/main/webapp/static/wcs/js/console.map.js | 66 ++++++++++++--------------------
src/main/webapp/views/realtimeWatch/console.html | 12 +++---
pom.xml | 2
src/main/resources/license.lic | 0
src/main/webapp/static/wcs/js/console1.map.js | 2
src/main/resources/application.yml | 6 +-
src/main/webapp/static/wms/js/common.js | 2
10 files changed, 40 insertions(+), 56 deletions(-)
diff --git a/pom.xml b/pom.xml
index 6db2168..e8d0eb2 100644
--- a/pom.xml
+++ b/pom.xml
@@ -200,7 +200,7 @@
</dependencies>
<build>
- <finalName>scwcs</finalName>
+ <finalName>wcs</finalName>
<plugins>
<plugin>
<groupId>org.springframework.boot</groupId>
diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml
index 0b6fb5c..9bc87e8 100644
--- a/src/main/resources/application.yml
+++ b/src/main/resources/application.yml
@@ -1,5 +1,5 @@
server:
- port: 8081
+ port: 9090
servlet:
context-path: /@pom.build.finalName@
@@ -8,7 +8,7 @@
name: @pom.build.finalName@
datasource:
driver-class-name: com.microsoft.sqlserver.jdbc.SQLServerDriver
- url: jdbc:sqlserver://127.0.0.1:1433;databasename=czscwcs
+ url: jdbc:sqlserver://127.0.0.1:1433;databasename=tzmsewcs
username: sa
password: sa@123
mvc:
@@ -37,7 +37,7 @@
#License鐩稿叧閰嶇疆
license:
- subject: scwcs
+ subject: tzmsewcs
publicAlias: publicCert
storePass: public_zhongyang_123456789
licensePath: license.lic
diff --git a/src/main/resources/license.lic b/src/main/resources/license.lic
index 77bf55a..062e42e 100644
--- a/src/main/resources/license.lic
+++ b/src/main/resources/license.lic
Binary files differ
diff --git a/src/main/webapp/static/wcs/js/common.js b/src/main/webapp/static/wcs/js/common.js
index 01a010b..dd0efd0 100644
--- a/src/main/webapp/static/wcs/js/common.js
+++ b/src/main/webapp/static/wcs/js/common.js
@@ -1,4 +1,4 @@
-var baseUrl = "/scwcs";
+var baseUrl = "/wcs";
// 璧嬪��
function setVal(el, val) {
diff --git a/src/main/webapp/static/wcs/js/console.map.js b/src/main/webapp/static/wcs/js/console.map.js
index 98ae686..e0bcb3e 100644
--- a/src/main/webapp/static/wcs/js/console.map.js
+++ b/src/main/webapp/static/wcs/js/console.map.js
@@ -1,5 +1,5 @@
mapInfo = {
- "mapName": "scwcs",
+ "mapName": "wcs",
"rackCount": 13,
"crnCount": 4,
"stbCount": 4,
@@ -7,17 +7,17 @@
"minBayNo": 1,
"floors": 1,
"racks": [
- // {
- // "type": "rack",
- // "id": "rack7",
- // "top": 326,
- // "left": 800,
- // "width": 795,
- // "height": 23,
- // "minBayNo": 1,
- // "maxBayNo": 50,
- // "hiddenArr": [1,22]
- // },
+ {
+ "type": "rack",
+ "id": "rack7",
+ "top": 326,
+ "left": 800,
+ "width": 795,
+ "height": 23,
+ "minBayNo": 1,
+ "maxBayNo": 50,
+ "hiddenArr": [1,22]
+ },
{
"type": "rack",
"id": "rack6",
@@ -29,17 +29,17 @@
"maxBayNo": 59,
"hiddenArr": [1,59]
},
- // {
- // "type": "rack",
- // "id": "rack5",
- // "top": 209,
- // "left": 820,
- // "width": 1050,
- // "height": 23,
- // "minBayNo": 1,
- // "maxBayNo": 59,
- // "hiddenArr": [1,59]
- // },
+ {
+ "type": "rack",
+ "id": "rack5",
+ "top": 209,
+ "left": 820,
+ "width": 1050,
+ "height": 23,
+ "minBayNo": 1,
+ "maxBayNo": 59,
+ "hiddenArr": [1,59]
+ },
{
"type": "rack",
"id": "rack4",
@@ -96,15 +96,7 @@
// "hiddenArr": [1,59]
// }
],
- "crns": [{
- "type": "crane",
- "id": "crn-2",
- "text": "2",
- "top": 268,
- "left": 855,
- "width": 93,
- "height": 22
- }, {
+ "crns": [ {
"type": "crane",
"id": "crn-1",
"text": "1",
@@ -112,15 +104,7 @@
"left": 855,
"width": 93,
"height": 22
- }, {
- "type": "track",
- "id": "lb_track2",
- "text": "",
- "top": 278,
- "left": 769,
- "width": 850,
- "height": 2
- }, {
+ },{
"type": "track",
"id": "lb_track1",
"text": "",
diff --git a/src/main/webapp/static/wcs/js/console1.map.js b/src/main/webapp/static/wcs/js/console1.map.js
index bb4e6a9..fb1c04f 100644
--- a/src/main/webapp/static/wcs/js/console1.map.js
+++ b/src/main/webapp/static/wcs/js/console1.map.js
@@ -1,5 +1,5 @@
mapInfo = {
- "mapName": "scwcs",
+ "mapName": "wcs",
"rackCount": 13,
"crnCount": 4,
"stbCount": 4,
diff --git a/src/main/webapp/static/wcs/js/console2.map.js b/src/main/webapp/static/wcs/js/console2.map.js
index c56ffef..068ec99 100644
--- a/src/main/webapp/static/wcs/js/console2.map.js
+++ b/src/main/webapp/static/wcs/js/console2.map.js
@@ -1,5 +1,5 @@
mapInfo = {
- "mapName": "scwcs",
+ "mapName": "wcs",
"rackCount": 13,
"crnCount": 4,
"stbCount": 4,
diff --git a/src/main/webapp/static/wcs/js/console3.map.js b/src/main/webapp/static/wcs/js/console3.map.js
index 356d3cd..b74f099 100644
--- a/src/main/webapp/static/wcs/js/console3.map.js
+++ b/src/main/webapp/static/wcs/js/console3.map.js
@@ -1,5 +1,5 @@
mapInfo = {
- "mapName": "scwcs",
+ "mapName": "wcs",
"rackCount": 13,
"crnCount": 4,
"stbCount": 4,
diff --git a/src/main/webapp/static/wms/js/common.js b/src/main/webapp/static/wms/js/common.js
index 7a479e6..fcb5b63 100644
--- a/src/main/webapp/static/wms/js/common.js
+++ b/src/main/webapp/static/wms/js/common.js
@@ -1,4 +1,4 @@
-var baseUrl = "/scwcs";
+var baseUrl = "/wcs";
// 璇︽儏绐楀彛-楂樺害
var detailHeight = '80%';
diff --git a/src/main/webapp/views/realtimeWatch/console.html b/src/main/webapp/views/realtimeWatch/console.html
index 7515115..7927faa 100644
--- a/src/main/webapp/views/realtimeWatch/console.html
+++ b/src/main/webapp/views/realtimeWatch/console.html
@@ -31,12 +31,12 @@
<h6>AUTOMATIC WAREHOUSE WCS MONITORING DIAGRAM</h6>
</div>
</div>
- <select onchange="window.open(this.value)">
- <option value = "console1.html">--鎴愬搧涓�妤�--</option>
- <option value="console2.html" >-鍗婃垚鍝佷簩妤�-</option>
- <option value="console3.html">-鎴愬搧浜屾ゼ-</option>
- <option value="console.html"selected ="selected">-鍗婃垚鍝佷竴妤�-</option>
- </select>
+<!-- <select onchange="window.open(this.value)">-->
+<!-- <option value = "console1.html">--鎴愬搧涓�妤�--</option>-->
+<!-- <option value="console2.html" >-鍗婃垚鍝佷簩妤�-</option>-->
+<!-- <option value="console3.html">-鎴愬搧浜屾ゼ-</option>-->
+<!-- <option value="console.html"selected ="selected">-鍗婃垚鍝佷竴妤�-</option>-->
+<!-- </select>-->
<!-- 璐ф灦 + 鍫嗗灈鏈� + 鍏ュ簱绔欑偣 -->
<div class="main-part">
--
Gitblit v1.9.1