From a7729ab954c949489fd6888fdecdd361d617c39e Mon Sep 17 00:00:00 2001
From: chenyao <1219716595@qq.com>
Date: Mon, 21 Apr 2025 08:33:38 +0800
Subject: [PATCH] Merge branch 'master' of http://139.196.74.78:10010/r/drone/command-center-dashboard
---
src/views/SignMachineNest/MachineRight/InspectionRaskList.vue | 141 +++--------------------------------------------
1 files changed, 9 insertions(+), 132 deletions(-)
diff --git a/src/views/SignMachineNest/MachineRight/InspectionRaskList.vue b/src/views/SignMachineNest/MachineRight/InspectionRaskList.vue
index 895f350..1b87b17 100644
--- a/src/views/SignMachineNest/MachineRight/InspectionRaskList.vue
+++ b/src/views/SignMachineNest/MachineRight/InspectionRaskList.vue
@@ -24,7 +24,6 @@
:infinite-scroll-disabled="busy"
infinite-scroll-immediate="true"
>
- >
<div class="item" v-for="(item, index) in tableList">
<div class="left" @click="taskClick(item)">
<div class="left-t">
@@ -78,7 +77,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,142 +209,21 @@
}
}
+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
await getJobList()
- // tableList.value = [
- // {
- // id: 11563,
- // status: 5,
- // begin_time: '2025/04/19 05:46:25',
- // end_time: '2025/04/19 05:46:25',
- // create_time: '2025-04-19T05:46:36.032+00:00',
- // name: '智引即飞202504191252',
- // event_number: 0,
- // dock_sn: '7CTDLCR00BQBM2',
- // wayline_job_info_id: 340,
- // job_id: '484a7846-60e0-4ec3-b9fb-272a055c6938',
- // },
- // {
- // id: 11559,
- // status: 5,
- // begin_time: '2025/04/19 05:39:42',
- // end_time: '2025/04/19 05:39:42',
- // create_time: '2025-04-19T05:39:52.022+00:00',
- // name: '智引即飞202504191252',
- // event_number: 0,
- // dock_sn: '7CTDLCR00BQBM2',
- // wayline_job_info_id: 340,
- // job_id: 'b8c58bfb-4352-47c5-ba33-242eec8df188',
- // },
- // {
- // id: 11558,
- // status: 3,
- // begin_time: '2025/04/19 05:39:17',
- // end_time: '2025/04/19 05:39:17',
- // create_time: '2025-04-19T05:39:27.407+00:00',
- // name: '智引即飞202504191252',
- // event_number: 0,
- // dock_sn: '7CTDLCR00BQBM2',
- // wayline_job_info_id: 340,
- // job_id: '839773ce-bd46-4947-a2ef-d859eaea82f6',
- // },
- // {
- // id: 11557,
- // status: 5,
- // begin_time: '2025/04/19 04:52:04',
- // end_time: '2025/04/19 04:52:04',
- // create_time: '2025-04-19T04:52:14.503+00:00',
- // name: '智引即飞202504191252',
- // event_number: 0,
- // dock_sn: '7CTDLCR00BQBM2',
- // wayline_job_info_id: 340,
- // job_id: '58366fd4-8361-456f-8ad9-3b881f933620',
- // },
- // {
- // id: 11556,
- // status: 5,
- // begin_time: '2025/04/19 03:45:06',
- // end_time: '2025/04/19 03:45:06',
- // create_time: '2025-04-19T03:45:16.522+00:00',
- // name: '智引即飞202504191145',
- // event_number: 0,
- // dock_sn: '7CTDLCR00BQBM2',
- // wayline_job_info_id: 338,
- // job_id: '39c60fb8-e5c4-4474-912a-c3af3f1b9054',
- // },
- // {
- // id: 11555,
- // status: 5,
- // begin_time: '2025/04/19 03:27:55',
- // end_time: '2025/04/19 03:27:55',
- // create_time: '2025-04-19T03:28:05.196+00:00',
- // name: '智引即飞202504191127',
- // event_number: 0,
- // dock_sn: '7CTDLCR00BQBM2',
- // wayline_job_info_id: 336,
- // job_id: '78c42532-45e4-4a01-b698-69bca19286ff',
- // },
- // {
- // id: 11554,
- // status: 5,
- // begin_time: '2025/04/19 02:58:53',
- // end_time: '2025/04/19 02:58:53',
- // create_time: '2025-04-19T02:59:03.602+00:00',
- // name: '智引即飞202504191058',
- // event_number: 0,
- // dock_sn: '7CTDLCR00BQBM2',
- // wayline_job_info_id: 335,
- // job_id: 'd3b25edc-ec23-4ad6-800a-0f659a72bff3',
- // },
- // {
- // id: 11553,
- // status: 5,
- // begin_time: '2025/04/19 02:52:21',
- // end_time: '2025/04/19 02:52:21',
- // create_time: '2025-04-19T02:52:31.415+00:00',
- // name: '智引即飞202504191052',
- // event_number: 0,
- // dock_sn: '7CTDLCR00BQBM2',
- // wayline_job_info_id: 334,
- // job_id: 'e27090f1-e740-4ae4-8d4d-301354eb0bbc',
- // },
- // {
- // id: 11548,
- // status: 5,
- // begin_time: '2025/04/19 02:23:06',
- // end_time: '2025/04/19 02:23:06',
- // create_time: '2025-04-19T02:23:16.151+00:00',
- // name: '智引即飞202504191023',
- // event_number: 0,
- // dock_sn: '7CTDLCR00BQBM2',
- // wayline_job_info_id: 332,
- // job_id: '9e1f7283-fe34-4cfd-b468-cd2b34a96d34',
- // },
- // {
- // id: 11547,
- // status: 3,
- // begin_time: '2025/04/19 02:18:24',
- // end_time: '2025/04/19 02:18:24',
- // create_time: '2025-04-19T02:18:34.590+00:00',
- // name: '智引即飞202504191018',
- // event_number: 0,
- // dock_sn: '7CTDLCR00BQBM2',
- // wayline_job_info_id: 331,
- // job_id: '7aa5222c-2f8b-401e-b6ba-d6a550398829',
- // },
- // ]
-
- if (tableList.value.length > 0) {
- await getTaskDetails(tableList.value[0].wayline_job_info_id)
- }
+ initTaskWayline(viewer, wsInfo, taskDetails)
})
-
-const { removeEntitys } = useTaskWayline(viewer || window.$viewer, taskDetails)
-
-useTaskViewInfo(viewer || window.$viewer, wsInfo, removeEntitys)
</script>
<style lang="scss" scoped>
--
Gitblit v1.9.3