*

lsh

2025-04-08 06e1ebee3ec23ceed20477eba43b2925ef6bb0c3

 src/main/webapp/views/taskWrkLog/taskWrkLog.html

@@ -29,7 +29,7 @@
                     <el-button type="primary" @click="getTableData">查询</el-button>
                     <el-button type="primary" @click="resetParam">重置</el-button>
                     <el-button type="primary" @click="exportTable">导出当前页面数据</el-button>
                     <el-button type="primary" @click="exportTableAll">导出所有</el-button>
                     <el-button type="primary" @click="exportTableAll">导出所有(点击后等待2分钟以上，不要重复点击)</el-button>
                  </el-form-item>
               </el-form>
               <el-table ref="singleTable" :data="tableData" style="width: 100%;">
@@ -164,22 +164,52 @@
                  // 2. 完整字段映射
                  const headerMap = {
                     taskNo: '任务号',
                     status$: '任务状态',
                     status: 'status',
                     wrkNo: '工作号',
                     createTime$: '生成时间',
                     modiTime$: '更新时间',
                     assignTime$: '派发时间',
                     executeTime$: '执行时间',
                     completeTime$: '完结时间',
                     cancelTime$: '取消时间',
                     durationTime: '持续时长',
                     ioType$: '任务类型',
                     createTime: 'createTime',
                     ioType: 'ioType',
                     ioPri: '优先级',
                     startPoint: '起点位置',
                     targetPoint: '终点位置',
                     wrkSts$: '工作状态',
                     crnNo: '堆垛机号',
                     modiUser: 'modiUser',
                     modiTime: 'modiTime',
                     memo: '备注',
                     barcode: '条码',
                     memo: '备注'
                     assignTime: 'assignTime',
                     executeTime: 'executeTime',
                     completeTime: 'completeTime',
                     cancelTime: 'cancelTime',
                     wrkSts: 'wrkSts',
                     crnNo: '堆垛机号',
                     commandStep: 'step',
                     transferMark: 'mark',
                     wrkSts$: '工作状态',
                     ioType$: '任务类型',
                     status$: '任务状态',
                     createTime$: '生成时间',
                     modiTime$: '更新时间',
                     modiUser$: '更新人员',
                     completeTime$: '完结时间',
                     executeTime$: '执行时间',
                     assignTime$: '派发时间',
                     cancelTime$: '取消时间'
                     // taskNo: '任务号',
                     // status$: '任务状态',
                     // wrkNo: '工作号',
                     // createTime$: '生成时间',
                     // modiTime$: '更新时间',
                     // assignTime$: '派发时间',
                     // executeTime$: '执行时间',
                     // completeTime$: '完结时间',
                     // cancelTime$: '取消时间',
                     // durationTime: '持续时长',
                     // ioType$: '任务类型',
                     // startPoint: '起点位置',
                     // targetPoint: '终点位置',
                     // wrkSts$: '工作状态',
                     // crnNo: '堆垛机号',
                     // barcode: '条码',
                     // memo: '备注'
                  }

                  // 3. 创建工作表
@@ -220,22 +250,35 @@
                           // 2. 完整字段映射
                           const headerMap = {
                              taskNo: '任务号',
                              status$: '任务状态',
                              status: '任务状态',
                              wrkNo: '工作号',
                              createTime$: '生成时间',
                              modiTime$: '更新时间',
                              assignTime$: '派发时间',
                              executeTime$: '执行时间',
                              completeTime$: '完结时间',
                              cancelTime$: '取消时间',
                              durationTime: '持续时长',
                              ioType$: '任务类型',
                              createTime: 'createTime',
                              ioType: 'ioType',
                              ioPri: '优先级',
                              startPoint: '起点位置',
                              targetPoint: '终点位置',
                              wrkSts$: '工作状态',
                              crnNo: '堆垛机号',
                              modiUser: 'modiUser',
                              modiTime: 'modiTime',
                              memo: '备注',
                              barcode: '条码',
                              memo: '备注'
                              assignTime: 'assignTime',
                              executeTime: 'executeTime',
                              completeTime: 'completeTime',
                              cancelTime: 'cancelTime',
                              wrkSts: 'wrkSts',
                              crnNo: '堆垛机号',
                              commandStep: 'step',
                              transferMark: 'mark',
                              wrkSts$: '工作状态',
                              ioType$: '任务类型',
                              status$: '任务状态',
                              createTime$: '生成时间',
                              modiTime$: '更新时间',
                              modiUser$: '更新人员',
                              completeTime$: '完结时间',
                              executeTime$: '执行时间',
                              assignTime$: '派发时间',
                              cancelTime$: '取消时间'
                           }

                           // 3. 创建工作表