From 8beddbb9e9e3c5cbb1a0155fe22d96ed962e99a6 Mon Sep 17 00:00:00 2001
From: rain <1679827795@qq.com>
Date: Wed, 07 May 2025 18:32:49 +0800
Subject: [PATCH] Merge branch 'master' of http://139.196.74.78:10010/r/drone/drone-web-manage
---
src/views/tickets/orderLog.vue | 17 +++++++++++------
1 files changed, 11 insertions(+), 6 deletions(-)
diff --git a/src/views/tickets/orderLog.vue b/src/views/tickets/orderLog.vue
index e5353bb..7590566 100644
--- a/src/views/tickets/orderLog.vue
+++ b/src/views/tickets/orderLog.vue
@@ -87,8 +87,8 @@
@click="rejectDetail(row.id)">驳回原因</el-button>
</div>
<!--草稿-->
- <div v-if="row.status == 0 && userInfo.user_id == row.create_user">
- <el-button class="edit-btn" type="text" icon="el-icon-edit-outline"
+ <div>
+ <el-button class="edit-btn" type="text" icon="el-icon-edit"
@click="handleViewDetail(row)">编辑</el-button>
<el-button class="publish-btn" type="text" icon="el-icon-position"
@click="userPublishPush(row.id)">发布</el-button>
@@ -189,7 +189,7 @@
<el-row>
<div class="add-box-btns">
- <el-button type="danger" @click="submitForm(1)">发布</el-button>
+ <el-button type="danger" @click="submitForm(1)">发起</el-button>
<el-button type="primary" @click="submitForm(0)">存草稿</el-button>
</div>
</el-row>
@@ -923,7 +923,7 @@
this.detailVisible = true
- this.initMapLine()
+ this.initMapLine(data.device_map_infos)
},
async handleCheckDetail (row) {
const response = await orderLogDetails(row.id)
@@ -936,7 +936,7 @@
// 更新机巢列表
this.device_sns = data.device_list
this.detailVisibleCopy = true
- this.initMapLine()
+ this.initMapLine(data.device_map_infos)
},
//导出
async exportData () {
@@ -1010,7 +1010,7 @@
this.initMapLine()
},
- initMapLine () {
+ initMapLine (infos = {}) {
let currentLine = this.wayLineList.find(item => item.wayline_id == this.form.file_id)
if (!currentLine) return
@@ -1038,6 +1038,11 @@
return item.Point.coordinates.split(',')
})
+ if (JSON.stringify(infos) != '{}') positions.unshift([
+ infos[0].longitude,
+ infos[0].latitude,
+ ])
+
this.$nextTick(() => {
if (this.$refs.MapContainer && this.$refs.MapContainer.initAddEntity) {
this.$refs.MapContainer.initAddEntity('polyline', positions)
--
Gitblit v1.9.3