From 1a5b2a6443dc24e3e024e2c0bb500d80a2b20d11 Mon Sep 17 00:00:00 2001
From: 杨磊 <505174330@qq.com>
Date: 星期四, 06 六月 2024 15:36:37 +0800
Subject: [PATCH] Merge branch 'master' of http://182.92.203.7:2001/r/TCM_CharacterLibrary

---
 src/pages/territory/territory.vue |  866 +++++++++++++++++++++++++++++++++------------------------
 1 files changed, 505 insertions(+), 361 deletions(-)

diff --git a/src/pages/territory/territory.vue b/src/pages/territory/territory.vue
index c09d6d9..eecc841 100644
--- a/src/pages/territory/territory.vue
+++ b/src/pages/territory/territory.vue
@@ -1,24 +1,25 @@
 <template>
   <view class="pageBox">
     <!-- 椤堕儴瀵艰埅 -->
-    <headNav :idIndex="idIndex" text="涓尰鍦板煙鍖昏氨" />
+    <headNav :idIndex="idIndex" text="涓尰鍦板煙鍖昏氨" style="z-index: 999" />
     <view
       class="flex flex-center"
-      style="width: 100%; margin: 0.2rem 0 0.34rem; justify-content: flex-start"
+      style="width: 100%; margin: 20px 0 34px; justify-content: flex-start"
     >
       <advancedSearch
         class="Search"
         placehold="杈撳叆濮撳悕/鍒悕/鏈濅唬/浼犱富鑱屼笟鎼滅储"
         @onSearch="onSearch"
         :isAvancedTrue="false"
+        :keyword="keyword"
       />
       <ul class="flex">
-        <li style="" v-for="(item, index) in dynasty" :key="item.id">
+        <li v-for="(item, index) in dynasty" :key="item.id">
           <view
             @click="SchoolClick(item.id)"
             class="flex flex-center font-family school"
             :style="{
-              marginRight: index === dynasty.length - 1 ? '0' : '0.03rem'
+              marginRight: index === dynasty.length - 1 ? '0' : '0.03rem',
             }"
             style="
               font-weight: 500;
@@ -32,7 +33,6 @@
             "
           >
             <view
-              class=""
               :style="{ background: item.color }"
               style="
                 margin-right: 0.07rem;
@@ -41,7 +41,7 @@
                 border-radius: 50%;
               "
             ></view>
-            <view class="" style="color: #2c2c2c; font-size: 0.12rem">{{
+            <view style="color: #2c2c2c; font-size: 0.12rem">{{
               item.name
             }}</view>
           </view>
@@ -56,7 +56,7 @@
         height: 3.2rem;
         width: 3rem;
         position: fixed;
-        z-index: 999999999999;
+        z-index: 99;
         left: 1rem;
         top: 2.2rem;
       "
@@ -75,11 +75,35 @@
           >鍏抽棴</el-button
         >
       </div>
-      <view class="" style="overflow: auto; height: 2.5rem">
-        <ul class="information" v-for="(item, index) in SearchArr" :key="index">
-          <li style="font-size: 0.18rem; font-weight: 700">{{ item.name }}</li>
-          <li>鐢熷崚骞�: {{ item.birthAndDeath }}</li>
-          <li>鏉ユ簮: {{ item.source }}</li>
+      <view style="overflow: auto; height: 2.5rem">
+        <div
+          v-if="!loading && SearchArr.length == 0"
+          style="
+            position: absolute;
+            top: 30%;
+            left: 0;
+            right: 0;
+            text-align: center;
+            font-size: 0.2rem;
+            color: #666;
+          "
+        >
+          鏆傛棤鎼滅储鏁版嵁
+        </div>
+        <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>
+          <li>
+            鐢熷崚骞�:
+            {{ item.birthAndDeath ? item.birthAndDeath : "-" }}
+          </li>
+          <li>鏉ユ簮: {{ item.source ? item.source : "-" }}</li>
           <li
             v-if="SearchArr.length - 1 !== index"
             style="margin: 0.1rem 0; border-bottom: 1px solid #d8d8d8"
@@ -88,51 +112,70 @@
       </view>
     </el-card>
     <!-- echarts閲岄潰鐨勬暟鎹偣鍑诲悗寮规 -->
-    <el-card
-      class="box-card echartsTrue"
-      v-if="isEchTrue"
-      style="
-        overflow: inherit;
-        width: 3rem;
-        position: fixed;
-        z-index: 999999999999;
-      "
-      :style="{ top: isTop, left: isLeft }"
-    >
-      <div slot="header" class="clearfix">
-        <span>{{ information[0].content }}</span>
+
+    <div class="mapBox" id="mapBox" v-loading="mapLoading">
+      <div id="map"></div>
+      <el-card
+        class="box-card echartsTrue"
+        v-show="isEchTrue"
+        style="overflow: inherit; width: 3rem; position: absolute; z-index: 999"
+        :style="{ top: isTop, left: isLeft }"
+      >
+        <div slot="header" class="clearfix">
+          <span v-if="currentMark">{{
+            currentMark.name ? currentMark.name : "-"
+          }}</span>
+          <el-button
+            style="
+              float: right;
+              padding: 3px 0;
+              font-size: 0.12rem;
+              color: #597aa5;
+            "
+            @click="isEchTrue = false"
+            type="text"
+            >鍏抽棴</el-button
+          >
+        </div>
+        <ul class="information" v-if="currentMark">
+          <li>
+            濮撳悕:
+            {{ currentMark.name ? currentMark.name : "-" }}
+          </li>
+          <li>鍒悕: {{ currentMark.nikeName ? currentMark.nikeName : "-" }}</li>
+          <li>
+            绫嶈疮: {{ currentMark.nativePlace ? currentMark.nativePlace : "-" }}
+          </li>
+          <li>鍖诲鍒嗙: {{ currentMark.barnch ? currentMark.barnch : "-" }}</li>
+          <li>灏忎紶: {{ currentMark.medical ? currentMark.medical : "-" }}</li>
+        </ul>
         <el-button
+          class="flex"
+          @click="viewMoreClick"
           style="
-            float: right;
+            width: 100%;
             padding: 3px 0;
             font-size: 0.12rem;
             color: #597aa5;
           "
-          @click="isEchTrue = false"
           type="text"
-          >鍏抽棴</el-button
+          >鏌ョ湅鏇村>></el-button
         >
-      </div>
-      <ul class="information">
-        <li v-for="(item, index) in information" :key="index">
-          {{ item.label }}: {{ item.content }}
-        </li>
-      </ul>
-      <el-button
-        class="flex"
-        @click="viewMoreClick"
-        style="width: 100%; padding: 3px 0; font-size: 0.12rem; color: #597aa5"
-        type="text"
-        >鏌ョ湅鏇村>></el-button
-      >
-    </el-card>
-    <!-- echarts鍦板浘 -->
-    <view id="main" style="width: 100vw; position: relative"></view>
+      </el-card>
+    </div>
 
     <!-- 鏈濅唬 -->
     <view
       class="flex flex-center"
-      style="width: 100%; position: fixed; bottom: 0.33rem; left: 0"
+      style="
+        width: 100%;
+        position: fixed;
+        bottom: 0.33rem;
+        left: 0;
+        right: 0;
+        z-index: 99;
+        overflow: auto;
+      "
     >
       <ul class="flex">
         <li
@@ -144,14 +187,15 @@
             class="flex flex-center"
             style="height: 0.35rem; background-color: #fff; color: #244a7b"
           >
-            {{ item.coord }}
+            {{ item.start }}
           </view>
           <view
             class="flex flex-center font-family"
             style="
-              padding: 0.05rem 0.19rem;
+              min-width: 0.6rem;
               height: 0.3rem;
               line-height: 0.3rem;
+              text-align: center;
               color: #fff;
               font-size: 0.14rem;
               margin-top: 0.03rem;
@@ -160,10 +204,10 @@
             "
             :style="{
               marginRight: index === dynasty1.length - 1 ? '0' : '0.03rem',
-              background: dynasty1Color == item.id ? '#244A7B' : '#597AA5'
+              background: dynasty1Color == item.id ? '#244A7B' : '#597AA5',
             }"
           >
-            {{ item.name }}
+            {{ item.dynastyChs }}
           </view>
         </li>
       </ul>
@@ -174,12 +218,18 @@
 <!-- 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, getDynasty, getPreCount } from "@/api/index.js";
 export default {
   data() {
     return {
+      loading: true,
+      mapLoading: true,
       // echarts鍏冪礌鐐瑰嚮鏃跺嚭鏉ョ殑寮圭獥鍜屽潗鏍�
+      keyword: "",
       isEchTrue: false,
       isLeft: 0,
       isTop: 0,
@@ -187,456 +237,509 @@
       information: [
         {
           label: "濮撳悕",
-          content: "鏉庢椂鐝�"
+          content: "鏉庢椂鐝�",
         },
         {
           label: "鍒悕",
-          content: "涓滀附鍏堢敓"
+          content: "涓滀附鍏堢敓",
         },
         {
           label: "绫嶈疮",
-          content: "婀栧寳"
+          content: "婀栧寳",
         },
         {
           label: "鍖诲鍒嗙",
-          content: "涓嵂,閽堢伕"
+          content: "涓嵂,閽堢伕",
         },
         {
           label: "灏忎紶",
           content:
-            "鏉庢椂鐝�(绾�1518骞磣1593 骞�)锛� 瀛椾笢鐠э紝 鏅氬勾鑷彿婵掓箹灞变汉锛� 婀栧箍榛勫窞搴滆柂宸�(浠婃箹鍖楃渷钖槬鍘�) 浜猴紝 鏄庝唬钁楀悕鍖昏嵂瀛﹀銆� 涓庘�� 鍖诲湥鈥� 涓囧瘑鏂嬮綈鍚嶏紝 鍙ゆ湁鈥� 涓囧瘑鏂嬬殑鏂癸紝 鏉庢椂鐝嶇殑鑽�� 涔嬭銆� 鍚庝负妤氬共搴�..."
-        }
+            "鏉庢椂鐝�(绾�1518骞磣1593 骞�)锛� 瀛椾笢鐠э紝 鏅氬勾鑷彿婵掓箹灞变汉锛� 婀栧箍榛勫窞搴滆柂宸�(浠婃箹鍖楃渷钖槬鍘�) 浜猴紝 鏄庝唬钁楀悕鍖昏嵂瀛﹀銆� 涓庘�� 鍖诲湥鈥� 涓囧瘑鏂嬮綈鍚嶏紝 鍙ゆ湁鈥� 涓囧瘑鏂嬬殑鏂癸紝 鏉庢椂鐝嶇殑鑽�� 涔嬭銆� 鍚庝负妤氬共搴�...",
+        },
       ],
       // 涓嬮潰鐨勬湞浠�1
-      dynasty1Color: 1,
+      dynasty1Color: "",
       dynasty1: [
         {
           name: "澶忔湞",
           coord: "2070BC",
-          id: 1
+          id: 1,
         },
         {
           name: "鍟嗘湞",
           id: 2,
-          coord: "1600BC"
+          coord: "1600BC",
         },
         {
           name: "瑗垮懆",
           id: 3,
-          coord: "1600BC"
+          coord: "1600BC",
         },
         {
           name: "鏄ョ鎴樺浗",
           id: 4,
-          coord: "770BC"
+          coord: "770BC",
         },
         {
           name: "绉︽湞",
           id: 5,
-          coord: "221BC"
+          coord: "221BC",
         },
         {
           name: "姹夋湞",
           id: 6,
-          coord: "202BC"
+          coord: "202BC",
         },
         {
           name: "涓夊浗涓ゆ檵鍗楀寳鏈�",
           id: 7,
-          coord: "184"
+          coord: "184",
         },
         {
           name: "闅嬫湞",
           id: 8,
-          coord: "581"
+          coord: "581",
         },
         {
           name: "鍞愭湞",
           id: 9,
-          coord: "618"
+          coord: "618",
         },
         {
           name: "浜斾唬鍗佸浗",
           id: 10,
-          coord: "907"
+          coord: "907",
         },
         {
           name: "杈藉閲�",
           id: 11,
-          coord: "907"
+          coord: "907",
         },
         {
           name: "瀹嬫湞",
           id: 12,
-          coord: "960"
+          coord: "960",
         },
         {
           name: "鍏冩湞",
           id: 13,
-          coord: "1271"
+          coord: "1271",
         },
         {
           name: "鏄庢湞",
           id: 14,
-          coord: "1368"
+          coord: "1368",
         },
         {
           name: "娓呮湞",
           id: 15,
-          coord: "1636"
-        }
+          coord: "1636",
+        },
       ],
       // 鏍囬椤堕儴鏍忛渶瑕佺殑涓滆タ
       idIndex: 0,
       // 鏈濅唬
       dynasty: [
         {
-          name: "澶忔湞",
+          name: "澶�",
           color: "#90BBD8",
-          id: 1
+          id: 1,
         },
         {
-          name: "鍟嗘湞",
+          name: "鍟�",
           color: "#EDD28B",
-          id: 2
+          id: 2,
         },
         {
           name: "瑗垮懆",
           color: "#CF746D",
-          id: 3
+          id: 3,
         },
         {
-          name: "绉︽湞",
+          name: "绉�",
           color: "#9CC27A",
-          id: 4
+          id: 4,
         },
         {
-          name: "姹夋湞",
+          name: "姹�",
           color: "#5B6CB9",
-          id: 5
+          id: 5,
         },
         {
-          name: "闅嬫湞",
+          name: "闅�",
           color: "#8860A8",
-          id: 6
+          id: 6,
         },
         {
-          name: "鍞愭湞",
+          name: "鍞�",
           color: "#DE8E66",
-          id: 7
-        }
+          id: 7,
+        },
+        {
+          name: "鏄�",
+          color: "#DE8E66",
+          id: 8,
+        },
       ],
       // 鎼滅储鍚庢槸鍚︽樉绀哄脊妗�
       isSearch: false,
+      currentMark: null,
       SearchArr: [
         {
           id: 1,
           name: "鏉庢椂鐝�",
           birthAndDeath: "1518-1593",
-          source: "鍥藉浘瑙勮寖妗o紝CBDB锛屼笂鍥惧彜绫嶆暟鎹簱 绫嶈疮锛氭箹鍖�"
+          source: "鍥藉浘瑙勮寖妗o紝CBDB锛屼笂鍥惧彜绫嶆暟鎹簱 绫嶈疮锛氭箹鍖�",
         },
         {
           id: 2,
           name: "鏉庢椂鐝�",
           birthAndDeath: "1518-1593",
-          source: "鍥藉浘瑙勮寖妗o紝CBDB锛屼笂鍥惧彜绫嶆暟鎹簱 绫嶈疮锛氭箹鍖�"
-        }
-      ]
+          source: "鍥藉浘瑙勮寖妗o紝CBDB锛屼笂鍥惧彜绫嶆暟鎹簱 绫嶈疮锛氭箹鍖�",
+        },
+      ],
     };
   },
   onLoad(options) {
     this.idIndex = options.id;
-    console.log("optionsoptionsoptions", options.id);
   },
   mounted() {
-    console.log("ss");
-    // this.$nextTick(() => {
-    loadBMap("1NJdwrI1CfT6lrykVhDkmWgsO6O2bjQK").then(() => {
-      this.innt();
-    });
-    // })
+    this.getDynastyList();
+
+    this.getDataList();
   },
   methods: {
+    getDynastyList() {
+      getDynasty().then((res) => {
+        this.dynasty1 = res.list;
+      });
+    },
+    showCard(info) {
+      const item = this.markerList.find((f) => f.id == info.id);
+      var latlng = L.latLng(item.yCoord, item.xCoord);
+      this.map.setView(latlng, 10);
+      setTimeout(() => {
+        this.isEchTrue = true;
+        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,
+          id: item.id,
+        };
+        this.$nextTick(() => {
+          this.isTop =
+            document.getElementById("mapBox").offsetHeight / 2 - 275 + "px";
+          this.isLeft =
+            document.getElementById("mapBox").offsetWidth / 2 - 171 + "px";
+        });
+      }, 300);
+    },
+    getDataList() {
+      this.SearchArr = [];
+      this.loading = true;
+      this.mapLoading = true;
+      // 杩欓噷鏀规垚浜嗗垎椤电殑鎺ュ彛锛岄渶瑕佽皟鐢ㄥ娆″彇鍑烘墍鏈夋暟鎹�
+      let times = 0;
+      getPreCount({
+        keyword: this.keyword,
+        dynasty: this.dynasty1Color,
+      }).then(async (res) => {
+        const totalCount = res.object;
+        if (totalCount % 200 == 0) {
+          times = totalCount / 200 - 1;
+        } else {
+          times = Math.floor(totalCount / 200);
+        }
+        console.log(times, "times");
+        if (times == 0 || times < 0) times = 1;
+        let markerList = [];
+        for (let i = 1; i <= times; i++) {
+          const curData = await this.getDataPageInfo(i);
+          if (curData) {
+            markerList = [...markerList, ...curData];
+          }
+          if (i == times) {
+            this.initMap(markerList);
+            this.SearchArr = markerList.map((item) => ({
+              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;
+            this.loading = false;
+            this.mapLoading = false;
+          }
+        }
+      });
+
+      // 闂锛�
+      // 鎼滅储缁撴灉涓嶅
+      // 鐐瑰嚮鍦板浘鏍囩偣鍑虹幇寮规锛屾嫋鍔ㄥ湴鍥炬椂搴斿叧闂脊妗�
+
+      // getRetrieval({
+      //   keyword: this.keyword,
+      //   dynasty: this.dynasty1Color,
+      //   page: 1,
+      //   pageSize: 200,
+      // }).then((res) => {
+      //   this.loading = false;
+      //   if (res.object) {
+      //     let markerList = [];
+      //     const listData = res.object.personList;
+      //     for (let i = 0; i < listData.length; i++) {
+      //       const item = listData[i];
+      //       if (item.NATIVE_PLACE?.length > 0) {
+      //         item.NATIVE_PLACE.forEach((citem) => {
+      //           if (citem.xCoord && citem.yCoord) {
+      //             const currentDynasty = this.dynasty1.find(
+      //               (f) => f.id == item.PERIOD[0].content1
+      //             );
+      //             if (currentDynasty) {
+      //               item.dynastyInfo = currentDynasty;
+      //             }
+      //             markerList.push({ ...citem, ...item });
+      //           }
+      //         });
+      //       }
+      //     }
+      //     this.initMap(markerList);
+      //     this.SearchArr = markerList.map((item) => ({
+      //       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;
+      //   } else {
+      //     this.initMap([]);
+      //   }
+      // });
+    },
+
+    async getDataPageInfo(count) {
+      const res = await getRetrieval({
+        keyword: this.keyword,
+        dynasty: this.dynasty1Color,
+        page: count,
+        pageSize: 200,
+      });
+      if (res.object) {
+        let markerList = [];
+        const listData = res.object.personList;
+        for (let i = 0; i < listData.length; i++) {
+          const item = listData[i];
+          if (item.NATIVE_PLACE?.length > 0) {
+            item.NATIVE_PLACE.forEach((citem) => {
+              if (citem.xCoord && citem.yCoord) {
+                const currentDynasty = this.dynasty1.find(
+                  (f) => f.id == item.PERIOD[0].content1
+                );
+                if (currentDynasty) {
+                  item.dynastyInfo = currentDynasty;
+                }
+                markerList.push({ ...citem, ...item });
+              }
+            });
+          }
+        }
+
+        return markerList;
+      } else {
+        return [];
+      }
+    },
+    onMapMoveEnd() {
+      console.log("鍦板浘鎷栧姩浜�");
+      this.isEchTrue = false;
+    },
+    //鍒濆鍖栧湴鍥�
+    initMap(markerList) {
+      console.log(markerList, "markerList");
+      this.isEchTrue = false;
+      if (this.map) {
+        this.map.remove();
+      }
+      var map = L.map("map", {
+        preferCanvas: true,
+        attributionControl: false,
+      }).setView([34.3227, 108.5525], 5);
+      map.on("moveend", this.onMapMoveEnd);
+      map.on("zoomend", function () {
+        var zoomLevel = map.getZoom(); // 鑾峰彇褰撳墠鍦板浘鐨勭缉鏀剧骇鍒�
+        console.log("褰撳墠鍦板浘缂╂斁绾у埆涓�:", zoomLevel);
+        this.isEchTrue = false;
+      });
+      L.tileLayer
+        .chinaProvider("TianDiTu.Normal.Map", {
+          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寮瑰嚭淇℃伅鐨勪綅缃�  杩欎釜鏄垜鎵嬪姩璋冨嚭鏉ョ殑锛屾枃妗i粯璁ゅ師濮嬪�兼槸[-1锛�-76]锛屾垜鏄幓涓�鍗婂�硷紝鍙栦竴鍗婂�艰皟鍑烘潵鐨�
+      });
+
+      let icon = L.divIcon({
+        html: "<div class='map-circle-name '></div>",
+        iconSize: [80, 80],
+        className: "map-circle",
+      });
+      this.map = map;
+      if (markerList.length) {
+        for (let i = 0; i < markerList.length; i++) {
+          const item = markerList[i];
+          let currentClassName = "map-circle-name";
+          if (item.dynastyInfo) {
+            switch (item.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([item.yCoord, item.xCoord], {
+            icon: icon,
+          }).addTo(map);
+          temp_mark.on("click", (e) => {
+            setTimeout(() => {
+              this.isEchTrue = true;
+              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,
+                id: item.id,
+              };
+              this.isTop = e.containerPoint.y - 275 + "px";
+              this.isLeft = e.containerPoint.x - 171 + "px";
+            }, 300);
+          });
+        }
+      }
+    },
+
     // 鐐瑰嚮涓嬮潰鐨勬湞浠f寜閽�
     dynastyBottomClick(id) {
-      console.log(id);
       this.dynasty1Color = id;
+      this.getDataList();
     },
     onSearch(val) {
-      console.log(val);
-      //
       this.isSearch = true;
+      this.keyword = val.text;
+      this.map.invalidateSize();
+
+      this.getDataList();
     },
     // 鐐瑰嚮涓婇潰鐨勬湞浠f寜閽�
-    SchoolClick(id) {
-      console.log(id);
-    },
-    innt() {
-      this.$nextTick(() => {
-        var chartDom = document.getElementById("main");
-        var myChart = echarts.init(chartDom);
-        var option;
-
-        const data = [
-          {
-            name: "娴烽棬",
-            value: [121.15, 31.89]
-          },
-          {
-            name: "閯傚皵澶氭柉",
-            value: [109.781327, 39.608266]
-          },
-          {
-            name: "鎷涜繙",
-            value: [120.38, 37.35]
-          },
-          {
-            name: "鑸熷北",
-            value: [122.207216, 29.985295]
-          },
-          {
-            name: "榻愰綈鍝堝皵",
-            value: [123.97, 47.33]
-          }
-        ];
-        option = {
-          title: {
-            text: "",
-            subtext: "",
-            sublink: "",
-            left: "center"
-          },
-          tooltip: {
-            trigger: "item"
-          },
-          bmap: {
-            center: [104.114129, 37.550339],
-            zoom: 5,
-            roam: true,
-            mapStyle: {
-              styleJson: [
-                {
-                  featureType: "water",
-                  elementType: "all",
-                  stylers: {
-                    color: "#86a1ac"
-                  }
-                },
-                {
-                  featureType: "land",
-                  elementType: "all",
-                  stylers: {
-                    color: "#f1d99d"
-                  }
-                },
-                {
-                  featureType: "railway",
-                  elementType: "all",
-                  stylers: {
-                    visibility: "off"
-                  }
-                },
-                {
-                  featureType: "highway",
-                  elementType: "all",
-                  stylers: {
-                    color: "#f1d99d"
-                  }
-                },
-                {
-                  featureType: "highway",
-                  elementType: "labels",
-                  stylers: {
-                    visibility: "off"
-                  }
-                },
-                {
-                  featureType: "arterial",
-                  elementType: "geometry",
-                  stylers: {
-                    color: "#f1d99d"
-                  }
-                },
-                {
-                  featureType: "arterial",
-                  elementType: "geometry.fill",
-                  stylers: {
-                    color: "#f1d99d"
-                  }
-                },
-                {
-                  featureType: "poi",
-                  elementType: "all",
-                  stylers: {
-                    visibility: "off"
-                  }
-                },
-                {
-                  featureType: "green",
-                  elementType: "all",
-                  stylers: {
-                    visibility: "off"
-                  }
-                },
-                {
-                  featureType: "subway",
-                  elementType: "all",
-                  stylers: {
-                    visibility: "off"
-                  }
-                },
-                {
-                  featureType: "manmade",
-                  elementType: "all",
-                  stylers: {
-                    color: "#f1d99d"
-                  }
-                },
-                {
-                  featureType: "local",
-                  elementType: "all",
-                  stylers: {
-                    color: "#f1d99d"
-                  }
-                },
-                {
-                  featureType: "local",
-                  elementType: "labels",
-                  stylers: {
-                    visibility: "off"
-                  }
-                },
-                {
-                  featureType: "arterial",
-                  elementType: "labels",
-                  stylers: {
-                    visibility: "off"
-                  }
-                },
-                {
-                  featureType: "boundary",
-                  elementType: "all",
-                  stylers: {
-                    color: "#f1d99d"
-                  }
-                },
-                {
-                  featureType: "building",
-                  elementType: "all",
-                  stylers: {
-                    color: "#f1d99d"
-                  }
-                },
-                {
-                  featureType: "label",
-                  elementType: "labels.text.fill",
-                  stylers: {
-                    color: "#000"
-                  }
-                }
-              ]
-            }
-          },
-          series: [
-            {
-              name: "",
-              type: "scatter",
-              coordinateSystem: "bmap",
-              data: data,
-              symbolSize: 0,
-              encode: {
-                value: 2
-              },
-              label: {
-                formatter: "{b}",
-                position: "right",
-                show: false
-              },
-              emphasis: {
-                label: {
-                  show: true
-                }
-              }
-            },
-            {
-              name: "",
-              type: "effectScatter",
-              coordinateSystem: "bmap",
-              data: data,
-              symbolSize: 20,
-              encode: {
-                value: 2
-              },
-              showEffectOn: "render",
-              rippleEffect: {
-                brushType: "stroke"
-              },
-              label: {
-                formatter: "{b}",
-                position: "right",
-                show: false
-              },
-              itemStyle: {
-                color: "#ec7b43",
-                shadowBlur: 10,
-                shadowColor: "#333"
-              },
-              emphasis: {
-                scale: false
-              },
-              zlevel: 1
-            }
-          ]
-        };
-        // 璁剧疆鐐瑰嚮浜嬩欢鐩戝惉
-        myChart.on("click", (params) => {
-          console.log(params.event.offsetX, params.event.offsetY);
-          if (params.componentType === "series") {
-            var dataName = params.data.name; // 鑾峰彇鐐瑰嚮鐨勬暟鎹悕绉�
-            var dataValue = params.data.value; // 鑾峰彇鐐瑰嚮鐨勬暟鎹��
-            // 鍦ㄨ繖閲屽彲浠ユ牴鎹渶瑕佸鐞嗙偣鍑讳簨浠讹紝姣斿寮瑰嚭瀵瑰簲鏁版嵁鐨勮缁嗕俊鎭瓑鎿嶄綔
-            console.log("鐐瑰嚮浜�", dataName, "鏁版嵁锛屾暟鍊间负", dataValue);
-            // 杩欓噷鍙互缂栧啓瑙﹀彂鏃堕棿鑾峰彇瀵瑰簲鏁版嵁淇℃伅鐨勯�昏緫
-            this.spaceTimeArr(params);
-          }
-        });
-
-        option && myChart.setOption(option);
-      });
-    },
-    // 鏃剁┖鍦板浘鐐瑰嚮鏃惰幏鍙栫殑鏁版嵁
-    spaceTimeArr(Arr) {
-      // 淇敼 Vue 缁勪欢鐨勬暟鎹紝渚嬪鏄剧ず鑿滃崟瀵艰埅
-      // 鏃剁┖鍦板浘鐨勬暟鎹�
-      console.log(Arr);
-
-      this.isEchTrue = true;
-      this.$nextTick(() => {
-        this.isTop =
-          Arr.event.offsetY -
-          0.18 -
-          document.querySelector(".echartsTrue").offsetHeight / 2.1 +
-          "px";
-        this.isLeft =
-          Arr.event.offsetX -
-          document.querySelector(".echartsTrue").offsetWidth / 2.1 +
-          "px";
-        console.log(
-          document.querySelector(".echartsTrue").offsetHeight / 2 / 100
-        );
-      });
-    },
+    SchoolClick(id) {},
     // 鏌ョ湅鏇村>>
     viewMoreClick() {
       uni.navigateTo({
-        url: "/pages/character/detail"
+        url: "/pages/character/detail?id=" + this.currentMark.id,
       });
-    }
-  }
+    },
+  },
 };
 </script>
 
 <style>
+::v-deep .map-circle-name {
+  width: 20px;
+  height: 20px;
+  border-radius: 50%;
+  background-color: rgb(144, 187, 216);
+}
+::v-deep .map-circle-xia {
+  width: 20px;
+  height: 20px;
+  border-radius: 50%;
+  background-color: rgb(144, 187, 216);
+}
+::v-deep .map-circle-shang {
+  width: 20px;
+  height: 20px;
+  border-radius: 50%;
+  background-color: rgb(237, 210, 139);
+}
+::v-deep .map-circle-zhou {
+  width: 20px;
+  height: 20px;
+  border-radius: 50%;
+  background-color: rgb(207, 116, 109);
+}
+::v-deep .map-circle-qin {
+  width: 20px;
+  height: 20px;
+  border-radius: 50%;
+  background-color: rgb(156, 194, 122);
+}
+::v-deep .map-circle-han {
+  width: 20px;
+  height: 20px;
+  border-radius: 50%;
+  background-color: rgb(91, 108, 185);
+}
+::v-deep .map-circle-sui {
+  width: 20px;
+  height: 20px;
+  border-radius: 50%;
+  background-color: rgb(136, 96, 168);
+}
+::v-deep .map-circle-tang {
+  width: 20px;
+  height: 20px;
+  border-radius: 50%;
+  background-color: rgb(136, 96, 168);
+}
+::v-deep .map-circle-ming {
+  width: 20px;
+  height: 20px;
+  border-radius: 50%;
+  background-color: rgb(222, 142, 102);
+}
+
 .pageBox {
   width: 100%;
   height: 100%;
@@ -658,6 +761,7 @@
   /* 鍙宠竟閫忔槑 */
   border-top: 0.2rem solid #fff;
   /* 椤堕儴绾㈣壊 */
+  z-index: 999;
 }
 
 ::v-deep .el-card__header {
@@ -755,4 +859,44 @@
   line-height: 1;
   margin-left: 0.19rem;
 }
+
+.mapBox {
+  height: 100%;
+  width: 100%;
+  margin: 0 auto;
+  position: relative;
+}
+#map {
+  height: 100%;
+  width: 100%;
+  margin: 0 auto;
+  font-size: 14px !important;
+  z-index: 10 !important;
+}
+
+::v-deep .ripple {
+  border-radius: 50%;
+  position: relative;
+  overflow: hidden;
+}
+
+::v-deep .ripple::before {
+  content: "";
+  position: absolute;
+  top: 50%;
+  left: 50%;
+  width: 150%; /* Ensure it covers the entire parent */
+  height: 150%;
+  background: rgba(255, 255, 255, 0.5);
+  border-radius: 50%;
+  transform: translate(-50%, -50%) scale(1);
+  animation: ripple-animation 1s infinite linear;
+}
+
+@keyframes ripple-animation {
+  to {
+    transform: translate(-50%, -50%) scale(0);
+    opacity: 0;
+  }
+}
 </style>

--
Gitblit v1.9.1