From cb609646805c315e82103d32bbed56cb84229364 Mon Sep 17 00:00:00 2001
From: chenyao <1219716595@qq.com>
Date: Thu, 17 Apr 2025 10:25:05 +0800
Subject: [PATCH] Merge branch 'master' of http://139.196.74.78:10010/r/drone/command-center-dashboard
---
src/views/SignMachineNest/MachineRight/MachineStatus/MachineTableDetails/DeviceJob/DeviceJob.vue | 11 +++++++----
1 files changed, 7 insertions(+), 4 deletions(-)
diff --git a/src/views/SignMachineNest/MachineRight/MachineStatus/MachineTableDetails/DeviceJob/DeviceJob.vue b/src/views/SignMachineNest/MachineRight/MachineStatus/MachineTableDetails/DeviceJob/DeviceJob.vue
index 4d904db..1a7fa6b 100644
--- a/src/views/SignMachineNest/MachineRight/MachineStatus/MachineTableDetails/DeviceJob/DeviceJob.vue
+++ b/src/views/SignMachineNest/MachineRight/MachineStatus/MachineTableDetails/DeviceJob/DeviceJob.vue
@@ -36,7 +36,7 @@
<el-pagination
class="ztzf-pagination"
background
-
+
v-model:current-page="sizeParams.current"
v-model:page-size="sizeParams.size"
layout=" prev, pager, next, jumper"
@@ -45,11 +45,15 @@
/>
</div>
- <DeviceJobDetails v-model:show="deviceJobDetailsShow" />
+ <DeviceJobDetails
+ v-if="deviceJobDetailsShow"
+ v-model:show="deviceJobDetailsShow"
+ :wayLineJodInfoId="wayLineJodInfoId"
+ />
</template>
<script setup>
import { useStore } from 'vuex'
-import DeviceJobDetails from './DeviceJobDetails/DeviceJobDetails.vue'
+import DeviceJobDetails from '@/components/DeviceJobDetails/DeviceJobDetails.vue'
import { getDeviceJobList } from '@/api/home/task'
const list = ref([])
@@ -65,7 +69,6 @@
const total = ref(0)
const deviceJobDetailsShow = ref(false)
const wayLineJodInfoId = ref(null)
-provide('wayLineJodInfoId', wayLineJodInfoId)
const viewJob = row => {
wayLineJodInfoId.value = row.id
deviceJobDetailsShow.value = true
--
Gitblit v1.9.3