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

QYF-GitLab1

2024-07-24 01cf3af5a11fd91225358496a650841ca443ad1e

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

 src/pages/academicSchools/index.vue

@@ -217,6 +217,21 @@
      </div>
      <div class="btn" @click="spaceTimeArr(detailData.id)">查看更多>>></div>
    </div>
    <div id="schoolDialog" class="customDialog">
      <div class="title">
        <span>{{ detailData.name }}</span>
        <span @click="closeDom">关闭</span>
      </div>
      <div class="content">
        <p>姓名：{{ detailData.name }}</p>
        <p>别名：{{ detailData.alias }}</p>
        <p>籍贯：{{ detailData.nativePlace }}</p>
        <p>医学分科： {{ detailData.medicalBranch }}</p>
        <p>小传：{{ detailData.biography }}</p>
      </div>
      <div class="btn" @click="spaceTimeArr(detailData.id)">查看更多>>></div>
    </div>
    
    <el-drawer
      title="地址列表"
      :visible.sync="drawer"
@@ -326,7 +341,26 @@
      hotKeyList: [],
      searchKey: "",
      // 分类
      categories: [],
      categories: [
        {
          name: "亲属关系"
        },
        {
          name: "师承关系"
        },
        {
          name: "文献作品"
        },
        {
          name: "社会关系"
        },
        {
          name: "活动地"
        },
        {
          name: "学术流派"
        }
      ],
      // 当前人物信息
      ownInfo: null,
      detailData: {
@@ -799,11 +833,9 @@
                );
                if (p) {
                  this.nodeDatas.push({
                    category: 0,
                    id: item.mainId,
                    name: p.NAME[0].content1,
                    itemStyle: {
                      color: "#5470c6",
                    },
                    name: p.NAME[0].content1
                  });
                }
              }
@@ -830,11 +862,9 @@
                -1
              ) {
                this.nodeDatas.push({
                  category: 2,
                  id: item.mainId,
                  name: item.literatureName,
                  itemStyle: {
                    color: "#fac858",
                  },
                  name: item.literatureName
                });
              }
              this.links.push({
@@ -849,11 +879,9 @@
                -1
              ) {
                this.nodeDatas.push({
                  category: 4,
                  id: item.mainId,
                  name: item.ancientName,
                  itemStyle: {
                    color: "#ea7ccc",
                  },
                  name: item.ancientName
                });
              }
              this.links.push({
@@ -870,16 +898,11 @@
                const s = this.infoOfSchools.find(
                  (sItem) => sItem.schoolId == item.schoolId
                );
                console.log(this.infoOfSchools);
                console.log(item.schoolId);
                console.log(s);
                if (s) {
                  this.nodeDatas.push({
                    category: 5,
                    id: item.mainId,
                    name: s.name[0],
                    itemStyle: {
                      color: "#9a60b4",
                    },
                    name: s.name[0]
                  });
                }
              }
@@ -899,11 +922,9 @@
                );
                if (p) {
                  this.nodeDatas.push({
                    category: 3,
                    id: item.mainId,
                    name: p.NAME[0].content1,
                    itemStyle: {
                      color: "#ee6666",
                    },
                    name: p.NAME[0].content1
                  });
                }
              }
@@ -934,11 +955,9 @@
                );
                if (p) {
                  this.nodeDatas.push({
                    category: 1,
                    id: item.mainId,
                    name: p.NAME[0].content1,
                    itemStyle: {
                      color: "#3dae7b",
                    },
                    name: p.NAME[0].content1
                  });
                }
              }
@@ -1051,7 +1070,7 @@
            symbolSize: 15,
            data: this.nodeDatas,
            links: this.links,
            categories: [{}],
            categories: this.categories,
            roam: true,
            label: {
              show: true,
@@ -1074,10 +1093,18 @@
            },
            force: {
              repulsion: 600,
              edgeLength: 300,
            },
          },
              edgeLength: 300
            }
          }
        ],
        color: [
          "#5470c6",
          "#3dae7b",
          "#fac858",
          "#ee6666",
          "#ea7ccc",
          "#9a60b4"
        ]
      };
      // 设置点击事件监听
      myChart.off("click");
@@ -1090,13 +1117,53 @@
    },

    creatDom(params) {
      const id = params.data.id.split("_")[0];
      const type = params.data.id.split("_")[1];
      if (type == "p") {
        // 人
      const e = params.event;
      const div = document.getElementById("customDialog");
      div.style.display = "block";
      div.style.left = e.offsetX + 50 + "px";
      div.style.top = e.offsetY - 50 + "px";
      const data = this.infoOfPersons?.find(
        (i) => i.id == params.data.personId
          (i) => i.id == id
        );
        const obj = {
          id: id,
          name:
            data?.NAME?.map((e, i) => {
              i += 1;
              return e["content" + i];
            }).join("、") ?? "",
          alias:
            data?.ALIAS?.map((e, i) => {
              i += 1;
              return e["content" + i];
            }).join("、") ?? "",
          nativePlace:
            data?.NATIVE_PLACE?.map((e, i) => {
              i += 1;
              return e["content" + i];
            }).join("、") ?? "",
          medicalBranch:
            data?.MEDICAL_BRANCH?.map((e, i) => {
              i += 1;
              return e["content" + i];
            }).join("、") ?? "",
          biography: data?.BIOGRAPHY ?? ""
        };
        this.detailData = obj;
      }
      if (type == "s") {
        // 学派
        const e = params.event;
        const div = document.getElementById("schoolDialog");
        div.style.display = "block";
        div.style.left = e.offsetX + 50 + "px";
        div.style.top = e.offsetY - 50 + "px";
        const data = this.infoOfPersons?.find(
          (i) => i.id == id
      );
      const obj = {
        id: params.data.id,
@@ -1120,9 +1187,10 @@
            i += 1;
            return e["content" + i];
          }).join("、") ?? "",
        biography: data?.BIOGRAPHY ?? "",
          biography: data?.BIOGRAPHY ?? ""
      };
      this.detailData = obj;
      }
    },

    closeDom() {

 src/pages/inherit/list.vue

@@ -286,7 +286,8 @@
      if (dataList && dataList.length) {
        const G6Data = dataList.map((f) => {
          return {
            id: f.name,
            id: f.value + "-" + f.name,
            name: f.name,
            personId: f.personId,
            relationInfo: f?.relationInfo?.relation
              ? f.relationInfo.relation
@@ -307,6 +308,7 @@
      const data = {
        isRoot: true,
        id: this.dataList.name,
        name:this.dataList.name,
        style: {
          fill: "red"
        },
@@ -324,14 +326,6 @@
        linkCenter: true,
        modes: {
          default: [
            // {
            //   type: "collapse-expand",
            //   onChange: function onChange(item, collapsed) {
            //     const data = item.get("model");
            //     data.collapsed = collapsed;
            //     return true;
            //   },
            // },
            "drag-canvas",
            "zoom-canvas"
          ]
@@ -374,7 +368,7 @@
            fill: node.relationType ? "#EDF4FF" : "#FCEFE3",
            stroke: node.relationType ? "#5E7AA7" : "#D3791E"
          },
          label: node.id,
          label: node.name,
          labelCfg: {
            position: "center",
            offset: 5,

 src/pages/territory/territory.vue

@@ -314,10 +314,8 @@
<!-- <script src="https://api.map.baidu.com/api?v=3.0&ak=5USVDAhhS4ssz44HLq3gNPZai7naXf4Q&callback=initializeMap"></script> -->
<!-- 5USVDAhhS4ssz44HLq3gNPZai7naXf4Q -->
<script>
import { loadBMap } from "@/static/map.js";
import L from "leaflet";
import "leaflet.chinatmsproviders";
import * as echarts from "echarts";
import "echarts/extension/bmap/bmap";
import {
  getRetrieval,
@@ -512,7 +510,6 @@
  },
  mounted() {
    this.getDynastyList();

    this.getDataList();
    this.getHaveDataDynasty();
  },