From 4fd9505abfcc5947afa434cc8dc5827f574073f5 Mon Sep 17 00:00:00 2001
From: chenyao <1219716595@qq.com>
Date: Thu, 03 Apr 2025 17:29:45 +0800
Subject: [PATCH] Merge branch 'master' of http://139.196.74.78:10010/r/drone/command-center-dashboard
---
src/views/SignMachineNest/MachineRight/MachineTableDetails/DeviceJob/DeviceJobDetails/JobRelatedEvents.vue | 28 ++++++++++++++++++++++------
1 files changed, 22 insertions(+), 6 deletions(-)
diff --git a/src/views/SignMachineNest/components/MachineRight/MachineTableDetails/DeviceEvent.vue b/src/views/SignMachineNest/MachineRight/MachineTableDetails/DeviceJob/DeviceJobDetails/JobRelatedEvents.vue
similarity index 69%
rename from src/views/SignMachineNest/components/MachineRight/MachineTableDetails/DeviceEvent.vue
rename to src/views/SignMachineNest/MachineRight/MachineTableDetails/DeviceJob/DeviceJobDetails/JobRelatedEvents.vue
index 9bbe2c3..5bf73aa 100644
--- a/src/views/SignMachineNest/components/MachineRight/MachineTableDetails/DeviceEvent.vue
+++ b/src/views/SignMachineNest/MachineRight/MachineTableDetails/DeviceJob/DeviceJobDetails/JobRelatedEvents.vue
@@ -1,6 +1,6 @@
<template>
- <el-divider content-position="left">相关事件 {{total}}次</el-divider>
- <el-table :data="list" style="width: 100%">
+ <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="event_name" label="名称" />
<el-table-column prop="media_type" label="类型" />
@@ -18,6 +18,12 @@
</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>
+ <el-button type="primary" link @click="distribution(scope.row)">分拨</el-button>
+ </template>
+ </el-table-column>
</el-table>
<el-pagination
background
@@ -32,11 +38,12 @@
<script setup>
import { useStore } from 'vuex'
import { getDeviceEventList } from '@/api/home/machineNest'
+import { ElMessage } from 'element-plus';
-const list = ref([])
+const list = ref()
const params = ref({
- device_sn: null,
+ wayLineJodInfoId:null
})
const sizeParams = ref({
current: 1,
@@ -44,10 +51,18 @@
})
const store = useStore()
const child_sn = computed(() => store.state.home.singleUavHome.child_sn)
-const total = ref(0)
+const total = ref(10)
+
+const distribution = row => {
+ ElMessage.warning('正在加急开发中...')
+}
+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
@@ -60,6 +75,7 @@
}
onMounted(() => {
+ console.log(66);
getList()
})
</script>
--
Gitblit v1.9.3