From b5e053671f50f54d78fc24ba48ad93919ce13375 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=A0=82=E7=B3=96?= <qq2178503051@163.com>
Date: Mon, 8 Dec 2025 11:48:20 +0800
Subject: [PATCH] =?UTF-8?q?feat(=E4=BB=93=E5=BA=93=E7=AE=A1=E7=90=86):=20?=
 =?UTF-8?q?=E5=AE=9E=E7=8E=B0=E4=BA=A4=E9=94=99=E5=BC=8F=E5=A4=9A=E5=B1=82?=
 =?UTF-8?q?=E4=BB=93=E5=BA=93=E5=8F=AF=E8=A7=86=E5=8C=96=E7=BB=84=E4=BB=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- 新增 WarehouseInterlaced 组件用于展示交错式多层仓库布局
- 修改仓库编码解析规则以支持新的格式
- 移除不再使用的 layerCount 字段
- 更新仓库鸟瞰图组件以使用新的交错式布局
- 调整图例样式和颜色区分不同层级
---
 klp-ui/src/components/CoilSelector/index.vue  |   2 +-
 .../warehouse/components/WarehouseBird.vue    |  31 +-
 .../components/WarehouseInterlaced.vue        | 372 ++++++++++++++++++
 klp-ui/src/views/wms/warehouse/overview.vue   |   6 +-
 4 files changed, 394 insertions(+), 17 deletions(-)
 create mode 100644 klp-ui/src/views/wms/warehouse/components/WarehouseInterlaced.vue

diff --git a/klp-ui/src/components/CoilSelector/index.vue b/klp-ui/src/components/CoilSelector/index.vue
index 98f98994..c24a3563 100644
--- a/klp-ui/src/components/CoilSelector/index.vue
+++ b/klp-ui/src/components/CoilSelector/index.vue
@@ -6,7 +6,7 @@
         <el-button type="primary" size="small" @click="handleOpen" class="select-button">
           <i class="el-icon-search"></i>
           <span v-if="selectedCoil">
-            <span>{{ selectedCoil.currentCoilNo }} </span>
+            <span>{{ selectedCoil.currentCoilNo }}</span>
 
             <span>({{ selectedCoil.itemName }}) </span>
 
diff --git a/klp-ui/src/views/wms/warehouse/components/WarehouseBird.vue b/klp-ui/src/views/wms/warehouse/components/WarehouseBird.vue
index fec2d7fb..c8e54638 100644
--- a/klp-ui/src/views/wms/warehouse/components/WarehouseBird.vue
+++ b/klp-ui/src/views/wms/warehouse/components/WarehouseBird.vue
@@ -25,8 +25,12 @@
     <!-- 图例 -->
     <div class="legend-container">
       <div class="legend-item">
-        <div class="legend-color normal"></div>
-        <span class="legend-text">正常未占用</span>
+        <div class="legend-color layer-1"></div>
+        <span class="legend-text">一层</span>
+      </div>
+      <div class="legend-item">
+        <div class="legend-color layer-2"></div>
+        <span class="legend-text">二层</span>
       </div>
       <div class="legend-item">
         <div class="legend-color occupied"></div>
@@ -36,29 +40,26 @@
 
     <!-- 分层库位容器 -->
     <div class="layers-container">
-      <!-- 遍历每层，渲染 Grid 组件 -->
-      <div v-for="(layerData, layer) in layers" :key="layer" class="layer-section">
-        <WarehouseGrid :layer="layer" :layer-data="layerData" />
-      </div>
-
       <!-- 无数据提示 -->
       <div class="empty-tip" v-if="Object.keys(layers).length === 0 && warehouseList.length > 0">
         暂无解析到有效的库位分层数据
       </div>
-      <div class="empty-tip" v-if="warehouseList.length === 0">
+      <div class="empty-tip" v-else-if="warehouseList.length === 0">
         <div class="empty-text">该分类下暂无库位数据</div>
         <el-button type="primary" icon="el-icon-plus" @click="openInitDialog">初始化库位</el-button>
       </div>
+      <warehouse-interlaced v-else="warehouseList.length" :layers="layers" />
     </div>
   </div>
 </template>
 
 <script>
 import WarehouseGrid from './WarehouseGrid.vue';
+import WarehouseInterlaced from './WarehouseInterlaced.vue';
 
 export default {
   name: "WarehouseBird",
-  components: { WarehouseGrid },
+  components: { WarehouseGrid, WarehouseInterlaced },
   props: {
     // 原始库位列表
     warehouseList: {
@@ -93,7 +94,7 @@ export default {
      */
     parseWarehouseCode(code) {
       if (!code) return null;
-      const reg = /^([A-Za-z])(\d+[A-Za-z])(\d)(\d{2})-(\d+)$/;
+      const reg = /^([A-Za-z])(\d+[A-Za-z])(\d)-(\d{2})-(\d+)$/;
       const match = code.match(reg);
 
       if (!match) {
@@ -239,8 +240,16 @@ export default {
       background-color: #ffffff;
     }
 
+    .layer-1 {
+      background-color: #fff3e0;
+    }
+
+    .layer-2 {
+      background-color: #e8f5e9;
+    }
+
     .occupied {
-      background-color: #eeff6f;
+      background-color: #111;
     }
 
     .legend-text {
diff --git a/klp-ui/src/views/wms/warehouse/components/WarehouseInterlaced.vue b/klp-ui/src/views/wms/warehouse/components/WarehouseInterlaced.vue
new file mode 100644
index 00000000..cad63b94
--- /dev/null
+++ b/klp-ui/src/views/wms/warehouse/components/WarehouseInterlaced.vue
@@ -0,0 +1,372 @@
+<template>
+  <div class="multi-layer-grid">
+    <!-- 顶部列标尺 -->
+    <div class="col-ruler" :style="{ '--cell-width': `${cellWidth}px` }">
+      <div class="ruler-empty"></div>
+      <div v-for="col in maxColumn" :key="`col-${col}`" class="ruler-item">
+        {{ col }}
+      </div>
+    </div>
+
+    <!-- 左侧行标尺 + 库位网格 -->
+    <div class="row-grid-wrapper">
+      <!-- 左侧行标尺 -->
+      <div class="row-ruler">
+        <div v-for="row in maxRow" :key="`row-${row}`" class="ruler-item">
+          {{ row }}
+        </div>
+      </div>
+
+      <!-- 库位网格容器 -->
+      <div 
+        class="grid-container" 
+        :style="{ 
+          '--half-cell-width': `${halfCellWidth}px`,
+          '--cell-width': `${cellWidth}px`,
+          '--column-count': maxColumn * 2,
+          '--row-height': '80px'
+        }"
+      >
+        <!-- 第一层库位（左半列） -->
+        <div 
+          v-for="warehouse in layer1Warehouses" 
+          :key="`warehouse-1-${warehouse.actualWarehouseId}`"
+          class="warehouse-cell layer-1"
+          :class="{ disabled: warehouse.isEnabled === 0 }"
+          :style="{
+            gridRow: `${warehouse.parsedInfo.row} / ${warehouse.parsedInfo.row + 1}`,
+            gridColumn: `${(warehouse.parsedInfo.column - 1) * 2 + 1} / ${(warehouse.parsedInfo.column - 1) * 2 + 2}`
+          }"
+          @click="handleCellClick(warehouse)"
+        >
+          <div class="cell-name">
+            <div class="cell-line1">{{ warehouse.actualWarehouseName || '-' }}</div>
+            <div class="cell-line2">{{ warehouse.currentCoilNo || '-' }}</div>
+          </div>
+        </div>
+
+        <!-- 第二层库位（右半列 + 下移半格） -->
+        <div 
+          v-for="warehouse in layer2Warehouses" 
+          :key="`warehouse-2-${warehouse.actualWarehouseId}`"
+          class="warehouse-cell layer-2"
+          :class="{ disabled: warehouse.isEnabled === 0 }"
+          :style="{
+            gridRow: `${warehouse.parsedInfo.row} / ${warehouse.parsedInfo.row + 1}`,
+            gridColumn: `${(warehouse.parsedInfo.column - 1) * 2 + 2} / ${(warehouse.parsedInfo.column - 1) * 2 + 3}`
+          }"
+          @click="handleCellClick(warehouse)" 
+        >
+          <div class="cell-name">
+            <div class="cell-line1">{{ warehouse.actualWarehouseName || '-' }}</div>
+            <div class="cell-line2">{{ warehouse.currentCoilNo || '-' }}</div>
+          </div>
+        </div>
+      </div>
+    </div>
+
+    <!-- 库位详情弹窗 -->
+    <el-dialog 
+      title="钢卷库位详情" 
+      :visible.sync="dialogVisible" 
+      width="600px" 
+      destroy-on-close 
+      append-to-body 
+      center
+    >
+      <el-descriptions :column="2" border size="small" v-if="currentWarehouse">
+        <el-descriptions-item label="库位编码">{{ currentWarehouse.actualWarehouseCode }}</el-descriptions-item>
+        <el-descriptions-item label="库位名称">{{ currentWarehouse.actualWarehouseName || '无' }}</el-descriptions-item>
+        <el-descriptions-item label="钢卷编号">{{ currentWarehouse.currentCoilNo || '无' }}</el-descriptions-item>
+        <el-descriptions-item label="所属层级">{{ currentWarehouse.parsedInfo.layer || '未知' }}</el-descriptions-item>
+        <el-descriptions-item label="行号">{{ currentWarehouse.parsedInfo.row || '未知' }}</el-descriptions-item>
+        <el-descriptions-item label="列号">{{ currentWarehouse.parsedInfo.column || '未知' }}</el-descriptions-item>
+        <el-descriptions-item label="启用状态">
+          <el-tag :type="currentWarehouse.isEnabled === 1 ? 'success' : 'danger'">
+            {{ currentWarehouse.isEnabled === 1 ? '启用' : '禁用' }}
+          </el-tag>
+        </el-descriptions-item>
+        <el-descriptions-item label="创建时间" span="2">{{ currentWarehouse.createTime || '无' }}</el-descriptions-item>
+      </el-descriptions>
+      <template slot="footer">
+        <el-button @click="dialogVisible = false">关闭</el-button>
+      </template>
+    </el-dialog>
+  </div>
+</template>
+
+<script>
+export default {
+  name: "SteelCoilWarehouse",
+  props: {
+    layers: {
+      type: Object,
+      required: true,
+      default: () => ({})
+    }
+  },
+  data() {
+    return {
+      dialogVisible: false,
+      currentWarehouse: null,
+      containerWidth: 0,
+      resizeTimer: null
+    };
+  },
+  computed: {
+    layer1Warehouses() {
+      return this.layers['1']?.warehouses || [];
+    },
+    layer2Warehouses() {
+      return this.layers['2']?.warehouses || [];
+    },
+    maxRow() {
+      let max = 0;
+      Object.keys(this.layers).forEach(layer => {
+        max = Math.max(max, this.layers[layer].maxRow);
+      });
+      return max;
+    },
+    maxColumn() {
+      let max = 0;
+      Object.keys(this.layers).forEach(layer => {
+        max = Math.max(max, this.layers[layer].maxColumn);
+      });
+      return max;
+    },
+    cellWidth() {
+      if (!this.containerWidth || this.maxColumn === 0) return 60;
+      const availableWidth = Math.max(0, this.containerWidth - 30);
+      const averageWidth = availableWidth / this.maxColumn;
+      return averageWidth;
+    },
+    halfCellWidth() {
+      return this.cellWidth / 2;
+    }
+  },
+  mounted() {
+    this.calcContainerWidth();
+    window.addEventListener('resize', this.handleResize);
+  },
+  beforeUnmount() {
+    window.removeEventListener('resize', this.handleResize);
+    clearTimeout(this.resizeTimer);
+  },
+  methods: {
+    calcContainerWidth() {
+      this.containerWidth = this.$el.parentElement?.clientWidth || this.$el.clientWidth || 0;
+    },
+    handleResize() {
+      clearTimeout(this.resizeTimer);
+      this.resizeTimer = setTimeout(() => {
+        this.calcContainerWidth();
+      }, 100);
+    },
+    handleCellClick(warehouse) {
+      this.currentWarehouse = warehouse;
+      this.dialogVisible = true;
+    }
+  }
+};
+</script>
+
+<style scoped lang="scss">
+/* 外层容器：填满父元素 + 隐藏滚动条 */
+.multi-layer-grid {
+  width: 100% !important;
+  height: 100%;
+  box-sizing: border-box;
+  margin: 0 !important;
+  padding: 0 !important;
+  overflow: hidden !important;
+}
+
+/* 列标尺 */
+.col-ruler {
+  display: flex;
+  height: 30px;
+  line-height: 30px;
+  background: #f5f7fa; /* 更柔和的标尺背景 */
+  border-bottom: 1px solid #e4e7ed;
+  width: 100% !important;
+  box-sizing: border-box;
+  overflow: hidden !important;
+
+  .ruler-empty {
+    width: 30px;
+    text-align: center;
+    font-weight: 600;
+    color: #606266;
+    border-right: 1px solid #e4e7ed;
+    flex-shrink: 0;
+  }
+
+  .ruler-item {
+    width: var(--cell-width);
+    text-align: center;
+    font-weight: 600;
+    color: #606266;
+    border-right: 1px solid #e4e7ed;
+    box-sizing: border-box;
+    flex-shrink: 0;
+    overflow: hidden;
+    text-overflow: ellipsis;
+    white-space: nowrap;
+  }
+}
+
+.row-grid-wrapper {
+  display: flex;
+  width: 100% !important;
+  height: calc(100% - 30px);
+  box-sizing: border-box;
+  overflow: hidden !important;
+}
+
+/* 行标尺 */
+.row-ruler {
+  width: 30px;
+  background: #f5f7fa; /* 更柔和的标尺背景 */
+  border-right: 1px solid #e4e7ed;
+  flex-shrink: 0;
+  overflow: hidden !important;
+
+  .ruler-item {
+    height: 80px;
+    line-height: 80px;
+    text-align: center;
+    font-weight: 600;
+    color: #606266;
+    border-bottom: 1px solid #e4e7ed;
+    box-sizing: border-box;
+    overflow: hidden;
+    text-overflow: ellipsis;
+    white-space: nowrap;
+  }
+}
+
+/* 网格容器 */
+.grid-container {
+  display: grid;
+  width: 100% !important;
+  grid-template-columns: repeat(var(--column-count), minmax(0, var(--half-cell-width)));
+  grid-auto-rows: var(--row-height);
+  gap: 1px;
+  box-sizing: border-box;
+  margin: 0 !important;
+  padding: 0 !important;
+  overflow: hidden !important;
+  -ms-overflow-style: none;
+  scrollbar-width: none;
+
+  &::-webkit-scrollbar {
+    display: none !important;
+    width: 0 !important;
+    height: 0 !important;
+  }
+}
+
+/* 库位单元格基础样式 */
+.warehouse-cell {
+  height: var(--row-height);
+  border: 1px solid #e4e7ed;
+  border-radius: 4px; /* 圆角更柔和 */
+  display: flex;
+  justify-content: center;
+  align-items: center;
+  cursor: pointer;
+  transition: all 0.2s;
+  box-sizing: border-box;
+  position: relative;
+  z-index: 1;
+  overflow: hidden;
+
+  /* 启用状态 - 第一层：柔和暖橙（低饱和度） */
+  &.layer-1:not(.disabled) {
+    background: #fff3e0; /* 柔和浅橙 */
+    color: #e65100; /* 文字用深一点的橙，保证可读性 */
+  }
+
+  /* 启用状态 - 第二层：柔和薄荷绿（低饱和度） */
+  &.layer-2:not(.disabled) {
+    background: #e8f5e9; /* 柔和浅绿 */
+    color: #2e7d32; /* 文字用深一点的绿，保证可读性 */
+    transform: translateY(50%);
+    position: relative;
+    top: 0;
+  }
+
+  /* 禁用状态 - 通用浅灰 */
+  &.disabled {
+    background: #111; /* 浅灰背景 */
+    color: #909399; /* 浅灰文字 */
+    cursor: not-allowed; /* 禁用光标 */
+    opacity: 0.8; /* 降低透明度 */
+    /* 禁用状态取消hover效果 */
+    &:hover {
+      border-color: #e4e7ed;
+      background: #fafafa;
+      z-index: 1;
+    }
+  }
+
+  /* 启用状态hover效果（更柔和） */
+  &:not(.disabled):hover {
+    border-color: #90caf9; /* 柔和的蓝色边框 */
+    background: #f0f8ff; /* 极浅的蓝背景 */
+    z-index: 2;
+    box-shadow: 0 2px 4px rgba(0,0,0,0.05); /* 轻微阴影，提升层次感 */
+  }
+
+  /* 两行文字样式 */
+  .cell-name {
+    width: 100%;
+    height: 90%;
+    display: flex;
+    flex-direction: column;
+    justify-content: center;
+    align-items: center;
+    text-align: center;
+    padding: 0 4px;
+    box-sizing: border-box;
+
+    /* 第一行：库位名称 */
+    .cell-line1 {
+      font-size: 14px;
+      font-weight: 600;
+      line-height: 1.2;
+      margin-bottom: 4px;
+      overflow: hidden;
+      text-overflow: ellipsis;
+      white-space: nowrap;
+      width: 100%;
+    }
+
+    /* 第二行：currentCoilNo */
+    .cell-line2 {
+      font-size: 13px;
+      line-height: 1.2;
+      overflow: hidden;
+      text-overflow: ellipsis;
+      white-space: nowrap;
+      width: 100%;
+    }
+
+    /* 禁用状态文字颜色 */
+    .disabled & .cell-line1,
+    .disabled & .cell-line2 {
+      color: #909399 !important;
+    }
+
+    /* 启用状态文字颜色适配 */
+    .layer-1:not(.disabled) & .cell-line1,
+    .layer-1:not(.disabled) & .cell-line2 {
+      color: #e65100;
+    }
+    .layer-2:not(.disabled) & .cell-line1,
+    .layer-2:not(.disabled) & .cell-line2 {
+      color: #2e7d32;
+    }
+  }
+}
+</style>
\ No newline at end of file
diff --git a/klp-ui/src/views/wms/warehouse/overview.vue b/klp-ui/src/views/wms/warehouse/overview.vue
index 0189ada9..6b4bd5a2 100644
--- a/klp-ui/src/views/wms/warehouse/overview.vue
+++ b/klp-ui/src/views/wms/warehouse/overview.vue
@@ -43,10 +43,6 @@
             </div>
           </div>
         </el-form-item>
-        <el-form-item label="层数" prop="layerCount">
-          <el-input-number size="mini" v-model="initForm.layerCount" :min="1" :max="99" placeholder="请输入层数（1-99）"
-            style="width: 100%;" />
-        </el-form-item>
         <el-form-item label="编码前缀" prop="prefix">
           <el-input v-model="initForm.prefix" disabled placeholder="系统自动生成" />
         </el-form-item>
@@ -189,7 +185,7 @@ export default {
 
       const prefix = await this.generateWarehousePrefix(this.selectedNode);
       this.initForm = {
-        rowCount: '', columnCount: '', layerCount: '',
+        rowCount: '', columnCount: '',
         prefix: prefix,
         parentId: this.selectedNode.actualWarehouseId
       };