From 5773fa29e070fe3d8a60be63c14e871e1138dfc9 Mon Sep 17 00:00:00 2001
From: admin <15939171744@163.com>
Date: 星期四, 21 十一月 2024 13:02:21 +0800
Subject: [PATCH] -
---
billion-ui/src/views/main/da/paramCollection/index.vue | 29 +++++++++++++++++++++--------
billion-main/src/main/java/com/billion/main/da/domain/DaParamCollection.java | 5 +++++
2 files changed, 26 insertions(+), 8 deletions(-)
diff --git a/billion-main/src/main/java/com/billion/main/da/domain/DaParamCollection.java b/billion-main/src/main/java/com/billion/main/da/domain/DaParamCollection.java
index bffb776..3b88c1b 100644
--- a/billion-main/src/main/java/com/billion/main/da/domain/DaParamCollection.java
+++ b/billion-main/src/main/java/com/billion/main/da/domain/DaParamCollection.java
@@ -1,6 +1,8 @@
package com.billion.main.da.domain;
import java.util.Date;
+
+import com.baomidou.mybatisplus.annotation.TableField;
import com.fasterxml.jackson.annotation.JsonFormat;
import lombok.Data;
import org.apache.commons.lang3.builder.ToStringBuilder;
@@ -47,5 +49,8 @@
@Excel(name = "閲囬泦鏃堕棿", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
private Date collectTime;
+ @TableField(exist = false)
+ private String[] timeQuery;
+
}
diff --git a/billion-ui/src/views/main/da/paramCollection/index.vue b/billion-ui/src/views/main/da/paramCollection/index.vue
index 90eb342..4b78660 100644
--- a/billion-ui/src/views/main/da/paramCollection/index.vue
+++ b/billion-ui/src/views/main/da/paramCollection/index.vue
@@ -9,6 +9,16 @@
@keyup.enter.native="handleQuery"
/>
</el-form-item>
+ <el-form-item label-width="120" label="閲囬泦鏃堕棿" prop="timeQuery">
+ <el-date-picker
+ v-model="queryParams.timeQuery"
+ type="datetimerange"
+ range-separator="鑷�"
+ value-format="yyyy-MM-dd HH:mm:ss"
+ start-placeholder="寮�濮嬫棩鏈�"
+ end-placeholder="缁撴潫鏃ユ湡">
+ </el-date-picker>
+ </el-form-item>
<el-form-item style="float: right">
<el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">鎼滅储</el-button>
<el-button icon="el-icon-refresh" size="mini" @click="resetQuery">閲嶇疆</el-button>
@@ -40,14 +50,14 @@
@keyup.enter.native="handleQuery"
/>
</el-form-item>
- <el-form-item label="閲囬泦鏃堕棿" prop="collectTime">
- <el-date-picker
- v-model="queryParams.collectTime"
- type="datetime"
- placeholder="璇烽�夋嫨閲囬泦鏃堕棿"
- value-format="yyyy-MM-dd HH:mm:ss"
- />
- </el-form-item>
+<!-- <el-form-item label="閲囬泦鏃堕棿" prop="collectTime">-->
+<!-- <el-date-picker-->
+<!-- v-model="queryParams.collectTime"-->
+<!-- type="datetime"-->
+<!-- placeholder="璇烽�夋嫨閲囬泦鏃堕棿"-->
+<!-- value-format="yyyy-MM-dd HH:mm:ss"-->
+<!-- />-->
+<!-- </el-form-item>-->
<!-- 鍙互缁х画娣诲姞鍏朵粬楂樼骇鏌ヨ鏉′欢 -->
<el-row>
<el-col :span="24" style="text-align: right;">
@@ -176,6 +186,7 @@
name: "ParamCollection",
data() {
return {
+ value1: "",
advancedSearchVisible: false,
// 閬僵灞�
loading: true,
@@ -203,6 +214,7 @@
locationCode: null,
paramCode: null,
paramName: null,
+ timeQuery: []
},
// 琛ㄥ崟鍙傛暟
form: {},
@@ -266,6 +278,7 @@
},
/** 鎼滅储鎸夐挳鎿嶄綔 */
handleQuery() {
+ console.log(this.value1)
this.queryParams.pageNum = 1;
this.getList();
this.advancedSearchVisible = false
--
Gitblit v1.9.3