From 2df37298dfd5b299a4c051cb544794b5241cc3a5 Mon Sep 17 00:00:00 2001
From: 张含笑 <zhx18749296735@163.com>
Date: Sat, 06 Dec 2025 11:06:12 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/feature/v9.0/9.0.1' into feature/v9.0/9.0.1
---
src/views/job/components/TaskIntermediateContent/TaskIntermediateContent.vue | 23 +++++++++++------------
1 files changed, 11 insertions(+), 12 deletions(-)
diff --git a/src/views/job/components/TaskIntermediateContent/TaskIntermediateContent.vue b/src/views/job/components/TaskIntermediateContent/TaskIntermediateContent.vue
index 8749468..17a35d9 100644
--- a/src/views/job/components/TaskIntermediateContent/TaskIntermediateContent.vue
+++ b/src/views/job/components/TaskIntermediateContent/TaskIntermediateContent.vue
@@ -17,7 +17,7 @@
</el-tooltip-copy>
</template>
</el-table-column>
- <el-table-column prop="name" label="任务编号" width="160">
+ <el-table-column prop="name" label="任务名称" width="160">
<template #default="scope">
<el-tooltip-copy :content="scope.row.name" :showCopyText="true">
{{scope.row.name}}
@@ -100,10 +100,10 @@
<!-- <CurrentTaskDetails
v-if="isShowCurrentTaskDetails"
v-model:show="isShowCurrentTaskDetails"
- :wayLineJodInfoId="rowData.id"
+ :wayLineJobInfoId="rowData.id"
/> -->
<!-- 历史任务详情 -->
- <DeviceJobDetails v-if="isShowDeviceJobDetails" v-model:show="isShowDeviceJobDetails" :wayLineJodInfoId="rowData.id"
+ <DeviceJobDetails v-if="isShowDeviceJobDetails" v-model:show="isShowDeviceJobDetails" :wayLineJobInfoId="rowData.id"
:batchNo="rowData.batch_no" :jobId="jobId"/>
<CancelTaskDialog ref="cancelTaskDialogRef" v-model:isShowCancelTask="isShowCancelTask" :row-data="rowData"
@refresh="getJobList" />
@@ -181,7 +181,7 @@
// isShowCurrentTaskDetails.value = true
// 跳转大屏当前任务详情
const adminUrl = `${import.meta.env.VITE_APP_AREA_NAME}/command-center-dashboard/#/taskManage`
- const targetPath = `id=${encodeURIComponent(rowData.value.id)}&batchNo=${encodeURIComponent(rowData.value.batch_no)}`
+ const targetPath = `id=${encodeURIComponent(rowData.value.id)}&batchNo=${encodeURIComponent(rowData.value.batch_no)}&dockSn=${encodeURIComponent(rowData.value.device_sns[0])}`
window.open(`${adminUrl}?${targetPath}`, '_blank')
} else {
isShowDeviceJobDetails.value = true
@@ -264,14 +264,13 @@
const changeKey = inject('changeKey')
-// 轮询查询是否刷新
-const polling = setInterval(async () => {
- const res = await statusChangedApi()
- if (res.data.data.DEVICE_REFRESH || res.data.data.JOB_REFRESH) {
- getJobList()
- changeKey.value++
- }
-}, 4000)
+const jobUpdateKey = computed(() => store.state.common.jobUpdateKey)
+const deviceUpdateKey = computed(() => store.state.common.deviceUpdateKey)
+
+watch([jobUpdateKey,deviceUpdateKey],()=>{
+ getJobList()
+ changeKey.value++
+})
onBeforeUnmount(() => {
clearInterval(polling)
--
Gitblit v1.9.3