From d5f572496c5fb12fec2fe346b847bf58331299c9 Mon Sep 17 00:00:00 2001
From: YM <479443481@qq.com>
Date: 星期三, 17 七月 2024 15:56:51 +0800
Subject: [PATCH] 1
---
src/pages/territory/territory.vue | 699 +++++++++++++++++++++++++++++++---------------------------
1 files changed, 374 insertions(+), 325 deletions(-)
diff --git a/src/pages/territory/territory.vue b/src/pages/territory/territory.vue
index 13a2c3e..36353af 100644
--- a/src/pages/territory/territory.vue
+++ b/src/pages/territory/territory.vue
@@ -1,19 +1,19 @@
<template>
<view class="pageBox">
<!-- 椤堕儴瀵艰埅 -->
- <headNav :idIndex="idIndex" text="涓尰鍦板煙鍖昏氨" style="z-index: 999" />
+ <headNav :idIndex="idIndex" text="鍦板煙鍥捐氨" style="z-index: 999" />
<view
class="flex flex-center"
style="width: 100%; margin: 20px 0 34px; justify-content: flex-start"
>
<advancedSearch
class="Search"
- placehold="杈撳叆濮撳悕/鍒悕/鏈濅唬/浼犱富鑱屼笟鎼滅储"
+ placehold="杈撳叆濮撳悕/鍒悕/鏃舵湡/浼犱富鑱屼笟鎼滅储"
@onSearch="onSearch"
:isAvancedTrue="false"
:keyword="keyword"
/>
- <ul class="flex">
+ <!-- <ul class="flex">
<li v-for="(item, index) in dynasty" :key="item.id">
<view
@click="SchoolClick(item.id)"
@@ -46,7 +46,7 @@
}}</view>
</view>
</li>
- </ul>
+ </ul> -->
</view>
<!-- 鎼滅储鍚庣殑寮规 -->
<el-card
@@ -75,7 +75,7 @@
>鍏抽棴</el-button
>
</div>
- <view style="overflow: auto; height: 2.5rem">
+ <view style="overflow: auto; height: 2.5rem" v-loading="loading">
<div
v-if="!loading && SearchArr.length == 0"
style="
@@ -94,6 +94,7 @@
class="information"
v-for="(item, index) in SearchArr"
:key="index"
+ style="cursor: pointer;"
@click="showCard(item)"
>
<li style="font-size: 0.18rem; font-weight: 700">
@@ -116,12 +117,88 @@
<div class="mapBox" id="mapBox" v-loading="mapLoading">
<div id="map"></div>
- <el-card
- class="box-card echartsTrue"
- v-show="isEchTrue"
+ <div
+ class="markerDataListBox"
+ v-if="isEchTrue"
style="overflow: inherit; width: 3rem; position: absolute; z-index: 999"
:style="{ top: isTop, left: isLeft }"
>
+ <div class="markerDataList">
+ <div class="markerDataContentBox">
+ <div v-if="currentMark.length == 1">
+ <ul class="information">
+ <li>
+ 濮撳悕:
+ {{ currentMark[0].name ? currentMark[0].name : "-" }}
+ </li>
+ <li>鍒悕: {{ currentMark[0].nikeName ? currentMark[0].nikeName : "-" }}</li>
+ <li>绫嶈疮: {{ currentMark[0].nativePlace ? currentMark[0].nativePlace : "-" }}</li>
+ <li>鍖诲鍒嗙: {{ currentMark[0].barnch ? currentMark[0].barnch : "-" }}</li>
+ <li
+ class="medicalLi"
+ :title="currentMark[0].medical ? currentMark[0].medical : '-'"
+ >
+ 灏忎紶: {{ currentMark[0].medical ? currentMark[0].medical : "-" }}
+ </li>
+ </ul>
+ <el-button
+ class="flex"
+ @click="viewMoreClick(currentMark[0])"
+ style="
+ width: 100%;
+ padding: 3px 0;
+ font-size: 0.12rem;
+ color: #597aa5;
+ "
+ type="text"
+ >鏌ョ湅鏇村>></el-button
+ >
+ </div>
+ <el-collapse v-else>
+ <el-collapse-item
+ v-for="(item, index) in currentMark"
+ :name="index"
+ >
+ <template slot="title">
+ <div class="titleImg">
+ <i class="el-icon-user"></i>
+ </div>
+ <span>{{ item.name }}</span>
+ </template>
+ <ul class="information">
+ <li>
+ 濮撳悕:
+ {{ item.name ? item.name : "-" }}
+ </li>
+ <li>鍒悕: {{ item.nikeName ? item.nikeName : "-" }}</li>
+ <li>绫嶈疮: {{ item.nativePlace ? item.nativePlace : "-" }}</li>
+ <li>鍖诲鍒嗙: {{ item.barnch ? item.barnch : "-" }}</li>
+ <li
+ class="medicalLi"
+ :title="item.medical ? item.medical : '-'"
+ >
+ 灏忎紶: {{ item.medical ? item.medical : "-" }}
+ </li>
+ </ul>
+ <el-button
+ class="flex"
+ @click="viewMoreClick(item)"
+ style="
+ width: 100%;
+ padding: 3px 0;
+ font-size: 0.12rem;
+ color: #597aa5;
+ "
+ type="text"
+ >鏌ョ湅鏇村>></el-button
+ >
+ </el-collapse-item>
+ </el-collapse>
+
+ </div>
+ </div>
+ </div>
+ <!-- <el-card class="box-card echartsTrue" v-show="isEchTrue">
<div slot="header" class="clearfix">
<span v-if="currentMark">{{
currentMark.name ? currentMark.name : "-"
@@ -167,7 +244,7 @@
type="text"
>鏌ョ湅鏇村>></el-button
>
- </el-card>
+ </el-card> -->
</div>
<!-- 鏈濅唬 -->
@@ -210,7 +287,7 @@
"
:style="{
marginRight: index === dynasty1.length - 1 ? '0' : '0.03rem',
- background: dynasty1Color == item.id ? '#244A7B' : '#597AA5',
+ background: dynasty1Color == item.id ? '#244A7B' : '#597AA5'
}"
>
{{ item.dynastyChs }}
@@ -232,8 +309,9 @@
getRetrieval,
getDynasty,
getPreCount,
- getDynastyData,
+ getDynastyData
} from "@/api/index.js";
+
export default {
data() {
return {
@@ -248,25 +326,25 @@
information: [
{
label: "濮撳悕",
- content: "鏉庢椂鐝�",
+ content: "鏉庢椂鐝�"
},
{
label: "鍒悕",
- content: "涓滀附鍏堢敓",
+ content: "涓滀附鍏堢敓"
},
{
label: "绫嶈疮",
- content: "婀栧寳",
+ content: "婀栧寳"
},
{
label: "鍖诲鍒嗙",
- content: "涓嵂,閽堢伕",
+ content: "涓嵂,閽堢伕"
},
{
label: "灏忎紶",
content:
- "鏉庢椂鐝�(绾�1518骞磣1593 骞�)锛� 瀛椾笢鐠э紝 鏅氬勾鑷彿婵掓箹灞变汉锛� 婀栧箍榛勫窞搴滆柂宸�(浠婃箹鍖楃渷钖槬鍘�) 浜猴紝 鏄庝唬钁楀悕鍖昏嵂瀛﹀銆� 涓庘�� 鍖诲湥鈥� 涓囧瘑鏂嬮綈鍚嶏紝 鍙ゆ湁鈥� 涓囧瘑鏂嬬殑鏂癸紝 鏉庢椂鐝嶇殑鑽�� 涔嬭銆� 鍚庝负妤氬共搴�...",
- },
+ "鏉庢椂鐝�(绾�1518骞磣1593 骞�)锛� 瀛椾笢鐠э紝 鏅氬勾鑷彿婵掓箹灞变汉锛� 婀栧箍榛勫窞搴滆柂宸�(浠婃箹鍖楃渷钖槬鍘�) 浜猴紝 鏄庝唬钁楀悕鍖昏嵂瀛﹀銆� 涓庘�� 鍖诲湥鈥� 涓囧瘑鏂嬮綈鍚嶏紝 鍙ゆ湁鈥� 涓囧瘑鏂嬬殑鏂癸紝 鏉庢椂鐝嶇殑鑽�� 涔嬭銆� 鍚庝负妤氬共搴�..."
+ }
],
// 涓嬮潰鐨勬湞浠�1
dynasty1Color: "",
@@ -274,78 +352,78 @@
{
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,
@@ -354,43 +432,43 @@
{
name: "澶�",
color: "#90BBD8",
- id: 1,
+ id: 1
},
{
name: "鍟�",
color: "#EDD28B",
- id: 2,
+ id: 2
},
{
name: "瑗垮懆",
color: "#CF746D",
- id: 3,
+ id: 3
},
{
name: "绉�",
color: "#9CC27A",
- id: 4,
+ id: 4
},
{
name: "姹�",
color: "#5B6CB9",
- id: 5,
+ id: 5
},
{
name: "闅�",
color: "#8860A8",
- id: 6,
+ id: 6
},
{
name: "鍞�",
color: "#DE8E66",
- id: 7,
+ id: 7
},
{
name: "鏄�",
color: "#DE8E66",
- id: 8,
- },
+ id: 8
+ }
],
// 鎼滅储鍚庢槸鍚︽樉绀哄脊妗�
isSearch: false,
@@ -400,15 +478,19 @@
id: 1,
name: "鏉庢椂鐝�",
birthAndDeath: "1518-1593",
- source: "鍥藉浘瑙勮寖妗ｏ紝CBDB锛屼笂鍥惧彜绫嶆暟鎹簱 绫嶈疮锛氭箹鍖�",
+ source: "鍥藉浘瑙勮寖妗ｏ紝CBDB锛屼笂鍥惧彜绫嶆暟鎹簱 绫嶈疮锛氭箹鍖�"
},
{
id: 2,
name: "鏉庢椂鐝�",
birthAndDeath: "1518-1593",
- source: "鍥藉浘瑙勮寖妗ｏ紝CBDB锛屼笂鍥惧彜绫嶆暟鎹簱 绫嶈疮锛氭箹鍖�",
- },
+ source: "鍥藉浘瑙勮寖妗ｏ紝CBDB锛屼笂鍥惧彜绫嶆暟鎹簱 绫嶈疮锛氭箹鍖�"
+ }
],
+ zoomLevel: 5,
+ oldMarkList: [],
+ aggregatedData: [],
+ openData: null
};
},
onLoad(options) {
@@ -434,26 +516,9 @@
},
showCard(info) {
const item = this.markerList.find((f) => f.id == info.id);
- console.log(item, "item");
+ this.openData = item;
var latlng = L.latLng(item.yCoord, item.xCoord);
- this.map.setView(latlng, 10);
- setTimeout(() => {
- this.isEchTrue = true;
- this.currentMark = {
- name: item?.NAME[0]?.content1,
- nikeName: item?.ALIAS[0]?.content2,
- nativePlace: item?.content1,
- barnch: item?.MEDICAL_BRANCH[0]?.content1,
- medical: item?.BIOGRAPHY,
- id: item.id,
- };
- this.$nextTick(() => {
- this.isTop =
- document.getElementById("mapBox").offsetHeight / 2 - 295 + "px";
- this.isLeft =
- document.getElementById("mapBox").offsetWidth / 2 - 171 + "px";
- });
- }, 300);
+ this.map.setView(latlng, 12);
},
getDataList() {
this.SearchArr = [];
@@ -463,7 +528,7 @@
let times = 0;
getPreCount({
keyword: this.keyword,
- dynasty: this.dynasty1Color,
+ dynasty: this.dynasty1Color
}).then(async (res) => {
const totalCount = res.object;
if (totalCount % 200 == 0) {
@@ -480,68 +545,11 @@
markerList = [...markerList, ...curData];
}
if (i == 1) {
- this.loading = false;
this.mapLoading = false;
this.markerList = markerList;
- this.initMap(markerList);
+ this.initMap();
} 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?.NAME[0]?.content1,
- nikeName: ele?.ALIAS[0]?.content2,
- nativePlace: ele?.content1,
- barnch: ele?.MEDICAL_BRANCH[0]?.content1,
- medical: ele?.BIOGRAPHY,
- id: ele.id,
- };
- this.isTop = e.containerPoint.y - 295 + "px";
- this.isLeft = e.containerPoint.x - 171 + "px";
- }, 300);
- });
- }
- }
+ this.handleMapIcon(this.markerList);
}
if (i == times) {
@@ -554,60 +562,14 @@
name: item?.NAME[0]?.content1,
source: "-",
nativPlace: item?.NATIVE_PLACE[0].content1,
- id: item.id,
+ id: item.id
}));
+ this.loading = false;
this.markerList = markerList;
- // this.initMap(markerList);
+ this.handleMapIcon(this.markerList);
}
}
});
-
- // 闂锛�
- // 鎼滅储缁撴灉涓嶅
- // 鐐瑰嚮鍦板浘鏍囩偣鍑虹幇寮规锛屾嫋鍔ㄥ湴鍥炬椂搴斿叧闂脊妗�
-
- // 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) {
@@ -615,7 +577,7 @@
keyword: this.keyword,
dynasty: this.dynasty1Color,
page: count,
- pageSize: 200,
+ pageSize: 200
});
if (res.object) {
let markerList = [];
@@ -644,109 +606,204 @@
},
onMapMoveEnd() {
console.log("鍦板浘鎷栧姩浜�");
- this.isEchTrue = false;
+ if (this.openData) {
+ this.handleMapIcon(this.markerList);
+ } else {
+ this.isEchTrue = false;
+ }
},
//鍒濆鍖栧湴鍥�
- initMap(markerList) {
- console.log(markerList, "markerList");
+ initMap() {
this.isEchTrue = false;
if (this.map) {
this.map.remove();
}
var map = L.map("map", {
preferCanvas: true,
- attributionControl: false,
- }).setView([34.3227, 108.5525], 5);
+ attributionControl: false
+ }).setView([34.3227, 108.5525], this.zoomLevel);
map.on("moveend", this.onMapMoveEnd);
- map.on("zoomend", function () {
+ map.on("zoomend", () => {
var zoomLevel = map.getZoom(); // 鑾峰彇褰撳墠鍦板浘鐨勭缉鏀剧骇鍒�
console.log("褰撳墠鍦板浘缂╂斁绾у埆涓�:", zoomLevel);
+ this.zoomLevel = zoomLevel;
this.isEchTrue = false;
+ this.handleMapIcon(this.markerList);
});
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,
+ 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]锛屾垜鏄幓涓�鍗婂�硷紝鍙栦竴鍗婂�艰皟鍑烘潵鐨�
- });
-
- let icon = L.divIcon({
- html: "<div class='map-circle-name '></div>",
- iconSize: [80, 80],
- className: "map-circle",
- });
this.map = map;
- 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) {
- 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;
- }
- }
+ this.handleMapIcon(this.markerList);
+ },
- 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,
+ handleMapIcon(data) {
+ if (this.oldMarkList.length) {
+ for (let j = 0; j < this.oldMarkList.length; j++) {
+ const oldMark = this.oldMarkList[j];
+ oldMark.remove();
+ }
+ this.oldMarkList = [];
+ }
+ // 鎸夊眰绾у鐞嗘暟鎹悎骞跺拰icon鐨勬覆鏌�
+ // 鑾峰彇澶╁湴鍥炬瘮渚嬪昂(鍦板浘1cm:瀹為檯cm)
+ const scale = {
+ 1: 295829355.45456564,
+ 2: 147914677.72728282,
+ 3: 73957338.863641411,
+ 4: 36978669.431820706,
+ 5: 18489334.715910353,
+ 6: 9244667.3579551764,
+ 7: 4622333.6789775882,
+ 8: 2311166.8394887941,
+ 9: 1155583.419744397,
+ 10: 577791.70987219852,
+ 11: 288895.85493609926,
+ 12: 144447.92746804963,
+ 13: 72223.963734024815,
+ 14: 36111.981867012408,
+ 15: 18055.990933506204,
+ 16: 9027.9954667531019,
+ 17: 4513.997733376551,
+ 18: 2256.9988666882755,
+ 19: 1128.4994333441377,
+ 20: 564.24971667206887
+ };
+ // 鏍规嵁姣斾緥灏鸿绠楀綋鍓嶅湴鍥�1鍘樼背鐨勭粡绾害宸��
+ const cmData = scale[this.zoomLevel] / 100; // 灏嗗帢绫宠浆鎹负绫�
+ const longitudeToM = 92064.1; // 1缁忓害瀵瑰簲绫�
+ const latitudeToM = 111195.1; // 1绾害瀵瑰簲绫�
+ const longitudeRange = cmData / longitudeToM; // 鍦板浘1cm鐨勭粡搴﹀樊
+ const latitudeRange = cmData / latitudeToM; // 鍦板浘1cm鐨勭含搴﹀樊
+ console.log("longitudeRange", longitudeRange);
+ console.log("latitudeRange", latitudeRange);
+ // 鏍规嵁缁忕含搴﹀樊鍊煎皢鍦板浘涓�鍘樼背鍐呮墍鏈夌偣鍚堝苟骞惰褰曟暟閲�
+ const aggregatedData = [];
+ for (let i = 0; i < data.length; i++) {
+ const item = data[i];
+ // 鍒ゆ柇褰撳墠鐐规槸鍚﹀瓨鍦ㄥ湪1cm鍐呯殑鐩稿叧鏁版嵁
+ const mateData = aggregatedData.find(
+ (aItem) =>
+ Math.abs(aItem.mainX - item.xCoord) < longitudeRange &&
+ Math.abs(aItem.mainY - item.yCoord) < latitudeRange
+ );
+ if (!mateData) {
+ // 鏃犲尮閰嶆暟鎹椂锛屽皢褰撳墠鐐瑰潗鏍囪涓轰腑蹇冪偣鍧愭爣锛岃櫣鍚稿悎骞跺懆鍥�1cm鍐呯殑鐐�
+ const obj = {
+ mainX: item.xCoord,
+ mainY: item.yCoord,
+ contentX: "",
+ contentY: "",
+ xList: [],
+ yList: [],
+ data: []
+ };
+ obj.xList.push(item.xCoord);
+ obj.yList.push(item.yCoord);
+ obj.data.push(item);
+ aggregatedData.push(obj);
+ } else {
+ // 鏈夊尮閰嶆暟鎹椂锛屽皢褰撳墠鐐硅繘琛屽悎骞�
+ mateData.xList.push(item.xCoord);
+ mateData.yList.push(item.yCoord);
+ mateData.data.push(item);
+ }
+ }
+ // 鏍规嵁鑱氬悎缁忓害鍜岀含搴﹀垪琛ㄧ殑鏈�澶ф渶灏忓�硷紝鍙栦腑蹇冪偣鍧愭爣
+ for (let j = 0; j < aggregatedData.length; j++) {
+ const aggregatedItem = aggregatedData[j];
+ const maxX = Math.max(...aggregatedItem.xList);
+ const minX = Math.min(...aggregatedItem.xList);
+ const maxY = Math.max(...aggregatedItem.yList);
+ const minY = Math.min(...aggregatedItem.yList);
+ aggregatedItem.contentX = (maxX - minX) / 2 + minX;
+ aggregatedItem.contentY = (maxY - minY) / 2 + minY;
+
+ // 娣诲姞鏍囪
+ let icon = L.divIcon({
+ html: `<div class='ripple' style='box-shadow: 0 0 20px ${
+ aggregatedItem.data.length > 30 ? 30 : aggregatedItem.data.length
+ }px #cc2edf78;'>${
+ aggregatedItem.data.length < 100
+ ? aggregatedItem.data.length
+ : "99+"
+ }</div>`,
+ iconSize: [30, 30],
+ className: "map-circle"
+ });
+ const temp_mark = L.marker(
+ [aggregatedItem.contentY, aggregatedItem.contentX],
+ {
+ icon: icon
+ }
+ );
+ this.oldMarkList.push(temp_mark);
+ temp_mark.addTo(this.map);
+ temp_mark.on("click", (e) => {
+ setTimeout(() => {
+ this.isEchTrue = true;
+ this.currentMark = aggregatedItem.data.map((item) => {
+ return {
+ name: item?.NAME[0]?.content1,
nikeName: item?.ALIAS[0]?.content2,
nativePlace: item?.content1,
barnch: item?.MEDICAL_BRANCH[0]?.content1,
medical: item?.BIOGRAPHY,
- id: item.id,
+ id: item.id
};
- this.isTop = e.containerPoint.y - 295 + "px";
- this.isLeft = e.containerPoint.x - 171 + "px";
- }, 300);
- });
- }
+ });
+ this.isTop = e.containerPoint.y - 435 + "px";
+ this.isLeft = e.containerPoint.x - 180 + "px";
+ }, 300);
+ });
+ }
+ console.log("aggregatedData", aggregatedData);
+ this.aggregatedData = aggregatedData;
+ if (this.openData) {
+ setTimeout(() => {
+ if (this.openData) {
+ let aggregated = null;
+ for (let i = 0; i < this.aggregatedData.length; i++) {
+ const aggregatedItem = this.aggregatedData[i];
+ const d = aggregatedItem.data.find(
+ (f) => f.id == this.openData.id
+ );
+ if (d) {
+ aggregated = aggregatedItem;
+ }
+ }
+ this.currentMark = aggregated.data.map((item) => {
+ return {
+ name: item?.NAME[0]?.content1,
+ nikeName: item?.ALIAS[0]?.content2,
+ nativePlace: item?.content1,
+ barnch: item?.MEDICAL_BRANCH[0]?.content1,
+ medical: item?.BIOGRAPHY,
+ id: item.id
+ };
+ });
+ this.isEchTrue = true;
+ this.$nextTick(() => {
+ this.isTop =
+ document.getElementById("mapBox").offsetHeight / 2 - 435 + "px";
+ this.isLeft =
+ document.getElementById("mapBox").offsetWidth / 2 - 180 + "px";
+ });
+ }
+
+ this.openData = null;
+ }, 300);
}
},
@@ -765,71 +822,16 @@
// 鐐瑰嚮涓婇潰鐨勬湞浠ｆ寜閽�
SchoolClick(id) {},
// 鏌ョ湅鏇村>>
- viewMoreClick() {
+ viewMoreClick(data) {
uni.navigateTo({
- url: "/pages/character/detail?id=" + this.currentMark.id,
+ url: "/pages/character/detail?id=" + data.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%;
@@ -837,21 +839,69 @@
flex-direction: column;
}
-.echartsTrue::before {
+.markerDataListBox {
+ width: 360px !important;
+ height: 400px;
+}
+
+.markerDataListBox::before {
content: "";
width: 0;
height: 0;
position: absolute;
- bottom: -0.18rem;
- left: 1.2rem;
+ bottom: -18px;
+ left: 160px;
/* background-color: red; */
- border-left: 0.2rem solid transparent;
+ border-left: 20px solid transparent;
/* 宸﹁竟閫忔槑 */
- border-right: 0.2rem solid transparent;
+ border-right: 20px solid transparent;
/* 鍙宠竟閫忔槑 */
- border-top: 0.2rem solid #fff;
+ border-top: 20px solid #fff;
/* 椤堕儴绾㈣壊 */
z-index: 999;
+}
+
+.markerDataList {
+ width: 100%;
+ height: 100%;
+ background: #fff;
+ border-radius: 8px;
+ overflow: hidden;
+ box-shadow: 0 0 10px 0 #000;
+}
+
+.markerDataList ::v-deep .el-collapse-item {
+ border-left: 1px solid #ebeef5;
+ border-right: 1px solid #ebeef5;
+}
+
+::v-deep .el-collapse-item__header.is-active {
+ border-bottom-color: #ebeef5;
+}
+
+::v-deep .el-collapse-item__header {
+ padding-left: 10px;
+ font-size: 16px;
+}
+
+.markerDataContentBox {
+ width: 100%;
+ height: 100%;
+ overflow: auto !important;
+ padding: 6px;
+ box-sizing: border-box;
+}
+
+.titleImg {
+ display: inline-block;
+ width: 24px;
+ height: 24px;
+ border-radius: 50%;
+ background-color: #4c48fb;
+ color: #fff;
+ margin-right: 10px;
+ text-align: center;
+ line-height: 24px;
}
::v-deep .el-card__header {
@@ -861,6 +911,14 @@
padding: 0.08rem 0.13rem;
font-size: 0.14rem;
font-weight: 600;
+}
+
+::v-deep .el-collapse-item__content {
+ padding-bottom: 10px;
+}
+
+.markerDataContentBox .information {
+ padding: 20px;
}
.information li {
@@ -965,22 +1023,13 @@
}
::v-deep .ripple {
+ width: 100%;
+ height: 100%;
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;
+ background: #4c48fb;
+ color: #fff;
+ text-align: center;
+ line-height: 30px;
}
/* @keyframes ripple-animation {
--
Gitblit v1.9.1