Showing
1 changed file
with
17 additions
and
12 deletions
... | ... | @@ -37,11 +37,7 @@ |
37 | 37 | <a-col :span="4"> |
38 | 38 | <a-range-picker |
39 | 39 | style="width: 400px" |
40 | - v-model:value="searchInfo.sendTime" | |
41 | - :show-time="{ | |
42 | - hideDisabledOptions: true, | |
43 | - defaultValue: [moment('00:00:00', 'HH:mm:ss'), moment('11:59:59', 'HH:mm:ss')], | |
44 | - }" | |
40 | + v-model:value="sendTime" | |
45 | 41 | format="YYYY-MM-DD HH:mm:ss" |
46 | 42 | /> |
47 | 43 | </a-col> |
... | ... | @@ -126,17 +122,18 @@ |
126 | 122 | current: 1, |
127 | 123 | pageSize: 10, |
128 | 124 | }); |
125 | + const sendTime = ref([]); | |
126 | + | |
129 | 127 | const searchInfo: any = reactive({ |
130 | 128 | jobName: '', |
131 | 129 | jobGroup: null, |
132 | 130 | status: null, |
133 | - sendTime: [], | |
134 | 131 | }); |
135 | 132 | const handleClearData = async () => { |
136 | 133 | searchInfo.jobName = ''; |
137 | 134 | searchInfo.jobGroup = null; |
138 | 135 | searchInfo.status = null; |
139 | - searchInfo.sendTime = []; | |
136 | + sendTime.value = []; | |
140 | 137 | setProps({ |
141 | 138 | loading: true, |
142 | 139 | }); |
... | ... | @@ -234,7 +231,7 @@ |
234 | 231 | searchInfo.jobName = ''; |
235 | 232 | searchInfo.jobGroup = null; |
236 | 233 | searchInfo.status = null; |
237 | - searchInfo.sendTime = []; | |
234 | + sendTime.value = []; | |
238 | 235 | }); |
239 | 236 | }); |
240 | 237 | const onChange = async (page) => { |
... | ... | @@ -266,16 +263,24 @@ |
266 | 263 | setProps({ |
267 | 264 | loading: true, |
268 | 265 | }); |
269 | - const res: any = await schedueLogPage({ | |
266 | + console.log(sendTime.value); | |
267 | + let startTime = null; | |
268 | + let endTime = null; | |
269 | + if (sendTime.value.length > 0) { | |
270 | + startTime = moment(sendTime.value.at(-2)).valueOf(); | |
271 | + endTime = moment(sendTime.value.at(-1)).valueOf(); | |
272 | + } | |
273 | + const data = { | |
270 | 274 | jobId: getJobId.value, |
271 | 275 | jobName: searchInfo.jobName, |
272 | 276 | jobGroup: searchInfo.jobGroup, |
273 | 277 | status: searchInfo.status, |
274 | 278 | page: pagination.current, |
275 | 279 | pageSize: pagination.pageSize, |
276 | - startTime: moment(searchInfo.sendTime.at(-2)).valueOf(), | |
277 | - endTime: moment(searchInfo.sendTime.at(-1)).valueOf(), | |
278 | - }); | |
280 | + startTime, | |
281 | + endTime, | |
282 | + }; | |
283 | + const res: any = await schedueLogPage(data); | |
279 | 284 | setTableData(res.items); |
280 | 285 | pagination.total = res.total; |
281 | 286 | setProps({ | ... | ... |