From c4b8209d92daa8c6e8ec20bdd56fecf4a95d0990 Mon Sep 17 00:00:00 2001
From: YM <479443481@qq.com>
Date: 星期三, 05 六月 2024 16:41:33 +0800
Subject: [PATCH] 1

---
 src/pages/characterMap/characterMap.vue |   42 ++++++++++++++++++++++--------------------
 1 files changed, 22 insertions(+), 20 deletions(-)

diff --git a/src/pages/characterMap/characterMap.vue b/src/pages/characterMap/characterMap.vue
index df06f02..5abd983 100644
--- a/src/pages/characterMap/characterMap.vue
+++ b/src/pages/characterMap/characterMap.vue
@@ -12,7 +12,7 @@
         <view
           class="font-family"
           style="font-size: 0.26rem; padding-top: 0.16rem; font-weight: bold"
-          >{{ activityInfo.participants }}</view
+          >{{ basicInfo.name }}</view
         >
         <ul
           style="
@@ -23,15 +23,11 @@
             line-height: 0.28rem;
           "
         >
-          <li>鍑虹敓浜巤{ basicInfo.nativePlace }}</li>
+          <li>鍑虹敓浜巤{ basicInfo.nativePlace || "-" }}</li>
           <li>
-            {{
-              basicInfo.birthYear +
-              basicInfo.nativePlace +
-              "(浠�" +
-              basicInfo.nowPlace +
-              ")"
-            }}
+            <span v-if="basicInfo.birthYear">{{basicInfo.birthYear}}</span>
+            <span v-if="basicInfo.nativePlace">{{basicInfo.nativePlace}}</span>
+            <span v-if="basicInfo.nowPlace">锛堜粖{{basicInfo.nowPlace}}锛�</span>
           </li>
         </ul>
         <ul
@@ -42,18 +38,18 @@
             line-height: 0.28rem;
           "
         >
-          <li>娲诲姩鍚嶇О锛歿{ activityInfo.activityName }}</li>
-          <li>娲诲姩鍦扮偣锛歿{ activityInfo.activityAddr }}</li>
-          <li>娲诲姩鍖洪棿锛歿{ activityInfo.time }}</li>
-          <li>娲诲姩鎻忚堪锛歿{ activityInfo.desc }}</li>
-          <li>鍙備笌浜哄憳锛歿{ activityInfo.participants }}</li>
+          <li>娲诲姩鍚嶇О锛歿{ activityInfo.activityName || "-" }}</li>
+          <li>娲诲姩鍦扮偣锛歿{ activityInfo.activityAddr || "-" }}</li>
+          <li>娲诲姩鍖洪棿锛歿{ activityInfo.time || "-" }}</li>
+          <li>娲诲姩鎻忚堪锛歿{ activityInfo.desc || "-" }}</li>
+          <li>鍙備笌浜哄憳锛歿{ activityInfo.participants || "-" }}</li>
         </ul>
         <!-- <img
           style="width: 100%; height: 2rem"
           src="https://img0.baidu.com/it/u=1845740325,2917001370&fm=253&app=120&size=w931&n=0&f=JPEG&fmt=auto?sec=1711731600&t=0b208ab46e1d33aa81ac31dd6bf627be"
           alt=""
         /> -->
-        <div class="box" style="width: 80%">
+        <!-- <div class="box" style="width: 80%">
           <span class="span" :style="{ marginLeft: spanML + 'rem' }"
             >{{ span }}骞�</span
           >
@@ -67,7 +63,7 @@
           </div>
           <div class="MX"></div>
           <div class="cursor" :style="{ marginLeft: cursorML + 'rem' }"></div>
-        </div>
+        </div> -->
       </el-dialog>
     </view>
   </view>
@@ -95,7 +91,13 @@
       spanML: 0,
       cursorML: -0.05,
       activityInfo: {},
-      basicInfo: {}
+      basicInfo: {
+        name: "",
+        birthYear: "",
+        deathYear: "",
+        nativePlace: "",
+        nowPlace: "",
+      }
     };
   },
 
@@ -204,7 +206,7 @@
         this.basicInfo.nowPlace = res.object.personFieldList.find(
           (f) => f.fieldName == "NATIVE_PLACE"
         ).content2;
-        // this.initMap(res.object.personSpaceTimeList);
+        console.log(this.basicInfo);
       });
     },
 
@@ -555,9 +557,9 @@
   margin: 0 !important;
   position: absolute;
   right: 0;
-  top: 0;
+  top: 86px;
+  bottom: 0;
   width: 4rem;
-  height: 100%;
 }
 
 .particulars ::v-deep .el-dialog__header {

--
Gitblit v1.9.1