From 8d34b11ddf7759875d3222315dfa2a36a24996ac Mon Sep 17 00:00:00 2001
From: YM <479443481@qq.com>
Date: 星期六, 18 五月 2024 15:09:45 +0800
Subject: [PATCH] Merge branch 'master' of http://182.92.203.7:2001/r/TCM_CharacterLibrary
---
src/pages/characterMap/characterMap.vue | 55 +++++++++++++++++++++++++++++++++++--------------------
1 files changed, 35 insertions(+), 20 deletions(-)
diff --git a/src/pages/characterMap/characterMap.vue b/src/pages/characterMap/characterMap.vue
index 8d04186..8f65ad1 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 {
@@ -122,7 +138,6 @@
// L.tileLayer(
// "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
.chinaProvider("TianDiTu.Normal.Map", {
--
Gitblit v1.9.1