From cccca4aeb6fa86358ff7081ba77bbbf63beb26bb Mon Sep 17 00:00:00 2001
From: chenyao <1219716595@qq.com>
Date: Tue, 17 Jun 2025 15:42:13 +0800
Subject: [PATCH] feat: 优化文件上传和任务管理
---
src/assets/images/uoload-success.png | 0
src/views/job/components/TaskIntermediateContent/TaskIntermediateContent.vue | 31 +++++++--------
src/views/system/userinfo.vue | 15 +++++--
src/views/job/components/TaskTop/TaskIndustry.vue | 15 ++-----
src/assets/images/upload-error.png | 0
5 files changed, 30 insertions(+), 31 deletions(-)
diff --git a/src/assets/images/uoload-success.png b/src/assets/images/uoload-success.png
index 903fb38..d8f7d0b 100644
--- a/src/assets/images/uoload-success.png
+++ b/src/assets/images/uoload-success.png
Binary files differ
diff --git a/src/assets/images/upload-error.png b/src/assets/images/upload-error.png
index 7b4ee58..4fd7c2c 100644
--- a/src/assets/images/upload-error.png
+++ b/src/assets/images/upload-error.png
Binary files differ
diff --git a/src/views/job/components/TaskIntermediateContent/TaskIntermediateContent.vue b/src/views/job/components/TaskIntermediateContent/TaskIntermediateContent.vue
index f544e30..173ae8b 100644
--- a/src/views/job/components/TaskIntermediateContent/TaskIntermediateContent.vue
+++ b/src/views/job/components/TaskIntermediateContent/TaskIntermediateContent.vue
@@ -3,13 +3,7 @@
<div class="task-intermediate-content">
<SearchBox @search="searchClick" @addTask="handleAddTask"></SearchBox>
<div class="task-table">
- <el-table
- stripe
- :data="jobListData"
- :row-class-name="tableRowClassName"
- :row-style="{ height: '54px', fontSize: '14px', 'text-align': 'center' }"
- :header-cell-style="{ 'text-align': 'center', height: '36px', fontSize: '14px' }"
- >
+ <el-table border stripe :data="jobListData" class="custom-header">
<el-table-column label="序号" type="index" width="60">
<template #default="{ $index }">
{{ ($index + 1 + (jobListParams.current - 1) * jobListParams.size).toString().padStart(2, '0') }}
@@ -53,8 +47,8 @@
<span>{{ scope.row.event_number ? scope.row.event_number : '/' }}</span>
</template>
</el-table-column>
- <el-table-column prop="cycle_time_value" label="任务时间" />
- <el-table-column prop="creator_name" label="创建人" align="center" />
+ <el-table-column prop="cycle_time_value" label="任务时间" show-overflow-tooltip />
+ <el-table-column prop="creator_name" label="创建人" align="center" show-overflow-tooltip />
<el-table-column label="操作" width="200" align="center">
<template #default="scope">
<div
@@ -274,18 +268,21 @@
color: #3efe96;
}
}
- :deep(.el-table) {
- --el-table-tr-bg-color: #ffffff;
- --el-table-striped-bg-color: #EFEFEF;
+ // :deep(.el-table) {
+ // --el-table-tr-bg-color: #ffffff;
+ // --el-table-striped-bg-color: #EFEFEF;
- .el-table__body tr.el-table__row--striped td {
- background-color: var(--el-table-striped-bg-color);
- }
- }
+ // .el-table__body tr.el-table__row--striped td {
+ // background-color: var(--el-table-striped-bg-color);
+ // }
+ // }
// 分页
+ :deep(.custom-header th.el-table__cell) {
+ color: rgba(0, 0, 0, 0.85);
+ }
:deep(.el-pagination) {
display: flex;
- justify-content: center;
+ justify-content: flex-end;
}
:deep(.el-pagination button) {
background: center center no-repeat none !important;
diff --git a/src/views/job/components/TaskTop/TaskIndustry.vue b/src/views/job/components/TaskTop/TaskIndustry.vue
index 5509958..7c8e3af 100644
--- a/src/views/job/components/TaskTop/TaskIndustry.vue
+++ b/src/views/job/components/TaskTop/TaskIndustry.vue
@@ -38,17 +38,12 @@
{
name: '机巢事件统计',
type: 'pie',
- roseType: 'radius',
- radius: ['20%', '70%'],
- center: ['50%', '45%'],
+ // roseType: 'radius',
+ radius: ['40%', '70%'],
+ // center: ['50%', '45%'],
+ // radius: '70%', // 设置饼图的半径
+ center: ['50%', '50%'], // 调整饼图位置
data: [],
- // [
- // { name: '国土类', value: 0, itemStyle: { color: '#3D7FFF' } },
- // { name: '城管类', value: 0, itemStyle: { color: '#8277E9' } },
- // { name: '消防类', value: 0, itemStyle: { color: '#FFB77E' } },
- // { name: '林业类', value: 0, itemStyle: { color: '#44D7B6' } },
- // { name: '公安类', value: 0, itemStyle: { color: '#62F4FF' } }
- // ],
label: {
show: true,
position: 'outside',
diff --git a/src/views/system/userinfo.vue b/src/views/system/userinfo.vue
index 9d39e51..acef2d7 100644
--- a/src/views/system/userinfo.vue
+++ b/src/views/system/userinfo.vue
@@ -111,7 +111,9 @@
<!-- 密钥上传 -->
<div class="upload-file" v-else-if="checked === 2">
<img v-if="isSuccess === 'success'" :src="uploadSuccess" alt="" />
+ <div v-if="isSuccess === 'success'">上传成功</div>
<img v-if="isSuccess === 'error'" :src="uploadError" alt="" />
+ <div v-if="isSuccess === 'error'">上传失败</div>
<el-upload
action="/upload"
accept=".lic"
@@ -419,12 +421,17 @@
.upload-btn {
width: 93px;
height: 38px;
- line-height: 38px;
- background: #1b3e6c;
+ background: #DDEBFF;
border-radius: 8px 8px 8px 8px;
- border: 1px solid #ffffff;
- color: #fff;
+ border: 1px solid #409EFF;
text-align: center;
+ font-family: Source Han Sans CN, Source Han Sans CN;
+ font-weight: bold;
+ font-size: 14px;
+ color: #228CFA;
+ line-height: 38px;
+ text-align: center;
+ margin-top: 10px;
}
.password-time {
margin-top: 50px;
--
Gitblit v1.9.3