From 447d6b096de7957ab5777a6e01d190f02eb4fab1 Mon Sep 17 00:00:00 2001
From: ludc
Date: 星期三, 24 四月 2024 17:17:58 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
Source/UBCS-WEB/src/views/docking/data.vue | 7 ++++---
1 files changed, 4 insertions(+), 3 deletions(-)
diff --git a/Source/UBCS-WEB/src/views/docking/data.vue b/Source/UBCS-WEB/src/views/docking/data.vue
index e4abbc5..6c651c6 100644
--- a/Source/UBCS-WEB/src/views/docking/data.vue
+++ b/Source/UBCS-WEB/src/views/docking/data.vue
@@ -23,7 +23,7 @@
</template>
<script>
-import {getList} from "@/api/docking/data";
+import {getDataList} from "@/api/docking/data";
import {validatenull} from "@/util/validate";
import {mapGetters} from "vuex";
import website from "@/config/website";
@@ -87,9 +87,10 @@
data:[],
option: {
height:'auto',
- calcHeight: 0,
+ columnBtn:false,
tip: false,
searchShow: false,
+ searchShowBtn:false,
searchMenuSpan: 6,
border: true,
index: true,
@@ -242,7 +243,7 @@
query['conditionMap["' + key + '"]'] = this.query[key];
}
}
- getList(page.currentPage, page.pageSize, Object.assign(params,this.params, query,this.query)).then(res => {
+ getDataList(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