From 04cd5b43197a8831c1e1637acf96bacb7a7116fa Mon Sep 17 00:00:00 2001
From: 张含笑 <zhx18749296735@163.com>
Date: Thu, 17 Apr 2025 11:01:46 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/components/DeviceJobDetails/JobRelatedEvents.vue | 5 +++--
1 files changed, 3 insertions(+), 2 deletions(-)
diff --git a/src/views/SignMachineNest/MachineRight/MachineStatus/MachineTableDetails/DeviceJob/DeviceJobDetails/JobRelatedEvents.vue b/src/components/DeviceJobDetails/JobRelatedEvents.vue
similarity index 99%
rename from src/views/SignMachineNest/MachineRight/MachineStatus/MachineTableDetails/DeviceJob/DeviceJobDetails/JobRelatedEvents.vue
rename to src/components/DeviceJobDetails/JobRelatedEvents.vue
index ede419c..f2bd341 100644
--- a/src/views/SignMachineNest/MachineRight/MachineStatus/MachineTableDetails/DeviceJob/DeviceJobDetails/JobRelatedEvents.vue
+++ b/src/components/DeviceJobDetails/JobRelatedEvents.vue
@@ -20,7 +20,7 @@
<div class="processing" v-if="scope.row.status === 3">处理中</div>
<div class="done" v-if="scope.row.status === 4">已完成</div>
<div class="ended" v-if="scope.row.status === 5">已完结</div>
-
+
</template>
</el-table-column>
<el-table-column label="操作" width="80">
@@ -67,13 +67,14 @@
}
const wayLineJodInfoId = inject('wayLineJodInfoId')
+
const getList = () => {
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
-
+
})
}
--
Gitblit v1.9.3