Merge remote-tracking branch 'origin/master'

张含笑

2026-01-30 b248152cc5d600d41e3b0be287a3c43415e46ed1

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

@@ -49,7 +49,7 @@
      </el-form>

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

      <div class="gd-table-container" v-loading="loading">
@@ -72,7 +72,7 @@
               </el-table-column>
               <el-table-column prop="skilledTaskType" show-overflow-tooltip label="擅长任务类型">
                  <template v-slot="{ row }">
                     {{ getDictLabel(row.skilledTaskType, dictObj.patrolTaskType) }}
                     {{ getDictLabel(row.skilledTaskType, dictObj.workOrderType) }}
                  </template>
               </el-table-column>
               <el-table-column label="操作" class-name="operation-btns" width="180">
@@ -136,7 +136,7 @@
const flyingHandData = ref({})

const dictObj = ref({
   patrolTaskType: [], // 擅长任务类型
   workOrderType: [], // 擅长任务类型
   skilledUavType: [], // 擅长机型
   technicalStrength: [] // 技术特长
})
@@ -212,7 +212,7 @@

// 获取字典
function getDictList() {
   getDictionaryByCode('patrolTaskType,skilledUavType,technicalStrength').then(res => {
   getDictionaryByCode('workOrderType,skilledUavType,technicalStrength').then(res => {
      dictObj.value = res.data.data
   })
}
@@ -233,4 +233,4 @@
    getFlyingHandList()
})
</script>
<style scoped lang="scss"></style>
<style scoped lang="scss"></style>