From 88f106e0b85c4745c593886ea9b1912098a5dbb4 Mon Sep 17 00:00:00 2001
From: 罗广辉 <guanghui.luo@foxmail.com>
Date: Sat, 19 Apr 2025 19:44:19 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/views/SignMachineNest/MachineRight/InspectionRaskList.vue | 21 ++++++++++-----------
1 files changed, 10 insertions(+), 11 deletions(-)
diff --git a/src/views/SignMachineNest/MachineRight/InspectionRaskList.vue b/src/views/SignMachineNest/MachineRight/InspectionRaskList.vue
index a93548d..693cfa6 100644
--- a/src/views/SignMachineNest/MachineRight/InspectionRaskList.vue
+++ b/src/views/SignMachineNest/MachineRight/InspectionRaskList.vue
@@ -78,7 +78,6 @@
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
@@ -211,6 +210,14 @@
}
}
+watch([() => tabIndex.value, () => tableList.value], async ([newTabIndex, newTableList]) => {
+ if (newTabIndex == 1 && newTableList.length > 0) {
+ await getTaskDetails(newTableList[0].wayline_job_info_id)
+ }
+})
+
+const { init: initTaskWayline, removeEntitys } = useTaskWayline()
+
onMounted(async () => {
viewer = window.$viewer
@@ -338,17 +345,9 @@
// job_id: '7aa5222c-2f8b-401e-b6ba-d6a550398829',
// },
// ]
+
+ initTaskWayline(viewer, wsInfo, taskDetails)
})
-
-watch([() => tabIndex.value, () => tableList.value], async ([newTabIndex, newTableList]) => {
- if (newTabIndex == 1 && newTableList.length > 0) {
- await getTaskDetails(newTableList[0].wayline_job_info_id)
- }
-})
-
-const { removeEntitys } = useTaskWayline(viewer || window.$viewer, taskDetails)
-
-useTaskViewInfo(viewer || window.$viewer, wsInfo, removeEntitys)
</script>
<style lang="scss" scoped>
--
Gitblit v1.9.3