From d9505e143cdf452c3a33752b380ee1b3a410601d Mon Sep 17 00:00:00 2001
From: Junjie <xjj@123>
Date: 星期四, 16 十月 2025 14:48:52 +0800
Subject: [PATCH] #
---
src/main/webapp/views/admin/locMap/locMap.html | 35 +++++++++++++++++++++--------------
1 files changed, 21 insertions(+), 14 deletions(-)
diff --git a/src/main/webapp/views/admin/locMap/locMap.html b/src/main/webapp/views/admin/locMap/locMap.html
index 347f66c..25d50c5 100644
--- a/src/main/webapp/views/admin/locMap/locMap.html
+++ b/src/main/webapp/views/admin/locMap/locMap.html
@@ -59,9 +59,9 @@
>
<div v-if="drawerLocNoData!=null">
<div style="margin: 10px;">
- <div style="margin-top: 5px;">X锛歿{drawerLocNoData.x}}</div>
- <div style="margin-top: 5px;">Y锛歿{drawerLocNoData.y}}</div>
- <div style="margin-top: 5px;">Z锛歿{drawerLocNoData.z}}</div>
+ <div style="margin-top: 5px;">鎺掞細{{drawerLocNoData.row}}</div>
+ <div style="margin-top: 5px;">鍒楋細{{drawerLocNoData.bay}}</div>
+ <div style="margin-top: 5px;">灞傦細{{drawerLocNoData.lev}}</div>
<div style="margin-top: 5px;">搴撲綅鍙凤細{{drawerLocNoData.locNo}}</div>
<div style="margin-top: 5px;">搴撲綅鐘舵�侊細{{drawerLocNoData.locSts}}</div>
</div>
@@ -193,22 +193,26 @@
},
methods: {
init(){
+ let that = this
ws = new WebSocket("ws://" + window.location.host + baseUrl + "/console/websocket");
ws.onopen = this.webSocketOnOpen
ws.onerror = this.webSocketOnError
ws.onmessage = this.webSocketOnMessage
ws.onclose = this.webSocketClose
- this.getMap(this.currentLev)
- this.initLev()//鍒濆鍖栨ゼ灞備俊鎭�
- this.consoleInterval = setInterval(() => {
- this.getMap(this.currentLev) //鑾峰彇瀹炴椂鍦板浘鏁版嵁
- this.getShuttleStateInfo() //鑾峰彇鍥涘悜绌挎杞︿俊鎭�
- this.getLiftStateInfo() //鑾峰彇鎻愬崌鏈轰俊鎭�
- this.getSiteInfo() //鑾峰彇杈撻�佺珯鐐规暟鎹�
- // this.getCodeData()//鑾峰彇鏉＄爜
- }, 1000)
+ this.initLev()//鍒濆鍖栨ゼ灞備俊鎭�
+ setTimeout(() => {
+ that.getMap(this.currentLev)
+ }, 1000);
+
+ // this.consoleInterval = setInterval(() => {
+ // this.getMap(this.currentLev) //鑾峰彇瀹炴椂鍦板浘鏁版嵁
+ // this.getShuttleStateInfo() //鑾峰彇鍥涘悜绌挎杞︿俊鎭�
+ // this.getLiftStateInfo() //鑾峰彇鎻愬崌鏈轰俊鎭�
+ // this.getSiteInfo() //鑾峰彇杈撻�佺珯鐐规暟鎹�
+ // // this.getCodeData()//鑾峰彇鏉＄爜
+ // }, 1000)
},
initLev(){
@@ -317,7 +321,7 @@
//鑾峰彇鍦板浘鏁版嵁
getMap(lev) {
this.sendWs(JSON.stringify({
- "url": "/console/map/auth",
+ "url": "/console/locMap/auth",
"data": lev
}))
},
@@ -577,7 +581,8 @@
},
rightEvent(x, y, e) {
this.drawerLocNo = true
- this.drawerLocNoData = {x:x, y: y, z: this.currentLev, locNo: this.map[x][y].locNo, locSts: this.map[x][y].locSts};
+ this.drawerLocNoData = {x:x, y: y, z: this.currentLev, locNo: this.map[x][y].locNo,
+ locSts: this.map[x][y].locSts,row:this.map[x][y].row, bay: this.map[x][y].bay, lev: this.currentLev};
},
findDiffList(arr1, arr2) {
let diff = []
@@ -693,6 +698,8 @@
this.setSiteInfo(JSON.parse(result.data))
}else if (result.url == "/console/map/auth") {
this.setMap(JSON.parse(result.data))
+ }else if (result.url == "/console/locMap/auth") {
+ this.setMap(JSON.parse(result.data))
}else if (result.url == "/console/barcode/output/site") {
this.setCodeData(JSON.parse(result.data))
}
--
Gitblit v1.9.1