From 0edf94722a0dcc338567fec7df76b2e0acd39b92 Mon Sep 17 00:00:00 2001
From: YM <479443481@qq.com>
Date: 星期一, 27 五月 2024 15:30:48 +0800
Subject: [PATCH] 调整
---
src/pages/territory/territory.vue | 119 +++++++++++++++++++++++++++--------------------------------
1 files changed, 55 insertions(+), 64 deletions(-)
diff --git a/src/pages/territory/territory.vue b/src/pages/territory/territory.vue
index e131ec5..2d7274d 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;
@@ -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>
@@ -76,7 +75,7 @@
>鍏抽棴</el-button
>
</div>
- <view class="" style="overflow: auto; height: 2.5rem">
+ <view style="overflow: auto; height: 2.5rem">
<ul
class="information"
v-for="(item, index) in SearchArr"
@@ -155,7 +154,9 @@
position: fixed;
bottom: 0.33rem;
left: 0;
+ right: 0;
z-index: 99;
+ overflow: auto;
"
>
<ul class="flex">
@@ -173,9 +174,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;
@@ -184,7 +186,7 @@
"
:style="{
marginRight: index === dynasty1.length - 1 ? '0' : '0.03rem',
- background: dynasty1Color == item.id ? '#244A7B' : '#597AA5',
+ background: dynasty1Color == item.id ? '#244A7B' : '#597AA5'
}"
>
{{ item.dynastyChs }}
@@ -216,25 +218,25 @@
information: [
{
label: "濮撳悕",
- content: "鏉庢椂鐝�",
+ content: "鏉庢椂鐝�"
},
{
label: "鍒悕",
- content: "涓滀附鍏堢敓",
+ content: "涓滀附鍏堢敓"
},
{
label: "绫嶈疮",
- content: "婀栧寳",
+ content: "婀栧寳"
},
{
label: "鍖诲鍒嗙",
- content: "涓嵂,閽堢伕",
+ content: "涓嵂,閽堢伕"
},
{
label: "灏忎紶",
content:
- "鏉庢椂鐝�(绾�1518骞磣1593 骞�)锛� 瀛椾笢鐠э紝 鏅氬勾鑷彿婵掓箹灞变汉锛� 婀栧箍榛勫窞搴滆柂宸�(浠婃箹鍖楃渷钖槬鍘�) 浜猴紝 鏄庝唬钁楀悕鍖昏嵂瀛﹀銆� 涓庘�� 鍖诲湥鈥� 涓囧瘑鏂嬮綈鍚嶏紝 鍙ゆ湁鈥� 涓囧瘑鏂嬬殑鏂癸紝 鏉庢椂鐝嶇殑鑽�� 涔嬭銆� 鍚庝负妤氬共搴�...",
- },
+ "鏉庢椂鐝�(绾�1518骞磣1593 骞�)锛� 瀛椾笢鐠э紝 鏅氬勾鑷彿婵掓箹灞变汉锛� 婀栧箍榛勫窞搴滆柂宸�(浠婃箹鍖楃渷钖槬鍘�) 浜猴紝 鏄庝唬钁楀悕鍖昏嵂瀛﹀銆� 涓庘�� 鍖诲湥鈥� 涓囧瘑鏂嬮綈鍚嶏紝 鍙ゆ湁鈥� 涓囧瘑鏂嬬殑鏂癸紝 鏉庢椂鐝嶇殑鑽�� 涔嬭銆� 鍚庝负妤氬共搴�..."
+ }
],
// 涓嬮潰鐨勬湞浠�1
dynasty1Color: "",
@@ -242,78 +244,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,
@@ -322,43 +324,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,
@@ -368,20 +370,19 @@
id: 1,
name: "鏉庢椂鐝�",
birthAndDeath: "1518-1593",
- source: "鍥藉浘瑙勮寖妗ｏ紝CBDB锛屼笂鍥惧彜绫嶆暟鎹簱 绫嶈疮锛氭箹鍖�",
+ source: "鍥藉浘瑙勮寖妗ｏ紝CBDB锛屼笂鍥惧彜绫嶆暟鎹簱 绫嶈疮锛氭箹鍖�"
},
{
id: 2,
name: "鏉庢椂鐝�",
birthAndDeath: "1518-1593",
- source: "鍥藉浘瑙勮寖妗ｏ紝CBDB锛屼笂鍥惧彜绫嶆暟鎹簱 绫嶈疮锛氭箹鍖�",
- },
- ],
+ source: "鍥藉浘瑙勮寖妗ｏ紝CBDB锛屼笂鍥惧彜绫嶆暟鎹簱 绫嶈疮锛氭箹鍖�"
+ }
+ ]
};
},
onLoad(options) {
this.idIndex = options.id;
- console.log("optionsoptionsoptions", options.id);
},
mounted() {
this.getDynastyList();
@@ -391,14 +392,10 @@
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);
@@ -409,7 +406,6 @@
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) {
@@ -426,7 +422,6 @@
});
}
}
- console.log(markerList, "markerList");
this.initMap(markerList);
this.SearchArr = markerList.map((item) => ({
birthAndDeath: item?.BIRTH_YEAR[0]?.content1
@@ -436,7 +431,7 @@
: "-",
name: item?.NAME[0]?.content1,
source: "-",
- id: item.id,
+ id: item.id
}));
this.markerList = markerList;
}
@@ -451,27 +446,27 @@
}
var map = L.map("map", {
preferCanvas: true,
- attributionControl: false,
+ attributionControl: false
}).setView([39.91667, 116.41667], 3);
L.tileLayer
.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) {
@@ -507,10 +502,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) => {
this.isEchTrue = true;
@@ -519,7 +514,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 =
@@ -538,7 +533,6 @@
// 鐐瑰嚮涓嬮潰鐨勬湞浠ｆ寜閽�
dynastyBottomClick(id) {
- console.log(id);
this.dynasty1Color = id;
this.getDataList();
},
@@ -550,16 +544,14 @@
this.getDataList();
},
// 鐐瑰嚮涓婇潰鐨勬湞浠ｆ寜閽�
- SchoolClick(id) {
- console.log(id);
- },
+ SchoolClick(id) {},
// 鏌ョ湅鏇村>>
viewMoreClick() {
uni.navigateTo({
- url: "/pages/character/detail",
+ url: "/pages/character/detail"
});
- },
- },
+ }
+ }
};
</script>
@@ -747,7 +739,6 @@
}
::v-deep .ripple {
-
border-radius: 50%;
position: relative;
overflow: hidden;
--
Gitblit v1.9.1