From 6bcc747d6676884462d9f35c560562847274919d Mon Sep 17 00:00:00 2001
From: YM <479443481@qq.com>
Date: 星期四, 06 六月 2024 15:05:24 +0800
Subject: [PATCH] Merge branch 'master' of http://182.92.203.7:2001/r/TCM_CharacterLibrary
---
src/pages/character/detail.vue | 34 ++++++++++++++++++++++++++++++----
1 files changed, 30 insertions(+), 4 deletions(-)
diff --git a/src/pages/character/detail.vue b/src/pages/character/detail.vue
index 10fcf40..939e81a 100644
--- a/src/pages/character/detail.vue
+++ b/src/pages/character/detail.vue
@@ -290,11 +290,16 @@
<span>鐩稿叧闄勮〃/鍥惧儚</span>
</div>
<view>
- <div class="flex">
+ <div style="overflow: auto">
<el-image
v-for="item in imageList"
:key="item"
- style="width: 2.05rem; height: 2.4rem"
+ style="
+ width: 2.05rem;
+ height: 2.4rem;
+ margin-right: 0.2rem;
+ margin-bottom: 0.1rem;
+ "
:src="item"
fit="fill"
></el-image>
@@ -318,7 +323,7 @@
>
<span>鐜颁唬鐮旂┒</span>
</div>
- <ul class="font-family" style="font-size: 0.13rem; line-height: 2">
+ <ul class="fileul" style="font-size: 0.13rem; line-height: 2">
<li
style="cursor: pointer"
v-for="(item, index) in personResearchList"
@@ -401,6 +406,7 @@
import {
getFuzzySearch,
getPersonInfo,
+ getRelationTypeTreeList,
getWebBasic,
getIntroduction,
getSource,
@@ -697,7 +703,11 @@
this.biogData = res.list.map((item) => {
return {
content: item.content1,
- bookName: "銆�" + item.bookName + "銆� " + "P " + item.pageNo // 杩欓噷鍙湁bookid鏃犳硶鍖归厤鍒颁功鍚�
+ bookName:
+ "銆�" +
+ item.bookName +
+ "銆� " +
+ (item.pageNo ? "P " + item.pageNo : "") // 杩欓噷鍙湁bookid鏃犳硶鍖归厤鍒颁功鍚�
};
});
});
@@ -718,6 +728,10 @@
});
},
getRelationship() {
+ getRelationTypeTreeList().then((res) => {
+ console.log(res, "getRelationTypeTreeList");
+ console.log(res);
+ });
// getPersonRelationAtSchool({
// personId: this.detailId,
// }).then((res) => {
@@ -731,6 +745,13 @@
// });
// }
// });
+ getPersonInfo({
+ id: this.detailId,
+ type: "PERSON_RELATIONS"
+ }).then((res) => {
+ this.tableData4;
+ console.log(res, "PERSON_RELATIONS");
+ });
// 绀句細鍏崇郴
getPersonRelationAtSchool({
personId: this.detailId,
@@ -825,6 +846,7 @@
});
this.markerList = data;
// 鏃剁┖鍦板浘
+ // 杩欓噷鍙彇浜嗙涓�鏉★紝闇�瑕佸叏閮ㄦ暟鎹�
this.initMap(data[0]);
}
@@ -1500,4 +1522,8 @@
opacity: 0;
}
}
+
+.fileul li:hover {
+ color: #597aa5;
+}
</style>
--
Gitblit v1.9.1