From a4201c87e9428d230d3778a940c2cbb114efd89a Mon Sep 17 00:00:00 2001
From: chenyao <1219716595@qq.com>
Date: Tue, 27 Jan 2026 08:45:26 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
applications/task-work-order/src/views/orderView/orderManage/inspectionRequest/ViewDiaLog.vue | 136 ++++++++++++++++++++++++++++++++++-----------
1 files changed, 103 insertions(+), 33 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 8d7bd7b..ccbe7a3 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
@@ -5,6 +5,7 @@
:title="titleEnum[dialogMode]"
@closed="visible = false"
destroy-on-close
+ width="auto"
:close-on-click-modal="false"
>
<div class="content" style="display: flex">
@@ -17,10 +18,10 @@
:type="index === processList.length - 1 ? 'success' : 'info'"
:color="activity.color"
:hollow="activity.hollow"
- :timestamp="activity.flowDesc.split(' ')[1]"
+ :timestamp="activity.createTime"
>
<div class="item-content">
- <div>{{ activity.flowDesc.split(' ')[0] }}</div>
+ <div>{{ activity.operator }}</div>
<div class="flowName">{{ activity.flowName }}</div>
</div>
</el-timeline-item>
@@ -45,7 +46,7 @@
</el-col>
<el-col :span="12">
<div class="label">巡查任务航线</div>
- <div class="val">{{ getRouteName(formData.patrolRouteUrl) }}</div>
+ <div class="val">{{ getAirName(formData.patrolRouteUrl) }}</div>
</el-col>
<el-col :span="12">
<div class="label">推荐飞手</div>
@@ -59,15 +60,17 @@
<div class="label">关联工单</div>
<div class="val">{{ getWorkOrderName(formData.workOrderId) }}</div>
</el-col>
- <el-col :span="24">
+ <el-col :span="12">
<div class="label">巡查任务描述</div>
<div class="val">{{ formData.taskDesc }}</div>
</el-col>
</el-row>
<template v-if="['6', '7', '8'].includes(taskStatus)">
- <div class="detail-title" :style="{ marginTop: pxToRem(10) }">任务成功({{ list.length || 0 }}条)</div>
+ <div class="detail-title" :style="{ marginTop: pxToRem(10) }">
+ 任务成果({{ taskResultList.length || 0 }}条)
+ </div>
<div class="imgBox">
- <div v-for="item in list">
+ <div v-for="item in taskResultList">
<el-image
v-if="item.resultUrl"
:src="item.resultUrl"
@@ -179,6 +182,7 @@
</el-row>
</el-form>
+ <div class="detail-title" :style="{ marginTop: pxToRem(10) }">任务航线</div>
<!-- 地图组件 -->
<CommonCesiumMap
ref="mapRef"
@@ -189,36 +193,37 @@
:layer-mode="4"
:boundary="false"
:zoomToBoundary="false"
- @ready="() => mapRef.flyBoundary()"
+ @ready="readyMap"
/>
</div>
</div>
<template #footer>
<template v-if="requester">
+ <el-button v-if="['1', '4'].includes(taskStatus)" @click="viewDescription" color="#F2F3F5">
+ {{ gdStatusObj[taskStatus].reason }}
+ </el-button>
+ <el-button @click="statusChange(3)" v-if="taskStatus === '3'" color="#4C34FF">撤回任务</el-button>
+ <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="!dialogReadonly || ['1', '4'].includes(taskStatus)"
:loading="submitting"
:disabled="submitting"
+ color="#4C34FF"
@click="handleSubmit"
>
提交
</el-button>
- <el-button v-if="['1', '4'].includes(taskStatus)" @click="viewDescription">
- {{ gdStatusObj[taskStatus].reason }}
- </el-button>
- <el-button @click="statusChange(3)" v-if="taskStatus === '3'">撤回任务</el-button>
- <el-button @click="refusalToAccept" v-if="taskStatus === '6'">拒绝验收</el-button>
- <el-button @click="statusChange(6)" v-if="taskStatus === '6'">验收通过</el-button>
</template>
<template v-else>
- <el-button v-if="['7'].includes(taskStatus)" @click="viewDescription">
+ <el-button v-if="['7'].includes(taskStatus)" @click="viewDescription" color="#F2F3F5">
{{ gdStatusObj[taskStatus].reason }}
</el-button>
- <el-button v-if="taskStatus === '0'" @click="addDescription">拒绝签收</el-button>
- <el-button v-if="taskStatus === '0'" @click="statusChange(1)">签收</el-button>
- <el-button v-if="taskStatus === '3'" @click="addDescription">驳回</el-button>
- <el-button v-if="taskStatus === '3'" @click="statusChange(4)">同意</el-button>
+ <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 === '3'" @click="addDescription" color="#F2F3F5">驳回</el-button>
+ <el-button v-if="taskStatus === '3'" @click="statusChange(4)" color="#4C34FF">同意</el-button>
</template>
</template>
@@ -234,7 +239,7 @@
<script setup>
import { computed, ref, onMounted } from 'vue'
import { ElMessage } from 'element-plus'
-import { fieldRules, getDictLabel } from '@ztzf/utils'
+import { fieldRules, flyVisual, getDictLabel } from '@ztzf/utils'
import { gdPatrolTaskRepublish, gdFlyerPageApi, gdPatrolTaskAuditApi } from './inspectionRequestApi'
import { gdWorkOrderFlowListApi, gdWorkOrderPageApi } from '../orderManage/orderManageApi'
import { gdManageDeviceListApi } from '../orderManage/gdManageDeviceApi'
@@ -244,6 +249,8 @@
import RefuseOrderDialog from '@/views/orderView/orderManage/orderManage/RefuseOrderDialog.vue'
import RefuseOrderDialog1 from '@/views/orderView/orderManage/inspectionRequest/RefuseOrderDialog1.vue'
import { Check } from '@element-plus/icons-vue'
+import { queryAirById } from '@/api/zkxt'
+import * as Cesium from 'cesium'
// 初始化表单数据
const initForm = () => ({
@@ -277,11 +284,8 @@
const flyerList = ref([])
const deviceList = ref([])
const workOrderList = ref([])
-const routeOptions = ref([
- { name: '航线1', id: '1' },
- { name: '航线2', id: '2' },
- { name: '航线3', id: '3' },
-])
+const routeOptions = inject('routeOptions')
+const getAirName = inject('getAirName')
const gdStatusObj = {
'0': { reason: '拒绝原因', operationType: '2' },
@@ -388,7 +392,7 @@
const processList = ref([])
// 加载时间线list
function loadList() {
- gdWorkOrderFlowListApi({ workOrderId: formData.value.id,type: '1' }).then(res => {
+ gdWorkOrderFlowListApi({ workOrderId: formData.value.id, type: '1' }).then(res => {
processList.value = res.data.data
})
}
@@ -408,25 +412,82 @@
}
}
-let list = ref([])
+let taskResultList = ref([])
// 获取成果列表
-async function getList() {
+async function getTaskResultList() {
if (!formData.value?.id) return
try {
const res = await gdTaskResultListApi({ patrolTaskId: formData.value.id })
- list.value = res?.data?.data ?? []
+ taskResultList.value = res?.data?.data ?? []
} finally {
}
+}
+
+// 获取航线详情
+function getAirDetails() {
+ queryAirById(formData.value.patrolRouteUrl).then(res => {
+ const list = res.data.data.airlineWaypoints
+ if (!list.length) return mapRef.value?.flyBoundary()
+ const result = list.map(item => [Number(item.longitude), Number(item.latitude)]).flat()
+ viewer.entities.add({
+ polyline: {
+ positions: Cesium.Cartesian3.fromDegreesArray(result),
+ clampToGround: true,
+ width: 3,
+ material: Cesium.Color.RED,
+ },
+ })
+ // 渲染起点（蓝色）
+ const startPoint = list[0]
+ viewer.entities.add({
+ position: Cesium.Cartesian3.fromDegrees(
+ Number(startPoint.longitude),
+ Number(startPoint.latitude),
+ startPoint.height || 0
+ ),
+ 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]
+ viewer.entities.add({
+ position: Cesium.Cartesian3.fromDegrees(
+ Number(endPoint.longitude),
+ Number(endPoint.latitude),
+ endPoint.height || 0
+ ),
+ 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,
+ })
+ })
}
// 打开弹框
async function open({ mode = 'view', row } = {}) {
dialogMode.value = mode
formData.value = { ...initForm(), ...row }
- console.log(row)
- ;['6', '7', '8'].includes(row.taskStatus) && getList()
+ ;['6', '7', '8'].includes(row.taskStatus) && getTaskResultList()
loadList()
initMap()
+}
+
+const readyMap = () => {
+ // mapRef.value?.flyBoundary()
+ getAirDetails()
}
// 初始化地图实例
@@ -449,17 +510,26 @@
.content {
display: flex;
gap: 0 20px;
+ height: 680px;
+
.leftBox {
width: 920px;
+ flex: 1;
+ overflow: auto;
+ display: flex;
+ flex-direction: column;
.gd-cesium {
- padding-top: 10px;
width: 100%;
- height: 423px;
+ min-height: 380px;
+ flex: 1;
}
-
}
.processBox {
width: 312px;
+ padding: 24px 0;
+ border: 1px solid #e4e4e4;
+ overflow: auto;
+
.item-content {
position: relative;
.flowName {
--
Gitblit v1.9.3