From 1a5b2a6443dc24e3e024e2c0bb500d80a2b20d11 Mon Sep 17 00:00:00 2001
From: 杨磊 <505174330@qq.com>
Date: 星期四, 06 六月 2024 15:36:37 +0800
Subject: [PATCH] Merge branch 'master' of http://182.92.203.7:2001/r/TCM_CharacterLibrary
---
src/pages/territory/territory.vue | 386 ++++++++++++++++++++++++++++++++++++------------------
1 files changed, 257 insertions(+), 129 deletions(-)
diff --git a/src/pages/territory/territory.vue b/src/pages/territory/territory.vue
index 4d8a90b..eecc841 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"
@@ -33,7 +33,6 @@
"
>
<view
- class=""
:style="{ background: item.color }"
style="
margin-right: 0.07rem;
@@ -42,7 +41,7 @@
border-radius: 50%;
"
></view>
- <view class="" style="color: #2c2c2c; font-size: 0.12rem">{{
+ <view style="color: #2c2c2c; font-size: 0.12rem">{{
item.name
}}</view>
</view>
@@ -57,7 +56,7 @@
height: 3.2rem;
width: 3rem;
position: fixed;
- z-index: 999999999999;
+ z-index: 99;
left: 1rem;
top: 2.2rem;
"
@@ -76,7 +75,21 @@
>鍏抽棴</el-button
>
</div>
- <view class="" style="overflow: auto; height: 2.5rem">
+ <view style="overflow: auto; height: 2.5rem">
+ <div
+ v-if="!loading && SearchArr.length == 0"
+ style="
+ position: absolute;
+ top: 30%;
+ left: 0;
+ right: 0;
+ text-align: center;
+ font-size: 0.2rem;
+ color: #666;
+ "
+ >
+ 鏆傛棤鎼滅储鏁版嵁
+ </div>
<ul
class="information"
v-for="(item, index) in SearchArr"
@@ -99,54 +112,58 @@
</view>
</el-card>
<!-- echarts閲岄潰鐨勬暟鎹偣鍑诲悗寮规 -->
- <el-card
- class="box-card echartsTrue"
- v-show="isEchTrue"
- style="
- overflow: inherit;
- width: 3rem;
- position: fixed;
- z-index: 999999999999;
- "
- :style="{ top: isTop, left: isLeft }"
- >
- <div slot="header" class="clearfix">
- <span v-if="currentMark">{{
- currentMark.name ? currentMark.name : "-"
- }}</span>
+
+ <div class="mapBox" id="mapBox" v-loading="mapLoading">
+ <div id="map"></div>
+ <el-card
+ class="box-card echartsTrue"
+ v-show="isEchTrue"
+ style="overflow: inherit; width: 3rem; position: absolute; z-index: 999"
+ :style="{ top: isTop, left: isLeft }"
+ >
+ <div slot="header" class="clearfix">
+ <span v-if="currentMark">{{
+ currentMark.name ? currentMark.name : "-"
+ }}</span>
+ <el-button
+ style="
+ float: right;
+ padding: 3px 0;
+ font-size: 0.12rem;
+ color: #597aa5;
+ "
+ @click="isEchTrue = false"
+ type="text"
+ >鍏抽棴</el-button
+ >
+ </div>
+ <ul class="information" v-if="currentMark">
+ <li>
+ 濮撳悕:
+ {{ currentMark.name ? currentMark.name : "-" }}
+ </li>
+ <li>鍒悕: {{ currentMark.nikeName ? currentMark.nikeName : "-" }}</li>
+ <li>
+ 绫嶈疮: {{ currentMark.nativePlace ? currentMark.nativePlace : "-" }}
+ </li>
+ <li>鍖诲鍒嗙: {{ currentMark.barnch ? currentMark.barnch : "-" }}</li>
+ <li>灏忎紶: {{ currentMark.medical ? currentMark.medical : "-" }}</li>
+ </ul>
<el-button
+ class="flex"
+ @click="viewMoreClick"
style="
- float: right;
+ width: 100%;
padding: 3px 0;
font-size: 0.12rem;
color: #597aa5;
"
- @click="isEchTrue = false"
type="text"
- >鍏抽棴</el-button
+ >鏌ョ湅鏇村>></el-button
>
- </div>
- <ul class="information" v-if="currentMark">
- <li>
- 濮撳悕:
- {{ currentMark.name ? currentMark.name : "-" }}
- </li>
- <li>鍒悕: {{ currentMark.nikeName ? currentMark.nikeName : "-" }}</li>
- <li>
- 绫嶈疮: {{ currentMark.nativePlace ? currentMark.nativePlace : "-" }}
- </li>
- <li>鍖诲鍒嗙: {{ currentMark.barnch ? currentMark.barnch : "-" }}</li>
- <li>灏忎紶: {{ currentMark.medical ? currentMark.medical : "-" }}</li>
- </ul>
- <el-button
- class="flex"
- @click="viewMoreClick"
- style="width: 100%; padding: 3px 0; font-size: 0.12rem; color: #597aa5"
- type="text"
- >鏌ョ湅鏇村>></el-button
- >
- </el-card>
- <div id="map"></div>
+ </el-card>
+ </div>
+
<!-- 鏈濅唬 -->
<view
class="flex flex-center"
@@ -155,7 +172,9 @@
position: fixed;
bottom: 0.33rem;
left: 0;
+ right: 0;
z-index: 99;
+ overflow: auto;
"
>
<ul class="flex">
@@ -173,9 +192,10 @@
<view
class="flex flex-center font-family"
style="
- padding: 0.05rem 0.19rem;
+ min-width: 0.6rem;
height: 0.3rem;
line-height: 0.3rem;
+ text-align: center;
color: #fff;
font-size: 0.14rem;
margin-top: 0.03rem;
@@ -199,13 +219,15 @@
<script>
import { loadBMap } from "@/static/map.js";
import L from "leaflet";
+import "leaflet.chinatmsproviders";
import * as echarts from "echarts";
import "echarts/extension/bmap/bmap";
-import "leaflet.chinatmsproviders";
-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,
@@ -380,7 +402,6 @@
},
onLoad(options) {
this.idIndex = options.id;
- console.log("optionsoptionsoptions", options.id);
},
mounted() {
this.getDynastyList();
@@ -390,42 +411,56 @@
methods: {
getDynastyList() {
getDynasty().then((res) => {
- console.log(res, "123123");
this.dynasty1 = res.list;
});
},
showCard(info) {
- console.log(info);
- console.log(this.markerList);
- console.log(this.map);
const item = this.markerList.find((f) => f.id == info.id);
var latlng = L.latLng(item.yCoord, item.xCoord);
this.map.setView(latlng, 10);
+ 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() {
- getRetrieval({ keyword: this.keyword, dynasty: this.dynasty1Color }).then(
- (res) => {
- if (res.object) {
- let markerList = [];
- const listData = res.object.personList;
- console.log(listData, "listData");
- 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 });
- }
- });
- }
- }
- console.log(markerList, "markerList");
+ 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
@@ -438,12 +473,99 @@
id: item.id,
}));
this.markerList = markerList;
+ this.loading = false;
+ this.mapLoading = false;
}
}
- );
+ });
+
+ // 闂锛�
+ // 鎼滅储缁撴灉涓嶅
+ // 鐐瑰嚮鍦板浘鏍囩偣鍑虹幇寮规锛屾嫋鍔ㄥ湴鍥炬椂搴斿叧闂脊妗�
+
+ // 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;
},
//鍒濆鍖栧湴鍥�
initMap(markerList) {
+ console.log(markerList, "markerList");
this.isEchTrue = false;
if (this.map) {
this.map.remove();
@@ -451,8 +573,13 @@
var map = L.map("map", {
preferCanvas: true,
attributionControl: false,
- }).setView([39.91667, 116.41667], 3);
-
+ }).setView([34.3227, 108.5525], 5);
+ map.on("moveend", this.onMapMoveEnd);
+ map.on("zoomend", function () {
+ var zoomLevel = map.getZoom(); // 鑾峰彇褰撳墠鍦板浘鐨勭缉鏀剧骇鍒�
+ console.log("褰撳墠鍦板浘缂╂斁绾у埆涓�:", zoomLevel);
+ this.isEchTrue = false;
+ });
L.tileLayer
.chinaProvider("TianDiTu.Normal.Map", {
key: "76bc34ead7e30e663a4eded8aeaf5860",
@@ -477,32 +604,35 @@
for (let i = 0; i < markerList.length; i++) {
const item = markerList[i];
let currentClassName = "map-circle-name";
- switch (item.dynastyInfo.dynastyChs) {
- case "澶�":
- currentClassName = "map-circle-xia";
- break;
- case "鍟�":
- currentClassName = "map-circle-shang";
- break;
- case "瑗垮懆":
- currentClassName = "map-circle-zhou";
- break;
- case "绉�":
- currentClassName = "map-circle-qin";
- break;
- case "姹�":
- currentClassName = "map-circle-han";
- break;
- case "闅�":
- currentClassName = "map-circle-sui";
- break;
- case "鍞�":
- currentClassName = "map-circle-tang";
- break;
- case "鏄�":
- currentClassName = "map-circle-ming";
- break;
+ if (item.dynastyInfo) {
+ switch (item.dynastyInfo.dynastyChs) {
+ case "澶�":
+ currentClassName = "map-circle-xia";
+ break;
+ case "鍟�":
+ currentClassName = "map-circle-shang";
+ break;
+ case "瑗垮懆":
+ currentClassName = "map-circle-zhou";
+ break;
+ case "绉�":
+ currentClassName = "map-circle-qin";
+ break;
+ case "姹�":
+ currentClassName = "map-circle-han";
+ break;
+ case "闅�":
+ currentClassName = "map-circle-sui";
+ break;
+ case "鍞�":
+ currentClassName = "map-circle-tang";
+ break;
+ case "鏄�":
+ currentClassName = "map-circle-ming";
+ break;
+ }
}
+
let icon = L.divIcon({
html: `<div class='${currentClassName} ripple'></div>`,
iconSize: [80, 80],
@@ -512,24 +642,19 @@
icon: icon,
}).addTo(map);
temp_mark.on("click", (e) => {
- 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 / 2 +
- "px";
- this.isLeft =
- e.containerPoint.x -
- document.querySelector(".echartsTrue").offsetWidth / 2 +
- "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);
});
}
}
@@ -537,7 +662,6 @@
// 鐐瑰嚮涓嬮潰鐨勬湞浠ｆ寜閽�
dynastyBottomClick(id) {
- console.log(id);
this.dynasty1Color = id;
this.getDataList();
},
@@ -549,13 +673,11 @@
this.getDataList();
},
// 鐐瑰嚮涓婇潰鐨勬湞浠ｆ寜閽�
- SchoolClick(id) {
- console.log(id);
- },
+ SchoolClick(id) {},
// 鏌ョ湅鏇村>>
viewMoreClick() {
uni.navigateTo({
- url: "/pages/character/detail",
+ url: "/pages/character/detail?id=" + this.currentMark.id,
});
},
},
@@ -639,6 +761,7 @@
/* 鍙宠竟閫忔槑 */
border-top: 0.2rem solid #fff;
/* 椤堕儴绾㈣壊 */
+ z-index: 999;
}
::v-deep .el-card__header {
@@ -737,6 +860,12 @@
margin-left: 0.19rem;
}
+.mapBox {
+ height: 100%;
+ width: 100%;
+ margin: 0 auto;
+ position: relative;
+}
#map {
height: 100%;
width: 100%;
@@ -746,7 +875,6 @@
}
::v-deep .ripple {
-
border-radius: 50%;
position: relative;
overflow: hidden;
--
Gitblit v1.9.1