From b4690c44b00625ed5f52f9ac0428262d229de2e4 Mon Sep 17 00:00:00 2001
From: 杨磊 <505174330@qq.com>
Date: 星期三, 24 七月 2024 09:53:50 +0800
Subject: [PATCH] 世医传承数据结构调整
---
src/pages/territory/territory.vue | 349 +++++++++++++++++++++++++++++++++++++++++++--------------
1 files changed, 261 insertions(+), 88 deletions(-)
diff --git a/src/pages/territory/territory.vue b/src/pages/territory/territory.vue
index 46e345e..43ff9e8 100644
--- a/src/pages/territory/territory.vue
+++ b/src/pages/territory/territory.vue
@@ -4,17 +4,17 @@
<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"
- placehold="杈撳叆濮撳悕/鍒悕/鏈濅唬/浼犱富鑱屼笟鎼滅储"
+ placehold="杈撳叆濮撳悕/鍒悕/鏃舵湡/浼犱富鑱屼笟鎼滅储"
@onSearch="onSearch"
:isAvancedTrue="false"
: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"
@@ -104,6 +104,7 @@
{{ item.birthAndDeath ? item.birthAndDeath : "-" }}
</li>
<li>鏉ユ簮: {{ item.source ? item.source : "-" }}</li>
+ <li>绫嶈疮: {{ item.nativPlace ? item.nativPlace : "-" }}</li>
<li
v-if="SearchArr.length - 1 !== index"
style="margin: 0.1rem 0; border-bottom: 1px solid #d8d8d8"
@@ -113,7 +114,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"
@@ -147,7 +148,12 @@
绫嶈疮: {{ currentMark.nativePlace ? currentMark.nativePlace : "-" }}
</li>
<li>鍖诲鍒嗙: {{ currentMark.barnch ? currentMark.barnch : "-" }}</li>
- <li>灏忎紶: {{ currentMark.medical ? currentMark.medical : "-" }}</li>
+ <li
+ class="medicalLi"
+ :title="currentMark.medical ? currentMark.medical : '-'"
+ >
+ 灏忎紶: {{ currentMark.medical ? currentMark.medical : "-" }}
+ </li>
</ul>
<el-button
class="flex"
@@ -217,17 +223,20 @@
<!-- <script src="https://api.map.baidu.com/api?v=3.0&ak=5USVDAhhS4ssz44HLq3gNPZai7naXf4Q&callback=initializeMap"></script> -->
<!-- 5USVDAhhS4ssz44HLq3gNPZai7naXf4Q -->
<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 { getRetrieval, getDynasty } from "@/api/index.js";
+import {
+ getRetrieval,
+ getDynasty,
+ getPreCount,
+ getDynastyData,
+} from "@/api/index.js";
export default {
data() {
return {
loading: true,
+ mapLoading: true,
// echarts鍏冪礌鐐瑰嚮鏃跺嚭鏉ョ殑寮圭獥鍜屽潗鏍�
keyword: "",
isEchTrue: false,
@@ -405,85 +414,231 @@
},
mounted() {
this.getDynastyList();
-
this.getDataList();
+ this.getHaveDataDynasty();
},
methods: {
+ getHaveDataDynasty() {
+ getDynastyData().then((res) => {
+ console.log(res, "getHaveDataDynasty");
+ });
+ },
getDynastyList() {
getDynasty().then((res) => {
this.dynasty1 = res.list;
+ console.log("dynasty1", res.list);
});
},
showCard(info) {
const item = this.markerList.find((f) => f.id == info.id);
+ console.log(item, "item");
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?.NAME[0]?.content1,
+ nikeName: item?.ALIAS[0]?.content2,
+ nativePlace: item?.content1,
+ barnch: item?.MEDICAL_BRANCH[0]?.content1,
+ medical: item?.BIOGRAPHY,
+ id: item.id,
+ };
+ this.$nextTick(() => {
+ this.isTop =
+ document.getElementById("mapBox").offsetHeight / 2 - 295 + "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 == 1) {
+ this.loading = false;
+ this.mapLoading = false;
+ this.markerList = markerList;
+ this.initMap(markerList);
+ } else {
+ if (curData && curData.length) {
+ for (let j = 0; j < curData.length; j++) {
+ const ele = curData[j];
+ let currentClassName = "map-circle-name";
+ if (ele.dynastyInfo) {
+ switch (ele.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],
+ className: "map-circle",
+ });
+ const temp_mark = L.marker([ele.yCoord, ele.xCoord], {
+ icon: icon,
+ }).addTo(this.map);
+ temp_mark.on("click", (e) => {
+ setTimeout(() => {
+ this.isEchTrue = true;
+ this.currentMark = {
+ name: ele?.NAME[0]?.content1,
+ nikeName: ele?.ALIAS[0]?.content2,
+ nativePlace: ele?.content1,
+ barnch: ele?.MEDICAL_BRANCH[0]?.content1,
+ medical: ele?.BIOGRAPHY,
+ id: ele.id,
+ };
+ this.isTop = e.containerPoint.y - 295 + "px";
+ this.isLeft = e.containerPoint.x - 171 + "px";
+ }, 300);
+ });
+ }
+ }
+ }
+
+ if (i == times) {
+ 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: "-",
+ nativPlace: item?.NATIVE_PLACE[0].content1,
+ id: item.id,
+ }));
+ this.markerList = markerList;
+ // this.initMap(markerList);
+ }
+ }
+ });
// 闂锛�
// 鎼滅储缁撴灉涓嶅
// 鐐瑰嚮鍦板浘鏍囩偣鍑虹幇寮规锛屾嫋鍔ㄥ湴鍥炬椂搴斿叧闂脊妗�
- 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;
@@ -512,6 +667,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
@@ -525,9 +687,9 @@
className: "map-circle",
});
this.map = map;
- if (markerList.length) {
- for (let i = 0; i < markerList.length; i++) {
- const item = markerList[i];
+ if (this.markerList.length) {
+ for (let i = 0; i < this.markerList.length; i++) {
+ const item = this.markerList[i];
let currentClassName = "map-circle-name";
if (item.dynastyInfo) {
switch (item.dynastyInfo.dynastyChs) {
@@ -567,25 +729,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?.BIOGRAPHY,
+ id: item.id,
+ };
+ this.isTop = e.containerPoint.y - 295 + "px";
+ this.isLeft = e.containerPoint.x - 171 + "px";
+ }, 300);
});
}
}
@@ -608,7 +764,7 @@
// 鏌ョ湅鏇村>>
viewMoreClick() {
uni.navigateTo({
- url: "/pages/character/detail",
+ url: "/pages/character/detail?id=" + this.currentMark.id,
});
},
},
@@ -824,10 +980,27 @@
animation: ripple-animation 1s infinite linear;
}
-@keyframes ripple-animation {
+/* @keyframes ripple-animation {
to {
transform: translate(-50%, -50%) scale(0);
opacity: 0;
}
+} */
+
+::v-deep .cleanupBtn {
+ right: 60px !important;
+}
+
+::v-deep .widget_input {
+ min-width: 240px !important;
+}
+
+.medicalLi {
+ height: 50px;
+ overflow: hidden;
+ text-overflow: ellipsis;
+ display: -webkit-box;
+ -webkit-box-orient: vertical;
+ -webkit-line-clamp: 2;
}
</style>
--
Gitblit v1.9.1