From 89380e6260a75d1d3b94de687ebcc2f50d50659d Mon Sep 17 00:00:00 2001
From: shuishen <1109946754@qq.com>
Date: Tue, 03 Feb 2026 15:44:33 +0800
Subject: [PATCH] feat:环境变量配置调整
---
applications/task-work-order/src/views/orderView/orderManage/inspectionRequest/ViewDiaLog.vue | 189 ++++++++++++++++++++++++++++++++---------------
1 files changed, 129 insertions(+), 60 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 89a3c4e..d5e84a7 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
@@ -6,31 +6,35 @@
@closed="visible = false"
destroy-on-close
:close-on-click-modal="false"
+ 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">
<!-- 查看模式 -->
<div class="view-container" v-if="dialogReadonly">
- <div class="detail-title">工单详情</div>
+ <div class="detail-title">巡查任务详情</div>
<el-row class="detail-row-view">
<el-col :span="12">
<div class="label">巡查任务名称</div>
@@ -38,7 +42,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 +50,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>
@@ -84,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">
@@ -101,7 +110,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"
@@ -113,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="请选择"
@@ -129,6 +137,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>
@@ -199,34 +208,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>
+ <el-button v-if="taskStatus === '3'" @click="statusChange(4)" color="#4C34FF">通过</el-button>
</template>
</template>
-
<RefuseOrderDialog1
ref="refuseOrderDialogRef"
v-if="rejectVisible"
@@ -240,17 +250,22 @@
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, gdWorkOrderPageApi } from '../orderManage/orderManageApi'
+import {
+ gdPatrolTaskRepublish,
+ gdFlyerPageApi,
+ gdPatrolTaskAuditApi,
+ gdPatrolTaskDetailApi,
+} from './inspectionRequestApi'
+import { gdWorkOrderFlowListApi, gdWorkOrderFlowPatrolListApi, gdWorkOrderPageApi } 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 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 = () => ({
@@ -264,11 +279,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())
@@ -288,10 +304,10 @@
const getAirName = inject('getAirName')
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: '拒绝原因' },
@@ -325,6 +341,7 @@
row: formData.value,
type: gdStatusObj[taskStatus.value].operationType,
formLabel: gdStatusObj[taskStatus.value].reason,
+ title: gdStatusObj[taskStatus.value]?.title,
})
})
}
@@ -366,7 +383,7 @@
// 获取飞手列表
async function getFlyerList() {
- const res = await gdFlyerPageApi({ size: 999 })
+ const res = await gdFlyerPageApi({ size: 999, current: 1 })
flyerList.value = res?.data?.data?.records ?? []
}
@@ -392,7 +409,7 @@
const processList = ref([])
// 加载时间线list
function loadList() {
- gdWorkOrderFlowListApi({ workOrderId: formData.value.id, type: '1' }).then(res => {
+ gdWorkOrderFlowPatrolListApi({ workOrderId: formData.value.id, type: '1' }).then(res => {
processList.value = res.data.data
})
}
@@ -422,9 +439,18 @@
} finally {
}
}
-
+import { ArrowLineMaterialProperty } from '@/utils/cesium/Material'
+import OrderStepBar from '@/views/orderView/orderManage/orderManage/OrderStepBar.vue'
+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() {
+ console.log(formData.value)
queryAirById(formData.value.patrolRouteUrl).then(res => {
const list = res.data.data.airlineWaypoints
if (!list.length) return mapRef.value?.flyBoundary()
@@ -433,8 +459,8 @@
polyline: {
positions: Cesium.Cartesian3.fromDegreesArray(result),
clampToGround: true,
- width: 3,
- material: Cesium.Color.RED,
+ width: 4,
+ material: arrowLineMaterialProperty,
},
})
// 渲染起点（蓝色）
@@ -479,14 +505,11 @@
// 打开弹框
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 }
+ ;['6', '7', '8'].includes(row.taskStatus) && await getTaskResultList()
loadList()
initMap()
-}
-
-const readyMap = () => {
- // mapRef.value?.flyBoundary()
getAirDetails()
}
@@ -507,4 +530,50 @@
</script>
<style lang="scss" scoped>
+/* 时间线样式 */
+:deep(.gd-timeline) {
+ padding-left: 90px;
+}
+
+:deep(.el-timeline-item) {
+ padding-bottom: 20px;
+ .item-content {
+ position: relative;
+ .flowName {
+ width: 72px;
+ position: absolute;
+ left: -120px;
+ top: 0px;
+ }
+ }
+}
+.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;
+}
+
+.processBox {
+ display: flex;
+ flex-direction: column;
+
+ .detail-left {
+ height: 100%;
+ overflow: auto;
+ }
+}
</style>
--
Gitblit v1.9.3