From e4a672a1ff1d8d881fe3071edb69080c2edaa96c Mon Sep 17 00:00:00 2001
From: Junjie <fallin.jie@qq.com>
Date: 星期三, 02 八月 2023 08:57:49 +0800
Subject: [PATCH] 充电任务

---
 src/main/webapp/views/console.html |   31 +++++++++++++++++++------------
 1 files changed, 19 insertions(+), 12 deletions(-)

diff --git a/src/main/webapp/views/console.html b/src/main/webapp/views/console.html
index 98de46f..5a080ce 100644
--- a/src/main/webapp/views/console.html
+++ b/src/main/webapp/views/console.html
@@ -23,16 +23,22 @@
                 <button class="floorBtn  btn-16" onclick="changFloor(this,2)" style="margin-top: 200px">2F</button>
                 <button class="floorBtn  btn-16" onclick="changFloor(this,3)" style="margin-top: 250px">3F</button>
                 <button class="floorBtn  btn-16" onclick="changFloor(this,4)" style="margin-top: 300px">4F</button>
+                <button class="floorBtn  btn-16" onclick="changFloor(this,5)" style="margin-top: 350px">5F</button>
+                <button class="floorBtn  btn-16" onclick="changFloor(this,6)" style="margin-top: 400px">6F</button>
+                <button class="floorBtn  btn-16" onclick="changFloor(this,7)" style="margin-top: 450px">7F</button>
+                <button class="floorBtn  btn-16" onclick="changFloor(this,8)" style="margin-top: 500px">8F</button>
+                <button class="floorBtn  btn-16" onclick="changFloor(this,9)" style="margin-top: 550px">9F</button>
+                <button class="floorBtn  btn-16" onclick="changFloor(this,10)" style="margin-top: 600px">10F</button>
             </div>
-<!--            <button class="floorBtn  btn-16" onclick="testMove()" style="margin-top: 350px;font-size: 14px;">娴嬭瘯绉诲姩杞�</button>-->
-            <button class="floorBtn  btn-16" onclick="resetMap()" style="margin-top: 400px;font-size: 14px;">閲嶇疆鍦板浘</button>
+            <button class="floorBtn  btn-16" onclick="resetMap()" style="margin-top: 650px;font-size: 14px;">閲嶇疆鍦板浘</button>
+<!--            <button class="floorBtn  btn-16" onclick="testMove()" style="margin-top: 700px;font-size: 14px;">娴嬭瘯绉诲姩杞�</button>-->
 
         <!-- 璐ф灦 + 鍫嗗灈鏈� + 鍏ュ簱绔欑偣 -->
-        <div class="main-part">
-            <!-- 绗竴缁� -->
-            <div class="lane" id="mapDataId" style="margin-bottom: 280px">
+        <div class="main-part" id="mapDataId">
+<!--            &lt;!&ndash; 绗竴缁� &ndash;&gt;-->
+<!--            <div class="lane" id="mapDataId" style="margin-bottom: 280px">-->
 
-            </div>
+<!--            </div>-->
         </div>
     </main>
     <footer class="footer">
@@ -60,7 +66,7 @@
         <!-- 鍥涘悜绌挎杞︾姸鎬� -->
         <div class="line-status">
             <div class="body-head">绌挎杞︾姸鎬�</div>
-            <div id="shuttle-status-box">
+            <div id="shuttle-status-box" style="height: 100px;overflow-y: scroll;overflow-x: hidden;">
             </div>
             <div class="button"><span>鎵�鏈夌姸鎬�</span></div>
             <div class="button item-group">
@@ -76,7 +82,7 @@
         <!-- 鎻愬崌鏈虹姸鎬� -->
         <div class="line-status">
             <div class="body-head">鎻愬崌鏈虹姸鎬�</div>
-            <div id="lift-status-box">
+            <div id="lift-status-box" style="height: 120px;overflow-y: scroll;overflow-x: hidden;">
 
             </div>
             <div class="button"><span>鎵�鏈夌姸鎬�</span></div>
@@ -427,7 +433,7 @@
                 $("#lift-status-box").empty()
                 res.data.forEach((item,index) => {
                     let liftStatusClass = "lift-idle"
-                    switch (item.status) {
+                    switch (item.protocolStatus) {
                         case 1://绌洪棽
                             liftStatusClass = "lift-idle";
                             break
@@ -463,7 +469,7 @@
                 $("#shuttle-status-box").empty()
                 res.data.forEach((item,index) => {
                     let shuttleStatusClass = "shuttle-idle"
-                    switch (item.status) {
+                    switch (item.protocolStatus) {
                         case 1://绌洪棽
                             shuttleStatusClass = "shuttle-idle";
                             break
@@ -490,7 +496,7 @@
                     }
                     let shuttleStatus = '<div class="state">' +
                         '<span>鍥涘悜绌挎杞� ' + item.shuttleNo + '</span>' +
-                        '<span class="state-ss ' + shuttleStatusClass + '">' + item.status$ + '</span></div>';
+                        '<span class="state-ss ' + shuttleStatusClass + '">' + item.protocolStatus$ + '</span></div>';
                     $("#shuttle-status-box").append(shuttleStatus)
 
                     if(item.locNoLev != currentLev){
@@ -508,7 +514,7 @@
     //璁＄畻鍥涘悜绌挎杞﹀浘鏍囦綅缃�
     function getCarPosition(x,y) {
         let top = (x * 35 - 35) + "px" //闇�瑕佸噺鍘诲皬杞﹁嚜宸辨墍鍗犻珮搴�
-        let left = (y * 70 - 70) + "px" //闇�瑕佸噺鍘诲皬杞﹁嚜宸辨墍鍗犲搴�
+        let left = (y * 35 - 35) + "px" //闇�瑕佸噺鍘诲皬杞﹁嚜宸辨墍鍗犲搴�
         return [top,left];
     }
 
@@ -552,6 +558,7 @@
             headers: {'token': localStorage.getItem('token')},
             success: (res) => {
                 let data = res.data
+                console.log(data)
                 mapData = data
                 let content = ""
                 data.forEach((rowData,index) => {

--
Gitblit v1.9.1