From f67d29de422b39a271f4b6679c66e3284df2e5cb Mon Sep 17 00:00:00 2001
From: YM <479443481@qq.com>
Date: 星期六, 11 五月 2024 21:21:20 +0800
Subject: [PATCH] 1

---
 src/pages/character/detail.vue |  132 ++++++++++++++++++++++++-------------------
 1 files changed, 73 insertions(+), 59 deletions(-)

diff --git a/src/pages/character/detail.vue b/src/pages/character/detail.vue
index 6eb5246..9eeb885 100644
--- a/src/pages/character/detail.vue
+++ b/src/pages/character/detail.vue
@@ -304,6 +304,8 @@
 import {
   getFuzzySearch,
   getPersonInfo,
+  getWebBasic,
+  getIntroduction,
   getSource,
   getPersonImages,
   getPersonBiog,
@@ -447,63 +449,75 @@
           }
         }
         console.log(obj);
-        this.tableArr = [
-          {
-            list: [
-              {
-                name: "鍒悕",
-                value: obj.WEAK_NAME || "-"
-              },
-              {
-                name: "瀛�",
-                value: obj.ALIAS || "-"
-              },
-              {
-                name: "鍙�",
-                value: obj.ALIAS || "-"
-              },
-              {
-                name: "鎵�澶勬椂鏈�",
-                value: obj.PERIOD || "-"
-              },
-              {
-                name: "姘戞棌",
-                value: obj.ETHNIC || "-"
-              }
-            ]
-          },
-          {
-            list: [
-              {
-                name: "绫嶈疮",
-                value: obj.NATIVE_PLACE || "-"
-              },
-              {
-                name: "鎬у埆",
-                value: obj.GENDER
-                  ? obj.GENDER == "UNKNOWN"
-                    ? "鏈煡"
-                    : "-"
-                  : "-"
-              },
-              {
-                name: "鑱屽畼",
-                value: obj.MEDICAL_BRANCH || "-"
-              },
-              {
-                name: "娴佹淳",
-                value: obj.MEDICAL_BRANCH || "-"
-              },
-              {
-                name: "瀛︽湳鐗圭偣",
-                value: obj.MEDICAL_EXPERTISE || "-"
-              }
-            ]
-          }
-        ];
         this.detailInfo = obj;
         // 鍏崇郴鍥捐氨
         this.getMappingData(this.detailInfo.NAME);
+      });
+
+      getWebBasic({
+        personId: this.detailId
+      }).then((res) => {
+        console.log(res, "resres");
+        const obj = res.object;
+        getIntroduction(Number(obj.school)).then((sres) => {
+          console.log(sres, "sres");
+          this.tableArr = [
+            {
+              list: [
+                {
+                  name: "鍒悕",
+                  value: obj.alias || "-"
+                },
+                {
+                  name: "瀛�",
+                  value: obj.zi || "-"
+                },
+                {
+                  name: "鍙�",
+                  value: obj.hao || "-"
+                },
+                {
+                  name: "鎵�澶勬椂鏈�",
+                  value: obj.dynastyDesc || "-"
+                },
+                {
+                  name: "姘戞棌",
+                  value: obj.ethnic || "-"
+                }
+              ]
+            },
+            {
+              list: [
+                {
+                  name: "绫嶈疮",
+                  value: obj.native || "-"
+                },
+                {
+                  name: "鎬у埆",
+                  value: obj.gender || "-"
+                },
+                {
+                  name: "鑱屽畼",
+                  value: obj.official || "-"
+                },
+                {
+                  name: "娴佹淳",
+                  value:
+                    sres &&
+                    sres.object &&
+                    sres.object.school_NAME &&
+                    sres.object.school_NAME.length
+                      ? sres.object.school_NAME[0].content
+                      : "-"
+                },
+                {
+                  name: "瀛︽湳鐗圭偣",
+                  value: obj.features || "-"
+                }
+              ]
+            }
+          ];
+        });
       });
       // 娲诲姩骞磋氨
       getPersonInfo({
@@ -611,13 +625,13 @@
       getSpaceTime({
         personId: this.detailId
       }).then((res) => {
-        console.log(res,'getSpaceTime');
-        const data = res.list.map(item=>{
+        console.log(res, "getSpaceTime");
+        const data = res.list.map((item) => {
           return {
             name: item.activityName,
-            value: [item.xcoord,item.ycoord]
-          }
-        })
+            value: [item.xcoord, item.ycoord]
+          };
+        });
         // 鏃剁┖鍦板浘
         loadBMap("1NJdwrI1CfT6lrykVhDkmWgsO6O2bjQK").then(() => {
           this.spaceTime(data);

--
Gitblit v1.9.1