From d75d83bd2a1f4e13634f84f8a4de1f7457187b2b Mon Sep 17 00:00:00 2001
From: shuishen <1109946754@qq.com>
Date: Thu, 05 Mar 2026 14:56:13 +0800
Subject: [PATCH] feat:部门管理，删除相关处理
---
applications/task-work-order/src/views/orderView/orderManage/inspectionRequest/ViewDiaLog.vue | 160 ++++++++++++++++++++++++++++++++---------------------
1 files changed, 96 insertions(+), 64 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..49947d0 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' && 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>
</div>
<div class="detail-right">
@@ -89,7 +92,8 @@
</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">
@@ -118,7 +122,6 @@
<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="请选择"
@@ -176,7 +179,7 @@
<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"
@@ -231,7 +234,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
@@ -246,16 +249,21 @@
<script setup>
import { computed, ref, onMounted } 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 } from '@/api/zkxt'
import * as Cesium from 'cesium'
import { useStore } from 'vuex'
@@ -288,18 +296,20 @@
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 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: '拒绝原因' },
@@ -333,6 +343,7 @@
row: formData.value,
type: gdStatusObj[taskStatus.value].operationType,
formLabel: gdStatusObj[taskStatus.value].reason,
+ title: gdStatusObj[taskStatus.value]?.title,
})
})
}
@@ -362,14 +373,8 @@
// 获取工单名称
function getWorkOrderName(id) {
- const item = workOrderList.value.find(item => item.id === id)
- return item ? item.workOrderName : id
-}
-
-// 获取工单列表
-async function getWorkOrderList() {
- const res = await gdWorkOrderPageApi({ size: 999 })
- workOrderList.value = res?.data?.data?.records ?? []
+ if (workOrderDetail.value?.id === id) return workOrderDetail.value.workOrderName
+ return id
}
// 获取飞手列表
@@ -441,53 +446,54 @@
})
// 获取航线详情
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,
})
})
}
@@ -495,15 +501,32 @@
// 打开弹框
async function open({ mode = 'view', row } = {}) {
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 }
+ // 获取工单详情并根据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 || []
+ } catch (e) {
+ console.error('获取工单详情或航线列表失败', e)
+ }
}
// 初始化地图实例
@@ -514,7 +537,6 @@
}
onMounted(() => {
- getWorkOrderList()
getFlyerList()
getDeviceList()
})
@@ -533,7 +555,7 @@
.item-content {
position: relative;
.flowName {
- width: 80px;
+ width: 72px;
position: absolute;
left: -120px;
top: 0px;
@@ -559,4 +581,14 @@
color: #999;
margin-top: 2px;
}
+
+.processBox {
+ display: flex;
+ flex-direction: column;
+
+ .detail-left {
+ height: 100%;
+ overflow: auto;
+ }
+}
</style>
--
Gitblit v1.9.3