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 | 310 +++++++++++++++++++++++++++++++++++++--------------
1 files changed, 225 insertions(+), 85 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 ce4967b..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
@@ -9,23 +9,26 @@
width="80%"
>
<div class="detail-container" style="display: flex">
- <div class="detail-left" v-if="dialogMode !== 'add' && processList.length">
- <el-timeline class="gd-timeline">
- <el-timeline-item
- v-for="(activity, index) in processList"
- :key="index"
- :icon="Check"
- :type="index === processList.length - 1 ? 'success' : 'info'"
- :color="activity.color"
- :hollow="activity.hollow"
- :timestamp="activity.createTime"
- >
- <div class="item-content">
- <div>{{ activity.operator }}</div>
- <div class="flowName">{{ activity.flowName }}</div>
- </div>
- </el-timeline-item>
- </el-timeline>
+ <div class="processBox">
+ <div class="detail-title">巡查需求记录</div>
+ <div class="detail-left" v-if="dialogMode !== 'add'">
+ <el-timeline class="gd-timeline">
+ <el-timeline-item
+ v-for="(activity, index) in processList"
+ :key="index"
+ :icon="Check"
+ :type="index === processList.length - 1 ? 'success' : 'info'"
+ :color="activity.color"
+ :hollow="activity.hollow"
+ :timestamp="activity.createTime"
+ >
+ <div class="item-content">
+ <div>{{ activity.operator }}</div>
+ <div class="flowName">{{ activity.flowName }}</div>
+ </div>
+ </el-timeline-item>
+ </el-timeline>
+ </div>
</div>
<div class="detail-right">
@@ -39,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>
@@ -55,7 +58,7 @@
</el-col>
<el-col :span="12">
<div class="label">推荐飞手</div>
- <div class="val">{{ formData.recommendFlyerName }}</div>
+ <div class="val">{{ getFlyerName(formData.deviceFlyerId) }}</div>
</el-col>
<el-col :span="12">
<div class="label">选择设备</div>
@@ -69,6 +72,10 @@
<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)">
<div class="detail-title" :style="{ marginTop: pxToRem(10) }">
@@ -77,19 +84,25 @@
<div class="imgBox">
<div v-for="item in taskResultList">
<el-image
- v-if="item.resultUrl"
+ v-if="item.attachmentType === 0 && item.resultUrl"
:src="item.resultUrl"
:preview-src-list="[item.resultUrl]"
fit="cover"
preview-teleported
/>
+ <div class="video-btn" v-if="item.attachmentType === 1 && item.resultUrl" @click="videoClick(item)">
+ <el-icon :size="30" color="#fff">
+ <VideoPlay />
+ </el-icon>
+ </div>
</div>
</div>
</template>
</div>
<!-- 编辑模式 -->
- <el-form class="gd-dialog-form" v-else ref="formRef" :model="formData" :rules="rules" label-width="110px">
+ <el-form class="gd-dialog-form" v-else ref="formRef" :model="formData" :rules="rules" label-width="130px">
+ <div class="detail-title">巡查任务详情</div>
<el-row>
<el-col :span="12">
<el-form-item label="巡查任务名称" prop="patrolTaskName">
@@ -98,27 +111,21 @@
</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">
<el-form-item label="任务执行时间" prop="executeTime">
<el-date-picker
class="gd-date-picker"
- popper-class="gd-date-picker-popper"
v-model="formData.executeTime"
type="datetime"
placeholder="请选择"
@@ -141,16 +148,16 @@
</el-form-item>
</el-col>
<el-col :span="12">
- <el-form-item label="推荐飞手" prop="recommendFlyerName">
+ <el-form-item label="推荐飞手" prop="deviceFlyerId">
<el-select
class="gd-select"
popper-class="gd-select-popper"
- v-model="formData.recommendFlyerName"
+ v-model="formData.deviceFlyerId"
placeholder="请选择"
filterable
clearable
>
- <el-option v-for="item in flyerList" :key="item.id" :label="item.flyerName" :value="item.flyerName" />
+ <el-option v-for="item in flyerList" :key="item.id" :label="item.flyerName" :value="item.flyerId" />
</el-select>
</el-form-item>
</el-col>
@@ -173,10 +180,30 @@
<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">
<el-form-item label="巡查任务描述" prop="taskDesc">
<el-input
- class="gd-input"
+ class="gd-input-text"
type="textarea"
:rows="4"
v-model="formData.taskDesc"
@@ -204,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>
@@ -231,7 +258,7 @@
</template>
<template v-if="permission.flyOrder_controlReview">
<el-button v-if="taskStatus === '3'" @click="addDescription" color="#F2F3F5">驳回</el-button>
- <el-button v-if="taskStatus === '3'" @click="statusChange(4)" color="#4C34FF">同意</el-button>
+ <el-button v-if="taskStatus === '3'" @click="statusChange(4)" color="#4C34FF">通过</el-button>
</template>
</template>
<RefuseOrderDialog1
@@ -241,33 +268,48 @@
@success="rejectSuccess"
/>
</el-dialog>
+
+ <VideoPlayDialog
+ ref="videoPlayDialogRef"
+ v-if="VideoShow"
+ v-model="VideoShow"
+ :playUrl="currentVideo.resultUrl"
+ >
+ </VideoPlayDialog>
</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 } from '@ztzf/utils'
-import { gdPatrolTaskRepublish, gdFlyerPageApi, gdPatrolTaskAuditApi } from './inspectionRequestApi'
-import { gdWorkOrderFlowListApi, gdWorkOrderFlowPatrolListApi, gdWorkOrderPageApi } from '../orderManage/orderManageApi'
+import { fieldRules, flyVisual, getDictLabel, geomAnalysis } from '@ztzf/utils'
+import {
+ gdPatrolTaskRepublish,
+ gdFlyerPageApi,
+ gdPatrolTaskAuditApi,
+ gdPatrolTaskDetailApi,
+} from './inspectionRequestApi'
+import { gdWorkOrderFlowListApi, gdWorkOrderFlowPatrolListApi, gdWorkOrderDetailApi } from '../orderManage/orderManageApi'
import { gdManageDeviceListApi } from '../orderManage/gdManageDeviceApi'
import { pxToRem } from '@/utils/rem'
import CommonCesiumMap from '@/components/map-container/common-cesium-map.vue'
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 } 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: '',
- recommendFlyerName: '',
+ deviceFlyerId: null,
deviceId: null,
+ algorithmIds: [],
taskDesc: '',
workOrderId: null,
})
@@ -283,23 +325,58 @@
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)
const refuseOrderDialogRef = ref(null)
-// 下拉选项
const flyerList = ref([])
const deviceList = ref([])
-const workOrderList = ref([])
-const routeOptions = inject('routeOptions')
-const getAirName = inject('getAirName')
+const workOrderDetail = ref(null) // 工单详情
+const routeOptions = ref([]) // 航线选项（根据工单范围获取）
+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 = {
- '0': { reason: '拒绝原因', operationType: '2' },
+ '0': { reason: '拒绝原因', operationType: '2', title: '拒绝签收' },
'1': { reason: '拒绝原因' },
'2': { reason: '' },
- '3': { reason: '驳回原因', operationType: '5' },
+ '3': { reason: '驳回原因', operationType: '5', title: '驳回' },
'4': { reason: '驳回原因' },
'5': { reason: '' },
'6': { reason: '拒绝原因' },
@@ -315,7 +392,7 @@
patrolTaskType: fieldRules(true),
executeTime: fieldRules(true),
patrolRouteUrl: fieldRules(true),
- recommendFlyerName: fieldRules(true),
+ deviceFlyerId: fieldRules(true),
deviceId: fieldRules(true),
}
@@ -333,6 +410,7 @@
row: formData.value,
type: gdStatusObj[taskStatus.value].operationType,
formLabel: gdStatusObj[taskStatus.value].reason,
+ title: gdStatusObj[taskStatus.value]?.title,
})
})
}
@@ -360,16 +438,16 @@
return item ? item.nickname : id
}
-// 获取工单名称
-function getWorkOrderName(id) {
- const item = workOrderList.value.find(item => item.id === id)
- return item ? item.workOrderName : id
+// 获取飞手名称
+function getFlyerName(id) {
+ const item = flyerList.value.find(item => item.flyerId === id)
+ return item ? item.flyerName : id
}
-// 获取工单列表
-async function getWorkOrderList() {
- const res = await gdWorkOrderPageApi({ size: 999 })
- workOrderList.value = res?.data?.data?.records ?? []
+// 获取工单名称
+function getWorkOrderName(id) {
+ if (workOrderDetail.value?.id === id) return workOrderDetail.value.workOrderName
+ return id
}
// 获取飞手列表
@@ -411,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')
@@ -427,11 +509,13 @@
try {
const res = await gdTaskResultListApi({ patrolTaskId: formData.value.id })
taskResultList.value = res?.data?.data ?? []
+ console.log(taskResultList.value, '8989')
} finally {
}
}
import { ArrowLineMaterialProperty } from '@/utils/cesium/Material'
import OrderStepBar from '@/views/orderView/orderManage/orderManage/OrderStepBar.vue'
+import VideoPlayDialog from '@/components/VideoPlayDialog.vue'
let arrowLineMaterialProperty = new ArrowLineMaterialProperty({
color: new Cesium.Color(128 / 255, 215 / 255, 255 / 255, 1),
directionColor: new Cesium.Color(1, 1, 1, 1),
@@ -441,69 +525,107 @@
})
// 获取航线详情
function getAirDetails() {
+ const dockHeight = formData.value.height
queryAirById(formData.value.patrolRouteUrl).then(res => {
- const list = res.data.data.airlineWaypoints
+ const { airlineWaypoints, airlineSetting } = res.data.data;
+ // 使用空值合并运算符 ?? 或 逻辑或 || 兜底
+ const { globalAirlineHeight = 0, airlineHeightMode } = airlineSetting || {};
+ const relative = airlineHeightMode === 'relativeToStartPoint'
+ const list = airlineWaypoints
if (!list.length) return mapRef.value?.flyBoundary()
- const result = list.map(item => [Number(item.longitude), Number(item.latitude)]).flat()
+ const result = list.map(item => {
+ let height = item?.globalHeight || globalAirlineHeight
+ if (relative){
+ height = height + Number(dockHeight)
+ }
+ return [Number(item.longitude), Number(item.latitude),height || 0]
+ })
viewer.entities.add({
polyline: {
- positions: Cesium.Cartesian3.fromDegreesArray(result),
- clampToGround: true,
+ positions: Cesium.Cartesian3.fromDegreesArrayHeights(result.flat()),
width: 4,
material: arrowLineMaterialProperty,
},
})
// 渲染起点（蓝色）
- const startPoint = list[0]
+ const startPoint = result[0]
viewer.entities.add({
- position: Cesium.Cartesian3.fromDegrees(
- Number(startPoint.longitude),
- Number(startPoint.latitude),
- startPoint.height || 0
- ),
+ position: Cesium.Cartesian3.fromDegrees(Number(startPoint[0]), Number(startPoint[1]), startPoint[2]),
point: {
pixelSize: 12,
color: Cesium.Color.BLUE,
outlineColor: Cesium.Color.WHITE,
outlineWidth: 2,
- heightReference: Cesium.HeightReference.CLAMP_TO_GROUND,
},
})
// 渲染终点（红色）
- const endPoint = list[list.length - 1]
+ const endPoint = result[result.length - 1]
viewer.entities.add({
- position: Cesium.Cartesian3.fromDegrees(
- Number(endPoint.longitude),
- Number(endPoint.latitude),
- endPoint.height || 0
- ),
+ position: Cesium.Cartesian3.fromDegrees(Number(endPoint[0]), Number(endPoint[1]), endPoint[2]),
point: {
pixelSize: 12,
color: Cesium.Color.RED,
outlineColor: Cesium.Color.WHITE,
outlineWidth: 2,
- heightReference: Cesium.HeightReference.CLAMP_TO_GROUND,
},
})
flyVisual({
positionsData: list.map(i => [Number(i.longitude), Number(i.latitude), i.height || 0]),
viewer,
+ multiple: 6,
})
})
}
// 打开弹框
async function open({ mode = 'view', row } = {}) {
+ detailLoaded.value = false
dialogMode.value = mode
- formData.value = { ...initForm(), ...row }
- ;['6', '7', '8'].includes(row.taskStatus) && getTaskResultList()
+
+ 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()
loadList()
initMap()
+ getAirDetails()
}
-const readyMap = () => {
- // mapRef.value?.flyBoundary()
- getAirDetails()
+// 获取工单详情
+async function getWorkOrderDetail(workOrderId) {
+ if (!workOrderId) return
+ try {
+ const res = await gdWorkOrderDetailApi({ id: workOrderId })
+ workOrderDetail.value = res?.data?.data ?? null
+ // 根据工单geom范围获取航线列表
+ const geom = workOrderDetail.value?.geom
+ if (!geom) return
+ const coordinates = geomAnalysis(geom)
+ if (!coordinates || !coordinates.length) return
+ const airRes = await airlineListApi(coordinates)
+ routeOptions.value = (airRes.data.data || []).filter(item => item)
+ } catch (e) {
+ console.error('获取工单详情或航线列表失败', e)
+ }
+}
+
+// 点击视频
+let VideoShow = ref(false)
+let currentVideo = ref({})
+function videoClick(row) {
+ VideoShow.value = true
+ currentVideo.value = row
}
// 初始化地图实例
@@ -514,7 +636,6 @@
}
onMounted(() => {
- getWorkOrderList()
getFlyerList()
getDeviceList()
})
@@ -533,7 +654,7 @@
.item-content {
position: relative;
.flowName {
- width: 80px;
+ width: 72px;
position: absolute;
left: -120px;
top: 0px;
@@ -553,10 +674,29 @@
width: 100%;
height: 100%;
}
+ .video-btn {
+ width: 100%;
+ height: 100%;
+ background-color: #9E9E9E;
+ display: flex;
+ align-items: center;
+ justify-content: center;
+ cursor: pointer;
+ }
}
:deep(.el-timeline-item__timestamp) {
font-size: 12px;
color: #999;
margin-top: 2px;
}
+
+.processBox {
+ display: flex;
+ flex-direction: column;
+
+ .detail-left {
+ height: 100%;
+ overflow: auto;
+ }
+}
</style>
--
Gitblit v1.9.3