From be5b7495edc7dbf7d3d934ba5a82782b7fbaf790 Mon Sep 17 00:00:00 2001
From: 杨磊 <505174330@qq.com>
Date: 星期三, 05 六月 2024 19:16:51 +0800
Subject: [PATCH] 图谱分页加载
---
src/pages/territory/territory.vue | 255 ++++++++++++++++++++++++++++++++------------------
src/api/index.js | 11 ++
2 files changed, 174 insertions(+), 92 deletions(-)
diff --git a/src/api/index.js b/src/api/index.js
index 42aaa5d..c1d9702 100644
--- a/src/api/index.js
+++ b/src/api/index.js
@@ -189,6 +189,17 @@
method: "post"
});
};
+// 涓浗鍦板煙鍦拌氨妫�绱汉鐗�
+export const getPreCount = (requestData) => {
+ return req1({
+ url:
+ "/person/retrieval/preCount?keyword=" +
+ requestData?.keyword +
+ "&dynasty=" +
+ requestData?.dynasty,
+ method: "post"
+ });
+};
// 鍖诲浜虹墿鐭ヨ瘑搴�
// 涓栧尰浼犳壙
diff --git a/src/pages/territory/territory.vue b/src/pages/territory/territory.vue
index bc41f10..21a1409 100644
--- a/src/pages/territory/territory.vue
+++ b/src/pages/territory/territory.vue
@@ -19,7 +19,7 @@
@click="SchoolClick(item.id)"
class="flex flex-center font-family school"
:style="{
- marginRight: index === dynasty.length - 1 ? '0' : '0.03rem'
+ marginRight: index === dynasty.length - 1 ? '0' : '0.03rem',
}"
style="
font-weight: 500;
@@ -113,7 +113,7 @@
</el-card>
<!-- echarts閲岄潰鐨勬暟鎹偣鍑诲悗寮规 -->
- <div class="mapBox" id="mapBox">
+ <div class="mapBox" id="mapBox" v-loading="mapLoading">
<div id="map"></div>
<el-card
class="box-card echartsTrue"
@@ -204,7 +204,7 @@
"
:style="{
marginRight: index === dynasty1.length - 1 ? '0' : '0.03rem',
- background: dynasty1Color == item.id ? '#244A7B' : '#597AA5'
+ background: dynasty1Color == item.id ? '#244A7B' : '#597AA5',
}"
>
{{ item.dynastyChs }}
@@ -223,11 +223,12 @@
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,
@@ -237,25 +238,25 @@
information: [
{
label: "濮撳悕",
- content: "鏉庢椂鐝�"
+ content: "鏉庢椂鐝�",
},
{
label: "鍒悕",
- content: "涓滀附鍏堢敓"
+ content: "涓滀附鍏堢敓",
},
{
label: "绫嶈疮",
- content: "婀栧寳"
+ content: "婀栧寳",
},
{
label: "鍖诲鍒嗙",
- content: "涓嵂,閽堢伕"
+ content: "涓嵂,閽堢伕",
},
{
label: "灏忎紶",
content:
- "鏉庢椂鐝�(绾�1518骞磣1593 骞�)锛� 瀛椾笢鐠э紝 鏅氬勾鑷彿婵掓箹灞变汉锛� 婀栧箍榛勫窞搴滆柂宸�(浠婃箹鍖楃渷钖槬鍘�) 浜猴紝 鏄庝唬钁楀悕鍖昏嵂瀛﹀銆� 涓庘�� 鍖诲湥鈥� 涓囧瘑鏂嬮綈鍚嶏紝 鍙ゆ湁鈥� 涓囧瘑鏂嬬殑鏂癸紝 鏉庢椂鐝嶇殑鑽�� 涔嬭銆� 鍚庝负妤氬共搴�..."
- }
+ "鏉庢椂鐝�(绾�1518骞磣1593 骞�)锛� 瀛椾笢鐠э紝 鏅氬勾鑷彿婵掓箹灞变汉锛� 婀栧箍榛勫窞搴滆柂宸�(浠婃箹鍖楃渷钖槬鍘�) 浜猴紝 鏄庝唬钁楀悕鍖昏嵂瀛﹀銆� 涓庘�� 鍖诲湥鈥� 涓囧瘑鏂嬮綈鍚嶏紝 鍙ゆ湁鈥� 涓囧瘑鏂嬬殑鏂癸紝 鏉庢椂鐝嶇殑鑽�� 涔嬭銆� 鍚庝负妤氬共搴�...",
+ },
],
// 涓嬮潰鐨勬湞浠�1
dynasty1Color: "",
@@ -263,78 +264,78 @@
{
name: "澶忔湞",
coord: "2070BC",
- id: 1
+ id: 1,
},
{
name: "鍟嗘湞",
id: 2,
- coord: "1600BC"
+ coord: "1600BC",
},
{
name: "瑗垮懆",
id: 3,
- coord: "1600BC"
+ coord: "1600BC",
},
{
name: "鏄ョ鎴樺浗",
id: 4,
- coord: "770BC"
+ coord: "770BC",
},
{
name: "绉︽湞",
id: 5,
- coord: "221BC"
+ coord: "221BC",
},
{
name: "姹夋湞",
id: 6,
- coord: "202BC"
+ coord: "202BC",
},
{
name: "涓夊浗涓ゆ檵鍗楀寳鏈�",
id: 7,
- coord: "184"
+ coord: "184",
},
{
name: "闅嬫湞",
id: 8,
- coord: "581"
+ coord: "581",
},
{
name: "鍞愭湞",
id: 9,
- coord: "618"
+ coord: "618",
},
{
name: "浜斾唬鍗佸浗",
id: 10,
- coord: "907"
+ coord: "907",
},
{
name: "杈藉閲�",
id: 11,
- coord: "907"
+ coord: "907",
},
{
name: "瀹嬫湞",
id: 12,
- coord: "960"
+ coord: "960",
},
{
name: "鍏冩湞",
id: 13,
- coord: "1271"
+ coord: "1271",
},
{
name: "鏄庢湞",
id: 14,
- coord: "1368"
+ coord: "1368",
},
{
name: "娓呮湞",
id: 15,
- coord: "1636"
- }
+ coord: "1636",
+ },
],
// 鏍囬椤堕儴鏍忛渶瑕佺殑涓滆タ
idIndex: 0,
@@ -343,43 +344,43 @@
{
name: "澶�",
color: "#90BBD8",
- id: 1
+ id: 1,
},
{
name: "鍟�",
color: "#EDD28B",
- id: 2
+ id: 2,
},
{
name: "瑗垮懆",
color: "#CF746D",
- id: 3
+ id: 3,
},
{
name: "绉�",
color: "#9CC27A",
- id: 4
+ id: 4,
},
{
name: "姹�",
color: "#5B6CB9",
- id: 5
+ id: 5,
},
{
name: "闅�",
color: "#8860A8",
- id: 6
+ id: 6,
},
{
name: "鍞�",
color: "#DE8E66",
- id: 7
+ id: 7,
},
{
name: "鏄�",
color: "#DE8E66",
- id: 8
- }
+ id: 8,
+ },
],
// 鎼滅储鍚庢槸鍚︽樉绀哄脊妗�
isSearch: false,
@@ -389,15 +390,15 @@
id: 1,
name: "鏉庢椂鐝�",
birthAndDeath: "1518-1593",
- source: "鍥藉浘瑙勮寖妗ｏ紝CBDB锛屼笂鍥惧彜绫嶆暟鎹簱 绫嶈疮锛氭箹鍖�"
+ source: "鍥藉浘瑙勮寖妗ｏ紝CBDB锛屼笂鍥惧彜绫嶆暟鎹簱 绫嶈疮锛氭箹鍖�",
},
{
id: 2,
name: "鏉庢椂鐝�",
birthAndDeath: "1518-1593",
- source: "鍥藉浘瑙勮寖妗ｏ紝CBDB锛屼笂鍥惧彜绫嶆暟鎹簱 绫嶈疮锛氭箹鍖�"
- }
- ]
+ source: "鍥藉浘瑙勮寖妗ｏ紝CBDB锛屼笂鍥惧彜绫嶆暟鎹簱 绫嶈疮锛氭箹鍖�",
+ },
+ ],
};
},
onLoad(options) {
@@ -425,7 +426,7 @@
nikeName: item?.ALIAS[0]?.content2,
nativePlace: item?.content1,
barnch: item?.MEDICAL_BRANCH[0]?.content1,
- medical: item?.MEDICAL_EXPERTISE[0]?.content1
+ medical: item?.MEDICAL_EXPERTISE[0]?.content1,
};
this.$nextTick(() => {
this.isTop =
@@ -438,56 +439,126 @@
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");
+ let markerList = [];
+ for (let i = 1; i <= times; i++) {
+ const curData = await this.getDataPageInfo(i);
+ if (curData) {
+ markerList = [...markerList, ...curData];
+ }
+ if (i == times) {
+ 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.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;
@@ -501,7 +572,7 @@
}
var map = L.map("map", {
preferCanvas: true,
- attributionControl: false
+ attributionControl: false,
}).setView([34.3227, 108.5525], 5);
map.on("moveend", this.onMapMoveEnd);
map.on("zoomend", function () {
@@ -513,20 +584,20 @@
.chinaProvider("TianDiTu.Normal.Map", {
key: "76bc34ead7e30e663a4eded8aeaf5860",
maxZoom: 18,
- minZoom: 3
+ minZoom: 3,
})
.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]锛屾垜鏄幓涓�鍗婂�硷紝鍙栦竴鍗婂�艰皟鍑烘潵鐨�
+ popupAnchor: [1, -24], // 璇ョ偣鏄浉瀵逛簬iconAnchor寮瑰嚭淇℃伅鐨勪綅缃� 杩欎釜鏄垜鎵嬪姩璋冨嚭鏉ョ殑锛屾枃妗ｉ粯璁ゅ師濮嬪�兼槸[-1锛�-76]锛屾垜鏄幓涓�鍗婂�硷紝鍙栦竴鍗婂�艰皟鍑烘潵鐨�
});
let icon = L.divIcon({
html: "<div class='map-circle-name '></div>",
iconSize: [80, 80],
- className: "map-circle"
+ className: "map-circle",
});
this.map = map;
if (markerList.length) {
@@ -565,10 +636,10 @@
let icon = L.divIcon({
html: `<div class='${currentClassName} ripple'></div>`,
iconSize: [80, 80],
- className: "map-circle"
+ className: "map-circle",
});
const temp_mark = L.marker([item.yCoord, item.xCoord], {
- icon: icon
+ icon: icon,
}).addTo(map);
temp_mark.on("click", (e) => {
setTimeout(() => {
@@ -578,7 +649,7 @@
nikeName: item?.ALIAS[0]?.content2,
nativePlace: item?.content1,
barnch: item?.MEDICAL_BRANCH[0]?.content1,
- medical: item?.MEDICAL_EXPERTISE[0]?.content1
+ medical: item?.MEDICAL_EXPERTISE[0]?.content1,
};
this.isTop = e.containerPoint.y - 275 + "px";
this.isLeft = e.containerPoint.x - 171 + "px";
@@ -605,10 +676,10 @@
// 鏌ョ湅鏇村>>
viewMoreClick() {
uni.navigateTo({
- url: "/pages/character/detail"
+ url: "/pages/character/detail",
});
- }
- }
+ },
+ },
};
</script>
--
Gitblit v1.9.1