From 1d552a3bad95caae4af15322df28e6240b797693 Mon Sep 17 00:00:00 2001
From: 罗广辉 <guanghui.luo@foxmail.com>
Date: Thu, 13 Aug 2026 15:32:06 +0800
Subject: [PATCH] feat: app视频封面图
---
applications/task-work-order/src/views/orderView/orderManage/inspectionRequest/FormDiaLog.vue | 55 ++++++++++++++++++++++++++++++++-----------------------
1 files changed, 32 insertions(+), 23 deletions(-)
diff --git a/applications/task-work-order/src/views/orderView/orderManage/inspectionRequest/FormDiaLog.vue b/applications/task-work-order/src/views/orderView/orderManage/inspectionRequest/FormDiaLog.vue
index 74afb7a..286905d 100644
--- a/applications/task-work-order/src/views/orderView/orderManage/inspectionRequest/FormDiaLog.vue
+++ b/applications/task-work-order/src/views/orderView/orderManage/inspectionRequest/FormDiaLog.vue
@@ -33,7 +33,7 @@
<div class="info-item">
<span class="label">工单类型</span>
<span class="val" v-if="selectedWorkOrder">
- {{ getDictLabel(selectedWorkOrder.workOrderType, dictObj.workOrderType) }}
+ {{ getTaskTypeLabel(selectedWorkOrder.workOrderType, workOrderTypeXT) }}
</span>
<span class="val grayText" v-else>选择工单后自动带出</span>
</div>
@@ -92,26 +92,22 @@
/>
</template>
</el-table-column>
- <el-table-column prop="patrolTaskType" min-width="100">
+ <el-table-column prop="patrolTaskType" min-width="120">
<template #header>
<span class="required-star">*</span>
巡查任务类型
</template>
<template v-slot="{ row, $index }">
- <el-select
+ <el-cascader
class="gd-select"
popper-class="gd-select-popper"
v-model="row.patrolTaskType"
+ :options="workOrderTypeXT"
+ :props="{...taskTypeCascaderProps,multiple:true}"
placeholder="请选择"
+ collapse-tags
@change="handlePatrolTaskTypeChange($index, $event)"
- >
- <el-option
- v-for="item in dictObj.workOrderType"
- :key="item.dictKey"
- :label="item.dictValue"
- :value="item.dictKey"
- />
- </el-select>
+ />
</template>
</el-table-column>
<el-table-column prop="executeTime" width="200">
@@ -166,7 +162,6 @@
placeholder="请选择"
filterable
:disabled="dialogReadonly || !taskList[$index].patrolTaskType"
-
>
<el-option
v-for="item in flyerListMap[$index] || []"
@@ -176,7 +171,7 @@
>
<template #default>
<!-- 匹配区域=1 显示红星号 -->
- <span v-if="item.areaMatchFlag === 1" style="color: #f56c6c; margin-right: 4px;">*</span>
+ <span v-if="item.taskTypeMatchFlag === 1" style="color: #f56c6c; margin-right: 4px;">*</span>
<span>{{ item.flyerName }}</span>
</template>
</el-option>
@@ -265,20 +260,25 @@
</template>
<script setup>
-import { computed, ref, onMounted } from 'vue'
+import { computed, ref, onMounted, inject } from 'vue'
import { ElMessage } from 'element-plus'
import { Plus, Delete } from '@element-plus/icons-vue'
import { geomAnalysis, getDictLabel } from '@ztzf/utils'
+
import { gdPatrolTaskSaveApi, gdFlyerPageApi, gdPatrolTaskAuditApi } from './inspectionRequestApi'
import { gdWorkOrderPageApi } from '../orderManage/orderManageApi'
import { gdManageDeviceListApi } from '../orderManage/gdManageDeviceApi'
import { pxToRem } from '@/utils/rem'
import { airlineListApi, algorithmGroupedApi } from '@/api/zkxt'
+import {
+ getTaskTypeLabel,
+ taskTypeCascaderProps,
+} from '../taskTypeOptions'
// 初始化任务行
const initTaskRow = () => ({
patrolTaskName: '',
- patrolTaskType: '',
+ patrolTaskType: [],
executeTime: '',
patrolRouteUrl: '',
deviceFlyerId: '',
@@ -305,6 +305,7 @@
const routeOptions = ref([]) // 航线选项（根据工单范围获取）
const routeLoading = ref(false) // 航线加载中
const algorithmTreeData = ref([]) // 算法树形数据
+const workOrderTypeXT = inject('workOrderTypeXT', ref([]))
// 获取算法分组数据
async function getAlgorithmList() {
@@ -435,11 +436,15 @@
// 获取飞手列表
async function getFlyerList(index, skilledTaskType) {
+ if (!skilledTaskType.length) {
+ flyerListMap.value[index] = []
+ return
+ }
const obj = getPolygonCenter(geomAnalysis(selectedWorkOrder.value.geom))
const res = await gdFlyerPageApi({
size: 999,
current: 1,
- skilledTaskType,
+ skilledTaskType: skilledTaskType.map(item => item[1])?.join?.(','),
// longitude: obj.longitude || '',
// latitude: obj.latitude || '',
})
@@ -464,8 +469,15 @@
// 判断一行是否已填写（至少填写了任务名称）
function isTaskRowFilled(task) {
- return !!(task.patrolTaskName || task.executeTime || task.patrolRouteUrl || task.deviceFlyerId || task.deviceId)
+ return !!(
+ task.patrolTaskName ||
+ task.executeTime ||
+ task.patrolRouteUrl ||
+ task.deviceFlyerId ||
+ task.deviceId
+ )
}
+
// 提交新增
async function handleSubmit() {
@@ -487,10 +499,6 @@
// 已填写的行需要校验完整性
if (!task.patrolTaskName) {
ElMessage.warning(`第${i + 1}行: 请输入巡查任务名称`)
- return
- }
- if (!task.patrolTaskType) {
- ElMessage.warning(`第${i + 1}行: 请选择巡查任务类型`)
return
}
if (!task.executeTime) {
@@ -534,6 +542,7 @@
dialogMode.value = mode
await getWorkOrderList()
getAlgorithmList()
+
if (dialogMode.value === 'add') {
selectedWorkOrderId.value = null
selectedWorkOrder.value = null
@@ -543,11 +552,11 @@
// 编辑/查看模式 - 加载已有数据
selectedWorkOrderId.value = row?.workOrderId
handleWorkOrderChange(row?.workOrderId)
- taskList.value = [{ ...row }]
+ taskList.value = [{ ...row, patrolTaskType: row?.patrolTaskType || [] }]
flyerListMap.value = {}
// 如果有巡查类型，加载对应的飞手列表
if (row?.patrolTaskType) {
- getFlyerList(0, row.patrolTaskType)
+ getFlyerList(0, taskList.value[0].patrolTaskType)
}
}
}
--
Gitblit v1.9.3