From 493a27022ad30291934db825bab591c7efdcbc09 Mon Sep 17 00:00:00 2001
From: 罗广辉 <guanghui.luo@foxmail.com>
Date: Wed, 12 Aug 2026 16:35:45 +0800
Subject: [PATCH] feat: 保存的时候一个按钮置灰
---
applications/task-work-order/src/views/orderView/orderManage/inspectionRequest/ViewDiaLog.vue | 264 +++++++++++++++++++++++++++++++++++++++-------------
1 files changed, 195 insertions(+), 69 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 0b4f24a..8b95244 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>
@@ -82,15 +82,21 @@
任务成果({{ 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"
+ :key="item.thumbnail"
+ v-if="item.attachmentType === 1 || item.attachmentType === 2"
+ :src="item.thumbnail"
:preview-src-list="[item.resultUrl]"
fit="cover"
preview-teleported
+ @error="handleThumbnailError(item)"
/>
- <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>
@@ -111,20 +117,16 @@
</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, multiple: true }"
placeholder="请选择"
+ collapse-tags
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">
@@ -237,33 +239,74 @@
</div>
<template #footer v-if="detailLoaded">
- <el-button v-if="['1', '4', '7'].includes(taskStatus)" @click="viewDescription" color="#F2F3F5">
+ <el-button
+ v-if="['1', '4', '7'].includes(taskStatus)"
+ :disabled="footerLoading"
+ @click="viewDescription"
+ color="#F2F3F5"
+ >
{{ gdStatusObj[taskStatus].reason }}
</el-button>
- <el-button @click="statusChange(3)" v-if="taskStatus === '3' && permission.flyOrder_revoke" color="#4C34FF">
+ <el-button
+ v-if="taskStatus === '3' && permission.flyOrder_revoke"
+ :loading="statusLoading === 3"
+ :disabled="footerLoading"
+ @click="statusChange(3)"
+ color="#4C34FF"
+ >
撤回任务
</el-button>
<template v-if="permission.flyOrder_controlAcceptance">
- <el-button @click="refusalToAccept" v-if="taskStatus === '6'" color="#F2F3F5">拒绝验收</el-button>
- <el-button @click="statusChange(6)" v-if="taskStatus === '6'" color="#4C34FF">验收通过</el-button>
+ <el-button v-if="taskStatus === '6'" :disabled="footerLoading" @click="refusalToAccept" color="#F2F3F5">
+ 拒绝验收
+ </el-button>
+ <el-button
+ v-if="taskStatus === '6'"
+ :loading="statusLoading === 6"
+ :disabled="footerLoading"
+ @click="statusChange(6)"
+ color="#4C34FF"
+ >
+ 验收通过
+ </el-button>
</template>
<el-button
v-if="!dialogReadonly || (['1', '4'].includes(taskStatus) && permission.flyOrder_add)"
:loading="submitting"
- :disabled="submitting"
+ :disabled="footerLoading"
color="#4C34FF"
@click="handleSubmit"
>
提交
</el-button>
<template v-if="permission.flyOrder_controlSignFor">
- <el-button v-if="taskStatus === '0'" @click="addDescription" color="#F2F3F5">拒绝签收</el-button>
- <el-button v-if="taskStatus === '0'" @click="statusChange(1)" color="#4C34FF">签收</el-button>
+ <el-button v-if="taskStatus === '0'" :disabled="footerLoading" @click="addDescription" color="#F2F3F5">
+ 拒绝签收
+ </el-button>
+ <el-button
+ v-if="taskStatus === '0'"
+ :loading="statusLoading === 1"
+ :disabled="footerLoading"
+ @click="statusChange(1)"
+ color="#4C34FF"
+ >
+ 签收
+ </el-button>
</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'" :disabled="footerLoading" @click="addDescription" color="#F2F3F5">
+ 驳回
+ </el-button>
+ <el-button
+ v-if="taskStatus === '3'"
+ :loading="statusLoading === 4"
+ :disabled="footerLoading"
+ @click="statusChange(4)"
+ color="#4C34FF"
+ >
+ 通过
+ </el-button>
</template>
</template>
<RefuseOrderDialog1
@@ -279,36 +322,40 @@
v-if="VideoShow"
v-model="VideoShow"
:playUrl="currentVideo.resultUrl"
- >
- </VideoPlayDialog>
+ ></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, geomAnalysis } from '@ztzf/utils'
+import { fieldRules, flyVisual, geomAnalysis, appendAiImages } 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 } from '../taskTypeOptions'
// 初始化表单数据
const initForm = () => ({
id: null,
patrolTaskName: '',
- patrolTaskType: '',
+ patrolTaskType: [],
executeTime: '',
patrolRouteUrl: '',
deviceFlyerId: null,
@@ -329,6 +376,8 @@
const visible = defineModel()
const dialogMode = ref('view')
const submitting = ref(false)
+const statusLoading = ref(null)
+const footerLoading = computed(() => submitting.value || statusLoading.value !== null)
const detailLoaded = ref(false)
const dialogReadonly = computed(() => dialogMode.value === 'view')
const titleEnum = ref({ edit: '编辑', view: '查看' })
@@ -345,6 +394,7 @@
}
const algorithmTreeData = ref([]) // 算法树形数据
+const workOrderTypeXT = inject('workOrderTypeXT', ref([]))
// 获取算法分组数据
async function getAlgorithmList() {
@@ -358,7 +408,7 @@
children: (group.algorithms || []).map(alg => ({
id: alg.id,
name: alg.name,
- }))
+ })),
}))
} catch (e) {
console.error('获取算法列表失败', e)
@@ -369,10 +419,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 = {
@@ -460,11 +512,16 @@
}
// 操作类型：1.同意签收、2.拒绝签收 、3.撤回任务 、4.同意审核、 5.拒绝审核、 6.验收通过、 7.验收拒绝
-function statusChange(auditStatus) {
- gdPatrolTaskAuditApi({ auditStatus, id: formData.value.id }).then(res => {
+async function statusChange(auditStatus) {
+ if (footerLoading.value) return
+ statusLoading.value = auditStatus
+ try {
+ await gdPatrolTaskAuditApi({ auditStatus, id: formData.value.id })
visible.value = false
emit('success')
- })
+ } finally {
+ statusLoading.value = null
+ }
}
function refusalToAccept() {
@@ -488,10 +545,11 @@
// 提交编辑
async function handleSubmit() {
- const isValid = await formRef.value?.validate().catch(() => false)
- if (!isValid) return
+ if (footerLoading.value) return
submitting.value = true
try {
+ const isValid = await formRef.value?.validate().catch(() => false)
+ if (!isValid) return
await gdPatrolTaskRepublish(formData.value)
ElMessage.success('更新成功')
visible.value = false
@@ -502,13 +560,27 @@
}
let taskResultList = ref([])
+// 缩略图加载失败时展示原图
+function handleThumbnailError(item) {
+ if (item.thumbnail !== item.resultUrl) {
+ item.thumbnail = item.resultUrl
+ }
+}
+
// 获取成果列表
async function getTaskResultList() {
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 = (res?.data?.data ?? []).map(item => ({
+ ...item,
+ thumbnail: item.resultUrl.replace(/(\.[^./?]+)(\?.*)?$/, '_thumbnail$1$2'),
+ }))
+ taskResultList.value.forEach(item => {
+ if (item.attachmentType === 2 && item.geojson !== '[]' && item.geojson?.length) {
+ appendAiImages(item)
+ }
+ })
} finally {
}
}
@@ -522,22 +594,51 @@
outlineWidth: 0,
speed: 5,
})
+
+// 创建航线起终点标记
+function createRouteEndpoint(position, text, color) {
+ viewer.entities.add({
+ position: Cesium.Cartesian3.fromDegrees(Number(position[0]), Number(position[1]), position[2]),
+ point: {
+ pixelSize: 16,
+ color,
+ outlineColor: Cesium.Color.WHITE,
+ outlineWidth: 4,
+ disableDepthTestDistance: Number.POSITIVE_INFINITY,
+ },
+ label: {
+ text,
+ font: 'bold 14px sans-serif',
+ fillColor: Cesium.Color.WHITE,
+ outlineColor: Cesium.Color.BLACK.withAlpha(0.35),
+ outlineWidth: 2,
+ style: Cesium.LabelStyle.FILL_AND_OUTLINE,
+ showBackground: true,
+ backgroundColor: color.withAlpha(0.9),
+ backgroundPadding: new Cesium.Cartesian2(10, 6),
+ pixelOffset: new Cesium.Cartesian2(0, -18),
+ verticalOrigin: Cesium.VerticalOrigin.BOTTOM,
+ disableDepthTestDistance: Number.POSITIVE_INFINITY,
+ },
+ })
+}
+
// 获取航线详情
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: {
@@ -546,28 +647,12 @@
material: arrowLineMaterialProperty,
},
})
- // 渲染起点（蓝色）
+ // 渲染起点
const startPoint = result[0]
- viewer.entities.add({
- 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,
- },
- })
- // 渲染终点（红色）
+ createRouteEndpoint(startPoint, '起点', Cesium.Color.fromCssColorString('#22C55E'))
+ // 渲染终点
const endPoint = result[result.length - 1]
- viewer.entities.add({
- 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,
- },
- })
+ createRouteEndpoint(endPoint, '终点', Cesium.Color.fromCssColorString('#EF4444'))
flyVisual({
positionsData: list.map(i => [Number(i.longitude), Number(i.latitude), i.height || 0]),
viewer,
@@ -580,6 +665,7 @@
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 }
// 确保 algorithmIds 是数组
@@ -593,7 +679,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()
@@ -621,8 +707,8 @@
let VideoShow = ref(false)
let currentVideo = ref({})
function videoClick(row) {
- VideoShow.value = true
currentVideo.value = row
+ VideoShow.value = true
}
// 初始化地图实例
@@ -666,6 +752,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%;
@@ -674,11 +770,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