From 8d34b11ddf7759875d3222315dfa2a36a24996ac Mon Sep 17 00:00:00 2001
From: YM <479443481@qq.com>
Date: 星期六, 18 五月 2024 15:09:45 +0800
Subject: [PATCH] Merge branch 'master' of http://182.92.203.7:2001/r/TCM_CharacterLibrary
---
src/pages/territory/territory.vue | 83 +++++++++++++++++++++++++++++++----------
1 files changed, 63 insertions(+), 20 deletions(-)
diff --git a/src/pages/territory/territory.vue b/src/pages/territory/territory.vue
index bf31e36..1252f05 100644
--- a/src/pages/territory/territory.vue
+++ b/src/pages/territory/territory.vue
@@ -1,7 +1,10 @@
<template>
<view class="pageBox">
<!-- 椤堕儴瀵艰埅 -->
- <headNav :idIndex="idIndex" text="涓尰鍦板煙鍖昏氨" />
+ <headNav
+ :idIndex="idIndex"
+ text="涓尰鍦板煙鍖昏氨"
+ />
<view
class="flex flex-center"
style="width: 100%; margin: 0.2rem 0 0.34rem; justify-content: flex-start"
@@ -14,7 +17,11 @@
:keyword="keyword"
/>
<ul class="flex">
- <li style="" v-for="(item, index) in dynasty" :key="item.id">
+ <li
+ style=""
+ v-for="(item, index) in dynasty"
+ :key="item.id"
+ >
<view
@click="SchoolClick(item.id)"
class="flex flex-center font-family school"
@@ -42,7 +49,10 @@
border-radius: 50%;
"
></view>
- <view class="" style="color: #2c2c2c; font-size: 0.12rem">{{
+ <view
+ class=""
+ style="color: #2c2c2c; font-size: 0.12rem"
+ >{{
item.name
}}</view>
</view>
@@ -62,7 +72,10 @@
top: 2.2rem;
"
>
- <div slot="header" class="clearfix">
+ <div
+ slot="header"
+ class="clearfix"
+ >
<span>浜虹墿 ({{ SearchArr.length }})</span>
<el-button
style="
@@ -73,11 +86,18 @@
"
@click="isSearch = false"
type="text"
- >鍏抽棴</el-button
- >
+ >鍏抽棴</el-button>
</div>
- <view class="" style="overflow: auto; height: 2.5rem">
- <ul class="information" v-for="(item, index) in SearchArr" :key="index">
+ <view
+ class=""
+ style="overflow: auto; height: 2.5rem"
+ >
+ <ul
+ class="information"
+ v-for="(item, index) in SearchArr"
+ :key="index"
+ @click="showCard(item)"
+ >
<li style="font-size: 0.18rem; font-weight: 700">
{{ item.name ? item.name : "-" }}
</li>
@@ -105,7 +125,10 @@
"
:style="{ top: isTop, left: isLeft }"
>
- <div slot="header" class="clearfix">
+ <div
+ slot="header"
+ class="clearfix"
+ >
<span v-if="currentMark">{{
currentMark.name ? currentMark.name : "-"
}}</span>
@@ -118,10 +141,12 @@
"
@click="isEchTrue = false"
type="text"
- >鍏抽棴</el-button
- >
+ >鍏抽棴</el-button>
</div>
- <ul class="information" v-if="currentMark">
+ <ul
+ class="information"
+ v-if="currentMark"
+ >
<li>
濮撳悕:
{{ currentMark.name ? currentMark.name : "-" }}
@@ -138,8 +163,7 @@
@click="viewMoreClick"
style="width: 100%; padding: 3px 0; font-size: 0.12rem; color: #597aa5"
type="text"
- >鏌ョ湅鏇村>></el-button
- >
+ >鏌ョ湅鏇村>></el-button>
</el-card>
<!-- echarts鍦板浘 -->
<!-- <view id="main" style="width: 100vw; position: relative"></view> -->
@@ -377,6 +401,22 @@
this.getDataList();
},
methods: {
+ showCard(info) {
+ console.log(info);
+ console.log(this.markerList);
+ const item = this.markerList.find((f) => f.id == info.id);
+ console.log(item, "12312");
+ 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,
+ };
+ console.log(this.currentMark);
+ console.log(this.map);
+ this.isEchTrue = true;
+ },
getDataList() {
getRetrieval({ keyword: this.keyword, dynasty: "" }).then((res) => {
let markerList = [];
@@ -393,11 +433,16 @@
}
this.initMap(markerList);
this.SearchArr = markerList.map((item) => ({
- birthAndDeath: item?.BIRTH_YEAR[0]?.content1 ?
- item?.BIRTH_YEAR[0]?.content1 + "-" + item?.DEATH_YEAR[0]?.content1 :'-',
+ 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;
console.log(markerList, "markerList");
});
},
@@ -406,17 +451,15 @@
var map = L.map("map", {
attributionControl: false,
preferCanvas: true,
- withPopup: L.latLng(34.261, 108.96),
}).setView([39.91667, 116.41667], 3);
L.tileLayer
.chinaProvider("TianDiTu.Normal.Map", {
key: "76bc34ead7e30e663a4eded8aeaf5860",
- // maxZoom: 18,
- // minZoom: 5,
+ maxZoom: 18,
+ minZoom: 3,
})
.addTo(map);
- this.map = map;
let DefaultIcon1 = L.icon({
iconUrl: this.icoName,
iconSize: [24, 41], // 鍥炬爣鐨勫ぇ灏� 銆愬��1锛屽��2銆� 涓哄叿浣撲綘鑷畾涔夊浘鏍囩殑灏哄锛屾瘮濡傛垜鍥炬爣灏哄鏄�32脳52锛岃〃绀鸿鍥炬爣锛氬搴�32鍍忕礌锛岄珮搴︼細52鍍忕礌锛岄偅涔堝��1:灏辨槸32锛屽��2锛氬氨鏄�52
--
Gitblit v1.9.1