From 25c9b7e028d62150520848b7c95eaf36926eee23 Mon Sep 17 00:00:00 2001
From: icewint <icewint@qq.com>
Date: Thu, 26 Feb 2026 16:17:53 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E4=B8=80=E7=82=B9=E5=BA=93?=
 =?UTF-8?q?=E4=BD=8D=E5=9B=BE=E7=9A=84=E6=98=BE=E7=A4=BA=E5=8A=9F=E8=83=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../components/custom/StackerLocationView.vue   | 17 +++++++++++++----
 .../page/stackerLocation/StackerLocationMap.vue |  5 +++--
 .../interface/custom/IStackerLocationInfo.ts    |  1 +
 3 files changed, 17 insertions(+), 6 deletions(-)

diff --git a/wcs_web/src/components/custom/StackerLocationView.vue b/wcs_web/src/components/custom/StackerLocationView.vue
index 7ad3c89..45c31d5 100644
--- a/wcs_web/src/components/custom/StackerLocationView.vue
+++ b/wcs_web/src/components/custom/StackerLocationView.vue
@@ -94,6 +94,15 @@ const filterData = (row: number, line: number, layer: number, depth: number) : I
     status: -2
   };
 }
+// 提示信息
+const tooltipString = (row: number, line: number, layer: number, depth: number) => {
+  const data = filterData(row, line, layer, depth);
+  const locationId = data.locationId;
+  if(data.vehicleNo != null && data.vehicleNo.length > 0) {
+    return locationId + '     [ ' + data.vehicleNo + ' ]';
+  }
+  return locationId;
+};
 
 const test = () => {
   console.log(layerMax, depthMax);
@@ -130,19 +139,19 @@ const test = () => {
         <span style="margin-left: 2px;font-size: .7rem">禁用</span>
       </el-col>
     </el-row>
-    <el-scrollbar height="50vh" style="width: 100%">
+    <el-scrollbar height="70vh" style="width: 100%">
       <el-row>
         <el-row v-for="(layer, layerIndex) in layerMax" :key="layerIndex">
           <el-divider v-if="layer != 1"></el-divider>
           <el-scrollbar>
-            <el-col :span="24" :style="{width: 16*lineMax + 'px', minWidth: '51vw'}">
+            <el-col :span="24" :style="{width: 16 * lineMax + 'px', height: 18 * (depthMax * 2 + 1) + 30 + 'px'}">
               <!--      2排-->
               <el-row v-for="(line, lineIndex) in lineMax" :key="lineIndex" style="display: inline">
                 <span style="width: 15px;height: 15px;background-color: white;border: 1px solid #ccc;margin-right: 1px;text-align: center;font-size: .6rem; display: inline-block">{{line}}</span>
               </el-row>
               <el-row v-for="(depth, depthIndex) in depthMax" :key="depthIndex">
                 <el-row v-for="(line, lineIndex) in lineMax" :key="lineIndex" style="display: inline;height: 16px;width: 16px">
-                  <el-tooltip effect="dark" :content="filterData(1, line, layerMax - layer + 1, depthMax - depth + 1).locationId" placement="top-start" style="margin: 0">
+                  <el-tooltip effect="dark" :content="tooltipString(1, line, layerMax - layer + 1, depthMax - depth + 1)" placement="top-start" style="margin: 0">
                     <span :style="blockStyle(filterData(1, line, layerMax - layer + 1, depthMax - depth + 1).status ?? -2)">
                     </span>
                   </el-tooltip>
@@ -154,7 +163,7 @@ const test = () => {
               <!--      1排-->
               <el-row v-for="(depth, depthIndex) in depthMax" :key="depthIndex">
                 <el-row v-for="(line, lineIndex) in lineMax" :key="lineIndex" style="display: inline;height: 16px;width: 16px">
-                  <el-tooltip effect="dark" :content="filterData(2, line, layerMax - layer + 1, depth).locationId" placement="top-start">
+                  <el-tooltip effect="dark" :content="tooltipString(2, line, layerMax - layer + 1, depth)" placement="top-start">
                     <span :style="blockStyle(filterData(2, line, layerMax - layer + 1, depth).status ?? -2)"></span>
                   </el-tooltip>
                 </el-row>
diff --git a/wcs_web/src/components/page/stackerLocation/StackerLocationMap.vue b/wcs_web/src/components/page/stackerLocation/StackerLocationMap.vue
index 9910ab4..9cbae7e 100644
--- a/wcs_web/src/components/page/stackerLocation/StackerLocationMap.vue
+++ b/wcs_web/src/components/page/stackerLocation/StackerLocationMap.vue
@@ -36,7 +36,8 @@ const query = () => {
           line: item.lLine,
           layer: item.lLayer,
           depth: item.lDepth,
-          status: item.locationStatus
+          status: item.locationStatus,
+          vehicleNo: item.vehicleNo
         });
       });
       laneData.value = newData;
@@ -89,7 +90,7 @@ const getLaneIdList = () => {
 </script>
 
 <template>
-  <el-drawer v-model="modelValue" title="仓库货位图" direction="btt" size="80vh" @close="close" :close-on-click-modal="false" @opened="open">
+  <el-drawer v-model="modelValue" title="仓库货位图" direction="ltr" size="90vw" @close="close" :close-on-click-modal="false" @opened="open">
     <el-row>
       <el-form class="searchForm" label-position="left" label-width="100px" inline>
         <el-form-item label="堆垛机号：" style="width: 250px;">
diff --git a/wcs_web/src/interface/custom/IStackerLocationInfo.ts b/wcs_web/src/interface/custom/IStackerLocationInfo.ts
index 817004a..d7730c8 100644
--- a/wcs_web/src/interface/custom/IStackerLocationInfo.ts
+++ b/wcs_web/src/interface/custom/IStackerLocationInfo.ts
@@ -6,4 +6,5 @@ export default interface IStackerLocationInfo {
     layer?: number,
     depth?: number,
     status?: number,
+    vehicleNo?: string,
 }
\ No newline at end of file