From beb95fb5fc166804056abafd70fc01ac27de7621 Mon Sep 17 00:00:00 2001
From: 罗广辉 <guanghui.luo@foxmail.com>
Date: Mon, 26 Jan 2026 09:11:00 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
applications/task-work-order/src/views/orderView/orderManage/orderManage/FormDiaLog.vue | 65 ++++++++++++++++++++++----------
1 files changed, 45 insertions(+), 20 deletions(-)
diff --git a/applications/task-work-order/src/views/orderView/orderManage/orderManage/FormDiaLog.vue b/applications/task-work-order/src/views/orderView/orderManage/orderManage/FormDiaLog.vue
index 1de0080..c635df7 100644
--- a/applications/task-work-order/src/views/orderView/orderManage/orderManage/FormDiaLog.vue
+++ b/applications/task-work-order/src/views/orderView/orderManage/orderManage/FormDiaLog.vue
@@ -10,9 +10,22 @@
>
<div class="content" style="display: flex">
<div class="processBox" v-if="dialogMode !== 'add' && processList.length">
- <el-steps direction="vertical" :active="processList.length">
- <el-step v-for="item in processList" :title="item.flowName" :description="item.flowDesc" />
- </el-steps>
+ <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.flowDesc.split(' ')[1]"
+ >
+ <div class="item-content">
+ <div>{{ activity.flowDesc.split(' ')[0] }}</div>
+ <div class="flowName">{{ activity.flowName }}</div>
+ </div>
+ </el-timeline-item>
+ </el-timeline>
</div>
<div class="leftBox">
<div v-if="dialogReadonly">
@@ -63,13 +76,8 @@
</template>
</el-table-column>
<el-table-column prop="executeTime" show-overflow-tooltip label="任务执行时间" />
- <el-table-column prop="feishou" show-overflow-tooltip label="选择飞手" />
- <el-table-column prop="deviceId" show-overflow-tooltip label="选择设备" />
- <el-table-column label="操作" class-name="operation-btns">
- <template v-slot="{ row }">
- <el-link type="primary" @click="">查看</el-link>
- </template>
- </el-table-column>
+ <el-table-column prop="recommendFlyerName" show-overflow-tooltip label="选择飞手" />
+ <el-table-column prop="deviceName" show-overflow-tooltip label="选择设备" />
</el-table>
</template>
</div>
@@ -141,7 +149,14 @@
</el-col>
<el-col :span="24">
<el-form-item label="工单备注" prop="remark">
- <el-input class="gd-input" type="textarea" v-model="formData.remark" placeholder="请输入" clearable />
+ <el-input
+ class="gd-input"
+ type="textarea"
+ :rows="4"
+ v-model="formData.remark"
+ placeholder="请输入"
+ clearable
+ />
</el-form-item>
</el-col>
</el-row>
@@ -174,7 +189,7 @@
<el-table-column prop="devicePayload" label="设备负载" />
</el-table>
</template>
- <div v-else>请先选择设备需求并绘制范围</div>
+ <div v-else class="tipSelect">请先选择设备需求并在地图上绘制工单范围</div>
</div>
</div>
@@ -202,10 +217,10 @@
</el-button>
<el-button v-if="gdStatus === '10'" @click="addDescription">拒绝接单</el-button>
<el-button v-if="gdStatus === '10'" @click="statusChange(1)">接单</el-button>
- <el-button v-if="gdStatus === '22'" @click="statusChange(7)">同意修改</el-button>
<el-button v-if="gdStatus === '22'" @click="statusChange(8)">不同意修改</el-button>
- <el-button v-if="gdStatus === '21'" @click="statusChange(5)">同意取消</el-button>
+ <el-button v-if="gdStatus === '22'" @click="statusChange(7)">同意修改</el-button>
<el-button v-if="gdStatus === '21'" @click="addDescription">不同意取消</el-button>
+ <el-button v-if="gdStatus === '21'" @click="statusChange(5)">同意取消</el-button>
<el-button v-if="gdStatus === '30'" @click="addDescription">协商修改</el-button>
<el-button v-if="gdStatus === '31'" @click="statusChange(10)">同意</el-button>
</template>
@@ -239,7 +254,7 @@
import RefuseOrderDialog from '@/views/orderView/orderManage/orderManage/RefuseOrderDialog.vue'
import CommonCesiumMap from '@/components/map-container/common-cesium-map.vue'
import { gdPatrolTaskPageApi } from '@/views/orderView/orderManage/inspectionRequest/inspectionRequestApi'
-
+import { Check } from '@element-plus/icons-vue'
// 初始化表单数据
const initForm = () => ({
workOrderName: '',
@@ -424,7 +439,7 @@
// 加载时间线list
function loadList() {
- gdWorkOrderFlowListApi({ workOrderId: formData.value.id }).then(res => {
+ gdWorkOrderFlowListApi({ workOrderId: formData.value.id,type: '0' }).then(res => {
processList.value = res.data.data
})
}
@@ -548,10 +563,10 @@
hasPatrolTaskList.value && gdPatrolTaskPage()
dialogMode.value === 'edit' ? editPolygon() : viewPolygon()
}
- await getDeviceList()
// setMapDevice()
await nextTick()
syncSelection()
+ getDeviceList()
}
// 初始化地图实例
@@ -596,11 +611,21 @@
.processBox {
width: 312px;
+ .item-content {
+ position: relative;
+ .flowName {
+ width: 80px;
+ position: absolute;
+ left: -120px;
+ top: 0px;
+ }
+ }
}
}
-.setHeight {
- //max-height: 300px;
- //min-height: 200px;
+.tipSelect {
+ text-align: center;
+ height: 200px;
+ line-height: 200px;
}
</style>
--
Gitblit v1.9.3