From da2a4e58ecc7c5da0a3ec726708a16c21e7f60e3 Mon Sep 17 00:00:00 2001
From: 罗广辉 <guanghui.luo@foxmail.com>
Date: Mon, 07 Apr 2025 15:34:09 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/views/SignMachineNest/MachineRight/MachineTableDetails/DeviceJob/DeviceJobDetails/JobRelatedEvents.vue | 45 ++++++++++++++++++++++++---------------------
1 files changed, 24 insertions(+), 21 deletions(-)
diff --git a/src/views/SignMachineNest/MachineRight/MachineTableDetails/DeviceJob/DeviceJobDetails/JobRelatedEvents.vue b/src/views/SignMachineNest/MachineRight/MachineTableDetails/DeviceJob/DeviceJobDetails/JobRelatedEvents.vue
index 311ec84..4455dc2 100644
--- a/src/views/SignMachineNest/MachineRight/MachineTableDetails/DeviceJob/DeviceJobDetails/JobRelatedEvents.vue
+++ b/src/views/SignMachineNest/MachineRight/MachineTableDetails/DeviceJob/DeviceJobDetails/JobRelatedEvents.vue
@@ -1,11 +1,23 @@
<template>
<el-divider content-position="left">关联事件 {{total}}个</el-divider>
<el-table :data="list" style="width: 100%" >
- <el-table-column prop="event_num" label="编号" />
+ <el-table-column prop="id" label="ID" />
<el-table-column prop="event_name" label="名称" />
<el-table-column prop="media_type" label="类型" />
- <el-table-column prop="photo_url" label="图片url" />
- <el-table-column prop="video_url" label="视频url" />
+ <el-table-column prop="photo_url" label="图片">
+ <template #default="scope">
+ <el-image
+ :style="{width: pxToRem(50), height: pxToRem(50)}"
+ :src="scope.row.photo_url"
+ :preview-src-list="[scope.row.photo_url]"
+ show-progress
+ preview-teleported
+ :initial-index="4"
+ fit="cover"
+ />
+ </template>
+ </el-table-column>
+ <el-table-column prop="video_url" label="视频" />
<el-table-column prop="remark" label="备注" />
<el-table-column prop="status" label="状态">
<template #default="scope">
@@ -17,7 +29,6 @@
<el-tag v-if="scope.row.status === 5" type="success">已完结</el-tag>
</template>
</el-table-column>
- <el-table-column prop="wayline_job_id" label=" 任务id" />
<el-table-column label="操作" >
<template #default="scope">
<el-button type="primary" link @click="examine(scope.row)">审核</el-button>
@@ -39,27 +50,16 @@
import { useStore } from 'vuex'
import { getDeviceEventList } from '@/api/home/machineNest'
import { ElMessage } from 'element-plus';
+import { pxToRem } from '@/utils/rem'
-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,
- size: 1,
+ size: 10,
})
const store = useStore()
const child_sn = computed(() => store.state.home.singleUavHome.child_sn)
@@ -71,22 +71,25 @@
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
total.value = resData.total
})
}
+
+
const pageChange = val => {
sizeParams.value.current = val
getList()
}
onMounted(() => {
- // getList()
+ getList()
})
</script>
<style scoped lang="scss"></style>
--
Gitblit v1.9.3