From ec2ff7ebf2f4b1baa9fb931d0e6fcf7134106f51 Mon Sep 17 00:00:00 2001
From: 张含笑 <zhx18749296735@163.com>
Date: Thu, 29 Jan 2026 10:34:59 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 applications/task-work-order/src/views/orderView/flyingHand/index.vue |    6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/applications/task-work-order/src/views/orderView/flyingHand/index.vue b/applications/task-work-order/src/views/orderView/flyingHand/index.vue
index 686f871..8972b67 100644
--- a/applications/task-work-order/src/views/orderView/flyingHand/index.vue
+++ b/applications/task-work-order/src/views/orderView/flyingHand/index.vue
@@ -72,7 +72,7 @@
 					</el-table-column>
 					<el-table-column prop="skilledTaskType" show-overflow-tooltip label="擅长任务类型">
 						<template v-slot="{ row }">
-							{{ getDictLabel(row.skilledTaskType, dictObj.skilledTaskType) }}
+							{{ getDictLabel(row.skilledTaskType, dictObj.patrolTaskType) }}
 						</template>
 					</el-table-column>
 					<el-table-column label="操作" class-name="operation-btns" width="180">
@@ -136,7 +136,7 @@
 const flyingHandData = ref({})
 
 const dictObj = ref({
-	skilledTaskType: [], // 擅长任务类型
+	patrolTaskType: [], // 擅长任务类型
 	skilledUavType: [], // 擅长机型
 	technicalStrength: [] // 技术特长
 })
@@ -212,7 +212,7 @@
 
 // 获取字典
 function getDictList() {
-	getDictionaryByCode('skilledTaskType,skilledUavType,technicalStrength').then(res => {
+	getDictionaryByCode('patrolTaskType,skilledUavType,technicalStrength').then(res => {
 		dictObj.value = res.data.data
 	})
 }

--
Gitblit v1.9.3