From f6fd494699bcfee4457b415fcbbc02b753a3ff28 Mon Sep 17 00:00:00 2001
From: 罗广辉 <guanghui.luo@foxmail.com>
Date: Sat, 19 Apr 2025 16:04:26 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/views/SignMachineNest/MachineRight/InspectionRaskList.vue | 11 ++++++++++-
1 files changed, 10 insertions(+), 1 deletions(-)
diff --git a/src/views/SignMachineNest/MachineRight/InspectionRaskList.vue b/src/views/SignMachineNest/MachineRight/InspectionRaskList.vue
index 34d4d33..e3f3323 100644
--- a/src/views/SignMachineNest/MachineRight/InspectionRaskList.vue
+++ b/src/views/SignMachineNest/MachineRight/InspectionRaskList.vue
@@ -78,7 +78,12 @@
import { useStore } from 'vuex'
import { useTaskWayline } from '@/hooks/useTaskWayline/useTaskWayline'
import { useTaskDetails } from '@/hooks/useTaskDetails/useTaskDetails'
+import { useTaskViewInfo } from '@/hooks/useTaskViewInfo/useTaskViewInfo'
+import { useDroneWS } from '@/hooks/useDroneWS'
+let viewer = null
+
let { taskDetails, workspace_id, getTaskDetails } = useTaskDetails()
+let { wsInfo, removeWS } = useDroneWS(workspace_id) //ws信息，是一个ref对象
const store = useStore()
// 设备任务详情
@@ -207,6 +212,8 @@
}
onMounted(async () => {
+ viewer = window.$viewer
+
await getJobList()
// tableList.value = [
@@ -337,7 +344,9 @@
}
})
-useTaskWayline(window.$viewer, taskDetails)
+const { removeEntitys } = useTaskWayline(viewer || window.$viewer, taskDetails)
+
+useTaskViewInfo(viewer || window.$viewer, wsInfo, removeEntitys)
</script>
<style lang="scss" scoped>
--
Gitblit v1.9.3