-

admin

2024-11-21 5773fa29e070fe3d8a60be63c14e871e1138dfc9

-

 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;


}

 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