From bdb924aaaef6a8d282ed2d34850cfd229d5865c7 Mon Sep 17 00:00:00 2001
From: Junjie <DELL@qq.com>
Date: 星期一, 08 十二月 2025 09:31:42 +0800
Subject: [PATCH] #增加许可证
---
src/main/webapp/views/console.html | 149 +++++++++++++++++++++++--------------------------
1 files changed, 70 insertions(+), 79 deletions(-)
diff --git a/src/main/webapp/views/console.html b/src/main/webapp/views/console.html
index 8e4316f..17b177f 100644
--- a/src/main/webapp/views/console.html
+++ b/src/main/webapp/views/console.html
@@ -13,6 +13,9 @@
<script type="text/javascript" src="../static/js/common.js"></script>
<script type="text/javascript" src="../static/vue/js/vue.min.js"></script>
<script type="text/javascript" src="../static/vue/element/element.js"></script>
+ <style>
+
+ </style>
</head>
<body>
<div id="app">
@@ -57,15 +60,17 @@
</div>
</div>
- <!--杈撳嚭灏忚溅-->
- <div v-for="(car,idx) in currentLevShuttleList"
- :style="{
- 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">
- {{car.shuttleNo}}
+ <div
+ v-for="(car, idx) in currentLevShuttleList"
+ :style="{
+ '--x-pos': getCarPosition(car.point.x, car.point.y)[1],
+ '--y-pos': getCarPosition(car.point.x, car.point.y)[0],
+ color: shuttleColorList[car.shuttleNo]
+ }"
+ class="sxcar"
+ :id="'sxcar-' + car.shuttleNo"
+ >
+ {{ car.shuttleNo }}
</div>
</div>
@@ -77,8 +82,7 @@
</div>
<div>
<!-- <el-button @click="testMove()">娴嬭瘯绉诲姩杞�</el-button>-->
- <el-button @click="resetMap()">閲嶇疆鍦板浘</el-button>
- <el-button @click="checkTask()">浠诲姟妫�娴�</el-button>
+<!-- <el-button @click="resetMap()">閲嶇疆鍦板浘</el-button>-->
<!-- <el-button @click="initLoc()">鍒濆鍖栧簱浣�</el-button>-->
</div>
</div>
@@ -165,43 +169,43 @@
<span class="lift-offline">绂荤嚎</span>
</div>
</div>
- <!-- 杈撻�佺嚎鐘舵�� -->
- <div class="line-status">
- <div class="body-head">杈撻�佺嚎鐘舵��</div>
- <div class="state states">
- <span>杩愯緭绾挎�绘暟</span>
- <span class="line-ss">9</span>
- </div>
- <div class="allStatus"><span>鎵�鏈夌姸鎬�</span></div>
- <div class="allStatus item-group">
- <span class="site-auto-run-id">鑷姩+鏈夌墿+ID</span>
- <span class="site-auto-run">鑷姩+鏈夌墿</span>
- <span class="site-auto-id">鑷姩+ID</span>
- <span class="site-auto">鑷姩</span>
- <span class="site-unauto">闈炶嚜鍔�/鎵嬪姩</span>
- </div>
- </div>
- <!-- 鏉＄爜琛ㄦ牸 -->
- <div class="bar-code">
- <div class="body-head" id="code">鏉＄爜鎵弿鍣�</div>
- <div class="tablebox">
- <div class="table-head">
- <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">
- <div class="table-head">
- <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>
- </div>
+<!-- <!– 杈撻�佺嚎鐘舵�� –>-->
+<!-- <div class="line-status">-->
+<!-- <div class="body-head">杈撻�佺嚎鐘舵��</div>-->
+<!-- <div class="state states">-->
+<!-- <span>杩愯緭绾挎�绘暟</span>-->
+<!-- <span class="line-ss">9</span>-->
+<!-- </div>-->
+<!-- <div class="allStatus"><span>鎵�鏈夌姸鎬�</span></div>-->
+<!-- <div class="allStatus item-group">-->
+<!-- <span class="site-auto-run-id">鑷姩+鏈夌墿+ID</span>-->
+<!-- <span class="site-auto-run">鑷姩+鏈夌墿</span>-->
+<!-- <span class="site-auto-id">鑷姩+ID</span>-->
+<!-- <span class="site-auto">鑷姩</span>-->
+<!-- <span class="site-unauto">闈炶嚜鍔�/鎵嬪姩</span>-->
+<!-- </div>-->
+<!-- </div>-->
+<!-- <!– 鏉＄爜琛ㄦ牸 –>-->
+<!-- <div class="bar-code">-->
+<!-- <div class="body-head" id="code">鏉＄爜鎵弿鍣�</div>-->
+<!-- <div class="tablebox">-->
+<!-- <div class="table-head">-->
+<!-- <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">-->
+<!-- <div class="table-head">-->
+<!-- <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>-->
+<!-- </div>-->
<!-- 杈撻�佽澶囧脊绐� -->
<div id="siteWindow" :style="{display:siteWindow?'block':'none'}" class="animate__animated animate__fadeIn">
@@ -354,17 +358,13 @@
},
methods: {
init() {
- this.ws = new WebSocket("ws://" + window.location.host + baseUrl + "/console/websocket");
- this.ws.onopen = this.webSocketOnOpen
- this.ws.onerror = this.webSocketOnError
- this.ws.onmessage = this.webSocketOnMessage
- this.ws.onclose = this.webSocketClose
-
this.getMap(this.currentLev)
this.getSystemRunningStatus() //鑾峰彇绯荤粺杩愯鐘舵��
this.initLev()//鍒濆鍖栨ゼ灞備俊鎭�
this.consoleInterval = setInterval(() => {
+ this.websocketConnect()
+
this.getShuttleStateInfo() //鑾峰彇鍥涘悜绌挎杞︿俊鎭�
this.getLiftStateInfo() //鑾峰彇鎻愬崌鏈轰俊鎭�
this.getSiteInfo() //鑾峰彇杈撻�佺珯鐐规暟鎹�
@@ -665,30 +665,6 @@
}
})
},
- checkTask() {
- let that = this
- $.ajax({
- url:baseUrl+"/console/checkTask",
- headers:{
- 'token': localStorage.getItem('token')
- },
- data:{},
- method:'get',
- success:function (res) {
- if (res.code === 200) {
- that.$message({
- message: res.msg,
- type: 'success'
- });
- } else {
- that.$message({
- message: res.msg,
- type: 'error'
- });
- }
- }
- })
- },
initLev(){
let that = this
$.ajax({
@@ -729,10 +705,20 @@
}
}
},
+ websocketConnect() {
+ if (this.ws == null) {
+ this.ws = new WebSocket("ws://" + window.location.host + baseUrl + "/console/websocket");
+ this.ws.onopen = this.webSocketOnOpen
+ this.ws.onerror = this.webSocketOnError
+ this.ws.onmessage = this.webSocketOnMessage
+ this.ws.onclose = this.webSocketClose
+ }
+ },
webSocketOnOpen(e) {
console.log("open");
},
webSocketOnError(e) {
+ this.ws = null;
console.log(e);
},
webSocketOnMessage(e) {
@@ -750,11 +736,16 @@
}
},
webSocketClose(e) {
+ this.ws = null;
console.log("close");
},
sendWs(message) {
+ if (this.ws == null) {
+ return;
+ }
+
if (this.ws.readyState == WebSocket.OPEN) {
- this.ws.send(message)
+ this.ws.send(message);
}
}
}
--
Gitblit v1.9.1