From b671ad36e53e3b116fe44e66e67cb044e7555f78 Mon Sep 17 00:00:00 2001
From: 田源 <lastanimals@163.com>
Date: 星期三, 20 九月 2023 17:04:20 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
Source/UBCS-WEB/src/views/docking/loge.vue | 10 ++++++----
1 files changed, 6 insertions(+), 4 deletions(-)
diff --git a/Source/UBCS-WEB/src/views/docking/loge.vue b/Source/UBCS-WEB/src/views/docking/loge.vue
index 2de73b5..91a235b 100644
--- a/Source/UBCS-WEB/src/views/docking/loge.vue
+++ b/Source/UBCS-WEB/src/views/docking/loge.vue
@@ -23,7 +23,7 @@
</template>
<script>
-import {getList} from "@/api/docking/loge";
+import {getLogoList} from "@/api/docking/loge";
import {validatenull} from "@/util/validate";
import {mapGetters} from "vuex";
@@ -219,8 +219,10 @@
},
methods: {
dockingGetList(val){
- console.log(val,'val')
- this.data=val;
+ this.data=val.records;
+ this.page.pageSize=val.size;
+ this.page.currentPage=val.current;
+ this.page.total=val.total;
},
async cellDbClick(row, column, cell, event) {
for (const key in row) {
@@ -269,7 +271,7 @@
query['conditionMap["' + key + '"]'] = this.query[key];
}
}
- getList(page.currentPage, page.pageSize, Object.assign(params,this.params, query,this.query)).then(res => {
+ getLogoList(page.currentPage, page.pageSize, Object.assign(params,this.params, query,this.query)).then(res => {
const data = res.data.data;
this.page.total = data.total;
this.data = data.records;
--
Gitblit v1.9.3