From 3ec8d3625e6fb7614e2ec4bb02ed99a3cdf4cdb7 Mon Sep 17 00:00:00 2001
From: shuishen <1109946754@qq.com>
Date: Thu, 12 Feb 2026 11:28:47 +0800
Subject: [PATCH] Merge branch 'master' of http://139.196.74.78:10010/r/jagzwxm/ja_web
---
applications/task-work-order/src/views/orderView/flyingHand/index.vue | 45 ++++++++++++++++++++++++++++++++++-----------
1 files changed, 34 insertions(+), 11 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 c499452..a291e82 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.patrolTaskType) }}
+ {{ getDictLabel(row.skilledTaskType, dictObj.workOrderType) }}
</template>
</el-table-column>
<el-table-column label="操作" class-name="operation-btns" width="180">
@@ -112,8 +112,8 @@
import { onMounted, ref, nextTick } from 'vue'
import { getDictionaryByCode } from '@/api/system/dictbiz'
import { getDictLabel } from '@ztzf/utils'
-import { getFlyingHandPage, removeFlyingHand } from './flyingHandApi'
-import { deviceFlyerApi } from '@/api/zkxt'
+import { getFlyingHandPage, removeFlyingHand,getAllFlyerIds } from './flyingHandApi'
+import { deviceFlyerApi,deviceFlyerDetailApi } from '@/api/zkxt'
import FlyingHandDialog from './FlyingHandDialog.vue'
import { ElMessage, ElMessageBox } from 'element-plus'
import { prod } from 'mathjs'
@@ -136,7 +136,7 @@
const flyingHandData = ref({})
const dictObj = ref({
- patrolTaskType: [], // 擅长任务类型
+ workOrderType: [], // 擅长任务类型
skilledUavType: [], // 擅长机型
technicalStrength: [] // 技术特长
})
@@ -159,6 +159,7 @@
function handleSearch() {
searchParams.value.current = 1
getList()
+ getFlyingHandList()
}
// 重置查询
@@ -166,6 +167,7 @@
queryParamsRef.value?.resetFields()
searchParams.value.current = 1
getList()
+ getFlyingHandList()
}
// 添加飞手
@@ -178,8 +180,18 @@
// 查看飞手
function viewFlyingHand(row) {
dialogType.value = 'view'
- flyingHandData.value = { ...row }
- dialogVisible.value = true
+ if (row.flyerId) {
+ deviceFlyerDetailApi(row.flyerId).then(res => {
+ flyingHandData.value = { ...row }
+ flyingHandData.value.licenseFrontFileUrl = res.data.data.licenseFrontFileUrl
+ flyingHandData.value.licenseBackFileUrl = res.data.data.licenseBackFileUrl
+ flyingHandData.value.certification = [res.data.data.licenseFrontFileUrl, res.data.data.licenseBackFileUrl]
+ dialogVisible.value = true
+ })
+ } else {
+ flyingHandData.value = { ...row }
+ dialogVisible.value = true
+ }
}
// 编辑飞手
@@ -202,30 +214,41 @@
await removeFlyingHand({ ids: ids })
ElMessage.success('删除成功')
getList()
+ getFlyingHandList()
}
// 处理弹窗确认
function handleConfirm() {
dialogVisible.value = false
getList()
+ getFlyingHandList()
}
// 获取字典
function getDictList() {
- getDictionaryByCode('patrolTaskType,skilledUavType,technicalStrength').then(res => {
+ getDictionaryByCode('workOrderType,skilledUavType,technicalStrength').then(res => {
dictObj.value = res.data.data
})
}
// 获取飞手列表
const flyingHandList = ref([])
+const flyingHandEditList = ref([])
function getFlyingHandList() {
- deviceFlyerApi({ current: 1, size: 10 }).then(res => {
- flyingHandList.value = res?.data?.data ?? []
- })
+ getAllFlyerIds().then(resIds => {
+ console.log(resIds.data.data, '99999')
+ deviceFlyerApi({ current: 1, size: 9999 }).then(res => {
+ flyingHandEditList.value = res?.data?.data ?? []
+ flyingHandList.value = res?.data?.data ?? []
+ // 把已经建档的飞手从flyingHandList.value里面移除
+ flyingHandList.value = flyingHandList.value.filter(item => !resIds.data.data.includes(item.id))
+ console.log(flyingHandList.value, '11111')
+ })
+ })
}
provide('flyingHandList', flyingHandList)
+provide('flyingHandEditList', flyingHandEditList)
onMounted(() => {
getList()
@@ -233,4 +256,4 @@
getFlyingHandList()
})
</script>
-<style scoped lang="scss"></style>
\ No newline at end of file
+<style scoped lang="scss"></style>
--
Gitblit v1.9.3