From a971d0c13ab9cd5107152f6eba5e1e724a37fa0b Mon Sep 17 00:00:00 2001
From: 杨磊 <505174330@qq.com>
Date: 星期五, 07 六月 2024 17:20:31 +0800
Subject: [PATCH] Merge branch 'master' of http://182.92.203.7:2001/r/TCM_CharacterLibrary
---
src/pages/character/detail.vue | 46 +++++++++++++++++++++++++++++++++++++++++++++-
1 files changed, 45 insertions(+), 1 deletions(-)
diff --git a/src/pages/character/detail.vue b/src/pages/character/detail.vue
index 4ed71ef..d3a5697 100644
--- a/src/pages/character/detail.vue
+++ b/src/pages/character/detail.vue
@@ -415,6 +415,7 @@
getPersonWritings,
getPersonRelationAtSchool,
getSpaceTime,
+ getDynastyData,
} from "@/api/index.js";
import { getImg, getFile } from "@/static/tool.js";
import L from "leaflet";
@@ -541,7 +542,8 @@
},
methods: {
copyText() {
- const textToCopy = this.biogData[0].content + " 鏉ユ簮锛氫腑鍖诲尰瀛︿汉鐗╃煡璇嗗簱";
+ const textToCopy =
+ this.biogData[0].content + "\n鏉ユ簮锛氫腑鍖诲尰瀛︿汉鐗╃煡璇嗗簱";
const textarea = document.createElement("textarea");
textarea.value = textToCopy;
document.body.appendChild(textarea);
@@ -643,6 +645,11 @@
{
name: "鎵�澶勬椂鏈�",
value: obj.dynastyDesc || "-",
+ valueClick: () => {
+ uni.navigateTo({
+ url: "/pages/knowledgeBase/knowledgeBase?dynasty=" + obj.dynastyId
+ });
+ }
},
{
name: "姘戞棌",
@@ -663,6 +670,11 @@
{
name: "鑱屽畼",
value: obj.official || "-",
+ valueClick: () => {
+ uni.navigateTo({
+ url: "/pages/knowledgeBase/knowledgeBase?isAdvancedSearch=1&official=" + obj.official
+ });
+ }
},
{
name: "娴佹淳",
@@ -751,6 +763,30 @@
}).then((res) => {
this.tableData4;
console.log(res, "PERSON_RELATIONS");
+ if (res.object.personRelationMap.kin.length) {
+ this.tableData2 = res.object.personRelationMap.kin.map((f) => {
+ return {
+ a: f.nodeName,
+ b: f.relationTypeName,
+ };
+ });
+ }
+ if (res.object.personRelationMap.teacherStudent.length) {
+ this.tableData3 = res.object.personRelationMap.teacherStudent.map((f) => {
+ return {
+ a: f.nodeName,
+ b: f.relationTypeName,
+ };
+ });
+ }
+ if (res.object.personRelationMap.social.length) {
+ this.tableData4 = res.object.personRelationMap.social.map((f) => {
+ return {
+ a: f.nodeName,
+ b: f.relationTypeName,
+ };
+ });
+ }
});
// 绀句細鍏崇郴
getPersonRelationAtSchool({
@@ -771,6 +807,7 @@
personId: this.detailId,
relationSearchTypeEO: "KINSHIP",
}).then((res) => {
+ console.log(res, "123123");
if (res.list && res.list.length) {
this.tableData2 = res.list.map((f) => {
return {
@@ -874,6 +911,13 @@
minZoom: 3,
})
.addTo(map);
+ L.tileLayer
+ .chinaProvider("TianDiTu.Normal.Annotion", {
+ key: "76bc34ead7e30e663a4eded8aeaf5860",
+ maxZoom: 18,
+ minZoom: 3,
+ })
+ .addTo(map);
let icon = L.divIcon({
html: "<div class='map-circle-name ripple'></div>",
iconSize: [80, 80],
--
Gitblit v1.9.1