From 21e72d18e42e0b5966f5c76ed853ff175f4418ad Mon Sep 17 00:00:00 2001
From: YM <479443481@qq.com>
Date: 星期五, 26 七月 2024 11:50:41 +0800
Subject: [PATCH] Merge branch 'master' of http://182.92.203.7:2001/r/TCM_CharacterLibrary

---
 src/pages/academicSchools/index.vue |   47 ++++++++++++++++++++++++++++++-----------------
 1 files changed, 30 insertions(+), 17 deletions(-)

diff --git a/src/pages/academicSchools/index.vue b/src/pages/academicSchools/index.vue
index 62ff658..c4735dc 100644
--- a/src/pages/academicSchools/index.vue
+++ b/src/pages/academicSchools/index.vue
@@ -299,7 +299,7 @@
         <p>鍖诲鍒嗙锛� {{ detailData.medicalBranch }}</p>
         <p>灏忎紶锛歿{ detailData.biography }}</p>
       </div>
-      <div class="btn" @click="spaceTimeArr(detailData.id)">鏌ョ湅鏇村>>></div>
+      <div class="btn" @click="spaceTimeArr(detailData.id, 1)">鏌ョ湅鏇村>>></div>
     </div>
     <div id="schoolDialog" class="customDialog">
       <div class="title">
@@ -312,7 +312,7 @@
         <p>浠ｈ〃鎬ц憲浣滐細{{ detailData.works }}</p>
         <p>瀛︽淳鎬濇兂锛� {{ detailData.thought }}</p>
       </div>
-      <div class="btn" @click="spaceTimeArr(detailData.id)">鏌ョ湅鏇村>>></div>
+      <div class="btn" @click="spaceTimeArr(detailData.id, 2)">鏌ョ湅鏇村>>></div>
     </div>
     <el-drawer
       title="鍦板潃鍒楄〃"
@@ -408,7 +408,7 @@
   getSocialDistinction,
   getDynastyAll,
   getAdvancedData,
-  getPlaceInfo,
+  getPlaceInfo
 } from "@/api/index.js";
 import * as echarts from "echarts";
 export default {
@@ -444,7 +444,7 @@
           name: "娲诲姩鍦�",
         },
         {
-          name: "瀛︽湳鍥捐氨"
+          name: "瀛︽湳娴佹淳"
         }
       ],
       // 褰撳墠浜虹墿淇℃伅
@@ -463,7 +463,7 @@
         page: 1,
         currentPage: 1,
         pageSize: 10,
-        total: 0,
+        total: 0
       },
       showPerson: false,
       personList: [],
@@ -616,7 +616,7 @@
         page: 1,
         currentPage: 1,
         pageSize: 10,
-        total: 0,
+        total: 0
       };
       this.formData.page = 1;
       this.searchFun();
@@ -626,7 +626,7 @@
         return {
           ancientName: item.ancientName ?? "",
           dynastyId: item.dynastyId,
-          currentName: item.currentName,
+          currentName: item.currentName
         };
       });
       let Obj = {
@@ -637,7 +637,7 @@
         socialDistinctionIdList: this.formData.socialIdentity,
         dynastyIdList: this.formData.period,
         page: this.formData.page,
-        pageSize: this.formData.pageSize,
+        pageSize: this.formData.pageSize
       };
       // // 鎼滅储
       getAdvancedData(Obj).then((res) => {
@@ -724,7 +724,7 @@
                     }
                   });
                   return data;
-                }).join() ?? "",
+                }).join() ?? ""
             };
           });
           if (res?.npage) {
@@ -1356,6 +1356,8 @@
         const e = params.event;
         const div = document.getElementById("customDialog");
         div.style.display = "block";
+        const div2 = document.getElementById("schoolDialog");
+        div2.style.display = "none";
         div.style.left = e.offsetX + 50 + "px";
         div.style.top = e.offsetY - 50 + "px";
         const data = this.infoOfPersons?.find((i) => i.id == id);
@@ -1390,11 +1392,13 @@
         const e = params.event;
         const div = document.getElementById("schoolDialog");
         div.style.display = "block";
+        const div2 = document.getElementById("customDialog");
+        div2.style.display = "none";
         div.style.left = e.offsetX + 50 + "px";
         div.style.top = e.offsetY - 50 + "px";
         const data = this.infoOfSchools?.find((i) => i.schoolId == id);
         const obj = {
-          id: params.data.id,
+          id: id,
           name: data.name[0],
           character: data.important_people
             ? data.important_people.map((item) => item.personName).join("銆�")
@@ -1406,8 +1410,8 @@
             ? data.important_work.map((item) => item.literatureTitle).join("銆�")
             : "",
           thought: data.school_introduction
-            ? data.school_introduction.map((item) => item).join("銆�")
-            : "",
+            ? data.school_introduction.join("銆�")
+            : ""
         };
         this.detailData = obj;
       }
@@ -1416,6 +1420,8 @@
     closeDom() {
       const div = document.getElementById("customDialog");
       div.style.display = "none";
+      const div2 = document.getElementById("schoolDialog");
+      div2.style.display = "none";
     },
 
     // 鍩虹鎼滅储
@@ -1468,11 +1474,18 @@
     },
 
     // 鍏崇郴鍥� 鐐瑰嚮閲岄潰鐨勫厓绱�
-    spaceTimeArr(id) {
-      // 鍏崇郴鍥剧殑鏁版嵁
-      uni.navigateTo({
-        url: "/pages/character/detail?id=" + id,
-      });
+    spaceTimeArr(id, type) {
+      if (type == 1) {
+        // 浜虹墿
+        uni.navigateTo({
+          url: "/pages/character/detail?id=" + id
+        });
+      } else {
+        // 瀛︽淳
+        uni.navigateTo({
+          url: "/pages/academicGenres/detail?id=" + id
+        });
+      }
     },
 
     // 鑾峰彇鏈濅唬echarts鐨勬暟鎹�

--
Gitblit v1.9.1