From 03e68b2be24ea024eae645c47da1d4cb1773302a Mon Sep 17 00:00:00 2001
From: Junjie <fallin.jie@qq.com>
Date: 星期五, 13 十月 2023 19:47:13 +0800
Subject: [PATCH] #

---
 src/main/webapp/views/console.html |   36 +++++++++++++++++++++++++++++-------
 1 files changed, 29 insertions(+), 7 deletions(-)

diff --git a/src/main/webapp/views/console.html b/src/main/webapp/views/console.html
index 6182599..f03c349 100644
--- a/src/main/webapp/views/console.html
+++ b/src/main/webapp/views/console.html
@@ -37,13 +37,13 @@
 								<!-- 鍏呯數妗� -->
 								<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>
@@ -187,7 +187,7 @@
 							<li><span>鏉＄爜鍚嶇О</span><span class="right">鎵爜鏃堕棿</span></li>
 						</div>
 						<div id="barcode1" class="table-body">
-
+							<li v-for="(item,index) in codeList1" :key="index"><span>{{item.barcode}}</span><span class="right">{{item.time}}</span></li>
 						</div>
 					</div>
 					<div class="tablebox">
@@ -195,7 +195,7 @@
 							<li><span>鏉＄爜鍚嶇О</span><span class="right">鎵爜鏃堕棿</span></li>
 						</div>
 						<div id="barcode2" class="table-body">
-
+							<li v-for="(item,index) in codeList2" :key="index"><span>{{item.barcode}}</span><span class="right">{{item.time}}</span></li>
 						</div>
 					</div>
 				</div>
@@ -340,6 +340,8 @@
 					liftList: [], //鎻愬崌鏈洪泦鍚�
 					systemStatus: true,//绯荤粺杩愯鐘舵��
 					consoleInterval: null,//瀹氭椂鍣ㄥ瓨鍌ㄥ彉閲�
+					codeList1: [],//鏉＄爜List
+					codeList2: [],//鏉＄爜List
 				},
 				created() {
 					this.init()
@@ -356,6 +358,8 @@
 							this.getShuttleStateInfo() //鑾峰彇鍥涘悜绌挎杞︿俊鎭�
 							this.getLiftStateInfo() //鑾峰彇鎻愬崌鏈轰俊鎭�
 							this.getSiteInfo() //鑾峰彇杈撻�佺珯鐐规暟鎹�
+							this.getMap(this.currentLev) //鑾峰彇瀹炴椂鍦板浘鏁版嵁
+							this.getCodeData()//鑾峰彇鏉＄爜
 						}, 1000)
 					},
 					//鑾峰彇鍦板浘鏁版嵁
@@ -372,7 +376,7 @@
 								for (let i = 1; i < data.length - 1; i++) {
 									tmp.push(data[i])
 								}
-								console.log(tmp)
+								// console.log(tmp)
 								this.map = tmp
 							}
 						})
@@ -658,6 +662,24 @@
 								});
 							}
 						})
+					},
+					getCodeData(){
+						let that = this
+						$.ajax({
+							url:baseUrl +'/console/barcode/output/site',
+							method:'GET',
+							success:function (res) {
+								if(res.code === 200){
+									let data = JSON.parse(res.data)
+									if(data.length<=5){
+										that.codeList1 = data
+									} else {
+										tData1 = data.slice(0,5)
+										tData2 = data.splice(5,10)
+									}
+								}
+							}
+						})
 					}
 				}
 			})

--
Gitblit v1.9.1