From 98ff0df343bd4e5d2d5e138a02c6db2b7fa9696b Mon Sep 17 00:00:00 2001
From: shuishen <1109946754@qq.com>
Date: Tue, 27 Jan 2026 10:23:03 +0800
Subject: [PATCH] feat:角色权限弹窗配置页面，调整
---
applications/task-work-order/src/views/orderView/orderManage/inspectionRequest/ViewDiaLog.vue | 35 +++++++++++++++++++++++++++--------
1 files changed, 27 insertions(+), 8 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..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
@@ -18,10 +18,10 @@
: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>
@@ -60,14 +60,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">
@@ -182,6 +182,7 @@
</el-row>
</el-form>
+ <div class="detail-title" :style="{ marginTop: pxToRem(10) }">任务航线</div>
<!-- 地图组件 -->
<CommonCesiumMap
ref="mapRef"
@@ -439,7 +440,11 @@
// 渲染起点（蓝色）
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 +456,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,
@@ -501,16 +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