From 835f3363757f6b5703c9385a6d60feff5681f93c Mon Sep 17 00:00:00 2001
From: QYF-GitLab1 <1940665526@qq.com>
Date: 星期三, 24 七月 2024 18:32:31 +0800
Subject: [PATCH] 1
---
src/pages/academicSchools/index.vue | 145 ++++++++++++++++++++++++++++++++++++++++-------
src/api/index.js | 8 ++
2 files changed, 130 insertions(+), 23 deletions(-)
diff --git a/src/api/index.js b/src/api/index.js
index 5ae3f05..9f6ac7e 100644
--- a/src/api/index.js
+++ b/src/api/index.js
@@ -302,6 +302,14 @@
});
};
+export const getAdvancedData = (data) => {
+ return req1({
+ url: "/person/advanced/search",
+ method: "post",
+ data: data,
+ });
+};
+
// 鏌ヨ浜虹墿瀛︽湳娴佹淳
export const getSchoolInfo = (id) => {
return req1({
diff --git a/src/pages/academicSchools/index.vue b/src/pages/academicSchools/index.vue
index 85406aa..613b85e 100644
--- a/src/pages/academicSchools/index.vue
+++ b/src/pages/academicSchools/index.vue
@@ -155,25 +155,31 @@
label="搴忓彿"
width="70"
></el-table-column>
- <el-table-column prop="personName" width="120" label="濮撳悕">
+ <el-table-column prop="name" width="120" label="濮撳悕">
<template slot-scope="scope">
<a
style="cursor: pointer; color: #027edc"
- @click="gotoDetail(scope.row.id)"
- >{{ scope.row.personName }}</a
+ @click="
+ () => {
+ currentId = scope.row.id;
+ getData();
+ isAdvancedSearch = false;
+ }
+ "
+ >{{ scope.row.name }}</a
>
</template>
</el-table-column>
- <el-table-column prop="personAlias" label="鍒悕"></el-table-column>
- <el-table-column prop="palce" label="娲诲姩鍦�"></el-table-column>
+ <el-table-column prop="alias" label="鍒悕"></el-table-column>
+ <el-table-column prop="place" label="娲诲姩鍦�"></el-table-column>
<el-table-column
- prop="birthYear"
+ prop="medicalBranch"
label="鍖诲鍒嗙"
width="120"
></el-table-column>
- <el-table-column prop="deathYear" label="浣滃搧"></el-table-column>
+ <el-table-column prop="workName" label="浣滃搧"></el-table-column>
<el-table-column
- prop="nativePlace"
+ prop="personLabel"
width="120"
label="浜虹墿鏍囩"
></el-table-column>
@@ -183,15 +189,24 @@
width="120"
></el-table-column>
<el-table-column
- prop="official"
+ prop="period"
width="120"
label="鏃舵湡"
></el-table-column>
</el-table>
- <div style="text-align: right;padding-top: 20px;">
- <el-button style="width: 120px;background-color: #244a7b; color: #fff"
- >纭</el-button
+ <div class="drawerPage">
+ <el-pagination
+ class="paging flex"
+ background
+ @size-change="handleSizeChange"
+ @current-change="handleCurrentChange"
+ :current-page="formData.currentPage"
+ :page-sizes="[10, 20, 60, 100]"
+ :page-size="formData.pageSize"
+ layout="total, sizes, prev, pager, next, jumper"
+ :total="formData.total"
>
+ </el-pagination>
</div>
</div>
</view>
@@ -233,7 +248,7 @@
style="margin-top: 0.1rem; flex: 1; width: 100%; position: relative"
>
<div
- v-if="!loading && relationships.length == 0"
+ v-if="!loading && links.length == 0"
style="
position: absolute;
top: 30%;
@@ -383,6 +398,7 @@
getPersonTag,
getSocialDistinction,
getDynastyAll,
+ getAdvancedData,
getPlaceInfo,
} from "@/api/index.js";
import * as echarts from "echarts";
@@ -435,6 +451,10 @@
personTags: "",
socialIdentity: "",
period: "",
+ page: 1,
+ currentPage: 1,
+ pageSize: 10,
+ total: 0,
},
showPerson: false,
personList: [],
@@ -548,12 +568,6 @@
index: i,
};
});
- setTimeout(() => {
- this.multipleTableSelection.forEach((row) => {
- this.$refs.multipleTable.toggleRowSelection(row);
- });
- this.formData.actively = this.multipleTableSelection;
- }, 2000);
} else {
this.gridData = [];
}
@@ -577,14 +591,86 @@
name: "",
actively: [],
works: "",
- personTags: "",
- socialIdentity: "",
- period: "",
+ personTags: [],
+ socialIdentity: [],
+ period: [],
+ page: 1,
+ currentPage: 1,
+ pageSize: 10,
+ total: 0,
};
},
searchFun() {
- console.log(this.formData);
+ const palceData = this.formData.actively?.map((item) => {
+ return {
+ ancientName: item.ancientName ?? "",
+ dynastyId: item.dynastyId,
+ currentName: item.currentName,
+ };
+ });
+ let Obj = {
+ keyword: this.formData.name,
+ placeList: [...palceData],
+ literatureName: this.formData.works,
+ personTagIdList: this.formData.personTags,
+ socialDistinctionIdList: this.formData.socialIdentity,
+ dynastyIdList: this.formData.period,
+ page: this.formData.page,
+ pageSize: this.formData.pageSize,
+ };
+ // // 鎼滅储
+ getAdvancedData(Obj).then((res) => {
+ if (res?.success) {
+ this.tableData = res.list.map((item) => {
+ return {
+ id: item.personId,
+ name:
+ item?.NAME?.map((e, i) => {
+ i += 1;
+ return e["content" + i];
+ }).join("銆�") ?? "",
+ alias:
+ item?.ALIAS?.map((e, i) => {
+ i += 1;
+ return e["content" + i];
+ }).join("銆�") ?? "",
+ place:
+ item?.NATIVE_PLACE?.map((e, i) => {
+ i += 1;
+ return e["content" + i];
+ }).join("銆�") ?? "",
+ medicalBranch:
+ item?.MEDICAL_BRANCH?.map((e, i) => {
+ i += 1;
+ return e["content" + i];
+ }).join("銆�") ?? "",
+ socialDistinction:
+ item?.SOCIAL_IDENTITY?.map((e, i) => {
+ i += 1;
+ return e["content" + i];
+ }).join("銆�") ?? "",
+ period:
+ item?.PERIOD?.map((e, i) => {
+ i += 1;
+ return e["content" + i];
+ }).join("銆�") ?? "",
+ workName:
+ item?.REPRESENTATIVE_WORKS?.map((e, i) => {
+ i += 1;
+ return e["content" + i];
+ }).join("銆�") ?? "",
+ personLabel:
+ item?.PERSON_LABEL?.map((e, i) => {
+ i += 1;
+ return e["content" + i];
+ }).join("銆�") ?? "",
+ };
+ });
+ // 鎬绘暟閲�
+ this.formData.total = res.npage.totalCount;
+ }
+ });
},
selectActively() {
@@ -724,6 +810,7 @@
}
return arr;
},
+
//鏁扮粍鍘婚噸
deduplicateArray(arr, idKey) {
// 浣跨敤涓�涓緟鍔╁璞℃潵璺熻釜宸茬粡瑙佽繃鐨処D
@@ -1276,6 +1363,7 @@
const div = document.getElementById("customDialog");
div.style.display = "none";
},
+
// 鍩虹鎼滅储
onSearch(val, index) {
console.log(val);
@@ -1292,6 +1380,7 @@
this.searchPerson(val.text);
}
},
+
// 鏍规嵁鍏抽敭瀛楁绱汉鐗�
searchPerson(key) {
academicSearch({
@@ -1324,6 +1413,7 @@
this.showPerson = true;
});
},
+
// 鍏崇郴鍥� 鐐瑰嚮閲岄潰鐨勫厓绱�
spaceTimeArr(id) {
// 鍏崇郴鍥剧殑鏁版嵁
@@ -1331,6 +1421,7 @@
url: "/pages/character/detail?id=" + id,
});
},
+
// 鑾峰彇鏈濅唬echarts鐨勬暟鎹�
echartsArr() {
getDataStatistics().then((res) => {
@@ -1344,6 +1435,7 @@
});
});
},
+
// 鐑棬鎼滅储
hotSearch() {
getHotSearch().then((res) => {
@@ -1357,6 +1449,7 @@
});
});
},
+
isAvancedClick() {
this.isAdvancedSearch = !this.isAdvancedSearch;
// this.$nextTick(() => {
@@ -1429,6 +1522,12 @@
box-sizing: border-box;
}
+.drawerPage
+ >>> .el-pagination.is-background
+ .el-pager
+ li:not(.disabled).active {
+}
+
.drawerBtn {
display: flex;
justify-content: flex-end;
--
Gitblit v1.9.1