From 2f20896b721a91bd08ae5e4b2988479101c7faa0 Mon Sep 17 00:00:00 2001
From: YM <479443481@qq.com>
Date: 星期三, 05 六月 2024 18:17:19 +0800
Subject: [PATCH] Merge branch 'master' of http://182.92.203.7:2001/r/TCM_CharacterLibrary
---
src/pages/territory/territory.vue | 482 +++++++++++++++++++++++++++++++++++++++++------------
1 files changed, 373 insertions(+), 109 deletions(-)
diff --git a/src/pages/territory/territory.vue b/src/pages/territory/territory.vue
index 5337057..46e345e 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">
@@ -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-show="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">
+ <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> -->
- <div id="map"></div>
+ </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;
@@ -163,7 +207,7 @@
background: dynasty1Color == item.id ? '#244A7B' : '#597AA5',
}"
>
- {{ item.name }}
+ {{ item.dynastyChs }}
</view>
</li>
</ul>
@@ -175,13 +219,17 @@
<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 {
+ loading: true,
// echarts鍏冪礌鐐瑰嚮鏃跺嚭鏉ョ殑寮圭獥鍜屽潗鏍�
+ keyword: "",
isEchTrue: false,
isLeft: 0,
isTop: 0,
@@ -210,7 +258,7 @@
},
],
// 涓嬮潰鐨勬湞浠�1
- dynasty1Color: 1,
+ dynasty1Color: "",
dynasty1: [
{
name: "澶忔湞",
@@ -293,12 +341,12 @@
// 鏈濅唬
dynasty: [
{
- name: "澶忔湞",
+ name: "澶�",
color: "#90BBD8",
id: 1,
},
{
- name: "鍟嗘湞",
+ name: "鍟�",
color: "#EDD28B",
id: 2,
},
@@ -308,28 +356,34 @@
id: 3,
},
{
- name: "绉︽湞",
+ name: "绉�",
color: "#9CC27A",
id: 4,
},
{
- name: "姹夋湞",
+ name: "姹�",
color: "#5B6CB9",
id: 5,
},
{
- name: "闅嬫湞",
+ name: "闅�",
color: "#8860A8",
id: 6,
},
{
- name: "鍞愭湞",
+ name: "鍞�",
color: "#DE8E66",
id: 7,
+ },
+ {
+ name: "鏄�",
+ color: "#DE8E66",
+ id: 8,
},
],
// 鎼滅储鍚庢槸鍚︽樉绀哄脊妗�
isSearch: false,
+ currentMark: null,
SearchArr: [
{
id: 1,
@@ -348,88 +402,209 @@
},
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: {
- //鍒濆鍖栧湴鍥�
- initMap() {
- var map = L.map("map", {
- attributionControl: false,
- preferCanvas: true,
- withPopup: L.latLng(34.261, 108.96),
- }).setView([39.91667, 116.41667], 4);
+ 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);
+ 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 = "12%";
+ this.isLeft = "41.1%";
+ });
+ },
+ getDataList() {
+ this.SearchArr = [];
+ this.loading = true;
+ // 杩欓噷鏀规垚浜嗗垎椤电殑鎺ュ彛锛岄渶瑕佽皟鐢ㄥ娆″彇鍑烘墍鏈夋暟鎹�
+ // 闂锛�
+ // 鎼滅储缁撴灉涓嶅
+ // 鐐瑰嚮鍦板浘鏍囩偣鍑虹幇寮规锛屾嫋鍔ㄥ湴鍥炬椂搴斿叧闂脊妗�
+
+ getRetrieval({
+ keyword: this.keyword,
+ dynasty: this.dynasty1Color,
+ page: 1,
+ pageSize: 1000,
+ }).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([]);
+ }
+ });
+ },
+
+ 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: 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]锛屾垜鏄幓涓�鍗婂�硷紝鍙栦竴鍗婂�艰皟鍑烘潵鐨�
});
- 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";
+ 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) => {
+ console.log(e, "123123");
+ 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 +
+ "px";
+ this.isLeft =
+ e.containerPoint.x -
+ document.querySelector(".echartsTrue").offsetWidth +
+ "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({
@@ -441,6 +616,61 @@
</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%;
@@ -462,6 +692,7 @@
/* 鍙宠竟閫忔槑 */
border-top: 0.2rem solid #fff;
/* 椤堕儴绾㈣壊 */
+ z-index: 999;
}
::v-deep .el-card__header {
@@ -560,10 +791,43 @@
margin-left: 0.19rem;
}
+.mapBox {
+ height: 100%;
+ width: 100%;
+ margin: 0 auto;
+ position: relative;
+}
#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