From df4e3452ecdc510faa09c7310ba4857ed432553d Mon Sep 17 00:00:00 2001
From: chenyao <1219716595@qq.com>
Date: Sat, 12 Apr 2025 17:47:19 +0800
Subject: [PATCH] Merge branch 'master' of http://139.196.74.78:10010/r/drone/command-center-dashboard
---
src/views/TaskManage/TaskIntermediateContent/TaskIntermediateContent.vue | 146 +++++++++++++++++++++++++++++++++---------------
1 files changed, 99 insertions(+), 47 deletions(-)
diff --git a/src/views/TaskManage/TaskIntermediateContent/TaskIntermediateContent.vue b/src/views/TaskManage/TaskIntermediateContent/TaskIntermediateContent.vue
index ccf669e..c267f8f 100644
--- a/src/views/TaskManage/TaskIntermediateContent/TaskIntermediateContent.vue
+++ b/src/views/TaskManage/TaskIntermediateContent/TaskIntermediateContent.vue
@@ -1,23 +1,21 @@
<!-- 任务统计表格 -->
<template>
- <SearchBox></SearchBox>
<div class="task-intermediate-content">
- <el-table :data="jobListData" style="width: 100%" height="calc(100vh - 180px)">
+ <SearchBox @search="searchClick" @addTask="handleAddTask"></SearchBox>
+ <el-table :data="jobListData" style="width: 100%" height="calc(100vh - 502px)">
<el-table-column label="序号" width="60">
<template #default="scope">
- {{ (jobListParams.page - 1) * jobListParams.limit + scope.$index + 1 }}
+ {{ (jobListParams.current - 1) * jobListParams.size + scope.$index + 1 }}
</template>
</el-table-column>
- <el-table-column prop="job_info_num" label="任务编号" />
- <el-table-column prop="name" label="任务名称" />
+ <el-table-column prop="job_info_num" label="任务编号" show-overflow-tooltip />
+ <el-table-column prop="name" label="任务名称" show-overflow-tooltip />
<el-table-column prop="dept_name" label="所属部门" />
<el-table-column prop="device_names" label="所属机巢" />
- <el-table-column prop="ai_type_str" label="关联算法" />
- <el-table-column prop="status" label="任务状态" >
+ <el-table-column prop="ai_type_str" label="关联算法" show-overflow-tooltip />
+ <el-table-column label="任务状态" >
<template #default="scope">
- <el-tag :type="getStatusType(scope.row.status)">
- {{ getStatusText(scope.row.status) }}
- </el-tag>
+ {{ scope.row.status ? getStatusText(scope.row.status) : '' }}
</template>
</el-table-column>
<el-table-column prop="industry_type_str" label="任务类型" />
@@ -26,38 +24,45 @@
<el-table-column prop="creator_name" label="创建人" />
<el-table-column label="操作" >
<template #default="scope">
- <el-button link type="primary" @click="handleDetail(scope.row)">查看</el-button>
+ <el-button class="current-details" link type="primary" @click="handleDetail(scope.row)">查看</el-button>
</template>
</el-table-column>
</el-table>
<div class="pagination">
- <el-pagination
- v-model:current-page="jobListParams.page"
- v-model:page-size="jobListParams.limit"
+ <el-pagination class="btn-prev"
+ v-model:current-page="jobListParams.current"
+ v-model:page-size="jobListParams.size"
:page-sizes="[10, 20, 30, 50]"
- layout="total, sizes, prev, pager, next"
+ layout="prev, pager, next, sizes, jumper"
:total="total"
@size-change="handleSizeChange"
@current-change="handleCurrentChange"
/>
</div>
</div>
+ <!-- 添加任务 -->
+ <AddTask v-model:show="isShowAddTask" @refresh="searchClick"/>
+ <!-- 当前任务详情 -->
+ <CurrentTaskDetails v-model:show="isShowCurrentTaskDetails" :rowData="rowData"/>
</template>
<script setup>
import SearchBox from '../SearchBox.vue';
+import AddTask from './AddTask.vue';
+import CurrentTaskDetails from './CurrentTaskDetails.vue';
import { jobList } from '@/api/home/task';
const jobListParams = reactive({
- page: 1,
- limit: 10,
+ current: 1,
+ size: 5,
+ searchParams:{}
});
const jobListData = ref([]);
const total = ref(0);
// 获取任务列表
const getJobList = () => {
- jobList({current:1,size:10}).then(res => {
+ jobList(jobListParams).then(res => {
if (res.data.code !== 0) return;
jobListData.value = res.data.data.records;
total.value = res.data.data.total;
@@ -72,36 +77,41 @@
4: '已取消',
5: '执行失败'
};
- return statusMap[status] || '未知';
+ return statusMap[status] || '-';
};
-// 状态标签类型
-const getStatusType = (status) => {
- const typeMap = {
- 1: 'info',
- 2: 'warning',
- 3: 'success',
- 4: '',
- 5: 'danger'
- };
- return typeMap[status] || '';
-};
-
-// 查看详情
+// 查看当前任务详情 如果是一台机则显示详情 如果是多台机则进入集群调度(暂未开发)
+let isShowCurrentTaskDetails = ref(false);
+let rowData = ref({});
const handleDetail = (row) => {
- console.log('查看详情', row);
+ isShowCurrentTaskDetails.value = true;
+ rowData.value = row? row : {};
};
// 分页大小改变
const handleSizeChange = (val) => {
- jobListParams.limit = val;
+ jobListParams.size = val;
getJobList();
};
// 页码改变
const handleCurrentChange = (val) => {
- jobListParams.page = val;
+ jobListParams.current = val;
getJobList();
+};
+
+// 传参查询条件
+const searchClick = (params) => {
+ jobListParams.current = 1;
+ jobListParams.size = 10;
+ jobListParams.searchParams = params;
+ getJobList();
+};
+
+// 新建任务
+const isShowAddTask = ref(false);
+const handleAddTask = () => {
+ isShowAddTask.value = true;
};
onMounted(() => {
@@ -109,39 +119,81 @@
});
</script>
+<style lang="scss">
+.task-intermediate-content {
+ .el-table__body tr {
+ background: #0B1D38;
+ border-bottom: 1px solid;
+ border-image: linear-gradient(270deg, rgba(81, 168, 255, 0), rgba(48, 111, 202, 1), rgba(81, 168, 255, 0)) 2 2;
+ }
+ .el-pagination__sizes {
+ .el-select {
+ .el-input__wrapper {
+ background-color: #021022;
+ box-shadow: 0 0 0 1px #1479EF inset;
+ }
+ }
+ }
+}
+</style>
<style lang="scss" scoped>
.task-intermediate-content {
- position: absolute;
- top: 190px;
- width: calc(100% - 400px - 400px - 100px);
- left: 450px;
- height: 770px;
- display: flex;
- flex-direction: column;
- justify-content: space-between;
+ margin: 16px 38px 16px 38px;
+ background: linear-gradient( 27deg, #1F3E7A 0%, rgba(31,62,122,0.35) 79%, rgba(31,62,122,0) 100%);
+ padding: 14px 18px;
:deep(.el-table) {
+ margin-top: 12px;
background-color: transparent;
--el-table-tr-bg-color: transparent;
--el-table-border-color: rgba(255, 255, 255, 0.1);
--el-table-header-bg-color: rgba(31, 62, 122, 0.5);
--el-table-header-text-color: #fff;
--el-table-text-color: #fff;
+ .el-table__header {
+ background: #0F1929;
+ box-shadow: inset 0px -50px 50px 0px rgba(27,148,255,0.13);
+ border-radius: 20px 0px 0px 0px;
+ border-bottom: 2px solid;
+ border-image: linear-gradient(90deg, rgba(81, 168, 255, 0), rgba(48, 111, 202, 1), rgba(81, 168, 255, 0)) 2 2;
+ }
.el-table__body tr:hover > td {
background-color: rgba(31, 62, 122, 0.3) !important;
}
}
+ .current-details {
+ width: 53px;
+ height: 27px;
+ background: #001F4E;
+ border-radius: 0px 0px 0px 0px;
+ border: 1px solid #51A8FF;
+ }
+
.pagination {
- padding: 20px 0;
+ // padding: 20px 0;
display: flex;
- justify-content: flex-end;
+ justify-content: center;
:deep(.el-pagination) {
--el-pagination-bg-color: transparent;
- --el-pagination-text-color: #fff;
- --el-pagination-button-color: #fff;
+ --el-pagination-text-color: #8EB8EA;
+ --el-pagination-button-color: #8EB8EA;
--el-pagination-hover-color: #409eff;
+ .btn-prev {
+ background: transparent;
+ }
+ .el-pager li.is-active {
+ background: #021022;
+ color: #8EB8EA;
+ border: 1px solid #1479EF;
+ padding: 0 6px;
+ }
+
+ .el-pagination__jump {
+ background: transparent;
+ color: #8EB8EA;
+ }
}
}
}
--
Gitblit v1.9.3