From cbec4308b61d0147cd60abfcbbb90db24c4a8e7f Mon Sep 17 00:00:00 2001
From: 张含笑 <zhx18749296735@163.com>
Date: Tue, 08 Apr 2025 15:22:29 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/views/TaskManage/SearchBox.vue | 30 +++++++++++++++++++++---------
1 files changed, 21 insertions(+), 9 deletions(-)
diff --git a/src/views/TaskManage/SearchBox.vue b/src/views/TaskManage/SearchBox.vue
index c96de38..a9eb886 100644
--- a/src/views/TaskManage/SearchBox.vue
+++ b/src/views/TaskManage/SearchBox.vue
@@ -53,7 +53,7 @@
/>
</el-form-item>
<el-form-item label="任务算法">
- <!-- <el-select v-model="searchForm.ai_type" placeholder="请选择算法" clearable>
+ <!-- <el-select v-model="searchForm.ai_types" placeholder="请选择算法" clearable>
<el-option v-for="item in taskAlgorithm" :key="item.id" :label="item.dictValue" :value="item.dictKey" />
</el-select> -->
<TaskAlgorithmBusiness :showAlgorithm="true" @algorithmChange="algorithmChange"/>
@@ -92,7 +92,7 @@
const dateRange = ref([]);
const searchForm = reactive({
- ai_type: '', // 算法类型
+ ai_types: [], // 算法类型
area_code: '', // 区域code
create_dept: '', // 创建部门
date_enum: '', // 日期枚举,可用值:TODAY,CURRENT_WEEK,CURRENT_MONTH,CURRENT_YEAR
@@ -117,8 +117,8 @@
const handleSearch = () => {
emit('search', {
...searchForm,
- start_date: `${dateRange.value[0]} 00:00:00`,
- end_date: `${dateRange.value[1]} 23:59:59`
+ start_date: dateRange.value.length ? `${dateRange.value[0]} 00:00:00` : '',
+ end_date: dateRange.value.length ? `${dateRange.value[1]} 23:59:59` : ''
});
};
@@ -149,7 +149,7 @@
// });
// };
const algorithmChange = (val) => {
- searchForm.ai_type = val;
+ searchForm.ai_types = val;
};
const businessChange = (val) => {
@@ -200,10 +200,11 @@
<style lang="scss" scoped>
.search-box {
position: absolute;
- top: 120px;
- left: 450px;
- width: calc(100% - 400px - 400px - 100px);
+ top: 340px;
+ left: 40px;
+ width: calc(100% - 80px);
height: 60px;
+ line-height: 60px;
background: rgba(31, 62, 122, 0.95);
// padding: 10px 20px;
transition: all 0.3s;
@@ -212,7 +213,7 @@
}
.search-row {
display: flex;
- justify-content: space-between;
+ // justify-content: space-between;
align-items: center;
.search-items {
@@ -236,6 +237,7 @@
z-index: 10;
border-top: 1px solid rgba(255, 255, 255, 0.1);
box-shadow: 0 4px 12px rgba(0, 0, 0, 0.3);
+ margin-bottom: 60px; // 为分页预留空间
}
:deep(.el-form) {
@@ -273,5 +275,15 @@
line-height: 18px;
}
}
+ :deep(.el-pagination) {
+ position: fixed;
+ bottom: 20px;
+ left: 50%;
+ transform: translateX(-50%);
+ background: rgba(31, 62, 122, 0.95);
+ padding: 15px 20px;
+ border-radius: 4px;
+ box-shadow: 0 2px 12px rgba(0, 0, 0, 0.3);
+ }
}
</style>
\ No newline at end of file
--
Gitblit v1.9.3