From 68cf4babb70ef2892f210e2b9a2bdea9a174fa81 Mon Sep 17 00:00:00 2001
From: QYF-GitLab1 <1940665526@qq.com>
Date: 星期三, 24 七月 2024 16:41:29 +0800
Subject: [PATCH] Merge branch 'master' of http://182.92.203.7:2001/r/TCM_CharacterLibrary
---
src/pages/territory/territory.vue | 150 +++++++++++--------------------------------------
1 files changed, 35 insertions(+), 115 deletions(-)
diff --git a/src/pages/territory/territory.vue b/src/pages/territory/territory.vue
index d7a2790..50a4a22 100644
--- a/src/pages/territory/territory.vue
+++ b/src/pages/territory/territory.vue
@@ -301,7 +301,7 @@
"
:style="{
marginRight: index === dynasty1.length - 1 ? '0' : '0.03rem',
- background: dynasty1Color == item.id ? '#244A7B' : '#597AA5',
+ background: dynasty1Color == item.id ? '#244A7B' : '#597AA5'
}"
>
{{ item.dynastyChs }}
@@ -321,7 +321,7 @@
getRetrieval,
getDynasty,
getPreCount,
- getDynastyData,
+ getDynastyData
} from "@/api/index.js";
export default {
@@ -334,175 +334,95 @@
isEchTrue: false,
isLeft: 0,
isTop: 0,
- // 鐢ㄦ埛淇℃伅
- information: [
- {
- label: "濮撳悕",
- content: "鏉庢椂鐝�",
- },
- {
- label: "鍒悕",
- content: "涓滀附鍏堢敓",
- },
- {
- label: "绫嶈疮",
- content: "婀栧寳",
- },
- {
- label: "鍖诲鍒嗙",
- content: "涓嵂,閽堢伕",
- },
- {
- label: "灏忎紶",
- content:
- "鏉庢椂鐝�(绾�1518骞磣1593 骞�)锛� 瀛椾笢鐠э紝 鏅氬勾鑷彿婵掓箹灞变汉锛� 婀栧箍榛勫窞搴滆柂宸�(浠婃箹鍖楃渷钖槬鍘�) 浜猴紝 鏄庝唬钁楀悕鍖昏嵂瀛﹀銆� 涓庘�� 鍖诲湥鈥� 涓囧瘑鏂嬮綈鍚嶏紝 鍙ゆ湁鈥� 涓囧瘑鏂嬬殑鏂癸紝 鏉庢椂鐝嶇殑鑽�� 涔嬭銆� 鍚庝负妤氬共搴�...",
- },
- ],
// 涓嬮潰鐨勬湞浠�1
dynasty1Color: "",
dynasty1: [
{
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,
- // 鏈濅唬
- dynasty: [
- {
- name: "澶�",
- color: "#90BBD8",
- id: 1,
- },
- {
- name: "鍟�",
- color: "#EDD28B",
- id: 2,
- },
- {
- name: "瑗垮懆",
- color: "#CF746D",
- id: 3,
- },
- {
- name: "绉�",
- color: "#9CC27A",
- id: 4,
- },
- {
- name: "姹�",
- color: "#5B6CB9",
- id: 5,
- },
- {
- name: "闅�",
- color: "#8860A8",
- id: 6,
- },
- {
- name: "鍞�",
- color: "#DE8E66",
- id: 7,
- },
- {
- name: "鏄�",
- color: "#DE8E66",
- id: 8,
- },
- ],
// 鎼滅储鍚庢槸鍚︽樉绀哄脊妗�
isSearch: false,
currentMark: null,
- SearchArr: [
- {
- id: 1,
- name: "鏉庢椂鐝�",
- birthAndDeath: "1518-1593",
- source: "鍥藉浘瑙勮寖妗ｏ紝CBDB锛屼笂鍥惧彜绫嶆暟鎹簱 绫嶈疮锛氭箹鍖�",
- },
- {
- id: 2,
- name: "鏉庢椂鐝�",
- birthAndDeath: "1518-1593",
- source: "鍥藉浘瑙勮寖妗ｏ紝CBDB锛屼笂鍥惧彜绫嶆暟鎹簱 绫嶈疮锛氭箹鍖�",
- },
- ],
+ SearchArr: [],
zoomLevel: 5,
oldMarkList: [],
aggregatedData: [],
- openData: null,
+ openData: null
};
},
onLoad(options) {
@@ -539,7 +459,7 @@
let times = 0;
getPreCount({
keyword: this.keyword,
- dynasty: this.dynasty1Color,
+ dynasty: this.dynasty1Color
}).then(async (res) => {
const totalCount = res.object;
if (totalCount % 200 == 0) {
@@ -573,7 +493,7 @@
name: item?.NAME[0]?.content1,
source: "-",
nativPlace: item?.NATIVE_PLACE[0].content1,
- id: item.id,
+ id: item.id
}));
this.loading = false;
this.markerList = markerList;
@@ -588,7 +508,7 @@
keyword: this.keyword,
dynasty: this.dynasty1Color,
page: count,
- pageSize: 200,
+ pageSize: 200
});
if (res.object) {
let markerList = [];
@@ -631,7 +551,7 @@
}
var map = L.map("map", {
preferCanvas: true,
- attributionControl: false,
+ attributionControl: false
}).setView([34.3227, 108.5525], this.zoomLevel);
map.on("moveend", this.onMapMoveEnd);
map.on("zoomend", () => {
@@ -645,14 +565,14 @@
.chinaProvider("TianDiTu.Normal.Map", {
key: "76bc34ead7e30e663a4eded8aeaf5860",
maxZoom: 18,
- minZoom: 3,
+ minZoom: 3
})
.addTo(map);
L.tileLayer
.chinaProvider("TianDiTu.Normal.Annotion", {
key: "76bc34ead7e30e663a4eded8aeaf5860",
maxZoom: 18,
- minZoom: 3,
+ minZoom: 3
})
.addTo(map);
this.map = map;
@@ -689,7 +609,7 @@
17: 4513.997733376551,
18: 2256.9988666882755,
19: 1128.4994333441377,
- 20: 564.24971667206887,
+ 20: 564.24971667206887
};
// 鏍规嵁姣斾緥灏鸿绠楀綋鍓嶅湴鍥�1鍘樼背鐨勭粡绾害宸��
const cmData = scale[this.zoomLevel] / 100; // 灏嗗帢绫宠浆鎹负绫�
@@ -718,7 +638,7 @@
contentY: "",
xList: [],
yList: [],
- data: [],
+ data: []
};
obj.xList.push(item.xCoord);
obj.yList.push(item.yCoord);
@@ -751,12 +671,12 @@
: "99+"
}</div>`,
iconSize: [30, 30],
- className: "map-circle",
+ className: "map-circle"
});
const temp_mark = L.marker(
[aggregatedItem.contentY, aggregatedItem.contentX],
{
- icon: icon,
+ icon: icon
}
);
this.oldMarkList.push(temp_mark);
@@ -771,7 +691,7 @@
nativePlace: item?.content1,
barnch: item?.MEDICAL_BRANCH[0]?.content1,
medical: item?.BIOGRAPHY,
- id: item.id,
+ id: item.id
};
});
this.isTop = e.containerPoint.y - 435 + "px";
@@ -801,7 +721,7 @@
nativePlace: item?.content1,
barnch: item?.MEDICAL_BRANCH[0]?.content1,
medical: item?.BIOGRAPHY,
- id: item.id,
+ id: item.id
};
});
this.isEchTrue = true;
@@ -835,10 +755,10 @@
// 鏌ョ湅鏇村>>
viewMoreClick(data) {
uni.navigateTo({
- url: "/pages/character/detail?id=" + data.id,
+ url: "/pages/character/detail?id=" + data.id
});
- },
- },
+ }
+ }
};
</script>
--
Gitblit v1.9.1