From 0bcf4a242a8aa0a0b8f1f2043f7c820292c7fc1a Mon Sep 17 00:00:00 2001
From: 张含笑 <zhx18749296735@163.com>
Date: Mon, 08 Dec 2025 09:50:06 +0800
Subject: [PATCH] Merge branch 'refs/heads/feature/v9.0/9.0.1' into test
---
src/views/job/components/TaskIntermediateContent/TaskIntermediateContent.vue | 32 +++++++++++++++++++++++++++++---
1 files changed, 29 insertions(+), 3 deletions(-)
diff --git a/src/views/job/components/TaskIntermediateContent/TaskIntermediateContent.vue b/src/views/job/components/TaskIntermediateContent/TaskIntermediateContent.vue
index e79c353..bc543ab 100644
--- a/src/views/job/components/TaskIntermediateContent/TaskIntermediateContent.vue
+++ b/src/views/job/components/TaskIntermediateContent/TaskIntermediateContent.vue
@@ -85,9 +85,19 @@
<el-button icon="el-icon-view" type="text" @click="handleDetail(scope.row)">查看</el-button>
</template>
</el-table-column>
+ <template #empty>
+ <el-empty
+ class="custom-empty"
+ :image-size="100"
+ >
+ <template #description>
+ <span class="custom-text">暂无数据</span>
+ </template>
+ </el-empty>
+ </template>
</el-table>
</div>
- <div class="pagination">
+ <div class="pagination" v-if="jobListData.length > 0">
<el-pagination class="ztzf-pagination" popper-class="custom-pagination-dropdown" background
:page-sizes="[10, 20, 30, 40, 50, 100]" :size="size" v-model:current-page="jobListParams.current"
v-model:page-size="jobListParams.size" layout="total, sizes, prev, pager, next, jumper" :total="total"
@@ -181,7 +191,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
@@ -273,7 +283,7 @@
})
onBeforeUnmount(() => {
- clearInterval(polling)
+ // clearInterval(polling)
})
onMounted(() => {
@@ -298,7 +308,22 @@
flex: 1;
margin-top: 18px;
overflow: auto;
+ :deep(.el-scrollbar__view) {
+ height: 100%;
+ }
+ :deep(.el-table--fit,.el-scrollbar__view) {
+ height: 100%;
+ }
}
+
+ .custom-empty {
+ //font-family: Source Han Sans CN, Source Han Sans CN;
+ //margin-top: 15%;
+ //.custom-text {
+ // color: #fff;
+ // font-size: 16px;
+ //}
+ }
.btnItem {
height: 27px;
@@ -344,6 +369,7 @@
:deep(.el-pagination) {
display: flex;
+ padding: 20px 0;
justify-content: right;
}
--
Gitblit v1.9.3