From 7b3de0d64e0ec5b932ee04c6a2126606a64e2962 Mon Sep 17 00:00:00 2001
From: 张含笑 <zhx18749296735@163.com>
Date: Fri, 11 Apr 2025 11:34:13 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/views/TaskManage/TaskIntermediateContent/CurrentTaskDetails.vue | 13 ++++++++-----
1 files changed, 8 insertions(+), 5 deletions(-)
diff --git a/src/views/TaskManage/TaskIntermediateContent/CurrentTaskDetails.vue b/src/views/TaskManage/TaskIntermediateContent/CurrentTaskDetails.vue
index 6e2d512..15f4358 100644
--- a/src/views/TaskManage/TaskIntermediateContent/CurrentTaskDetails.vue
+++ b/src/views/TaskManage/TaskIntermediateContent/CurrentTaskDetails.vue
@@ -27,8 +27,12 @@
import cesiumOperation from '@/utils/cesium-tsa';
import { useStore } from 'vuex';
+import { initPointWayline } from './initPointWayline';
+
+const { parsingFiles } = initPointWayline()
+
const { _init, viewerDestory } = cesiumOperation()
-const store = useStore();
+
const isShowCurrentTaskDetails = defineModel('show');
const props = defineProps({
@@ -40,7 +44,6 @@
// 获取直播地址
const getVideoUrl = () => {
- console.log(props.rowData, '当前任务详情');
liveStart(props.rowData.deviceSns).then(res => {
if (res.data.code !== 0) return;
airPortUrl.value = res.data.data.rtcs_url;
@@ -50,9 +53,9 @@
// 获取任务详情获取航线文件
const getTaskDetails = () => {
getJobDetails({ wayLineJobInfoId: props.rowData.id }).then(res => {
- console.log(res.data.data, '顶顶顶');
if (res.data.data.way_lines && res.data.data.way_lines.length === 1) {
- const line = res.data.data.way_lines[0].url
+ // console.log(window.$viewer,'顶顶顶顶')
+ parsingFiles(res.data.data.way_lines[0].url, window.$viewer);
}
})
}
@@ -66,7 +69,7 @@
// 监听 rowData 变化
watch(() => props.rowData, (newVal) => {
if (newVal && Object.keys(newVal).length) {
- getVideoUrl();
+ // getVideoUrl();
getTaskDetails();
}
}, { deep: true, immediate: true });
--
Gitblit v1.9.3