From 1c326c20f634590ad05265d5de5090be15d27231 Mon Sep 17 00:00:00 2001
From: 罗广辉 <guanghui.luo@foxmail.com>
Date: Fri, 17 Oct 2025 18:02:14 +0800
Subject: [PATCH] Merge branch 'feature/v7.0/7.0.1' into prod
---
src/views/dataCenter/components/searchData.vue | 35 ++++++++++++++++++++++++++---------
1 files changed, 26 insertions(+), 9 deletions(-)
diff --git a/src/views/dataCenter/components/searchData.vue b/src/views/dataCenter/components/searchData.vue
index fbbb2db..1988466 100644
--- a/src/views/dataCenter/components/searchData.vue
+++ b/src/views/dataCenter/components/searchData.vue
@@ -1,7 +1,8 @@
<template>
<div class="search-box-test">
<el-form :model="searchForm" inline>
- <div class="search-first">
+ <el-row :gutter="24">
+ <el-col :span="4">
<el-form-item label="行政区划:" >
<el-tree-select
:disabled="viewDetailsDisabled"
@@ -15,6 +16,8 @@
@node-click="handleNodeClick"
/>
</el-form-item>
+ </el-col>
+ <el-col :span="4">
<el-form-item label="所属机巢:">
<el-select
:disabled="viewDetailsDisabled"
@@ -32,10 +35,14 @@
/>
</el-select>
</el-form-item>
+ </el-col>
+ <el-col :span="4">
<el-form-item label="任务名称:">
<el-input :disabled="viewDetailsDisabled" v-model="searchForm.jobName" placeholder="请输入" clearable />
</el-form-item>
- <el-form-item>
+ </el-col>
+ <el-col :span="8">
+ <el-form-item label="选择日期:">
<el-date-picker
:disabled="viewDetailsDisabled"
popper-class="custom-date-picker"
@@ -60,6 +67,8 @@
}"
/>
</el-form-item>
+ </el-col>
+ <el-col :span="4">
<el-form-item label="文件格式:">
<el-select
:disabled="foldersDisabled || viewDetailsDisabled"
@@ -78,6 +87,8 @@
/>
</el-select>
</el-form-item>
+ </el-col>
+ <el-col :span="4">
<el-form-item label="文件类别:">
<el-select
@@ -97,16 +108,17 @@
/>
</el-select>
</el-form-item>
- </div>
- <div class="search-first">
+ </el-col>
+ <el-col :span="4">
<el-form-item label="文件名称:">
<el-input :disabled="foldersDisabled || viewDetailsDisabled" v-model="searchForm.name" placeholder="请输入" clearable />
</el-form-item>
- <div class="search-btn">
+ </el-col>
+ <el-col :span="4">
<el-button type="primary" icon="el-icon-search" @click="handleSearch">搜索</el-button>
<el-button icon="el-icon-refresh" @click="handleReset">清空</el-button>
- </div>
- </div>
+ </el-col>
+ </el-row>
<div class="search-first">
<div class="search-btn">
<!-- <el-button type="primary" icon="el-icon-download" @click="allDownloadFun"-->
@@ -469,12 +481,17 @@
}
.el-form-item {
- margin-bottom: 0;
- width: 233px;
+ //margin-bottom: 0;
+ width: 100%;
.el-form-item__label {
color: #363636;
line-height: 32px;
+ width: 80px;
+ }
+ .el-form-item__content {
+ display: flex;
+ flex: 1;
}
}
}
--
Gitblit v1.9.3