From 0d04e9440d19f30a8220f498ebdde5a8bfcc48a8 Mon Sep 17 00:00:00 2001
From: Junjie <fallin.jie@qq.com>
Date: 星期二, 10 十月 2023 13:50:03 +0800
Subject: [PATCH] #机械臂任务下发

---
 src/main/webapp/views/console.html |   66 +++++++++++++++++++++++++++++----
 1 files changed, 58 insertions(+), 8 deletions(-)

diff --git a/src/main/webapp/views/console.html b/src/main/webapp/views/console.html
index 3c5f1f0..a841049 100644
--- a/src/main/webapp/views/console.html
+++ b/src/main/webapp/views/console.html
@@ -31,19 +31,19 @@
 							</div>
 							<div v-else-if="col.value == 4">
 								<!-- 绔欑偣 -->
-								<div class="site" @click="openSite(col.data)">{{col.data}}</div>
+								<div class="site" :id="'site-' + col.data" @click="openSite(col.data)">{{col.data}}</div>
 							</div>
 							<div v-else-if="col.value == 5">
 								<!-- 鍏呯數妗� -->
 								<div class="item" style="font-size: 24px">&#9889;</div>
 							</div>
-							<div v-else-if="col.value < 0">
-								<!-- 绂佹鏄剧ず鍖哄煙 -->
-								<div class="item" style="visibility: hidden">{{idx}}</div>
-							</div>
 							<div v-else-if="col.value == -999">
 								<!-- 璺緞鍗犵敤鍖哄煙 -->
 								<div class="item" style="background:#f83333;color: #fff;">{{idx}}</div>
+							</div>
+							<div v-else-if="col.value < 0">
+								<!-- 绂佹鏄剧ず鍖哄煙 -->
+								<div class="item" style="visibility: hidden">{{idx}}</div>
 							</div>
 							<div v-else>
 								<div class="item" v-if="col.data.length > 0">{{col.data}}</div>
@@ -73,10 +73,11 @@
 				<!--杈撳嚭妤煎眰-->
 				<div style="height: 100%;">
 					<div class="floorBtnBox" v-for="(lev,idx) in floorList">
-						<el-button @click="changFloor(lev)">{{lev}}F</el-button>
+						<el-button :style="{background:currentLev === lev ? '#7DCDFF':''}" @click="changFloor(lev)">{{lev}}F</el-button>
 					</div>
 					<div>
 						<el-button @click="testMove()">娴嬭瘯绉诲姩杞�</el-button>
+						<el-button @click="resetMap()">閲嶇疆鍦板浘</el-button>
 					</div>
 				</div>
 			</div>
@@ -354,6 +355,8 @@
 						this.consoleInterval = setInterval(() => {
 							this.getShuttleStateInfo() //鑾峰彇鍥涘悜绌挎杞︿俊鎭�
 							this.getLiftStateInfo() //鑾峰彇鎻愬崌鏈轰俊鎭�
+							this.getSiteInfo() //鑾峰彇杈撻�佺珯鐐规暟鎹�
+							this.getMap(this.currentLev) //鑾峰彇瀹炴椂鍦板浘鏁版嵁
 						}, 1000)
 					},
 					//鑾峰彇鍦板浘鏁版嵁
@@ -370,6 +373,7 @@
 								for (let i = 1; i < data.length - 1; i++) {
 									tmp.push(data[i])
 								}
+								console.log(tmp)
 								this.map = tmp
 							}
 						})
@@ -400,6 +404,32 @@
 
 						})
 					},
+					getSiteInfo() {
+						//鑾峰彇杈撻�佺珯鐐规暟鎹�
+						$.ajax({
+							url: baseUrl+ "/console/latest/data/site",
+							headers: {'token': localStorage.getItem('token')},
+							method: 'POST',
+							success: function (res) {
+								if (res.code === 200){
+									var sites = res.data;
+									for (var i = 0; i < sites.length; i++){
+										var siteEl = $("#site-"+sites[i].siteId);
+										siteEl.attr("class", "site " + sites[i].siteStatus);
+										if (sites[i].workNo != null && sites[i].workNo>0) {
+											siteEl.html(sites[i].siteId + "[" + sites[i].workNo + "]");
+										} else {
+											siteEl.html(sites[i].siteId);
+										}
+									}
+								} else if (res.code === 403){
+									parent.location.href = baseUrl+"/login";
+								}  else {
+									console.log(res.msg);
+								}
+							}
+						});
+					},
 					changFloor(lev) {
 						this.currentLev = lev
 						this.currentLevShuttleList = []
@@ -418,8 +448,10 @@
 								if (res.code == 200) {
 									let currentLevShuttle = []//褰撳墠妤煎眰灏忚溅闆嗗悎
 									res.data.forEach((item,idx) => {
-										if (item.point.z == that.currentLev) {
-											currentLevShuttle.push(item)
+										if (item != null && item.point != undefined && item.point != null) {
+											if (item.point.z == that.currentLev) {
+												currentLevShuttle.push(item);
+											}
 										}
 									})
 									that.currentLevShuttleList = currentLevShuttle
@@ -609,6 +641,24 @@
 							}
 						}
 						return data;//杩斿洖灏忚溅鍙烽泦鍚�
+					},
+					resetMap() {
+						//閲嶇疆鍦板浘
+						let that = this
+						$.ajax({
+							url:baseUrl+"/console/map/resetMap/auth",
+							headers:{
+								'token': localStorage.getItem('token')
+							},
+							data:{},
+							method:'get',
+							success:function (res) {
+								that.$message({
+									message: '閲嶇疆瀹屾垚',
+									type: 'success'
+								});
+							}
+						})
 					}
 				}
 			})

--
Gitblit v1.9.1