applications/task-work-order/src/views/orderView/flyingHand/FlyingHandDialog.vue
@@ -66,17 +66,31 @@ <el-row> <el-col :span="12"> <el-form-item label="飞手姓名" prop="flyerId"> <el-select <el-select v-if="dialogType === 'add'" class="gd-select" popper-class="gd-select-popper" v-model="formData.flyerId" placeholder="请选择" clearable @change="handleChange" :disabled="dialogType === 'view'" > <el-option v-for="item in flyingHandList" :key="item.id" :label="item.name" :value="item.id" /> </el-select> <el-select v-else class="gd-select" popper-class="gd-select-popper" v-model="formData.flyerId" placeholder="请选择" clearable :disabled="dialogType === 'edit'" > <el-option v-for="item in flyingHandEditList" :key="item.id" :label="item.name" :value="item.id" @@ -215,6 +229,8 @@ const dictObj = inject('dictObj') // 擅长任务类型 const flyingHandList = inject('flyingHandList') // 飞手列表 const flyingHandEditList = inject('flyingHandEditList') // 飞手建档列表 const emit = defineEmits(['update:modelValue', 'confirm']) applications/task-work-order/src/views/orderView/flyingHand/flyingHandApi.js
@@ -34,3 +34,12 @@ method: 'post', }) } // 查看所有已经建档飞手 export function getAllFlyerIds(params) { return request({ url: '/drone-gd/flyer/gdFlyer/allFlyerIds', method: 'get', params }) } applications/task-work-order/src/views/orderView/flyingHand/index.vue
@@ -112,7 +112,7 @@ import { onMounted, ref, nextTick } from 'vue' import { getDictionaryByCode } from '@/api/system/dictbiz' import { getDictLabel } from '@ztzf/utils' import { getFlyingHandPage, removeFlyingHand } from './flyingHandApi' import { getFlyingHandPage, removeFlyingHand,getAllFlyerIds } from './flyingHandApi' import { deviceFlyerApi,deviceFlyerDetailApi } from '@/api/zkxt' import FlyingHandDialog from './FlyingHandDialog.vue' import { ElMessage, ElMessageBox } from 'element-plus' @@ -212,6 +212,7 @@ await removeFlyingHand({ ids: ids }) ElMessage.success('删除成功') getList() getFlyingHandList() } // 处理弹窗确认 @@ -229,13 +230,22 @@ // 获取飞手列表 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()