|
|
@@ -28,13 +28,13 @@
|
|
|
</a-form-item>
|
|
|
</a-col>
|
|
|
<a-col :xs="24" :sm="24" :md="12" :lg="8" :xl="8">
|
|
|
- <a-form-item label="时间范围" name="searchKey">
|
|
|
+ <a-form-item label="时间范围" name="time">
|
|
|
<a-range-picker
|
|
|
- v-model:value="searchFormState.searchKey"
|
|
|
+ v-model:value="searchFormState.time"
|
|
|
show-time
|
|
|
format="YYYY-MM-DD HH:mm:ss"
|
|
|
value-format="YYYY-MM-DD HH:mm:ss"
|
|
|
- style="width: 250px"
|
|
|
+ style="width: 350px"
|
|
|
/>
|
|
|
</a-form-item>
|
|
|
</a-col>
|
|
|
@@ -120,13 +120,17 @@
|
|
|
|
|
|
const tableData = ref([]) // 用来存储表格数据
|
|
|
const loadData = (parameter) => {
|
|
|
- if (searchFormState.value.searchKey) {
|
|
|
- searchFormState.value.startTime = searchFormState.value.searchKey[0]
|
|
|
- searchFormState.value.endTime = searchFormState.value.searchKey[1]
|
|
|
- delete searchFormState.value.searchKey
|
|
|
+ parameter = {
|
|
|
+ ...parameter,
|
|
|
+ ...cloneDeep(searchFormState.value)
|
|
|
+ }
|
|
|
+ if (parameter.time) {
|
|
|
+ parameter.startTime = parameter.time[0]
|
|
|
+ parameter.endTime = parameter.time[1]
|
|
|
+ delete parameter.time
|
|
|
}
|
|
|
|
|
|
- return getPage({ ...parameter, ...cloneDeep(searchFormState.value) }).then((res) => {
|
|
|
+ return getPage(parameter).then((res) => {
|
|
|
tableData.value = res.records || []
|
|
|
return res
|
|
|
})
|
like