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

YM

2024-06-06 6f7c9ef272906bbd5d905ee069bc5d6d1bf55614

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

 src/pages/character/detail.vue

@@ -414,7 +414,7 @@
  getPersonBiog,
  getPersonWritings,
  getPersonRelationAtSchool,
  getSpaceTime
  getSpaceTime,
} from "@/api/index.js";
import { getImg, getFile } from "@/static/tool.js";
import L from "leaflet";
@@ -422,7 +422,7 @@

export default {
  components: {
    Table1
    Table1,
  },
  data() {
    return {
@@ -443,60 +443,60 @@
      tableColumns1: [
        {
          prop: "a",
          label: "正书名"
          label: "正书名",
        },
        {
          prop: "e",
          label: "作者"
          label: "作者",
        },
        {
          prop: "b",
          label: "著作年"
          label: "著作年",
        },
        {
          prop: "c",
          label: "著作方式"
          label: "著作方式",
        },
        {
          prop: "d",
          label: "总目分类"
        }
          label: "总目分类",
        },
      ],
      tableColumns2: [
        {
          prop: "a",
          label: "关系人"
          label: "关系人",
        },
        {
          prop: "b",
          label: "关系类型"
          label: "关系类型",
        },
        {
          prop: "c",
          label: "考据"
          label: "考据",
        },
        {
          prop: "d",
          label: "出处"
        }
          label: "出处",
        },
      ],
      tableColumns3: [
        {
          prop: "a",
          label: "活动时间区间"
          label: "活动时间区间",
        },
        {
          prop: "b",
          label: "活动名称"
          label: "活动名称",
        },
        {
          prop: "c",
          label: "活动地点"
          label: "活动地点",
        },
        {
          prop: "d",
          label: "活动描述"
        }
          label: "活动描述",
        },
      ],
      tableData1: [],
      tableData2: [],
@@ -506,7 +506,7 @@
      nodes: [],
      relationships: [],
      personResearchList: [],
      markerList: []
      markerList: [],
    };
  },
  onLoad(options) {
@@ -551,7 +551,7 @@
      document.body.removeChild(textarea);
      this.$message({
        message: "复制成功！",
        type: "success"
        type: "success",
      });
    },
    toLink(item) {
@@ -567,7 +567,7 @@
      // 基本信息
      getPersonInfo({
        id: this.detailId,
        type: "PERSON_BASIC"
        type: "PERSON_BASIC",
      }).then((res) => {
        const obj = {};
        if (
@@ -590,13 +590,13 @@
      //现代研究
      getPersonInfo({
        id: this.detailId,
        type: "PERSON_RESEARCH"
        type: "PERSON_RESEARCH",
      }).then((res) => {
        this.personResearchList = res.object.personResearchList;
      });

      getWebBasic({
        personId: this.detailId
        personId: this.detailId,
      }).then((res) => {
        const obj = res.object;
        if (obj.school) {
@@ -611,7 +611,7 @@
      // 活动年谱
      getPersonInfo({
        id: this.detailId,
        type: "PERSON_SPACE_TIME"
        type: "PERSON_SPACE_TIME",
      }).then((res) => {
        if (res.object.personSpaceTimeList) {
          this.tableData5 = res.object.personSpaceTimeList.map((item) => {
@@ -619,7 +619,7 @@
              a: item.time,
              b: item.activityName,
              c: item.activityAddrOld,
              d: item.desc // 这里缺少活动描述字段
              d: item.desc, // 这里缺少活动描述字段
            };
          });
        }
@@ -631,15 +631,15 @@
          list: [
            {
              name: "别名",
              value: obj.alias || "-"
              value: obj.alias || "-",
            },
            {
              name: "字",
              value: obj.zi || "-"
              value: obj.zi || "-",
            },
            {
              name: "号",
              value: obj.hao || "-"
              value: obj.hao || "-",
            },
            {
              name: "所处时期",
@@ -652,19 +652,19 @@
            },
            {
              name: "民族",
              value: obj.ethnic || "-"
            }
          ]
              value: obj.ethnic || "-",
            },
          ],
        },
        {
          list: [
            {
              name: "籍贯",
              value: obj.native || "-"
              value: obj.native || "-",
            },
            {
              name: "性别",
              value: obj.gender || "-"
              value: obj.gender || "-",
            },
            {
              name: "职官",
@@ -683,33 +683,33 @@
                sres.object.school_NAME &&
                sres.object.school_NAME.length
                  ? sres.object.school_NAME[0].content
                  : "-"
                  : "-",
            },
            {
              name: "学术特点",
              value: obj.features || "-"
            }
          ]
        }
              value: obj.features || "-",
            },
          ],
        },
      ];
    },
    getSourceData() {
      getSource({
        personId: this.detailId
        personId: this.detailId,
      }).then((res) => {
        this.sourceDataList = res.list;
      });
    },
    getImages() {
      getPersonImages({
        personId: this.detailId
        personId: this.detailId,
      }).then((res) => {
        this.imageList = res.list.map((item) => getImg(item.filePath));
      });
    },
    getBiog() {
      getPersonBiog({
        personId: this.detailId
        personId: this.detailId,
      }).then((res) => {
        this.biogData = res.list.map((item) => {
          return {
@@ -718,14 +718,14 @@
              "《" +
              item.bookName +
              "》 " +
              (item.pageNo ? "P " + item.pageNo : "") // 这里只有bookid无法匹配到书名
              (item.pageNo ? "P " + item.pageNo : ""), // 这里只有bookid无法匹配到书名
          };
        });
      });
    },
    getWritings() {
      getPersonWritings({
        personId: this.detailId
        personId: this.detailId,
      }).then((res) => {
        this.tableData1 = res.list.map((item) => {
          return {
@@ -733,7 +733,7 @@
            b: item.dynasty,
            c: item.writeWay,
            d: item.classify,
            e: this.detailInfo.NAME
            e: this.detailInfo.NAME,
          };
        });
      });
@@ -758,7 +758,7 @@
      // });
      getPersonInfo({
        id: this.detailId,
        type: "PERSON_RELATIONS"
        type: "PERSON_RELATIONS",
      }).then((res) => {
        this.tableData4;
        console.log(res, "PERSON_RELATIONS");
@@ -766,13 +766,13 @@
      // 社会关系
      getPersonRelationAtSchool({
        personId: this.detailId,
        relationSearchTypeEO: "SOCIAL"
        relationSearchTypeEO: "SOCIAL",
      }).then((res) => {
        if (res.list && res.list.length) {
          this.tableData4 = res.list.map((f) => {
            return {
              a: f.name1,
              b: f.relationName
              b: f.relationName,
            };
          });
        }
@@ -780,13 +780,13 @@
      // 亲属关系
      getPersonRelationAtSchool({
        personId: this.detailId,
        relationSearchTypeEO: "KINSHIP"
        relationSearchTypeEO: "KINSHIP",
      }).then((res) => {
        if (res.list && res.list.length) {
          this.tableData2 = res.list.map((f) => {
            return {
              a: f.name1,
              b: f.relationName
              b: f.relationName,
            };
          });
        }
@@ -794,13 +794,13 @@
      // 师承关系
      getPersonRelationAtSchool({
        personId: this.detailId,
        relationSearchTypeEO: "INHERITANCE"
        relationSearchTypeEO: "INHERITANCE",
      }).then((res) => {
        if (res.list && res.list.length) {
          this.tableData3 = res.list.map((f) => {
            return {
              a: f.name1,
              b: f.relationName
              b: f.relationName,
            };
          });
        }
@@ -808,7 +808,7 @@
    },
    getMappingData(name) {
      getFuzzySearch({
        keyword: name
        keyword: name,
      }).then((res) => {
        this.nodes = [];
        this.relationships = [];
@@ -824,19 +824,19 @@
            if (item.name1 && exists1 !== true) {
              this.nodes.push({
                name: item.name1,
                id: item.identifier1
                id: item.identifier1,
              });
            }
            if (item.name2 && exists2 !== true) {
              this.nodes.push({
                name: item.name2,
                id: item.identifier2
                id: item.identifier2,
              });
            }
            let obj = {
              source: item.name1,
              target: item.name2,
              relation: item.relationName || "" // 如果存在 relationName 字段则使用，否则为空字符串
              relation: item.relationName || "", // 如果存在 relationName 字段则使用，否则为空字符串
            };
            this.relationships.push(obj);
          });
@@ -846,19 +846,26 @@
    },
    getMapInfo() {
      getSpaceTime({
        personId: this.detailId
        personId: this.detailId,
      }).then((res) => {
        if (res.list && res.list.length) {
          const data = res.list.map((item) => {
            return {
          const data = [];
          for (let i = 0; i < res.list.length; i++) {
            const item = res.list[i];
            if (item.xcoord && item.ycoord) {
              const obj = {
              name: item.activityName,
              value: [item.xcoord, item.ycoord]
                value: [item.xcoord, item.ycoord],
            };
          });
              data.push(obj);
            }
          }
          this.markerList = data;
          // 时空地图
          // 这里只取了第一条，需要全部数据
          this.initMap(data[0]);
          if (data && data.length) {
            this.initMap(data);
          }
        }

        // loadBMap("1NJdwrI1CfT6lrykVhDkmWgsO6O2bjQK").then(() => {
@@ -869,34 +876,49 @@
    initMap(markerList) {
      var map = L.map("spaceTime", {
        preferCanvas: true,
        attributionControl: false
      }).setView([markerList.value[1], markerList.value[0]], 13);
        attributionControl: false,
      }).setView([markerList[0].value[1], markerList[0].value[0]], 13);
      L.tileLayer
        .chinaProvider("TianDiTu.Normal.Map", {
          key: "76bc34ead7e30e663a4eded8aeaf5860",
          maxZoom: 18,
          minZoom: 3
          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],
        className: "map-circle"
        className: "map-circle",
      });
      this.map = map;
      const temp_mark = L.marker([markerList.value[1], markerList.value[0]], {
        icon: icon
        icon: icon,
      }).addTo(map);
      if (markerList.length) {
        for (let i = 0; i < markerList.length; i++) {
          const item = markerList[i];
          const temp_mark = L.marker([item.value[1], item.value[0]], {
            icon: icon,
          }).addTo(map);
        }
      }
    },
    // 放大地图跳转
    fangdaClick(index) {
      if (index == 1) {
        uni.navigateTo({
          url: "/pages/character/index?keyword=" + this.detailInfo.NAME
          url: "/pages/character/index?keyword=" + this.detailInfo.NAME,
        });
      } else if (index == 2) {
        uni.navigateTo({
          url: "/pages/characterMap/characterMap?id=" + this.detailId
          url: "/pages/characterMap/characterMap?id=" + this.detailId,
        });
      }
    },
@@ -912,13 +934,13 @@
    scrollToTop() {
      window.scrollTo({
        top: 0,
        behavior: "smooth" // 使用平滑滚动
        behavior: "smooth", // 使用平滑滚动
      });
    },
    openFileClick(index) {
      let obj = {
        id: this.detailId,
        type: "Person"
        type: "Person",
      };
      switch (index) {
        case 1:
@@ -1021,8 +1043,8 @@
                position: "middle", // 设置标签文本在线的中间位置上居中显示
                // bottom: -(FontSize+10),
                z: 10, // 设置标签的z轴高度，使其比连接线更高
                distance: -(Distance + 1) // 将标签放置在连接线上
              }
                distance: -(Distance + 1), // 将标签放置在连接线上
              },
            });
          }
        }
@@ -1037,8 +1059,8 @@
          itemStyle: {
            color: "#eae0eb", // 可以根据索引设置不同的颜色
            borderWidth: BorderWidth,
            borderColor: "#996f9f"
          }
            borderColor: "#996f9f",
          },
        };
      });
      var option;
@@ -1048,14 +1070,14 @@
          top: FontSize + 10,
          subtextStyle: {
            fontSize: FontSize, // 设置副标题文字大小为 14px
            color: "#2C2C2C"
          }
            color: "#2C2C2C",
          },
        },
        backgroundColor: {
          type: "image",
          image: "/static/image/characterRelationBg.png",
          size: "100% 100%", // 背景图片的尺寸，可以是百分比或者像素
          position: "center center" // 背景图片的位置，可以是 top, bottom, middle 或者百分比
          position: "center center", // 背景图片的位置，可以是 top, bottom, middle 或者百分比
        },
        tooltip: {},
        animationDurationUpdate: 1500,
@@ -1069,7 +1091,7 @@
            label: {
              show: true,
              color: "black", // 设置节点文字颜色为黑色
              fontSize: FontSize // 设置文字大小
              fontSize: FontSize, // 设置文字大小
            },
            edgeSymbol: ["circle"],
            edgeSymbolSize: [4, 10],
@@ -1078,16 +1100,16 @@
            lineStyle: {
              opacity: 0.9,
              width: 2,
              curveness: 0.3
              curveness: 0.3,
            },
            emphasis: {
              focus: "adjacency",
              lineStyle: {
                width: 10
              }
            }
          }
        ]
                width: 10,
              },
            },
          },
        ],
      };
      // 将生成的连接线添加到echarts图表的option中
      option.series[0].links = links;
@@ -1111,10 +1133,10 @@
          text: "",
          subtext: "",
          sublink: "",
          left: "center"
          left: "center",
        },
        tooltip: {
          trigger: "item"
          trigger: "item",
        },
        bmap: {
          center: data[0].value,
@@ -1126,123 +1148,123 @@
                featureType: "water",
                elementType: "all",
                stylers: {
                  color: "#86a1ac"
                }
                  color: "#86a1ac",
                },
              },
              {
                featureType: "land",
                elementType: "all",
                stylers: {
                  color: "#f1d99d"
                }
                  color: "#f1d99d",
                },
              },
              {
                featureType: "railway",
                elementType: "all",
                stylers: {
                  visibility: "off"
                }
                  visibility: "off",
                },
              },
              {
                featureType: "highway",
                elementType: "all",
                stylers: {
                  color: "#f1d99d"
                }
                  color: "#f1d99d",
                },
              },
              {
                featureType: "highway",
                elementType: "labels",
                stylers: {
                  visibility: "off"
                }
                  visibility: "off",
                },
              },
              {
                featureType: "arterial",
                elementType: "geometry",
                stylers: {
                  color: "#f1d99d"
                }
                  color: "#f1d99d",
                },
              },
              {
                featureType: "arterial",
                elementType: "geometry.fill",
                stylers: {
                  color: "#f1d99d"
                }
                  color: "#f1d99d",
                },
              },
              {
                featureType: "poi",
                elementType: "all",
                stylers: {
                  visibility: "off"
                }
                  visibility: "off",
                },
              },
              {
                featureType: "green",
                elementType: "all",
                stylers: {
                  visibility: "off"
                }
                  visibility: "off",
                },
              },
              {
                featureType: "subway",
                elementType: "all",
                stylers: {
                  visibility: "off"
                }
                  visibility: "off",
                },
              },
              {
                featureType: "manmade",
                elementType: "all",
                stylers: {
                  color: "#f1d99d"
                }
                  color: "#f1d99d",
                },
              },
              {
                featureType: "local",
                elementType: "all",
                stylers: {
                  color: "#f1d99d"
                }
                  color: "#f1d99d",
                },
              },
              {
                featureType: "local",
                elementType: "labels",
                stylers: {
                  visibility: "off"
                }
                  visibility: "off",
                },
              },
              {
                featureType: "arterial",
                elementType: "labels",
                stylers: {
                  visibility: "off"
                }
                  visibility: "off",
                },
              },
              {
                featureType: "boundary",
                elementType: "all",
                stylers: {
                  color: "#f1d99d"
                }
                  color: "#f1d99d",
                },
              },
              {
                featureType: "building",
                elementType: "all",
                stylers: {
                  color: "#f1d99d"
                }
                  color: "#f1d99d",
                },
              },
              {
                featureType: "label",
                elementType: "labels.text.fill",
                stylers: {
                  color: "#000"
                }
              }
            ]
          }
                  color: "#000",
                },
              },
            ],
          },
        },
        series: [
          {
@@ -1252,18 +1274,18 @@
            data: data,
            symbolSize: 0,
            encode: {
              value: 2
              value: 2,
            },
            label: {
              formatter: "{b}",
              position: "right",
              show: false
              show: false,
            },
            emphasis: {
              label: {
                show: true
              }
            }
                show: true,
              },
            },
          },
          {
            name: "",
@@ -1272,32 +1294,32 @@
            data: data,
            symbolSize: 20,
            encode: {
              value: 2
              value: 2,
            },
            showEffectOn: "render",
            rippleEffect: {
              brushType: "stroke"
              brushType: "stroke",
            },
            label: {
              formatter: "{b}",
              position: "right",
              show: false
              show: false,
            },
            itemStyle: {
              color: "#ec7b43",
              shadowBlur: 10,
              shadowColor: "#333"
              shadowColor: "#333",
            },
            emphasis: {
              scale: false
              scale: false,
            },
            zlevel: 1
          }
        ]
            zlevel: 1,
          },
        ],
      };
      option && myChart.setOption(option);
    }
  }
    },
  },
};
</script>


 src/pages/characterMap/characterMap.vue

@@ -1,8 +1,10 @@
<template>
  <view style="width: 100%;height: 100%;display: flex;flex-direction: column;">
  <view
    style="width: 100%; height: 100%; display: flex; flex-direction: column"
  >
    <headNav :idIndex="1 + ''" text="中医人物数据库" />
    <el-button class="getBack" @click="goBack">返回</el-button>
    <view style="flex: 1;overflow: hidden;">
    <view style="flex: 1; overflow: hidden">
      <!-- 地图 -->
      <!-- <view id="spaceTime" style="height: 90vh;width: 100%;position: relative;"></view> -->
      <div id="map"></div>
@@ -26,8 +28,12 @@
          <li>出生于{{ basicInfo.nativePlace || "-" }}</li>
          <li>
            <span v-if="basicInfo.birthYear">{{basicInfo.birthYear}}</span>
            <span v-if="basicInfo.nativePlace">{{basicInfo.nativePlace}}</span>
            <span v-if="basicInfo.nowPlace">（今{{basicInfo.nowPlace}}）</span>
            <span v-if="basicInfo.nativePlace">{{
              basicInfo.nativePlace
            }}</span>
            <span v-if="basicInfo.nowPlace"
              >（今{{ basicInfo.nowPlace }}）</span
            >
          </li>
        </ul>
        <ul
@@ -97,7 +103,7 @@
        deathYear: "",
        nativePlace: "",
        nowPlace: "",
      }
      },
    };
  },

@@ -118,7 +124,7 @@
    initMap(info) {
      var map = L.map("map", {
        attributionControl: false,
        preferCanvas: true
        preferCanvas: true,
      }).setView([35.91667, 110.41667], 5);

      // L.tileLayer(
@@ -129,26 +135,33 @@
        .chinaProvider("TianDiTu.Normal.Map", {
          key: "76bc34ead7e30e663a4eded8aeaf5860",
          maxZoom: 18,
          minZoom: 5
          minZoom: 5,
        })
        .addTo(map);
      L.tileLayer
        .chinaProvider("TianDiTu.Normal.Annotion", {
          key: "76bc34ead7e30e663a4eded8aeaf5860",
          maxZoom: 18,
          minZoom: 3,
        })
        .addTo(map);
      let DefaultIcon1 = L.icon({
        iconUrl: this.icoName,
        iconSize: [24, 41], //  图标的大小    【值1，值2】 为具体你自定义图标的尺寸，比如我图标尺寸是32×52，表示该图标：宽度32像素，高度：52像素，那么值1:就是32，值2：就是52
        iconAnchor: [24, 41], //  图标将对应标记点的位置 这个是重点， 【值1，值2】，值1：为图标坐标第一个值(即32)的一半，值2：为图标坐标第二个值(即52)
        popupAnchor: [1, -24] // 该点是相对于iconAnchor弹出信息的位置  这个是我手动调出来的，文档默认原始值是[-1，-76]，我是去一半值，取一半值调出来的
        popupAnchor: [1, -24], // 该点是相对于iconAnchor弹出信息的位置  这个是我手动调出来的，文档默认原始值是[-1，-76]，我是去一半值，取一半值调出来的
      });
      let icon = L.divIcon({
        html: "<div class='map-circle-name ripple'></div>",
        iconSize: [80, 80],
        className: "map-circle"
        className: "map-circle",
      });
      this.map = map;
      if (info && info.length) {
        for (let i = 0; i < info.length; i++) {
          const item = info[i];
          const marker1 = L.marker([item.ycoord, item.xcoord], {
            icon: icon
            icon: icon,
          }).addTo(map);
          marker1.on("click", (e) => {
            this.menuNav = true;
@@ -180,7 +193,7 @@
    getPersonInfoFun() {
      getPersonInfo({
        id: this.$route.query.id,
        type: "PERSON_SPACE_TIME"
        type: "PERSON_SPACE_TIME",
      }).then((res) => {
        this.initMap(res.object.personSpaceTimeList);
      });
@@ -189,7 +202,7 @@
    getBasicInfo() {
      getPersonInfo({
        id: this.$route.query.id,
        type: "PERSON_BASIC"
        type: "PERSON_BASIC",
      }).then((res) => {
        this.basicInfo.name = res.object.personFieldList.find(
          (f) => f.fieldName == "WEAK_NAME"
@@ -250,40 +263,40 @@
      const data = [
        {
          name: "海门",
          value: 9
          value: 9,
        },
        {
          name: "金昌",
          value: 19
          value: 19,
        },
        {
          name: "泉州",
          value: 21
          value: 21,
        },
        {
          name: "衢州",
          value: 177
          value: 177,
        },
        {
          name: "廊坊",
          value: 193
          value: 193,
        },
        {
          name: "菏泽",
          value: 194
          value: 194,
        },
        {
          name: "合肥",
          value: 229
          value: 229,
        },
        {
          name: "武汉",
          value: 273
          value: 273,
        },
        {
          name: "啊三大矿及说到底是封建士大夫大师傅就",
          value: 279
        }
          value: 279,
        },
      ];
      const geoCoordMap = {
        海门: [121.15, 31.89],
@@ -313,7 +326,7 @@
        菏泽: [115.480656, 35.23375],
        合肥: [117.27, 31.86],
        武汉: ["你好", 30.52],
        啊三大矿及说到底是封建士大夫大师傅就: [125.03, 46.58]
        啊三大矿及说到底是封建士大夫大师傅就: [125.03, 46.58],
      };
      const convertData = function (data) {
        var res = [];
@@ -322,7 +335,7 @@
          if (geoCoord) {
            res.push({
              name: data[i].name,
              value: geoCoord.concat(data[i].value)
              value: geoCoord.concat(data[i].value),
            });
          }
        }
@@ -330,7 +343,7 @@
      };
      option = {
        tooltip: {
          trigger: "item"
          trigger: "item",
        },
        bmap: {
          center: [104.114129, 37.550339], // 调整地图中心点位置
@@ -342,60 +355,60 @@
                featureType: "water",
                elementType: "all",
                stylers: {
                  color: "#d1d1d1"
                }
                  color: "#d1d1d1",
                },
              },
              {
                featureType: "land",
                elementType: "all",
                stylers: {
                  color: "#f3f3f3"
                }
                  color: "#f3f3f3",
                },
              },
              {
                featureType: "manmade",
                elementType: "all",
                stylers: {
                  color: "#d1d1d1"
                }
                  color: "#d1d1d1",
                },
              },
              {
                featureType: "local",
                elementType: "all",
                stylers: {
                  color: "#d1d1d1"
                }
                  color: "#d1d1d1",
                },
              },
              {
                featureType: "arterial",
                elementType: "labels",
                stylers: {
                  visibility: "off"
                }
                  visibility: "off",
                },
              },
              {
                featureType: "boundary",
                elementType: "all",
                stylers: {
                  color: "#fefefe"
                }
                  color: "#fefefe",
                },
              },
              {
                featureType: "building",
                elementType: "all",
                stylers: {
                  color: "#d1d1d1"
                }
                  color: "#d1d1d1",
                },
              },
              {
                featureType: "label",
                elementType: "labels.text.fill",
                stylers: {
                  color: "#999999"
                }
              }
            ]
          }
                  color: "#999999",
                },
              },
            ],
          },
        },
        series: [
          {
@@ -412,11 +425,11 @@
              return val[2] / 10;
            },
            encode: {
              value: 2
              value: 2,
            },
            showEffectOn: "render",
            rippleEffect: {
              brushType: "stroke"
              brushType: "stroke",
            },
            label: {
              formatter: "{b}",
@@ -434,18 +447,18 @@
              },
              show: true,
              fontSize: 12,
              borderRadius: 30
              borderRadius: 30,
            },
            itemStyle: {
              shadowBlur: 10,
              shadowColor: "#333"
              shadowColor: "#333",
            },
            emphasis: {
              scale: true
              scale: true,
            },
            zlevel: 1
          }
        ]
            zlevel: 1,
          },
        ],
      };
      let menuNav1 = this.menuNav;
      let menuNav2 = this.menuNav;
@@ -468,8 +481,8 @@
      // 修改 Vue 组件的数据，例如显示菜单导航
      this.menuNav = !this.menuNav;
      // 时空地图的数据
    }
  }
    },
  },
};
</script>


 src/pages/territory/territory.vue

@@ -426,6 +426,7 @@
          nativePlace: item?.content1,
          barnch: item?.MEDICAL_BRANCH[0]?.content1,
          medical: item?.MEDICAL_EXPERTISE[0]?.content1,
          id: item.id,
        };
        this.$nextTick(() => {
          this.isTop =
@@ -446,7 +447,6 @@
        dynasty: this.dynasty1Color,
      }).then(async (res) => {
        const totalCount = res.object;
        console.log(totalCount, "totalCount");
        if (totalCount % 200 == 0) {
          times = totalCount / 200 - 1;
        } else {
@@ -461,7 +461,6 @@
            markerList = [...markerList, ...curData];
          }
          if (i == times) {
            console.log(markerList, "markerList");
            this.initMap(markerList);
            this.SearchArr = markerList.map((item) => ({
              birthAndDeath: item?.BIRTH_YEAR[0]?.content1
@@ -588,6 +587,13 @@
          minZoom: 3,
        })
        .addTo(map);
      L.tileLayer
        .chinaProvider("TianDiTu.Normal.Annotion", {
          key: "76bc34ead7e30e663a4eded8aeaf5860",
          maxZoom: 18,
          minZoom: 3,
        })
        .addTo(map);
      let DefaultIcon1 = L.icon({
        iconUrl: this.icoName,
        iconSize: [24, 41], //  图标的大小    【值1，值2】 为具体你自定义图标的尺寸，比如我图标尺寸是32×52，表示该图标：宽度32像素，高度：52像素，那么值1:就是32，值2：就是52
@@ -651,6 +657,7 @@
                nativePlace: item?.content1,
                barnch: item?.MEDICAL_BRANCH[0]?.content1,
                medical: item?.MEDICAL_EXPERTISE[0]?.content1,
                id: item.id,
              };
              this.isTop = e.containerPoint.y - 275 + "px";
              this.isLeft = e.containerPoint.x - 171 + "px";
@@ -677,7 +684,7 @@
    // 查看更多>>
    viewMoreClick() {
      uni.navigateTo({
        url: "/pages/character/detail",
        url: "/pages/character/detail?id=" + this.currentMark.id,
      });
    },
  },