From d04ecbb2aa47d93e05d28bb551e7bad83d97d60f Mon Sep 17 00:00:00 2001
From: 罗广辉 <guanghui.luo@foxmail.com>
Date: Wed, 03 Jun 2026 18:38:55 +0800
Subject: [PATCH] feat: 类型多选改造
---
applications/task-work-order/src/views/orderView/orderManage/inspectionRequest/ViewDiaLog.vue | 104 +++++++++++++++++++++++++++++++++++++++++++--------
1 files changed, 87 insertions(+), 17 deletions(-)
diff --git a/applications/task-work-order/src/views/orderView/orderManage/inspectionRequest/ViewDiaLog.vue b/applications/task-work-order/src/views/orderView/orderManage/inspectionRequest/ViewDiaLog.vue
index ac11597..9e20e41 100644
--- a/applications/task-work-order/src/views/orderView/orderManage/inspectionRequest/ViewDiaLog.vue
+++ b/applications/task-work-order/src/views/orderView/orderManage/inspectionRequest/ViewDiaLog.vue
@@ -42,7 +42,7 @@
</el-col>
<el-col :span="12">
<div class="label">巡查任务类型</div>
- <div class="val">{{ getDictLabel(formData.patrolTaskType, dictObj.workOrderType) }}</div>
+ <div class="val">{{ getTaskTypeLabel(formData.patrolTaskType, workOrderTypeXT) }}</div>
</el-col>
<el-col :span="12">
<div class="label">任务执行时间</div>
@@ -71,6 +71,10 @@
<el-col :span="12">
<div class="label">巡查任务描述</div>
<div class="val">{{ formData.taskDesc }}</div>
+ </el-col>
+ <el-col :span="12">
+ <div class="label">算法</div>
+ <div class="val">{{ getAlgorithmNames(formData.algorithmIds) }}</div>
</el-col>
</el-row>
<template v-if="['6', '7', '8'].includes(taskStatus)">
@@ -107,20 +111,15 @@
</el-col>
<el-col :span="12">
<el-form-item label="巡查任务类型" prop="patrolTaskType">
- <el-select
+ <el-cascader
class="gd-select"
popper-class="gd-select-popper"
v-model="formData.patrolTaskType"
+ :options="workOrderTypeXT"
+ :props="taskTypeCascaderProps"
placeholder="请选择"
clearable
- >
- <el-option
- v-for="item in dictObj.workOrderType"
- :key="item.dictKey"
- :label="item.dictValue"
- :value="item.dictKey"
- />
- </el-select>
+ />
</el-form-item>
</el-col>
<el-col :span="12">
@@ -158,7 +157,7 @@
filterable
clearable
>
- <el-option v-for="item in flyerList" :key="item.id" :label="item.flyerName" :value="item.id" />
+ <el-option v-for="item in flyerList" :key="item.id" :label="item.flyerName" :value="item.flyerId" />
</el-select>
</el-form-item>
</el-col>
@@ -179,6 +178,26 @@
<el-col :span="12">
<el-form-item label="关联工单">
<span>{{ getWorkOrderName(formData.workOrderId) }}</span>
+ </el-form-item>
+ </el-col>
+ <!-- 算法下拉 -->
+ <el-col :span="12">
+ <el-form-item label="算法" prop="algorithmIds">
+ <el-tree-select
+ class="gd-select"
+ popper-class="gd-tree-select-popper"
+ v-model="formData.algorithmIds"
+ :data="algorithmTreeData"
+ :props="{ label: 'name', children: 'children', value: 'id' }"
+ node-key="id"
+ multiple
+ collapse-tags
+ collapse-tags-tooltip
+ check-strictly
+ filterable
+ clearable
+ placeholder="请选择"
+ />
</el-form-item>
</el-col>
<el-col :span="24">
@@ -212,7 +231,7 @@
</div>
</div>
- <template #footer>
+ <template #footer v-if="detailLoaded">
<el-button v-if="['1', '4', '7'].includes(taskStatus)" @click="viewDescription" color="#F2F3F5">
{{ gdStatusObj[taskStatus].reason }}
</el-button>
@@ -260,7 +279,7 @@
</template>
<script setup>
-import { computed, ref, onMounted } from 'vue'
+import { computed, ref, onMounted, inject } from 'vue'
import { ElMessage } from 'element-plus'
import { fieldRules, flyVisual, getDictLabel, geomAnalysis } from '@ztzf/utils'
import {
@@ -276,19 +295,21 @@
import { gdTaskResultListApi } from '@/views/orderView/orderManage/clueEvents/achievementApi'
import RefuseOrderDialog1 from '@/views/orderView/orderManage/inspectionRequest/RefuseOrderDialog1.vue'
import { Check } from '@element-plus/icons-vue'
-import { queryAirById, airlineListApi } from '@/api/zkxt'
+import { queryAirById, airlineListApi, algorithmGroupedApi } from '@/api/zkxt'
import * as Cesium from 'cesium'
import { useStore } from 'vuex'
+import { getTaskTypeLabel, taskTypeCascaderProps, toTaskTypeCascaderValue, toTaskTypeRequestValue } from '../taskTypeOptions'
// 初始化表单数据
const initForm = () => ({
id: null,
patrolTaskName: '',
- patrolTaskType: '',
+ patrolTaskType: [],
executeTime: '',
patrolRouteUrl: '',
deviceFlyerId: null,
deviceId: null,
+ algorithmIds: [],
taskDesc: '',
workOrderId: null,
})
@@ -304,6 +325,7 @@
const visible = defineModel()
const dialogMode = ref('view')
const submitting = ref(false)
+const detailLoaded = ref(false)
const dialogReadonly = computed(() => dialogMode.value === 'view')
const titleEnum = ref({ edit: '编辑', view: '查看' })
const taskStatus = computed(() => formData.value.taskStatus)
@@ -316,6 +338,38 @@
const getAirName = id => {
const item = routeOptions.value.find(item => item.id === id)
return item ? item.name : id
+}
+
+const algorithmTreeData = ref([]) // 算法树形数据
+const workOrderTypeXT = inject('workOrderTypeXT', ref([]))
+
+// 获取算法分组数据
+async function getAlgorithmList() {
+ try {
+ const res = await algorithmGroupedApi()
+ const list = res?.data?.data ?? []
+ algorithmTreeData.value = list.map(group => ({
+ id: 'group_' + group.type,
+ name: group.type,
+ disabled: true,
+ children: (group.algorithms || []).map(alg => ({
+ id: alg.id,
+ name: alg.name,
+ }))
+ }))
+ } catch (e) {
+ console.error('获取算法列表失败', e)
+ }
+}
+
+// 根据 algorithmIds 数组获取算法名称，逗号分割回显
+function getAlgorithmNames(algorithmIds) {
+ if (!algorithmIds || !algorithmIds.length) return ''
+ const allAlgorithms = algorithmTreeData.value.flatMap(group => group.children || [])
+ return algorithmIds.map(id => {
+ const item = allAlgorithms.find(alg => alg.id === id)
+ return item ? item.name : id
+ }).join(', ')
}
const gdStatusObj = {
@@ -386,7 +440,7 @@
// 获取飞手名称
function getFlyerName(id) {
- const item = flyerList.value.find(item => item.id === id)
+ const item = flyerList.value.find(item => item.flyerId === id)
return item ? item.flyerName : id
}
@@ -435,7 +489,11 @@
if (!isValid) return
submitting.value = true
try {
- await gdPatrolTaskRepublish(formData.value)
+ const payload = {
+ ...formData.value,
+ patrolTaskType: toTaskTypeRequestValue(formData.value.patrolTaskType),
+ }
+ await gdPatrolTaskRepublish(payload)
ElMessage.success('更新成功')
visible.value = false
emit('success')
@@ -521,9 +579,21 @@
// 打开弹框
async function open({ mode = 'view', row } = {}) {
+ detailLoaded.value = false
dialogMode.value = mode
+
const res = await gdPatrolTaskDetailApi({ id: row.id })
formData.value = { ...initForm(), ...res.data.data }
+ formData.value.patrolTaskType = toTaskTypeCascaderValue(formData.value.patrolTaskType)
+ // 确保 algorithmIds 是数组
+ if (formData.value.algorithmIds && typeof formData.value.algorithmIds === 'string') {
+ formData.value.algorithmIds = formData.value.algorithmIds.split(',').filter(Boolean)
+ } else if (!formData.value.algorithmIds) {
+ formData.value.algorithmIds = []
+ }
+ detailLoaded.value = true
+ // 获取算法列表
+ getAlgorithmList()
// 获取工单详情并根据geom范围获取航线列表
await getWorkOrderDetail(formData.value.workOrderId)
;['6', '7', '8'].includes(row.taskStatus) && await getTaskResultList()
--
Gitblit v1.9.3