From 5c12ee87de4f483ce6a205b53996944c8e4506a7 Mon Sep 17 00:00:00 2001
From: Junjie <fallin.jie@qq.com>
Date: 星期二, 07 一月 2025 16:58:23 +0800
Subject: [PATCH] #

---
 src/main/webapp/views/console.html                     |    2 +-
 src/main/webapp/views/index.html                       |    2 --
 src/main/webapp/static/css/index.css                   |    6 +++---
 src/main/webapp/views/console4.html                    |   20 +++++++++++++++++++-
 src/main/java/com/zy/common/utils/NavigateMapData.java |    4 ++--
 5 files changed, 25 insertions(+), 9 deletions(-)

diff --git a/src/main/java/com/zy/common/utils/NavigateMapData.java b/src/main/java/com/zy/common/utils/NavigateMapData.java
index 98cc5a1..6e9a3a8 100644
--- a/src/main/java/com/zy/common/utils/NavigateMapData.java
+++ b/src/main/java/com/zy/common/utils/NavigateMapData.java
@@ -371,11 +371,11 @@
 
                 if (mapType == NavigationMapType.DFX.id) {
                     //杞﹁締鏈夎揣
-                    if (staProtocol.getHasTray()) {
+                    if (staProtocol.getHasTray() != null && staProtocol.getHasTray()) {
                         mapNode.setValue(MapNodeType.DISABLE.id);
                     }
                 }else {
-                    if (staProtocol.getHasCar()) {
+                    if (staProtocol.getHasCar() != null && staProtocol.getHasCar()) {
                         mapNode.setValue(MapNodeType.CAR.id);
                     }
                 }
diff --git a/src/main/webapp/static/css/index.css b/src/main/webapp/static/css/index.css
index e625365..60e071c 100644
--- a/src/main/webapp/static/css/index.css
+++ b/src/main/webapp/static/css/index.css
@@ -7,7 +7,7 @@
 }
 
 .sidebar {
-    width: 8%;
+    width: 10%;
     height: 50%;
     line-height: 5.625em;
     position: fixed;
@@ -76,11 +76,11 @@
 
 
 .nav-unselect {
-    color: #FFFFFF;
+    color: #000000;
 }
 .nav-select {
     font-weight: 900;
-    color:  #fff;
+    color: #ffe100;
 }
 
 
diff --git a/src/main/webapp/views/console.html b/src/main/webapp/views/console.html
index 1f9a9dd..ed81f30 100644
--- a/src/main/webapp/views/console.html
+++ b/src/main/webapp/views/console.html
@@ -333,7 +333,7 @@
 					map: [],//鍦板浘鏁版嵁
 					currentLev: 1,//鍦板浘褰撳墠妤煎眰
 					siteWindow: false, //绔欑偣寮圭獥鏄剧ず榛樿涓嶆樉绀�
-					floorList: [1, 2, 3, 4, 5, 6, 7, 8, 9, 10], //褰撳墠椤圭洰妤煎眰
+					floorList: [1, 2, 3], //褰撳墠椤圭洰妤煎眰
 					shuttleList: [], //鍥涘悜绌挎杞﹂泦鍚�
 					currentLevShuttleList: [],//褰撳墠妤煎眰鍥涘悜绌挎杞﹂泦鍚�
 					shuttleColorList: [],//鍥涘悜绌挎杞﹂鑹查泦鍚�
diff --git a/src/main/webapp/views/console4.html b/src/main/webapp/views/console4.html
index baceb7d..d974358 100644
--- a/src/main/webapp/views/console4.html
+++ b/src/main/webapp/views/console4.html
@@ -150,7 +150,7 @@
     data: {
       map: [],
       currentLev: 1,
-      floorList: [1, 2, 3, 4, 5, 6, 7, 8, 9, 10], //褰撳墠椤圭洰妤煎眰
+      floorList: [1, 2, 3], //褰撳墠椤圭洰妤煎眰
       currentLevShuttleList: [],//褰撳墠妤煎眰鍥涘悜绌挎杞﹂泦鍚�
       shuttleColorList: [],//鍥涘悜绌挎杞﹂鑹查泦鍚�
       drawer: false,
@@ -932,6 +932,24 @@
           })
         }
       },
+      resetMap() {
+        //閲嶇疆鍦板浘
+        let that = this
+        $.ajax({
+          url:baseUrl+"/console/map/resetMap/" + this.currentLev,
+          headers:{
+            'token': localStorage.getItem('token')
+          },
+          data:{},
+          method:'get',
+          success:function (res) {
+            that.$message({
+              message: that.currentLev + '灞傚湴鍥鹃噸缃畬鎴�',
+              type: 'success'
+            });
+          }
+        })
+      },
     }
   })
 
diff --git a/src/main/webapp/views/index.html b/src/main/webapp/views/index.html
index 3e064f6..e9c8b09 100644
--- a/src/main/webapp/views/index.html
+++ b/src/main/webapp/views/index.html
@@ -23,8 +23,6 @@
             <li><a id="lift" onclick="nav(this.id)" class="nav-unselect" href="#">鎻愬崌鏈�</a></li>
 <!--            <li><a id="ste" onclick="nav(this.id)" class="nav-unselect" href="#">绌挎杞�</a></li>-->
             <li><a id="shuttle" onclick="nav(this.id)" class="nav-unselect" href="#">鍥涘悜绌挎杞�</a></li>
-            <li><a id="plc2" onclick="nav(this.id)" class="nav-unselect" href="#">PLC2</a></li>
-            <li><a id="ess" onclick="nav(this.id)" class="nav-unselect" href="#">ESS</a></li>
         </ul>
     </div>
 </div>

--
Gitblit v1.9.1