Merge remote-tracking branch 'origin/main'

This commit is contained in:
hekaiyu 2025-05-11 14:50:42 +08:00
commit 83bf619c4e
2 changed files with 4 additions and 5 deletions

View File

@ -118,7 +118,7 @@ export default {
created() { created() {
this.getselect() this.getselect()
const start = moment() const start = moment()
.subtract(365, 'days') .subtract(1, 'days')
.set({ hour: 0, minute: 0, second: 0 }); .set({ hour: 0, minute: 0, second: 0 });
const end = moment() const end = moment()
.set({ hour: 23, minute: 59, second: 59 }); .set({ hour: 23, minute: 59, second: 59 });
@ -192,15 +192,14 @@ export default {
this.tableParams.startTime = null this.tableParams.startTime = null
this.tableParams.endTime = null this.tableParams.endTime = null
this.tableParams.pageNum = 1 this.tableParams.pageNum = 1
this.getTableDataList()
} else { } else {
this.tableParams.startTime = moment(date[0]).format(this.dateFormat); this.tableParams.startTime = moment(date[0]).format(this.dateFormat);
this.tableParams.endTime = moment(date[1]).format(this.dateFormat); this.tableParams.endTime = moment(date[1]).format(this.dateFormat);
this.tableParams.pageNum = 1 this.tableParams.pageNum = 1
this.getTableDataList()
} }
}, },
getTableDataList() { getTableDataList() {
console.log(this.tableParams)
tableDataList(this.tableParams).then(res => { tableDataList(this.tableParams).then(res => {
if (res.code == 200) { if (res.code == 200) {
this.columns = [] this.columns = []

View File

@ -3,8 +3,8 @@
<a-col :md="24" :sm="1" > <a-col :md="24" :sm="1" >
<div class="table-page-search-wrapper"style="background: #e6e9f1;padding:10px;"> <div class="table-page-search-wrapper"style="background: #e6e9f1;padding:10px;">
<a-select placeholder="选择数据类型" option-filter-prop="children" v-model="datatypequeryParam.schemaMass" @change="getTables" style="width: 40%;"> <a-select placeholder="选择数据类型" option-filter-prop="children" v-model="datatypequeryParam.schemaMass" @change="getTables" style="width: 40%;">
<a-select-option v-for="d in dataTypedataSources" :key="d.cnName"> <a-select-option v-for="d in dataTypedataSources" :key="d.enName">
{{ d.cnName }} {{ d.enName }} {{ d.cnName }}
</a-select-option> </a-select-option>
</a-select> </a-select>
</div> </div>