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/characterMap/characterMap.vue | 83 +++++++++++++++++++++++++++--------------
1 files changed, 54 insertions(+), 29 deletions(-)
diff --git a/src/pages/characterMap/characterMap.vue b/src/pages/characterMap/characterMap.vue
index e9a18d3..763f48f 100644
--- a/src/pages/characterMap/characterMap.vue
+++ b/src/pages/characterMap/characterMap.vue
@@ -1,28 +1,38 @@
<template>
<view>
- <headNav :idIndex="idIndex" text="涓尰浜虹墿鏁版嵁搴�" />
- <el-button class="getBack" @click="getBack">杩斿洖</el-button>
- <view class="" style="position: relative">
+ <headNav
+ :idIndex="idIndex"
+ text="涓尰浜虹墿鏁版嵁搴�"
+ />
+ <el-button
+ class="getBack"
+ @click="getBack"
+ >杩斿洖</el-button>
+ <view
+ class=""
+ style="position: relative"
+ >
<!-- 鍦板浘 -->
<!-- <view id="spaceTime" style="height: 90vh;width: 100%;position: relative;"></view> -->
<div id="map"></div>
<!-- 璇︽儏 -->
- <el-dialog class="particulars" :visible.sync="menuNav" :modal="false">
+ <el-dialog
+ class="particulars"
+ :visible.sync="menuNav"
+ :modal="false"
+ >
<view
class="font-family"
style="font-size: 0.26rem; padding-top: 0.16rem; font-weight: bold"
- >{{ activityInfo.participants }}</view
- >
- <ul
- style="
+ >{{ activityInfo.participants }}</view>
+ <ul style="
border-bottom: 0.01rem solid #d8d8d8;
padding: 0.16rem 0;
font-size: 0.14rem;
font-weight: 400;
line-height: 0.28rem;
- "
- >
+ ">
<li>鍑虹敓浜巤{ basicInfo.nativePlace }}</li>
<li>
{{
@@ -34,14 +44,12 @@
}}
</li>
</ul>
- <ul
- style="
+ <ul style="
margin: 0.31rem 0 0.11rem 0;
font-size: 0.14rem;
font-weight: 400;
line-height: 0.28rem;
- "
- >
+ ">
<li>娲诲姩鍚嶇О锛歿{ activityInfo.activityName }}</li>
<li>娲诲姩鍦扮偣锛歿{ activityInfo.activityAddr }}</li>
<li>娲诲姩鍖洪棿锛歿{ activityInfo.time }}</li>
@@ -53,10 +61,14 @@
src="https://img0.baidu.com/it/u=1845740325,2917001370&fm=253&app=120&size=w931&n=0&f=JPEG&fmt=auto?sec=1711731600&t=0b208ab46e1d33aa81ac31dd6bf627be"
alt=""
/> -->
- <div class="box" style="width: 80%">
- <span class="span" :style="{ marginLeft: spanML + 'rem' }"
- >{{ span }}骞�</span
- >
+ <div
+ class="box"
+ style="width: 80%"
+ >
+ <span
+ class="span"
+ :style="{ marginLeft: spanML + 'rem' }"
+ >{{ span }}骞�</span>
<div class="scales">
<view
v-for="(item, index) in yearArr"
@@ -66,7 +78,10 @@
></view>
</div>
<div class="MX"></div>
- <div class="cursor" :style="{ marginLeft: cursorML + 'rem' }"></div>
+ <div
+ class="cursor"
+ :style="{ marginLeft: cursorML + 'rem' }"
+ ></div>
</div>
</el-dialog>
</view>
@@ -77,6 +92,7 @@
import * as echarts from "echarts";
import "echarts/extension/bmap/bmap";
import { loadBMap } from "@/static/map.js";
+import "leaflet.chinatmsproviders";
import L from "leaflet";
import { getPersonInfo } from "@/api/index.js";
export default {
@@ -123,27 +139,30 @@
// "http://webrd01.is.autonavi.com/appmaptile?lang=zh_cn&size=1&scale=1&style=7&x={x}&y={y}&z={z}"
// ).addTo(map);
- L.tileLayer(
- "https://t{s}.tianditu.gov.cn/vec_c/wmts?service=wmts&request=GetTile&version=1.0.0&LAYER=vec&tileMatrixSet=c&TileMatrix={z}&TileRow={y}&TileCol={x}&style=default&format=tiles&tk=76bc34ead7e30e663a4eded8aeaf5860",
- {
+ L.tileLayer
+ .chinaProvider("TianDiTu.Normal.Map", {
+ key: "76bc34ead7e30e663a4eded8aeaf5860",
maxZoom: 18,
- attribution: "Map data © 2012-2019, TianDiTu",
- id: "tdtAnnoLayer",
- accessToken: "your.mapbox.public.access.token",
- }
- ).addTo(map);
+ minZoom: 5,
+ })
+ .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 (info && info.length) {
for (let i = 0; i < info.length; i++) {
const item = info[i];
const marker1 = L.marker([item.ycoord, item.xcoord], {
- icon: DefaultIcon1,
+ icon: icon,
}).addTo(map);
marker1.on("click", (e) => {
this.menuNav = true;
@@ -579,9 +598,15 @@
height: 100%;
}
#map {
- height: 1080px;
+ height: 100%;
width: 100%;
margin: 0 auto;
font-size: 14px !important;
}
+::v-deep .map-circle-name {
+ width: 20px;
+ height: 20px;
+ border-radius: 50%;
+ background-color: #2070bc;
+}
</style>
--
Gitblit v1.9.1