From afc12f9bbd372b55a4539c1fc40b17dbd5949cb1 Mon Sep 17 00:00:00 2001
From: zhang <zc857179121@qq.com>
Date: 星期二, 19 八月 2025 13:44:38 +0800
Subject: [PATCH] 1
---
src/main/webapp/views/console.html | 42 ++++++++++++++++++++++++------------------
1 files changed, 24 insertions(+), 18 deletions(-)
diff --git a/src/main/webapp/views/console.html b/src/main/webapp/views/console.html
index 2bd4961..1da3dbe 100644
--- a/src/main/webapp/views/console.html
+++ b/src/main/webapp/views/console.html
@@ -60,8 +60,8 @@
<!--杈撳嚭灏忚溅-->
<div v-for="(car,idx) in currentLevShuttleList"
:style="{
- left: getCarPosition(car.wcsPoint.x,car.wcsPoint.y)[1]
- ,top: getCarPosition(car.wcsPoint.x,car.wcsPoint.y)[0]
+ left: getCarPosition(car.point.x,car.point.y)[1]
+ ,top: getCarPosition(car.point.x,car.point.y)[0]
,color: shuttleColorList[car.shuttleNo]
}"
class="sxcar" :id="'sxcar-' + car.shuttleNo">
@@ -78,7 +78,7 @@
<div>
<!-- <el-button @click="testMove()">娴嬭瘯绉诲姩杞�</el-button>-->
<el-button @click="resetMap()">閲嶇疆鍦板浘</el-button>
- <el-button @click="initLoc()">鍒濆鍖栧簱浣�</el-button>
+<!-- <el-button @click="initLoc()">鍒濆鍖栧簱浣�</el-button>-->
</div>
</div>
</div>
@@ -334,7 +334,7 @@
map: [],//鍦板浘鏁版嵁
currentLev: 1,//鍦板浘褰撳墠妤煎眰
siteWindow: false, //绔欑偣寮圭獥鏄剧ず榛樿涓嶆樉绀�
- floorList: [1, 2, 3], //褰撳墠椤圭洰妤煎眰
+ floorList: [], //褰撳墠椤圭洰妤煎眰
shuttleList: [], //鍥涘悜绌挎杞﹂泦鍚�
currentLevShuttleList: [],//褰撳墠妤煎眰鍥涘悜绌挎杞﹂泦鍚�
shuttleColorList: [],//鍥涘悜绌挎杞﹂鑹查泦鍚�
@@ -361,6 +361,7 @@
this.getMap(this.currentLev)
this.getSystemRunningStatus() //鑾峰彇绯荤粺杩愯鐘舵��
+ this.initLev()//鍒濆鍖栨ゼ灞備俊鎭�
this.consoleInterval = setInterval(() => {
this.getShuttleStateInfo() //鑾峰彇鍥涘悜绌挎杞︿俊鎭�
@@ -599,8 +600,8 @@
let tmp = null
tmp = setInterval(() => {
if (index < res.length) {
- that.currentLevShuttleList[0].wcsPoint.y = res[index].y
- that.currentLevShuttleList[0].wcsPoint.x = res[index].x
+ that.currentLevShuttleList[0].point.y = res[index].y
+ that.currentLevShuttleList[0].point.x = res[index].x
index++
}else {
clearInterval(tmp)
@@ -663,23 +664,28 @@
}
})
},
- initLoc() {
- //鍒濆鍖栧簱浣�
+ initLev(){
let that = this
$.ajax({
- url:baseUrl+"/locMast/init",
- headers:{
+ url: baseUrl + "/console/map/lev/list",
+ headers: {
'token': localStorage.getItem('token')
},
- data:{},
- method:'post',
- success:function (res) {
- that.$message({
- message: '鍒濆鍖栧畬鎴�',
- type: 'success'
- });
+ data: {},
+ method: 'get',
+ success: function(res) {
+ if (res.code === 200) {
+ that.floorList = res.data;
+ } else if (res.code === 403) {
+ parent.location.href = baseUrl + "/login";
+ } else {
+ that.$message({
+ message: res.msg,
+ type: 'error'
+ });
+ }
}
- })
+ });
},
getCodeData(){
this.sendWs(JSON.stringify({
--
Gitblit v1.9.1