From baed29d667be08051c36c31997117a1ba292d5bc Mon Sep 17 00:00:00 2001
From: Junjie <fallin.jie@qq.com>
Date: 星期三, 10 五月 2023 16:51:01 +0800
Subject: [PATCH] redis实时地图
---
src/main/webapp/views/console.html | 43 +++++++++++++++++++++++++++----------------
1 files changed, 27 insertions(+), 16 deletions(-)
diff --git a/src/main/webapp/views/console.html b/src/main/webapp/views/console.html
index 63e10eb..ae228b6 100644
--- a/src/main/webapp/views/console.html
+++ b/src/main/webapp/views/console.html
@@ -522,13 +522,35 @@
//鍒濆鍖栧湴鍥�
function initMap(lev) {
+ getMap(lev)
+
+ $.ajax({
+ url: baseUrl+ "/shuttle/table/shuttle/state",
+ headers: {'token': localStorage.getItem('token')},
+ method: 'POST',
+ success: function (res) {
+ res.data.forEach((item,index) => {
+ if(lev == item.locNoLev){
+ let carBox = '<div class="sxcar" id="sxcar-' + item.shuttleNo + '"></div>'
+ $("#mapDataId").append(carBox)
+ }
+ })
+ }
+ });
+ }
+
+ //鑾峰彇鍦板浘鏁版嵁
+ function getMap(lev) {
//姣嶈建閬撶涓�娆＄储寮曪紝鐢ㄤ簬瀹氫綅灏忚溅
let firstMotherIndex = [0,0];
$("#mapDataId").empty()
$.ajax({
type:"get",
- url: baseUrl + "/static/js/map_" + lev + ".json",
- success: (data) => {
+ // url: baseUrl + "/static/js/map_" + lev + ".json",
+ url: baseUrl + "/console/map/" + lev + "/auth",
+ headers: {'token': localStorage.getItem('token')},
+ success: (res) => {
+ let data = res.data
mapData = data
let content = ""
data.forEach((rowData,index) => {
@@ -540,6 +562,9 @@
if(!(idx == 0 || rowData.length - 1 == idx)){
let col;
switch (colData.value){
+ case -999:
+ col = '<button class="item" style="background:#f83333;color: #fff;">' + idx + '</button>';
+ break;
case -1:
col = '<button class="item" style="visibility: hidden">' + idx + '</button>';
break;
@@ -579,20 +604,6 @@
$("#mapDataId").append(content)
}
})
-
- $.ajax({
- url: baseUrl+ "/shuttle/table/shuttle/state",
- headers: {'token': localStorage.getItem('token')},
- method: 'POST',
- success: function (res) {
- res.data.forEach((item,index) => {
- if(lev == item.locNoLev){
- let carBox = '<div class="sxcar" id="sxcar-' + item.shuttleNo + '"></div>'
- $("#mapDataId").append(carBox)
- }
- })
- }
- });
}
//灏嗗湴鍥炬暟鎹浆鎹㈡垚int浜岀淮鏁扮粍(鍚庣画鐢ㄤ簬璇锋眰璁＄畻璺緞鏃舵惡甯﹀湴鍥炬暟鎹弬鏁颁娇鐢�)
--
Gitblit v1.9.1