From 324936076c35e784dffcf6ecb1c72b49158057a0 Mon Sep 17 00:00:00 2001
From: YM <479443481@qq.com>
Date: 星期六, 11 五月 2024 21:21:49 +0800
Subject: [PATCH] Merge branch 'master' of http://182.92.203.7:2001/r/TCM_CharacterLibrary
---
src/pages/knowledgeBase/knowledgeBase.vue | 40 ++++++++++++++++++++++++++--------------
1 files changed, 26 insertions(+), 14 deletions(-)
diff --git a/src/pages/knowledgeBase/knowledgeBase.vue b/src/pages/knowledgeBase/knowledgeBase.vue
index 227ad41..99525f7 100644
--- a/src/pages/knowledgeBase/knowledgeBase.vue
+++ b/src/pages/knowledgeBase/knowledgeBase.vue
@@ -375,6 +375,14 @@
dataTable: [],
option: {},
keywords: "",
+ submitData: {
+ name: "",
+ alias: "",
+ nativePlace: "",
+ tagId: "",
+ official: "",
+ genderType: "",
+ },
};
},
onLoad(options) {
@@ -402,24 +410,27 @@
// 涓嬭浇鎸夐挳
async exportClick() {
const dataList = this.tableData;
+ console.log(this.keywords, "keywords");
let Obj = {
- keywords: "", //鎼滅储妗嗘绱�
- name: "", //濮撳悕
- alias: "", //鍒悕
- nativePlace: "", //鏈哄叧
- tagId: null, //鑱屼笟id
- official: null, //鑱屽畼
- genderType: null, //鎬у埆
- dynasty: null, //鏈濅唬id
- dynastyId: null, //鏈濅唬id
- institution: null, //鏈烘瀯
+ keywords: '妤�', //鎼滅储妗嗘绱�
+ // keywords: this.keywords, //鎼滅储妗嗘绱�
+ name: this.submitData.name, //濮撳悕
+ alias: this.submitData.alias, //鍒悕
+ nativePlace: this.submitData.nativePlace, //鏈哄叧
+ tagId: this.profession.id !== 0 ? Number(this.profession.id) : null, //鑱屼笟id
+ official: this.submitData.official, //鑱屽畼
+ genderType:
+ this.submitData.genderType !== "" ? this.submitData.genderType : null, //鎬у埆
+ dynasty: this.dynasty.id !== "" ? Number(this.dynasty.id) : null, //鏈濅唬id
+ institution: "", //鏈烘瀯
bookId: null, //鏉ユ簮id
page: 1,
- pageSize: 9999,
+ pageSize: 1,
};
+ console.log(Obj, "Obj");
// // 鎼滅储
- await getPersonList(Obj).then((res) => {
- console.log(res);
+ await getPDownload(Obj).then((res) => {
+ console.log(res, "exportClick");
// if (res.success) {
// console.log(res, "鎼滅储鎺ュ彛");
// this.tableData = res.list;
@@ -597,7 +608,7 @@
this.dynasty.index = currentDynasty.dynastyId;
this.dynasty.id = currentDynasty.dynastyId;
}
-
+ this.submitData = val;
this.CurrentPage = 1;
let Obj = {
keywords: "", //鎼滅储妗嗘绱�
@@ -628,6 +639,7 @@
},
// 鍩虹鎼滅储
async onSearch(val) {
+ this.keywords = val.text;
let Obj = {
keywords: val.text, //鎼滅储妗嗘绱�
name: "", //濮撳悕
--
Gitblit v1.9.1