From 5bc1611298e274f710072daf8c44145ee87cb1f1 Mon Sep 17 00:00:00 2001
From: 18516761980 <56479841@qq.com>
Date: 星期二, 16 八月 2022 11:05:36 +0800
Subject: [PATCH] #
---
src/main/webapp/static/js/console.js | 2
src/main/webapp/static/js/console.map.js | 112 ++++++++++++++++++------------------
src/main/java/com/zy/core/MainProcess.java | 8 +-
src/main/java/com/zy/core/ServerBootstrap.java | 14 ++--
4 files changed, 69 insertions(+), 67 deletions(-)
diff --git a/src/main/java/com/zy/core/MainProcess.java b/src/main/java/com/zy/core/MainProcess.java
index b122e50..10cb9e5 100644
--- a/src/main/java/com/zy/core/MainProcess.java
+++ b/src/main/java/com/zy/core/MainProcess.java
@@ -64,10 +64,10 @@
mainService.recCrnErr();
// 鍏ュ簱 ===>> 绌烘爤鏉垮垵濮嬪寲鍏ュ簱,鍙夎溅鍏ュ簱绔欐斁璐�
mainService.storeEmptyPlt();
- // 鍑哄簱 ===>> 宸ヤ綔妗ｄ俊鎭啓鍏ed鏄剧ず鍣�
- mainService.ledExecute();
- // 鍏朵粬 ===>> LED鏄剧ず鍣ㄥ浣嶏紝鏄剧ず榛樿淇℃伅
- mainService.ledReset();
+// // 鍑哄簱 ===>> 宸ヤ綔妗ｄ俊鎭啓鍏ed鏄剧ず鍣�
+// mainService.ledExecute();
+// // 鍏朵粬 ===>> LED鏄剧ず鍣ㄥ浣嶏紝鏄剧ず榛樿淇℃伅
+// mainService.ledReset();
mainService.outOfDevp();
diff --git a/src/main/java/com/zy/core/ServerBootstrap.java b/src/main/java/com/zy/core/ServerBootstrap.java
index ef958a5..7b62114 100644
--- a/src/main/java/com/zy/core/ServerBootstrap.java
+++ b/src/main/java/com/zy/core/ServerBootstrap.java
@@ -95,13 +95,13 @@
// new Thread(barcodeThread).start();
SlaveConnection.put(SlaveType.Barcode, barcode.getId(), barcodeThread);
}
- // 鍒濆鍖朙ED绾跨▼
- log.info("鍒濆鍖朙ED绾跨▼...................................................");
- for (LedSlave led : slaveProperties.getLed()) {
- LedThread ledThread = new LedThread(led);
- new Thread(ledThread).start();
- SlaveConnection.put(SlaveType.Led, led.getId(), ledThread);
- }
+// // 鍒濆鍖朙ED绾跨▼
+// log.info("鍒濆鍖朙ED绾跨▼...................................................");
+// for (LedSlave led : slaveProperties.getLed()) {
+// LedThread ledThread = new LedThread(led);
+// new Thread(ledThread).start();
+// SlaveConnection.put(SlaveType.Led, led.getId(), ledThread);
+// }
// 鍒濆鍖栫绉ょ嚎绋�
// log.info("鍒濆鍖栫绉ょ嚎绋�...................................................");
// for (Slave scale : slaveProperties.getScale()) {
diff --git a/src/main/webapp/static/js/console.js b/src/main/webapp/static/js/console.js
index 34af77e..71073e8 100644
--- a/src/main/webapp/static/js/console.js
+++ b/src/main/webapp/static/js/console.js
@@ -93,10 +93,12 @@
let stnss = areas[i].stns
let floor = areas[i].text
+ console.log(areas[i].top)
floorId = areas[i].id
var position = (i+1)*100
floorBtn =
"<button class='floorBtn btn-16' onclick='changFloor("+i+")' style='top: "+position+"px;'>" + floor +"</button>"
+ console.log(mapInfo.areas[0].floors.length)
if (mapInfo.areas[0].floors.length == 1) {
floorBtnss = ''
} else {
diff --git a/src/main/webapp/static/js/console.map.js b/src/main/webapp/static/js/console.map.js
index b27cae1..024000f 100644
--- a/src/main/webapp/static/js/console.map.js
+++ b/src/main/webapp/static/js/console.map.js
@@ -113,224 +113,224 @@
"type": "stn",
"id": "site-212",
"text": "212",
- "top": 220,
- "left": 1312,
+ "top": 313,
+ "left": 1433,
"width": 60,
"height": 24
}, {
"type": "track",
"id": "lb_trCart21",
"text": "",
- "top": 54,
- "left": 1316,
+ "top": 147,
+ "left": 1437,
"width": 4,
"height": 213
}, {
"type": "track",
"id": "lb_trCart22",
"text": "",
- "top": 54,
- "left": 1363,
+ "top": 147,
+ "left": 1484,
"width": 4,
"height": 213
}, {
"type": "stn",
"id": "site-202",
"text": "202",
- "top": 75,
- "left": 1373,
+ "top": 168,
+ "left": 1494,
"width": 60,
"height": 24
}, {
"type": "stn",
"id": "site-201",
"text": "201",
- "top": 220,
- "left": 1374,
+ "top": 313,
+ "left": 1495,
"width": 88,
"height": 24
}, {
"type": "stn",
"id": "site-203",
"text": "203",
- "top": 75,
- "left": 1434,
+ "top": 168,
+ "left": 1555,
"width": 60,
"height": 24
}, {
"type": "stn",
"id": "site-204",
"text": "204",
- "top": 220,
- "left": 1250,
+ "top": 313,
+ "left": 1371,
"width": 60,
"height": 24
}, {
"type": "stn",
"id": "site-205",
"text": "205",
- "top": 220,
- "left": 1189,
+ "top": 313,
+ "left": 1310,
"width": 60,
"height": 24
}, {
"type": "stn",
"id": "site-207",
"text": "207",
- "top": 163,
- "left": 1250,
+ "top": 256,
+ "left": 1371,
"width": 60,
"height": 24
}, {
"type": "stn",
"id": "site-206",
"text": "206",
- "top": 163,
- "left": 1189,
+ "top": 256,
+ "left": 1310,
"width": 60,
"height": 24
}, {
"type": "stn",
"id": "site-208",
"text": "208",
- "top": 133,
- "left": 1250,
+ "top": 226,
+ "left": 1371,
"width": 60,
"height": 24
}, {
"type": "stn",
"id": "site-209",
"text": "209",
- "top": 133,
- "left": 1189,
+ "top": 226,
+ "left": 1310,
"width": 60,
"height": 24
}, {
"type": "stn",
"id": "site-211",
"text": "211",
- "top": 75,
- "left": 1250,
+ "top": 168,
+ "left": 1371,
"width": 60,
"height": 24
}, {
"type": "stn",
"id": "site-210",
"text": "210",
- "top": 75,
- "left": 1189,
+ "top": 168,
+ "left": 1310,
"width": 60,
"height": 24
}, {
"type": "stn",
"id": "site-112",
"text": "112",
- "top": 220,
- "left": 158,
+ "top": 313,
+ "left": 279,
"width": 60,
"height": 24
}, {
"type": "track",
"id": "lb_trCart11",
"text": "",
- "top": 54,
- "left": 162,
+ "top": 147,
+ "left": 283,
"width": 4,
"height": 213
}, {
"type": "track",
"id": "lb_trCart12",
"text": "",
- "top": 54,
- "left": 209,
+ "top": 147,
+ "left": 330,
"width": 4,
"height": 213
}, {
"type": "stn",
"id": "site-110",
"text": "110",
- "top": 220,
- "left": 281,
+ "top": 313,
+ "left": 402,
"width": 60,
"height": 24
}, {
"type": "stn",
"id": "site-111",
"text": "111",
- "top": 220,
- "left": 220,
+ "top": 313,
+ "left": 341,
"width": 60,
"height": 24
}, {
"type": "stn",
"id": "site-109",
"text": "109",
- "top": 163,
- "left": 281,
+ "top": 256,
+ "left": 402,
"width": 60,
"height": 24
}, {
"type": "stn",
"id": "site-108",
"text": "108",
- "top": 163,
- "left": 220,
+ "top": 256,
+ "left": 341,
"width": 60,
"height": 24
}, {
"type": "stn",
"id": "site-106",
"text": "106",
- "top": 133,
- "left": 281,
+ "top": 226,
+ "left": 402,
"width": 60,
"height": 24
}, {
"type": "stn",
"id": "site-107",
"text": "107",
- "top": 133,
- "left": 220,
+ "top": 226,
+ "left": 341,
"width": 60,
"height": 24
}, {
"type": "stn",
"id": "site-105",
"text": "105",
- "top": 75,
- "left": 281,
+ "top": 168,
+ "left": 402,
"width": 60,
"height": 24
}, {
"type": "stn",
"id": "site-103",
"text": "103",
- "top": 75,
- "left": 35,
+ "top": 168,
+ "left": 156,
"width": 60,
"height": 24
}, {
"type": "stn",
"id": "site-101",
"text": "101",
- "top": 220,
- "left": 68,
+ "top": 313,
+ "left": 189,
"width": 88,
"height": 24
}, {
"type": "stn",
"id": "site-102",
"text": "102",
- "top": 75,
- "left": 96,
+ "top": 168,
+ "left": 217,
"width": 60,
"height": 24
}, {
"type": "stn",
"id": "site-104",
"text": "104",
- "top": 75,
- "left": 220,
+ "top": 168,
+ "left": 341,
"width": 60,
"height": 24
}]
--
Gitblit v1.9.1