From 41b8a8d0ecea96ace27b5afb9ce63b4193420c49 Mon Sep 17 00:00:00 2001
From: 张含笑 <zhx18749296735@163.com>
Date: Thu, 14 Aug 2025 08:47:21 +0800
Subject: [PATCH] Merge branch 'refs/heads/历史任务详情' into feature/v5.0/5.0.3
---
src/views/job/components/DeviceJobDetails.vue | 49 ++++++++++++++++++++++++++++++++++++++++++++-----
1 files changed, 44 insertions(+), 5 deletions(-)
diff --git a/src/views/job/components/DeviceJobDetails.vue b/src/views/job/components/DeviceJobDetails.vue
index 3b0e909..0e6c850 100644
--- a/src/views/job/components/DeviceJobDetails.vue
+++ b/src/views/job/components/DeviceJobDetails.vue
@@ -1,7 +1,7 @@
<!-- 历史任务详情 -->
<template>
<el-dialog class="ztzf-dialog" append-to-body modal-class="detailsOfHistoricalTasks" v-model="isShow" title="历史任务详情"
- :width="pxToRem(1700)" :close-on-click-modal="false" :destroy-on-close="true">
+ :width="pxToRem(1800)" :close-on-click-modal="false" :destroy-on-close="true">
<div class="content">
<div class="contentLeft">
<div class="machineTableDetailsTitle"><span>详情</span></div>
@@ -121,9 +121,23 @@
</template>
</div>
+ <el-image-viewer
+ v-if="showViewer"
+ :url-list="previewUrls"
+ :initial-index="activeIndex"
+ @close="showViewer = false"
+ />
</div>
- <DeviceJobDetailsMap v-if="isShow" :yuanImages="yuanImages" class="contentRight" :detailsData="detailsData" />
+ <div class="content-right" v-if="isShow">
+ <DeviceJobDetailsMap
+ :detailsData="detailsData"
+ :yuanImages="yuanImages"
+ @showImageeclick="showImageeclick"
+ :jobId="props.jobId"
+ />
+ <div class="content-map-popups"></div>
+ </div>
</div>
</el-dialog>
<!-- 全景360 -->
@@ -258,7 +272,7 @@
}).then(result => {
if (result.data.code !== 200) return
yuanImages.value = result.data.data.records
- console.log('ssssss',yuanImages.value);
+
})
})
@@ -312,6 +326,20 @@
const clickpanorama = val => {
panoramaParamsShow.value = true
panoramaParamsUrl.value = val.link
+}
+// 从地图点击图片预览
+const showViewer = ref(false)
+const activeIndex = ref(0)
+const previewUrls = ref([])
+const showImageeclick = (list, index, categoriestype) => {
+ if (categoriestype === 5) {
+ panoramaParamsShow.value = true
+ panoramaParamsUrl.value = list[0]
+ } else {
+ previewUrls.value = list
+ activeIndex.value = 0
+ showViewer.value = true
+ }
}
// 取消下载
function cancelDownload() {
@@ -408,7 +436,7 @@
:deep(){
.el-progress-bar__outer{
- height: 26px !important;
+ height: 28px !important;
border-radius: 0 !important;
background: transparent !important;
@@ -617,11 +645,22 @@
}
}
- .contentRight {
+
+ .content-right {
+ position: relative;
width: 0;
flex-grow: 1;
background: #19ad8d;
margin-right: 17px;
+ overflow: hidden;
+
+ .content-map-popups {
+ pointer-events: none;
+
+ > * {
+ pointer-events: auto !important;
+ }
+ }
}
}
</style>
--
Gitblit v1.9.3