From a5f41a9dbd0eed8545d842a8c4ced75f17befac1 Mon Sep 17 00:00:00 2001
From: chenyao <1219716595@qq.com>
Date: Tue, 02 Dec 2025 16:10:17 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/feature/v8.0/8.0.4' into feature/v8.0/8.0.4
---
src/views/job/components/DeviceJobDetails.vue | 45 +++++++++++++++++++++++----------------------
1 files changed, 23 insertions(+), 22 deletions(-)
diff --git a/src/views/job/components/DeviceJobDetails.vue b/src/views/job/components/DeviceJobDetails.vue
index 0d1644a..7ae756e 100644
--- a/src/views/job/components/DeviceJobDetails.vue
+++ b/src/views/job/components/DeviceJobDetails.vue
@@ -99,28 +99,7 @@
fit="cover"
/>
- <el-dialog
- class="ztzf-dialog"
- append-to-body
- modal-class="detailsOfHistoricalTasks"
- v-model="VideoShow"
- :width="pxToRem(1600)"
- :close-on-click-modal="false"
- :destroy-on-close="true"
- >
- <div class="fullscreen">
- <video
- ref="fullscreenVideo"
- class="fullscreen-video"
- :src="currentVideoUrl"
- :style="{ width: pxToRem(1567), height: '80vh' }"
- controls
- preload="auto"
- @play="handleVideoPlay"
- @ended="handleVideoEnded"
- ></video>
- </div>
- </el-dialog>
+
</div>
</template>
@@ -145,6 +124,28 @@
</div>
</div>
</el-dialog>
+ <el-dialog
+ class="ztzf-dialog"
+ append-to-body
+ modal-class="detailsOfHistoricalTasks"
+ v-model="VideoShow"
+ :width="pxToRem(1600)"
+ :close-on-click-modal="false"
+ :destroy-on-close="true"
+ >
+ <div class="fullscreen">
+ <video
+ ref="fullscreenVideo"
+ class="fullscreen-video"
+ :src="currentVideoUrl"
+ :style="{ width: pxToRem(1567), height: '80vh' }"
+ controls
+ preload="auto"
+ @play="handleVideoPlay"
+ @ended="handleVideoEnded"
+ ></video>
+ </div>
+ </el-dialog>
<!-- 全景360 -->
<PanoramaPopup
v-if="'全景'"
--
Gitblit v1.9.3