From 6cffb189105aaa2dbde8886c3f43a1a65276e872 Mon Sep 17 00:00:00 2001
From: 杨磊 <505174330@qq.com>
Date: 星期一, 20 五月 2024 17:44:43 +0800
Subject: [PATCH] Merge branch 'master' of http://182.92.203.7:2001/r/TCM_CharacterLibrary
---
src/pages/territory/territory.vue | 225 ++++++++++++++++++++++++++++++++++++++++++++-----------
1 files changed, 178 insertions(+), 47 deletions(-)
diff --git a/src/pages/territory/territory.vue b/src/pages/territory/territory.vue
index bf31e36..22219f4 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"
@@ -77,7 +77,12 @@
>
</div>
<view class="" style="overflow: auto; height: 2.5rem">
- <ul class="information" v-for="(item, index) in SearchArr" :key="index">
+ <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>
@@ -141,13 +146,11 @@
>鏌ョ湅鏇村>></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; z-index: 99;"
>
<ul class="flex">
<li
@@ -159,7 +162,7 @@
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"
@@ -178,7 +181,7 @@
background: dynasty1Color == item.id ? '#244A7B' : '#597AA5',
}"
>
- {{ item.name }}
+ {{ item.dynastyChs }}
</view>
</li>
</ul>
@@ -193,7 +196,7 @@
import * as echarts from "echarts";
import "echarts/extension/bmap/bmap";
import "leaflet.chinatmsproviders";
-import { getRetrieval } from "@/api/index.js";
+import { getRetrieval, getDynasty } from "@/api/index.js";
export default {
data() {
return {
@@ -227,7 +230,7 @@
},
],
// 涓嬮潰鐨勬湞浠�1
- dynasty1Color: 1,
+ dynasty1Color: "",
dynasty1: [
{
name: "澶忔湞",
@@ -310,12 +313,12 @@
// 鏈濅唬
dynasty: [
{
- name: "澶忔湞",
+ name: "澶�",
color: "#90BBD8",
id: 1,
},
{
- name: "鍟嗘湞",
+ name: "鍟�",
color: "#EDD28B",
id: 2,
},
@@ -325,24 +328,29 @@
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,
},
],
// 鎼滅储鍚庢槸鍚︽樉绀哄脊妗�
@@ -369,54 +377,83 @@
console.log("optionsoptionsoptions", options.id);
},
mounted() {
- // this.$nextTick(() => {
- // loadBMap("1NJdwrI1CfT6lrykVhDkmWgsO6O2bjQK").then(() => {
- // this.innt();
- // });
- // })
+ this.getDynastyList();
+
this.getDataList();
},
methods: {
+ getDynastyList() {
+ getDynasty().then((res) => {
+ console.log(res, "123123");
+ this.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);
+ var latlng = L.latLng(item.yCoord, item.xCoord);
+ this.map.setView(latlng, 10);
+ },
getDataList() {
- getRetrieval({ keyword: this.keyword, dynasty: "" }).then((res) => {
- 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) {
- markerList.push({ ...citem, ...item });
+ 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 = 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.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: "-",
- }));
- console.log(markerList, "markerList");
- });
+ );
},
//鍒濆鍖栧湴鍥�
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),
+ 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);
- this.map = map;
let DefaultIcon1 = L.icon({
iconUrl: this.icoName,
iconSize: [24, 41], // 鍥炬爣鐨勫ぇ灏� 銆愬��1锛屽��2銆� 涓哄叿浣撲綘鑷畾涔夊浘鏍囩殑灏哄锛屾瘮濡傛垜鍥炬爣灏哄鏄�32脳52锛岃〃绀鸿鍥炬爣锛氬搴�32鍍忕礌锛岄珮搴︼細52鍍忕礌锛岄偅涔堝��1:灏辨槸32锛屽��2锛氬氨鏄�52
@@ -424,11 +461,49 @@
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 (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}'></div>`,
+ iconSize: [80, 80],
+ className: "map-circle",
+ });
const temp_mark = L.marker([item.yCoord, item.xCoord], {
- icon: DefaultIcon1,
+ icon: icon,
}).addTo(map);
temp_mark.on("click", (e) => {
this.isEchTrue = true;
@@ -458,6 +533,7 @@
dynastyBottomClick(id) {
console.log(id);
this.dynasty1Color = id;
+ this.getDataList();
},
onSearch(val) {
this.isSearch = true;
@@ -481,6 +557,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%;
@@ -601,10 +732,10 @@
}
#map {
- height: 600px;
+ height: 100%;
width: 100%;
margin: 0 auto;
font-size: 14px !important;
- z-index: -1 !important;
+ z-index: 10 !important;
}
</style>
--
Gitblit v1.9.1