From ca4f493cd93c40f09cfde5b49bcbd66f822380cf Mon Sep 17 00:00:00 2001
From: YM <479443481@qq.com>
Date: 星期三, 05 六月 2024 19:41:16 +0800
Subject: [PATCH] 1
---
src/pages/character/detail.vue | 42 +++++++++++++++++++++++++++++++++---------
1 files changed, 33 insertions(+), 9 deletions(-)
diff --git a/src/pages/character/detail.vue b/src/pages/character/detail.vue
index 70367fd..2333598 100644
--- a/src/pages/character/detail.vue
+++ b/src/pages/character/detail.vue
@@ -320,6 +320,7 @@
</div>
<ul class="font-family" style="font-size: 0.13rem; line-height: 2">
<li
+ style="cursor: pointer"
v-for="(item, index) in personResearchList"
:key="index"
@click="toLink(item)"
@@ -339,7 +340,15 @@
</div>
<!-- 杩斿洖椤堕儴 -->
- <el-col style="position: absolute; bottom: 1rem; left: 1.2rem">
+ <el-col
+ style="
+ position: absolute;
+ bottom: 1rem;
+ left: 1.2rem;
+ width: 0.6rem;
+ height: 0.6rem;
+ "
+ >
<el-button
style="font-size: 0.3rem"
icon="el-icon-top"
@@ -392,6 +401,7 @@
import {
getFuzzySearch,
getPersonInfo,
+ getRelationTypeTreeList,
getWebBasic,
getIntroduction,
getSource,
@@ -401,7 +411,7 @@
getPersonRelationAtSchool,
getSpaceTime
} from "@/api/index.js";
-import { getImg } from "@/static/tool.js";
+import { getImg, getFile } from "@/static/tool.js";
import L from "leaflet";
import "leaflet.chinatmsproviders";
@@ -539,7 +549,13 @@
});
},
toLink(item) {
- window.open(item.url);
+ console.log(item);
+ if (item.url) {
+ window.open(item.url);
+ }
+ if (item.filePath) {
+ window.open(getFile(item.filePath));
+ }
},
getData() {
// 鍩烘湰淇℃伅
@@ -560,6 +576,7 @@
: fieldItem.content1;
}
}
+ console.log(obj);
this.detailInfo = obj;
// 鍏崇郴鍥捐氨
this.getMappingData(this.detailInfo.NAME);
@@ -702,6 +719,10 @@
});
},
getRelationship() {
+ getRelationTypeTreeList().then(res=>{
+ console.log(res,"getRelationTypeTreeList");
+ console.log(res);
+ })
// getPersonRelationAtSchool({
// personId: this.detailId,
// }).then((res) => {
@@ -715,6 +736,13 @@
// });
// }
// });
+ getPersonInfo({
+ id: this.detailId,
+ type: "PERSON_RELATIONS"
+ }).then((res) => {
+ this.tableData4
+ console.log(res,"PERSON_RELATIONS");
+ });
// 绀句細鍏崇郴
getPersonRelationAtSchool({
personId: this.detailId,
@@ -773,13 +801,13 @@
(node) => node.id === item.identifier2 && node.name === item.name2
);
// 璇佹槑涓嶅瓨鍦�
- if (exists1 !== true) {
+ if (item.name1 && exists1 !== true) {
this.nodes.push({
name: item.name1,
id: item.identifier1
});
}
- if (exists2 !== true) {
+ if (item.name2 && exists2 !== true) {
this.nodes.push({
name: item.name2,
id: item.identifier2
@@ -1295,10 +1323,6 @@
::v-deep .el-dialog__body {
padding: 0;
-}
-
-::v-deep .el-dialog__wrapper {
- z-index: 999999999999999 !important;
}
.ProfileNav {
--
Gitblit v1.9.1