From 649f78a9f068e7e6ea7408f1f39a9e0a46d09048 Mon Sep 17 00:00:00 2001
From: 罗广辉 <guanghui.luo@foxmail.com>
Date: Thu, 03 Apr 2025 17:30:04 +0800
Subject: [PATCH] feat: 历史任务详情关联的事件列表
---
src/views/SignMachineNest/MachineRight/MachineTableDetails/DeviceJob/DeviceJob.vue | 6 +++---
src/views/SignMachineNest/MachineRight/MachineTableDetails/DeviceJob/DeviceJobDetails/DeviceJobDetails.vue | 3 +--
src/views/SignMachineNest/MachineRight/MachineTableDetails/DeviceJob/DeviceJobDetails/JobRelatedEvents.vue | 22 ++++++----------------
3 files changed, 10 insertions(+), 21 deletions(-)
diff --git a/src/views/SignMachineNest/MachineRight/MachineTableDetails/DeviceJob/DeviceJob.vue b/src/views/SignMachineNest/MachineRight/MachineTableDetails/DeviceJob/DeviceJob.vue
index 922d82c..f8fce46 100644
--- a/src/views/SignMachineNest/MachineRight/MachineTableDetails/DeviceJob/DeviceJob.vue
+++ b/src/views/SignMachineNest/MachineRight/MachineTableDetails/DeviceJob/DeviceJob.vue
@@ -47,10 +47,10 @@
const device_sn = computed(() => store.state.home.singleUavHome.device_sn)
const total = ref(0)
const deviceJobDetailsShow = ref(false)
-const jobId = ref(null)
-provide('jobId', jobId)
+const wayLineJodInfoId = ref(null)
+provide('wayLineJodInfoId', wayLineJodInfoId)
const viewJob = (row) => {
- jobId.value = row.id
+ wayLineJodInfoId.value = row.id
deviceJobDetailsShow.value = true
}
diff --git a/src/views/SignMachineNest/MachineRight/MachineTableDetails/DeviceJob/DeviceJobDetails/DeviceJobDetails.vue b/src/views/SignMachineNest/MachineRight/MachineTableDetails/DeviceJob/DeviceJobDetails/DeviceJobDetails.vue
index 58304d5..38eb225 100644
--- a/src/views/SignMachineNest/MachineRight/MachineTableDetails/DeviceJob/DeviceJobDetails/DeviceJobDetails.vue
+++ b/src/views/SignMachineNest/MachineRight/MachineTableDetails/DeviceJob/DeviceJobDetails/DeviceJobDetails.vue
@@ -1,7 +1,7 @@
<!-- 任务详情 -->
<template>
<el-dialog
- append-to-body
+ append-to-body
modal-class="detailsOfHistoricalTasks"
v-model="isShow"
title="历史任务详情"
@@ -56,7 +56,6 @@
{ name: '任务描述', value: 'xxx' },
])
-onMounted(() => {})
</script>
<style lang="scss">
diff --git a/src/views/SignMachineNest/MachineRight/MachineTableDetails/DeviceJob/DeviceJobDetails/JobRelatedEvents.vue b/src/views/SignMachineNest/MachineRight/MachineTableDetails/DeviceJob/DeviceJobDetails/JobRelatedEvents.vue
index 311ec84..5bf73aa 100644
--- a/src/views/SignMachineNest/MachineRight/MachineTableDetails/DeviceJob/DeviceJobDetails/JobRelatedEvents.vue
+++ b/src/views/SignMachineNest/MachineRight/MachineTableDetails/DeviceJob/DeviceJobDetails/JobRelatedEvents.vue
@@ -40,22 +40,10 @@
import { getDeviceEventList } from '@/api/home/machineNest'
import { ElMessage } from 'element-plus';
-const jobId = inject("jobId");
-const list = ref([
- {event_num:''},
- {event_num:''},
- {event_num:''},
- {event_num:''},
- {event_num:''},
- {event_num:''},
- {event_num:''},
- {event_num:''},
- {event_num:''},
- {event_num:''},
-])
+const list = ref()
const params = ref({
- device_sn: null,
+ wayLineJodInfoId:null
})
const sizeParams = ref({
current: 1,
@@ -71,9 +59,10 @@
const examine = row => {
ElMessage.warning('正在加急开发中...')
}
+const wayLineJodInfoId = inject("wayLineJodInfoId");
const getList = () => {
- params.value.device_sn = child_sn.value
+ params.value.wayLineJodInfoId = wayLineJodInfoId.value
getDeviceEventList(params.value, sizeParams.value).then(res => {
const resData = res?.data?.data || {}
list.value = resData.records
@@ -86,7 +75,8 @@
}
onMounted(() => {
- // getList()
+ console.log(66);
+ getList()
})
</script>
<style scoped lang="scss"></style>
--
Gitblit v1.9.3