From 4b3c357f2fa24a27eac3fe59cbf64e34255ab212 Mon Sep 17 00:00:00 2001
From: chenyao <1219716595@qq.com>
Date: Tue, 30 Jun 2026 11:56:09 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
applications/task-work-order/src/views/orderView/orderManage/inspectionRequest/ViewDiaLog.vue | 114 +++++++++++++++++++++++++++++++++++++++++----------------
1 files changed, 82 insertions(+), 32 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 9e20e41..32f497b 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
@@ -82,15 +82,19 @@
任务成果({{ taskResultList.length || 0 }}条)
</div>
<div class="imgBox">
- <div v-for="item in taskResultList">
+ <div
+ v-for="item in taskResultList.filter(
+ item1 => item1.resultUrl && [1, 2, 3].includes(item1.attachmentType)
+ )"
+ >
<el-image
- v-if="item.attachmentType === 0 && item.resultUrl"
- :src="item.resultUrl"
- :preview-src-list="[item.resultUrl]"
+ v-if="item.attachmentType === 1 || item.attachmentType === 2"
+ :src="item.attachmentType === 1 ? item.resultUrl : item.aiImg"
+ :preview-src-list="[item.attachmentType === 1 ? item.resultUrl : item.aiImg]"
fit="cover"
preview-teleported
/>
- <div class="video-btn" v-if="item.attachmentType === 1 && item.resultUrl" @click="videoClick(item)">
+ <div class="video-btn" v-if="item.attachmentType === 3" @click="videoClick(item)">
<el-icon :size="30" color="#fff">
<VideoPlay />
</el-icon>
@@ -116,8 +120,9 @@
popper-class="gd-select-popper"
v-model="formData.patrolTaskType"
:options="workOrderTypeXT"
- :props="taskTypeCascaderProps"
+ :props="{ ...taskTypeCascaderProps, multiple: true }"
placeholder="请选择"
+ collapse-tags
clearable
/>
</el-form-item>
@@ -274,31 +279,34 @@
v-if="VideoShow"
v-model="VideoShow"
:playUrl="currentVideo.resultUrl"
- >
- </VideoPlayDialog>
+ ></VideoPlayDialog>
</template>
<script setup>
import { computed, ref, onMounted, inject } from 'vue'
import { ElMessage } from 'element-plus'
-import { fieldRules, flyVisual, getDictLabel, geomAnalysis } from '@ztzf/utils'
+import { fieldRules, flyVisual, geomAnalysis, getAiImg } from '@ztzf/utils'
import {
gdPatrolTaskRepublish,
gdFlyerPageApi,
gdPatrolTaskAuditApi,
gdPatrolTaskDetailApi,
} from './inspectionRequestApi'
-import { gdWorkOrderFlowListApi, gdWorkOrderFlowPatrolListApi, gdWorkOrderDetailApi } from '../orderManage/orderManageApi'
+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 { Check, VideoPlay } from '@element-plus/icons-vue'
import { queryAirById, airlineListApi, algorithmGroupedApi } from '@/api/zkxt'
import * as Cesium from 'cesium'
import { useStore } from 'vuex'
-import { getTaskTypeLabel, taskTypeCascaderProps, toTaskTypeCascaderValue, toTaskTypeRequestValue } from '../taskTypeOptions'
+import { getTaskTypeLabel, taskTypeCascaderProps } from '../taskTypeOptions'
// 初始化表单数据
const initForm = () => ({
@@ -355,7 +363,7 @@
children: (group.algorithms || []).map(alg => ({
id: alg.id,
name: alg.name,
- }))
+ })),
}))
} catch (e) {
console.error('获取算法列表失败', e)
@@ -366,10 +374,12 @@
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(', ')
+ return algorithmIds
+ .map(id => {
+ const item = allAlgorithms.find(alg => alg.id === id)
+ return item ? item.name : id
+ })
+ .join(', ')
}
const gdStatusObj = {
@@ -489,11 +499,7 @@
if (!isValid) return
submitting.value = true
try {
- const payload = {
- ...formData.value,
- patrolTaskType: toTaskTypeRequestValue(formData.value.patrolTaskType),
- }
- await gdPatrolTaskRepublish(payload)
+ await gdPatrolTaskRepublish(formData.value)
ElMessage.success('更新成功')
visible.value = false
emit('success')
@@ -508,8 +514,13 @@
if (!formData.value?.id) return
try {
const res = await gdTaskResultListApi({ patrolTaskId: formData.value.id })
- taskResultList.value = res?.data?.data ?? []
- console.log(taskResultList.value, '8989')
+ taskResultList.value = await Promise.all(
+ (res?.data?.data ?? []).map(async item => {
+ if (item.attachmentType !== 2) return item
+ const aiImg = await getAiImg(item.resultUrl, item.geojson)
+ return { ...item, aiImg }
+ })
+ )
} finally {
}
}
@@ -527,18 +538,18 @@
function getAirDetails() {
const dockHeight = formData.value.height
queryAirById(formData.value.patrolRouteUrl).then(res => {
- const { airlineWaypoints, airlineSetting } = res.data.data;
+ const { airlineWaypoints, airlineSetting } = res.data.data
// 使用空值合并运算符 ?? 或 逻辑或 || 兜底
- const { globalAirlineHeight = 0, airlineHeightMode } = airlineSetting || {};
+ const { globalAirlineHeight = 0, airlineHeightMode } = airlineSetting || {}
const relative = airlineHeightMode === 'relativeToStartPoint'
const list = airlineWaypoints
if (!list.length) return mapRef.value?.flyBoundary()
const result = list.map(item => {
let height = item?.globalHeight || globalAirlineHeight
- if (relative){
+ if (relative) {
height = height + Number(dockHeight)
}
- return [Number(item.longitude), Number(item.latitude),height || 0]
+ return [Number(item.longitude), Number(item.latitude), height || 0]
})
viewer.entities.add({
polyline: {
@@ -584,7 +595,6 @@
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)
@@ -596,7 +606,7 @@
getAlgorithmList()
// 获取工单详情并根据geom范围获取航线列表
await getWorkOrderDetail(formData.value.workOrderId)
- ;['6', '7', '8'].includes(row.taskStatus) && await getTaskResultList()
+ ;['6', '7', '8'].includes(row.taskStatus) && (await getTaskResultList())
loadList()
initMap()
getAirDetails()
@@ -624,8 +634,8 @@
let VideoShow = ref(false)
let currentVideo = ref({})
function videoClick(row) {
- VideoShow.value = true
currentVideo.value = row
+ VideoShow.value = true
}
// 初始化地图实例
@@ -669,6 +679,16 @@
width: calc((100% - 40px) / 5); /* 5列布局，减去4个10px间隙 */
height: 110px;
flex-shrink: 0;
+ position: relative;
+ overflow: hidden;
+ border-radius: 4px;
+ cursor: pointer;
+ box-shadow: inset 0 0 0 1px rgba(17, 31, 68, 0.08);
+ transition: box-shadow 0.16s ease;
+
+ &:hover {
+ box-shadow: inset 0 0 0 2px rgba(76, 52, 255, 0.48), 0 8px 20px rgba(76, 52, 255, 0.24);
+ }
}
.el-image {
width: 100%;
@@ -677,11 +697,41 @@
.video-btn {
width: 100%;
height: 100%;
- background-color: #9E9E9E;
+ position: relative;
+ overflow: hidden;
+ //border: 1px solid #D8D6FF;
+ border-radius: 4px;
+ background: linear-gradient(135deg, rgba(76, 52, 255, 0.14), rgba(76, 52, 255, 0) 48%),
+ linear-gradient(180deg, #f4f5ff 0%, #e9ecff 100%);
+ box-shadow: inset 0 0 0 1px rgba(255, 255, 255, 0.7);
display: flex;
align-items: center;
justify-content: center;
cursor: pointer;
+
+ &::before {
+ content: '';
+ position: absolute;
+ inset: 0;
+ background-image: linear-gradient(
+ 90deg,
+ rgba(76, 52, 255, 0.05) 0,
+ rgba(76, 52, 255, 0.05) 1px,
+ transparent 1px,
+ transparent 12px
+ );
+ opacity: 0.42;
+ }
+
+ .el-icon {
+ position: relative;
+ z-index: 1;
+ width: 42px;
+ height: 42px;
+ border-radius: 50%;
+ background: rgba(76, 52, 255, 0.72);
+ box-shadow: 0 4px 12px rgba(76, 52, 255, 0.2);
+ }
}
}
:deep(.el-timeline-item__timestamp) {
--
Gitblit v1.9.3