From 5a39da04cdd86de85324edeb26074a6af32112a6 Mon Sep 17 00:00:00 2001
From: 杨磊 <505174330@qq.com>
Date: 星期四, 06 六月 2024 19:36:13 +0800
Subject: [PATCH] chinaProvider
---
src/pages/territory/territory.vue | 234 ++++++++++++++++++++++++++++++++++++++-------------------
1 files changed, 155 insertions(+), 79 deletions(-)
diff --git a/src/pages/territory/territory.vue b/src/pages/territory/territory.vue
index 46e345e..cf6576a 100644
--- a/src/pages/territory/territory.vue
+++ b/src/pages/territory/territory.vue
@@ -4,7 +4,7 @@
<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"
+ style="width: 100%; margin: 20px 0 34px; justify-content: flex-start"
>
<advancedSearch
class="Search"
@@ -14,7 +14,7 @@
:keyword="keyword"
/>
<ul class="flex">
- <li style="" v-for="(item, index) in dynasty" :key="item.id">
+ <li v-for="(item, index) in dynasty" :key="item.id">
<view
@click="SchoolClick(item.id)"
class="flex flex-center font-family school"
@@ -113,7 +113,7 @@
</el-card>
<!-- echarts閲岄潰鐨勬暟鎹偣鍑诲悗寮规 -->
- <div class="mapBox">
+ <div class="mapBox" id="mapBox" v-loading="mapLoading">
<div id="map"></div>
<el-card
class="box-card echartsTrue"
@@ -220,14 +220,14 @@
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 } from "@/api/index.js";
+import { getRetrieval, getDynasty, getPreCount } from "@/api/index.js";
export default {
data() {
return {
loading: true,
+ mapLoading: true,
// echarts鍏冪礌鐐瑰嚮鏃跺嚭鏉ョ殑寮圭獥鍜屽潗鏍�
keyword: "",
isEchTrue: false,
@@ -418,72 +418,147 @@
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%";
- });
+ setTimeout(() => {
+ 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,
+ id: item.id,
+ };
+ this.$nextTick(() => {
+ this.isTop =
+ document.getElementById("mapBox").offsetHeight / 2 - 275 + "px";
+ this.isLeft =
+ document.getElementById("mapBox").offsetWidth / 2 - 171 + "px";
+ });
+ }, 300);
},
getDataList() {
this.SearchArr = [];
this.loading = true;
+ this.mapLoading = true;
// 杩欓噷鏀规垚浜嗗垎椤电殑鎺ュ彛锛岄渶瑕佽皟鐢ㄥ娆″彇鍑烘墍鏈夋暟鎹�
+ let times = 0;
+ getPreCount({
+ keyword: this.keyword,
+ dynasty: this.dynasty1Color,
+ }).then(async (res) => {
+ const totalCount = res.object;
+ if (totalCount % 200 == 0) {
+ times = totalCount / 200 - 1;
+ } else {
+ 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);
+ if (curData) {
+ markerList = [...markerList, ...curData];
+ }
+ if (i == times) {
+ 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.loading = false;
+ this.mapLoading = false;
+ }
+ }
+ });
// 闂锛�
// 鎼滅储缁撴灉涓嶅
// 鐐瑰嚮鍦板浘鏍囩偣鍑虹幇寮规锛屾嫋鍔ㄥ湴鍥炬椂搴斿叧闂脊妗�
- 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([]);
- }
- });
+ // getRetrieval({
+ // keyword: this.keyword,
+ // dynasty: this.dynasty1Color,
+ // page: 1,
+ // pageSize: 200,
+ // }).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([]);
+ // }
+ // });
},
+ async getDataPageInfo(count) {
+ const res = await getRetrieval({
+ keyword: this.keyword,
+ dynasty: this.dynasty1Color,
+ page: count,
+ pageSize: 200,
+ });
+ 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 });
+ }
+ });
+ }
+ }
+
+ return markerList;
+ } else {
+ return [];
+ }
+ },
onMapMoveEnd() {
console.log("鍦板浘鎷栧姩浜�");
this.isEchTrue = false;
@@ -507,6 +582,13 @@
});
L.tileLayer
.chinaProvider("TianDiTu.Normal.Map", {
+ key: "76bc34ead7e30e663a4eded8aeaf5860",
+ maxZoom: 18,
+ minZoom: 3,
+ })
+ .addTo(map);
+ L.tileLayer
+ .chinaProvider("TianDiTu.Normal.Annotion", {
key: "76bc34ead7e30e663a4eded8aeaf5860",
maxZoom: 18,
minZoom: 3,
@@ -567,25 +649,19 @@
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";
- });
+ setTimeout(() => {
+ 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,
+ id: item.id,
+ };
+ this.isTop = e.containerPoint.y - 275 + "px";
+ this.isLeft = e.containerPoint.x - 171 + "px";
+ }, 300);
});
}
}
@@ -608,7 +684,7 @@
// 鏌ョ湅鏇村>>
viewMoreClick() {
uni.navigateTo({
- url: "/pages/character/detail",
+ url: "/pages/character/detail?id=" + this.currentMark.id,
});
},
},
--
Gitblit v1.9.1