From fed17b9162273d70043f7d5e9061bc7afd17c6ef Mon Sep 17 00:00:00 2001
From: Junjie <fallin.jie@qq.com>
Date: 星期四, 27 七月 2023 16:36:19 +0800
Subject: [PATCH] 地图显示
---
src/main/java/com/zy/asrs/controller/ConsoleController.java | 2 +-
src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java | 2 +-
src/main/webapp/views/console.html | 25 ++++++++++++++++---------
src/main/webapp/static/css/console.css | 12 ++++++++----
4 files changed, 26 insertions(+), 15 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/ConsoleController.java b/src/main/java/com/zy/asrs/controller/ConsoleController.java
index 54cbddd..1983b70 100644
--- a/src/main/java/com/zy/asrs/controller/ConsoleController.java
+++ b/src/main/java/com/zy/asrs/controller/ConsoleController.java
@@ -327,7 +327,7 @@
@GetMapping("/map/resetMap/auth")
@ManagerAuth
public R resetMapToRedis() {
- for (int i = 1; i <= 4; i++) {//鎬诲叡鍥涘眰妤�
+ for (int i = 1; i <= 10; i++) {//鎬诲叡10灞傛ゼ
BasMap basMap = basMapService.selectLatestMap(i);
//杞藉叆鍦板浘
NavigateMapData mapData = new NavigateMapData(i);
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 2dbac01..1654b29 100644
--- a/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java
@@ -572,7 +572,7 @@
* 鍒濆鍖栧疄鏃跺湴鍥�
*/
public synchronized void initRealtimeBasMap() {
- for (int i = 1; i <= 4; i++) {//鎬诲叡鍥涘眰妤�
+ for (int i = 1; i <= 10; i++) {//鎬诲叡鍥涘眰妤�
Object data = redisUtil.get("realtimeBasMap_" + i);
if (data == null) {//redis鍦板浘鏁版嵁涓虹┖锛屼粠鏁版嵁搴撲腑鑾峰彇
BasMap basMap = basMapService.selectLatestMap(i);
diff --git a/src/main/webapp/static/css/console.css b/src/main/webapp/static/css/console.css
index cd46d92..b3db022 100644
--- a/src/main/webapp/static/css/console.css
+++ b/src/main/webapp/static/css/console.css
@@ -420,9 +420,10 @@
/* ------------------ 璐ф灦鎬绘垚 ------------------ */
.main-part {
position: absolute;
- top: -150px;
- left: 50px;
- transform: scale(0.75);
+ top: 100px;
+ left: -150px;
+ width: 2205px;
+ scale: 0.7;
}
.main-part .lane {
margin-top: 30px;
@@ -437,8 +438,11 @@
}
/* 搴撲綅缁� */
+.stock-group {
+ width: 100%;
+}
.stock-group .item {
- width: 70px;
+ width: 35px;
height: 35px;
float: left;
border-top: 1px solid rgb(194,76,65);
diff --git a/src/main/webapp/views/console.html b/src/main/webapp/views/console.html
index c0d7bee..9dca6b9 100644
--- a/src/main/webapp/views/console.html
+++ b/src/main/webapp/views/console.html
@@ -23,16 +23,22 @@
<button class="floorBtn btn-16" onclick="changFloor(this,2)" style="margin-top: 200px">2F</button>
<button class="floorBtn btn-16" onclick="changFloor(this,3)" style="margin-top: 250px">3F</button>
<button class="floorBtn btn-16" onclick="changFloor(this,4)" style="margin-top: 300px">4F</button>
+ <button class="floorBtn btn-16" onclick="changFloor(this,5)" style="margin-top: 350px">5F</button>
+ <button class="floorBtn btn-16" onclick="changFloor(this,6)" style="margin-top: 400px">6F</button>
+ <button class="floorBtn btn-16" onclick="changFloor(this,7)" style="margin-top: 450px">7F</button>
+ <button class="floorBtn btn-16" onclick="changFloor(this,8)" style="margin-top: 500px">8F</button>
+ <button class="floorBtn btn-16" onclick="changFloor(this,9)" style="margin-top: 550px">9F</button>
+ <button class="floorBtn btn-16" onclick="changFloor(this,10)" style="margin-top: 600px">10F</button>
</div>
-<!-- <button class="floorBtn btn-16" onclick="testMove()" style="margin-top: 350px;font-size: 14px;">娴嬭瘯绉诲姩杞�</button>-->
- <button class="floorBtn btn-16" onclick="resetMap()" style="margin-top: 400px;font-size: 14px;">閲嶇疆鍦板浘</button>
+ <button class="floorBtn btn-16" onclick="resetMap()" style="margin-top: 650px;font-size: 14px;">閲嶇疆鍦板浘</button>
+<!-- <button class="floorBtn btn-16" onclick="testMove()" style="margin-top: 700px;font-size: 14px;">娴嬭瘯绉诲姩杞�</button>-->
<!-- 璐ф灦 + 鍫嗗灈鏈� + 鍏ュ簱绔欑偣 -->
- <div class="main-part">
- <!-- 绗竴缁� -->
- <div class="lane" id="mapDataId" style="margin-bottom: 280px">
+ <div class="main-part" id="mapDataId">
+<!-- <!– 绗竴缁� –>-->
+<!-- <div class="lane" id="mapDataId" style="margin-bottom: 280px">-->
- </div>
+<!-- </div>-->
</div>
</main>
<footer class="footer">
@@ -463,7 +469,7 @@
$("#shuttle-status-box").empty()
res.data.forEach((item,index) => {
let shuttleStatusClass = "shuttle-idle"
- switch (item.status) {
+ switch (item.protocolStatus) {
case 1://绌洪棽
shuttleStatusClass = "shuttle-idle";
break
@@ -490,7 +496,7 @@
}
let shuttleStatus = '<div class="state">' +
'<span>鍥涘悜绌挎杞� ' + item.shuttleNo + '</span>' +
- '<span class="state-ss ' + shuttleStatusClass + '">' + item.status$ + '</span></div>';
+ '<span class="state-ss ' + shuttleStatusClass + '">' + item.protocolStatus$ + '</span></div>';
$("#shuttle-status-box").append(shuttleStatus)
if(item.locNoLev != currentLev){
@@ -508,7 +514,7 @@
//璁＄畻鍥涘悜绌挎杞﹀浘鏍囦綅缃�
function getCarPosition(x,y) {
let top = (x * 35 - 35) + "px" //闇�瑕佸噺鍘诲皬杞﹁嚜宸辨墍鍗犻珮搴�
- let left = (y * 70 - 70) + "px" //闇�瑕佸噺鍘诲皬杞﹁嚜宸辨墍鍗犲搴�
+ let left = (y * 35 - 35) + "px" //闇�瑕佸噺鍘诲皬杞﹁嚜宸辨墍鍗犲搴�
return [top,left];
}
@@ -552,6 +558,7 @@
headers: {'token': localStorage.getItem('token')},
success: (res) => {
let data = res.data
+ console.log(data)
mapData = data
let content = ""
data.forEach((rowData,index) => {
--
Gitblit v1.9.1