From 10e83e3fe15b141c5e5d073b0059bcd5167467fc Mon Sep 17 00:00:00 2001
From: chenyao <1219716595@qq.com>
Date: Sat, 12 Jul 2025 11:51:00 +0800
Subject: [PATCH] feat:优化任务管理
---
src/views/job/components/TaskIntermediateContent/TaskIntermediateContent.vue | 27 +++++++++++++--------------
1 files changed, 13 insertions(+), 14 deletions(-)
diff --git a/src/views/job/components/TaskIntermediateContent/TaskIntermediateContent.vue b/src/views/job/components/TaskIntermediateContent/TaskIntermediateContent.vue
index 43efc41..2972cfa 100644
--- a/src/views/job/components/TaskIntermediateContent/TaskIntermediateContent.vue
+++ b/src/views/job/components/TaskIntermediateContent/TaskIntermediateContent.vue
@@ -59,7 +59,7 @@
<template #default="scope">
<div
v-if="scope.row.status === 2"
- class="btnItem turnBack"
+ class="btnItem"
link
type="primary"
@click="turnBack(scope.row)"
@@ -68,7 +68,7 @@
</div>
<div
v-if="scope.row.status === 1"
- class="btnItem cancelTask"
+ class="btnItem"
link
type="primary"
@click="cancelTask(scope.row)"
@@ -84,10 +84,12 @@
<el-pagination
class="ztzf-pagination"
popper-class="custom-pagination-dropdown"
+ background
+ :page-sizes="[10, 20, 30, 40]"
+ :size="size"
v-model:current-page="jobListParams.current"
v-model:page-size="jobListParams.size"
- :page-sizes="[10, 20, 30, 40]"
- layout="prev, pager, next, sizes, jumper"
+ layout="total, sizes, prev, pager, next, jumper"
:total="total"
@size-change="handleSizeChange"
@current-change="handleCurrentChange"
@@ -170,14 +172,11 @@
if (row.status === 2 || row.status === 1) {
// isShowCurrentTaskDetails.value = true
// 跳转大屏当前任务详情
- const adminUrl = `${import.meta.env.VITE_APP_AREA_NAME}/command-center-dashboard/`
- const targetPath = `/taskManage?id=${rowData.value.id}&batchNo=${rowData.value.batch_no}`
- window.open(`${adminUrl}?redirect=${encodeURIComponent(targetPath)}`, '_blank')
+ 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)}`
+ window.open(`${adminUrl}?${targetPath}`, '_blank')
} else {
- // isShowDeviceJobDetails.value = true
- const adminUrl = `${import.meta.env.VITE_APP_AREA_NAME}/command-center-dashboard/`
- const targetPath = `/taskManage?id=${rowData.value.id}&batchNo=${rowData.value.batch_no}`
- window.open(`${adminUrl}?redirect=${encodeURIComponent(targetPath)}`, '_blank')
+ isShowDeviceJobDetails.value = true
}
}
@@ -245,12 +244,12 @@
<style lang="scss" scoped>
.task-intermediate-content {
- margin: 0 30px 16px 40px;
+ margin: 0 18px 16px 10px;
background-color: #ffffff;
padding: 14px 18px;
// 表格
.task-table {
- height: 520px;
+ height: 580px;
margin-top: 18px;
overflow: auto;
}
@@ -288,7 +287,7 @@
// 分页
:deep(.el-pagination) {
display: flex;
- justify-content: center;
+ justify-content: right;
}
:deep(.el-pagination button) {
background: center center no-repeat none !important;
--
Gitblit v1.9.3