From 0edf94722a0dcc338567fec7df76b2e0acd39b92 Mon Sep 17 00:00:00 2001
From: YM <479443481@qq.com>
Date: 星期一, 27 五月 2024 15:30:48 +0800
Subject: [PATCH] 调整
---
src/pages/territory/territory.vue | 431 +++++++++++++++++++++++++++++++++++++++--------------
1 files changed, 314 insertions(+), 117 deletions(-)
diff --git a/src/pages/territory/territory.vue b/src/pages/territory/territory.vue
index 5337057..2d7274d 100644
--- a/src/pages/territory/territory.vue
+++ b/src/pages/territory/territory.vue
@@ -1,7 +1,7 @@
<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"
@@ -11,6 +11,7 @@
placehold="杈撳叆濮撳悕/鍒悕/鏈濅唬/浼犱富鑱屼笟鎼滅储"
@onSearch="onSearch"
:isAvancedTrue="false"
+ :keyword="keyword"
/>
<ul class="flex">
<li style="" v-for="(item, index) in dynasty" :key="item.id">
@@ -18,7 +19,7 @@
@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>
@@ -75,11 +75,21 @@
>鍏抽棴</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">
+ <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"
@@ -100,7 +110,9 @@
:style="{ top: isTop, left: isLeft }"
>
<div slot="header" class="clearfix">
- <span>{{ information[0].content }}</span>
+ <span v-if="currentMark">{{
+ currentMark.name ? currentMark.name : "-"
+ }}</span>
<el-button
style="
float: right;
@@ -113,10 +125,17 @@
>鍏抽棴</el-button
>
</div>
- <ul class="information">
- <li v-for="(item, index) in information" :key="index">
- {{ item.label }}: {{ item.content }}
+ <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"
@@ -126,13 +145,19 @@
>鏌ョ湅鏇村>></el-button
>
</el-card>
- <!-- echarts鍦板浘 -->
- <!-- <view id="main" style="width: 100vw; position: relative"></view> -->
<div id="map"></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 +169,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 +186,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>
@@ -175,13 +201,16 @@
<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";
export default {
data() {
return {
// echarts鍏冪礌鐐瑰嚮鏃跺嚭鏉ョ殑寮圭獥鍜屽潗鏍�
+ keyword: "",
isEchTrue: false,
isLeft: 0,
isTop: 0,
@@ -189,258 +218,399 @@
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: "鍥藉浘瑙勮寖妗ｏ紝CBDB锛屼笂鍥惧彜绫嶆暟鎹簱 绫嶈疮锛氭箹鍖�",
+ source: "鍥藉浘瑙勮寖妗ｏ紝CBDB锛屼笂鍥惧彜绫嶆暟鎹簱 绫嶈疮锛氭箹鍖�"
},
{
id: 2,
name: "鏉庢椂鐝�",
birthAndDeath: "1518-1593",
- source: "鍥藉浘瑙勮寖妗ｏ紝CBDB锛屼笂鍥惧彜绫嶆暟鎹簱 绫嶈疮锛氭箹鍖�",
- },
- ],
+ source: "鍥藉浘瑙勮寖妗ｏ紝CBDB锛屼笂鍥惧彜绫嶆暟鎹簱 绫嶈疮锛氭箹鍖�"
+ }
+ ]
};
},
onLoad(options) {
this.idIndex = options.id;
- console.log("optionsoptionsoptions", options.id);
},
mounted() {
- // this.$nextTick(() => {
- // loadBMap("1NJdwrI1CfT6lrykVhDkmWgsO6O2bjQK").then(() => {
- // this.innt();
- // });
- // })
- this.initMap();
+ 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);
+ },
+ getDataList() {
+ getRetrieval({ keyword: this.keyword, dynasty: this.dynasty1Color }).then(
+ (res) => {
+ 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;
+ }
+ }
+ );
+ },
//鍒濆鍖栧湴鍥�
- initMap() {
+ initMap(markerList) {
+ this.isEchTrue = false;
+ if (this.map) {
+ this.map.remove();
+ }
var map = L.map("map", {
- attributionControl: false,
preferCanvas: true,
- withPopup: L.latLng(34.261, 108.96),
- }).setView([39.91667, 116.41667], 4);
+ attributionControl: false
+ }).setView([39.91667, 116.41667], 3);
L.tileLayer
.chinaProvider("TianDiTu.Normal.Map", {
key: "76bc34ead7e30e663a4eded8aeaf5860",
- // maxZoom: 18,
- // minZoom: 5,
+ 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]锛屾垜鏄幓涓�鍗婂�硷紝鍙栦竴鍗婂�艰皟鍑烘潵鐨�
});
- const marker1 = L.marker([34.261, 108.96], {
- icon: DefaultIcon1,
- }).addTo(map);
- L.marker([39.90609, 116.38543], {
- icon: DefaultIcon1,
- })
- .addTo(map)
- .bindPopup(this.popContent); //鍖椾含
- L.marker([29.55546, 106.5448], {
- icon: DefaultIcon1,
- }).addTo(map); // 閲嶅簡
- L.marker([30.56781, 114.30222], {
- icon: DefaultIcon1,
- }).addTo(map); //婀栧寳
- L.marker([18.23522, 109.51085], {
- icon: DefaultIcon1,
- }).addTo(map); //娴峰崡
- marker1.on("click", (e) => {
- this.isEchTrue = true;
- console.log(document.querySelector(".echartsTrue").offsetWidth);
- console.log(document.querySelector(".echartsTrue").offsetHeight);
- this.$nextTick(() => {
- this.isTop =
- e.containerPoint.y -
- document.querySelector(".echartsTrue").offsetHeight / 2 +
- "px";
- this.isLeft =
- e.containerPoint.x -
- document.querySelector(".echartsTrue").offsetWidth / 2 +
- "px";
- });
+ 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";
+ 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) => {
+ 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.$nextTick(() => {
+ this.isTop =
+ e.containerPoint.y -
+ document.querySelector(".echartsTrue").offsetHeight / 2 +
+ "px";
+ this.isLeft =
+ e.containerPoint.x -
+ document.querySelector(".echartsTrue").offsetWidth / 2 +
+ "px";
+ });
+ });
+ }
+ }
},
// 鐐瑰嚮涓嬮潰鐨勬湞浠ｆ寜閽�
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();
},
// 鐐瑰嚮涓婇潰鐨勬湞浠ｆ寜閽�
- SchoolClick(id) {
- console.log(id);
- },
+ SchoolClick(id) {},
// 鏌ョ湅鏇村>>
viewMoreClick() {
uni.navigateTo({
- url: "/pages/character/detail",
+ url: "/pages/character/detail"
});
- },
- },
+ }
+ }
};
</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%;
@@ -561,9 +731,36 @@
}
#map {
- height: 600px;
+ 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