From dd1b7a58b7ffc2153b284a7bfb8f568a2e2050f4 Mon Sep 17 00:00:00 2001
From: YM <479443481@qq.com>
Date: 星期四, 06 六月 2024 15:05:21 +0800
Subject: [PATCH] 1

---
 src/pages/character/detail.vue |   64 +++++++++++++++++++++++++------
 1 files changed, 51 insertions(+), 13 deletions(-)

diff --git a/src/pages/character/detail.vue b/src/pages/character/detail.vue
index 70367fd..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,8 +323,9 @@
             >
               <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"
                 :key="index"
                 @click="toLink(item)"
@@ -339,7 +345,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 +406,7 @@
 import {
   getFuzzySearch,
   getPersonInfo,
+  getRelationTypeTreeList,
   getWebBasic,
   getIntroduction,
   getSource,
@@ -401,7 +416,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 +554,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 +581,7 @@
               : fieldItem.content1;
           }
         }
+        console.log(obj);
         this.detailInfo = obj;
         // 鍏崇郴鍥捐氨
         this.getMappingData(this.detailInfo.NAME);
@@ -681,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鏃犳硶鍖归厤鍒颁功鍚�
           };
         });
       });
@@ -702,6 +728,10 @@
       });
     },
     getRelationship() {
+      getRelationTypeTreeList().then((res) => {
+        console.log(res, "getRelationTypeTreeList");
+        console.log(res);
+      });
       // getPersonRelationAtSchool({
       //   personId: this.detailId,
       // }).then((res) => {
@@ -715,6 +745,13 @@
       //     });
       //   }
       // });
+      getPersonInfo({
+        id: this.detailId,
+        type: "PERSON_RELATIONS"
+      }).then((res) => {
+        this.tableData4;
+        console.log(res, "PERSON_RELATIONS");
+      });
       // 绀句細鍏崇郴
       getPersonRelationAtSchool({
         personId: this.detailId,
@@ -773,13 +810,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
@@ -809,6 +846,7 @@
           });
           this.markerList = data;
           // 鏃剁┖鍦板浘
+          // 杩欓噷鍙彇浜嗙涓�鏉★紝闇�瑕佸叏閮ㄦ暟鎹�
           this.initMap(data[0]);
         }
 
@@ -1297,10 +1335,6 @@
   padding: 0;
 }
 
-::v-deep .el-dialog__wrapper {
-  z-index: 999999999999999 !important;
-}
-
 .ProfileNav {
   width: 100%;
   height: 0.7rem;
@@ -1488,4 +1522,8 @@
     opacity: 0;
   }
 }
+
+.fileul li:hover {
+  color: #597aa5;
+}
 </style>

--
Gitblit v1.9.1