Merge branch 'master' of http://182.92.203.7:2001/r/TCM_CharacterLibrary

杨磊

2024-06-07 a971d0c13ab9cd5107152f6eba5e1e724a37fa0b

 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";
@@ -644,6 +645,11 @@
            {
              name: "所处时期",
              value: obj.dynastyDesc || "-",
              valueClick: () => {
                uni.navigateTo({
                  url: "/pages/knowledgeBase/knowledgeBase?dynasty=" + obj.dynastyId
                });
              }
            },
            {
              name: "民族",
@@ -664,6 +670,11 @@
            {
              name: "职官",
              value: obj.official || "-",
              valueClick: () => {
                uni.navigateTo({
                  url: "/pages/knowledgeBase/knowledgeBase?isAdvancedSearch=1&official=" + obj.official
                });
              }
            },
            {
              name: "流派",
@@ -752,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({
@@ -772,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 {