From 6adeb6bdc3b8753a23f1451fc5a6cae4ce39a9fe Mon Sep 17 00:00:00 2001
From: YM <479443481@qq.com>
Date: 星期三, 24 七月 2024 18:35:15 +0800
Subject: [PATCH] Merge branch 'master' of http://182.92.203.7:2001/r/TCM_CharacterLibrary
---
src/pages/academicSchools/index.vue | 150 +++++++++++++++++++++++++++++++++++++++++--------
1 files changed, 124 insertions(+), 26 deletions(-)
diff --git a/src/pages/academicSchools/index.vue b/src/pages/academicSchools/index.vue
index d8603ac..8b05a64 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,16 +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>
@@ -234,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,7 +397,8 @@
getPersonTag,
getSocialDistinction,
getDynastyAll,
- getPlaceInfo
+ getAdvancedData,
+ getPlaceInfo,
} from "@/api/index.js";
import * as echarts from "echarts";
export default {
@@ -434,7 +449,11 @@
works: "",
personTags: "",
socialIdentity: "",
- period: ""
+ period: "",
+ page: 1,
+ currentPage: 1,
+ pageSize: 10,
+ total: 0,
},
showPerson: false,
personList: [],
@@ -548,12 +567,6 @@
index: i
};
});
- setTimeout(() => {
- this.multipleTableSelection.forEach((row) => {
- this.$refs.multipleTable.toggleRowSelection(row);
- });
- this.formData.actively = this.multipleTableSelection;
- }, 2000);
} else {
this.gridData = [];
}
@@ -577,14 +590,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 +809,7 @@
}
return arr;
},
+
//鏁扮粍鍘婚噸
deduplicateArray(arr, idKey) {
// 浣跨敤涓�涓緟鍔╁璞℃潵璺熻釜宸茬粡瑙佽繃鐨処D
@@ -1270,6 +1356,7 @@
const div = document.getElementById("customDialog");
div.style.display = "none";
},
+
// 鍩虹鎼滅储
onSearch(val, index) {
console.log(val);
@@ -1286,6 +1373,7 @@
this.searchPerson(val.text);
}
},
+
// 鏍规嵁鍏抽敭瀛楁绱汉鐗�
searchPerson(key) {
academicSearch({
@@ -1318,6 +1406,7 @@
this.showPerson = true;
});
},
+
// 鍏崇郴鍥� 鐐瑰嚮閲岄潰鐨勫厓绱�
spaceTimeArr(id) {
// 鍏崇郴鍥剧殑鏁版嵁
@@ -1325,6 +1414,7 @@
url: "/pages/character/detail?id=" + id
});
},
+
// 鑾峰彇鏈濅唬echarts鐨勬暟鎹�
echartsArr() {
getDataStatistics().then((res) => {
@@ -1338,6 +1428,7 @@
});
});
},
+
// 鐑棬鎼滅储
hotSearch() {
getHotSearch().then((res) => {
@@ -1351,6 +1442,7 @@
});
});
},
+
isAvancedClick() {
this.isAdvancedSearch = !this.isAdvancedSearch;
// this.$nextTick(() => {
@@ -1423,6 +1515,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