From 5c10ee9ab5cf4e147c33f0a015e9daf4eebd6c53 Mon Sep 17 00:00:00 2001
From: lty <876263681@qq.com>
Date: 星期五, 14 三月 2025 09:31:49 +0800
Subject: [PATCH] #初始化
---
src/main/webapp/views/crn.html | 66 +
src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java | 184 ++--
src/main/webapp/views/console.html | 778 +++++++++++----------
src/main/webapp/views/index.html | 2
src/main/webapp/static/js/console.js | 2
src/main/webapp/static/css/index.css | 2
src/main/webapp/static/js/console.map.js | 972 ++++++++++++---------------
src/main/java/com/zy/core/MainProcess.java | 2
src/main/webapp/static/js/common.js | 2
pom.xml | 2
src/main/resources/application.yml | 42 +
11 files changed, 1,006 insertions(+), 1,048 deletions(-)
diff --git a/pom.xml b/pom.xml
index 6779859..2bebf12 100644
--- a/pom.xml
+++ b/pom.xml
@@ -185,7 +185,7 @@
</dependencies>
<build>
- <finalName>xgmFlwcs</finalName>
+ <finalName>tzglwcs</finalName>
<plugins>
<plugin>
<groupId>org.springframework.boot</groupId>
diff --git a/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java b/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java
index 9c8ba39..51ac5cc 100644
--- a/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java
@@ -408,10 +408,14 @@
StaProtocol staProtocol = devpThread.getStation().get(pickSta.getStaNo());
+ if(staProtocol == null) {
+ News.error("绔欑偣淇℃伅鏈幏寰�");
+ continue;
+ }
// 灏哄妫�娴嬪紓甯�
boolean back = false;
String errMsg = "";
- if (staProtocol.isFrontErr()) {
+ if (!back && staProtocol.isFrontErr()) {
errMsg = "鍓嶈秴闄�";
back = true;
}
@@ -1018,48 +1022,48 @@
continue;
}
- // 鍙屾繁搴撲綅涓旀祬搴撲綅鏈夎揣锛屽垯闇�鍏堝娴呭簱浣嶈繘琛屽簱浣嶇Щ杞�
- if (Utils.isDeepLoc(slaveProperties, wrkMast.getLocNo())) {
- News.warnNoLog("" + mark + " - 1" + " - 8" + " - 鍙屾繁搴撲綅涓旀祬搴撲綅鏈夎揣锛屽垯闇�鍏堝娴呭簱浣嶈繘琛屽簱浣嶇Щ杞� : 寮�濮嬫墽琛� 浠诲姟鍙�={}", wrkMast.getWrkNo());
- String shallowLocNo = Utils.getShallowLoc(slaveProperties, wrkMast.getLocNo());
- LocMast shallowLoc = locMastService.selectById(shallowLocNo);
- // O.绌哄簱浣嶃�丵.鎷ｆ枡/鐩樼偣/骞舵澘鍐嶅叆搴撱�丼.鍏ュ簱棰勭害銆乆.绂佺敤 鐩存帴鎼紒
- if (shallowLoc.getLocSts().equals("P") || shallowLoc.getLocSts().equals("R")) {
- News.warnNoLog("" + mark + " - 1" + " - 9" + " - // O.绌哄簱浣嶃�丵.鎷ｆ枡/鐩樼偣/骞舵澘鍐嶅叆搴撱�丼.鍏ュ簱棰勭害銆乆.绂佺敤 鐩存帴鎼紒搴撲綅鐘舵��={}", shallowLoc.getLocSts());
- WrkMast waitWrkMast = wrkMastMapper.selectByLocNo(shallowLocNo);
- if (null == waitWrkMast) {
- News.error("" + mark + " - 1" + " - 10" + " - {}搴撲綅寮傚父锛屾湭妫�绱㈠埌鐩稿簲宸ヤ綔妗ｏ紒", shallowLocNo);
- } else {
- waitWrkMast.setIoPri(15D);
- waitWrkMast.setModiTime(new Date());
- if (wrkMastMapper.updateById(waitWrkMast) == 0) {
- News.error("" + mark + " - 1" + " - 11" + " - 璋冩暣宸ヤ綔妗ｄ紭鍏堢骇澶辫触锛佸伐浣滃彿={}", waitWrkMast.getWrkNo());
- }
- continue;
- }
-
- } else if (shallowLoc.getLocSts().equals("F") || shallowLoc.getLocSts().equals("D")) {
- News.warnNoLog("" + mark + " - 1" + " - 12" + " - // F銆丏 搴撲綅鐘舵��={}", shallowLoc.getLocSts());
- // 姝ゆ爣璁伴伩鍏嶅娆℃墽琛岀Щ搴撲换鍔�
- if (Cools.isEmpty(wrkMast.getUpdMk()) || "N".equals(wrkMast.getUpdMk())) {
- wrkMast.setUpdMk("Y");
- wrkMast.setIoPri(14D);
- wrkMastMapper.updateById(wrkMast);
- // 鐢熸垚宸ヤ綔妗�,灏嗘祬搴撲綅绉昏浆鍒版柊鐨勫簱浣嶄腑
- moveLocForDeepLoc(slave, shallowLoc, mark);
- // 鐢熸垚宸ヤ綔妗ｃ�佹敼鍙樻祬搴撲綅鐨勬簮搴�/鐩爣搴� 搴撲綅鐘舵�併�佷笅鍙戝爢鍨涙満鍛戒护锛堢珛椹墽琛�)
-// moveLocForDeepLocPakin(slave, shallowLoc, wrkMast);
- }
- continue;
- } else if (shallowLoc.getLocSts().equals("Q")) {
- News.warnNoLog("" + mark + " - 1" + " - 13" + " - // Q 搴撲綅鐘舵��={}", shallowLoc.getLocSts());
- WrkMast waitWrkMast = wrkMastMapper.selectByLocNo(shallowLocNo);
- if (null != waitWrkMast && waitWrkMast.getWrkSts() == 4) {
- News.infoNoLog("" + mark + " - 1" + " - 14" + " - // F銆丏 宸ヤ綔鐘舵��(鍒ゆ柇鏉′欢涓�==4)={}", waitWrkMast.getWrkSts());
- continue;
- }
- }
- }
+// // 鍙屾繁搴撲綅涓旀祬搴撲綅鏈夎揣锛屽垯闇�鍏堝娴呭簱浣嶈繘琛屽簱浣嶇Щ杞�
+// if (Utils.isDeepLoc(slaveProperties, wrkMast.getLocNo())) {
+// News.warnNoLog("" + mark + " - 1" + " - 8" + " - 鍙屾繁搴撲綅涓旀祬搴撲綅鏈夎揣锛屽垯闇�鍏堝娴呭簱浣嶈繘琛屽簱浣嶇Щ杞� : 寮�濮嬫墽琛� 浠诲姟鍙�={}", wrkMast.getWrkNo());
+// String shallowLocNo = Utils.getShallowLoc(slaveProperties, wrkMast.getLocNo());
+// LocMast shallowLoc = locMastService.selectById(shallowLocNo);
+// // O.绌哄簱浣嶃�丵.鎷ｆ枡/鐩樼偣/骞舵澘鍐嶅叆搴撱�丼.鍏ュ簱棰勭害銆乆.绂佺敤 鐩存帴鎼紒
+// if (shallowLoc.getLocSts().equals("P") || shallowLoc.getLocSts().equals("R")) {
+// News.warnNoLog("" + mark + " - 1" + " - 9" + " - // O.绌哄簱浣嶃�丵.鎷ｆ枡/鐩樼偣/骞舵澘鍐嶅叆搴撱�丼.鍏ュ簱棰勭害銆乆.绂佺敤 鐩存帴鎼紒搴撲綅鐘舵��={}", shallowLoc.getLocSts());
+// WrkMast waitWrkMast = wrkMastMapper.selectByLocNo(shallowLocNo);
+// if (null == waitWrkMast) {
+// News.error("" + mark + " - 1" + " - 10" + " - {}搴撲綅寮傚父锛屾湭妫�绱㈠埌鐩稿簲宸ヤ綔妗ｏ紒", shallowLocNo);
+// } else {
+// waitWrkMast.setIoPri(15D);
+// waitWrkMast.setModiTime(new Date());
+// if (wrkMastMapper.updateById(waitWrkMast) == 0) {
+// News.error("" + mark + " - 1" + " - 11" + " - 璋冩暣宸ヤ綔妗ｄ紭鍏堢骇澶辫触锛佸伐浣滃彿={}", waitWrkMast.getWrkNo());
+// }
+// continue;
+// }
+//
+// } else if (shallowLoc.getLocSts().equals("F") || shallowLoc.getLocSts().equals("D")) {
+// News.warnNoLog("" + mark + " - 1" + " - 12" + " - // F銆丏 搴撲綅鐘舵��={}", shallowLoc.getLocSts());
+// // 姝ゆ爣璁伴伩鍏嶅娆℃墽琛岀Щ搴撲换鍔�
+// if (Cools.isEmpty(wrkMast.getUpdMk()) || "N".equals(wrkMast.getUpdMk())) {
+// wrkMast.setUpdMk("Y");
+// wrkMast.setIoPri(14D);
+// wrkMastMapper.updateById(wrkMast);
+// // 鐢熸垚宸ヤ綔妗�,灏嗘祬搴撲綅绉昏浆鍒版柊鐨勫簱浣嶄腑
+// moveLocForDeepLoc(slave, shallowLoc, mark);
+// // 鐢熸垚宸ヤ綔妗ｃ�佹敼鍙樻祬搴撲綅鐨勬簮搴�/鐩爣搴� 搴撲綅鐘舵�併�佷笅鍙戝爢鍨涙満鍛戒护锛堢珛椹墽琛�)
+//// moveLocForDeepLocPakin(slave, shallowLoc, wrkMast);
+// }
+// continue;
+// } else if (shallowLoc.getLocSts().equals("Q")) {
+// News.warnNoLog("" + mark + " - 1" + " - 13" + " - // Q 搴撲綅鐘舵��={}", shallowLoc.getLocSts());
+// WrkMast waitWrkMast = wrkMastMapper.selectByLocNo(shallowLocNo);
+// if (null != waitWrkMast && waitWrkMast.getWrkSts() == 4) {
+// News.infoNoLog("" + mark + " - 1" + " - 14" + " - // F銆丏 宸ヤ綔鐘舵��(鍒ゆ柇鏉′欢涓�==4)={}", waitWrkMast.getWrkSts());
+// continue;
+// }
+// }
+// }
News.warnNoLog("" + mark + " - 1" + " - 15" + " - 鍛戒护涓嬪彂 : 宸ヤ綔鍙�={},婧愭帓={},婧愬垪={},婧愬眰={},鐩爣鎺�={},鐩爣鍒�={},鐩爣灞�={}", wrkMast.getWrkNo().shortValue()
, crnStn.getRow().shortValue(), crnStn.getBay().shortValue(), crnStn.getLev().shortValue()
, locMast.getRow1().shortValue(), locMast.getBay1().shortValue(), locMast.getLev1().shortValue());
@@ -1167,54 +1171,54 @@
break;
}
- // 鍙屾繁搴撲綅涓旀祬搴撲綅鏈夎揣锛屽垯闇�鍏堝娴呭簱浣嶈繘琛屽簱浣嶇Щ杞�
- if (Utils.isDeepLoc(slaveProperties, wrkMast.getSourceLocNo())) {
- News.warnNoLog("" + mark + " - 2" + " - 6" + " - 鍙屾繁搴撲綅涓旀祬搴撲綅鏈夎揣锛屽垯闇�鍏堝娴呭簱浣嶈繘琛屽簱浣嶇Щ杞� : 寮�濮嬫墽琛� 浠诲姟鍙�={}", wrkMast.getWrkNo());
- String shallowLocNo = Utils.getShallowLoc(slaveProperties, wrkMast.getSourceLocNo());
- LocMast shallowLoc = locMastService.selectById(shallowLocNo);
- // O.绌哄簱浣嶃�丵.鎷ｆ枡/鐩樼偣/骞舵澘鍐嶅叆搴撱�丼.鍏ュ簱棰勭害銆乆.绂佺敤 鐩存帴鎼紒
- if (shallowLoc.getLocSts().equals("P") || shallowLoc.getLocSts().equals("R")) {
- News.warnNoLog("" + mark + " - 2" + " - 7" + " - // O.绌哄簱浣嶃�丵.鎷ｆ枡/鐩樼偣/骞舵澘鍐嶅叆搴撱�丼.鍏ュ簱棰勭害銆乆.绂佺敤 鐩存帴鎼紒搴撲綅鐘舵��={}", shallowLoc.getLocSts());
- WrkMast waitWrkMast = wrkMastMapper.selectByLocNo(shallowLocNo);
- if (null == waitWrkMast) {
- News.error("{}搴撲綅寮傚父锛屾湭妫�绱㈠埌鐩稿簲宸ヤ綔妗ｏ紒", shallowLocNo);
- } else {
- if (waitWrkMast.getWrkSts() == 11) {
- waitWrkMast.setIoPri(15D);
- waitWrkMast.setModiTime(new Date());
- if (wrkMastMapper.updateById(waitWrkMast) == 0) {
- News.error("" + mark + " - 2" + " - 8" + " - 璋冩暣宸ヤ綔妗ｄ紭鍏堢骇澶辫触锛佸伐浣滃彿={}", waitWrkMast.getWrkNo());
- }
- continue;
- } else {
-
- }
- }
- } else if (shallowLoc.getLocSts().equals("F") || shallowLoc.getLocSts().equals("D")) {
- News.warnNoLog("" + mark + " - 2" + " - 9" + " - // F銆丏 搴撲綅鐘舵��={}", shallowLoc.getLocSts());
+// // 鍙屾繁搴撲綅涓旀祬搴撲綅鏈夎揣锛屽垯闇�鍏堝娴呭簱浣嶈繘琛屽簱浣嶇Щ杞�
+// if (Utils.isDeepLoc(slaveProperties, wrkMast.getSourceLocNo())) {
+// News.warnNoLog("" + mark + " - 2" + " - 6" + " - 鍙屾繁搴撲綅涓旀祬搴撲綅鏈夎揣锛屽垯闇�鍏堝娴呭簱浣嶈繘琛屽簱浣嶇Щ杞� : 寮�濮嬫墽琛� 浠诲姟鍙�={}", wrkMast.getWrkNo());
+// String shallowLocNo = Utils.getShallowLoc(slaveProperties, wrkMast.getSourceLocNo());
+// LocMast shallowLoc = locMastService.selectById(shallowLocNo);
+// // O.绌哄簱浣嶃�丵.鎷ｆ枡/鐩樼偣/骞舵澘鍐嶅叆搴撱�丼.鍏ュ簱棰勭害銆乆.绂佺敤 鐩存帴鎼紒
+// if (shallowLoc.getLocSts().equals("P") || shallowLoc.getLocSts().equals("R")) {
+// News.warnNoLog("" + mark + " - 2" + " - 7" + " - // O.绌哄簱浣嶃�丵.鎷ｆ枡/鐩樼偣/骞舵澘鍐嶅叆搴撱�丼.鍏ュ簱棰勭害銆乆.绂佺敤 鐩存帴鎼紒搴撲綅鐘舵��={}", shallowLoc.getLocSts());
// WrkMast waitWrkMast = wrkMastMapper.selectByLocNo(shallowLocNo);
- //2022-08-16 modify,涓嶆牴鎹畊pdmk鏍囪绉诲簱浠诲姟(瀹规槗琚彇娑堝鑷村牭濉�)锛屾煡璇㈠伐浣滄。鏄惁瀛樺湪浠诲姟
- WrkMast waitWrkMast = wrkMastMapper.selectByLocNo1(shallowLocNo);
- // 姝ゆ爣璁伴伩鍏嶅娆℃墽琛岀Щ搴撲换鍔�
-// if (Cools.isEmpty(wrkMast.getUpdMk()) || "N".equals(wrkMast.getUpdMk())
-// || Cools.isEmpty(waitWrkMast)) {
- if (Cools.isEmpty(waitWrkMast)) {
- wrkMast.setUpdMk("Y");
- wrkMastMapper.updateById(wrkMast);
- // 鐢熸垚宸ヤ綔妗�,灏嗘祬搴撲綅绉昏浆鍒版柊鐨勫簱浣嶄腑
- moveLocForDeepLoc(slave, shallowLoc, mark);
- }
- News.error("{}浠诲姟鍑哄簱澶辫触锛屾祬搴撲綅鍫靛锛佹祬搴撲綅鍙�:{}", wrkMast.getWrkNo(), shallowLocNo);
- continue;
- } else if (shallowLoc.getLocSts().equals("Q") || shallowLoc.getLocSts().equals("S")) {
- News.warnNoLog("" + mark + " - 2" + " - 10" + " - // Q銆丼 搴撲綅鐘舵��={}", shallowLoc.getLocSts());
- WrkMast waitWrkMast = wrkMastMapper.selectByLocNo1(shallowLocNo);
- if (null != waitWrkMast && waitWrkMast.getWrkSts() == 4) {
- News.infoNoLog("" + mark + " - 2" + " - 11" + " - // F銆丏 宸ヤ綔鐘舵��(鍒ゆ柇鏉′欢涓�==4)={}", waitWrkMast.getWrkSts());
- continue;
- }
- }
- }
+// if (null == waitWrkMast) {
+// News.error("{}搴撲綅寮傚父锛屾湭妫�绱㈠埌鐩稿簲宸ヤ綔妗ｏ紒", shallowLocNo);
+// } else {
+// if (waitWrkMast.getWrkSts() == 11) {
+// waitWrkMast.setIoPri(15D);
+// waitWrkMast.setModiTime(new Date());
+// if (wrkMastMapper.updateById(waitWrkMast) == 0) {
+// News.error("" + mark + " - 2" + " - 8" + " - 璋冩暣宸ヤ綔妗ｄ紭鍏堢骇澶辫触锛佸伐浣滃彿={}", waitWrkMast.getWrkNo());
+// }
+// continue;
+// } else {
+//
+// }
+// }
+// } else if (shallowLoc.getLocSts().equals("F") || shallowLoc.getLocSts().equals("D")) {
+// News.warnNoLog("" + mark + " - 2" + " - 9" + " - // F銆丏 搴撲綅鐘舵��={}", shallowLoc.getLocSts());
+//// WrkMast waitWrkMast = wrkMastMapper.selectByLocNo(shallowLocNo);
+// //2022-08-16 modify,涓嶆牴鎹畊pdmk鏍囪绉诲簱浠诲姟(瀹规槗琚彇娑堝鑷村牭濉�)锛屾煡璇㈠伐浣滄。鏄惁瀛樺湪浠诲姟
+// WrkMast waitWrkMast = wrkMastMapper.selectByLocNo1(shallowLocNo);
+// // 姝ゆ爣璁伴伩鍏嶅娆℃墽琛岀Щ搴撲换鍔�
+//// if (Cools.isEmpty(wrkMast.getUpdMk()) || "N".equals(wrkMast.getUpdMk())
+//// || Cools.isEmpty(waitWrkMast)) {
+// if (Cools.isEmpty(waitWrkMast)) {
+// wrkMast.setUpdMk("Y");
+// wrkMastMapper.updateById(wrkMast);
+// // 鐢熸垚宸ヤ綔妗�,灏嗘祬搴撲綅绉昏浆鍒版柊鐨勫簱浣嶄腑
+// moveLocForDeepLoc(slave, shallowLoc, mark);
+// }
+// News.error("{}浠诲姟鍑哄簱澶辫触锛屾祬搴撲綅鍫靛锛佹祬搴撲綅鍙�:{}", wrkMast.getWrkNo(), shallowLocNo);
+// continue;
+// } else if (shallowLoc.getLocSts().equals("Q") || shallowLoc.getLocSts().equals("S")) {
+// News.warnNoLog("" + mark + " - 2" + " - 10" + " - // Q銆丼 搴撲綅鐘舵��={}", shallowLoc.getLocSts());
+// WrkMast waitWrkMast = wrkMastMapper.selectByLocNo1(shallowLocNo);
+// if (null != waitWrkMast && waitWrkMast.getWrkSts() == 4) {
+// News.infoNoLog("" + mark + " - 2" + " - 11" + " - // F銆丏 宸ヤ綔鐘舵��(鍒ゆ柇鏉′欢涓�==4)={}", waitWrkMast.getWrkSts());
+// continue;
+// }
+// }
+// }
// 宸茬粡瀛樺湪鍚婅溅鎵ц浠诲姟鏃讹紝鍒欒繃婊�
if (wrkMastMapper.selectWorking(slave.getId()) != null) {
diff --git a/src/main/java/com/zy/core/MainProcess.java b/src/main/java/com/zy/core/MainProcess.java
index 38df41c..771cc2f 100644
--- a/src/main/java/com/zy/core/MainProcess.java
+++ b/src/main/java/com/zy/core/MainProcess.java
@@ -78,7 +78,7 @@
// 鍏朵粬 ===>> LED鏄剧ず鍣ㄥ浣嶏紝鏄剧ず榛樿淇℃伅
mainService.ledReset();
- mainService.outOfDevp(11);
+// mainService.outOfDevp(11);
// if (i>10){
// //绌烘墭鐩樿嚜鍔ㄥ嚭搴�
diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml
index 5a37a8c..c381a91 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://192.168.11.30:1433;databasename=xgmFlasrs
+ url: jdbc:sqlserver://127.0.0.1:1433;databasename=tzglasrs
username: sa
password: sa@123
mvc:
@@ -34,7 +34,7 @@
enable: false
wms:
- url: 192.168.11.30:8080/xgmFlwms
+ url: 127.0.0.1:8080/tzglwms
# 涓嬩綅鏈洪厤缃�
wcs-slave:
@@ -158,6 +158,44 @@
row: 5
bay: 42
lev: 1
+ # 鍫嗗灈鏈�4
+ crn[3]:
+ id: 4
+ ip: 10.10.10.141
+ port: 102
+ rack: 0
+ slot: 0
+ # 鍋忕Щ閲忥紝褰撳爢鍨涙満绔欑偣鍒楀彿=1鏃讹紝鍋忕Щ閲�=2
+ offset: 0
+ demo: false
+ # 鍫嗗灈鏈哄叆搴撶珯鐐�
+ crnInStn[0]:
+ devpPlcId: ${wcs-slave.devp[0].id}
+ staNo: 204
+ row: 6
+ bay: 1
+ lev: 1
+ # 鍫嗗灈鏈哄嚭搴撶珯鐐�
+ crnOutStn[0]:
+ devpPlcId: ${wcs-slave.devp[0].id}
+ staNo: 208
+ row: 5
+ bay: 1
+ lev: 1
+ # 鍫嗗灈鏈哄叆搴撶珯鐐�
+ crnInStn[1]:
+ devpPlcId: ${wcs-slave.devp[0].id}
+ staNo: 104
+ row: 6
+ bay: 42
+ lev: 1
+ # 鍫嗗灈鏈哄嚭搴撶珯鐐�
+ crnOutStn[1]:
+ devpPlcId: ${wcs-slave.devp[0].id}
+ staNo: 108
+ row: 5
+ bay: 42
+ lev: 1
# 杈撻�佺嚎1
devp[0]:
id: 1
diff --git a/src/main/webapp/static/css/index.css b/src/main/webapp/static/css/index.css
index 7c5a292..10c2f8d 100644
--- a/src/main/webapp/static/css/index.css
+++ b/src/main/webapp/static/css/index.css
@@ -34,7 +34,7 @@
height: 40%;
line-height: 90px;
position: fixed;
- top: 50%;
+ top: 60%;
transform: translateY(-50%);
}
.nav ul {
diff --git a/src/main/webapp/static/js/common.js b/src/main/webapp/static/js/common.js
index 3dbaab4..b17ab25 100644
--- a/src/main/webapp/static/js/common.js
+++ b/src/main/webapp/static/js/common.js
@@ -1,4 +1,4 @@
-var baseUrl = "/xgmFlwcs";
+var baseUrl = "/tzglwcs";
// 璧嬪��
function setVal(el, val) {
diff --git a/src/main/webapp/static/js/console.js b/src/main/webapp/static/js/console.js
index 7523ae8..f9936db 100644
--- a/src/main/webapp/static/js/console.js
+++ b/src/main/webapp/static/js/console.js
@@ -129,7 +129,7 @@
let floor = areas[i].text
let barcodes = areas[i].barcode
floorId = areas[i].id
- var position = (i+1)*100
+ var position = (i+1)*50 + 400
floorBtn =
"<button class='floorBtn btn-16' onclick='changFloor("+i+")' style='top: "+position+"px;'>" + floor +"</button>"
if (mapInfo.areas[0].floors.length == 1) {
diff --git a/src/main/webapp/static/js/console.map.js b/src/main/webapp/static/js/console.map.js
index 5ef9b5f..7cef044 100644
--- a/src/main/webapp/static/js/console.map.js
+++ b/src/main/webapp/static/js/console.map.js
@@ -1,553 +1,435 @@
mapInfo ={
- "mapName": "xgmFlwcs",
- "rackCount": 6,
- "crnCount": 3,
- "stbCount": 48,
+ "mapName": "tzglwcs",
+ "rackCount": 8,
+ "crnCount": 4,
+ "stbCount": 120,
"hpPosition": 0,
"minBayNo": 2,
- "floors": 1,
- "racks": [{
- "type": "rack",
- "id": "rack5",
- "top": 448,
- "left": 447,
- "width": 845,
- "height": 20,
- "minBayNo": 2,
- "maxBayNo": 41
- }, {
- "type": "rack",
- "id": "rack6",
- "top": 500,
- "left": 447,
- "width": 845,
- "height": 20,
- "minBayNo": 2,
- "maxBayNo": 41
- }, {
- "type": "rack",
- "id": "rack4",
- "top": 427,
- "left": 447,
- "width": 845,
- "height": 20,
- "minBayNo": 2,
- "maxBayNo": 41
- }, {
- "type": "rack",
- "id": "rack1",
- "top": 308,
- "left": 447,
- "width": 845,
- "height": 20,
- "minBayNo": 2,
- "maxBayNo": 41
- }, {
- "type": "rack",
- "id": "rack2",
- "top": 356,
- "left": 447,
- "width": 845,
- "height": 20,
- "minBayNo": 2,
- "maxBayNo": 41
- }, {
- "type": "rack",
- "id": "rack3",
- "top": 377,
- "left": 447,
- "width": 845,
- "height": 20,
- "minBayNo": 2,
- "maxBayNo": 41
- }],
- "rackDescs": [{
- "type": "rackDescs",
- "id": "lb_desc1",
- "text": "#1",
- "top": 273,
- "left": 1217,
- "width": 30,
- "height": 23
- }, {
- "type": "rackDescs",
- "id": "lb_desc2",
- "text": "#6",
- "top": 551,
- "left": 1218,
- "width": 33,
- "height": 23
- }],
- "crns": [{
- "type": "track",
- "id": "lb_track3",
- "text": "",
- "top": 485,
- "left": 408,
- "width": 900,
- "height": 2
- }, {
- "type": "crane",
- "id": "crn-3",
- "text": "3",
- "top": 474,
- "left": 866,
- "width": 93,
- "height": 22
- }, {
- "type": "track",
- "id": "lb_track2",
- "text": "",
- "top": 412,
- "left": 408,
- "width": 900,
- "height": 2
- }, {
- "type": "crane",
- "id": "crn-2",
- "text": "2",
- "top": 402,
- "left": 866,
- "width": 93,
- "height": 22
- }, {
- "type": "track",
- "id": "lb_track1",
- "text": "",
- "top": 339,
- "left": 408,
- "width": 900,
- "height": 2
- }, {
- "type": "crane",
- "id": "crn-1",
- "text": "1",
- "top": 329,
- "left": 866,
- "width": 93,
- "height": 22
- }],
- "areas": [{
- "type": "Control_floor",
- "id": "tabControl_floor1",
- "text": "妤煎眰",
- "top": 66,
- "left": 77,
- "width": 1537,
- "height": 598,
- "floors": [{
- "type": "floor",
- "id": "page_floor1",
- "text": "1F",
- "top": 4,
- "left": 22,
- "width": 1511,
- "height": 590,
- "stns": [{
- "type": "stn",
- "id": "site-221",
- "text": "221",
- "top": 311,
- "left": 284,
- "width": 80,
- "height": 20
- }, {
- "type": "stn",
- "id": "site-222",
- "text": "222",
- "top": 311,
- "left": 365,
- "width": 80,
- "height": 20
- }, {
- "type": "stn",
- "id": "site-217",
- "text": "217",
- "top": 357,
- "left": 284,
- "width": 80,
- "height": 20
- }, {
- "type": "stn",
- "id": "site-223",
- "text": "223",
- "top": 290,
- "left": 203,
- "width": 80,
- "height": 20
- }, {
- "type": "stn",
- "id": "site-220",
- "text": "220",
- "top": 311,
- "left": 203,
- "width": 80,
- "height": 20
- }, {
- "type": "stn",
- "id": "site-200",
- "text": "200",
- "top": 542,
- "left": 203,
- "width": 80,
- "height": 20
- }, {
- "type": "stn",
- "id": "site-214",
- "text": "214",
- "top": 378,
- "left": 284,
- "width": 80,
- "height": 20
- }, {
- "type": "stn",
- "id": "site-213",
- "text": "213",
- "top": 378,
- "left": 203,
- "width": 80,
- "height": 20
- }, {
- "type": "stn",
- "id": "site-215",
- "text": "215",
- "top": 378,
- "left": 365,
- "width": 80,
- "height": 20
- }, {
- "type": "stn",
- "id": "site-211",
- "text": "211",
- "top": 427,
- "left": 365,
- "width": 80,
- "height": 20
- }, {
- "type": "stn",
- "id": "site-210",
- "text": "210",
- "top": 427,
- "left": 284,
- "width": 80,
- "height": 20
- }, {
- "type": "stn",
- "id": "site-212",
- "text": "212",
- "top": 399,
- "left": 203,
- "width": 80,
- "height": 27
- }, {
- "type": "stn",
- "id": "site-208",
- "text": "208",
- "top": 448,
- "left": 365,
- "width": 80,
- "height": 20
- }, {
- "type": "stn",
- "id": "site-207",
- "text": "207",
- "top": 448,
- "left": 284,
- "width": 80,
- "height": 20
- }, {
- "type": "stn",
- "id": "site-209",
- "text": "209",
- "top": 427,
- "left": 203,
- "width": 80,
- "height": 20
- }, {
- "type": "stn",
- "id": "site-205",
- "text": "205",
- "top": 469,
- "left": 203,
- "width": 80,
- "height": 30
- }, {
- "type": "stn",
- "id": "site-204",
- "text": "204",
- "top": 500,
- "left": 365,
- "width": 80,
- "height": 20
- }, {
- "type": "stn",
- "id": "site-206",
- "text": "206",
- "top": 448,
- "left": 203,
- "width": 80,
- "height": 20
- }, {
- "type": "stn",
- "id": "site-202",
- "text": "202",
- "top": 500,
- "left": 203,
- "width": 80,
- "height": 20
- }, {
- "type": "stn",
- "id": "site-201",
- "text": "201",
- "top": 521,
- "left": 203,
- "width": 80,
- "height": 20
- }, {
- "type": "stn",
- "id": "site-203",
- "text": "203",
- "top": 500,
- "left": 284,
- "width": 80,
- "height": 20
- }, {
- "type": "stn",
- "id": "site-219",
- "text": "219",
- "top": 332,
- "left": 203,
- "width": 80,
- "height": 24
- }, {
- "type": "stn",
- "id": "site-216",
- "text": "216",
- "top": 357,
- "left": 203,
- "width": 80,
- "height": 20
- }, {
- "type": "stn",
- "id": "site-218",
- "text": "218",
- "top": 357,
- "left": 365,
- "width": 80,
- "height": 20
- }, {
- "type": "stn",
- "id": "site-121",
- "text": "121",
- "top": 311,
- "left": 1375,
- "width": 80,
- "height": 20
- }, {
- "type": "stn",
- "id": "site-122",
- "text": "122",
- "top": 311,
- "left": 1294,
- "width": 80,
- "height": 20
- }, {
- "type": "stn",
- "id": "site-117",
- "text": "117",
- "top": 357,
- "left": 1375,
- "width": 80,
- "height": 20
- }, {
- "type": "stn",
- "id": "site-123",
- "text": "123",
- "top": 290,
- "left": 1456,
- "width": 80,
- "height": 20
- }, {
- "type": "stn",
- "id": "site-120",
- "text": "120",
- "top": 311,
- "left": 1456,
- "width": 80,
- "height": 20
- }, {
- "type": "stn",
- "id": "site-100",
- "text": "100",
- "top": 542,
- "left": 1456,
- "width": 80,
- "height": 20
- }, {
- "type": "stn",
- "id": "site-114",
- "text": "114",
- "top": 378,
- "left": 1375,
- "width": 80,
- "height": 20
- }, {
- "type": "stn",
- "id": "site-113",
- "text": "113",
- "top": 378,
- "left": 1456,
- "width": 80,
- "height": 20
- }, {
- "type": "stn",
- "id": "site-115",
- "text": "115",
- "top": 378,
- "left": 1294,
- "width": 80,
- "height": 20
- }, {
- "type": "stn",
- "id": "site-111",
- "text": "111",
- "top": 427,
- "left": 1294,
- "width": 80,
- "height": 20
- }, {
- "type": "stn",
- "id": "site-110",
- "text": "110",
- "top": 427,
- "left": 1375,
- "width": 80,
- "height": 20
- }, {
- "type": "stn",
- "id": "site-112",
- "text": "112",
- "top": 399,
- "left": 1456,
- "width": 80,
- "height": 27
- }, {
- "type": "stn",
- "id": "site-108",
- "text": "108",
- "top": 448,
- "left": 1294,
- "width": 80,
- "height": 20
- }, {
- "type": "stn",
- "id": "site-107",
- "text": "107",
- "top": 448,
- "left": 1375,
- "width": 80,
- "height": 20
- }, {
- "type": "stn",
- "id": "site-109",
- "text": "109",
- "top": 427,
- "left": 1456,
- "width": 80,
- "height": 20
- }, {
- "type": "stn",
- "id": "site-105",
- "text": "105",
- "top": 469,
- "left": 1456,
- "width": 80,
- "height": 30
- }, {
- "type": "stn",
- "id": "site-104",
- "text": "104",
- "top": 500,
- "left": 1294,
- "width": 80,
- "height": 20
- }, {
- "type": "stn",
- "id": "site-106",
- "text": "106",
- "top": 448,
- "left": 1456,
- "width": 80,
- "height": 20
- }, {
- "type": "stn",
- "id": "site-102",
- "text": "102",
- "top": 500,
- "left": 1456,
- "width": 80,
- "height": 20
- }, {
- "type": "stn",
- "id": "site-101",
- "text": "101",
- "top": 521,
- "left": 1456,
- "width": 80,
- "height": 20
- }, {
- "type": "stn",
- "id": "site-103",
- "text": "103",
- "top": 500,
- "left": 1375,
- "width": 80,
- "height": 20
- }, {
- "type": "stn",
- "id": "site-119",
- "text": "119",
- "top": 332,
- "left": 1456,
- "width": 80,
- "height": 24
- }, {
- "type": "stn",
- "id": "site-116",
- "text": "116",
- "top": 357,
- "left": 1456,
- "width": 80,
- "height": 20
- }, {
- "type": "stn",
- "id": "site-118",
- "text": "118",
- "top": 357,
- "left": 1294,
- "width": 80,
- "height": 20
- }],
- "barcode":[
+ "racks": [
+ {
+ "type": "rack",
+ "id": "rack1",
+ "top": 80,
+ "left": 140,
+ "width": 1600,
+ "height": 23,
+ "minBayNo": 2,
+ "maxBayNo": 120
+ },
+ {
+ "type": "rack",
+ "id": "rack2",
+ "top": 130,
+ "left": 140,
+ "width": 1600,
+ "height": 23,
+ "minBayNo": 2,
+ "maxBayNo": 120
+ },
+ {
+ "type": "rack",
+ "id": "rack3",
+ "top": 160,
+ "left": 140,
+ "width": 1600,
+ "height": 23,
+ "minBayNo": 2,
+ "maxBayNo": 120
+ },
+ {
+ "type": "rack",
+ "id": "rack4",
+ "top": 210,
+ "left": 140,
+ "width": 1600,
+ "height": 23,
+ "minBayNo": 2,
+ "maxBayNo": 120
+ },
+ {
+ "type": "rack",
+ "id": "rack5",
+ "top": 240,
+ "left": 140,
+ "width": 1600,
+ "height": 23,
+ "minBayNo": 2,
+ "maxBayNo": 120
+ },
+ {
+ "type": "rack",
+ "id": "rack6",
+ "top": 290,
+ "left": 140,
+ "width": 1600,
+ "height": 23,
+ "minBayNo": 2,
+ "maxBayNo": 120
+ },
+ {
+ "type": "rack",
+ "id": "rack7",
+ "top": 320,
+ "left": 140,
+ "width": 1600,
+ "height": 23,
+ "minBayNo": 2,
+ "maxBayNo": 120
+ },
+ {
+ "type": "rack",
+ "id": "rack8",
+ "top": 370,
+ "left": 140,
+ "width": 1600,
+ "height": 23,
+ "minBayNo": 2,
+ "maxBayNo": 120
+ }
+ ],
+ "rackDescs": [
+ {
+ "type": "rackDescs",
+ "id": "lb_desc1",
+ "text": "#1",
+ "top": 80,
+ "left": 1860,
+ "width": 30,
+ "height": 23
+ },
+ {
+ "type": "rackDescs",
+ "id": "lb_desc2",
+ "text": "#2",
+ "top": 130,
+ "left": 1860,
+ "width": 30,
+ "height": 23
+ },
+ {
+ "type": "rackDescs",
+ "id": "lb_desc3",
+ "text": "#3",
+ "top": 160,
+ "left": 1860,
+ "width": 30,
+ "height": 23
+ },
+ {
+ "type": "rackDescs",
+ "id": "lb_desc4",
+ "text": "#4",
+ "top": 210,
+ "left": 1860,
+ "width": 30,
+ "height": 23
+ },
+ {
+ "type": "rackDescs",
+ "id": "lb_desc5",
+ "text": "#5",
+ "top": 240,
+ "left": 1860,
+ "width": 30,
+ "height": 23
+ },
+ {
+ "type": "rackDescs",
+ "id": "lb_desc6",
+ "text": "#6",
+ "top": 290,
+ "left": 1860,
+ "width": 30,
+ "height": 23
+ },
+ {
+ "type": "rackDescs",
+ "id": "lb_desc7",
+ "text": "#7",
+ "top": 320,
+ "left": 1860,
+ "width": 30,
+ "height": 23
+ },
+ {
+ "type": "rackDescs",
+ "id": "lb_desc8",
+ "text": "#8",
+ "top": 370,
+ "left": 1860,
+ "width": 30,
+ "height": 23
+ },
+ ],
+ "crns": [
+ {
+ "type": "crane",
+ "id": "crn-1",
+ "text": "1",
+ "top": 110,
+ "left": 1550,
+ "width": 100,
+ "height": 22
+ },
+ {
+ "type": "crane",
+ "id": "crn-2",
+ "text": "2",
+ "top": 190,
+ "left": 1550,
+ "width": 100,
+ "height": 22
+ },
+ {
+ "type": "crane",
+ "id": "crn-3",
+ "text": "3",
+ "top": 270,
+ "left": 1550,
+ "width": 100,
+ "height": 22
+ },
+ {
+ "type": "crane",
+ "id": "crn-4",
+ "text": "4",
+ "top": 350,
+ "left": 1550,
+ "width": 100,
+ "height": 22
+ },
+ {
+ "type": "track",
+ "id": "lb_track1",
+ "text": "",
+ "top": 117,
+ "left": 140,
+ "width": 1600,
+ "height": 2
+ },
+ {
+ "type": "track",
+ "id": "lb_track2",
+ "text": "",
+ "top": 197,
+ "left": 140,
+ "width": 1600,
+ "height": 2
+ },
+ {
+ "type": "track",
+ "id": "lb_track3",
+ "text": "",
+ "top": 277,
+ "left": 140,
+ "width": 1600,
+ "height": 2
+ },
+ {
+ "type": "track",
+ "id": "lb_track4",
+ "text": "",
+ "top": 357,
+ "left": 140,
+ "width": 1600,
+ "height": 2
+ }
+ ],
+ "areas": [
+ {
+ "type": "Control_floor",
+ "id": "tabControl_floor1",
+ "text": "妤煎眰",
+ "top": 50,
+ "left": 50,
+ "width": 2900,
+ "height": 600,
+ "floors": [
{
- "type": "barcode",
- "id": "barcode-1",
- "text": "",
- "top": 522,
- "left": 1370,
- "width": 80,
- "height": 20
+ "type": "floor",
+ "id": "page_floor1",
+ "text": "1F",
+ "top": 0,
+ "left": 0,
+ "width": 2900,
+ "height": 600,
+ "stns": [
+ { "type": "stn", "id": "site-100", "text": "100", "top": 80, "left": 94, "width": 40, "height": 23 },
+ { "type": "stn", "id": "site-101", "text": "101", "top": 80, "left": 52, "width": 40, "height": 23 },
+ { "type": "stn", "id": "site-102", "text": "102", "top": 80, "left": 10, "width": 40, "height": 23 },
+ { "type": "stn", "id": "site-103", "text": "103", "top": 80, "left": 1742, "width": 40, "height": 23 },
+ { "type": "stn", "id": "site-104", "text": "104", "top": 80, "left": 1784, "width": 40, "height": 23 },
+ { "type": "stn", "id": "site-105", "text": "105", "top": 80, "left": 1826, "width": 40, "height": 23 },
+
+ { "type": "stn", "id": "site-106", "text": "106", "top": 130, "left": 94, "width": 40, "height": 23 },
+ { "type": "stn", "id": "site-107", "text": "107", "top": 130, "left": 52, "width": 40, "height": 23 },
+ { "type": "stn", "id": "site-108", "text": "108", "top": 130, "left": 10, "width": 40, "height": 23 },
+ { "type": "stn", "id": "site-109", "text": "109", "top": 130, "left": 1742, "width": 40, "height": 23 },
+ { "type": "stn", "id": "site-110", "text": "110", "top": 130, "left": 1784, "width": 40, "height": 23 },
+ { "type": "stn", "id": "site-111", "text": "111", "top": 130, "left": 1826, "width": 40, "height": 23 },
+
+ { "type": "stn", "id": "site-112", "text": "112", "top": 160, "left": 94, "width": 40, "height": 23 },
+ { "type": "stn", "id": "site-113", "text": "113", "top": 160, "left": 52, "width": 40, "height": 23 },
+ { "type": "stn", "id": "site-114", "text": "114", "top": 160, "left": 10, "width": 40, "height": 23 },
+ { "type": "stn", "id": "site-115", "text": "115", "top": 160, "left": 1742, "width": 40, "height": 23 },
+ { "type": "stn", "id": "site-116", "text": "116", "top": 160, "left": 1784, "width": 40, "height": 23 },
+ { "type": "stn", "id": "site-117", "text": "117", "top": 160, "left": 1826, "width": 40, "height": 23 },
+
+ { "type": "stn", "id": "site-118", "text": "118", "top": 240, "left": 94, "width": 40, "height": 23 },
+ { "type": "stn", "id": "site-119", "text": "119", "top": 240, "left": 52, "width": 40, "height": 23 },
+ { "type": "stn", "id": "site-120", "text": "120", "top": 240, "left": 10, "width": 40, "height": 23 },
+ { "type": "stn", "id": "site-121", "text": "121", "top": 240, "left": 1742, "width": 40, "height": 23 },
+ { "type": "stn", "id": "site-122", "text": "122", "top": 240, "left": 1784, "width": 40, "height": 23 },
+ { "type": "stn", "id": "site-123", "text": "123", "top": 240, "left": 1826, "width": 40, "height": 23 },
+
+ { "type": "stn", "id": "site-124", "text": "124", "top": 320, "left": 94, "width": 40, "height": 23 },
+ { "type": "stn", "id": "site-125", "text": "125", "top": 320, "left": 52, "width": 40, "height": 23 },
+ { "type": "stn", "id": "site-126", "text": "126", "top": 320, "left": 10, "width": 40, "height": 23 },
+ { "type": "stn", "id": "site-127", "text": "127", "top": 320, "left": 1742, "width": 40, "height": 23 },
+ { "type": "stn", "id": "site-128", "text": "128", "top": 320, "left": 1784, "width": 40, "height": 23 },
+ { "type": "stn", "id": "site-129", "text": "129", "top": 320, "left": 1826, "width": 40, "height": 23 }
+ ],
+ "barcode": []
},
{
- "type": "barcode",
- "id": "barcode-2",
- "text": "",
- "top": 522,
- "left": 285,
- "width": 80,
- "height": 20
+ "type": "floor",
+ "id": "page_floor2",
+ "text": "2F",
+ "top": 0,
+ "left": 0,
+ "width": 2900,
+ "height": 600,
+ "stns": [
+ { "type": "stn", "id": "site-200", "text": "200", "top": 80, "left": 94, "width": 40, "height": 23 },
+ { "type": "stn", "id": "site-201", "text": "201", "top": 80, "left": 52, "width": 40, "height": 23 },
+ { "type": "stn", "id": "site-202", "text": "202", "top": 80, "left": 10, "width": 40, "height": 23 },
+ { "type": "stn", "id": "site-203", "text": "203", "top": 80, "left": 1742, "width": 40, "height": 23 },
+ { "type": "stn", "id": "site-204", "text": "204", "top": 80, "left": 1784, "width": 40, "height": 23 },
+ { "type": "stn", "id": "site-205", "text": "205", "top": 80, "left": 1826, "width": 40, "height": 23 },
+
+ { "type": "stn", "id": "site-206", "text": "206", "top": 130, "left": 94, "width": 40, "height": 23 },
+ { "type": "stn", "id": "site-207", "text": "207", "top": 130, "left": 52, "width": 40, "height": 23 },
+ { "type": "stn", "id": "site-208", "text": "208", "top": 130, "left": 10, "width": 40, "height": 23 },
+ { "type": "stn", "id": "site-209", "text": "209", "top": 130, "left": 1742, "width": 40, "height": 23 },
+ { "type": "stn", "id": "site-210", "text": "210", "top": 130, "left": 1784, "width": 40, "height": 23 },
+ { "type": "stn", "id": "site-211", "text": "211", "top": 130, "left": 1826, "width": 40, "height": 23 },
+
+ { "type": "stn", "id": "site-212", "text": "212", "top": 160, "left": 94, "width": 40, "height": 23 },
+ { "type": "stn", "id": "site-213", "text": "213", "top": 160, "left": 52, "width": 40, "height": 23 },
+ { "type": "stn", "id": "site-214", "text": "214", "top": 160, "left": 10, "width": 40, "height": 23 },
+ { "type": "stn", "id": "site-215", "text": "215", "top": 160, "left": 1742, "width": 40, "height": 23 },
+ { "type": "stn", "id": "site-216", "text": "216", "top": 160, "left": 1784, "width": 40, "height": 23 },
+ { "type": "stn", "id": "site-217", "text": "217", "top": 160, "left": 1826, "width": 40, "height": 23 },
+
+ { "type": "stn", "id": "site-218", "text": "218", "top": 240, "left": 94, "width": 40, "height": 23 },
+ { "type": "stn", "id": "site-219", "text": "219", "top": 240, "left": 52, "width": 40, "height": 23 },
+ { "type": "stn", "id": "site-220", "text": "220", "top": 240, "left": 10, "width": 40, "height": 23 },
+ { "type": "stn", "id": "site-221", "text": "221", "top": 240, "left": 1742, "width": 40, "height": 23 },
+ { "type": "stn", "id": "site-222", "text": "222", "top": 240, "left": 1784, "width": 40, "height": 23 },
+ { "type": "stn", "id": "site-223", "text": "223", "top": 240, "left": 1826, "width": 40, "height": 23 },
+
+ { "type": "stn", "id": "site-224", "text": "224", "top": 320, "left": 94, "width": 40, "height": 23 },
+ { "type": "stn", "id": "site-225", "text": "225", "top": 320, "left": 52, "width": 40, "height": 23 },
+ { "type": "stn", "id": "site-226", "text": "226", "top": 320, "left": 10, "width": 40, "height": 23 },
+ { "type": "stn", "id": "site-227", "text": "227", "top": 320, "left": 1742, "width": 40, "height": 23 },
+ { "type": "stn", "id": "site-228", "text": "228", "top": 320, "left": 1784, "width": 40, "height": 23 },
+ { "type": "stn", "id": "site-229", "text": "229", "top": 320, "left": 1826, "width": 40, "height": 23 }
+ ],
+ "barcode": []
+ },
+ {
+ "type": "floor",
+ "id": "page_floor3",
+ "text": "3F",
+ "top": 0,
+ "left": 0,
+ "width": 2900,
+ "height": 600,
+ "stns": [
+ // { "type": "stn", "id": "site-300", "text": "300", "top": 80, "left": 94, "width": 40, "height": 23 },
+ // { "type": "stn", "id": "site-301", "text": "301", "top": 80, "left": 52, "width": 40, "height": 23 },
+ // { "type": "stn", "id": "site-302", "text": "302", "top": 80, "left": 10, "width": 40, "height": 23 },
+ // { "type": "stn", "id": "site-303", "text": "303", "top": 80, "left": 1742, "width": 40, "height": 23 },
+ // { "type": "stn", "id": "site-304", "text": "304", "top": 80, "left": 1784, "width": 40, "height": 23 },
+ // { "type": "stn", "id": "site-305", "text": "305", "top": 80, "left": 1826, "width": 40, "height": 23 },
+ //
+ // { "type": "stn", "id": "site-306", "text": "306", "top": 130, "left": 94, "width": 40, "height": 23 },
+ // { "type": "stn", "id": "site-307", "text": "307", "top": 130, "left": 52, "width": 40, "height": 23 },
+ // { "type": "stn", "id": "site-308", "text": "308", "top": 130, "left": 10, "width": 40, "height": 23 },
+ // { "type": "stn", "id": "site-309", "text": "309", "top": 130, "left": 1742, "width": 40, "height": 23 },
+ // { "type": "stn", "id": "site-310", "text": "310", "top": 130, "left": 1784, "width": 40, "height": 23 },
+ // { "type": "stn", "id": "site-311", "text": "311", "top": 130, "left": 1826, "width": 40, "height": 23 },
+ //
+ // { "type": "stn", "id": "site-312", "text": "312", "top": 160, "left": 94, "width": 40, "height": 23 },
+ // { "type": "stn", "id": "site-313", "text": "313", "top": 160, "left": 52, "width": 40, "height": 23 },
+ // { "type": "stn", "id": "site-314", "text": "314", "top": 160, "left": 10, "width": 40, "height": 23 },
+ // { "type": "stn", "id": "site-315", "text": "315", "top": 160, "left": 1742, "width": 40, "height": 23 },
+ // { "type": "stn", "id": "site-316", "text": "316", "top": 160, "left": 1784, "width": 40, "height": 23 },
+ // { "type": "stn", "id": "site-317", "text": "317", "top": 160, "left": 1826, "width": 40, "height": 23 },
+ //
+ // { "type": "stn", "id": "site-318", "text": "318", "top": 240, "left": 94, "width": 40, "height": 23 },
+ // { "type": "stn", "id": "site-319", "text": "319", "top": 240, "left": 52, "width": 40, "height": 23 },
+ // { "type": "stn", "id": "site-320", "text": "320", "top": 240, "left": 10, "width": 40, "height": 23 },
+ // { "type": "stn", "id": "site-321", "text": "321", "top": 240, "left": 1742, "width": 40, "height": 23 },
+ // { "type": "stn", "id": "site-322", "text": "322", "top": 240, "left": 1784, "width": 40, "height": 23 },
+ // { "type": "stn", "id": "site-323", "text": "323", "top": 240, "left": 1826, "width": 40, "height": 23 },
+ //
+ // { "type": "stn", "id": "site-324", "text": "324", "top": 320, "left": 94, "width": 40, "height": 23 },
+ // { "type": "stn", "id": "site-325", "text": "325", "top": 320, "left": 52, "width": 40, "height": 23 },
+ // { "type": "stn", "id": "site-326", "text": "326", "top": 320, "left": 10, "width": 40, "height": 23 },
+ // { "type": "stn", "id": "site-327", "text": "327", "top": 320, "left": 1742, "width": 40, "height": 23 },
+ // { "type": "stn", "id": "site-328", "text": "328", "top": 320, "left": 1784, "width": 40, "height": 23 },
+ // { "type": "stn", "id": "site-329", "text": "329", "top": 320, "left": 1826, "width": 40, "height": 23 }
+ ],
+ "barcode": []
+ },
+ {
+ "type": "floor",
+ "id": "page_floor4",
+ "text": "4F",
+ "top": 0,
+ "left": 0,
+ "width": 2900,
+ "height": 600,
+ "stns": [
+ { "type": "stn", "id": "site-400", "text": "400", "top": 80, "left": 94, "width": 40, "height": 23 },
+ { "type": "stn", "id": "site-401", "text": "401", "top": 80, "left": 52, "width": 40, "height": 23 },
+ { "type": "stn", "id": "site-402", "text": "402", "top": 80, "left": 10, "width": 40, "height": 23 },
+ { "type": "stn", "id": "site-403", "text": "403", "top": 80, "left": 1742, "width": 40, "height": 23 },
+ { "type": "stn", "id": "site-404", "text": "404", "top": 80, "left": 1784, "width": 40, "height": 23 },
+ { "type": "stn", "id": "site-405", "text": "405", "top": 80, "left": 1826, "width": 40, "height": 23 },
+
+ { "type": "stn", "id": "site-406", "text": "406", "top": 130, "left": 94, "width": 40, "height": 23 },
+ { "type": "stn", "id": "site-407", "text": "407", "top": 130, "left": 52, "width": 40, "height": 23 },
+ { "type": "stn", "id": "site-408", "text": "408", "top": 130, "left": 10, "width": 40, "height": 23 },
+ { "type": "stn", "id": "site-409", "text": "409", "top": 130, "left": 1742, "width": 40, "height": 23 },
+ { "type": "stn", "id": "site-410", "text": "410", "top": 130, "left": 1784, "width": 40, "height": 23 },
+ { "type": "stn", "id": "site-411", "text": "411", "top": 130, "left": 1826, "width": 40, "height": 23 },
+
+ { "type": "stn", "id": "site-412", "text": "412", "top": 160, "left": 94, "width": 40, "height": 23 },
+ { "type": "stn", "id": "site-413", "text": "413", "top": 160, "left": 52, "width": 40, "height": 23 },
+ { "type": "stn", "id": "site-414", "text": "414", "top": 160, "left": 10, "width": 40, "height": 23 },
+ { "type": "stn", "id": "site-415", "text": "415", "top": 160, "left": 1742, "width": 40, "height": 23 },
+ { "type": "stn", "id": "site-416", "text": "416", "top": 160, "left": 1784, "width": 40, "height": 23 },
+ { "type": "stn", "id": "site-417", "text": "417", "top": 160, "left": 1826, "width": 40, "height": 23 },
+
+ { "type": "stn", "id": "site-418", "text": "418", "top": 240, "left": 94, "width": 40, "height": 23 },
+ { "type": "stn", "id": "site-419", "text": "419", "top": 240, "left": 52, "width": 40, "height": 23 },
+ { "type": "stn", "id": "site-420", "text": "420", "top": 240, "left": 10, "width": 40, "height": 23 },
+ { "type": "stn", "id": "site-421", "text": "421", "top": 240, "left": 1742, "width": 40, "height": 23 },
+ { "type": "stn", "id": "site-422", "text": "422", "top": 240, "left": 1784, "width": 40, "height": 23 },
+ { "type": "stn", "id": "site-423", "text": "423", "top": 240, "left": 1826, "width": 40, "height": 23 },
+
+ { "type": "stn", "id": "site-424", "text": "424", "top": 320, "left": 94, "width": 40, "height": 23 },
+ { "type": "stn", "id": "site-425", "text": "425", "top": 320, "left": 52, "width": 40, "height": 23 },
+ { "type": "stn", "id": "site-426", "text": "426", "top": 320, "left": 10, "width": 40, "height": 23 },
+ { "type": "stn", "id": "site-427", "text": "427", "top": 320, "left": 1742, "width": 40, "height": 23 },
+ { "type": "stn", "id": "site-428", "text": "428", "top": 320, "left": 1784, "width": 40, "height": 23 },
+ { "type": "stn", "id": "site-429", "text": "429", "top": 320, "left": 1826, "width": 40, "height": 23 }
+ ],
+ "barcode": []
}
]
- }]
- }]
-}
\ No newline at end of file
+ }
+ ]
+}
diff --git a/src/main/webapp/views/console.html b/src/main/webapp/views/console.html
index 8a48028..4358a9f 100644
--- a/src/main/webapp/views/console.html
+++ b/src/main/webapp/views/console.html
@@ -14,318 +14,318 @@
</head>
<body>
- <div id="main">
- <div class="head">
- <div class="head-left">
- <h1>鑷姩浠撳簱WCS鐩戞帶鍥�</h1>
- <h6>AUTOMATIC WAREHOUSE WCS MONITORING DIAGRAM</h6>
- </div>
- <div class="head-right">
- <img src="../static/images/zy-logo.png" alt="涓壃" height="44" width="80">
- </div>
+<div id="main">
+ <div class="head">
+ <div class="head-left">
+ <h1>鑷姩浠撳簱WCS鐩戞帶鍥�</h1>
+ <h6>AUTOMATIC WAREHOUSE WCS MONITORING DIAGRAM</h6>
</div>
- <!-- 璐ф灦 + 鍫嗗灈鏈� + 鍏ュ簱绔欑偣 -->
- <div class="main-part">
+ <div class="head-right">
+ <!-- <img src="../static/images/zy-logo.png" alt="寰愬伐姹変簯" height="44" width="80">-->
+ </div>
+ </div>
+ <!-- 璐ф灦 + 鍫嗗灈鏈� + 鍏ュ簱绔欑偣 -->
+ <div class="main-part">
+ </div>
+ <div id="body">
+ <!-- 鎬诲紑鍏� -->
+ <div class="system-state">
+ <div class="body-head">鎬诲紑鍏�</div>
+ <div class="switch">
+ <div id="system-icon" class="system-icon-open" onclick="systemSwitch()"></div>
+ <div class="switch_r">
+ <p>绯荤粺鐘舵��</p>
+ <p id="system-run-desc">绯荤粺杩愯涓�</p>
+ </div>
+ </div>
</div>
- <div id="body">
- <!-- 鎬诲紑鍏� -->
- <div class="system-state">
- <div class="body-head">鎬诲紑鍏�</div>
- <div class="switch">
- <div id="system-icon" class="system-icon-open" onclick="systemSwitch()"></div>
- <div class="switch_r">
- <p>绯荤粺鐘舵��</p>
- <p id="system-run-desc">绯荤粺杩愯涓�</p>
- </div>
+ <!-- 鍫嗗灈鏈虹姸鎬� -->
+ <div class="machine-status">
+ <div class="body-head">鍫嗗灈鏈虹姸鎬�</div>
+ <div class="state">
+ <span>鍫嗗灈鏈� 1</span>
+ <span class="state-ss machine-put-flag ">鍏ュ簱</span>
+ </div>
+ <div class="state">
+ <span>鍫嗗灈鏈� 2</span>
+ <span class="state-ss machine-auto-flag ">鑷姩</span>
+
+ </div>
+ <div class="button"><span>鎵�鏈夌姸鎬�</span></div>
+ <div class="button item-group">
+ <span class="machine-put-flag">鍏ュ簱</span>
+ <span class="machine-take-flag">鍑哄簱</span>
+ <span class="machine-stock-move-flag">搴撳埌搴�</span>
+ <span class="machine-site-move-flag">绔欏埌绔�</span>
+ <span class="machine-p-move-flag">PToP</span>
+ <span class="machine-error-flag">寮傚父</span>
+ <span class="machine-auto-flag">鑷姩</span>
+ <span class="machine-unauto-flag">闈炶嚜鍔�/鎵嬪姩</span>
+ </div>
+ </div>
+ <div class="line-status">
+ <div class="body-head">杈撻�佺嚎鐘舵��</div>
+ <div class="state states">
+ <span>杩愯緭绾挎�绘暟</span>
+ <span id="line-total" class="line-ss"></span>
+ </div>
+ <div class="button"><span>鎵�鏈夌姸鎬�</span></div>
+ <div class="button item-group">
+ <span class="site-auto-run-id">鑷姩+鏈夌墿+ID</span>
+ <span class="site-auto-run">鑷姩+鏈夌墿</span>
+ <span class="site-auto-id">鑷姩+ID</span>
+ <span class="site-auto">鑷姩</span>
+ <span class="site-unauto">闈炶嚜鍔�/鎵嬪姩</span>
+ </div>
+ </div>
+ <div class="bar-code">
+ <div class="body-head" id="code">鏉＄爜鎵弿鍣�</div>
+ <div class="tablebox">
+ <div class="table-head">
+ <li><span>鏉＄爜鍚嶇О</span><span class="right">鎵爜鏃堕棿</span></li>
+ </div>
+ <div id="barcode1" class="table-body">
+
+ </div>
+ </div>
+ <div class="tablebox">
+ <div class="table-head">
+ <li><span>鏉＄爜鍚嶇О</span><span class="right">鎵爜鏃堕棿</span></li>
+ </div>
+ <div id="barcode2" class="table-body">
+
+ </div>
+ </div>
+ <div class="tablebox">
+ <div class="table-head">
+ <li><span>鏉＄爜鍚嶇О</span><span class="right">鎵爜鏃堕棿</span></li>
+ </div>
+ <div id="barcode3" class="table-body">
+
+ </div>
+ </div>
+ </div>
+ </div>
+ <!-- 鍫嗗灈鏈哄脊绐� -->
+ <div id="crnWindow" style="display: none;" class="animate__animated animate__fadeIn">
+ <div id="crnWindow-head">
+ <div class='detailed'></div>
+ <button></button>
+ </div>
+ <form>
+ <!-- 鍫嗗灈鏈哄彿 -->
+ <div class="form-item">
+ <div class="form-item-label" style>
+ <span>鍫嗗灈鏈哄彿锛�</span>
+ </div>
+ <div class="form-item-input">
+ <input type="text" name="crnNo" value="">
+ </div>
+ </div>
+ <!-- 宸ヤ綔鍙� -->
+ <div class="form-item">
+ <div class="form-item-label">
+ <span>宸ヤ綔鍙凤細</span>
+ </div>
+ <div class="form-item-input">
+ <input type="text" name="workNo" value="">
+ </div>
+ </div>
+ <!-- 绔欐簮 -->
+ <div class="form-item">
+ <div class="form-item-label">
+ <span>绔欐簮锛�</span>
+ </div>
+ <div class="form-item-input">
+ <input type="text" name="sourceStaNo" value="">
+ </div>
+ </div>
+ <!-- 鐩爣绔� -->
+ <div class="form-item">
+ <div class="form-item-label">
+ <span>鐩爣绔欙細</span>
+ </div>
+ <div class="form-item-input">
+ <input type="text" name="staNo" value="">
+ </div>
+ </div>
+ <!-- 宸ヤ綔鐘舵�� -->
+ <div class="form-item">
+ <div class="form-item-label">
+ <span>宸ヤ綔鐘舵�侊細</span>
+ </div>
+ <div class="form-item-input">
+ <input type="text" name="wrkSts" value="">
+ </div>
+ </div>
+ <!-- 鍑哄叆绫诲瀷 -->
+ <div class="form-item">
+ <div class="form-item-label">
+ <span>鍑哄叆绫诲瀷锛�</span>
+ </div>
+ <div class="form-item-input">
+ <input type="text" name="ioType" value="">
+ </div>
+ </div>
+ <!-- 婧愬簱浣� -->
+ <div class="form-item">
+ <div class="form-item-label">
+ <span>婧愬簱浣嶏細</span>
+ </div>
+ <div class="form-item-input">
+ <input type="text" name="sourceLocNo" value="">
+ </div>
+ </div>
+ <!-- 鐩爣搴撲綅 -->
+ <div class="form-item">
+ <div class="form-item-label">
+ <span>鐩爣搴撲綅锛�</span>
+ </div>
+ <div class="form-item-input">
+ <input type="text" name="locNo" value="">
</div>
</div>
<!-- 鍫嗗灈鏈虹姸鎬� -->
- <div class="machine-status">
- <div class="body-head">鍫嗗灈鏈虹姸鎬�</div>
- <div class="state">
- <span>鍫嗗灈鏈� 1</span>
- <span class="state-ss machine-put-flag ">鍏ュ簱</span>
+ <div class="form-item">
+ <div class="form-item-label">
+ <span>鍫嗗灈鏈虹姸鎬侊細</span>
</div>
- <div class="state">
- <span>鍫嗗灈鏈� 2</span>
- <span class="state-ss machine-auto-flag ">鑷姩</span>
-
- </div>
- <div class="button"><span>鎵�鏈夌姸鎬�</span></div>
- <div class="button item-group">
- <span class="machine-put-flag">鍏ュ簱</span>
- <span class="machine-take-flag">鍑哄簱</span>
- <span class="machine-stock-move-flag">搴撳埌搴�</span>
- <span class="machine-site-move-flag">绔欏埌绔�</span>
- <span class="machine-p-move-flag">PToP</span>
- <span class="machine-error-flag">寮傚父</span>
- <span class="machine-auto-flag">鑷姩</span>
- <span class="machine-unauto-flag">闈炶嚜鍔�/鎵嬪姩</span>
+ <div class="form-item-input">
+ <input type="text" name="crnStatus" value="">
</div>
</div>
- <div class="line-status">
- <div class="body-head">杈撻�佺嚎鐘舵��</div>
- <div class="state states">
- <span>杩愯緭绾挎�绘暟</span>
- <span id="line-total" class="line-ss"></span>
+ <!-- 寮傚父 -->
+ <div class="form-item">
+ <div class="form-item-label">
+ <span>寮傚父锛�</span>
</div>
- <div class="button"><span>鎵�鏈夌姸鎬�</span></div>
- <div class="button item-group">
- <span class="site-auto-run-id">鑷姩+鏈夌墿+ID</span>
- <span class="site-auto-run">鑷姩+鏈夌墿</span>
- <span class="site-auto-id">鑷姩+ID</span>
- <span class="site-auto">鑷姩</span>
- <span class="site-unauto">闈炶嚜鍔�/鎵嬪姩</span>
+ <div class="form-item-input">
+ <input type="text" name="error" value="">
</div>
</div>
- <div class="bar-code">
- <div class="body-head" id="code">鏉＄爜鎵弿鍣�</div>
- <div class="tablebox">
- <div class="table-head">
- <li><span>鏉＄爜鍚嶇О</span><span class="right">鎵爜鏃堕棿</span></li>
- </div>
- <div id="barcode1" class="table-body">
-
- </div>
- </div>
- <div class="tablebox">
- <div class="table-head">
- <li><span>鏉＄爜鍚嶇О</span><span class="right">鎵爜鏃堕棿</span></li>
- </div>
- <div id="barcode2" class="table-body">
-
- </div>
- </div>
- <div class="tablebox">
- <div class="table-head">
- <li><span>鏉＄爜鍚嶇О</span><span class="right">鎵爜鏃堕棿</span></li>
- </div>
- <div id="barcode3" class="table-body">
-
- </div>
- </div>
- </div>
- </div>
- <!-- 鍫嗗灈鏈哄脊绐� -->
- <div id="crnWindow" style="display: none;" class="animate__animated animate__fadeIn">
- <div id="crnWindow-head">
- <div class='detailed'></div>
- <button></button>
- </div>
- <form>
- <!-- 鍫嗗灈鏈哄彿 -->
- <div class="form-item">
- <div class="form-item-label" style>
- <span>鍫嗗灈鏈哄彿锛�</span>
- </div>
- <div class="form-item-input">
- <input type="text" name="crnNo" value="">
- </div>
- </div>
- <!-- 宸ヤ綔鍙� -->
- <div class="form-item">
- <div class="form-item-label">
- <span>宸ヤ綔鍙凤細</span>
- </div>
- <div class="form-item-input">
- <input type="text" name="workNo" value="">
- </div>
- </div>
- <!-- 绔欐簮 -->
- <div class="form-item">
- <div class="form-item-label">
- <span>绔欐簮锛�</span>
- </div>
- <div class="form-item-input">
- <input type="text" name="sourceStaNo" value="">
- </div>
- </div>
- <!-- 鐩爣绔� -->
- <div class="form-item">
- <div class="form-item-label">
- <span>鐩爣绔欙細</span>
- </div>
- <div class="form-item-input">
- <input type="text" name="staNo" value="">
- </div>
- </div>
- <!-- 宸ヤ綔鐘舵�� -->
- <div class="form-item">
- <div class="form-item-label">
- <span>宸ヤ綔鐘舵�侊細</span>
- </div>
- <div class="form-item-input">
- <input type="text" name="wrkSts" value="">
- </div>
- </div>
- <!-- 鍑哄叆绫诲瀷 -->
- <div class="form-item">
- <div class="form-item-label">
- <span>鍑哄叆绫诲瀷锛�</span>
- </div>
- <div class="form-item-input">
- <input type="text" name="ioType" value="">
- </div>
- </div>
- <!-- 婧愬簱浣� -->
- <div class="form-item">
- <div class="form-item-label">
- <span>婧愬簱浣嶏細</span>
- </div>
- <div class="form-item-input">
- <input type="text" name="sourceLocNo" value="">
- </div>
- </div>
- <!-- 鐩爣搴撲綅 -->
- <div class="form-item">
- <div class="form-item-label">
- <span>鐩爣搴撲綅锛�</span>
- </div>
- <div class="form-item-input">
- <input type="text" name="locNo" value="">
- </div>
- </div>
- <!-- 鍫嗗灈鏈虹姸鎬� -->
- <div class="form-item">
- <div class="form-item-label">
- <span>鍫嗗灈鏈虹姸鎬侊細</span>
- </div>
- <div class="form-item-input">
- <input type="text" name="crnStatus" value="">
- </div>
- </div>
- <!-- 寮傚父 -->
- <div class="form-item">
- <div class="form-item-label">
- <span>寮傚父锛�</span>
- </div>
- <div class="form-item-input">
- <input type="text" name="error" value="">
- </div>
- </div>
- </form>
- </div>
- <!-- 杈撻�佽澶囧脊绐� -->
- <div id="siteWindow" style="display: none;" class="animate__animated animate__fadeIn">
- <!-- 琛ㄥご -->
- <div id="siteWindow-head">
- <div class='detailed'></div>
- <button></button>
- </div>
- <form>
- <!-- 璁惧鍙� -->
- <div class="form-item">
- <div class="form-item-label">
- <span>璁惧鍙凤細</span>
- </div>
- <div class="form-item-input">
- <input type="text" name="siteId" value="">
- </div>
- </div>
- <!-- 宸ヤ綔鍙� -->
- <div class="form-item">
- <div class="form-item-label">
- <span>宸ヤ綔鍙凤細</span>
- </div>
- <div class="form-item-input">
- <input type="text" name="workNo" value="">
- </div>
- </div>
- <!-- 宸ヤ綔鐘舵�� -->
- <div class="form-item">
- <div class="form-item-label">
- <span>宸ヤ綔鐘舵�侊細</span>
- </div>
- <div class="form-item-input">
- <input type="text" name="wrkSts" value="">
- </div>
- </div>
- <!-- 鑷姩 -->
- <div class="form-item-checkbox">
- <div class="form-item-label-checkbox">
- <span>鑷姩</span>
- </div>
- <div class="form-item-input-checkbox">
- <input type="checkbox" name="autoing">
- </div>
- </div>
- <!-- 鏈夌墿 -->
- <div class="form-item-checkbox">
- <div class="form-item-label-checkbox">
- <span>鏈夌墿</span>
- </div>
- <div class="form-item-input-checkbox">
- <input type="checkbox" name="loading">
- </div>
- </div>
- <!-- 鑳藉叆 -->
- <div class="form-item-checkbox">
- <div class="form-item-label-checkbox">
- <span>鑳藉叆</span>
- </div>
- <div class="form-item-input-checkbox">
- <input type="checkbox" name="canining">
- </div>
- </div>
- <!-- 鑳藉嚭 -->
- <div class="form-item-checkbox">
- <div class="form-item-label-checkbox">
- <span>鑳藉嚭</span>
- </div>
- <div class="form-item-input-checkbox">
- <input type="checkbox" name="canouting">
- </div>
- </div>
- <!-- 鍑哄叆绫诲瀷 -->
- <div class="form-item">
- <div class="form-item-label">
- <span>鍑哄叆绫诲瀷锛�</span>
- </div>
- <div class="form-item-input">
- <input type="text" name="ioType" value="">
- </div>
- </div>
- <!-- 婧愮珯 -->
- <div class="form-item">
- <div class="form-item-label">
- <span>婧愮珯锛�</span>
- </div>
- <div class="form-item-input">
- <input type="text" name="sourceStaNo" value="">
- </div>
- </div>
- <!-- 鐩爣绔� -->
- <div class="form-item">
- <div class="form-item-label">
- <span>鐩爣绔欙細</span>
- </div>
- <div class="form-item-input">
- <input type="text" name="staNo" value="">
- </div>
- </div>
- <!-- 婧愬簱浣� -->
- <div class="form-item">
- <div class="form-item-label">
- <span>婧愬簱浣嶏細</span>
- </div>
- <div class="form-item-input">
- <input type="text" name="sourceLocNo" value="">
- </div>
- </div>
- <!-- 鐩爣搴撲綅 -->
- <div class="form-item">
- <div class="form-item-label">
- <span>鐩爣搴撲綅锛�</span>
- </div>
- <div class="form-item-input">
- <input type="text" name="locNo" value="">
- </div>
- </div>
-
- </form>
- </div>
+ </form>
</div>
+ <!-- 杈撻�佽澶囧脊绐� -->
+ <div id="siteWindow" style="display: none;" class="animate__animated animate__fadeIn">
+ <!-- 琛ㄥご -->
+ <div id="siteWindow-head">
+ <div class='detailed'></div>
+ <button></button>
+ </div>
+ <form>
+ <!-- 璁惧鍙� -->
+ <div class="form-item">
+ <div class="form-item-label">
+ <span>璁惧鍙凤細</span>
+ </div>
+ <div class="form-item-input">
+ <input type="text" name="siteId" value="">
+ </div>
+ </div>
+ <!-- 宸ヤ綔鍙� -->
+ <div class="form-item">
+ <div class="form-item-label">
+ <span>宸ヤ綔鍙凤細</span>
+ </div>
+ <div class="form-item-input">
+ <input type="text" name="workNo" value="">
+ </div>
+ </div>
+ <!-- 宸ヤ綔鐘舵�� -->
+ <div class="form-item">
+ <div class="form-item-label">
+ <span>宸ヤ綔鐘舵�侊細</span>
+ </div>
+ <div class="form-item-input">
+ <input type="text" name="wrkSts" value="">
+ </div>
+ </div>
+ <!-- 鑷姩 -->
+ <div class="form-item-checkbox">
+ <div class="form-item-label-checkbox">
+ <span>鑷姩</span>
+ </div>
+ <div class="form-item-input-checkbox">
+ <input type="checkbox" name="autoing">
+ </div>
+ </div>
+ <!-- 鏈夌墿 -->
+ <div class="form-item-checkbox">
+ <div class="form-item-label-checkbox">
+ <span>鏈夌墿</span>
+ </div>
+ <div class="form-item-input-checkbox">
+ <input type="checkbox" name="loading">
+ </div>
+ </div>
+ <!-- 鑳藉叆 -->
+ <div class="form-item-checkbox">
+ <div class="form-item-label-checkbox">
+ <span>鑳藉叆</span>
+ </div>
+ <div class="form-item-input-checkbox">
+ <input type="checkbox" name="canining">
+ </div>
+ </div>
+ <!-- 鑳藉嚭 -->
+ <div class="form-item-checkbox">
+ <div class="form-item-label-checkbox">
+ <span>鑳藉嚭</span>
+ </div>
+ <div class="form-item-input-checkbox">
+ <input type="checkbox" name="canouting">
+ </div>
+ </div>
+ <!-- 鍑哄叆绫诲瀷 -->
+ <div class="form-item">
+ <div class="form-item-label">
+ <span>鍑哄叆绫诲瀷锛�</span>
+ </div>
+ <div class="form-item-input">
+ <input type="text" name="ioType" value="">
+ </div>
+ </div>
+ <!-- 婧愮珯 -->
+ <div class="form-item">
+ <div class="form-item-label">
+ <span>婧愮珯锛�</span>
+ </div>
+ <div class="form-item-input">
+ <input type="text" name="sourceStaNo" value="">
+ </div>
+ </div>
+ <!-- 鐩爣绔� -->
+ <div class="form-item">
+ <div class="form-item-label">
+ <span>鐩爣绔欙細</span>
+ </div>
+ <div class="form-item-input">
+ <input type="text" name="staNo" value="">
+ </div>
+ </div>
+ <!-- 婧愬簱浣� -->
+ <div class="form-item">
+ <div class="form-item-label">
+ <span>婧愬簱浣嶏細</span>
+ </div>
+ <div class="form-item-input">
+ <input type="text" name="sourceLocNo" value="">
+ </div>
+ </div>
+ <!-- 鐩爣搴撲綅 -->
+ <div class="form-item">
+ <div class="form-item-label">
+ <span>鐩爣搴撲綅锛�</span>
+ </div>
+ <div class="form-item-input">
+ <input type="text" name="locNo" value="">
+ </div>
+ </div>
+
+ </form>
+ </div>
+</div>
</body>
@@ -344,7 +344,6 @@
url: baseUrl + '/console/barcode/output/site',
method: 'GET',
success: function (res) {
- console.log(res)
if (res.code === 200) {
tData = eval(res.data);
if (tData.length <= 5) {
@@ -384,21 +383,16 @@
}
</script>
<script type="text/javascript">
- // 寮圭獥绔欑偣淇℃伅
- $('.site').on('click', function () {
+ // 寮圭獥绔欑偣淇℃伅 鈥斺�� 浣跨敤浜嬩欢濮旀墭
+ $(document).on('click', '.site', function () {
var id = this.id.split("-")[1];
- $("#siteWindow").attr("style", "display:block;");//鏄剧ずdiv
- $("#crnWindow").attr("style", "display:none;");
- $(".detailed").empty();
- $('.detailed').append(id + '绔欑偣璇︾粏淇℃伅');
+ $("#siteWindow").css("display", "block"); // 鏄剧ず绔欑偣淇℃伅绐楀彛
+ $("#crnWindow").css("display", "none");
+ $(".detailed").empty().append(id + '绔欑偣璇︾粏淇℃伅');
$.ajax({
url: baseUrl + "/console/site/detail",
- headers: {
- 'token': localStorage.getItem('token')
- },
- data: {
- siteId: id
- },
+ headers: { 'token': localStorage.getItem('token') },
+ data: { siteId: id },
method: 'post',
success: function (res) {
for (var val in res.data) {
@@ -406,29 +400,23 @@
if (find[0].type === 'text') {
find.val(res.data[val]);
} else if (find[0].type === 'checkbox') {
- find.attr("checked", res.data[val] === 'Y');
+ find.prop("checked", res.data[val] === 'Y');
}
}
}
-
- })
-
+ });
});
- // 鍫嗗灈鏈轰俊鎭�
- $('.machine').on('click', function () {
+
+ // 鍫嗗灈鏈轰俊鎭� 鈥斺�� 浣跨敤浜嬩欢濮旀墭
+ $(document).on('click', '.machine', function () {
var id = this.id.split("-")[1];
- $("#crnWindow").attr('style', 'display:block;');
- $("#siteWindow").attr("style", "display:none;");
- $('.detailed').empty();
- $('.detailed').append(id + '鍙峰爢鍨涙満');
+ $("#crnWindow").css("display", "block");
+ $("#siteWindow").css("display", "none");
+ $(".detailed").empty().append(id + '鍙峰爢鍨涙満');
$.ajax({
url: baseUrl + "/console/crn/detail",
- headers: {
- 'token': localStorage.getItem('token')
- },
- data: {
- crnNo: id
- },
+ headers: { 'token': localStorage.getItem('token') },
+ data: { crnNo: id },
method: 'post',
success: function (res) {
for (var val in res.data) {
@@ -436,14 +424,13 @@
if (find[0].type === 'text') {
find.val(res.data[val]);
} else if (find[0].type === 'checkbox') {
- find.attr("checked", res.data[val] === 'Y');
+ find.prop("checked", res.data[val] === 'Y');
}
}
}
+ });
+ });
- })
-
- })
// 寮圭獥鍏抽棴
$('button').on('click', function () {
$('#siteWindow').attr('style', 'display:none')
@@ -463,6 +450,8 @@
getSystemRunningStatus();
getBarcodeInfo();
getScaleInfo();
+ // carAnimate();
+ carAnimate2();
// 瀹炴椂璁块棶
setInterval(function () {
getCrnInfo();
@@ -516,8 +505,8 @@
} else if (res.code === 403) {
parent.location.href = baseUrl + "/login";
} else {
+ alert(res.msg);
console.log(res.msg);
-
}
}
});
@@ -561,14 +550,16 @@
var sites = res.data;
for (var i = 0; i < sites.length; i++) {
var siteEl = $("#site-" + sites[i].siteId);
+ console.log(sites[i].siteId)
siteEl.attr("class", "site " + sites[i].siteStatus);
+ // siteEl.attr("class", "site site-auto-run-id");
if (sites[i].workNo != null && sites[i].workNo > 0) {
siteEl.html(sites[i].siteId + "[" + sites[i].workNo + "]");
} else {
siteEl.html(sites[i].siteId);
}
- if (sites[i].siteId === '1' || sites[i].siteId === '2' || sites[i].siteId === '3') {
+ if (sites[i].siteId === '16' || sites[i].siteId === '016') {
carAnimate(Number(sites[i].siteId), Number(sites[i].nearbySta));
}
@@ -602,25 +593,11 @@
}
// crnEl.animate({left: (crns[i].bay * unit) + 'px'}, 1000);
// crns[i].bay = 15;
+
var offSet = 0;
- switch (i) {
- case 0:
- case 1:
- case 2:
- case 3:
- unit = 18;
- offSet = 500;
- break;
- case 5:
- unit = 124;
- offSet = 550;
- break;
- case 4:
- case 6:
- unit = 62;
- offSet = 550;
- break;
- }
+ unit = 15;
+ offSet = 140;
+
if(crns[i].bay === 1){
crnEl.animate({left: offSet + 'px'}, 1000);
@@ -648,7 +625,7 @@
if (res.code === 200) {
var barcodes = res.data;
for (var i = 0; i < barcodes.length; i++) {
- $("#barcode-"+barcodes[i].barcodeId).html(barcodes[i].codeValue ? barcodes[i].codeValue : "--");
+ $("#code-decoder-data-" + barcodes[i].barcodeId).html(barcodes[i].codeValue);
}
} else if (res.code === 403) {
parent.location.href = baseUrl + "/login";
@@ -698,14 +675,14 @@
$("#crn-3").animate({left: leftVal + 'px'}, 1000);
crn3Position = leftVal;
break;
- // case 4:
- // $("#crn-4").animate({left: leftVal + 'px'}, 1000);
- // crn4Position = leftVal;
- // break;
- // case 5:
- // $("#crn-5").animate({left: leftVal + 'px'}, 1000);
- // crn5Position = leftVal;
- // break;
+ case 4:
+ $("#crn-4").animate({left: leftVal + 'px'}, 1000);
+ crn4Position = leftVal;
+ break;
+ case 5:
+ $("#crn-5").animate({left: leftVal + 'px'}, 1000);
+ crn5Position = leftVal;
+ break;
default:
break
}
@@ -715,43 +692,37 @@
function carAnimate(id, target) {
// debugger
var targetTop = 0;
- if (id === 1 || id === '1' || id === '2' || id === 2 || id === '3' || id === 3) {
+ if (id === 16 || id === '16' || id === '016') {
switch (target) {
case 1:
- targetTop += 792;
+ targetTop += 827;
break;
case 2:
- targetTop += 771;
+ targetTop += 765;
break;
case 3:
- targetTop += 727;
+ targetTop += 651;
break;
case 4:
- targetTop += 706;
+ targetTop += 589;
break;
case 5:
- targetTop += 662;
+ targetTop += 505;
break;
case 6:
- targetTop += 620;
+ targetTop += 443;
break;
case 7:
- targetTop += 578;
+ targetTop += 362;
break;
case 8:
- targetTop += 530;
+ targetTop += 297;
break;
case 9:
- targetTop += 190;
+ targetTop += 243;
break;
case 10:
- targetTop += 147;
- break;
- case 11:
- targetTop += 107;
- break;
- case 12:
- targetTop += 63;
+ targetTop += 129;
break;
default:
return;
@@ -760,8 +731,57 @@
return;
}
- $("#site-" + id).animate({top: targetTop + 'px'}, 1000);
+ $("#site-0" + id).animate({top: targetTop + 'px'}, 1000);
}
+ //RGV杞﹁締鍚勭珯鐐硅窛绂绘暟鎹�
+ let sitePosition = {
+ 101: '68px',
+ 102: '117px',
+ 122: '183px',
+ 104: '183px',
+ 105: '232px',
+ 118: '297px',
+ 107: '297px',
+ 108: '345px',
+ 119: '355px',
+ 110: '410px',
+ 120: '421px',
+ 111: '459px',
+ 121: '479px',
+ 113: '524px',
+ 123: '556px',
+ 114: '572px',
+ 1142: '600px',
+ 116: '639px',
+ 117: '687px',
+ }
+
+ //RGV杞︾Щ鍔ㄥ姩鐢�
+ function moveSite(siteId, staNo) {
+ $(siteId).animate({top: sitePosition[staNo]}, 1000);
+ }
+
+ // moveSite("#site-1", 117);//娴嬭瘯绉诲姩鏂规硶,鍙垹闄�
+
+ // Rgv瀹炴椂鏁版嵁鑾峰彇
+ function carAnimate2() {
+ // console.log("1=============1")
+ $.ajax({
+ url: baseUrl + "/rgv/console/rgv/site/data",
+ headers: {'token': localStorage.getItem('token')},
+ method: 'POST',
+ success: function (res) {
+ if (res.code === 200) {
+ var rgvMap = res.data;
+ for (var i = 0; i < rgvMap.length; i++) {
+ moveSite("#site-"+rgvMap[i].id, rgvMap[i].title);
+ }
+ } else {
+ console.log(res.msg);
+ }
+ }
+ });
+ }
</script>
\ No newline at end of file
diff --git a/src/main/webapp/views/crn.html b/src/main/webapp/views/crn.html
index 8c87a2e..ddf184a 100644
--- a/src/main/webapp/views/crn.html
+++ b/src/main/webapp/views/crn.html
@@ -71,12 +71,24 @@
<!-- <span> </span>-->
<input id="crn3" disabled="disabled">
</div>
-<!-- <div class="crn-command-item">-->
-<!-- <label>4#</label>-->
-<!-- <button id="demoBtn-4" class="demoBtn" onclick="demoSwitch(this.id)"> - </button>-->
-<!-- <!– <span> </span>–>-->
-<!-- <input id="crn4" disabled="disabled">-->
-<!-- </div>-->
+ <div class="crn-command-item">
+ <label>4#</label>
+ <button id="demoBtn-4" class="demoBtn" onclick="demoSwitch(this.id)"> - </button>
+ <!-- <span> </span>-->
+ <input id="crn4" disabled="disabled">
+ </div>
+ <!-- <div class="crn-command-item">-->
+ <!-- <label>5#</label>-->
+ <!-- <button id="demoBtn-5" class="demoBtn" onclick="demoSwitch(this.id)"> - </button>-->
+ <!-- <!– <span> </span>–>-->
+ <!-- <input id="crn5" disabled="disabled">-->
+ <!-- </div>-->
+ <!-- <div class="crn-command-item">-->
+ <!-- <label>6#</label>-->
+ <!-- <button id="demoBtn-6" class="demoBtn" onclick="demoSwitch(this.id)"> - </button>-->
+ <!-- <!– <span> </span>–>-->
+ <!-- <input id="crn6" disabled="disabled">-->
+ <!-- </div>-->
</div>
<!-- 鍫嗗灈鏈虹姸鎬佷綅淇℃伅 -->
<div class="crn-state">
@@ -113,13 +125,13 @@
<th>鐩爣绔�</th>
<th>婧愬簱浣�</th>
<th>鐩爣搴撲綅</th>
- <th>璧拌閫熷害锛坢/min)</th>
- <th>鍗囬檷閫熷害锛坢/min)</th>
- <th>鍙夌墮閫熷害锛坢/min)</th>
- <th>璧拌璺濈(Km)</th>
- <th>鍗囬檷璺濈(Km)</th>
- <th>璧拌鏃堕暱(H)</th>
- <th>鍗囬檷鏃堕暱(H)</th>
+ <!-- <th>璧拌閫熷害锛坢/min)</th>-->
+ <!-- <th>鍗囬檷閫熷害锛坢/min)</th>-->
+ <!-- <th>鍙夌墮閫熷害锛坢/min)</th>-->
+ <!-- <th>璧拌璺濈(Km)</th>-->
+ <!-- <th>鍗囬檷璺濈(Km)</th>-->
+ <!-- <th>璧拌鏃堕暱(H)</th>-->
+ <!-- <th>鍗囬檷鏃堕暱(H)</th>-->
</tr>
</thead>
<tbody>
@@ -145,7 +157,9 @@
<label><input type="radio" name="crnSelect" value="1" checked> 1鍙峰爢鍨涙満</label>
<label><input type="radio" name="crnSelect" value="2"> 2鍙峰爢鍨涙満</label>
<label><input type="radio" name="crnSelect" value="3"> 3鍙峰爢鍨涙満</label>
-<!-- <label><input type="radio" name="crnSelect" value="4"> 4鍙峰爢鍨涙満</label>-->
+ <label><input type="radio" name="crnSelect" value="4"> 4鍙峰爢鍨涙満</label>
+ <!-- <label><input type="radio" name="crnSelect" value="5"> 5鍙峰爢鍨涙満</label>-->
+ <!-- <label><input type="radio" name="crnSelect" value="6"> 6鍙峰爢鍨涙満</label>-->
</div>
</div>
<!-- 婧愮珯/婧愬簱浣� 閫夋嫨 -->
@@ -199,18 +213,18 @@
<fieldset>
<legend>鎵嬪姩鎿嶄綔</legend>
<div class="button-group">
-<!-- <button class="item" onclick="put()">鍏ュ簱</button>-->
-<!-- <button class="item" onclick="take()">鍑哄簱</button>-->
+ <button class="item" onclick="put()">鍏ュ簱</button>
+ <button class="item" onclick="take()">鍑哄簱</button>
<button class="item" onclick="stockMove()">搴撲綅杞Щ</button>
-<!-- <button class="item" onclick="siteMove()">绔欏埌绔�</button>-->
+ <button class="item" onclick="siteMove()">绔欏埌绔�</button>
<!-- <button class="item" onclick="bacOrigin()">鍥炲師鐐�</button>-->
<!-- <button class="item" onclick="reverseOrigin()">鍙嶅師鐐�</button>-->
<!-- <button class="item" onclick="coorMove()">鍧愭爣绉昏</button>-->
<button class="item" onclick="taskComplete()">浠诲姟瀹屾垚</button>
<!-- <button class="item" onclick="pause()">鏆傚仠</button>-->
<!-- <button class="item" onclick="boot()">鍚姩</button>-->
-<!-- <button class="item" onclick="clearCommand()">娓呴櫎鍛戒护</button>-->
-<!-- <button class="item" onclick="handleReset()">澶嶄綅</button>-->
+ <button class="item" onclick="clearCommand()">娓呴櫎鍛戒护</button>
+ <button class="item" onclick="handleReset()">澶嶄綅</button>
</div>
</fieldset>
</div>
@@ -346,13 +360,13 @@
setVal(tr.children("td").eq(4), table[i-1].staNo);
setVal(tr.children("td").eq(5), table[i-1].sourceLocNo);
setVal(tr.children("td").eq(6), table[i-1].locNo);
- setVal(tr.children("td").eq(7), table[i-1].xspeed);
- setVal(tr.children("td").eq(8), table[i-1].yspeed);
- setVal(tr.children("td").eq(9), table[i-1].zspeed);
- setVal(tr.children("td").eq(10), table[i-1].xdistance);
- setVal(tr.children("td").eq(11), table[i-1].ydistance);
- setVal(tr.children("td").eq(12), table[i-1].xduration);
- setVal(tr.children("td").eq(13), table[i-1].yduration);
+ // setVal(tr.children("td").eq(7), table[i-1].xspeed);
+ // setVal(tr.children("td").eq(8), table[i-1].yspeed);
+ // setVal(tr.children("td").eq(9), table[i-1].zspeed);
+ // setVal(tr.children("td").eq(10), table[i-1].xdistance);
+ // setVal(tr.children("td").eq(11), table[i-1].ydistance);
+ // setVal(tr.children("td").eq(12), table[i-1].xduration);
+ // setVal(tr.children("td").eq(13), table[i-1].yduration);
}
} else if (res.code === 403){
window.location.href = baseUrl+"/login";
diff --git a/src/main/webapp/views/index.html b/src/main/webapp/views/index.html
index e47b77d..481b9ea 100644
--- a/src/main/webapp/views/index.html
+++ b/src/main/webapp/views/index.html
@@ -25,7 +25,7 @@
<li><a id="console" onclick="nav(this.id)" class="nav-select" href="#">涓绘帶鍥�</a></li>
<li><a id="pipeline" onclick="nav(this.id)" class="nav-unselect" href="#">杈撻�佽澶�</a></li>
<li><a id="crn" onclick="nav(this.id)" class="nav-unselect" href="#">鍫嗗灈鏈�</a></li>
- <li><a id="rgv" onclick="nav(this.id)" class="nav-unselect" href="#">RGV</a></li>
+<!-- <li><a id="rgv" onclick="nav(this.id)" class="nav-unselect" href="#">RGV</a></li>-->
</ul>
</div>
</div>
--
Gitblit v1.9.1