From a5fd6b72f8342f0228321849b04c822feba2d2a0 Mon Sep 17 00:00:00 2001
From: taisheng <taisheng@qq.com>
Date: 星期三, 02 七月 2025 09:42:42 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/shuttle_rcs' into shuttle_rcs
---
src/main/webapp/views/console.html | 49 ++++++++++++++++++++++++++++++++++++++++---------
1 files changed, 40 insertions(+), 9 deletions(-)
diff --git a/src/main/webapp/views/console.html b/src/main/webapp/views/console.html
index 7f5fb5d..8e4316f 100644
--- a/src/main/webapp/views/console.html
+++ b/src/main/webapp/views/console.html
@@ -78,6 +78,7 @@
<div>
<!-- <el-button @click="testMove()">娴嬭瘯绉诲姩杞�</el-button>-->
<el-button @click="resetMap()">閲嶇疆鍦板浘</el-button>
+ <el-button @click="checkTask()">浠诲姟妫�娴�</el-button>
<!-- <el-button @click="initLoc()">鍒濆鍖栧簱浣�</el-button>-->
</div>
</div>
@@ -334,7 +335,7 @@
map: [],//鍦板浘鏁版嵁
currentLev: 1,//鍦板浘褰撳墠妤煎眰
siteWindow: false, //绔欑偣寮圭獥鏄剧ず榛樿涓嶆樉绀�
- floorList: [1, 2, 3, 4], //褰撳墠椤圭洰妤煎眰
+ floorList: [], //褰撳墠椤圭洰妤煎眰
shuttleList: [], //鍥涘悜绌挎杞﹂泦鍚�
currentLevShuttleList: [],//褰撳墠妤煎眰鍥涘悜绌挎杞﹂泦鍚�
shuttleColorList: [],//鍥涘悜绌挎杞﹂鑹查泦鍚�
@@ -361,6 +362,7 @@
this.getMap(this.currentLev)
this.getSystemRunningStatus() //鑾峰彇绯荤粺杩愯鐘舵��
+ this.initLev()//鍒濆鍖栨ゼ灞備俊鎭�
this.consoleInterval = setInterval(() => {
this.getShuttleStateInfo() //鑾峰彇鍥涘悜绌挎杞︿俊鎭�
@@ -663,24 +665,53 @@
}
})
},
- initLoc() {
- //鍒濆鍖栧簱浣�
+ checkTask() {
let that = this
$.ajax({
- url:baseUrl+"/locMast/init",
+ url:baseUrl+"/console/checkTask",
headers:{
'token': localStorage.getItem('token')
},
data:{},
- method:'post',
+ method:'get',
success:function (res) {
- that.$message({
- message: '鍒濆鍖栧畬鎴�',
- type: 'success'
- });
+ if (res.code === 200) {
+ that.$message({
+ message: res.msg,
+ type: 'success'
+ });
+ } else {
+ that.$message({
+ message: res.msg,
+ type: 'error'
+ });
+ }
}
})
},
+ initLev(){
+ let that = this
+ $.ajax({
+ url: baseUrl + "/console/map/lev/list",
+ headers: {
+ 'token': localStorage.getItem('token')
+ },
+ 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({
"url": "/console/barcode/output/site",
--
Gitblit v1.9.1