From df18b23b4569828d6be32fb64c80492241e1fc46 Mon Sep 17 00:00:00 2001
From: ludc
Date: 星期一, 16 十月 2023 20:31:43 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
Source/UBCS-WEB/src/views/docking/task.vue | 8 +++++---
1 files changed, 5 insertions(+), 3 deletions(-)
diff --git a/Source/UBCS-WEB/src/views/docking/task.vue b/Source/UBCS-WEB/src/views/docking/task.vue
index 00c0348..4e83ecd 100644
--- a/Source/UBCS-WEB/src/views/docking/task.vue
+++ b/Source/UBCS-WEB/src/views/docking/task.vue
@@ -31,7 +31,7 @@
</template>
<script>
-import {getList,sendData} from "@/api/docking/task";
+import {getTaskList,sendData} from "@/api/docking/task";
import {validatenull} from "@/util/validate";
import {mapGetters} from "vuex";
import {remove} from "@/api/code/codeSynonym";
@@ -120,9 +120,11 @@
option: {
height:'auto',
calcHeight: 0,
+ columnBtn:false,
tip: false,
searchShow: false,
- searchMenuSpan: 6,
+ searchShowBtn:false,
+ // searchMenuSpan: 6,
border: true,
index: true,
viewBtn: true,
@@ -295,7 +297,7 @@
query['conditionMap["' + key + '"]'] = this.query[key];
}
}
- getList(page.currentPage, page.pageSize, Object.assign(params, this.params, query, this.query)).then(res => {
+ getTaskList(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