From e3655df17c2bb461e8174bf40283a1ec0708870f Mon Sep 17 00:00:00 2001
From: zyx <zyx123456>
Date: 星期二, 02 一月 2024 16:16:23 +0800
Subject: [PATCH] AGV地图显示bug修改

---
 src/main/webapp/views/home/agvMap.html                     |   14 +++++++-------
 src/main/java/com/zy/asrs/controller/AgvMapController.java |   24 +++++++++++-------------
 2 files changed, 18 insertions(+), 20 deletions(-)

diff --git a/src/main/java/com/zy/asrs/controller/AgvMapController.java b/src/main/java/com/zy/asrs/controller/AgvMapController.java
index defe628..c05f34a 100644
--- a/src/main/java/com/zy/asrs/controller/AgvMapController.java
+++ b/src/main/java/com/zy/asrs/controller/AgvMapController.java
@@ -49,7 +49,7 @@
     @GetMapping("/map/getData/{floor}/{lev}/auth")
     @ManagerAuth
     public String getMapData(@PathVariable("floor") Integer floor, @PathVariable("lev") Integer lev) {
-        BasMap basMap = agvBasMapService.selectLatestMap(lev,floor);
+        BasMap basMap = agvBasMapService.selectLatestMap(1,floor);
         //瑙f瀽json鍦板浘鏁版嵁
         List<ArrayList> arrayLists = JSON.parseArray(basMap.getData(), ArrayList.class);
 
@@ -74,15 +74,12 @@
                 x = generateMap3Bay(bay);
             }
 
-
             ArrayList rowData = arrayLists.get(x);
             Object o = rowData.get(y);
 
             JSONObject jsonObject = JSON.parseObject(o.toString());
-            if (DISABLE_LOC_NO.contains(locMast.getLocNo())) {
-                //绂佹搴撲綅
-                jsonObject.put("value", 10);//灏嗙鐢ㄥ簱浣嶈繘琛岃缃�
-            }
+            jsonObject.put("value","0");
+
             jsonObject.put("locNo", locMast.getLocNo());//璁剧疆搴撲綅鍙�
             jsonObject.put("locSts", locMast.getLocSts());//搴撲綅鐘舵��
             //鏇存柊list
@@ -101,13 +98,13 @@
         if(row > 3){
             x --;
         }
-        if(row > 4){
+        if(row > 5){
             x --;
         }
-        if(row > 6){
+        if(row > 7){
             x --;
         }
-        if(row > 8){
+        if(row > 9){
             x --;
         }
         if(row > 10){
@@ -133,7 +130,7 @@
 
     private Integer generateMap3Row(int row){
         int x = row;
-        Integer[] rowAdd = {2,4,6,8,9,11,12,14,16,18,19,21,23,25,27,29,31,33};
+        Integer[] rowAdd = {2,4,6,7,8,10,12,13,15,17,19,21,23,24,26,28,30,32};
         for(int i=0; i<rowAdd.length; i++){
             if(row >= rowAdd[i]){
                 x ++;
@@ -143,9 +140,10 @@
     }
 
     private Integer generateMap3Bay(int bay){
-        int y = 73-bay;
-        if(bay >= 15) y --;
-        if(bay >= 47) y --;
+        int y = 76-bay;
+        if(bay >= 18) y --;
+        if(bay >= 26) y --;
+        if(bay >= 50) y --;
         return y;
     }
 
diff --git a/src/main/webapp/views/home/agvMap.html b/src/main/webapp/views/home/agvMap.html
index 1501b18..11574c5 100644
--- a/src/main/webapp/views/home/agvMap.html
+++ b/src/main/webapp/views/home/agvMap.html
@@ -434,10 +434,10 @@
             <div style="margin-top: 20px;"><button class="layui-btn" @click="currentLev = 6" :style="{background: currentLev==6?'red':''}">6F</button></div>
             <div style="margin-top: 20px;"><button class="layui-btn" @click="currentLev = 7" :style="{background: currentLev==7?'red':''}">7F</button></div>
             <div style="margin-top: 20px;"><button class="layui-btn" @click="currentLev = 8" :style="{background: currentLev==8?'red':''}">8F</button></div>
-            <div class="lev-for-floor3" style="margin-top: 20px; display: none;"><button class="layui-btn" @click="currentLev = 8" :style="{background: currentLev==8?'red':''}">9F</button></div>
-            <div class="lev-for-floor3" style="margin-top: 20px; display: none;"><button class="layui-btn" @click="currentLev = 8" :style="{background: currentLev==8?'red':''}">10F</button></div>
-            <div class="lev-for-floor3" style="margin-top: 20px; display: none;"><button class="layui-btn" @click="currentLev = 8" :style="{background: currentLev==8?'red':''}">11F</button></div>
-            <div class="lev-for-floor3" style="margin-top: 20px; display: none;"><button class="layui-btn" @click="currentLev = 8" :style="{background: currentLev==8?'red':''}">12F</button></div>
+            <div class="lev-for-floor1" style="margin-top: 20px;"><button class="layui-btn" @click="currentLev = 8" :style="{background: currentLev==8?'red':''}">9F</button></div>
+            <div class="lev-for-floor1" style="margin-top: 20px;"><button class="layui-btn" @click="currentLev = 8" :style="{background: currentLev==8?'red':''}">10F</button></div>
+            <div class="lev-for-floor1" style="margin-top: 20px;"><button class="layui-btn" @click="currentLev = 8" :style="{background: currentLev==8?'red':''}">11F</button></div>
+            <div class="lev-for-floor1" style="margin-top: 20px;"><button class="layui-btn" @click="currentLev = 8" :style="{background: currentLev==8?'red':''}">12F</button></div>
         </div>
     </div>
     <div style="padding: 40px 20px 10px 10px;" :style="window.innerWidth < 2000 ? 'margin-top: 0px;' : 'flex: 5;margin-top: -70px;'">
@@ -682,10 +682,10 @@
             currentFloor: {
                 deep: true,
                 handler(val) {
-                    if(this.currentFloor == 3){
-                        $(".lev-for-floor3").show();
+                    if(this.currentFloor == 1){
+                        $(".lev-for-floor1").show();
                     }else{
-                        $(".lev-for-floor3").hide();
+                        $(".lev-for-floor1").hide();
                     }
 
                     this.init()

--
Gitblit v1.9.1