From 6f7c9ef272906bbd5d905ee069bc5d6d1bf55614 Mon Sep 17 00:00:00 2001
From: YM <479443481@qq.com>
Date: 星期四, 06 六月 2024 21:41:27 +0800
Subject: [PATCH] Merge branch 'master' of http://182.92.203.7:2001/r/TCM_CharacterLibrary
---
src/pages/territory/territory.vue | 22 +++++++++++++++++++---
1 files changed, 19 insertions(+), 3 deletions(-)
diff --git a/src/pages/territory/territory.vue b/src/pages/territory/territory.vue
index 21a1409..64fbbbd 100644
--- a/src/pages/territory/territory.vue
+++ b/src/pages/territory/territory.vue
@@ -220,7 +220,6 @@
import { loadBMap } from "@/static/map.js";
import L from "leaflet";
import "leaflet.chinatmsproviders";
-
import * as echarts from "echarts";
import "echarts/extension/bmap/bmap";
import { getRetrieval, getDynasty, getPreCount } from "@/api/index.js";
@@ -427,6 +426,7 @@
nativePlace: item?.content1,
barnch: item?.MEDICAL_BRANCH[0]?.content1,
medical: item?.MEDICAL_EXPERTISE[0]?.content1,
+ id: item.id,
};
this.$nextTick(() => {
this.isTop =
@@ -453,6 +453,7 @@
times = Math.floor(totalCount / 200);
}
console.log(times, "times");
+ if (times == 0 || times < 0) times = 1;
let markerList = [];
for (let i = 1; i <= times; i++) {
const curData = await this.getDataPageInfo(i);
@@ -460,7 +461,6 @@
markerList = [...markerList, ...curData];
}
if (i == times) {
- console.log(markerList, "markerList");
this.initMap(markerList);
this.SearchArr = markerList.map((item) => ({
birthAndDeath: item?.BIRTH_YEAR[0]?.content1
@@ -587,6 +587,13 @@
minZoom: 3,
})
.addTo(map);
+ L.tileLayer
+ .chinaProvider("TianDiTu.Normal.Annotion", {
+ key: "76bc34ead7e30e663a4eded8aeaf5860",
+ 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
@@ -650,6 +657,7 @@
nativePlace: item?.content1,
barnch: item?.MEDICAL_BRANCH[0]?.content1,
medical: item?.MEDICAL_EXPERTISE[0]?.content1,
+ id: item.id,
};
this.isTop = e.containerPoint.y - 275 + "px";
this.isLeft = e.containerPoint.x - 171 + "px";
@@ -676,7 +684,7 @@
// 鏌ョ湅鏇村>>
viewMoreClick() {
uni.navigateTo({
- url: "/pages/character/detail",
+ url: "/pages/character/detail?id=" + this.currentMark.id,
});
},
},
@@ -898,4 +906,12 @@
opacity: 0;
}
}
+
+::v-deep .cleanupBtn{
+ right: 60px !important;
+}
+
+::v-deep .widget_input{
+ min-width: 240px !important;
+}
</style>
--
Gitblit v1.9.1