Merge remote-tracking branch 'origin/master'

chenyao

2026-06-30 4b3c357f2fa24a27eac3fe59cbf64e34255ab212

 applications/task-work-order/src/views/orderView/flyingHand/index.vue

@@ -52,7 +52,7 @@
         <div class="gd-table-toolbar">
            <el-button :icon="Plus" color="#4C34FF" type="primary" @click="addFlyingHand">飞手建档</el-button>
         </div>
			

         <div class="gd-table-content gd-table-content-bg">
            <el-table class="gd-table" :data="list">
               <el-table-column type="index" width="64" label="序号" />
@@ -72,7 +72,7 @@
               </el-table-column>
               <el-table-column prop="skilledTaskType" show-overflow-tooltip label="擅长任务类型">
                  <template v-slot="{ row }">
                     {{ getDictLabel(row.skilledTaskType, dictObj.workOrderType) }}
                     {{ getTaskTypeLabel(row.skilledTaskType, workOrderTypeXT) }}
                  </template>
               </el-table-column>
               <el-table-column label="操作" class-name="operation-btns" width="180">
@@ -113,10 +113,14 @@
import { getDictionaryByCode } from '@/api/system/dictbiz'
import { getDictLabel } from '@ztzf/utils'
import { getFlyingHandPage, removeFlyingHand,getAllFlyerIds } from './flyingHandApi'
import { deviceFlyerApi,deviceFlyerDetailApi } from '@/api/zkxt'
import { deviceFlyerApi,deviceFlyerDetailApi, getDictListApi } from '@/api/zkxt'
import FlyingHandDialog from './FlyingHandDialog.vue'
import { ElMessage, ElMessageBox } from 'element-plus'
import { prod } from 'mathjs'
import {
   getTaskTypeLabel,
   normalizeTaskTypeOptions,
} from '../orderManage/taskTypeOptions'

// 初始化查询参数
const initSearchParams = () => ({
@@ -140,8 +144,10 @@
   skilledUavType: [], // 擅长机型
   technicalStrength: [] // 技术特长
})
const workOrderTypeXT = ref([])

provide('dictObj', dictObj)
provide('workOrderTypeXT', workOrderTypeXT)

// 获取列表
async function getList() {
@@ -229,6 +235,9 @@
   getDictionaryByCode('workOrderType,skilledUavType,technicalStrength').then(res => {
      dictObj.value = res.data.data
   })
   getDictListApi('task_inspection_type').then(res => {
      workOrderTypeXT.value = normalizeTaskTypeOptions(res.data.data || [])
   })
}

// 获取飞手列表