1
y505174330
2024-05-18 842bbd680d229252c6a8010f97ef6d35e49c542c
1
2个文件已修改
138 ■■■■ 已修改文件
src/pages/characterMap/characterMap.vue 55 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/pages/territory/territory.vue 83 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/pages/characterMap/characterMap.vue
@@ -1,28 +1,38 @@
<template>
  <view>
    <headNav :idIndex="idIndex" text="中医人物数据库" />
    <el-button class="getBack" @click="getBack">返回</el-button>
    <view class="" style="position: relative">
    <headNav
      :idIndex="idIndex"
      text="中医人物数据库"
    />
    <el-button
      class="getBack"
      @click="getBack"
    >返回</el-button>
    <view
      class=""
      style="position: relative"
    >
      <!-- 地图 -->
      <!-- <view id="spaceTime" style="height: 90vh;width: 100%;position: relative;"></view> -->
      <div id="map"></div>
      <!-- 详情 -->
      <el-dialog class="particulars" :visible.sync="menuNav" :modal="false">
      <el-dialog
        class="particulars"
        :visible.sync="menuNav"
        :modal="false"
      >
        <view
          class="font-family"
          style="font-size: 0.26rem; padding-top: 0.16rem; font-weight: bold"
          >{{ activityInfo.participants }}</view
        >
        <ul
          style="
        >{{ activityInfo.participants }}</view>
        <ul style="
            border-bottom: 0.01rem solid #d8d8d8;
            padding: 0.16rem 0;
            font-size: 0.14rem;
            font-weight: 400;
            line-height: 0.28rem;
          "
        >
          ">
          <li>出生于{{ basicInfo.nativePlace }}</li>
          <li>
            {{
@@ -34,14 +44,12 @@
            }}
          </li>
        </ul>
        <ul
          style="
        <ul style="
            margin: 0.31rem 0 0.11rem 0;
            font-size: 0.14rem;
            font-weight: 400;
            line-height: 0.28rem;
          "
        >
          ">
          <li>活动名称:{{ activityInfo.activityName }}</li>
          <li>活动地点:{{ activityInfo.activityAddr }}</li>
          <li>活动区间:{{ activityInfo.time }}</li>
@@ -53,10 +61,14 @@
          src="https://img0.baidu.com/it/u=1845740325,2917001370&fm=253&app=120&size=w931&n=0&f=JPEG&fmt=auto?sec=1711731600&t=0b208ab46e1d33aa81ac31dd6bf627be"
          alt=""
        /> -->
        <div class="box" style="width: 80%">
          <span class="span" :style="{ marginLeft: spanML + 'rem' }"
            >{{ span }}年</span
          >
        <div
          class="box"
          style="width: 80%"
        >
          <span
            class="span"
            :style="{ marginLeft: spanML + 'rem' }"
          >{{ span }}年</span>
          <div class="scales">
            <view
              v-for="(item, index) in yearArr"
@@ -66,7 +78,10 @@
            ></view>
          </div>
          <div class="MX"></div>
          <div class="cursor" :style="{ marginLeft: cursorML + 'rem' }"></div>
          <div
            class="cursor"
            :style="{ marginLeft: cursorML + 'rem' }"
          ></div>
        </div>
      </el-dialog>
    </view>
@@ -77,6 +92,7 @@
import * as echarts from "echarts";
import "echarts/extension/bmap/bmap";
import { loadBMap } from "@/static/map.js";
import "leaflet.chinatmsproviders";
import L from "leaflet";
import { getPersonInfo } from "@/api/index.js";
export default {
@@ -122,7 +138,6 @@
      // L.tileLayer(
      //   "http://webrd01.is.autonavi.com/appmaptile?lang=zh_cn&size=1&scale=1&style=7&x={x}&y={y}&z={z}"
      // ).addTo(map);
      L.tileLayer
        .chinaProvider("TianDiTu.Normal.Map", {
src/pages/territory/territory.vue
@@ -1,7 +1,10 @@
<template>
  <view class="pageBox">
    <!-- 顶部导航 -->
    <headNav :idIndex="idIndex" text="中医地域医谱" />
    <headNav
      :idIndex="idIndex"
      text="中医地域医谱"
    />
    <view
      class="flex flex-center"
      style="width: 100%; margin: 0.2rem 0 0.34rem; justify-content: flex-start"
@@ -14,7 +17,11 @@
        :keyword="keyword"
      />
      <ul class="flex">
        <li style="" v-for="(item, index) in dynasty" :key="item.id">
        <li
          style=""
          v-for="(item, index) in dynasty"
          :key="item.id"
        >
          <view
            @click="SchoolClick(item.id)"
            class="flex flex-center font-family school"
@@ -42,7 +49,10 @@
                border-radius: 50%;
              "
            ></view>
            <view class="" style="color: #2c2c2c; font-size: 0.12rem">{{
            <view
              class=""
              style="color: #2c2c2c; font-size: 0.12rem"
            >{{
              item.name
            }}</view>
          </view>
@@ -62,7 +72,10 @@
        top: 2.2rem;
      "
    >
      <div slot="header" class="clearfix">
      <div
        slot="header"
        class="clearfix"
      >
        <span>人物 ({{ SearchArr.length }})</span>
        <el-button
          style="
@@ -73,11 +86,18 @@
          "
          @click="isSearch = false"
          type="text"
          >关闭</el-button
        >
        >关闭</el-button>
      </div>
      <view class="" style="overflow: auto; height: 2.5rem">
        <ul class="information" v-for="(item, index) in SearchArr" :key="index">
      <view
        class=""
        style="overflow: auto; height: 2.5rem"
      >
        <ul
          class="information"
          v-for="(item, index) in SearchArr"
          :key="index"
          @click="showCard(item)"
        >
          <li style="font-size: 0.18rem; font-weight: 700">
            {{ item.name ? item.name : "-" }}
          </li>
@@ -105,7 +125,10 @@
      "
      :style="{ top: isTop, left: isLeft }"
    >
      <div slot="header" class="clearfix">
      <div
        slot="header"
        class="clearfix"
      >
        <span v-if="currentMark">{{
          currentMark.name ? currentMark.name : "-"
        }}</span>
@@ -118,10 +141,12 @@
          "
          @click="isEchTrue = false"
          type="text"
          >关闭</el-button
        >
        >关闭</el-button>
      </div>
      <ul class="information" v-if="currentMark">
      <ul
        class="information"
        v-if="currentMark"
      >
        <li>
          姓名:
          {{ currentMark.name ? currentMark.name : "-" }}
@@ -138,8 +163,7 @@
        @click="viewMoreClick"
        style="width: 100%; padding: 3px 0; font-size: 0.12rem; color: #597aa5"
        type="text"
        >查看更多>></el-button
      >
      >查看更多>></el-button>
    </el-card>
    <!-- echarts地图 -->
    <!-- <view id="main" style="width: 100vw; position: relative"></view> -->
@@ -377,6 +401,22 @@
    this.getDataList();
  },
  methods: {
    showCard(info) {
      console.log(info);
      console.log(this.markerList);
      const item = this.markerList.find((f) => f.id == info.id);
      console.log(item, "12312");
      this.currentMark = {
        name: item?.WEAK_NAME[0]?.content1,
        nikeName: item?.ALIAS[0]?.content2,
        nativePlace: item?.content1,
        barnch: item?.MEDICAL_BRANCH[0]?.content1,
        medical: item?.MEDICAL_EXPERTISE[0]?.content1,
      };
      console.log(this.currentMark);
      console.log(this.map);
      this.isEchTrue = true;
    },
    getDataList() {
      getRetrieval({ keyword: this.keyword, dynasty: "" }).then((res) => {
        let markerList = [];
@@ -393,11 +433,16 @@
        }
        this.initMap(markerList);
        this.SearchArr = markerList.map((item) => ({
          birthAndDeath: item?.BIRTH_YEAR[0]?.content1 ?
            item?.BIRTH_YEAR[0]?.content1 + "-" + item?.DEATH_YEAR[0]?.content1 :'-',
          birthAndDeath: item?.BIRTH_YEAR[0]?.content1
            ? item?.BIRTH_YEAR[0]?.content1 +
              "-" +
              item?.DEATH_YEAR[0]?.content1
            : "-",
          name: item?.NAME[0]?.content1,
          source: "-",
          id: item.id,
        }));
        this.markerList = markerList;
        console.log(markerList, "markerList");
      });
    },
@@ -406,17 +451,15 @@
      var map = L.map("map", {
        attributionControl: false,
        preferCanvas: true,
        withPopup: L.latLng(34.261, 108.96),
      }).setView([39.91667, 116.41667], 3);
      L.tileLayer
        .chinaProvider("TianDiTu.Normal.Map", {
          key: "76bc34ead7e30e663a4eded8aeaf5860",
          // maxZoom: 18,
          // minZoom: 5,
          maxZoom: 18,
          minZoom: 3,
        })
        .addTo(map);
      this.map = map;
      let DefaultIcon1 = L.icon({
        iconUrl: this.icoName,
        iconSize: [24, 41], //  图标的大小    【值1,值2】 为具体你自定义图标的尺寸,比如我图标尺寸是32×52,表示该图标:宽度32像素,高度:52像素,那么值1:就是32,值2:就是52