From ae3b9f656a0704cf3ea6fa0b475d8b89c5ea614e Mon Sep 17 00:00:00 2001
From: "han\\hanst" <songtao.han@xujiesoft.com>
Date: Sun, 26 Oct 2025 13:33:53 +0800
Subject: [PATCH] =?UTF-8?q?=E5=AE=8C=E5=96=84?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../modules/automatedWarehouse/agvTask.vue    |  14 +--
 src/views/modules/dashboard/picking-board.vue | 106 ++----------------
 .../modules/dashboard/robot-picking-board.vue |  13 +++
 3 files changed, 32 insertions(+), 101 deletions(-)

diff --git a/src/views/modules/automatedWarehouse/agvTask.vue b/src/views/modules/automatedWarehouse/agvTask.vue
index 2b40a08..ec2facf 100644
--- a/src/views/modules/automatedWarehouse/agvTask.vue
+++ b/src/views/modules/automatedWarehouse/agvTask.vue
@@ -263,41 +263,41 @@
 
          <!-- AGV状态表格 -->
          <el-table :data="agvList" border style="width: 100%;" height="300" class="zxClass">
-           <el-table-column prop="id" label="AGV编号" width="100" align="center"></el-table-column>
-           <el-table-column prop="soc" label="电量" width="120" align="center">
+           <el-table-column prop="id" label="AGV编号" min-width="100" align="center"></el-table-column>
+           <el-table-column prop="soc" label="电量" min-width="120" align="center">
              <template slot-scope="scope">
                <el-progress :percentage="scope.row.soc" :color="getBatteryColor(scope.row.soc)"></el-progress>
              </template>
            </el-table-column>
-           <el-table-column prop="agvStat" label="状态" width="120" align="center">
+           <el-table-column prop="agvStat" label="状态" min-width="120" align="center">
              <template slot-scope="scope">
                <el-tag :type="getAgvStatusType(scope.row.agvStat)">
                  {{ getAgvStatusText(scope.row.agvStat) }}
                </el-tag>
              </template>
            </el-table-column>
-           <el-table-column prop="cargo" label="载货状态" width="100" align="center">
+           <el-table-column prop="cargo" label="载货状态" min-width="100" align="center">
              <template slot-scope="scope">
                <el-tag :type="scope.row.cargo ? 'success' : 'info'">
                  {{ scope.row.cargo ? '有货' : '空载' }}
                </el-tag>
              </template>
            </el-table-column>
-           <el-table-column prop="offline" label="连接状态" width="100" align="center">
+           <el-table-column prop="offline" label="连接状态" min-width="100" align="center">
              <template slot-scope="scope">
                <el-tag :type="scope.row.offline ? 'danger' : 'success'">
                  {{ scope.row.offline ? '离线' : '在线' }}
                </el-tag>
              </template>
            </el-table-column>
-           <el-table-column label="位置信息" width="200" align="center">
+           <el-table-column label="位置信息" min-width="200" align="center">
              <template slot-scope="scope">
                <div>X: {{ scope.row.x }}mm</div>
                <div>Y: {{ scope.row.y }}mm</div>
                <div>角度: {{ (scope.row.theta / 1000).toFixed(1) }}°</div>
              </template>
            </el-table-column>
-           <el-table-column prop="offPlat" label="控制模式" width="100" align="center">
+           <el-table-column prop="offPlat" label="控制模式" min-width="100" align="center">
              <template slot-scope="scope">
                <el-tag :type="scope.row.offPlat ? 'warning' : 'primary'">
                  {{ scope.row.offPlat ? '手动' : '自动' }}
diff --git a/src/views/modules/dashboard/picking-board.vue b/src/views/modules/dashboard/picking-board.vue
index f0cba63..3f7577e 100644
--- a/src/views/modules/dashboard/picking-board.vue
+++ b/src/views/modules/dashboard/picking-board.vue
@@ -125,102 +125,20 @@ export default {
       // 模拟工单数据
       workOrders: [
         {
-          workOrderNo: '3020124',
-          materialName: '80506561',
-          workOrderTime: '2025-01-20 08:30:00',
-          completedCount: 2,
-          totalCount: 5,
-          details: [
-            {
-              pickingBatchNo: 'W00001',
-              pickingMaterialName: '70000213-0045',
-              pickingQty: '1,000',
-              status: '完成',
-              storageBatchNo: 'W01100',
-              storageLocation: 'RG01'
-            },
-            {
-              pickingBatchNo: 'W00010',
-              pickingMaterialName: '70000235-0046',
-              pickingQty: '5,000',
-              status: '分拣中',
-              storageBatchNo: 'W01100',
-              storageLocation: 'RG01'
-            },
-            {
-              pickingBatchNo: 'W00012',
-              pickingMaterialName: '70004562-0075',
-              pickingQty: '1,000',
-              status: '等待分拣',
-              storageBatchNo: 'W01100',
-              storageLocation: 'RG01'
-            },
-            {
-              pickingBatchNo: 'W00012',
-              pickingMaterialName: '70004358-0254',
-              pickingQty: '1,000',
-              status: '等待分拣',
-              storageBatchNo: 'W01101',
-              storageLocation: 'RG02'
-            },
-            {
-              pickingBatchNo: 'W00033',
-              pickingMaterialName: '70000220-0335',
-              pickingQty: '5,000',
-              status: '等待分拣',
-              storageBatchNo: 'W01101',
-              storageLocation: 'RG02'
-            }
-          ]
+          workOrderNo: '',
+          materialName: '',
+          workOrderTime: '',
+          completedCount: '',
+          totalCount: '',
+          details: []
         },
         {
-          workOrderNo: '3020125',
-          materialName: '80506562',
-          workOrderTime: '2025-01-20 10:00:00',
-          completedCount: 1,
-          totalCount: 5,
-          details: [
-            {
-              pickingBatchNo: 'W00002',
-              pickingMaterialName: '70000213-0046',
-              pickingQty: '1,000',
-              status: '完成',
-              storageBatchNo: 'W01102',
-              storageLocation: 'RG03'
-            },
-            {
-              pickingBatchNo: 'W00011',
-              pickingMaterialName: '70000235-0047',
-              pickingQty: '5,000',
-              status: '分拣中',
-              storageBatchNo: 'W01102',
-              storageLocation: 'RG03'
-            },
-            {
-              pickingBatchNo: 'W00013',
-              pickingMaterialName: '70004562-0078',
-              pickingQty: '1,000',
-              status: '等待分拣',
-              storageBatchNo: 'W01102',
-              storageLocation: 'RG03'
-            },
-            {
-              pickingBatchNo: 'W00013',
-              pickingMaterialName: '70004358-0256',
-              pickingQty: '1,000',
-              status: '等待分拣',
-              storageBatchNo: 'W01103',
-              storageLocation: 'RG04'
-            },
-            {
-              pickingBatchNo: 'W00034',
-              pickingMaterialName: '70000220-0337',
-              pickingQty: '5,000',
-              status: '等待分拣',
-              storageBatchNo: 'W01103',
-              storageLocation: 'RG04'
-            }
-          ]
+          workOrderNo: '',
+          materialName: '',
+          workOrderTime: '',
+          completedCount: '',
+          totalCount: '',
+          details: []
         }
       ]
     }
diff --git a/src/views/modules/dashboard/robot-picking-board.vue b/src/views/modules/dashboard/robot-picking-board.vue
index 471677d..e7fe70d 100644
--- a/src/views/modules/dashboard/robot-picking-board.vue
+++ b/src/views/modules/dashboard/robot-picking-board.vue
@@ -285,6 +285,19 @@ export default {
       if (message && message.code === 0) {
         this.containerPickingList = message.data.containerList
         this.materialPickingList = message.data.materialList
+        // 如果storageBatchNo.length>10,则status改成分拣中
+        this.containerPickingList.forEach(item => {
+          if (item.storageBatchNo && item.storageBatchNo.length < 10) {
+            item.status = '分拣中'
+          }
+        })
+
+        this.materialPickingList.forEach(item => {
+          if (item.storageBatchNo && item.storageBatchNo.length < 10) {
+            item.status = '分拣中'
+          }
+        })
+
       }
     },