From 90f011d24f2a771f9b63eef8f7047a38acf00fff Mon Sep 17 00:00:00 2001
From: Tcsm <1377977403@qq.com>
Date: 星期二, 25 七月 2023 16:31:08 +0800
Subject: [PATCH] 各模块时间搜索已完善
---
ruoyi-ui/src/views/self/memo.vue | 1 +
ruoyi-ui/src/views/genealogy/index.vue | 2 +-
ruoyi-ui/src/views/device/index.vue | 4 +++-
ruoyi-ui/src/views/economy/index.vue | 4 ++--
ruoyi-ui/src/views/note/index.vue | 2 +-
ruoyi-ui/src/views/secret/index.vue | 19 ++++++++++---------
ruoyi-ui/src/views/healthy/index.vue | 2 +-
7 files changed, 19 insertions(+), 15 deletions(-)
diff --git a/ruoyi-ui/src/views/device/index.vue b/ruoyi-ui/src/views/device/index.vue
index d5e3876..439e44c 100644
--- a/ruoyi-ui/src/views/device/index.vue
+++ b/ruoyi-ui/src/views/device/index.vue
@@ -6,7 +6,7 @@
<el-date-picker
v-model="dateRange"
style="width: 240px;"
- value-format="yyyy-MM-dd HH-MM"
+ value-format="yyyy-MM-dd"
type="daterange"
range-separator="-"
start-placeholder="寮�濮嬫棩鏈�"
@@ -482,6 +482,8 @@
getList() {
this.loading = true;
+ this.queryParams.happenStartTime = this.dateRange.length > 0 && this.dateRange[0]
+ this.queryParams.happenEndTime = this.dateRange.length > 0 && this.dateRange[1]
// console.log(this.queryParams)
// listProperty(this.addDateRange(this.queryParams, this.dateRange)).then(response => {
listEquipment(this.queryParams).then(response => {
diff --git a/ruoyi-ui/src/views/economy/index.vue b/ruoyi-ui/src/views/economy/index.vue
index cfc9b16..7eec652 100644
--- a/ruoyi-ui/src/views/economy/index.vue
+++ b/ruoyi-ui/src/views/economy/index.vue
@@ -6,7 +6,7 @@
<el-date-picker
v-model="dateRange"
style="width: 240px;"
- value-format="yyyy-MM-dd HH-MM"
+ value-format="yyyy-MM-dd"
type="daterange"
range-separator="-"
start-placeholder="寮�濮嬫棩鏈�"
@@ -343,7 +343,7 @@
btn:false,
formDat: {
type: undefined,
- happenTime: undefined,
+ createTime: undefined,
useFor: undefined,
usePeople: undefined,
kind:undefined,
diff --git a/ruoyi-ui/src/views/genealogy/index.vue b/ruoyi-ui/src/views/genealogy/index.vue
index 1238352..12c07ef 100644
--- a/ruoyi-ui/src/views/genealogy/index.vue
+++ b/ruoyi-ui/src/views/genealogy/index.vue
@@ -86,7 +86,7 @@
<!-- line-height: 21px;-->
<!-- ">寮犳皬涓�瑙堣〃</div>-->
-<!-- <el-row :gutter="10" class="mb8">-->
+ <el-row :gutter="10" class="mb8">
<!-- <el-col :span="1.5">-->
<!-- <el-button-->
<!-- type="primary"-->
diff --git a/ruoyi-ui/src/views/healthy/index.vue b/ruoyi-ui/src/views/healthy/index.vue
index 72acc99..18abe47 100644
--- a/ruoyi-ui/src/views/healthy/index.vue
+++ b/ruoyi-ui/src/views/healthy/index.vue
@@ -6,7 +6,7 @@
<el-date-picker
v-model="dateRange"
style="width: 240px;"
- value-format="yyyy-MM-dd HH-MM"
+ value-format="yyyy-MM-dd"
type="daterange"
range-separator="-"
start-placeholder="寮�濮嬫棩鏈�"
diff --git a/ruoyi-ui/src/views/note/index.vue b/ruoyi-ui/src/views/note/index.vue
index 8440696..22230c4 100644
--- a/ruoyi-ui/src/views/note/index.vue
+++ b/ruoyi-ui/src/views/note/index.vue
@@ -52,7 +52,7 @@
<el-date-picker
v-model="dateRange"
style="width: 240px"
- value-format="yyyy-MM-dd HH-MM-SS"
+ value-format="yyyy-MM-dd"
type="daterange"
range-separator="-"
start-placeholder="寮�濮嬫棩鏈�"
diff --git a/ruoyi-ui/src/views/secret/index.vue b/ruoyi-ui/src/views/secret/index.vue
index 21a3850..7654343 100644
--- a/ruoyi-ui/src/views/secret/index.vue
+++ b/ruoyi-ui/src/views/secret/index.vue
@@ -4,9 +4,9 @@
<el-form-item label="鏃堕棿" prop="happenTime">
<el-date-picker
- v-model="queryParams.happenTime"
+ v-model="dateRange"
style="width: 240px;"
- value-format="yyyy-MM-dd HH-MM"
+ value-format="yyyy-MM-dd"
type="daterange"
range-separator="-"
start-placeholder="寮�濮嬫棩鏈�"
@@ -23,9 +23,9 @@
/>
</el-form-item>
- <el-form-item label="璐﹀彿" prop="useFor">
+ <el-form-item label="璐﹀彿" prop="accNo">
<el-input
- v-model="queryParams.useFor"
+ v-model="queryParams.accNo"
placeholder="璇疯緭鍏ヨ处鍙�"
clearable
style="width: 240px"
@@ -102,12 +102,12 @@
<el-table-column type="selection" :reserve-selection="true" width="55" align="center" />
<el-table-column label="搴忓彿" sortable type="index" :index="(queryParams.pageNum-1)*queryParams.pageSize+1" width="120"/>
<el-table-column label="鍙戠敓鏃堕棿" prop="happenTime" sortable width="100" align="center">
- <template slot-scope="scope">{{scope.row.happenTime? scope.row.createTime: '鈥斺�斺�斺��'}}</template>
+ <template slot-scope="scope">{{scope.row.happenTime? scope.row.happenTime: '鈥斺�斺�斺��'}}</template>
</el-table-column>
- <el-table-column label="绫诲瀷" prop="type" sortable width="100" />
+ <el-table-column label="绫诲埆" prop="type" sortable width="100" />
<el-table-column label="璐﹀彿" prop="accNo" sortable width="100" />
<el-table-column label="鏈夋晥鏈�" prop="validityDate" sortable width="100" align="center">
- <template slot-scope="scope">{{scope.row.createTime? scope.row.createTime: '鈥斺�斺�斺��'}}</template>
+ <template slot-scope="scope">{{scope.row.validityDate? scope.row.validityDate: '鈥斺�斺�斺��'}}</template>
</el-table-column>
<el-table-column label="瀵嗙爜" prop="password" sortable width="100" />
<el-table-column label="鏄惁寮�鍚寚绾�" prop="isFinger" sortable width="120" >
@@ -340,7 +340,7 @@
// 鎬绘潯鏁�
total: 0,
// 瀹跺ぇ浜嬭琛ㄦ牸鏁版嵁
- economyList: [],
+ secretList: [],
// 寮瑰嚭灞傛爣棰�
title: "",
// 鏄惁鏄剧ず寮瑰嚭灞�
@@ -367,8 +367,8 @@
happenTime: undefined,
accNo:undefined,
password:undefined,
- validityDate:undefined,
isFinger:undefined,
+ validityDate:undefined,
isFace:undefined,
isPrivate:undefined,
location:undefined,
@@ -386,6 +386,7 @@
type:undefined,
accNo:undefined,
happenTime:undefined,
+ useFor:undefined,
},
// 琛ㄥ崟鍙傛暟
diff --git a/ruoyi-ui/src/views/self/memo.vue b/ruoyi-ui/src/views/self/memo.vue
index fcb4431..ac2c327 100644
--- a/ruoyi-ui/src/views/self/memo.vue
+++ b/ruoyi-ui/src/views/self/memo.vue
@@ -31,6 +31,7 @@
range-separator="-"
start-placeholder="寮�濮嬫棩鏈�"
end-placeholder="缁撴潫鏃ユ湡"
+ @keyup.enter.native="handleQuery"
></el-date-picker>
</el-form-item>
<el-form-item label="浜虹墿" prop="people">
--
Gitblit v1.9.1