Skip to content

Commit 539c039

Browse files
xingyuvxingyuv
committed
refactor: 时间区间查询传入数组
1 parent 66f009a commit 539c039

File tree

33 files changed

+217
-390
lines changed

33 files changed

+217
-390
lines changed

‎src/views/bpm/group/index.vue

Lines changed: 5 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -13,9 +13,9 @@
1313
:key="dict.value" :label="dict.label" :value="dict.value"/>
1414
</el-select>
1515
</el-form-item>
16-
<el-form-item label="创建时间">
17-
<el-date-picker v-model="dateRangeCreateTime" style="width: 240px" value-format="yyyy-MM-dd"
18-
type="daterange" range-separator="-" start-placeholder="开始日期" end-placeholder="结束日期" />
16+
<el-form-item label="创建时间" prop="createTime">
17+
<el-date-picker v-model="queryParams.createTime" style="width: 240px" value-format="yyyy-MM-dd HH:mm:ss" type="daterange"
18+
range-separator="-" start-placeholder="开始日期" end-placeholder="结束日期" :default-time="['00:00:00', '23:59:59']" />
1919
</el-form-item>
2020
<el-form-item>
2121
<el-button type="primary" icon="el-icon-search" @click="handleQuery">搜索</el-button>
@@ -121,14 +121,14 @@ export default {
121121
title: "",
122122
// 是否显示弹出层
123123
open: false,
124-
dateRangeCreateTime: [],
125124
// 查询参数
126125
queryParams: {
127126
pageNo: 1,
128127
pageSize: 10,
129128
name: null,
130129
status: null,
131130
tenantId: null,
131+
createTime: []
132132
},
133133
// 表单参数
134134
form: {},
@@ -152,11 +152,8 @@ export default {
152152
/** 查询列表 */
153153
getList() {
154154
this.loading = true;
155-
// 处理查询参数
156-
let params = {...this.queryParams};
157-
this.addBeginAndEndTime(params, this.dateRangeCreateTime, 'createTime');
158155
// 执行查询
159-
getUserGroupPage(params).then(response => {
156+
getUserGroupPage(this.queryParams).then(response => {
160157
this.list = response.data.list;
161158
this.total = response.data.total;
162159
this.loading = false;
@@ -185,7 +182,6 @@ export default {
185182
},
186183
/** 重置按钮操作 */
187184
resetQuery() {
188-
this.dateRangeCreateTime = [];
189185
this.resetForm("queryForm");
190186
this.handleQuery();
191187
},

‎src/views/bpm/oa/leave/index.vue

Lines changed: 5 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -9,9 +9,9 @@
99
<el-option v-for="dict in leaveTypeDictData" :key="dict.value" :label="dict.label" :value="dict.value" />
1010
</el-select>
1111
</el-form-item>
12-
<el-form-item label="申请时间">
13-
<el-date-picker v-model="dateRangeCreateTime" style="width: 240px" value-format="yyyy-MM-dd"
14-
type="daterange" range-separator="-" start-placeholder="开始日期" end-placeholder="结束日期" />
12+
<el-form-item label="申请时间" prop="createTime">
13+
<el-date-picker v-model="queryParams.createTime" style="width: 240px" value-format="yyyy-MM-dd HH:mm:ss" type="daterange"
14+
range-separator="-" start-placeholder="开始日期" end-placeholder="结束日期" :default-time="['00:00:00', '23:59:59']" />
1515
</el-form-item>
1616
<el-form-item label="结果" prop="result">
1717
<el-select v-model="queryParams.result" placeholder="请选择流结果" clearable>
@@ -102,15 +102,14 @@ export default {
102102
total: 0,
103103
// 请假申请列表
104104
list: [],
105-
//审批进度弹出层
106-
dateRangeCreateTime: [],
107105
// 查询参数
108106
queryParams: {
109107
pageNo: 1,
110108
pageSize: 10,
111109
result: null,
112110
type: null,
113111
reason: null,
112+
createTime: []
114113
},
115114
116115
leaveTypeDictData: getDictDatas(DICT_TYPE.BPM_OA_LEAVE_TYPE),
@@ -124,11 +123,8 @@ export default {
124123
/** 查询列表 */
125124
getList() {
126125
this.loading = true;
127-
// 处理查询参数
128-
let params = {...this.queryParams};
129-
this.addBeginAndEndTime(params, this.dateRangeCreateTime, 'createTime');
130126
// 执行查询
131-
getLeavePage(params).then(response => {
127+
getLeavePage(this.queryParams).then(response => {
132128
this.list = response.data.list;
133129
this.total = response.data.total;
134130
this.loading = false;
@@ -141,7 +137,6 @@ export default {
141137
},
142138
/** 重置按钮操作 */
143139
resetQuery() {
144-
this.dateRangeCreateTime = [];
145140
this.resetForm("queryForm");
146141
this.handleQuery();
147142
},

‎src/views/bpm/processInstance/index.vue

Lines changed: 5 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -16,9 +16,9 @@
1616
:key="dict.value" :label="dict.label" :value="dict.value"/>
1717
</el-select>
1818
</el-form-item>
19-
<el-form-item label="提交时间">
20-
<el-date-picker v-model="dateRangeCreateTime" style="width: 240px" value-format="yyyy-MM-dd"
21-
type="daterange" range-separator="-" start-placeholder="开始日期" end-placeholder="结束日期" />
19+
<el-form-item label="提交时间" prop="createTime">
20+
<el-date-picker v-model="queryParams.createTime" style="width: 240px" value-format="yyyy-MM-dd HH:mm:ss" type="daterange"
21+
range-separator="-" start-placeholder="开始日期" end-placeholder="结束日期" :default-time="['00:00:00', '23:59:59']" />
2222
</el-form-item>
2323
<el-form-item label="状态" prop="status">
2424
<el-select v-model="queryParams.status" placeholder="请选择状态" clearable>
@@ -116,8 +116,6 @@ export default {
116116
total: 0,
117117
// 工作流的流程实例的拓展列表
118118
list: [],
119-
// 是否显示弹出层
120-
dateRangeCreateTime: [],
121119
// 查询参数
122120
queryParams: {
123121
pageNo: 1,
@@ -127,6 +125,7 @@ export default {
127125
category: null,
128126
status: null,
129127
result: null,
128+
createTime: []
130129
}
131130
};
132131
},
@@ -137,11 +136,8 @@ export default {
137136
/** 查询列表 */
138137
getList() {
139138
this.loading = true;
140-
// 处理查询参数
141-
let params = {...this.queryParams};
142-
this.addBeginAndEndTime(params, this.dateRangeCreateTime, 'createTime');
143139
// 执行查询
144-
getMyProcessInstancePage(params).then(response => {
140+
getMyProcessInstancePage(this.queryParams).then(response => {
145141
this.list = response.data.list;
146142
this.total = response.data.total;
147143
this.loading = false;
@@ -154,7 +150,6 @@ export default {
154150
},
155151
/** 重置按钮操作 */
156152
resetQuery() {
157-
this.dateRangeCreateTime = [];
158153
this.resetForm("queryForm");
159154
this.handleQuery();
160155
},

‎src/views/bpm/task/done.vue

Lines changed: 5 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -7,9 +7,9 @@
77
<el-form-item label="流程名" prop="name">
88
<el-input v-model="queryParams.name" placeholder="请输入流程名" clearable @keyup.enter.native="handleQuery"/>
99
</el-form-item>
10-
<el-form-item label="创建时间">
11-
<el-date-picker v-model="dateRangeCreateTime" style="width: 240px" value-format="yyyy-MM-dd"
12-
type="daterange" range-separator="-" start-placeholder="开始日期" end-placeholder="结束日期" />
10+
<el-form-item label="创建时间" prop="createTime">
11+
<el-date-picker v-model="queryParams.createTime" style="width: 240px" value-format="yyyy-MM-dd HH:mm:ss" type="daterange"
12+
range-separator="-" start-placeholder="开始日期" end-placeholder="结束日期" :default-time="['00:00:00', '23:59:59']" />
1313
</el-form-item>
1414
<el-form-item>
1515
<el-button type="primary" icon="el-icon-search" @click="handleQuery">搜索</el-button>
@@ -77,11 +77,11 @@ export default {
7777
// 已办任务列表
7878
list: [],
7979
// 查询参数
80-
dateRangeCreateTime: [],
8180
queryParams: {
8281
pageNo: 1,
8382
pageSize: 10,
8483
name: null,
84+
createTime: []
8585
},
8686
};
8787
},
@@ -92,10 +92,7 @@ export default {
9292
/** 查询列表 */
9393
getList() {
9494
this.loading = true;
95-
// 处理查询参数
96-
let params = {...this.queryParams};
97-
this.addBeginAndEndTime(params, this.dateRangeCreateTime, 'createTime');
98-
getDoneTaskPage(params).then(response => {
95+
getDoneTaskPage(this.queryParams).then(response => {
9996
this.list = response.data.list;
10097
this.total = response.data.total;
10198
this.loading = false;
@@ -108,7 +105,6 @@ export default {
108105
},
109106
/** 重置按钮操作 */
110107
resetQuery() {
111-
this.dateRangeCreateTime = [];
112108
this.resetForm("queryForm");
113109
this.handleQuery();
114110
},

‎src/views/bpm/task/todo.vue

Lines changed: 5 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -7,9 +7,9 @@
77
<el-form-item label="流程名" prop="name">
88
<el-input v-model="queryParams.name" placeholder="请输入流程名" clearable @keyup.enter.native="handleQuery"/>
99
</el-form-item>
10-
<el-form-item label="创建时间">
11-
<el-date-picker v-model="dateRangeCreateTime" style="width: 240px" value-format="yyyy-MM-dd"
12-
type="daterange" range-separator="-" start-placeholder="开始日期" end-placeholder="结束日期" />
10+
<el-form-item label="创建时间" prop="createTime">
11+
<el-date-picker v-model="queryParams.createTime" style="width: 240px" value-format="yyyy-MM-dd HH:mm:ss" type="daterange"
12+
range-separator="-" start-placeholder="开始日期" end-placeholder="结束日期" :default-time="['00:00:00', '23:59:59']" />
1313
</el-form-item>
1414
<el-form-item>
1515
<el-button type="primary" icon="el-icon-search" @click="handleQuery">搜索</el-button>
@@ -67,11 +67,11 @@ export default {
6767
// 待办任务列表
6868
list: [],
6969
// 查询参数
70-
dateRangeCreateTime: [],
7170
queryParams: {
7271
pageNo: 1,
7372
pageSize: 10,
7473
name: null,
74+
createTime: []
7575
},
7676
};
7777
},
@@ -83,9 +83,7 @@ export default {
8383
getList() {
8484
this.loading = true;
8585
// 处理查询参数
86-
let params = {...this.queryParams};
87-
this.addBeginAndEndTime(params, this.dateRangeCreateTime, 'createTime');
88-
getTodoTaskPage(params).then(response => {
86+
getTodoTaskPage(this.queryParams).then(response => {
8987
this.list = response.data.list;
9088
this.total = response.data.total;
9189
this.loading = false;
@@ -98,7 +96,6 @@ export default {
9896
},
9997
/** 重置按钮操作 */
10098
resetQuery() {
101-
this.dateRangeCreateTime = [];
10299
this.resetForm("queryForm");
103100
this.handleQuery();
104101
},

‎src/views/infra/apiAccessLog/index.vue

Lines changed: 5 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -18,9 +18,9 @@
1818
<el-form-item label="请求地址" prop="requestUrl">
1919
<el-input v-model="queryParams.requestUrl" placeholder="请输入请求地址" clearable @keyup.enter.native="handleQuery"/>
2020
</el-form-item>
21-
<el-form-item label="请求时间">
22-
<el-date-picker v-model="dateRangeBeginTime" style="width: 240px" value-format="yyyy-MM-dd"
23-
type="daterange" range-separator="-" start-placeholder="开始日期" end-placeholder="结束日期" />
21+
<el-form-item label="请求时间" prop="beginTime">
22+
<el-date-picker v-model="queryParams.beginTime" style="width: 240px" value-format="yyyy-MM-dd HH:mm:ss" type="daterange"
23+
range-separator="-" start-placeholder="开始日期" end-placeholder="结束日期" :default-time="['00:00:00', '23:59:59']" />
2424
</el-form-item>
2525
<el-form-item label="执行时长" prop="duration">
2626
<el-input v-model="queryParams.duration" placeholder="请输入执行时长" clearable @keyup.enter.native="handleQuery"/>
@@ -135,7 +135,6 @@ export default {
135135
title: "",
136136
// 是否显示弹出层
137137
open: false,
138-
dateRangeBeginTime: [],
139138
// 查询参数
140139
queryParams: {
141140
pageNo: 1,
@@ -146,6 +145,7 @@ export default {
146145
requestUrl: null,
147146
duration: null,
148147
resultCode: null,
148+
beginTime: []
149149
},
150150
// 表单参数
151151
form: {},
@@ -158,11 +158,8 @@ export default {
158158
/** 查询列表 */
159159
getList() {
160160
this.loading = true;
161-
// 处理查询参数
162-
let params = {...this.queryParams};
163-
this.addBeginAndEndTime(params, this.dateRangeBeginTime, 'beginTime');
164161
// 执行查询
165-
getApiAccessLogPage(params).then(response => {
162+
getApiAccessLogPage(this.queryParams).then(response => {
166163
this.list = response.data.list;
167164
this.total = response.data.total;
168165
this.loading = false;
@@ -185,7 +182,6 @@ export default {
185182
},
186183
/** 重置按钮操作 */
187184
resetQuery() {
188-
this.dateRangeBeginTime = [];
189185
this.resetForm("queryForm");
190186
this.handleQuery();
191187
},
@@ -200,7 +196,6 @@ export default {
200196
let params = {...this.queryParams};
201197
params.pageNo = undefined;
202198
params.pageSize = undefined;
203-
this.addBeginAndEndTime(params, this.dateRangeBeginTime, 'beginTime');
204199
// 执行导出
205200
this.$modal.confirm('是否确认导出所有API 访问日志数据项?').then(() => {
206201
this.exportLoading = true;

‎src/views/infra/apiErrorLog/index.vue

Lines changed: 5 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -18,9 +18,9 @@
1818
<el-form-item label="请求地址" prop="requestUrl">
1919
<el-input v-model="queryParams.requestUrl" placeholder="请输入请求地址" clearable @keyup.enter.native="handleQuery"/>
2020
</el-form-item>
21-
<el-form-item label="异常时间">
22-
<el-date-picker v-model="dateRangeExceptionTime" style="width: 240px" value-format="yyyy-MM-dd"
23-
type="daterange" range-separator="-" start-placeholder="开始日期" end-placeholder="结束日期" />
21+
<el-form-item label="异常时间" prop="exceptionTime">
22+
<el-date-picker v-model="queryParams.exceptionTime" style="width: 240px" value-format="yyyy-MM-dd HH:mm:ss" type="daterange"
23+
range-separator="-" start-placeholder="开始日期" end-placeholder="结束日期" :default-time="['00:00:00', '23:59:59']" />
2424
</el-form-item>
2525
<el-form-item label="处理状态" prop="processStatus">
2626
<el-select v-model="queryParams.processStatus" placeholder="请选择处理状态" clearable>
@@ -142,7 +142,6 @@ export default {
142142
title: "",
143143
// 是否显示弹出层
144144
open: false,
145-
dateRangeExceptionTime: [],
146145
// 查询参数
147146
queryParams: {
148147
pageNo: 1,
@@ -152,6 +151,7 @@ export default {
152151
applicationName: null,
153152
requestUrl: null,
154153
processStatus: null,
154+
exceptionTime: []
155155
},
156156
// 表单参数
157157
form: {},
@@ -166,11 +166,8 @@ export default {
166166
/** 查询列表 */
167167
getList() {
168168
this.loading = true;
169-
// 处理查询参数
170-
let params = {...this.queryParams};
171-
this.addBeginAndEndTime(params, this.dateRangeExceptionTime, 'exceptionTime');
172169
// 执行查询
173-
getApiErrorLogPage(params).then(response => {
170+
getApiErrorLogPage(this.queryParams).then(response => {
174171
this.list = response.data.list;
175172
this.total = response.data.total;
176173
this.loading = false;
@@ -193,7 +190,6 @@ export default {
193190
},
194191
/** 重置按钮操作 */
195192
resetQuery() {
196-
this.dateRangeExceptionTime = [];
197193
this.resetForm("queryForm");
198194
this.handleQuery();
199195
},
@@ -218,7 +214,6 @@ export default {
218214
let params = {...this.queryParams};
219215
params.pageNo = undefined;
220216
params.pageSize = undefined;
221-
this.addBeginAndEndTime(params, this.dateRangeExceptionTime, 'exceptionTime');
222217
// 执行导出
223218
this.$modal.confirm('是否确认导出所有API 错误日志数据项?').then(() => {
224219
this.exportLoading = true;

0 commit comments

Comments
 (0)