From 587d25c4a1d1a5d240e7750aa0c043a702a737d5 Mon Sep 17 00:00:00 2001
From: QYF-GitLab1 <1940665526@qq.com>
Date: 星期四, 18 七月 2024 10:47:30 +0800
Subject: [PATCH] 1
---
src/pages/territory/territory.vue | 770 +++++++++++++++++++++++++++++++++++++++++------------------
1 files changed, 534 insertions(+), 236 deletions(-)
diff --git a/src/pages/territory/territory.vue b/src/pages/territory/territory.vue
index 4d8a90b..4f8e055 100644
--- a/src/pages/territory/territory.vue
+++ b/src/pages/territory/territory.vue
@@ -1,20 +1,20 @@
<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: 0.2rem 0 0.34rem; justify-content: flex-start"
+ 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">
- <li style="" v-for="(item, index) in dynasty" :key="item.id">
+ <!-- <ul class="flex">
+ <li v-for="(item, index) in dynasty" :key="item.id">
<view
@click="SchoolClick(item.id)"
class="flex flex-center font-family school"
@@ -33,7 +33,6 @@
"
>
<view
- class=""
:style="{ background: item.color }"
style="
margin-right: 0.07rem;
@@ -42,12 +41,12 @@
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>
</li>
- </ul>
+ </ul> -->
</view>
<!-- 鎼滅储鍚庣殑寮规 -->
<el-card
@@ -57,7 +56,7 @@
height: 3.2rem;
width: 3rem;
position: fixed;
- z-index: 999999999999;
+ z-index: 99;
left: 1rem;
top: 2.2rem;
"
@@ -76,11 +75,26 @@
>鍏抽棴</el-button
>
</div>
- <view class="" style="overflow: auto; height: 2.5rem">
+ <view style="overflow: auto; height: 2.5rem" v-loading="loading">
+ <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"
+ style="cursor: pointer"
@click="showCard(item)"
>
<li style="font-size: 0.18rem; font-weight: 700">
@@ -91,6 +105,7 @@
{{ item.birthAndDeath ? item.birthAndDeath : "-" }}
</li>
<li>鏉ユ簮: {{ item.source ? item.source : "-" }}</li>
+ <li>绫嶈疮: {{ item.nativPlace ? item.nativPlace : "-" }}</li>
<li
v-if="SearchArr.length - 1 !== index"
style="margin: 0.1rem 0; border-bottom: 1px solid #d8d8d8"
@@ -99,54 +114,153 @@
</view>
</el-card>
<!-- echarts閲岄潰鐨勬暟鎹偣鍑诲悗寮规 -->
- <el-card
- class="box-card echartsTrue"
- v-show="isEchTrue"
- style="
- overflow: inherit;
- width: 3rem;
- position: fixed;
- z-index: 999999999999;
- "
- :style="{ top: isTop, left: isLeft }"
- >
- <div slot="header" class="clearfix">
- <span v-if="currentMark">{{
- currentMark.name ? currentMark.name : "-"
- }}</span>
+
+ <div class="mapBox" id="mapBox" v-loading="mapLoading">
+ <div id="map"></div>
+ <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"
+ :key="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 : "-"
+ }}</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
+ class="medicalLi"
+ :title="currentMark.medical ? currentMark.medical : '-'"
+ >
+ 灏忎紶: {{ 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" 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="width: 100%; padding: 3px 0; font-size: 0.12rem; color: #597aa5"
- type="text"
- >鏌ョ湅鏇村>></el-button
- >
- </el-card>
- <div id="map"></div>
+ </el-card> -->
+ </div>
+
<!-- 鏈濅唬 -->
<view
class="flex flex-center"
@@ -155,7 +269,9 @@
position: fixed;
bottom: 0.33rem;
left: 0;
+ right: 0;
z-index: 99;
+ overflow: auto;
"
>
<ul class="flex">
@@ -173,9 +289,10 @@
<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;
@@ -199,13 +316,21 @@
<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 "leaflet.chinatmsproviders";
-import { getRetrieval, getDynasty } from "@/api/index.js";
+import {
+ getRetrieval,
+ getDynasty,
+ getPreCount,
+ getDynastyData,
+} from "@/api/index.js";
+
export default {
data() {
return {
+ loading: true,
+ mapLoading: true,
// echarts鍏冪礌鐐瑰嚮鏃跺嚭鏉ョ殑寮圭獥鍜屽潗鏍�
keyword: "",
isEchTrue: false,
@@ -376,57 +501,72 @@
source: "鍥藉浘瑙勮寖妗ｏ紝CBDB锛屼笂鍥惧彜绫嶆暟鎹簱 绫嶈疮锛氭箹鍖�",
},
],
+ zoomLevel: 5,
+ oldMarkList: [],
+ aggregatedData: [],
+ openData: null,
};
},
onLoad(options) {
this.idIndex = options.id;
- console.log("optionsoptionsoptions", options.id);
},
mounted() {
this.getDynastyList();
this.getDataList();
+ this.getHaveDataDynasty();
},
methods: {
+ getHaveDataDynasty() {
+ getDynastyData().then((res) => {
+ console.log(res, "getHaveDataDynasty");
+ });
+ },
getDynastyList() {
getDynasty().then((res) => {
- console.log(res, "123123");
this.dynasty1 = res.list;
+ console.log("dynasty1", res.list);
});
},
showCard(info) {
- console.log(info);
- console.log(this.markerList);
- console.log(this.map);
const item = this.markerList.find((f) => f.id == info.id);
+ this.openData = item;
var latlng = L.latLng(item.yCoord, item.xCoord);
- this.map.setView(latlng, 10);
+ this.map.setView(latlng, 12);
},
getDataList() {
- getRetrieval({ keyword: this.keyword, dynasty: this.dynasty1Color }).then(
- (res) => {
- if (res.object) {
- let markerList = [];
- const listData = res.object.personList;
- console.log(listData, "listData");
- 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 });
- }
- });
- }
- }
- console.log(markerList, "markerList");
- this.initMap(markerList);
+ 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 == 1) {
+ this.mapLoading = false;
+ this.markerList = markerList;
+ this.initMap();
+ } else {
+ this.handleMapIcon(this.markerList);
+ }
+
+ if (i == times) {
this.SearchArr = markerList.map((item) => ({
birthAndDeath: item?.BIRTH_YEAR[0]?.content1
? item?.BIRTH_YEAR[0]?.content1 +
@@ -435,15 +575,59 @@
: "-",
name: item?.NAME[0]?.content1,
source: "-",
+ nativPlace: item?.NATIVE_PLACE[0].content1,
id: item.id,
}));
+ this.loading = false;
this.markerList = markerList;
+ this.handleMapIcon(this.markerList);
}
}
- );
+ });
+ },
+
+ 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("鍦板浘鎷栧姩浜�");
+ if (this.openData) {
+ this.handleMapIcon(this.markerList);
+ } else {
+ this.isEchTrue = false;
+ }
},
//鍒濆鍖栧湴鍥�
- initMap(markerList) {
+ initMap() {
this.isEchTrue = false;
if (this.map) {
this.map.remove();
@@ -451,8 +635,15 @@
var map = L.map("map", {
preferCanvas: true,
attributionControl: false,
- }).setView([39.91667, 116.41667], 3);
-
+ }).setView([34.3227, 108.5525], this.zoomLevel);
+ map.on("moveend", this.onMapMoveEnd);
+ 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",
@@ -460,84 +651,178 @@
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",
- });
+ L.tileLayer
+ .chinaProvider("TianDiTu.Normal.Annotion", {
+ key: "76bc34ead7e30e663a4eded8aeaf5860",
+ maxZoom: 18,
+ minZoom: 3,
+ })
+ .addTo(map);
this.map = map;
- if (markerList.length) {
- for (let i = 0; i < markerList.length; i++) {
- const item = markerList[i];
- let currentClassName = "map-circle-name";
- 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], {
+ this.handleMapIcon(this.markerList);
+ },
+
+ 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,
- }).addTo(map);
- temp_mark.on("click", (e) => {
+ }
+ );
+ this.oldMarkList.push(temp_mark);
+ temp_mark.addTo(this.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,
- };
+ 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,
+ };
+ });
+ 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 =
- e.containerPoint.y -
- document.querySelector(".echartsTrue").offsetHeight / 2 +
- "px";
+ document.getElementById("mapBox").offsetHeight / 2 - 435 + "px";
this.isLeft =
- e.containerPoint.x -
- document.querySelector(".echartsTrue").offsetWidth / 2 +
- "px";
+ document.getElementById("mapBox").offsetWidth / 2 - 180 + "px";
});
- });
- }
+ }
+
+ this.openData = null;
+ }, 300);
}
},
// 鐐瑰嚮涓嬮潰鐨勬湞浠ｆ寜閽�
dynastyBottomClick(id) {
- console.log(id);
this.dynasty1Color = id;
this.getDataList();
},
@@ -549,13 +834,11 @@
this.getDataList();
},
// 鐐瑰嚮涓婇潰鐨勬湞浠ｆ寜閽�
- SchoolClick(id) {
- console.log(id);
- },
+ SchoolClick(id) {},
// 鏌ョ湅鏇村>>
- viewMoreClick() {
+ viewMoreClick(data) {
uni.navigateTo({
- url: "/pages/character/detail",
+ url: "/pages/character/detail?id=" + data.id,
});
},
},
@@ -563,61 +846,6 @@
</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%;
@@ -625,20 +853,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 {
@@ -648,6 +925,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 {
@@ -737,6 +1022,12 @@
margin-left: 0.19rem;
}
+.mapBox {
+ height: 100%;
+ width: 100%;
+ margin: 0 auto;
+ position: relative;
+}
#map {
height: 100%;
width: 100%;
@@ -746,29 +1037,36 @@
}
::v-deep .ripple {
-
+ width: 100%;
+ height: 100%;
border-radius: 50%;
- position: relative;
- overflow: hidden;
+ background: #4c48fb;
+ color: #fff;
+ text-align: center;
+ line-height: 30px;
}
-::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 {
+/* @keyframes ripple-animation {
to {
transform: translate(-50%, -50%) scale(0);
opacity: 0;
}
+} */
+
+::v-deep .cleanupBtn {
+ right: 60px !important;
+}
+
+::v-deep .widget_input {
+ min-width: 240px !important;
+}
+
+.medicalLi {
+ height: 50px;
+ overflow: hidden;
+ text-overflow: ellipsis;
+ display: -webkit-box;
+ -webkit-box-orient: vertical;
+ -webkit-line-clamp: 2;
}
</style>
--
Gitblit v1.9.1