From fa97207062ccc4bc2535a821bb1af5030c10df6f Mon Sep 17 00:00:00 2001
From: Junjie <DELL@qq.com>
Date: 星期三, 03 十二月 2025 13:28:34 +0800
Subject: [PATCH] #

---
 src/main/webapp/views/watch/console2.html |   34 +++++++++++++++++++++++-----------
 1 files changed, 23 insertions(+), 11 deletions(-)

diff --git a/src/main/webapp/views/watch/console2.html b/src/main/webapp/views/watch/console2.html
index 337d6f8..9c7b52f 100644
--- a/src/main/webapp/views/watch/console2.html
+++ b/src/main/webapp/views/watch/console2.html
@@ -79,9 +79,6 @@
   <script>
     let pixiApp;
     let pixiStageList = [];
-    let pixiShuttleMap = new Map();
-    let pixiShuttleMoveAdvancePathMap = new Map();
-    let pixiShuttleMoveAdvancePathList = [];
     let pixiStaMap = new Map();
     let pixiCrnMap = new Map();
     let pixiRgvMap = new Map();
@@ -199,13 +196,15 @@
         },
         changeFloor(lev) {
           this.currentLev = lev
-          this.currentLevShuttleList = []
-          this.getMap(lev)
-
-          //娓呯┖棰勮璺緞
+          objectsContainer.removeChildren();
           objectsContainer2.removeChildren();
-          pixiShuttleMoveAdvancePathMap = new Map();
-          pixiShuttleMoveAdvancePathList = []
+          crnList = []
+          rgvList = []
+          pixiCrnMap = new Map()
+          pixiRgvMap = new Map()
+          pixiStaMap = new Map()
+          pixiStageList = []
+          this.getMap(lev)
         },
         createMap() {
           //Create a Pixi Application
@@ -331,7 +330,7 @@
               }
             }
           })
-
+          
           map.forEach((item, index) => {
             for(let idx = 0;idx < item.length;idx++){
               let val = item[idx]
@@ -372,7 +371,20 @@
             }
           })
 
-          const rowHeightScaled = bayHeightList.map(h => (h != null && h !== -1) ? (h / 8) : (height));
+          const rowHeightScaled = [];
+          for (let r = 0; r < map.length; r++) {
+            const h = bayHeightList[r];
+            if (h != null && h !== -1) {
+              rowHeightScaled[r] = h / 8;
+            } else {
+              let fallback = 0;
+              for (let c = 0; c < map[r].length; c++) {
+                const v = map[r][c];
+                if (v && v.type !== 'merge' && v.height != null && v.height > 0) { fallback = v.height; break; }
+              }
+              rowHeightScaled[r] = fallback > 0 ? fallback : 25;
+            }
+          }
           let yOffsets = [];
           let yCursor = 0;
           for (let r = 0; r < map.length; r++) {

--
Gitblit v1.9.1