From 559e8f771c283c19efec60c400a538824185bebf Mon Sep 17 00:00:00 2001
From: 罗广辉 <guanghui.luo@foxmail.com>
Date: Fri, 30 Jan 2026 17:39:52 +0800
Subject: [PATCH] feat: 流程管理
---
applications/task-work-order/src/views/orderView/orderManage/inspectionRequest/ViewDiaLog.vue | 169 ++++++++++++++++++++++++++++++++------------------------
1 files changed, 96 insertions(+), 73 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 ba97deb..713e5ac 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,11 +5,11 @@
:title="titleEnum[dialogMode]"
@closed="visible = false"
destroy-on-close
- width="auto"
:close-on-click-modal="false"
+ width="80%"
>
- <div class="content" style="display: flex">
- <div class="processBox" v-if="dialogMode !== 'add' && processList.length">
+ <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"
@@ -18,18 +18,19 @@
:type="index === processList.length - 1 ? 'success' : 'info'"
:color="activity.color"
:hollow="activity.hollow"
- :timestamp="activity.flowDesc.split(' ')[1] + activity.flowDesc.split(' ')[2]"
+ :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>
</el-timeline>
</div>
- <div class="leftBox">
+
+ <div class="detail-right">
<!-- 查看模式 -->
- <div class="detail-container" v-if="dialogReadonly">
+ <div class="view-container" v-if="dialogReadonly">
<div class="detail-title">工单详情</div>
<el-row class="detail-row-view">
<el-col :span="12">
@@ -38,7 +39,7 @@
</el-col>
<el-col :span="12">
<div class="label">巡查任务类型</div>
- <div class="val">{{ getDictLabel(formData.patrolTaskType, dictObj.patrolTaskType) }}</div>
+ <div class="val">{{ getDictLabel(formData.patrolTaskType, dictObj.workOrderType) }}</div>
</el-col>
<el-col :span="12">
<div class="label">任务执行时间</div>
@@ -46,7 +47,11 @@
</el-col>
<el-col :span="12">
<div class="label">巡查任务航线</div>
- <div class="val">{{ getAirName(formData.patrolRouteUrl) }}</div>
+ <div class="val val-long">
+ <el-tooltip :content="getAirName(formData.patrolRouteUrl)" placement="top">
+ {{ getAirName(formData.patrolRouteUrl) }}
+ </el-tooltip>
+ </div>
</el-col>
<el-col :span="12">
<div class="label">推荐飞手</div>
@@ -60,14 +65,14 @@
<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) }">
- 任务成功({{ taskResultList.length || 0 }}条)
+ 任务成果({{ taskResultList.length || 0 }}条)
</div>
<div class="imgBox">
<div v-for="item in taskResultList">
@@ -101,7 +106,7 @@
clearable
>
<el-option
- v-for="item in dictObj.patrolTaskType"
+ v-for="item in dictObj.workOrderType"
:key="item.dictKey"
:label="item.dictValue"
:value="item.dictKey"
@@ -129,6 +134,7 @@
v-model="formData.patrolRouteUrl"
placeholder="请选择"
clearable
+ @change="getAirDetails"
>
<el-option v-for="item in routeOptions" :key="item.id" :label="item.name" :value="item.id" />
</el-select>
@@ -182,6 +188,7 @@
</el-row>
</el-form>
+ <div class="detail-title" :style="{ marginTop: pxToRem(10) }">任务航线</div>
<!-- 地图组件 -->
<CommonCesiumMap
ref="mapRef"
@@ -198,34 +205,35 @@
</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 v-if="['1', '4', '7'].includes(taskStatus)" @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>
+
+ <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="!dialogReadonly || ['1', '4'].includes(taskStatus)"
- :loading="submitting"
- :disabled="submitting"
- color="#4C34FF"
- @click="handleSubmit"
- >
- 提交
- </el-button>
</template>
- <template v-else>
- <el-button v-if="['7'].includes(taskStatus)" @click="viewDescription" color="#F2F3F5">
- {{ gdStatusObj[taskStatus].reason }}
- </el-button>
+ <el-button
+ v-if="!dialogReadonly || (['1', '4'].includes(taskStatus) && permission.flyOrder_add)"
+ :loading="submitting"
+ :disabled="submitting"
+ 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>
+ </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>
</template>
</template>
-
<RefuseOrderDialog1
ref="refuseOrderDialogRef"
v-if="rejectVisible"
@@ -245,11 +253,11 @@
import { pxToRem } from '@/utils/rem'
import CommonCesiumMap from '@/components/map-container/common-cesium-map.vue'
import { gdTaskResultListApi } from '@/views/orderView/orderManage/clueEvents/achievementApi'
-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'
+import { useStore } from 'vuex'
// 初始化表单数据
const initForm = () => ({
@@ -263,11 +271,12 @@
taskDesc: '',
workOrderId: null,
})
+const store = useStore()
+const permission = computed(() => store.state.user.permission)
const rejectVisible = ref(false)
const mapRef = ref(null)
const dictObj = inject('dictObj')
-const requester = inject('requester')
const emit = defineEmits(['success', 'refusalAccept'])
const formRef = ref(null)
const formData = ref(initForm())
@@ -365,7 +374,7 @@
// 获取飞手列表
async function getFlyerList() {
- const res = await gdFlyerPageApi({ size: 999 })
+ const res = await gdFlyerPageApi({ size: 999, current: 1 })
flyerList.value = res?.data?.data?.records ?? []
}
@@ -393,6 +402,7 @@
function loadList() {
gdWorkOrderFlowListApi({ workOrderId: formData.value.id, type: '1' }).then(res => {
processList.value = res.data.data
+ console.log(processList.value, 'processList.value')
})
}
@@ -421,7 +431,14 @@
} finally {
}
}
-
+import { ArrowLineMaterialProperty } from '@/utils/cesium/Material'
+let arrowLineMaterialProperty = new ArrowLineMaterialProperty({
+ color: new Cesium.Color(128 / 255, 215 / 255, 255 / 255, 1),
+ directionColor: new Cesium.Color(1, 1, 1, 1),
+ outlineColor: new Cesium.Color(1, 1, 1, 1),
+ outlineWidth: 0,
+ speed: 5,
+})
// 获取航线详情
function getAirDetails() {
queryAirById(formData.value.patrolRouteUrl).then(res => {
@@ -432,14 +449,18 @@
polyline: {
positions: Cesium.Cartesian3.fromDegreesArray(result),
clampToGround: true,
- width: 3,
- material: Cesium.Color.RED,
+ width: 4,
+ material: arrowLineMaterialProperty,
},
})
// 渲染起点（蓝色）
const startPoint = list[0]
viewer.entities.add({
- position: Cesium.Cartesian3.fromDegrees(Number(startPoint.longitude), Number(startPoint.latitude), startPoint.height || 0),
+ position: Cesium.Cartesian3.fromDegrees(
+ Number(startPoint.longitude),
+ Number(startPoint.latitude),
+ startPoint.height || 0
+ ),
point: {
pixelSize: 12,
color: Cesium.Color.BLUE,
@@ -451,7 +472,11 @@
// 渲染终点（红色）
const endPoint = list[list.length - 1]
viewer.entities.add({
- position: Cesium.Cartesian3.fromDegrees(Number(endPoint.longitude), Number(endPoint.latitude), endPoint.height || 0),
+ position: Cesium.Cartesian3.fromDegrees(
+ Number(endPoint.longitude),
+ Number(endPoint.latitude),
+ endPoint.height || 0
+ ),
point: {
pixelSize: 12,
color: Cesium.Color.RED,
@@ -498,42 +523,40 @@
</script>
<style lang="scss" scoped>
-.content {
+/* 时间线样式 */
+:deep(.gd-timeline) {
+ padding-left: 90px;
+}
+
+:deep(.el-timeline-item) {
+ padding-bottom: 20px;
+ .item-content {
+ position: relative;
+ .flowName {
+ width: 80px;
+ position: absolute;
+ left: -120px;
+ top: 0px;
+ }
+ }
+}
+.imgBox {
display: flex;
- gap: 0 20px;
- .leftBox {
- width: 920px;
- .gd-cesium {
- padding-top: 10px;
- width: 100%;
- height: 423px;
- }
+ flex-wrap: wrap;
+ gap: 10px;
+ > div {
+ width: calc((100% - 40px) / 5); /* 5列布局，减去4个10px间隙 */
+ height: 110px;
+ flex-shrink: 0;
}
- .processBox {
- width: 312px;
- .item-content {
- position: relative;
- .flowName {
- width: 80px;
- position: absolute;
- left: -120px;
- top: 0px;
- }
- }
+ .el-image {
+ width: 100%;
+ height: 100%;
}
- .imgBox {
- display: flex;
- flex-wrap: wrap;
- gap: 10px;
- > div {
- width: calc((100% - 40px) / 5); /* 5列布局，减去4个10px间隙 */
- height: 110px;
- flex-shrink: 0;
- }
- .el-image {
- width: 100%;
- height: 100%;
- }
- }
+}
+:deep(.el-timeline-item__timestamp) {
+ font-size: 12px;
+ color: #999;
+ margin-top: 2px;
}
</style>
--
Gitblit v1.9.3