1

YM

2024-06-11 a4fe90ef374a9a3144fb8de5d7229dd11bfa7ff4

1

 src/api/index.js

@@ -264,6 +264,12 @@
    method: "post"
  });
};
export const getDynastyData = () => {
  return req1({
    url: "/person/retrieval/dynasty",
    method: "post"
  });
};

// 学术流派
export const getDynastyStatistics = () => {

 src/pages/character/detail.vue

@@ -414,7 +414,8 @@
  getPersonBiog,
  getPersonWritings,
  getPersonRelationAtSchool,
  getSpaceTime
  getSpaceTime,
  getDynastyData,
} from "@/api/index.js";
import { getImg } from "@/static/tool.js";
import L from "leaflet";
@@ -766,6 +767,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({
@@ -786,6 +811,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 {

 src/pages/fileDetail/index.vue

@@ -5,7 +5,8 @@
        {{ data }}
      </code>
    </pre>
    <div v-else v-html="data"></div>
    <div v-else-if="'NT'" v-html="data"></div>
    <div v-else-if="'RDF'" v-html="data"></div>
  </view>
</template>

@@ -16,7 +17,7 @@
  data() {
    return {
      options: {},
      data: ""
      data: "",
    };
  },
  onLoad(options) {
@@ -28,17 +29,18 @@
      if (this.options.type == "Person") {
        getPersonDataOutput({
          personId: this.options.id,
          dataTypeEO: this.options.outputType
          dataTypeEO: this.options.outputType,
        }).then((res) => {
          this.data = res;
        });
      } else {
        getMedicalDataOutput(this.options).then((res) => {
          this.data = res;
          console.log(this.data, "data");
        });
      }
    }
  }
    },
  },
};
</script>


 src/pages/territory/territory.vue

@@ -104,6 +104,7 @@
            {{ item.birthAndDeath ? item.birthAndDeath : "-" }}
          </li>
          <li>来源: {{ item.source ? item.source : "-" }}</li>
          <li>籍贯: {{ item.nativPlace ? item.nativPlace : "-" }}</li>
          <li
            v-if="SearchArr.length - 1 !== index"
            style="margin: 0.1rem 0; border-bottom: 1px solid #d8d8d8"
@@ -222,7 +223,12 @@
import "leaflet.chinatmsproviders";
import * as echarts from "echarts";
import "echarts/extension/bmap/bmap";
import { getRetrieval, getDynasty, getPreCount } from "@/api/index.js";
import {
  getRetrieval,
  getDynasty,
  getPreCount,
  getDynastyData,
} from "@/api/index.js";
export default {
  data() {
    return {
@@ -407,11 +413,18 @@
    this.getDynastyList();

    this.getDataList();
    this.getHaveDataDynasty();
  },
  methods: {
    getHaveDataDynasty() {
      getDynastyData().then((res) => {
        console.log(res, "getHaveDataDynasty");
      });
    },
    getDynastyList() {
      getDynasty().then((res) => {
        this.dynasty1 = res.list;
        console.log("dynasty1", res.list);
      });
    },
    showCard(info) {
@@ -460,8 +473,72 @@
          if (curData) {
            markerList = [...markerList, ...curData];
          }
          if (i == times) {
          if (i == 1) {
            this.loading = false;
            this.mapLoading = false;
            this.markerList = markerList;
            this.initMap(markerList);
          } else {
            if (curData && curData.length) {
              for (let j = 0; j < curData.length; j++) {
                const ele = curData[j];
                let currentClassName = "map-circle-name";
                if (ele.dynastyInfo) {
                  switch (ele.dynastyInfo.dynastyChs) {
                    case "夏":
                      currentClassName = "map-circle-xia";
                      break;
                    case "商":
                      currentClassName = "map-circle-shang";
                      break;
                    case "西周":
                      currentClassName = "map-circle-zhou";
                      break;
                    case "秦":
                      currentClassName = "map-circle-qin";
                      break;
                    case "汉":
                      currentClassName = "map-circle-han";
                      break;
                    case "隋":
                      currentClassName = "map-circle-sui";
                      break;
                    case "唐":
                      currentClassName = "map-circle-tang";
                      break;
                    case "明":
                      currentClassName = "map-circle-ming";
                      break;
                  }
                }
                let icon = L.divIcon({
                  html: `<div class='${currentClassName} ripple'></div>`,
                  iconSize: [80, 80],
                  className: "map-circle",
                });
                const temp_mark = L.marker([ele.yCoord, ele.xCoord], {
                  icon: icon,
                }).addTo(this.map);
                temp_mark.on("click", (e) => {
                  setTimeout(() => {
                    this.isEchTrue = true;
                    this.currentMark = {
                      name: ele?.WEAK_NAME[0]?.content1,
                      nikeName: ele?.ALIAS[0]?.content2,
                      nativePlace: ele?.content1,
                      barnch: ele?.MEDICAL_BRANCH[0]?.content1,
                      medical: ele?.MEDICAL_EXPERTISE[0]?.content1,
                      id: ele.id,
                    };
                    this.isTop = e.containerPoint.y - 275 + "px";
                    this.isLeft = e.containerPoint.x - 171 + "px";
                  }, 300);
                });
              }
            }
          }

          if (i == times) {
            this.SearchArr = markerList.map((item) => ({
              birthAndDeath: item?.BIRTH_YEAR[0]?.content1
                ? item?.BIRTH_YEAR[0]?.content1 +
@@ -470,11 +547,11 @@
                : "-",
              name: item?.NAME[0]?.content1,
              source: "-",
              nativPlace: item?.NATIVE_PLACE[0].content1,
              id: item.id,
            }));
            this.markerList = markerList;
            this.loading = false;
            this.mapLoading = false;
            // this.initMap(markerList);
          }
        }
      });
@@ -607,9 +684,9 @@
        className: "map-circle",
      });
      this.map = map;
      if (markerList.length) {
        for (let i = 0; i < markerList.length; i++) {
          const item = markerList[i];
      if (this.markerList.length) {
        for (let i = 0; i < this.markerList.length; i++) {
          const item = this.markerList[i];
          let currentClassName = "map-circle-name";
          if (item.dynastyInfo) {
            switch (item.dynastyInfo.dynastyChs) {
@@ -900,12 +977,12 @@
  animation: ripple-animation 1s infinite linear;
}

@keyframes ripple-animation {
/* @keyframes ripple-animation {
  to {
    transform: translate(-50%, -50%) scale(0);
    opacity: 0;
  }
}
} */

::v-deep .cleanupBtn{
  right: 60px !important;