From 0082fa417fb2af9add3406bf05ab3e3e45890c34 Mon Sep 17 00:00:00 2001
From: rain <1679827795@qq.com>
Date: Thu, 12 Jun 2025 14:30:02 +0800
Subject: [PATCH] Merge branch 'master' of http://139.196.74.78:10010/r/drone/drone-web-manage
---
src/views/resource/attach.vue | 49 +++++++++++++++++++++++++++++++++++++++++++++----
1 files changed, 45 insertions(+), 4 deletions(-)
diff --git a/src/views/resource/attach.vue b/src/views/resource/attach.vue
index 8353fe6..3b1ed06 100644
--- a/src/views/resource/attach.vue
+++ b/src/views/resource/attach.vue
@@ -76,8 +76,6 @@
attachBox: false,
selectionList: [],
option: {
- height: 'auto',
- calcHeight: 32,
tip: false,
searchShow: true,
searchMenuSpan: 6,
@@ -165,6 +163,27 @@
{
label: '创建日期',
prop: 'createTime'
+ },
+ {
+ label: '创建日期',
+ prop: 'daterange',
+ type: 'daterange',
+ search:true,
+ searchRange: true,
+ searchSpan:6,
+ format: 'YYYY-MM-DD',
+ valueFormat: 'YYYY-MM-DD',
+ startPlaceholder: '开始时间',
+ endPlaceholder: '结束时间',
+ viewDisplay:false,
+ hide: true,
+ rules: [
+ {
+ required: true,
+ message: '请选择操作时间',
+ trigger: 'blur',
+ },
+ ],
},
],
},
@@ -298,8 +317,21 @@
this.onLoad(this.page, this.query);
},
onLoad(page, params = {}) {
+ const { daterange } = this.query;
+ let values = {
+ ...params,
+ ...this.query,
+ };
+ if (daterange) {
+ values = {
+ ...values,
+ startTime: daterange[0],
+ endTime: daterange[1],
+ };
+ values.daterange = null;
+ }
this.loading = true;
- getList(page.currentPage, page.pageSize, Object.assign(params, this.query)).then(res => {
+ getList(page.currentPage, page.pageSize, values).then(res => {
const data = res.data.data;
this.page.total = data.total;
this.data = data.records;
@@ -311,4 +343,13 @@
};
</script>
-<style></style>
+<style scoped lang="scss">
+ :deep(){
+ .avue-crud__body{
+ .el-form{
+ height: 745px;
+ overflow: auto;
+ }
+ }
+ }
+</style>
--
Gitblit v1.9.3