From e2aa3f9c79ae688a56ea3bb5bc96ba1600f215de Mon Sep 17 00:00:00 2001
From: dubin <bindu_bean@163.com>
Date: 星期一, 15 十二月 2025 13:35:10 +0800
Subject: [PATCH] 初始化
---
/dev/null | 853 ---------------------------
src/main/java/com/zy/core/thread/SiemensCrnThread.java | 22
src/main/java/com/zy/asrs/controller/OpenController.java | 2
src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java | 18
src/main/webapp/static/wcs/js/console.map.js | 409 ------------
src/main/webapp/views/realtimeWatch/console.html | 14
src/main/webapp/views/index.html | 150 ++++
src/main/webapp/views/old_page/console-old.html | 230 +++---
src/main/resources/application-prod.yml | 56 -
src/main/java/com/zy/core/thread/SiemensDevpThread.java | 97 --
src/main/resources/application.yml | 2
src/main/webapp/static/wms/js/common.js | 2
12 files changed, 321 insertions(+), 1,534 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/OpenController.java b/src/main/java/com/zy/asrs/controller/OpenController.java
index 52da4d3..a6d1e0a 100644
--- a/src/main/java/com/zy/asrs/controller/OpenController.java
+++ b/src/main/java/com/zy/asrs/controller/OpenController.java
@@ -130,7 +130,7 @@
.eq("stn_no",param.getTerminalNo()));
if(Cools.isEmpty(staDesc)){
map.put("ReturnStatus",1);
- map.put("ErrorMessage","鍑哄簱璺姴涓嶅瓨鍦紒");
+ map.put("ErrorMessage","鍑哄簱璺緞涓嶅瓨鍦紒");
return map;
}
r = openService.taskCreate(new TaskCreateParam(param,staDesc.getCrnNo()));
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 2dea637..a6160c5 100644
--- a/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java
@@ -389,8 +389,6 @@
storageEscalationParam.setLocType(1);
}else if(staProtocol.isLow()){
storageEscalationParam.setLocType(0);
- }else if (staProtocol.isCentre()){
- storageEscalationParam.setLocType(2);
}
storageEscalationParam.setTerminalNo(staProtocol.getSiteId());
@@ -465,6 +463,7 @@
staProtocol.setStaNo(inSta.getBackSta().shortValue());
devpThread.setPakMk(staProtocol.getSiteId(), false);
MessageQueue.offer(SlaveType.Devp, devp.getId(), new Task(2, staProtocol));
+ log.error("宸叉湁鍏ュ簱浠诲姟,wms--->浠诲姟鍙�:{}",result.getTaskNo());
}
} else {
@@ -479,6 +478,7 @@
staProtocol.setStaNo(inSta.getBackSta().shortValue());
devpThread.setPakMk(staProtocol.getSiteId(), false);
MessageQueue.offer(SlaveType.Devp, devp.getId(), new Task(2, staProtocol));
+ log.error("鍏ュ簱寮傚父,wms杩斿洖鍊间笉绗﹀悎鏉′欢,wms--->{}",response);
}
}
} catch (Exception e) {
@@ -634,6 +634,7 @@
staProtocol.setStaNo(inSta.getBackSta().shortValue());
devpThread.setPakMk(staProtocol.getSiteId(), false);
MessageQueue.offer(SlaveType.Devp, devp.getId(), new Task(2, staProtocol));
+ log.error("浠诲姟宸插瓨鍦�,wms--->浠诲姟鍙�:{}",result.getTaskNo());
}
} else {
@@ -646,6 +647,7 @@
staProtocol.setStaNo(inSta.getBackSta().shortValue());
devpThread.setPakMk(staProtocol.getSiteId(), false);
MessageQueue.offer(SlaveType.Devp, devp.getId(), new Task(2, staProtocol));
+ log.error("璇锋眰鎺ュ彛寮傚父,wms--->{}",response);
}
} catch (Exception e) {
@@ -1220,11 +1222,13 @@
if (!crnProtocol.getStatusType().equals(CrnStatusType.IDLE) || crnProtocol.getTaskNo() != 0) {
break;
}
-// int storeCount = basDevpService.getStoreCount();
-// if (storeCount >= maxCount) {
-// log.error("杈撻�佺嚎鏆傚瓨鏁拌揪鍒颁笂闄恵}", storeCount);
-// break;
-// }
+
+ //杈撻�佺嚎鍙厑璁稿瓨鍦ㄤ竴涓墭鐩�
+ int storeCount = basDevpService.getStoreCount();
+ if (storeCount >= maxCount) {
+ log.error("杈撻�佺嚎鏆傚瓨鏁拌揪鍒颁笂闄�,褰撳墠杈撻�佺嚎鎵樼洏鏁伴噺:{},鏈�澶ф殏瀛樻暟閲�:{}", storeCount,maxCount);
+ break;
+ }
// 宸茬粡瀛樺湪鍚婅溅鎵ц浠诲姟鏃讹紝鍒欒繃婊�
diff --git a/src/main/java/com/zy/core/thread/SiemensCrnThread.java b/src/main/java/com/zy/core/thread/SiemensCrnThread.java
index 70fac4b..a34c0ff 100644
--- a/src/main/java/com/zy/core/thread/SiemensCrnThread.java
+++ b/src/main/java/com/zy/core/thread/SiemensCrnThread.java
@@ -182,7 +182,7 @@
// crnProtocol.setTemp2(siemensNet.getByteTransform().TransInt16(result.Content, 22));
// crnProtocol.setTemp3(siemensNet.getByteTransform().TransInt16(result.Content, 24));
// crnProtocol.setTemp4(siemensNet.getByteTransform().TransInt16(result.Content, 26));
- if(slave.getId()==3){
+// if(slave.getId()==3){
// crnProtocol.setXSpeed((float) siemensNet.getByteTransform().TransInt16(result.Content, 28));
// crnProtocol.setYSpeed((float) siemensNet.getByteTransform().TransInt16(result.Content, 30));
// crnProtocol.setZSpeed((float) siemensNet.getByteTransform().TransInt16(result.Content, 32));
@@ -190,6 +190,15 @@
// crnProtocol.setYDistance((float) siemensNet.getByteTransform().TransInt16(result.Content, 36));
// crnProtocol.setXDuration((float) siemensNet.getByteTransform().TransInt16(result.Content, 38));
// crnProtocol.setYDuration((float) siemensNet.getByteTransform().TransInt16(result.Content, 40));
+// crnProtocol.setXSpeed(siemensNet.getByteTransform().TransSingle(result.Content, 28));
+// crnProtocol.setYSpeed(siemensNet.getByteTransform().TransSingle(result.Content, 32));
+// crnProtocol.setZSpeed(siemensNet.getByteTransform().TransSingle(result.Content, 36));
+// crnProtocol.setXDistance(siemensNet.getByteTransform().TransSingle(result.Content, 40));
+// crnProtocol.setYDistance(siemensNet.getByteTransform().TransSingle(result.Content, 44));
+// crnProtocol.setXDuration(siemensNet.getByteTransform().TransSingle(result.Content, 48));
+// crnProtocol.setYDuration(siemensNet.getByteTransform().TransSingle(result.Content, 52));
+
+// }else{
crnProtocol.setXSpeed(siemensNet.getByteTransform().TransSingle(result.Content, 28));
crnProtocol.setYSpeed(siemensNet.getByteTransform().TransSingle(result.Content, 32));
crnProtocol.setZSpeed(siemensNet.getByteTransform().TransSingle(result.Content, 36));
@@ -198,16 +207,7 @@
crnProtocol.setXDuration(siemensNet.getByteTransform().TransSingle(result.Content, 48));
crnProtocol.setYDuration(siemensNet.getByteTransform().TransSingle(result.Content, 52));
- }else{
- crnProtocol.setXSpeed(siemensNet.getByteTransform().TransSingle(result.Content, 28));
- crnProtocol.setYSpeed(siemensNet.getByteTransform().TransSingle(result.Content, 32));
- crnProtocol.setZSpeed(siemensNet.getByteTransform().TransSingle(result.Content, 36));
- crnProtocol.setXDistance(siemensNet.getByteTransform().TransSingle(result.Content, 40));
- crnProtocol.setYDistance(siemensNet.getByteTransform().TransSingle(result.Content, 44));
- crnProtocol.setXDuration(siemensNet.getByteTransform().TransSingle(result.Content, 48));
- crnProtocol.setYDuration(siemensNet.getByteTransform().TransSingle(result.Content, 52));
-
- }
+// }
diff --git a/src/main/java/com/zy/core/thread/SiemensDevpThread.java b/src/main/java/com/zy/core/thread/SiemensDevpThread.java
index 1453933..d51f376 100644
--- a/src/main/java/com/zy/core/thread/SiemensDevpThread.java
+++ b/src/main/java/com/zy/core/thread/SiemensDevpThread.java
@@ -52,68 +52,6 @@
add(1001);
add(1002);
add(1003);
- add(1004);
- add(1005);
- add(1006);
- add(1007);
- add(1008);
- add(1009);
- add(1010);
- add(1011);
- add(1012);
- add(1013);
- add(1014);
- add(1015);
- add(1016);
- add(1017);
- add(1018);
- add(1019);
- add(1020);
-
-
- }};
- public static final ArrayList<Integer> staNos2 = new ArrayList<Integer>() {{
- add(2001);
- add(2002);
- add(2003);
- add(2004);
- add(2005);
- add(2006);
- add(2007);
- add(2008);
- add(2009);
- add(2010);
- add(2011);
- add(2012);
- add(2013);
- add(2014);
- add(2015);
- add(2016);
- add(2017);
- add(2018);
- add(2019);
-
- }};
- public static final ArrayList<Integer> staNos3 = new ArrayList<Integer>() {{
- add(1051);
- add(1052);
- add(1053);
- add(1054);
- add(1055);
- add(1056);
- add(1057);
- add(1058);
- }};
- public static final ArrayList<Integer> staNos4 = new ArrayList<Integer>() {{
- add(2051);
- add(2052);
- add(2053);
- add(2054);
- add(2055);
- add(2056);
- add(2057);
- add(2058);
-
}};
/**
@@ -136,12 +74,6 @@
switch (slave.getId()) {
case 1:
return staNos1;
- case 2:
- return staNos2;
- case 3:
- return staNos3;
- case 4:
- return staNos4;
default:
throw new CoolException("鏈嶅姟鍣ㄥ紓甯�");
}
@@ -266,7 +198,7 @@
staProtocol.setStaNo(siemensS7Net.getByteTransform().TransInt16(result.Content, i * 8 + 4)); // 鐩爣绔�
boolean[] status = siemensS7Net.getByteTransform().TransBool(result.Content, i * 8 + 6, 2);
- staProtocol.setAutoing(status[0]); //
+ staProtocol.setAutoing(status[0]); // 鑷姩
staProtocol.setLoading(status[1]); // 鏈夌墿
staProtocol.setInEnable(status[2]); // 鍙叆
staProtocol.setOutEnable(status[3]);// 鍙嚭
@@ -274,7 +206,7 @@
staProtocol.setFullPlt(status[5]); // 婊℃墭鐩�
staProtocol.setHigh(status[6]); // 楂樺簱浣�
staProtocol.setLow(status[7]); // 浣庡簱浣�
- staProtocol.setCentre(status[8]); // 涓簱浣�
+// staProtocol.setCentre(status[8]); // 涓簱浣�
if (!staProtocol.isPakMk() && !staProtocol.isLoading()) {
staProtocol.setPakMk(true);
@@ -301,27 +233,18 @@
int sta = 0;
switch (slave.getId()) {
case 1:
- sta = 1014;
- break;
- case 2:
- sta = 2007;
- break;
- case 3:
- sta = 1052;
- break;
- case 4:
- sta = 2056;
+ sta = 1002;
break;
}
StaProtocol staProtocol1 = station.get(sta);
boolean[] status1 = siemensS7Net.getByteTransform().TransBool(resultErr1.Content, 0, 1);
- staProtocol1.setFrontErr(status1[0]);
- staProtocol1.setBackErr(status1[1]);
- staProtocol1.setHighErr(status1[2]);
- staProtocol1.setLeftErr(status1[3]);
- staProtocol1.setRightErr(status1[4]);
- staProtocol1.setWeightErr(status1[5]);
- staProtocol1.setBarcodeErr(status1[6]);
+ staProtocol1.setFrontErr(status1[0]); // 鍓嶈秴
+ staProtocol1.setBackErr(status1[1]); // 鍚庤秴
+ staProtocol1.setHighErr(status1[2]); // 楂樿秴
+ staProtocol1.setLeftErr(status1[3]); // 宸﹁秴
+ staProtocol1.setRightErr(status1[4]); // 鍙宠秴
+ staProtocol1.setWeightErr(status1[5]); // 瓒呴噸
+ staProtocol1.setBarcodeErr(status1[6]); // 鎵爜澶辫触
}
diff --git a/src/main/resources/application-prod.yml b/src/main/resources/application-prod.yml
index f4c584e..e31a7d9 100644
--- a/src/main/resources/application-prod.yml
+++ b/src/main/resources/application-prod.yml
@@ -1,7 +1,7 @@
wcs-slave:
- doubleDeep: true #鍙屾繁
+ doubleDeep: false #鍙屾繁
doubleLocs: 1,4 #鍙屾繁搴撲綅鎺掑彿 1,4
- groupCount: 4 #涓�涓爢鍨涙満璐熻矗鐨勮揣鏋舵帓鏁�
+ groupCount: 2 #涓�涓爢鍨涙満璐熻矗鐨勮揣鏋舵帓鏁�
crn[0]: #鍫嗗灈鏈�1
id: 1
ip: 192.168.110.100
@@ -11,29 +11,16 @@
offset: 2 #鍋忕Щ閲忥紝褰撳爢鍨涙満绔欑偣鍒楀彿=1鏃讹紝鍋忕Щ閲�=2
port: 102
crnOutStn[0]: #鍫嗗灈鏈哄嚭搴撶珯鐐�--1F杈撻�佺嚎 鏀捐揣鍙�
- staNo: 1002
+ staNo: 1001
row: 1
bay: 1
lev: 1
devpPlcId: ${wcs-slave.devp[0].id}
crnInStn[0]: #鍫嗗灈鏈哄叆搴撶珯鐐�1--1F杈撻�佺嚎 鍙栬揣鍙�
- staNo: 1004
- row: 2
+ staNo: 1001
+ row: 1
bay: 1
lev: 1
- backSta: 102
- devpPlcId: ${wcs-slave.devp[0].id}
- crnOutStn[1]: #鍫嗗灈鏈哄嚭搴撶珯鐐�--2F杈撻�佺嚎 鏀捐揣鍙�
- staNo: 2002
- row: 1
- bay: 59
- lev: 11
- devpPlcId: ${wcs-slave.devp[0].id}
- crnInStn[1]: #鍫嗗灈鏈哄叆搴撶珯鐐�--2F杈撻�佺嚎 鍙栬揣鍙�
- staNo: 2003
- row: 2
- bay: 59
- lev: 11
backSta: 102
devpPlcId: ${wcs-slave.devp[0].id}
devp[0]: #杈撻�佺嚎--鍗婃垚鍝�1F
@@ -43,37 +30,26 @@
port: 102
slot: 0
emptyInSta[0]: #绌烘澘鍏ュ簱鍙�0
- staNo: 1014
+ staNo: 1002
inSta[0]: #鍏ュ簱鍙�1
- staNo: 1014
- backSta: 1015
+ staNo: 1002
+ backSta: 1003
barcode: ${wcs-slave.barcode[0].id}
- led: ${wcs-slave.led[0].id}
+# led: ${wcs-slave.led[0].id}
# scale: ${wcs-slave.scale[0].id}
outSta[0]: #鍑哄簱鍙�1
- staNo: 1019
- outSta[1]: #鍑哄簱鍙�2
- staNo: 1010
- outSta[2]: #鍑哄簱鍙�2
- staNo: 1020
+ staNo: 1003
barcode[0]: #鏉＄爜鎵弿浠�
port: 51236
ip: 172.17.91.39
id: 1
# LED1
- led[0]:
- id: 1
- ip: 192.168.110.210
- port: 5005
- devpPlcId: ${wcs-slave.devp[0].id}
- staArr: 1052
- # LED2
- led[1]:
- id: 2
- ip: 192.168.110.211
- port: 5005
- devpPlcId: ${wcs-slave.devp[0].id}
- staArr: 1051
+# led[0]:
+# id: 1
+# ip: 192.168.110.210
+# port: 5005
+# devpPlcId: ${wcs-slave.devp[0].id}
+# staArr: 1052
# 纾呯Г 鍗婃垚鍝佷竴妤� 192.168.110.24
# scale[0]:
# id: 1
diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml
index c382e6c..bd30c20 100644
--- a/src/main/resources/application.yml
+++ b/src/main/resources/application.yml
@@ -45,7 +45,7 @@
wms:
#杈撻�佺嚎鏆傚瓨鏁�
- count: 8
+ count: 1
maxCirle: 3
# 鏄惁寮�鍚笂鎶�
start: true
diff --git a/src/main/webapp/static/wcs/js/console.map.js b/src/main/webapp/static/wcs/js/console.map.js
index 5d7249b..a0b71a7 100644
--- a/src/main/webapp/static/wcs/js/console.map.js
+++ b/src/main/webapp/static/wcs/js/console.map.js
@@ -1,100 +1,34 @@
mapInfo = {
"mapName": "wcs",
- "rackCount": 13,
+ "rackCount": 2,
"crnCount": 4,
"stbCount": 4,
"hpPosition": 0,
"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": "rack6",
+ "id": "rack1",
"top": 303,
"left": 820,
"width": 1050,
"height": 23,
"minBayNo": 1,
- "maxBayNo": 59,
- "hiddenArr": [1,59]
+ "maxBayNo": 30,
+ "hiddenArr": [1,30]
},
- // {
- // "type": "rack",
- // "id": "rack5",
- // "top": 209,
- // "left": 820,
- // "width": 1050,
- // "height": 23,
- // "minBayNo": 1,
- // "maxBayNo": 59,
- // "hiddenArr": [1,59]
- // },
{
"type": "rack",
- "id": "rack4",
+ "id": "rack2",
"top": 232,
"left": 820,
"width": 1050,
"height": 23,
"minBayNo": 1,
- "maxBayNo": 59,
- "hiddenArr": [1,59]
+ "maxBayNo": 30,
+ "hiddenArr": [1,30]
},
- // {
- // "type": "rack",
- // "id": "rack3",
- // "top": 182,
- // "left": 820,
- // "width": 1050,
- // "height": 23,
- // "minBayNo": 1,
- // "maxBayNo": 59,
- // "hiddenArr": [1,59]
- // },
- {
- "type": "rack",
- "id": "rack2",
- "top": 159,
- "left": 820,
- "width": 1050,
- "height": 23,
- "minBayNo": 1,
- "maxBayNo": 59,
- "hiddenArr": [1,59]
- },
- {
- "type": "rack",
- "id": "rack1",
- "top": 98,
- "left": 820,
- "width": 1050,
- "height": 23,
- "minBayNo": 1,
- "maxBayNo": 59,
- "hiddenArr": [1,59]
- },
- // {
- // "type": "rack",
- // "id": "rack0",
- // "top": 75,
- // "left": 820,
- // "width": 1050,
- // "height": 23,
- // "minBayNo": 1,
- // "maxBayNo": 59,
- // "hiddenArr": [1,59]
- // }
],
"crns": [{
"type": "crane",
@@ -105,28 +39,12 @@
"width": 93,
"height": 22
}, {
- "type": "crane",
- "id": "crn-2",
- "text": "2",
- "top": 132,
- "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": "",
- "top": 143,
- "left": 769,
- "width": 850,
+ "width": 1100,
"height": 2
}],
"areas": [{
@@ -145,124 +63,21 @@
"left": 422,
"width": 308,
"height": 706,
- "stns": [{
- "type": "stn",
- "id": "site-1008",
- "text": "1008",
- "top": 99,
- "left": 771,
- "width": 62,
- "height": 23
- },{
- "type": "stn",
- "id": "site-1007",
- "text": "1007",
- "top": 99,
- "left": 707,
- "width": 62,
- "height": 23
- },{
- "type": "stn",
- "id": "site-102",
- "text": "RGV灏忚溅",
- "top": 99,
- "left": 643,
- "width": 62,
- "height": 23
- },{
- "type": "stn",
- "id": "site-1011",
- "text": "1011",
- "top": 99,
- "left": 579,
- "width": 62,
- "height": 23
- },
- {
- "type": "stn",
- "id": "site-1020",
- "text": "1020",
- "top": 70,
- "left": 579,
- "width": 62,
- "height": 23
- },
- {
- "type": "stn",
- "id": "site-103",
- "text": "",
- "top": 70,
- "left": 515,
- "width": 62,
- "height": 23
- },
- {
- "type": "stn",
- "id": "site-103",
- "text": "",
- "top": 70,
- "left": 450,
- "width": 62,
- "height": 23
- },
- // {
- // "type": "stn",
- // "id": "site-104",
- // "text": "104",
- // "top": 124,
- // "left": 579,
- // "width": 62,
- // "height": 34
- // },
+ "stns": [
{
"type": "stn",
- "id": "site-1006",
- "text": "1006",
- "top": 160,
- "left": 771,
- "width": 62,
- "height": 23
- },{
- "type": "stn",
- "id": "site-1005",
- "text": "1005",
- "top": 160,
- "left": 707,
- "width": 62,
- "height": 23
- },/*{
- "type": "stn",
- "id": "site-123",
- "text": "RGV灏忚溅",
- "top": 160,
- "left": 643,
- "width": 62,
- "height": 23
- },*/
- // {
- // "type": "stn",
- // "id": "site-122",
- // "text": "122",
- // "top": 160,
- // "left": 579,
- // "width": 62,
- // "height": 23
- // },
- // {
- // "type": "stn",
- // "id": "site-121",
- // "text": "121",
- // "top": 186,
- // "left": 579,
- // "width": 62,
- // "height": 42
- // },
- {
- "type": "stn",
- "id": "site-1004",
- "text": "1004",
+ "id": "site-1001",
+ "text": "1001",
"top": 231,
- "left": 771,
+ "left": 790,
+ "width": 62,
+ "height": 23
+ },{
+ "type": "stn",
+ "id": "site-1002",
+ "text": "1002",
+ "top": 231,
+ "left": 720,
"width": 62,
"height": 23
},{
@@ -270,190 +85,10 @@
"id": "site-1003",
"text": "1003",
"top": 231,
- "left": 707,
+ "left": 650,
"width": 62,
- "height": 23
- },/*{
- "type": "stn",
- "id": "site-118",
- "text": "RGV灏忚溅",
- "top": 231,
- "left": 643,
- "width": 62,
- "height": 23
- },*/
- // {
- // "type": "stn",
- // "id": "site-117",
- // "text": "117",
- // "top": 231,
- // "left": 579,
- // "width": 62,
- // "height": 23
- // },{
- // "type": "stn",
- // "id": "site-116",
- // "text": "116",
- // "top": 256,
- // "left": 579,
- // "width": 62,
- // "height": 46
- // },
- {
- "type": "stn",
- "id": "site-1002",
- "text": "1002",
- "top": 304,
- "left": 771,
- "width": 62,
- "height": 23
- },{
- "type": "stn",
- "id": "site-1001",
- "text": "1001",
- "top": 304,
- "left": 707,
- "width": 62,
- "height": 23
+ "height": 40
},
- {
- "type": "stn",
- "id": "site-1016",
- "text": "1016",
- "top": 330,
- "left": 707,
- "width": 62,
- "height": 23
- },
- {
- "type": "stn",
- "id": "site-1018",
- "text": "1018",
- "top": 356,
- "left": 707,
- "width": 62,
- "height": 23
- },
- {
- "type": "stn",
- "id": "site-1019",
- "text": "1019",
- "top": 356,
- "left": 772,
- "width": 62,
- "height": 23
- },
- {
- "type": "stn",
- "id": "site-114",
- "text": "",
- "top": 356,
- "left": 837,
- "width": 62,
- "height": 23
- },
- {
- "type": "stn",
- "id": "site-114",
- "text": "",
- "top": 356,
- "left": 902,
- "width": 62,
- "height": 23
- },
- {
- "type": "stn",
- "id": "site-1017",
- "text": "1017",
- "top": 383,
- "left": 707,
- "width": 62,
- "height": 23
- },/*{
- "type": "stn",
- "id": "site-113",
- "text": "RGV灏忚溅",
- "top": 304,
- "left": 643,
- "width": 62,
- "height": 23
- },*/
- // {
- // "type": "stn",
- // "id": "site-112",
- // "text": "112",
- // "top": 304,
- // "left": 579,
- // "width": 62,
- // "height": 23
- // },
- {
- "type": "stn",
- "id": "site-1012",
- "text": "1012",
- "top": 99,
- "left": 515,
- "width": 62,
- "height": 23
- },{
- "type": "stn",
- "id": "site-1013",
- "text": "1013",
- "top": 124,
- "left": 515,
- "width": 62,
- "height": 177
- },{
- "type": "stn",
- "id": "site-1014",
- "text": "1014",
- "top": 304,
- "left": 515,
- "width": 62,
- "height": 23
- },{
- "type": "stn",
- "id": "site-1015",
- "text": "1015",
- "top": 329,
- "left": 515,
- "width": 62,
- "height": 23
- },
- // {
- // "type": "stn",
- // "id": "site-1001",
- // "text": "1001",
- // "top": 99,
- // "left": 451,
- // "width": 62,
- // "height": 23
- // },
- // {
- // "type": "stn",
- // "id": "site-1002",
- // "text": "1002",
- // "top": 160,
- // "left": 451,
- // "width": 62,
- // "height": 23
- // },{
- // "type": "stn",
- // "id": "site-1003",
- // "text": "1003",
- // "top": 231,
- // "left": 451,
- // "width": 62,
- // "height": 23
- // },{
- // "type": "stn",
- // "id": "site-1004",
- // "text": "1004",
- // "top": 304,
- // "left": 451,
- // "width": 62,
- // "height": 23
- // }
]
}]
}]
diff --git a/src/main/webapp/static/wcs/js/console1.map.js b/src/main/webapp/static/wcs/js/console1.map.js
deleted file mode 100644
index 1f84f82..0000000
--- a/src/main/webapp/static/wcs/js/console1.map.js
+++ /dev/null
@@ -1,500 +0,0 @@
-mapInfo = {
- "mapName": "wcs",
- "rackCount": 13,
- "crnCount": 4,
- "stbCount": 4,
- "hpPosition": 0,
- "minBayNo": 1,
- "floors": 1,
- "racks": [
- {
- "type": "rack",
- "id": "rack7",
- "top": 326,
- "left": 820,
- "width": 1050,
- "height": 23,
- "minBayNo": 1,
- "maxBayNo": 43,
- "hiddenArr": [1,43]
- },
- {
- "type": "rack",
- "id": "rack6",
- "top": 303,
- "left": 820,
- "width": 1050,
- "height": 23,
- "minBayNo": 1,
- "maxBayNo": 43,
- "hiddenArr": [1,43]
- },
- {
- "type": "rack",
- "id": "rack5",
- "top": 209,
- "left": 820,
- "width": 1050,
- "height": 23,
- "minBayNo": 1,
- "maxBayNo": 43,
- "hiddenArr": [1,43]
- },
- {
- "type": "rack",
- "id": "rack4",
- "top": 232,
- "left": 820,
- "width": 1050,
- "height": 23,
- "minBayNo": 1,
- "maxBayNo": 43,
- "hiddenArr": [1,43]
- },
- /*{
- "type": "rack",
- "id": "rack3",
- "top": 182,
- "left": 820,
- "width": 1050,
- "height": 23,
- "minBayNo": 1,
- "maxBayNo": 43,
- "hiddenArr": [1,43]
- },*/
- /*{
- "type": "rack",
- "id": "rack2",
- "top": 159,
- "left": 820,
- "width": 1050,
- "height": 23,
- "minBayNo": 1,
- "maxBayNo": 43,
- "hiddenArr": [1,43]
- },*/
- /*{
- "type": "rack",
- "id": "rack1",
- "top": 98,
- "left": 820,
- "width": 1050,
- "height": 23,
- "minBayNo": 1,
- "maxBayNo": 43,
- "hiddenArr": [1,43]
- },*/
- /*{
- "type": "rack",
- "id": "rack0",
- "top": 75,
- "left": 820,
- "width": 1050,
- "height": 23,
- "minBayNo": 1,
- "maxBayNo": 43,
- "hiddenArr": [1,43]
- }*/
- ],
- "crns": [
- {
- "type": "crane",
- "id": "crn-3",
- "text": "3",
- "top": 268,
- "left": 855,
- "width": 93,
- "height": 22
- },
- /*{
- "type": "crane",
- "id": "crn-1",
- "text": "1",
- "top": 132,
- "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": "",
- "top": 143,
- "left": 769,
- "width": 850,
- "height": 2
- }*/
- ],
- "areas": [{
- "type": "Control_floor",
- "id": "tabControl_floor2",
- "text": "妤煎眰",
- "top": 66,
- "left": 580,
- "width": 334,
- "height": 714,
- "floors": [{
- "type": "floor",
- "id": "page_floor1",
- "text": "1F",
- "top": 4,
- "left": 422,
- "width": 308,
- "height": 706,
- "stns": [
- /*{
- "type": "stn",
- "id": "site-100",
- "text": "1008",
- "top": 99,
- "left": 771,
- "width": 62,
- "height": 23
- },*/
- /*{
- "type": "stn",
- "id": "site-101",
- "text": "1007",
- "top": 99,
- "left": 707,
- "width": 62,
- "height": 23
- },*/
- /*{
- "type": "stn",
- "id": "site-102",
- "text": "RGV灏忚溅",
- "top": 99,
- "left": 643,
- "width": 62,
- "height": 23
- },*/
- /*{
- "type": "stn",
- "id": "site-103",
- "text": "1011",
- "top": 99,
- "left": 579,
- "width": 62,
- "height": 23
- },*/
- /*{
- "type": "stn",
- "id": "site-103",
- "text": "1020",
- "top": 70,
- "left": 579,
- "width": 62,
- "height": 23
- },*/
- /*{
- "type": "stn",
- "id": "site-103",
- "text": "",
- "top": 70,
- "left": 515,
- "width": 62,
- "height": 23
- },*/
- /*{
- "type": "stn",
- "id": "site-103",
- "text": "",
- "top": 70,
- "left": 450,
- "width": 62,
- "height": 23
- },*/
- // {
- // "type": "stn",
- // "id": "site-104",
- // "text": "104",
- // "top": 124,
- // "left": 579,
- // "width": 62,
- // "height": 34
- // },
- /*{
- "type": "stn",
- "id": "site-125",
- "text": "1006",
- "top": 160,
- "left": 771,
- "width": 62,
- "height": 23
- },*/
- {
- "type": "stn",
- "id": "site-1051",
- "text": "1051",
- "top": 200,
- "left": 707,
- "width": 62,
- "height": 23
- },/*{
- "type": "stn",
- "id": "site-123",
- "text": "RGV灏忚溅",
- "top": 160,
- "left": 643,
- "width": 62,
- "height": 23
- },*/
- // {
- // "type": "stn",
- // "id": "site-122",
- // "text": "122",
- // "top": 160,
- // "left": 579,
- // "width": 62,
- // "height": 23
- // },
- // {
- // "type": "stn",
- // "id": "site-121",
- // "text": "121",
- // "top": 186,
- // "left": 579,
- // "width": 62,
- // "height": 42
- // },
- {
- "type": "stn",
- "id": "site-1056",
- "text": "1056",
- "top": 231,
- "left": 771,
- "width": 62,
- "height": 23
- },{
- "type": "stn",
- "id": "site-1052",
- "text": "1052",
- "top": 231,
- "left": 707,
- "width": 62,
- "height": 60
- },/*{
- "type": "stn",
- "id": "site-118",
- "text": "RGV灏忚溅",
- "top": 231,
- "left": 643,
- "width": 62,
- "height": 23
- },*/
- // {
- // "type": "stn",
- // "id": "site-117",
- // "text": "117",
- // "top": 231,
- // "left": 579,
- // "width": 62,
- // "height": 23
- // },{
- // "type": "stn",
- // "id": "site-116",
- // "text": "116",
- // "top": 256,
- // "left": 579,
- // "width": 62,
- // "height": 46
- // },
- {
- "type": "stn",
- "id": "site-1058",
- "text": "1058",
- "top": 304,
- "left": 771,
- "width": 62,
- "height": 23
- },{
- "type": "stn",
- "id": "site-1053",
- "text": "1053",
- "top": 304,
- "left": 707,
- "width": 62,
- "height": 23
- },
- {
- "type": "stn",
- "id": "site-1054",
- "text": "1054",
- "top": 330,
- "left": 707,
- "width": 62,
- "height": 23
- },
- /*{
- "type": "stn",
- "id": "site-114",
- "text": "1018",
- "top": 356,
- "left": 707,
- "width": 62,
- "height": 23
- },*/
- /*{
- "type": "stn",
- "id": "site-114",
- "text": "1019",
- "top": 356,
- "left": 772,
- "width": 62,
- "height": 23
- },*/
- /*{
- "type": "stn",
- "id": "site-114",
- "text": "",
- "top": 356,
- "left": 837,
- "width": 62,
- "height": 23
- },*/
- /*{
- "type": "stn",
- "id": "site-114",
- "text": "",
- "top": 356,
- "left": 902,
- "width": 62,
- "height": 23
- },*/
- /*{
- "type": "stn",
- "id": "site-114",
- "text": "1017",
- "top": 383,
- "left": 707,
- "width": 62,
- "height": 23
- },*//*{
- "type": "stn",
- "id": "site-113",
- "text": "RGV灏忚溅",
- "top": 304,
- "left": 643,
- "width": 62,
- "height": 23
- },*/
- // {
- // "type": "stn",
- // "id": "site-112",
- // "text": "112",
- // "top": 304,
- // "left": 579,
- // "width": 62,
- // "height": 23
- // },
- /* {
- "type": "stn",
- "id": "site-105",
- "text": "1012",
- "top": 99,
- "left": 515,
- "width": 62,
- "height": 23
- },*/
- /*{
- "type": "stn",
- "id": "site-106",
- "text": "1013",
- "top": 124,
- "left": 515,
- "width": 62,
- "height": 34
- },*/
- /*{
- "type": "stn",
- "id": "site-107",
- "text": "1013",
- "top": 160,
- "left": 515,
- "width": 62,
- "height": 23
- },*/
- /*{
- "type": "stn",
- "id": "site-108",
- "text": "1013",
- "top": 186,
- "left": 515,
- "width": 62,
- "height": 42
- },*/
- /*{
- "type": "stn",
- "id": "site-109",
- "text": "1013",
- "top": 231,
- "left": 515,
- "width": 62,
- "height": 70
- },*/
- /*{
- "type": "stn",
- "id": "site-110",
- "text": "1014",
- "top": 304,
- "left": 515,
- "width": 62,
- "height": 23
- },*/
- /*{
- "type": "stn",
- "id": "site-111",
- "text": "1015",
- "top": 329,
- "left": 515,
- "width": 62,
- "height": 23
- },*/
- // {
- // "type": "stn",
- // "id": "site-1001",
- // "text": "1001",
- // "top": 99,
- // "left": 451,
- // "width": 62,
- // "height": 23
- // },
- // {
- // "type": "stn",
- // "id": "site-1002",
- // "text": "1002",
- // "top": 160,
- // "left": 451,
- // "width": 62,
- // "height": 23
- // },{
- // "type": "stn",
- // "id": "site-1003",
- // "text": "1003",
- // "top": 231,
- // "left": 451,
- // "width": 62,
- // "height": 23
- // },{
- // "type": "stn",
- // "id": "site-1004",
- // "text": "1004",
- // "top": 304,
- // "left": 451,
- // "width": 62,
- // "height": 23
- // }
- ]
- }]
- }]
-}
\ No newline at end of file
diff --git a/src/main/webapp/static/wcs/js/console2.map.js b/src/main/webapp/static/wcs/js/console2.map.js
deleted file mode 100644
index 894dd83..0000000
--- a/src/main/webapp/static/wcs/js/console2.map.js
+++ /dev/null
@@ -1,544 +0,0 @@
-mapInfo = {
- "mapName": "wcs",
- "rackCount": 13,
- "crnCount": 4,
- "stbCount": 4,
- "hpPosition": 0,
- "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": "rack6",
- "top": 303,
- "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",
- "top": 232,
- "left": 820,
- "width": 1050,
- "height": 23,
- "minBayNo": 1,
- "maxBayNo": 59,
- "hiddenArr": [1, 59]
- },
- // {
- // "type": "rack",
- // "id": "rack3",
- // "top": 182,
- // "left": 820,
- // "width": 1050,
- // "height": 23,
- // "minBayNo": 1,
- // "maxBayNo": 59,
- // "hiddenArr": [1,59]
- // },
- {
- "type": "rack",
- "id": "rack2",
- "top": 159,
- "left": 820,
- "width": 1050,
- "height": 23,
- "minBayNo": 1,
- "maxBayNo": 59,
- "hiddenArr": [1, 59]
- },
- {
- "type": "rack",
- "id": "rack1",
- "top": 98,
- "left": 820,
- "width": 1050,
- "height": 23,
- "minBayNo": 1,
- "maxBayNo": 59,
- "hiddenArr": [1, 59]
- },
- // {
- // "type": "rack",
- // "id": "rack0",
- // "top": 75,
- // "left": 820,
- // "width": 1050,
- // "height": 23,
- // "minBayNo": 1,
- // "maxBayNo": 59,
- // "hiddenArr": [1,59]
- // }
- ],
- "crns": [{
- "type": "crane",
- "id": "crn-1",
- "text": "1",
- "top": 268,
- "left": 855,
- "width": 93,
- "height": 22
- }, {
- "type": "crane",
- "id": "crn-2",
- "text": "2",
- "top": 132,
- "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": "",
- "top": 143,
- "left": 769,
- "width": 850,
- "height": 2
- }],
- "areas": [{
- "type": "Control_floor",
- "id": "tabControl_floor3",
- "text": "妤煎眰",
- "top": 66,
- "left": 580,
- "width": 334,
- "height": 714,
- "floors": [{
- "type": "floor",
- "id": "page_floor1",
- "text": "1F",
- "top": 4,
- "left": 422,
- "width": 308,
- "height": 706,
- "stns": [
- {
- "type": "stn",
- "id": "site-2001",
- "text": "2001",
- "top": 40,
- "left": 900,
- "width": 62,
- "height": 23
- },
- {
- "type": "stn",
- "id": "site-2002",
- "text": "2002",
- "top": 67,
- "left": 900,
- "width": 62,
- "height": 23
- },
- {
- "type": "stn",
- "id": "site-2006",
- "text": "2006",
- "top": 57,
- "left": 640,
- "width": 62,
- "height": 23
- },
- {
- "type": "stn",
- "id": "site-2007",
- "text": "2007",
- "top": 90,
- "left": 640,
- "width": 62,
- "height": 23
- }, {
- "type": "stn",
- "id": "site-2008",
- "text": "2008",
- "top": 125,
- "left": 640,
- "width": 62,
- "height": 23
- },
- /*{
- "type": "stn",
- "id": "site-103",
- "text": "1011",
- "top": 99,
- "left": 579,
- "width": 62,
- "height": 23
- },*/
- /*{
- "type": "stn",
- "id": "site-103",
- "text": "1020",
- "top": 70,
- "left": 579,
- "width": 62,
- "height": 23
- },*/
- /* {
- "type": "stn",
- "id": "site-103",
- "text": "",
- "top": 70,
- "left": 515,
- "width": 62,
- "height": 23
- },*/
- /*{
- "type": "stn",
- "id": "site-103",
- "text": "",
- "top": 70,
- "left": 450,
- "width": 62,
- "height": 23
- },*/
- // {
- // "type": "stn",
- // "id": "site-104",
- // "text": "104",
- // "top": 124,
- // "left": 579,
- // "width": 62,
- // "height": 34
- // },
- {
- "type": "stn",
- "id": "site-2003",
- "text": "2003",
- "top": 160,
- "left": 771,
- "width": 62,
- "height": 23
- },
- {
- "type": "stn",
- "id": "site-2005",
- "text": "2005",
- "top": 160,
- "left": 640,
- "width": 62,
- "height": 23
- },
- {
- "type": "stn",
- "id": "site-2004",
- "text": "2004",
- "top": 160,
- "left": 707,
- "width": 62,
- "height": 23
- },/*{
- "type": "stn",
- "id": "site-123",
- "text": "RGV灏忚溅",
- "top": 160,
- "left": 643,
- "width": 62,
- "height": 23
- },*/
- // {
- // "type": "stn",
- // "id": "site-122",
- // "text": "122",
- // "top": 160,
- // "left": 579,
- // "width": 62,
- // "height": 23
- // },
- // {
- // "type": "stn",
- // "id": "site-121",
- // "text": "121",
- // "top": 186,
- // "left": 579,
- // "width": 62,
- // "height": 42
- // },
- {
- "type": "stn",
- "id": "site-2012",
- "text": "2012",
- "top": 231,
- "left": 771,
- "width": 62,
- "height": 23
- },
- {
- "type": "stn",
- "id": "site-2009",
- "text": "2009",
- "top": 195,
- "left": 640,
- "width": 62,
- "height": 23
- },
- {
- "type": "stn",
- "id": "site-2010",
- "text": "2010",
- "top": 231,
- "left": 640,
- "width": 62,
- "height": 23
- },
- {
- "type": "stn",
- "id": "site-2011",
- "text": "2011",
- "top": 231,
- "left": 707,
- "width": 62,
- "height": 23
- },/*{
- "type": "stn",
- "id": "site-118",
- "text": "RGV灏忚溅",
- "top": 231,
- "left": 643,
- "width": 62,
- "height": 23
- },*/
- // {
- // "type": "stn",
- // "id": "site-117",
- // "text": "117",
- // "top": 231,
- // "left": 579,
- // "width": 62,
- // "height": 23
- // },{
- // "type": "stn",
- // "id": "site-116",
- // "text": "116",
- // "top": 256,
- // "left": 579,
- // "width": 62,
- // "height": 46
- // },
- {
- "type": "stn",
- "id": "site-2013",
- "text": "2013",
- "top": 304,
- "left": 771,
- "width": 62,
- "height": 23
- },
- {
- "type": "stn",
- "id": "site-2015",
- "text": "2015",
- "top": 304,
- "left": 640,
- "width": 62,
- "height": 23
- },
- {
- "type": "stn",
- "id": "site-2014",
- "text": "2014",
- "top": 304,
- "left": 707,
- "width": 62,
- "height": 23
- },
- /*{
- "type": "stn",
- "id": "site-114",
- "text": "1016",
- "top": 330,
- "left": 707,
- "width": 62,
- "height": 23
- },*/
- /*{
- "type": "stn",
- "id": "site-114",
- "text": "1018",
- "top": 356,
- "left": 707,
- "width": 62,
- "height": 23
- },*/
- /*{
- "type": "stn",
- "id": "site-114",
- "text": "1019",
- "top": 356,
- "left": 772,
- "width": 62,
- "height": 23
- },*/
- /* {
- "type": "stn",
- "id": "site-114",
- "text": "",
- "top": 356,
- "left": 837,
- "width": 62,
- "height": 23
- },*/
- /* {
- "type": "stn",
- "id": "site-114",
- "text": "",
- "top": 356,
- "left": 902,
- "width": 62,
- "height": 23
- },*/
- /*{
- "type": "stn",
- "id": "site-114",
- "text": "1017",
- "top": 383,
- "left": 707,
- "width": 62,
- "height": 23
- },*//*{
- "type": "stn",
- "id": "site-113",
- "text": "RGV灏忚溅",
- "top": 304,
- "left": 643,
- "width": 62,
- "height": 23
- },*/
- // {
- // "type": "stn",
- // "id": "site-112",
- // "text": "112",
- // "top": 304,
- // "left": 579,
- // "width": 62,
- // "height": 23
- // },
- {
- "type": "stn",
- "id": "site-2019",
- "text": "2019",
- "top": 99,
- "left": 515,
- "width": 62,
- "height": 23
- }, {
- "type": "stn",
- "id": "site-106",
- "text": "",
- "top": 135,
- "left": 515,
- "width": 62,
- "height": 34
- }, {
- "type": "stn",
- "id": "site-2018",
- "text": "2018",
- "top": 160,
- "left": 515,
- "width": 62,
- "height": 23
- }, {
- "type": "stn",
- "id": "site-108",
- "text": "",
- "top": 190,
- "left": 515,
- "width": 62,
- "height": 42
- }, {
- "type": "stn",
- "id": "site-2017",
- "text": "2017",
- "top": 231,
- "left": 515,
- "width": 62,
- "height": 70
- }, {
- "type": "stn",
- "id": "site-2016",
- "text": "2016",
- "top": 304,
- "left": 574,
- "width": 62,
- "height": 23
- },/*{
- "type": "stn",
- "id": "site-111",
- "text": "1015",
- "top": 329,
- "left": 515,
- "width": 62,
- "height": 23
- },*/
- // {
- // "type": "stn",
- // "id": "site-1001",
- // "text": "1001",
- // "top": 99,
- // "left": 451,
- // "width": 62,
- // "height": 23
- // },
- // {
- // "type": "stn",
- // "id": "site-1002",
- // "text": "1002",
- // "top": 160,
- // "left": 451,
- // "width": 62,
- // "height": 23
- // },{
- // "type": "stn",
- // "id": "site-1003",
- // "text": "1003",
- // "top": 231,
- // "left": 451,
- // "width": 62,
- // "height": 23
- // },{
- // "type": "stn",
- // "id": "site-1004",
- // "text": "1004",
- // "top": 304,
- // "left": 451,
- // "width": 62,
- // "height": 23
- // }
- ]
- }]
- }]
-}
\ No newline at end of file
diff --git a/src/main/webapp/static/wcs/js/console3.map.js b/src/main/webapp/static/wcs/js/console3.map.js
deleted file mode 100644
index 348cc4f..0000000
--- a/src/main/webapp/static/wcs/js/console3.map.js
+++ /dev/null
@@ -1,494 +0,0 @@
-mapInfo = {
- "mapName": "wcs",
- "rackCount": 13,
- "crnCount": 4,
- "stbCount": 4,
- "hpPosition": 0,
- "minBayNo": 1,
- "floors": 1,
- "racks": [
- {
- "type": "rack",
- "id": "rack7",
- "top": 326,
- "left": 820,
- "width": 1050,
- "height": 23,
- "minBayNo": 1,
- "maxBayNo": 43,
- "hiddenArr": [1, 43]
- },
- {
- "type": "rack",
- "id": "rack6",
- "top": 303,
- "left": 820,
- "width": 1050,
- "height": 23,
- "minBayNo": 1,
- "maxBayNo": 43,
- "hiddenArr": [1, 43]
- },
- {
- "type": "rack",
- "id": "rack5",
- "top": 209,
- "left": 820,
- "width": 1050,
- "height": 23,
- "minBayNo": 1,
- "maxBayNo": 43,
- "hiddenArr": [1, 43]
- },
- {
- "type": "rack",
- "id": "rack4",
- "top": 232,
- "left": 820,
- "width": 1050,
- "height": 23,
- "minBayNo": 1,
- "maxBayNo": 43,
- "hiddenArr": [1, 43]
- },
- /*{
- "type": "rack",
- "id": "rack3",
- "top": 182,
- "left": 820,
- "width": 1050,
- "height": 23,
- "minBayNo": 1,
- "maxBayNo": 43,
- "hiddenArr": [1,43]
- },*/
- /*{
- "type": "rack",
- "id": "rack2",
- "top": 159,
- "left": 820,
- "width": 1050,
- "height": 23,
- "minBayNo": 1,
- "maxBayNo": 43,
- "hiddenArr": [1,43]
- },*/
- /*{
- "type": "rack",
- "id": "rack1",
- "top": 98,
- "left": 820,
- "width": 1050,
- "height": 23,
- "minBayNo": 1,
- "maxBayNo": 43,
- "hiddenArr": [1,43]
- },*/
- /*{
- "type": "rack",
- "id": "rack0",
- "top": 75,
- "left": 820,
- "width": 1050,
- "height": 23,
- "minBayNo": 1,
- "maxBayNo": 43,
- "hiddenArr": [1,43]
- }*/
- ],
- "crns": [
- {
- "type": "crane",
- "id": "crn-3",
- "text": "3",
- "top": 268,
- "left": 855,
- "width": 93,
- "height": 22
- },
- /*{
- "type": "crane",
- "id": "crn-1",
- "text": "1",
- "top": 132,
- "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": "",
- "top": 143,
- "left": 769,
- "width": 850,
- "height": 2
- }*/
- ],
- "areas": [{
- "type": "Control_floor",
- "id": "tabControl_floor4",
- "text": "妤煎眰",
- "top": 66,
- "left": 580,
- "width": 334,
- "height": 714,
- "floors": [{
- "type": "floor",
- "id": "page_floor1",
- "text": "1F",
- "top": 4,
- "left": 422,
- "width": 308,
- "height": 706,
- "stns": [
- {
- "type": "stn",
- "id": "site-2052",
- "text": "2052",
- "top": 150,
- "left": 1050,
- "width": 62,
- "height": 50
- },
- {
- "type": "stn",
- "id": "site-2051",
- "text": "2051",
- "top": 150,
- "left": 1150,
- "width": 62,
- "height": 50
- },/*{
- "type": "stn",
- "id": "site-102",
- "text": "RGV灏忚溅",
- "top": 99,
- "left": 643,
- "width": 62,
- "height": 23
- },*//*{
- "type": "stn",
- "id": "site-103",
- "text": "1011",
- "top": 99,
- "left": 579,
- "width": 62,
- "height": 23
- },*/
- /*{
- "type": "stn",
- "id": "site-103",
- "text": "1020",
- "top": 70,
- "left": 579,
- "width": 62,
- "height": 23
- },*/
- /*{
- "type": "stn",
- "id": "site-103",
- "text": "",
- "top": 70,
- "left": 515,
- "width": 62,
- "height": 23
- },*/
- /*{
- "type": "stn",
- "id": "site-103",
- "text": "",
- "top": 70,
- "left": 450,
- "width": 62,
- "height": 23
- },*/
- // {
- // "type": "stn",
- // "id": "site-104",
- // "text": "104",
- // "top": 124,
- // "left": 579,
- // "width": 62,
- // "height": 34
- // },
- {
- "type": "stn",
- "id": "site-2053",
- "text": "2053",
- "top": 150,
- "left": 950,
- "width": 62,
- "height": 23
- },
- {
- "type": "stn",
- "id": "site-2054",
- "text": "2054",
- "top": 180,
- "left": 950,
- "width": 62,
- "height": 23
- },
- {
- "type": "stn",
- "id": "site-2055",
- "text": "2055",
- "top": 150,
- "left": 850,
- "width": 62,
- "height": 23
- },
- {
- "type": "stn",
- "id": "site-2056",
- "text": "2056",
- "top": 180,
- "left": 850,
- "width": 62,
- "height": 23
- },/*{
- "type": "stn",
- "id": "site-123",
- "text": "RGV灏忚溅",
- "top": 160,
- "left": 643,
- "width": 62,
- "height": 23
- },*/
- // {
- // "type": "stn",
- // "id": "site-122",
- // "text": "122",
- // "top": 160,
- // "left": 579,
- // "width": 62,
- // "height": 23
- // },
- // {
- // "type": "stn",
- // "id": "site-121",
- // "text": "121",
- // "top": 186,
- // "left": 579,
- // "width": 62,
- // "height": 42
- // },
- {
- "type": "stn",
- "id": "site-2057",
- "text": "2057",
- "top": 231,
- "left": 720,
- "width": 120,
- "height": 23
- },/*{
- "type": "stn",
- "id": "site-118",
- "text": "RGV灏忚溅",
- "top": 231,
- "left": 643,
- "width": 62,
- "height": 23
- },*/
- // {
- // "type": "stn",
- // "id": "site-117",
- // "text": "117",
- // "top": 231,
- // "left": 579,
- // "width": 62,
- // "height": 23
- // },{
- // "type": "stn",
- // "id": "site-116",
- // "text": "116",
- // "top": 256,
- // "left": 579,
- // "width": 62,
- // "height": 46
- // },
- {
- "type": "stn",
- "id": "site-2058",
- "text": "2058",
- "top": 304,
- "left": 720,
- "width": 120,
- "height": 23
- },
- /*{
- "type": "stn",
- "id": "site-114",
- "text": "1016",
- "top": 330,
- "left": 707,
- "width": 62,
- "height": 23
- },*/
- /*{
- "type": "stn",
- "id": "site-114",
- "text": "1018",
- "top": 356,
- "left": 707,
- "width": 62,
- "height": 23
- },*/
- /*{
- "type": "stn",
- "id": "site-114",
- "text": "1019",
- "top": 356,
- "left": 772,
- "width": 62,
- "height": 23
- },*/
- /*{
- "type": "stn",
- "id": "site-114",
- "text": "",
- "top": 356,
- "left": 837,
- "width": 62,
- "height": 23
- },*/
- /*{
- "type": "stn",
- "id": "site-114",
- "text": "",
- "top": 356,
- "left": 902,
- "width": 62,
- "height": 23
- },*/
- /*{
- "type": "stn",
- "id": "site-114",
- "text": "1017",
- "top": 383,
- "left": 707,
- "width": 62,
- "height": 23
- },*//*{
- "type": "stn",
- "id": "site-113",
- "text": "RGV灏忚溅",
- "top": 304,
- "left": 643,
- "width": 62,
- "height": 23
- },*/
- // {
- // "type": "stn",
- // "id": "site-112",
- // "text": "112",
- // "top": 304,
- // "left": 579,
- // "width": 62,
- // "height": 23
- // },
- /*{
- "type": "stn",
- "id": "site-105",
- "text": "1012",
- "top": 99,
- "left": 515,
- "width": 62,
- "height": 23
- },*//*{
- "type": "stn",
- "id": "site-106",
- "text": "1013",
- "top": 124,
- "left": 515,
- "width": 62,
- "height": 34
- },*//*{
- "type": "stn",
- "id": "site-107",
- "text": "1013",
- "top": 160,
- "left": 515,
- "width": 62,
- "height": 23
- },*//*{
- "type": "stn",
- "id": "site-108",
- "text": "1013",
- "top": 186,
- "left": 515,
- "width": 62,
- "height": 42
- },*//*{
- "type": "stn",
- "id": "site-109",
- "text": "1013",
- "top": 231,
- "left": 515,
- "width": 62,
- "height": 70
- },*//*{
- "type": "stn",
- "id": "site-110",
- "text": "1014",
- "top": 304,
- "left": 515,
- "width": 62,
- "height": 23
- },*//*{
- "type": "stn",
- "id": "site-111",
- "text": "1015",
- "top": 329,
- "left": 515,
- "width": 62,
- "height": 23
- },*/
- // {
- // "type": "stn",
- // "id": "site-1001",
- // "text": "1001",
- // "top": 99,
- // "left": 451,
- // "width": 62,
- // "height": 23
- // },
- // {
- // "type": "stn",
- // "id": "site-1002",
- // "text": "1002",
- // "top": 160,
- // "left": 451,
- // "width": 62,
- // "height": 23
- // },{
- // "type": "stn",
- // "id": "site-1003",
- // "text": "1003",
- // "top": 231,
- // "left": 451,
- // "width": 62,
- // "height": 23
- // },{
- // "type": "stn",
- // "id": "site-1004",
- // "text": "1004",
- // "top": 304,
- // "left": 451,
- // "width": 62,
- // "height": 23
- // }
- ]
- }]
- }]
-}
\ No newline at end of file
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/index.html b/src/main/webapp/views/index.html
index 834ff6c..68fa6af 100644
--- a/src/main/webapp/views/index.html
+++ b/src/main/webapp/views/index.html
@@ -2,14 +2,15 @@
<html lang="en">
<head>
<meta charset="utf-8">
- <title>涓壃 - 鑷姩鍖栫珛浣撲粨搴� - AS / RS</title>
+ <title>鑷姩鍖栫珛浣撲粨搴� - wcs</title>
<meta name="renderer" content="webkit">
<meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
<meta name="viewport" content="width=device-width, initial-scale=1.0, minimum-scale=1.0, maximum-scale=1.0, user-scalable=0">
- <link rel="icon" type="image/x-icon" href="../static/image/favicon.ico" />
- <link rel="stylesheet" href="../static/layui/css/layui.css" media="all">
- <link rel="stylesheet" href="../static/css/admin.css?v=318" media="all">
- <link rel="stylesheet" href="../static/css/loader.css" media="all">
+ <link rel="stylesheet" href="../static/wms/layui/css/layui.css" media="all">
+ <link rel="stylesheet" href="../static/wms/css/admin.css?v=318" media="all">
+ <link rel="stylesheet" href="../static/wms/css/loader.css" media="all">
+ <link rel="stylesheet" href="../static/wcs/css/layx.min.css" type="text/css" />
+ <script src="../static/wcs/js/tools/layx.min.js"></script>
<style>
.layui-logo img {
width: 25px;
@@ -19,6 +20,27 @@
font-weight: 400;
/*margin-left: 5px;*/
}
+ /* 寮圭獥鏍峰紡 */
+ .popup {
+ position: fixed;
+ top: 0;
+ left: 0;
+ width: 100%;
+ height: 100%;
+ background-color: rgba(0,0,0,0.5);
+ display: none;
+ justify-content: center;
+ align-items: center;
+ z-index: 9999;
+ }
+
+ .popup-content {
+ background-color: #fff;
+ padding: 20px;
+ border-radius: 5px;
+ box-shadow: 0px 0px 20px rgba(0,0,0,0.3);
+ text-align: center;
+ }
</style>
</head>
<body class="layui-layout-body">
@@ -26,10 +48,10 @@
<!-- 澶撮儴 -->
<div class="layui-header">
<div class="layui-logo">
- <img src="../static/image/zy_logo_dark_color.png" style="display: inline-block; width: 40%;height: auto">
- <!-- <span style="margin-top: 0; letter-spacing: 10px">涓壃绔嬪簱</span>-->
- <!-- <img src="../static/image/logo.svg"/>-->
- <!-- <cite>涓壃 - Zoneyung</cite>-->
+ <img class="loginLogo" src="../static/wms/image/logo.png" style="display: inline-block; width: 60%;height: auto">
+ <!-- <span style="margin-top: 0; letter-spacing: 10px">wcs</span>-->
+ <!-- <img src="../static/wms/image/logo.svg"/>-->
+ <!-- <cite>wcs - 鑷姩鍖栫珛浣撲粨搴�</cite>-->
</div>
<ul class="layui-nav layui-layout-left">
@@ -41,8 +63,11 @@
</li>
</ul>
<ul class="layui-nav layui-layout-right">
+<!-- <li class="layui-nav-item" lay-unselect>-->
+<!-- <a ew-event="note" title="渚跨"><i class="layui-icon layui-icon-note"></i></a>-->
+<!-- </li>-->
<li class="layui-nav-item" lay-unselect id="licenseShow" style="display: none;user-select: none;">
- <div style="color: red;">涓存椂璁稿彲璇佹湁鏁堟湡锛�<span id="licenseDays">29</span>澶�</div>
+ <div style="color: red;">浠撳偍绯荤粺璁稿彲鏈夋晥鏈燂細<span id="licenseDays">29</span>澶�</div>
</li>
<li class="layui-nav-item layui-hide-xs" lay-unselect>
<a ew-event="fullScreen" title="鍏ㄥ睆"><i class="layui-icon layui-icon-screen-full"></i></a>
@@ -75,7 +100,7 @@
<div class="layui-body"></div>
<!-- 搴曢儴 -->
<div class="layui-footer layui-text">
- copyright 漏 2022 <a href="https://www.superton.cn/" target="_blank">娴欐睙涓壃绔嬪簱鏈夐檺鍏徃</a> all rights reserved.
+<!-- <span class="copyright-text">copyright 漏 2023 wcs all rights reserved.</span>-->
<span class="pull-right">Version 1.0.0</span>
</div>
@@ -85,13 +110,65 @@
<div class="layuimini-loader">
<div class="layuimini-loader-inner"></div>
</div>
-
-<script type="text/javascript" src="../static/js/jquery/jquery-3.3.1.min.js"></script>
-<script type="text/javascript" src="../static/layui/layui.js"></script>
-<script type="text/javascript" src="../static/js/handlebars/handlebars-v4.5.3.js"></script>
-<script type="text/javascript" src="../static/js/common.js"></script>
+<!-- 寮圭獥鍐呭 -->
+<div class="popup" id="popup">
+ <div class="popup-content">
+ <h2 style="font-size: 28px;margin-bottom: 10px;">璁稿彲璇佸嵆灏嗚繃鏈�</h2>
+ <div id="popup-text" style="font-size: 28px;color: red"></div>
+ <button style="background-color: #007bff;color: #fff;border: none;padding: 10px 20px;border-radius: 5px;cursor: pointer;font-size: 16px;" onclick="hidePopup()">鍏抽棴</button>
+ </div>
+</div>
<script>
- console.log('%c 涓壃绔嬪簱骞冲彴 %c 1.0.0','background-color:rgb(53,73,94);color: #fff;border-radius:2px 0 0 2px;padding:2px 4px;','background-color:rgb(25,190,107);color: #fff;border-radius:0 2px 2px 0;padding:2px 4px;font: 9pt "Apercu Regular", Georgia, "Times New Roman", Times, serif;');
+ // 鏄剧ず寮圭獥
+ function showPopup(res) {
+ document.getElementById('popup').style.display = 'block';
+ // 鑾峰彇寮瑰嚭绐楀彛鍐呭鐨勫鍣ㄥ厓绱�
+ var popupText = document.getElementById('popup-text');
+ // 鍋囪鍚庡彴杩斿洖鐨勫瓧绗︿覆涓� responseString
+ if (res!==""){
+ // 鑾峰彇褰撳墠鏃ユ湡
+ const currentDate = new Date();
+ // 鍒涘缓鏂版棩鏈熷璞″苟娣诲姞澶╂暟
+ const newDate = new Date();
+ newDate.setDate(currentDate.getDate() + res + 1);
+ // 灏嗗瓧绗︿覆璁剧疆涓哄脊绐楀唴瀹圭殑鏂囨湰
+ popupText.textContent = "璁稿彲璇佸皢浜�" + new Intl.DateTimeFormat('zh-CN').format(newDate) + "杩囨湡锛屽墿浣欐湁鏁堟湡:" + res + "澶╋紒";
+ }else {
+ document.getElementById('popup').style.display = 'none';
+ }
+ }
+
+ // 闅愯棌寮圭獥
+ function hidePopup() {
+ document.getElementById('popup').style.display = 'none';
+ }
+</script>
+<script type="text/javascript" src="../static/wms/js/jquery/jquery-3.3.1.min.js"></script>
+<script type="text/javascript" src="../static/wms/layui/layui.js"></script>
+<script type="text/javascript" src="../static/wms/js/handlebars/handlebars-v4.5.3.js"></script>
+<script type="text/javascript" src="../static/wms/js/common.js"></script>
+<script>
+ f()
+ function f() {
+ $.ajax({
+ url: baseUrl + "/license/getLicenseDays",
+ headers: {'token': localStorage.getItem('token')},
+ method: 'POST',
+ success: function (res) {
+ if (res.code == 200) {
+ let days = res.data
+ if (days <= 15) {
+ showPopup(res.data)
+ } else {
+ showPopup("");
+ }
+ }
+ }
+ });
+ }
+</script>
+<script>
+ console.log('%c wcs %c 1.0.0','background-color:rgb(53,73,94);color: #fff;border-radius:2px 0 0 2px;padding:2px 4px;','background-color:rgb(25,190,107);color: #fff;border-radius:0 2px 2px 0;padding:2px 4px;font: 9pt "Apercu Regular", Georgia, "Times New Roman", Times, serif;');
$(function () {
if ("" === localStorage.getItem('token')) {
top.location.href = baseUrl + "/login";
@@ -99,7 +176,7 @@
});
layui.config({
- base: baseUrl + "/static/layui/lay/modules/"
+ base: baseUrl + "/static/wms/layui/lay/modules/"
}).extend({
notice: 'notice/notice',
}).use(['index', 'element', 'layer', 'admin', 'notice'], function () {
@@ -132,11 +209,29 @@
var html = template(res);
$("#menu-main").html(html);
element.init();
+
+ $("#a-30519").attr({"href":$("#a-30519").attr("lay-href"),"target":"_blank"})
+ $("#a-30519").attr({"lay-href":""})
+ $("#a-30520").attr({"href":$("#a-30520").attr("lay-href"),"target":"_blank"})
+ $("#a-30520").attr({"lay-href":""})
+ $("#a-30522").attr({"href":$("#a-30522").attr("lay-href"),"target":"_blank"})
+ $("#a-30522").attr({"lay-href":""})
} else if (res.code === 403) {
top.location.href = baseUrl + "/login";
} else {
layer.msg(res.msg, {icon: 2});
}
+ }
+ });
+
+ $.ajax({
+ url: baseUrl+"/loginInformation",
+ data: {},
+ method: 'GET',
+ success: function (res) {
+ var data = res.data
+ $(".copyright-text").text(data.loginCopyrightText);
+ $(".loginLogo").attr("src", data.loginLogo);
}
});
@@ -148,9 +243,22 @@
if (res.code == 200) {
let days = res.data
if (days <= 30) {
+ // 寮瑰嚭涓�涓畝鍗曠殑鎻愮ず妗�
+ layer.alert(`
+ <div style="font-size: 100px; text-align: center; line-height: 1.8; color: red">
+ 璁稿彲璇佹湁鏁堟湡涓猴細${days}
+ </div>
+`, {
+ area: ['1000px', '800px'],
+ btn: '纭畾',
+ btnAlign: 'c', // 鎸夐挳灞呬腑锛堥粯璁ゆ槸鍙冲榻愶級
+ yes: function(index) {
+ layer.msg('璇疯仈绯荤珛搴撳叕鍙稿晢鍔＄画绾�');
+ layer.close(index);
+ }
+ });
$("#licenseShow").show()
$("#licenseDays").html(days)
- alert("涓存椂璁稿彲鏈夋晥鏈燂細" + days + "澶�")
}
}else {
top.location.href = baseUrl + "/login";
@@ -160,7 +268,7 @@
// 榛樿鍔犺浇涓婚〉
index.loadHome({
- menuPath: baseUrl+'/views/home/navigation.html',
+ menuPath: baseUrl+'/views/home/console.html',
menuName: '<i class="layui-icon layui-icon-home"></i>'
});
@@ -186,7 +294,7 @@
<a><i class="layui-icon {{this.menuIcon}}"></i> <cite>{{this.menu}}</cite></a>
<dl class="layui-nav-child">
{{#each this.subMenu}}
- <dd><a lay-href="{{this.code}}?resourceId={{this.id}}">{{this.name}}</a></dd>
+ <dd><a lay-href="{{this.code}}?resourceId={{this.id}}" id="a-{{this.id}}">{{this.name}}</a></dd>
{{/each}}
</dl>
</li>
diff --git a/src/main/webapp/views/old_page/console-old.html b/src/main/webapp/views/old_page/console-old.html
index a9ba04d..afbd567 100644
--- a/src/main/webapp/views/old_page/console-old.html
+++ b/src/main/webapp/views/old_page/console-old.html
@@ -32,21 +32,21 @@
<div class="lane">
<!-- 璐ф灦 -->
<div class="stock-group">
- <button class="item" style="margin-left: 82px">60</button>
- <button class="item">58</button>
- <button class="item">56</button>
- <button class="item">54</button>
- <button class="item">52</button>
- <button class="item">50</button>
- <button class="item">48</button>
- <button class="item">46</button>
- <button class="item">44</button>
- <button class="item">42</button>
- <button class="item">40</button>
- <button class="item">38</button>
- <button class="item">36</button>
- <button class="item">34</button>
- <button class="item">32</button>
+<!-- <button class="item" style="margin-left: 82px">60</button>-->
+<!-- <button class="item">58</button>-->
+<!-- <button class="item">56</button>-->
+<!-- <button class="item">54</button>-->
+<!-- <button class="item">52</button>-->
+<!-- <button class="item">50</button>-->
+<!-- <button class="item">48</button>-->
+<!-- <button class="item">46</button>-->
+<!-- <button class="item">44</button>-->
+<!-- <button class="item">42</button>-->
+<!-- <button class="item">40</button>-->
+<!-- <button class="item">38</button>-->
+<!-- <button class="item">36</button>-->
+<!-- <button class="item">34</button>-->
+<!-- <button class="item">32</button>-->
<button class="item">30</button>
<button class="item">28</button>
<button class="item">26</button>
@@ -67,21 +67,21 @@
</div>
<div class="stock-group">
- <button class="item" style="margin-left: 82px">60</button>
- <button class="item">58</button>
- <button class="item">56</button>
- <button class="item">54</button>
- <button class="item">52</button>
- <button class="item">50</button>
- <button class="item">48</button>
- <button class="item">46</button>
- <button class="item">44</button>
- <button class="item">42</button>
- <button class="item">40</button>
- <button class="item">38</button>
- <button class="item">36</button>
- <button class="item">34</button>
- <button class="item">32</button>
+<!-- <button class="item" style="margin-left: 82px">60</button>-->
+<!-- <button class="item">58</button>-->
+<!-- <button class="item">56</button>-->
+<!-- <button class="item">54</button>-->
+<!-- <button class="item">52</button>-->
+<!-- <button class="item">50</button>-->
+<!-- <button class="item">48</button>-->
+<!-- <button class="item">46</button>-->
+<!-- <button class="item">44</button>-->
+<!-- <button class="item">42</button>-->
+<!-- <button class="item">40</button>-->
+<!-- <button class="item">38</button>-->
+<!-- <button class="item">36</button>-->
+<!-- <button class="item">34</button>-->
+<!-- <button class="item">32</button>-->
<button class="item">30</button>
<button class="item">28</button>
<button class="item">26</button>
@@ -107,21 +107,21 @@
<!-- 璐ф灦 -->
<div class="stock-group">
- <button class="item" style="margin-left: 82px">60</button>
- <button class="item">58</button>
- <button class="item">56</button>
- <button class="item">54</button>
- <button class="item">52</button>
- <button class="item">50</button>
- <button class="item">48</button>
- <button class="item">46</button>
- <button class="item">44</button>
- <button class="item">42</button>
- <button class="item">40</button>
- <button class="item">38</button>
- <button class="item">36</button>
- <button class="item">34</button>
- <button class="item">32</button>
+<!-- <button class="item" style="margin-left: 82px">60</button>-->
+<!-- <button class="item">58</button>-->
+<!-- <button class="item">56</button>-->
+<!-- <button class="item">54</button>-->
+<!-- <button class="item">52</button>-->
+<!-- <button class="item">50</button>-->
+<!-- <button class="item">48</button>-->
+<!-- <button class="item">46</button>-->
+<!-- <button class="item">44</button>-->
+<!-- <button class="item">42</button>-->
+<!-- <button class="item">40</button>-->
+<!-- <button class="item">38</button>-->
+<!-- <button class="item">36</button>-->
+<!-- <button class="item">34</button>-->
+<!-- <button class="item">32</button>-->
<button class="item">30</button>
<button class="item">28</button>
<button class="item">26</button>
@@ -140,21 +140,21 @@
<div id="site-106" class="site" style="">106</div>
</div>
<div class="stock-group">
- <button class="item" style="margin-left: 82px">60</button>
- <button class="item">58</button>
- <button class="item">56</button>
- <button class="item">54</button>
- <button class="item">52</button>
- <button class="item">50</button>
- <button class="item">48</button>
- <button class="item">46</button>
- <button class="item">44</button>
- <button class="item">42</button>
- <button class="item">40</button>
- <button class="item">38</button>
- <button class="item">36</button>
- <button class="item">34</button>
- <button class="item">32</button>
+<!-- <button class="item" style="margin-left: 82px">60</button>-->
+<!-- <button class="item">58</button>-->
+<!-- <button class="item">56</button>-->
+<!-- <button class="item">54</button>-->
+<!-- <button class="item">52</button>-->
+<!-- <button class="item">50</button>-->
+<!-- <button class="item">48</button>-->
+<!-- <button class="item">46</button>-->
+<!-- <button class="item">44</button>-->
+<!-- <button class="item">42</button>-->
+<!-- <button class="item">40</button>-->
+<!-- <button class="item">38</button>-->
+<!-- <button class="item">36</button>-->
+<!-- <button class="item">34</button>-->
+<!-- <button class="item">32</button>-->
<button class="item">30</button>
<button class="item">28</button>
<button class="item">26</button>
@@ -177,17 +177,17 @@
<span class="row-no"></span>
<!-- 璐ф灦 -->
<div class="stock-group">
- <button class="item" style="margin-left: 193px">52</button>
- <button class="item">50</button>
- <button class="item">48</button>
- <button class="item">46</button>
- <button class="item">44</button>
- <button class="item">42</button>
- <button class="item">40</button>
- <button class="item">38</button>
- <button class="item">36</button>
- <button class="item">34</button>
- <button class="item">32</button>
+<!-- <button class="item" style="margin-left: 193px">52</button>-->
+<!-- <button class="item">50</button>-->
+<!-- <button class="item">48</button>-->
+<!-- <button class="item">46</button>-->
+<!-- <button class="item">44</button>-->
+<!-- <button class="item">42</button>-->
+<!-- <button class="item">40</button>-->
+<!-- <button class="item">38</button>-->
+<!-- <button class="item">36</button>-->
+<!-- <button class="item">34</button>-->
+<!-- <button class="item">32</button>-->
<button class="item">30</button>
<button class="item">28</button>
<button class="item">26</button>
@@ -206,17 +206,17 @@
</div>
<div class="stock-group">
- <button class="item" style="margin-left: 193px">52</button>
- <button class="item">50</button>
- <button class="item">48</button>
- <button class="item">46</button>
- <button class="item">44</button>
- <button class="item">42</button>
- <button class="item">40</button>
- <button class="item">38</button>
- <button class="item">36</button>
- <button class="item">34</button>
- <button class="item">32</button>
+<!-- <button class="item" style="margin-left: 193px">52</button>-->
+<!-- <button class="item">50</button>-->
+<!-- <button class="item">48</button>-->
+<!-- <button class="item">46</button>-->
+<!-- <button class="item">44</button>-->
+<!-- <button class="item">42</button>-->
+<!-- <button class="item">40</button>-->
+<!-- <button class="item">38</button>-->
+<!-- <button class="item">36</button>-->
+<!-- <button class="item">34</button>-->
+<!-- <button class="item">32</button>-->
<button class="item">30</button>
<button class="item">28</button>
<button class="item">26</button>
@@ -241,17 +241,17 @@
</div>
<!-- 璐ф灦 -->
<div class="stock-group">
- <button class="item" style="margin-left: 193px">52</button>
- <button class="item">50</button>
- <button class="item">48</button>
- <button class="item">46</button>
- <button class="item">44</button>
- <button class="item">42</button>
- <button class="item">40</button>
- <button class="item">38</button>
- <button class="item">36</button>
- <button class="item">34</button>
- <button class="item">32</button>
+<!-- <button class="item" style="margin-left: 193px">52</button>-->
+<!-- <button class="item">50</button>-->
+<!-- <button class="item">48</button>-->
+<!-- <button class="item">46</button>-->
+<!-- <button class="item">44</button>-->
+<!-- <button class="item">42</button>-->
+<!-- <button class="item">40</button>-->
+<!-- <button class="item">38</button>-->
+<!-- <button class="item">36</button>-->
+<!-- <button class="item">34</button>-->
+<!-- <button class="item">32</button>-->
<button class="item">30</button>
<button class="item">28</button>
<button class="item">26</button>
@@ -272,17 +272,17 @@
</div>
<div class="stock-group">
- <button class="item" style="margin-left: 193px">52</button>
- <button class="item">50</button>
- <button class="item">48</button>
- <button class="item">46</button>
- <button class="item">44</button>
- <button class="item">42</button>
- <button class="item">40</button>
- <button class="item">38</button>
- <button class="item">36</button>
- <button class="item">34</button>
- <button class="item">32</button>
+<!-- <button class="item" style="margin-left: 193px">52</button>-->
+<!-- <button class="item">50</button>-->
+<!-- <button class="item">48</button>-->
+<!-- <button class="item">46</button>-->
+<!-- <button class="item">44</button>-->
+<!-- <button class="item">42</button>-->
+<!-- <button class="item">40</button>-->
+<!-- <button class="item">38</button>-->
+<!-- <button class="item">36</button>-->
+<!-- <button class="item">34</button>-->
+<!-- <button class="item">32</button>-->
<button class="item">30</button>
<button class="item">28</button>
<button class="item">26</button>
@@ -305,17 +305,17 @@
<span class="row-no"></span>
<!-- 璐ф灦 -->
<div class="stock-group">
- <button class="item" style="margin-left: 193px">52</button>
- <button class="item">50</button>
- <button class="item">48</button>
- <button class="item">46</button>
- <button class="item">44</button>
- <button class="item">42</button>
- <button class="item">40</button>
- <button class="item">38</button>
- <button class="item">36</button>
- <button class="item">34</button>
- <button class="item">32</button>
+<!-- <button class="item" style="margin-left: 193px">52</button>-->
+<!-- <button class="item">50</button>-->
+<!-- <button class="item">48</button>-->
+<!-- <button class="item">46</button>-->
+<!-- <button class="item">44</button>-->
+<!-- <button class="item">42</button>-->
+<!-- <button class="item">40</button>-->
+<!-- <button class="item">38</button>-->
+<!-- <button class="item">36</button>-->
+<!-- <button class="item">34</button>-->
+<!-- <button class="item">32</button>-->
<button class="item">30</button>
<button class="item">28</button>
<button class="item">26</button>
diff --git a/src/main/webapp/views/realtimeWatch/console.html b/src/main/webapp/views/realtimeWatch/console.html
index 7515115..4064a06 100644
--- a/src/main/webapp/views/realtimeWatch/console.html
+++ b/src/main/webapp/views/realtimeWatch/console.html
@@ -31,12 +31,6 @@
<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>
<!-- 璐ф灦 + 鍫嗗灈鏈� + 鍏ュ簱绔欑偣 -->
<div class="main-part">
@@ -66,11 +60,11 @@
<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 class="state">-->
+<!-- <span>鍫嗗灈鏈� 2</span>-->
+<!-- <span class="state-ss machine-auto-flag ">鑷姩</span>-->
- </div>
+<!-- </div>-->
<div class="button"><span>鎵�鏈夌姸鎬�</span></div>
<div class="button item-group">
<span class="machine-put-flag">鍏ュ簱</span>
diff --git a/src/main/webapp/views/realtimeWatch/console1.html b/src/main/webapp/views/realtimeWatch/console1.html
deleted file mode 100644
index fa6c32a..0000000
--- a/src/main/webapp/views/realtimeWatch/console1.html
+++ /dev/null
@@ -1,853 +0,0 @@
-<!DOCTYPE html>
-<html lang="en">
-<head>
- <meta charset="UTF-8">
- <title>鑷姩浠撳簱wcs绯荤粺</title>
- <link rel="stylesheet" href="../../static/wcs/css/render.css">
- <link rel="stylesheet" href="../../static/wms/layui/css/layui.css" media="all">
- <link rel="stylesheet" href="../../static/wms/css/cool.css" media="all">
- <link rel="stylesheet" href="../../static/wms/css/common.css" media="all">
- <script type="text/javascript" src="../../static/wms/js/jquery/jquery-3.3.1.min.js"></script>
- <script type="text/javascript" src="../../static/wms/layui/layui.js" charset="utf-8"></script>
- <script type="text/javascript" src="../../static/wms/js/common.js" charset="utf-8"></script>
- <script type="text/javascript" src="../../static/wms/js/cool.js" charset="utf-8"></script>
- <!--鍦板浘json-->
- <script src="../../static/wcs/js/console1.map.js"></script>
- <script src="../../static/wcs/js/console.js"></script>
- <script src="../../static/wcs/js/common.js"></script>
-</head>
-<script type="text/html" id="errorTpl">
- {{# if( d.error === false ){ }}
- <span name="level" class="layui-badge layui-badge-green">姝ｅ父</span>
- {{# } else { }}
- <span name="level" class="layui-badge layui-badge-red">寮傚父</span>
- {{# } }}
-</script>
-<body>
- <div id="main">
- <div class="head">
- <div class="head-left">
- <h1>鑷姩浠撳簱WCS鐩戞帶鍥�</h1>
- <h6>AUTOMATIC WAREHOUSE WCS MONITORING DIAGRAM</h6>
- </div>
- </div>
- <select onchange="window.open(this.value)">
- <option value = "console1.html">--鎴愬搧涓�妤�--</option>
- <option value="" >-鍗婃垚鍝佷簩妤�-</option>
- <option value="">-鎴愬搧浜屾ゼ-</option>
- <option value="console.html"selected ="selected">-鍗婃垚鍝佷竴妤�-</option>
- </select>
- <!-- 璐ф灦 + 鍫嗗灈鏈� + 鍏ュ簱绔欑偣 -->
- <div class="main-part">
-
- </div>
-
-<!-- <!–璁惧鍒楄〃–>-->
-<!-- <div class="device-info">-->
-<!-- <table class="layui-hide" id="deviceInfo" lay-filter="deviceInfo"></table>-->
-<!-- </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 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="" id="crnNo">
- </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>
- <!-- 鎿嶄綔鎸夐挳 -->
- <div class="form-item" style="display: flex;">
- <div class="form-item-input">
- <div>鍏ュ簱锛氬紑<input type="radio" name="pakIn" id="pakInY" value="1"> 鍏�<input type="radio" name="pakIn" id="pakInN" value="0"/></div>
- <div>鍑哄簱锛氬紑<input type="radio" name="pakOut" id="pakOutY" value="1"> 鍏�<input type="radio" name="pakOut" id="pakOutN" value="0"/></div>
- </div>
- <div><a id="crnCommand" class="layui-btn">涓嬪彂鍛戒护</a></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="" id="devpSiteId">
- </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="" id="devpWorkNo">
- </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="" id="devpStaNo">
- </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">
- <a id="devpCommand" class="layui-btn">涓嬪彂鍛戒护</a>
- </div>
- </form>
- </div>
- </div>
-
-</body>
-
-</html>
-<script>
- getMap();
-</script>
-<script>
- setInterval(function () {
- getCodeData();
- renderBarCode();
- }, 1000)
- var tData = [],tData1 = [],tData2 = [],tData3 = [];
- function getCodeData() {
- $.ajax({
- 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) {
- tData1 = tData
- } else if (tData.length <= 10) {
- tData1 = tData.slice(0, 5)
- tData.splice(0, 5)
- tData2 = tData
- } else if (tData.length <= 15) {
- tData1 = tData.slice(0, 5)
- tData2 = tData.slice(6, 10)
- tData.splice(0, 10)
- tData3 = tData
- } else {
- tData = tData.slice(-15)
- tData1 = tData.slice(-15)
- tData2 = tData.slice(-10)
- tData3 = tData.slice(-5)
- }
- }
- }
- })
- }
- function renderBarCode() {
- for (var i = 0; i < tData1.length; i++) {
- var str1 = '<li><span>' + tData1[i].id +'-'+ tData1[i].scale +'kg'+ '</span><span class="right">' + tData1[i].time + '</span></li>'
- $('#scale1').append(str1)
- }
- for (var j = 0; j < tData2.length; j++) {
- var str2 = '<li><span>' + tData2[j].id +'-'+ tData1[i].scale +'kg'+ '</span><span class="right">' + tData2[j].time + '</span></li>'
- $('#scale2').append(str2)
- }
- for (var k = 0; k < tData3.length; k++) {
- var str3 = '<li><span>' + tData3[k].id +'-'+ tData1[i].scale +'kg'+ '</span><span class="right">' + tData3[k].time + '</span></li>'
- $('#scale3').append(str3)
- }
- }
-</script>
-<script type="text/javascript">
- // 寮圭獥绔欑偣淇℃伅
- $("body").on('click', '.site', function (e) {
- console.log(e)
- var id = this.id.split("-")[1];
- $("#siteWindow").attr("style", "display:block;");//鏄剧ずdiv
- $("#crnWindow").attr("style", "display:none;");
- $(".detailed").empty();
- $('.detailed').append(id + '绔欑偣璇︾粏淇℃伅');
- $.ajax({
- url: baseUrl + "/console/site/detail",
- headers: {
- 'token': localStorage.getItem('token')
- },
- data: {
- siteId: id
- },
- method: 'post',
- success: function (res) {
- for (var val in res.data) {
- var find = $("#siteWindow").find(":input[name='" + val + "']");
- if (find[0].type === 'text') {
- find.val(res.data[val]);
- } else if (find[0].type === 'checkbox') {
- find.attr("checked", res.data[val] === 'Y');
- }
- }
- }
-
- })
-
- });
- // 鍫嗗灈鏈轰俊鎭�
- $("body").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 + '鍙峰爢鍨涙満');
- $.ajax({
- url: baseUrl + "/console/crn/detail",
- headers: {
- 'token': localStorage.getItem('token')
- },
- data: {
- crnNo: id
- },
- method: 'post',
- success: function (res) {
- console.log(res)
- for (var val in res.data) {
- if (val === "inEnable") {
- if (res.data[val] === 'Y') {
- $("#pakInY").prop("checked", true);
- }else{
- $("#pakInN").prop("checked", true);
- }
- }else if (val === "outEnable") {
- if (res.data[val] === 'Y') {
- $("#pakOutY").prop("checked", true);
- }else{
- $("#pakOutN").prop("checked", true);
- }
- }else {
- var find = $("#crnWindow").find(":input[name='" + val + "']");
- if (find[0].type === 'text') {
- find.val(res.data[val]);
- } else if (find[0].type === 'checkbox') {
- find.attr("checked", res.data[val] === 'Y');
- }
- }
- }
- }
-
- })
-
- });
- // 寮圭獥鍏抽棴
- $('button').on('click', function () {
- $('#siteWindow').attr('style', 'display:none')
- $('#crnWindow').attr('style', 'display:none')
- })
-
-
- var crn1Position = 0;
- var crn2Position = 0;
- var crn3Position = 0;
- var crn4Position = 0;
- var crn5Position = 0;
-
- // 鍒濆鍖�
- getSitesInfo();
- getCrnInfo();
- getSystemRunningStatus();
- getBarcodeInfo();
- getScaleInfo();
- // 瀹炴椂璁块棶
- setInterval(function () {
- getCrnInfo();
- getSystemRunningStatus();
- getBarcodeInfo();
- getScaleInfo();
- }, 1000);
- setInterval(function () {
- getSitesInfo();
- }, 3000);
-
- // 绯荤粺杩愯寮�鍏�
- function systemSwitch() {
- if (parent.systemRunning) {
- layer.prompt({title: '璇疯緭鍏ュ彛浠わ紝骞跺仠姝� WCS 绯荤粺', formType: 1, shadeClose: true}, function (pass, idx) {
- layer.close(idx);
- doSwitch(0, pass); // 鍋滄wcs绯荤粺
- });
- } else {
- doSwitch(1); // 鍚姩wcs绯荤粺
- }
- }
-
- // 璇锋眰鏈嶅姟鍣ㄦ帶鍒秝cs绯荤粺杩愯鐘舵��
- function doSwitch(operatorType, password) {
- // 鍔犺浇tips
- var index = layer.load(1, {
- shade: [0.1, '#fff']
- });
- $.ajax({
- url: baseUrl + "/console/system/switch",
- headers: {'token': localStorage.getItem('token')},
- // async: false,
- data: {
- operatorType: operatorType,
- password: password
- },
- method: 'POST',
- success: function (res) {
- layer.close(index);
- if (res.code === 200) {
- if (res.data.status) {
- $('#system-icon').attr("class", "system-icon-open");
- $('#system-run-desc').html("绯荤粺杩愯涓�...");
- parent.systemRunning = true;
- } else {
- $('#system-icon').attr("class", "system-icon-close");
- $('#system-run-desc').html("绯荤粺宸插仠姝�!");
- parent.systemRunning = false;
- }
- } else if (res.code === 403) {
- parent.location.href = baseUrl + "/login";
- } else {
- console.log(res.msg);
-
- }
- }
- });
-
- }
-
- // 鑾峰彇wcs绯荤粺杩愯鐘舵��
- function getSystemRunningStatus() {
- $.ajax({
- url: baseUrl + "/console/system/running/status",
- headers: {'token': localStorage.getItem('token')},
- method: 'POST',
- success: function (res) {
- if (res.code === 200) {
- if (res.data.status) {
- $('#system-icon').attr("class", "system-icon-open");
- $('#system-run-desc').html("绯荤粺杩愯涓�...");
- parent.systemRunning = true;
- } else {
- $('#system-icon').attr("class", "system-icon-close");
- $('#system-run-desc').html("绯荤粺宸插仠姝�!");
- parent.systemRunning = false;
- }
- } else if (res.code === 403) {
- parent.location.href = baseUrl + "/login";
- } else {
- console.log(res.msg);
- }
- }
- });
- }
-
- // 杈撻�佽澶囧疄鏃舵暟鎹幏鍙�
- function getSitesInfo() {
- // carAnimate(112,4);
- $.ajax({
- url: baseUrl + "/console/latest/data/site",
- headers: {'token': localStorage.getItem('token')},
- method: 'POST',
- success: function (res) {
- if (res.code === 200) {
- var sites = res.data;
- for (var i = 0; i < sites.length; i++) {
- var siteEl = $("#site-" + sites[i].siteId);
- siteEl.attr("class", "site " + sites[i].siteStatus);
- if (sites[i].workNo != null && sites[i].workNo > 0) {
- siteEl.html(sites[i].siteId + "[" + sites[i].workNo + "]");
- } else {
- siteEl.html(sites[i].siteId);
- }
- // RGV浣嶇疆
- if(sites[i].siteId === '112' || sites[i].siteId === '212'){
- carAnimate(Number(sites[i].siteId), Number(sites[i].nearbySta));
- }
- }
- } else if (res.code === 403) {
- parent.location.href = baseUrl + "/login";
- } else {
- console.log(res.msg);
- }
- }
- });
- }
-
- // 鍫嗗灈鏈哄疄鏃舵暟鎹幏鍙�
- function getCrnInfo() {
- $.ajax({
- url: baseUrl + "/console/latest/data/crn",
- headers: {'token': localStorage.getItem('token')},
- method: 'POST',
- success: function (res) {
- // console.log(res)
- if (res.code === 200) {
- var crns = res.data;
- for (var i = 0; i < crns.length; i++) {
- var crnEl = $("#crn-" + crns[i].crnId);
- crnEl.attr("class", "machine " + crns[i].crnStatus);
- var unit = 20.6;//($('.item').eq(0).width() + 13) / 2;
- if (crns[i].bay < 0) {
- crns[i].bay = 1;
- }
- // crnEl.animate({left: (crns[i].bay * unit) + 'px'}, 1000);
- // crns[i].bay = 1;
-
- var offSet = 800;
- // crns[i].bay = 41;
- if(crns[i].bay === 1){
- crnEl.animate({left: offSet + 'px'}, 1000);
- } else {
- crnEl.animate({left: (offSet - unit + (crns[i].bay * unit)) + 'px'}, 1000);
- }
-
- }
- } else if (res.code === 403) {
- parent.location.href = baseUrl + "/login";
- } else {
- console.log(res.msg);
- }
- }
- });
- }
-
- // 鎵爜鍣ㄥ疄鏃舵暟鎹幏鍙�
- function getBarcodeInfo() {
- $.ajax({
- url: baseUrl + "/console/latest/data/barcode",
- headers: {'token': localStorage.getItem('token')},
- method: 'POST',
- success: function (res) {
- if (res.code === 200) {
- var barcodes = res.data;
- for (var i = 0; i < barcodes.length; i++) {
- $("#code-decoder-data-" + barcodes[i].barcodeId).html(barcodes[i].codeValue);
- }
- } else if (res.code === 403) {
- parent.location.href = baseUrl + "/login";
- } else {
- console.log(res.msg);
- }
- }
- });
- }
-
- // 纾呯Г瀹炴椂鏁版嵁鑾峰彇
- function getScaleInfo() {
- $.ajax({
- url: baseUrl + "/console/latest/data/scale",
- headers: {'token': localStorage.getItem('token')},
- method: 'POST',
- success: function (res) {
-
- if (res.code === 200) {
- var sclaes = res.data;
- for (var i = 0; i < sclaes.length; i++) {
- console.log(sclaes[i].scaleId + ":" + sclaes[i].value)
- $("#scale-data-" + sclaes[i].scaleId).text(sclaes[i].value);
- }
- } else if (res.code === 403) {
- parent.location.href = baseUrl + "/login";
- } else {
- console.log(res.msg);
- }
- }
- });
- }
-
- // 鍫嗗灈鏈哄亸绉诲姩鐢�
- function crnAnimate(id, leftVal) {
- // console.log(crn1Position)
- switch (id) {
- case 1:
- $("#crn-1").animate({left: leftVal + 'px'}, 1000);
- crn1Position = leftVal;
- break;
- case 2:
- $("#crn-2").animate({left: leftVal + 'px'}, 1000);
- crn2Position = leftVal;
- break;
- case 3:
- $("#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;
- default:
- break
- }
- }
-
- // 灏忚溅鍋忕Щ鍔ㄧ敾
- function carAnimate(id, target) {
- var targetTop = 0;
- if (id === 112) {
- switch (target) {
- case 1:
- targetTop += 313;
- break;
- case 2:
- targetTop += 313;
- break;
- case 3:
- targetTop += 256;
- break;
- case 4:
- targetTop += 226;
- break;
- case 5:
- targetTop += 168;
- case 6:
- targetTop += 168;
- break;
- default:
- return;
- }
- } else if (id === 212) {
- switch (target) {
- case 1:
- targetTop += 313;
- break;
- case 2:
- targetTop += 313;
- break;
- case 3:
- targetTop += 256;
- break;
- case 4:
- targetTop += 226;
- break;
- case 5:
- targetTop += 168;
- case 6:
- targetTop += 168;
- break;
- default:
- return;
- }
- } else {
- return;
- }
- $("#site-" + id).animate({top: targetTop + 'px'}, 1000);
- }
-
- //涓嬪彂杈撻�佺嚎鍛戒护
- $("#devpCommand").on("click", () => {
- let siteId = $("#devpSiteId").val()//璁惧id
- let wrkNo = $("#devpWorkNo").val()//宸ヤ綔鍙�
- let staNo = $("#devpStaNo").val()//鐩爣绔�
-
- $.ajax({
- url: baseUrl+"/site/detl/update",
- headers: {'token': localStorage.getItem('token')},
- data: {
- devNo: siteId,
- workNo: wrkNo,
- staNo: staNo,
- },
- method: 'POST',
- success: function (res) {
- if (res.code === 200){
- layer.msg("涓嬪彂鎴愬姛",{icon: 1,});
- } else if (res.code === 403){
- top.location.href = baseUrl+"/";
- }else {
- layer.msg(res.msg, {icon: 2});
- }
- }
- })
- });
-
- //涓嬪彂鍫嗗灈鏈哄懡浠�
- $("#crnCommand").on("click", () => {
- let crnNo = $("#crnNo").val()//璁惧id
- var pakIn = $('input[name="pakIn"]:checked').val();
- var pakOut = $('input[name="pakOut"]:checked').val();
-
- console.log(pakIn,pakOut)
-
- $.ajax({
- url: baseUrl + "/basCrnp/update/auth",
- headers: {
- 'token': localStorage.getItem('token')
- },
- data: {
- crnNo: crnNo,
- inEnable: pakIn == 1 ? "Y" : "N",
- outEnable: pakOut == 1 ? "Y" : "N"
- },
- method: 'POST',
- success: function (res) {
- if (res.code === 200){
- layer.msg("涓嬪彂鎴愬姛",{icon: 1,});
- } else if (res.code === 403){
- top.location.href = baseUrl+"/";
- }else {
- layer.msg(res.msg, {icon: 2});
- }
- }
- });
- });
-
-</script>
\ No newline at end of file
diff --git a/src/main/webapp/views/realtimeWatch/console2.html b/src/main/webapp/views/realtimeWatch/console2.html
deleted file mode 100644
index 02bffdf..0000000
--- a/src/main/webapp/views/realtimeWatch/console2.html
+++ /dev/null
@@ -1,853 +0,0 @@
-<!DOCTYPE html>
-<html lang="en">
-<head>
- <meta charset="UTF-8">
- <title>鑷姩浠撳簱wcs绯荤粺</title>
- <link rel="stylesheet" href="../../static/wcs/css/render.css">
- <link rel="stylesheet" href="../../static/wms/layui/css/layui.css" media="all">
- <link rel="stylesheet" href="../../static/wms/css/cool.css" media="all">
- <link rel="stylesheet" href="../../static/wms/css/common.css" media="all">
- <script type="text/javascript" src="../../static/wms/js/jquery/jquery-3.3.1.min.js"></script>
- <script type="text/javascript" src="../../static/wms/layui/layui.js" charset="utf-8"></script>
- <script type="text/javascript" src="../../static/wms/js/common.js" charset="utf-8"></script>
- <script type="text/javascript" src="../../static/wms/js/cool.js" charset="utf-8"></script>
- <!--鍦板浘json-->
- <script src="../../static/wcs/js/console2.map.js"></script>
- <script src="../../static/wcs/js/console.js"></script>
- <script src="../../static/wcs/js/common.js"></script>
-</head>
-<script type="text/html" id="errorTpl">
- {{# if( d.error === false ){ }}
- <span name="level" class="layui-badge layui-badge-green">姝ｅ父</span>
- {{# } else { }}
- <span name="level" class="layui-badge layui-badge-red">寮傚父</span>
- {{# } }}
-</script>
-<body>
- <div id="main">
- <div class="head">
- <div class="head-left">
- <h1>鑷姩浠撳簱WCS鐩戞帶鍥�</h1>
- <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>
- <!-- 璐ф灦 + 鍫嗗灈鏈� + 鍏ュ簱绔欑偣 -->
- <div class="main-part">
-
- </div>
-
-<!-- <!–璁惧鍒楄〃–>-->
-<!-- <div class="device-info">-->
-<!-- <table class="layui-hide" id="deviceInfo" lay-filter="deviceInfo"></table>-->
-<!-- </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 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="" id="crnNo">
- </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>
- <!-- 鎿嶄綔鎸夐挳 -->
- <div class="form-item" style="display: flex;">
- <div class="form-item-input">
- <div>鍏ュ簱锛氬紑<input type="radio" name="pakIn" id="pakInY" value="1"> 鍏�<input type="radio" name="pakIn" id="pakInN" value="0"/></div>
- <div>鍑哄簱锛氬紑<input type="radio" name="pakOut" id="pakOutY" value="1"> 鍏�<input type="radio" name="pakOut" id="pakOutN" value="0"/></div>
- </div>
- <div><a id="crnCommand" class="layui-btn">涓嬪彂鍛戒护</a></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="" id="devpSiteId">
- </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="" id="devpWorkNo">
- </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="" id="devpStaNo">
- </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">
- <a id="devpCommand" class="layui-btn">涓嬪彂鍛戒护</a>
- </div>
- </form>
- </div>
- </div>
-
-</body>
-
-</html>
-<script>
- getMap();
-</script>
-<script>
- setInterval(function () {
- getCodeData();
- renderBarCode();
- }, 1000)
- var tData = [],tData1 = [],tData2 = [],tData3 = [];
- function getCodeData() {
- $.ajax({
- 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) {
- tData1 = tData
- } else if (tData.length <= 10) {
- tData1 = tData.slice(0, 5)
- tData.splice(0, 5)
- tData2 = tData
- } else if (tData.length <= 15) {
- tData1 = tData.slice(0, 5)
- tData2 = tData.slice(6, 10)
- tData.splice(0, 10)
- tData3 = tData
- } else {
- tData = tData.slice(-15)
- tData1 = tData.slice(-15)
- tData2 = tData.slice(-10)
- tData3 = tData.slice(-5)
- }
- }
- }
- })
- }
- function renderBarCode() {
- for (var i = 0; i < tData1.length; i++) {
- var str1 = '<li><span>' + tData1[i].id +'-'+ tData1[i].scale +'kg'+ '</span><span class="right">' + tData1[i].time + '</span></li>'
- $('#scale1').append(str1)
- }
- for (var j = 0; j < tData2.length; j++) {
- var str2 = '<li><span>' + tData2[j].id +'-'+ tData1[i].scale +'kg'+ '</span><span class="right">' + tData2[j].time + '</span></li>'
- $('#scale2').append(str2)
- }
- for (var k = 0; k < tData3.length; k++) {
- var str3 = '<li><span>' + tData3[k].id +'-'+ tData1[i].scale +'kg'+ '</span><span class="right">' + tData3[k].time + '</span></li>'
- $('#scale3').append(str3)
- }
- }
-</script>
-<script type="text/javascript">
- // 寮圭獥绔欑偣淇℃伅
- $("body").on('click', '.site', function (e) {
- console.log(e)
- var id = this.id.split("-")[1];
- $("#siteWindow").attr("style", "display:block;");//鏄剧ずdiv
- $("#crnWindow").attr("style", "display:none;");
- $(".detailed").empty();
- $('.detailed').append(id + '绔欑偣璇︾粏淇℃伅');
- $.ajax({
- url: baseUrl + "/console/site/detail",
- headers: {
- 'token': localStorage.getItem('token')
- },
- data: {
- siteId: id
- },
- method: 'post',
- success: function (res) {
- for (var val in res.data) {
- var find = $("#siteWindow").find(":input[name='" + val + "']");
- if (find[0].type === 'text') {
- find.val(res.data[val]);
- } else if (find[0].type === 'checkbox') {
- find.attr("checked", res.data[val] === 'Y');
- }
- }
- }
-
- })
-
- });
- // 鍫嗗灈鏈轰俊鎭�
- $("body").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 + '鍙峰爢鍨涙満');
- $.ajax({
- url: baseUrl + "/console/crn/detail",
- headers: {
- 'token': localStorage.getItem('token')
- },
- data: {
- crnNo: id
- },
- method: 'post',
- success: function (res) {
- console.log(res)
- for (var val in res.data) {
- if (val === "inEnable") {
- if (res.data[val] === 'Y') {
- $("#pakInY").prop("checked", true);
- }else{
- $("#pakInN").prop("checked", true);
- }
- }else if (val === "outEnable") {
- if (res.data[val] === 'Y') {
- $("#pakOutY").prop("checked", true);
- }else{
- $("#pakOutN").prop("checked", true);
- }
- }else {
- var find = $("#crnWindow").find(":input[name='" + val + "']");
- if (find[0].type === 'text') {
- find.val(res.data[val]);
- } else if (find[0].type === 'checkbox') {
- find.attr("checked", res.data[val] === 'Y');
- }
- }
- }
- }
-
- })
-
- });
- // 寮圭獥鍏抽棴
- $('button').on('click', function () {
- $('#siteWindow').attr('style', 'display:none')
- $('#crnWindow').attr('style', 'display:none')
- })
-
-
- var crn1Position = 0;
- var crn2Position = 0;
- var crn3Position = 0;
- var crn4Position = 0;
- var crn5Position = 0;
-
- // 鍒濆鍖�
- getSitesInfo();
- getCrnInfo();
- getSystemRunningStatus();
- getBarcodeInfo();
- getScaleInfo();
- // 瀹炴椂璁块棶
- setInterval(function () {
- getCrnInfo();
- getSystemRunningStatus();
- getBarcodeInfo();
- getScaleInfo();
- }, 1000);
- setInterval(function () {
- getSitesInfo();
- }, 3000);
-
- // 绯荤粺杩愯寮�鍏�
- function systemSwitch() {
- if (parent.systemRunning) {
- layer.prompt({title: '璇疯緭鍏ュ彛浠わ紝骞跺仠姝� WCS 绯荤粺', formType: 1, shadeClose: true}, function (pass, idx) {
- layer.close(idx);
- doSwitch(0, pass); // 鍋滄wcs绯荤粺
- });
- } else {
- doSwitch(1); // 鍚姩wcs绯荤粺
- }
- }
-
- // 璇锋眰鏈嶅姟鍣ㄦ帶鍒秝cs绯荤粺杩愯鐘舵��
- function doSwitch(operatorType, password) {
- // 鍔犺浇tips
- var index = layer.load(1, {
- shade: [0.1, '#fff']
- });
- $.ajax({
- url: baseUrl + "/console/system/switch",
- headers: {'token': localStorage.getItem('token')},
- // async: false,
- data: {
- operatorType: operatorType,
- password: password
- },
- method: 'POST',
- success: function (res) {
- layer.close(index);
- if (res.code === 200) {
- if (res.data.status) {
- $('#system-icon').attr("class", "system-icon-open");
- $('#system-run-desc').html("绯荤粺杩愯涓�...");
- parent.systemRunning = true;
- } else {
- $('#system-icon').attr("class", "system-icon-close");
- $('#system-run-desc').html("绯荤粺宸插仠姝�!");
- parent.systemRunning = false;
- }
- } else if (res.code === 403) {
- parent.location.href = baseUrl + "/login";
- } else {
- console.log(res.msg);
-
- }
- }
- });
-
- }
-
- // 鑾峰彇wcs绯荤粺杩愯鐘舵��
- function getSystemRunningStatus() {
- $.ajax({
- url: baseUrl + "/console/system/running/status",
- headers: {'token': localStorage.getItem('token')},
- method: 'POST',
- success: function (res) {
- if (res.code === 200) {
- if (res.data.status) {
- $('#system-icon').attr("class", "system-icon-open");
- $('#system-run-desc').html("绯荤粺杩愯涓�...");
- parent.systemRunning = true;
- } else {
- $('#system-icon').attr("class", "system-icon-close");
- $('#system-run-desc').html("绯荤粺宸插仠姝�!");
- parent.systemRunning = false;
- }
- } else if (res.code === 403) {
- parent.location.href = baseUrl + "/login";
- } else {
- console.log(res.msg);
- }
- }
- });
- }
-
- // 杈撻�佽澶囧疄鏃舵暟鎹幏鍙�
- function getSitesInfo() {
- // carAnimate(112,4);
- $.ajax({
- url: baseUrl + "/console/latest/data/site",
- headers: {'token': localStorage.getItem('token')},
- method: 'POST',
- success: function (res) {
- if (res.code === 200) {
- var sites = res.data;
- for (var i = 0; i < sites.length; i++) {
- var siteEl = $("#site-" + sites[i].siteId);
- siteEl.attr("class", "site " + sites[i].siteStatus);
- if (sites[i].workNo != null && sites[i].workNo > 0) {
- siteEl.html(sites[i].siteId + "[" + sites[i].workNo + "]");
- } else {
- siteEl.html(sites[i].siteId);
- }
- // RGV浣嶇疆
- if(sites[i].siteId === '112' || sites[i].siteId === '212'){
- carAnimate(Number(sites[i].siteId), Number(sites[i].nearbySta));
- }
- }
- } else if (res.code === 403) {
- parent.location.href = baseUrl + "/login";
- } else {
- console.log(res.msg);
- }
- }
- });
- }
-
- // 鍫嗗灈鏈哄疄鏃舵暟鎹幏鍙�
- function getCrnInfo() {
- $.ajax({
- url: baseUrl + "/console/latest/data/crn",
- headers: {'token': localStorage.getItem('token')},
- method: 'POST',
- success: function (res) {
- // console.log(res)
- if (res.code === 200) {
- var crns = res.data;
- for (var i = 0; i < crns.length; i++) {
- var crnEl = $("#crn-" + crns[i].crnId);
- crnEl.attr("class", "machine " + crns[i].crnStatus);
- var unit = 20.6;//($('.item').eq(0).width() + 13) / 2;
- if (crns[i].bay < 0) {
- crns[i].bay = 1;
- }
- // crnEl.animate({left: (crns[i].bay * unit) + 'px'}, 1000);
- // crns[i].bay = 1;
-
- var offSet = 800;
- // crns[i].bay = 41;
- if(crns[i].bay === 1){
- crnEl.animate({left: offSet + 'px'}, 1000);
- } else {
- crnEl.animate({left: (offSet - unit + (crns[i].bay * unit)) + 'px'}, 1000);
- }
-
- }
- } else if (res.code === 403) {
- parent.location.href = baseUrl + "/login";
- } else {
- console.log(res.msg);
- }
- }
- });
- }
-
- // 鎵爜鍣ㄥ疄鏃舵暟鎹幏鍙�
- function getBarcodeInfo() {
- $.ajax({
- url: baseUrl + "/console/latest/data/barcode",
- headers: {'token': localStorage.getItem('token')},
- method: 'POST',
- success: function (res) {
- if (res.code === 200) {
- var barcodes = res.data;
- for (var i = 0; i < barcodes.length; i++) {
- $("#code-decoder-data-" + barcodes[i].barcodeId).html(barcodes[i].codeValue);
- }
- } else if (res.code === 403) {
- parent.location.href = baseUrl + "/login";
- } else {
- console.log(res.msg);
- }
- }
- });
- }
-
- // 纾呯Г瀹炴椂鏁版嵁鑾峰彇
- function getScaleInfo() {
- $.ajax({
- url: baseUrl + "/console/latest/data/scale",
- headers: {'token': localStorage.getItem('token')},
- method: 'POST',
- success: function (res) {
-
- if (res.code === 200) {
- var sclaes = res.data;
- for (var i = 0; i < sclaes.length; i++) {
- console.log(sclaes[i].scaleId + ":" + sclaes[i].value)
- $("#scale-data-" + sclaes[i].scaleId).text(sclaes[i].value);
- }
- } else if (res.code === 403) {
- parent.location.href = baseUrl + "/login";
- } else {
- console.log(res.msg);
- }
- }
- });
- }
-
- // 鍫嗗灈鏈哄亸绉诲姩鐢�
- function crnAnimate(id, leftVal) {
- // console.log(crn1Position)
- switch (id) {
- case 1:
- $("#crn-1").animate({left: leftVal + 'px'}, 1000);
- crn1Position = leftVal;
- break;
- case 2:
- $("#crn-2").animate({left: leftVal + 'px'}, 1000);
- crn2Position = leftVal;
- break;
- case 3:
- $("#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;
- default:
- break
- }
- }
-
- // 灏忚溅鍋忕Щ鍔ㄧ敾
- function carAnimate(id, target) {
- var targetTop = 0;
- if (id === 112) {
- switch (target) {
- case 1:
- targetTop += 313;
- break;
- case 2:
- targetTop += 313;
- break;
- case 3:
- targetTop += 256;
- break;
- case 4:
- targetTop += 226;
- break;
- case 5:
- targetTop += 168;
- case 6:
- targetTop += 168;
- break;
- default:
- return;
- }
- } else if (id === 212) {
- switch (target) {
- case 1:
- targetTop += 313;
- break;
- case 2:
- targetTop += 313;
- break;
- case 3:
- targetTop += 256;
- break;
- case 4:
- targetTop += 226;
- break;
- case 5:
- targetTop += 168;
- case 6:
- targetTop += 168;
- break;
- default:
- return;
- }
- } else {
- return;
- }
- $("#site-" + id).animate({top: targetTop + 'px'}, 1000);
- }
-
- //涓嬪彂杈撻�佺嚎鍛戒护
- $("#devpCommand").on("click", () => {
- let siteId = $("#devpSiteId").val()//璁惧id
- let wrkNo = $("#devpWorkNo").val()//宸ヤ綔鍙�
- let staNo = $("#devpStaNo").val()//鐩爣绔�
-
- $.ajax({
- url: baseUrl+"/site/detl/update",
- headers: {'token': localStorage.getItem('token')},
- data: {
- devNo: siteId,
- workNo: wrkNo,
- staNo: staNo,
- },
- method: 'POST',
- success: function (res) {
- if (res.code === 200){
- layer.msg("涓嬪彂鎴愬姛",{icon: 1,});
- } else if (res.code === 403){
- top.location.href = baseUrl+"/";
- }else {
- layer.msg(res.msg, {icon: 2});
- }
- }
- })
- });
-
- //涓嬪彂鍫嗗灈鏈哄懡浠�
- $("#crnCommand").on("click", () => {
- let crnNo = $("#crnNo").val()//璁惧id
- var pakIn = $('input[name="pakIn"]:checked').val();
- var pakOut = $('input[name="pakOut"]:checked').val();
-
- console.log(pakIn,pakOut)
-
- $.ajax({
- url: baseUrl + "/basCrnp/update/auth",
- headers: {
- 'token': localStorage.getItem('token')
- },
- data: {
- crnNo: crnNo,
- inEnable: pakIn == 1 ? "Y" : "N",
- outEnable: pakOut == 1 ? "Y" : "N"
- },
- method: 'POST',
- success: function (res) {
- if (res.code === 200){
- layer.msg("涓嬪彂鎴愬姛",{icon: 1,});
- } else if (res.code === 403){
- top.location.href = baseUrl+"/";
- }else {
- layer.msg(res.msg, {icon: 2});
- }
- }
- });
- });
-
-</script>
\ No newline at end of file
diff --git a/src/main/webapp/views/realtimeWatch/console3.html b/src/main/webapp/views/realtimeWatch/console3.html
deleted file mode 100644
index a178e2a..0000000
--- a/src/main/webapp/views/realtimeWatch/console3.html
+++ /dev/null
@@ -1,853 +0,0 @@
-<!DOCTYPE html>
-<html lang="en">
-<head>
- <meta charset="UTF-8">
- <title>鑷姩浠撳簱wcs绯荤粺</title>
- <link rel="stylesheet" href="../../static/wcs/css/render.css">
- <link rel="stylesheet" href="../../static/wms/layui/css/layui.css" media="all">
- <link rel="stylesheet" href="../../static/wms/css/cool.css" media="all">
- <link rel="stylesheet" href="../../static/wms/css/common.css" media="all">
- <script type="text/javascript" src="../../static/wms/js/jquery/jquery-3.3.1.min.js"></script>
- <script type="text/javascript" src="../../static/wms/layui/layui.js" charset="utf-8"></script>
- <script type="text/javascript" src="../../static/wms/js/common.js" charset="utf-8"></script>
- <script type="text/javascript" src="../../static/wms/js/cool.js" charset="utf-8"></script>
- <!--鍦板浘json-->
- <script src="../../static/wcs/js/console3.map.js"></script>
- <script src="../../static/wcs/js/console.js"></script>
- <script src="../../static/wcs/js/common.js"></script>
-</head>
-<script type="text/html" id="errorTpl">
- {{# if( d.error === false ){ }}
- <span name="level" class="layui-badge layui-badge-green">姝ｅ父</span>
- {{# } else { }}
- <span name="level" class="layui-badge layui-badge-red">寮傚父</span>
- {{# } }}
-</script>
-<body>
- <div id="main">
- <div class="head">
- <div class="head-left">
- <h1>鑷姩浠撳簱WCS鐩戞帶鍥�</h1>
- <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>
- <!-- 璐ф灦 + 鍫嗗灈鏈� + 鍏ュ簱绔欑偣 -->
- <div class="main-part">
-
- </div>
-
-<!-- <!–璁惧鍒楄〃–>-->
-<!-- <div class="device-info">-->
-<!-- <table class="layui-hide" id="deviceInfo" lay-filter="deviceInfo"></table>-->
-<!-- </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 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="" id="crnNo">
- </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>
- <!-- 鎿嶄綔鎸夐挳 -->
- <div class="form-item" style="display: flex;">
- <div class="form-item-input">
- <div>鍏ュ簱锛氬紑<input type="radio" name="pakIn" id="pakInY" value="1"> 鍏�<input type="radio" name="pakIn" id="pakInN" value="0"/></div>
- <div>鍑哄簱锛氬紑<input type="radio" name="pakOut" id="pakOutY" value="1"> 鍏�<input type="radio" name="pakOut" id="pakOutN" value="0"/></div>
- </div>
- <div><a id="crnCommand" class="layui-btn">涓嬪彂鍛戒护</a></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="" id="devpSiteId">
- </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="" id="devpWorkNo">
- </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="" id="devpStaNo">
- </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">
- <a id="devpCommand" class="layui-btn">涓嬪彂鍛戒护</a>
- </div>
- </form>
- </div>
- </div>
-
-</body>
-
-</html>
-<script>
- getMap();
-</script>
-<script>
- setInterval(function () {
- getCodeData();
- renderBarCode();
- }, 1000)
- var tData = [],tData1 = [],tData2 = [],tData3 = [];
- function getCodeData() {
- $.ajax({
- 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) {
- tData1 = tData
- } else if (tData.length <= 10) {
- tData1 = tData.slice(0, 5)
- tData.splice(0, 5)
- tData2 = tData
- } else if (tData.length <= 15) {
- tData1 = tData.slice(0, 5)
- tData2 = tData.slice(6, 10)
- tData.splice(0, 10)
- tData3 = tData
- } else {
- tData = tData.slice(-15)
- tData1 = tData.slice(-15)
- tData2 = tData.slice(-10)
- tData3 = tData.slice(-5)
- }
- }
- }
- })
- }
- function renderBarCode() {
- for (var i = 0; i < tData1.length; i++) {
- var str1 = '<li><span>' + tData1[i].id +'-'+ tData1[i].scale +'kg'+ '</span><span class="right">' + tData1[i].time + '</span></li>'
- $('#scale1').append(str1)
- }
- for (var j = 0; j < tData2.length; j++) {
- var str2 = '<li><span>' + tData2[j].id +'-'+ tData1[i].scale +'kg'+ '</span><span class="right">' + tData2[j].time + '</span></li>'
- $('#scale2').append(str2)
- }
- for (var k = 0; k < tData3.length; k++) {
- var str3 = '<li><span>' + tData3[k].id +'-'+ tData1[i].scale +'kg'+ '</span><span class="right">' + tData3[k].time + '</span></li>'
- $('#scale3').append(str3)
- }
- }
-</script>
-<script type="text/javascript">
- // 寮圭獥绔欑偣淇℃伅
- $("body").on('click', '.site', function (e) {
- console.log(e)
- var id = this.id.split("-")[1];
- $("#siteWindow").attr("style", "display:block;");//鏄剧ずdiv
- $("#crnWindow").attr("style", "display:none;");
- $(".detailed").empty();
- $('.detailed').append(id + '绔欑偣璇︾粏淇℃伅');
- $.ajax({
- url: baseUrl + "/console/site/detail",
- headers: {
- 'token': localStorage.getItem('token')
- },
- data: {
- siteId: id
- },
- method: 'post',
- success: function (res) {
- for (var val in res.data) {
- var find = $("#siteWindow").find(":input[name='" + val + "']");
- if (find[0].type === 'text') {
- find.val(res.data[val]);
- } else if (find[0].type === 'checkbox') {
- find.attr("checked", res.data[val] === 'Y');
- }
- }
- }
-
- })
-
- });
- // 鍫嗗灈鏈轰俊鎭�
- $("body").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 + '鍙峰爢鍨涙満');
- $.ajax({
- url: baseUrl + "/console/crn/detail",
- headers: {
- 'token': localStorage.getItem('token')
- },
- data: {
- crnNo: id
- },
- method: 'post',
- success: function (res) {
- console.log(res)
- for (var val in res.data) {
- if (val === "inEnable") {
- if (res.data[val] === 'Y') {
- $("#pakInY").prop("checked", true);
- }else{
- $("#pakInN").prop("checked", true);
- }
- }else if (val === "outEnable") {
- if (res.data[val] === 'Y') {
- $("#pakOutY").prop("checked", true);
- }else{
- $("#pakOutN").prop("checked", true);
- }
- }else {
- var find = $("#crnWindow").find(":input[name='" + val + "']");
- if (find[0].type === 'text') {
- find.val(res.data[val]);
- } else if (find[0].type === 'checkbox') {
- find.attr("checked", res.data[val] === 'Y');
- }
- }
- }
- }
-
- })
-
- });
- // 寮圭獥鍏抽棴
- $('button').on('click', function () {
- $('#siteWindow').attr('style', 'display:none')
- $('#crnWindow').attr('style', 'display:none')
- })
-
-
- var crn1Position = 0;
- var crn2Position = 0;
- var crn3Position = 0;
- var crn4Position = 0;
- var crn5Position = 0;
-
- // 鍒濆鍖�
- getSitesInfo();
- getCrnInfo();
- getSystemRunningStatus();
- getBarcodeInfo();
- getScaleInfo();
- // 瀹炴椂璁块棶
- setInterval(function () {
- getCrnInfo();
- getSystemRunningStatus();
- getBarcodeInfo();
- getScaleInfo();
- }, 1000);
- setInterval(function () {
- getSitesInfo();
- }, 3000);
-
- // 绯荤粺杩愯寮�鍏�
- function systemSwitch() {
- if (parent.systemRunning) {
- layer.prompt({title: '璇疯緭鍏ュ彛浠わ紝骞跺仠姝� WCS 绯荤粺', formType: 1, shadeClose: true}, function (pass, idx) {
- layer.close(idx);
- doSwitch(0, pass); // 鍋滄wcs绯荤粺
- });
- } else {
- doSwitch(1); // 鍚姩wcs绯荤粺
- }
- }
-
- // 璇锋眰鏈嶅姟鍣ㄦ帶鍒秝cs绯荤粺杩愯鐘舵��
- function doSwitch(operatorType, password) {
- // 鍔犺浇tips
- var index = layer.load(1, {
- shade: [0.1, '#fff']
- });
- $.ajax({
- url: baseUrl + "/console/system/switch",
- headers: {'token': localStorage.getItem('token')},
- // async: false,
- data: {
- operatorType: operatorType,
- password: password
- },
- method: 'POST',
- success: function (res) {
- layer.close(index);
- if (res.code === 200) {
- if (res.data.status) {
- $('#system-icon').attr("class", "system-icon-open");
- $('#system-run-desc').html("绯荤粺杩愯涓�...");
- parent.systemRunning = true;
- } else {
- $('#system-icon').attr("class", "system-icon-close");
- $('#system-run-desc').html("绯荤粺宸插仠姝�!");
- parent.systemRunning = false;
- }
- } else if (res.code === 403) {
- parent.location.href = baseUrl + "/login";
- } else {
- console.log(res.msg);
-
- }
- }
- });
-
- }
-
- // 鑾峰彇wcs绯荤粺杩愯鐘舵��
- function getSystemRunningStatus() {
- $.ajax({
- url: baseUrl + "/console/system/running/status",
- headers: {'token': localStorage.getItem('token')},
- method: 'POST',
- success: function (res) {
- if (res.code === 200) {
- if (res.data.status) {
- $('#system-icon').attr("class", "system-icon-open");
- $('#system-run-desc').html("绯荤粺杩愯涓�...");
- parent.systemRunning = true;
- } else {
- $('#system-icon').attr("class", "system-icon-close");
- $('#system-run-desc').html("绯荤粺宸插仠姝�!");
- parent.systemRunning = false;
- }
- } else if (res.code === 403) {
- parent.location.href = baseUrl + "/login";
- } else {
- console.log(res.msg);
- }
- }
- });
- }
-
- // 杈撻�佽澶囧疄鏃舵暟鎹幏鍙�
- function getSitesInfo() {
- // carAnimate(112,4);
- $.ajax({
- url: baseUrl + "/console/latest/data/site",
- headers: {'token': localStorage.getItem('token')},
- method: 'POST',
- success: function (res) {
- if (res.code === 200) {
- var sites = res.data;
- for (var i = 0; i < sites.length; i++) {
- var siteEl = $("#site-" + sites[i].siteId);
- siteEl.attr("class", "site " + sites[i].siteStatus);
- if (sites[i].workNo != null && sites[i].workNo > 0) {
- siteEl.html(sites[i].siteId + "[" + sites[i].workNo + "]");
- } else {
- siteEl.html(sites[i].siteId);
- }
- // RGV浣嶇疆
- if(sites[i].siteId === '112' || sites[i].siteId === '212'){
- carAnimate(Number(sites[i].siteId), Number(sites[i].nearbySta));
- }
- }
- } else if (res.code === 403) {
- parent.location.href = baseUrl + "/login";
- } else {
- console.log(res.msg);
- }
- }
- });
- }
-
- // 鍫嗗灈鏈哄疄鏃舵暟鎹幏鍙�
- function getCrnInfo() {
- $.ajax({
- url: baseUrl + "/console/latest/data/crn",
- headers: {'token': localStorage.getItem('token')},
- method: 'POST',
- success: function (res) {
- // console.log(res)
- if (res.code === 200) {
- var crns = res.data;
- for (var i = 0; i < crns.length; i++) {
- var crnEl = $("#crn-" + crns[i].crnId);
- crnEl.attr("class", "machine " + crns[i].crnStatus);
- var unit = 20.6;//($('.item').eq(0).width() + 13) / 2;
- if (crns[i].bay < 0) {
- crns[i].bay = 1;
- }
- // crnEl.animate({left: (crns[i].bay * unit) + 'px'}, 1000);
- // crns[i].bay = 1;
-
- var offSet = 800;
- // crns[i].bay = 41;
- if(crns[i].bay === 1){
- crnEl.animate({left: offSet + 'px'}, 1000);
- } else {
- crnEl.animate({left: (offSet - unit + (crns[i].bay * unit)) + 'px'}, 1000);
- }
-
- }
- } else if (res.code === 403) {
- parent.location.href = baseUrl + "/login";
- } else {
- console.log(res.msg);
- }
- }
- });
- }
-
- // 鎵爜鍣ㄥ疄鏃舵暟鎹幏鍙�
- function getBarcodeInfo() {
- $.ajax({
- url: baseUrl + "/console/latest/data/barcode",
- headers: {'token': localStorage.getItem('token')},
- method: 'POST',
- success: function (res) {
- if (res.code === 200) {
- var barcodes = res.data;
- for (var i = 0; i < barcodes.length; i++) {
- $("#code-decoder-data-" + barcodes[i].barcodeId).html(barcodes[i].codeValue);
- }
- } else if (res.code === 403) {
- parent.location.href = baseUrl + "/login";
- } else {
- console.log(res.msg);
- }
- }
- });
- }
-
- // 纾呯Г瀹炴椂鏁版嵁鑾峰彇
- function getScaleInfo() {
- $.ajax({
- url: baseUrl + "/console/latest/data/scale",
- headers: {'token': localStorage.getItem('token')},
- method: 'POST',
- success: function (res) {
-
- if (res.code === 200) {
- var sclaes = res.data;
- for (var i = 0; i < sclaes.length; i++) {
- console.log(sclaes[i].scaleId + ":" + sclaes[i].value)
- $("#scale-data-" + sclaes[i].scaleId).text(sclaes[i].value);
- }
- } else if (res.code === 403) {
- parent.location.href = baseUrl + "/login";
- } else {
- console.log(res.msg);
- }
- }
- });
- }
-
- // 鍫嗗灈鏈哄亸绉诲姩鐢�
- function crnAnimate(id, leftVal) {
- // console.log(crn1Position)
- switch (id) {
- case 1:
- $("#crn-1").animate({left: leftVal + 'px'}, 1000);
- crn1Position = leftVal;
- break;
- case 2:
- $("#crn-2").animate({left: leftVal + 'px'}, 1000);
- crn2Position = leftVal;
- break;
- case 3:
- $("#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;
- default:
- break
- }
- }
-
- // 灏忚溅鍋忕Щ鍔ㄧ敾
- function carAnimate(id, target) {
- var targetTop = 0;
- if (id === 112) {
- switch (target) {
- case 1:
- targetTop += 313;
- break;
- case 2:
- targetTop += 313;
- break;
- case 3:
- targetTop += 256;
- break;
- case 4:
- targetTop += 226;
- break;
- case 5:
- targetTop += 168;
- case 6:
- targetTop += 168;
- break;
- default:
- return;
- }
- } else if (id === 212) {
- switch (target) {
- case 1:
- targetTop += 313;
- break;
- case 2:
- targetTop += 313;
- break;
- case 3:
- targetTop += 256;
- break;
- case 4:
- targetTop += 226;
- break;
- case 5:
- targetTop += 168;
- case 6:
- targetTop += 168;
- break;
- default:
- return;
- }
- } else {
- return;
- }
- $("#site-" + id).animate({top: targetTop + 'px'}, 1000);
- }
-
- //涓嬪彂杈撻�佺嚎鍛戒护
- $("#devpCommand").on("click", () => {
- let siteId = $("#devpSiteId").val()//璁惧id
- let wrkNo = $("#devpWorkNo").val()//宸ヤ綔鍙�
- let staNo = $("#devpStaNo").val()//鐩爣绔�
-
- $.ajax({
- url: baseUrl+"/site/detl/update",
- headers: {'token': localStorage.getItem('token')},
- data: {
- devNo: siteId,
- workNo: wrkNo,
- staNo: staNo,
- },
- method: 'POST',
- success: function (res) {
- if (res.code === 200){
- layer.msg("涓嬪彂鎴愬姛",{icon: 1,});
- } else if (res.code === 403){
- top.location.href = baseUrl+"/";
- }else {
- layer.msg(res.msg, {icon: 2});
- }
- }
- })
- });
-
- //涓嬪彂鍫嗗灈鏈哄懡浠�
- $("#crnCommand").on("click", () => {
- let crnNo = $("#crnNo").val()//璁惧id
- var pakIn = $('input[name="pakIn"]:checked').val();
- var pakOut = $('input[name="pakOut"]:checked').val();
-
- console.log(pakIn,pakOut)
-
- $.ajax({
- url: baseUrl + "/basCrnp/update/auth",
- headers: {
- 'token': localStorage.getItem('token')
- },
- data: {
- crnNo: crnNo,
- inEnable: pakIn == 1 ? "Y" : "N",
- outEnable: pakOut == 1 ? "Y" : "N"
- },
- method: 'POST',
- success: function (res) {
- if (res.code === 200){
- layer.msg("涓嬪彂鎴愬姛",{icon: 1,});
- } else if (res.code === 403){
- top.location.href = baseUrl+"/";
- }else {
- layer.msg(res.msg, {icon: 2});
- }
- }
- });
- });
-
-</script>
\ No newline at end of file
--
Gitblit v1.9.1