Merge remote-tracking branch 'origin/master'

张含笑

2026-01-23 bcfa7fec8c6d2d222989e34f01b5fd6300befaf8

 applications/task-work-order/src/views/orderView/orderManage/orderManage/FormDiaLog.vue

@@ -76,13 +76,8 @@
                        </template>
                     </el-table-column>
                     <el-table-column prop="executeTime" show-overflow-tooltip label="任务执行时间" />
                     <el-table-column prop="feishou" show-overflow-tooltip label="选择飞手" />
                     <el-table-column prop="deviceId" show-overflow-tooltip label="选择设备" />
                     <el-table-column label="操作" class-name="operation-btns">
                        <template v-slot="{ row }">
                           <el-link type="primary" @click="">查看</el-link>
                        </template>
                     </el-table-column>
                     <el-table-column prop="recommendFlyerName" show-overflow-tooltip label="选择飞手" />
                     <el-table-column prop="deviceName" show-overflow-tooltip label="选择设备" />
                  </el-table>
               </template>
            </div>
@@ -187,7 +182,7 @@
                  <el-table-column prop="devicePayload" label="设备负载" />
               </el-table>
            </template>
            <div v-else>请先选择设备需求并绘制范围</div>
            <div v-else>请先选择设备需求并在地图上绘制工单范围</div>
         </div>
      </div>

@@ -215,10 +210,10 @@
            </el-button>
            <el-button v-if="gdStatus === '10'" @click="addDescription">拒绝接单</el-button>
            <el-button v-if="gdStatus === '10'" @click="statusChange(1)">接单</el-button>
            <el-button v-if="gdStatus === '22'" @click="statusChange(7)">同意修改</el-button>
            <el-button v-if="gdStatus === '22'" @click="statusChange(8)">不同意修改</el-button>
            <el-button v-if="gdStatus === '21'" @click="statusChange(5)">同意取消</el-button>
            <el-button v-if="gdStatus === '22'" @click="statusChange(7)">同意修改</el-button>
            <el-button v-if="gdStatus === '21'" @click="addDescription">不同意取消</el-button>
            <el-button v-if="gdStatus === '21'" @click="statusChange(5)">同意取消</el-button>
            <el-button v-if="gdStatus === '30'" @click="addDescription">协商修改</el-button>
            <el-button v-if="gdStatus === '31'" @click="statusChange(10)">同意</el-button>
         </template>
@@ -561,7 +556,6 @@
      hasPatrolTaskList.value && gdPatrolTaskPage()
      dialogMode.value === 'edit' ? editPolygon() : viewPolygon()
   }
   await getDeviceList()
   // setMapDevice()
   await nextTick()
   syncSelection()
@@ -609,18 +603,17 @@

   .processBox {
      width: 312px;
      .el-timeline{
      .el-timeline {
         padding-left: 100px;
      }
      .item-content{
      .item-content {
         position: relative;
         .flowName{
         .flowName {
            position: absolute;
            left: -100px;
            top: 0;
         }
      }

   }
}