From 6f7c9ef272906bbd5d905ee069bc5d6d1bf55614 Mon Sep 17 00:00:00 2001
From: YM <479443481@qq.com>
Date: 星期四, 06 六月 2024 21:41:27 +0800
Subject: [PATCH] Merge branch 'master' of http://182.92.203.7:2001/r/TCM_CharacterLibrary
---
src/pages/character/detail.vue | 302 ++++++++++++++++++++-----------------
src/pages/territory/territory.vue | 13 +
src/pages/characterMap/characterMap.vue | 123 ++++++++------
3 files changed, 240 insertions(+), 198 deletions(-)
diff --git a/src/pages/character/detail.vue b/src/pages/character/detail.vue
index d84ce9c..9922981 100644
--- a/src/pages/character/detail.vue
+++ b/src/pages/character/detail.vue
@@ -414,7 +414,7 @@
getPersonBiog,
getPersonWritings,
getPersonRelationAtSchool,
- getSpaceTime
+ getSpaceTime,
} from "@/api/index.js";
import { getImg, getFile } from "@/static/tool.js";
import L from "leaflet";
@@ -422,7 +422,7 @@
export default {
components: {
- Table1
+ Table1,
},
data() {
return {
@@ -443,60 +443,60 @@
tableColumns1: [
{
prop: "a",
- label: "姝ｄ功鍚�"
+ label: "姝ｄ功鍚�",
},
{
prop: "e",
- label: "浣滆��"
+ label: "浣滆��",
},
{
prop: "b",
- label: "钁椾綔骞�"
+ label: "钁椾綔骞�",
},
{
prop: "c",
- label: "钁椾綔鏂瑰紡"
+ label: "钁椾綔鏂瑰紡",
},
{
prop: "d",
- label: "鎬荤洰鍒嗙被"
- }
+ label: "鎬荤洰鍒嗙被",
+ },
],
tableColumns2: [
{
prop: "a",
- label: "鍏崇郴浜�"
+ label: "鍏崇郴浜�",
},
{
prop: "b",
- label: "鍏崇郴绫诲瀷"
+ label: "鍏崇郴绫诲瀷",
},
{
prop: "c",
- label: "鑰冩嵁"
+ label: "鑰冩嵁",
},
{
prop: "d",
- label: "鍑哄"
- }
+ label: "鍑哄",
+ },
],
tableColumns3: [
{
prop: "a",
- label: "娲诲姩鏃堕棿鍖洪棿"
+ label: "娲诲姩鏃堕棿鍖洪棿",
},
{
prop: "b",
- label: "娲诲姩鍚嶇О"
+ label: "娲诲姩鍚嶇О",
},
{
prop: "c",
- label: "娲诲姩鍦扮偣"
+ label: "娲诲姩鍦扮偣",
},
{
prop: "d",
- label: "娲诲姩鎻忚堪"
- }
+ label: "娲诲姩鎻忚堪",
+ },
],
tableData1: [],
tableData2: [],
@@ -506,7 +506,7 @@
nodes: [],
relationships: [],
personResearchList: [],
- markerList: []
+ markerList: [],
};
},
onLoad(options) {
@@ -551,7 +551,7 @@
document.body.removeChild(textarea);
this.$message({
message: "澶嶅埗鎴愬姛锛�",
- type: "success"
+ type: "success",
});
},
toLink(item) {
@@ -567,7 +567,7 @@
// 鍩烘湰淇℃伅
getPersonInfo({
id: this.detailId,
- type: "PERSON_BASIC"
+ type: "PERSON_BASIC",
}).then((res) => {
const obj = {};
if (
@@ -590,13 +590,13 @@
//鐜颁唬鐮旂┒
getPersonInfo({
id: this.detailId,
- type: "PERSON_RESEARCH"
+ type: "PERSON_RESEARCH",
}).then((res) => {
this.personResearchList = res.object.personResearchList;
});
getWebBasic({
- personId: this.detailId
+ personId: this.detailId,
}).then((res) => {
const obj = res.object;
if (obj.school) {
@@ -611,7 +611,7 @@
// 娲诲姩骞磋氨
getPersonInfo({
id: this.detailId,
- type: "PERSON_SPACE_TIME"
+ type: "PERSON_SPACE_TIME",
}).then((res) => {
if (res.object.personSpaceTimeList) {
this.tableData5 = res.object.personSpaceTimeList.map((item) => {
@@ -619,7 +619,7 @@
a: item.time,
b: item.activityName,
c: item.activityAddrOld,
- d: item.desc // 杩欓噷缂哄皯娲诲姩鎻忚堪瀛楁
+ d: item.desc, // 杩欓噷缂哄皯娲诲姩鎻忚堪瀛楁
};
});
}
@@ -631,15 +631,15 @@
list: [
{
name: "鍒悕",
- value: obj.alias || "-"
+ value: obj.alias || "-",
},
{
name: "瀛�",
- value: obj.zi || "-"
+ value: obj.zi || "-",
},
{
name: "鍙�",
- value: obj.hao || "-"
+ value: obj.hao || "-",
},
{
name: "鎵�澶勬椂鏈�",
@@ -652,19 +652,19 @@
},
{
name: "姘戞棌",
- value: obj.ethnic || "-"
- }
- ]
+ value: obj.ethnic || "-",
+ },
+ ],
},
{
list: [
{
name: "绫嶈疮",
- value: obj.native || "-"
+ value: obj.native || "-",
},
{
name: "鎬у埆",
- value: obj.gender || "-"
+ value: obj.gender || "-",
},
{
name: "鑱屽畼",
@@ -683,33 +683,33 @@
sres.object.school_NAME &&
sres.object.school_NAME.length
? sres.object.school_NAME[0].content
- : "-"
+ : "-",
},
{
name: "瀛︽湳鐗圭偣",
- value: obj.features || "-"
- }
- ]
- }
+ value: obj.features || "-",
+ },
+ ],
+ },
];
},
getSourceData() {
getSource({
- personId: this.detailId
+ personId: this.detailId,
}).then((res) => {
this.sourceDataList = res.list;
});
},
getImages() {
getPersonImages({
- personId: this.detailId
+ personId: this.detailId,
}).then((res) => {
this.imageList = res.list.map((item) => getImg(item.filePath));
});
},
getBiog() {
getPersonBiog({
- personId: this.detailId
+ personId: this.detailId,
}).then((res) => {
this.biogData = res.list.map((item) => {
return {
@@ -718,14 +718,14 @@
"銆�" +
item.bookName +
"銆� " +
- (item.pageNo ? "P " + item.pageNo : "") // 杩欓噷鍙湁bookid鏃犳硶鍖归厤鍒颁功鍚�
+ (item.pageNo ? "P " + item.pageNo : ""), // 杩欓噷鍙湁bookid鏃犳硶鍖归厤鍒颁功鍚�
};
});
});
},
getWritings() {
getPersonWritings({
- personId: this.detailId
+ personId: this.detailId,
}).then((res) => {
this.tableData1 = res.list.map((item) => {
return {
@@ -733,7 +733,7 @@
b: item.dynasty,
c: item.writeWay,
d: item.classify,
- e: this.detailInfo.NAME
+ e: this.detailInfo.NAME,
};
});
});
@@ -758,7 +758,7 @@
// });
getPersonInfo({
id: this.detailId,
- type: "PERSON_RELATIONS"
+ type: "PERSON_RELATIONS",
}).then((res) => {
this.tableData4;
console.log(res, "PERSON_RELATIONS");
@@ -766,13 +766,13 @@
// 绀句細鍏崇郴
getPersonRelationAtSchool({
personId: this.detailId,
- relationSearchTypeEO: "SOCIAL"
+ relationSearchTypeEO: "SOCIAL",
}).then((res) => {
if (res.list && res.list.length) {
this.tableData4 = res.list.map((f) => {
return {
a: f.name1,
- b: f.relationName
+ b: f.relationName,
};
});
}
@@ -780,13 +780,13 @@
// 浜插睘鍏崇郴
getPersonRelationAtSchool({
personId: this.detailId,
- relationSearchTypeEO: "KINSHIP"
+ relationSearchTypeEO: "KINSHIP",
}).then((res) => {
if (res.list && res.list.length) {
this.tableData2 = res.list.map((f) => {
return {
a: f.name1,
- b: f.relationName
+ b: f.relationName,
};
});
}
@@ -794,13 +794,13 @@
// 甯堟壙鍏崇郴
getPersonRelationAtSchool({
personId: this.detailId,
- relationSearchTypeEO: "INHERITANCE"
+ relationSearchTypeEO: "INHERITANCE",
}).then((res) => {
if (res.list && res.list.length) {
this.tableData3 = res.list.map((f) => {
return {
a: f.name1,
- b: f.relationName
+ b: f.relationName,
};
});
}
@@ -808,7 +808,7 @@
},
getMappingData(name) {
getFuzzySearch({
- keyword: name
+ keyword: name,
}).then((res) => {
this.nodes = [];
this.relationships = [];
@@ -824,19 +824,19 @@
if (item.name1 && exists1 !== true) {
this.nodes.push({
name: item.name1,
- id: item.identifier1
+ id: item.identifier1,
});
}
if (item.name2 && exists2 !== true) {
this.nodes.push({
name: item.name2,
- id: item.identifier2
+ id: item.identifier2,
});
}
let obj = {
source: item.name1,
target: item.name2,
- relation: item.relationName || "" // 濡傛灉瀛樺湪 relationName 瀛楁鍒欎娇鐢紝鍚﹀垯涓虹┖瀛楃涓�
+ relation: item.relationName || "", // 濡傛灉瀛樺湪 relationName 瀛楁鍒欎娇鐢紝鍚﹀垯涓虹┖瀛楃涓�
};
this.relationships.push(obj);
});
@@ -846,19 +846,26 @@
},
getMapInfo() {
getSpaceTime({
- personId: this.detailId
+ personId: this.detailId,
}).then((res) => {
if (res.list && res.list.length) {
- const data = res.list.map((item) => {
- return {
- name: item.activityName,
- value: [item.xcoord, item.ycoord]
- };
- });
+ const data = [];
+ for (let i = 0; i < res.list.length; i++) {
+ const item = res.list[i];
+ if (item.xcoord && item.ycoord) {
+ const obj = {
+ name: item.activityName,
+ value: [item.xcoord, item.ycoord],
+ };
+ data.push(obj);
+ }
+ }
this.markerList = data;
// 鏃剁┖鍦板浘
// 杩欓噷鍙彇浜嗙涓�鏉★紝闇�瑕佸叏閮ㄦ暟鎹�
- this.initMap(data[0]);
+ if (data && data.length) {
+ this.initMap(data);
+ }
}
// loadBMap("1NJdwrI1CfT6lrykVhDkmWgsO6O2bjQK").then(() => {
@@ -869,34 +876,49 @@
initMap(markerList) {
var map = L.map("spaceTime", {
preferCanvas: true,
- attributionControl: false
- }).setView([markerList.value[1], markerList.value[0]], 13);
+ attributionControl: false,
+ }).setView([markerList[0].value[1], markerList[0].value[0]], 13);
L.tileLayer
.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,
})
.addTo(map);
let icon = L.divIcon({
html: "<div class='map-circle-name ripple'></div>",
iconSize: [80, 80],
- className: "map-circle"
+ className: "map-circle",
});
this.map = map;
const temp_mark = L.marker([markerList.value[1], markerList.value[0]], {
- icon: icon
+ icon: icon,
}).addTo(map);
+ if (markerList.length) {
+ for (let i = 0; i < markerList.length; i++) {
+ const item = markerList[i];
+ const temp_mark = L.marker([item.value[1], item.value[0]], {
+ icon: icon,
+ }).addTo(map);
+ }
+ }
},
// 鏀惧ぇ鍦板浘璺宠浆
fangdaClick(index) {
if (index == 1) {
uni.navigateTo({
- url: "/pages/character/index?keyword=" + this.detailInfo.NAME
+ url: "/pages/character/index?keyword=" + this.detailInfo.NAME,
});
} else if (index == 2) {
uni.navigateTo({
- url: "/pages/characterMap/characterMap?id=" + this.detailId
+ url: "/pages/characterMap/characterMap?id=" + this.detailId,
});
}
},
@@ -912,13 +934,13 @@
scrollToTop() {
window.scrollTo({
top: 0,
- behavior: "smooth" // 浣跨敤骞虫粦婊氬姩
+ behavior: "smooth", // 浣跨敤骞虫粦婊氬姩
});
},
openFileClick(index) {
let obj = {
id: this.detailId,
- type: "Person"
+ type: "Person",
};
switch (index) {
case 1:
@@ -1021,8 +1043,8 @@
position: "middle", // 璁剧疆鏍囩鏂囨湰鍦ㄧ嚎鐨勪腑闂翠綅缃笂灞呬腑鏄剧ず
// bottom: -(FontSize+10),
z: 10, // 璁剧疆鏍囩鐨剒杞撮珮搴︼紝浣垮叾姣旇繛鎺ョ嚎鏇撮珮
- distance: -(Distance + 1) // 灏嗘爣绛炬斁缃湪杩炴帴绾夸笂
- }
+ distance: -(Distance + 1), // 灏嗘爣绛炬斁缃湪杩炴帴绾夸笂
+ },
});
}
}
@@ -1037,8 +1059,8 @@
itemStyle: {
color: "#eae0eb", // 鍙互鏍规嵁绱㈠紩璁剧疆涓嶅悓鐨勯鑹�
borderWidth: BorderWidth,
- borderColor: "#996f9f"
- }
+ borderColor: "#996f9f",
+ },
};
});
var option;
@@ -1048,14 +1070,14 @@
top: FontSize + 10,
subtextStyle: {
fontSize: FontSize, // 璁剧疆鍓爣棰樻枃瀛楀ぇ灏忎负 14px
- color: "#2C2C2C"
- }
+ color: "#2C2C2C",
+ },
},
backgroundColor: {
type: "image",
image: "/static/image/characterRelationBg.png",
size: "100% 100%", // 鑳屾櫙鍥剧墖鐨勫昂瀵革紝鍙互鏄櫨鍒嗘瘮鎴栬�呭儚绱�
- position: "center center" // 鑳屾櫙鍥剧墖鐨勪綅缃紝鍙互鏄� top, bottom, middle 鎴栬�呯櫨鍒嗘瘮
+ position: "center center", // 鑳屾櫙鍥剧墖鐨勪綅缃紝鍙互鏄� top, bottom, middle 鎴栬�呯櫨鍒嗘瘮
},
tooltip: {},
animationDurationUpdate: 1500,
@@ -1069,7 +1091,7 @@
label: {
show: true,
color: "black", // 璁剧疆鑺傜偣鏂囧瓧棰滆壊涓洪粦鑹�
- fontSize: FontSize // 璁剧疆鏂囧瓧澶у皬
+ fontSize: FontSize, // 璁剧疆鏂囧瓧澶у皬
},
edgeSymbol: ["circle"],
edgeSymbolSize: [4, 10],
@@ -1078,16 +1100,16 @@
lineStyle: {
opacity: 0.9,
width: 2,
- curveness: 0.3
+ curveness: 0.3,
},
emphasis: {
focus: "adjacency",
lineStyle: {
- width: 10
- }
- }
- }
- ]
+ width: 10,
+ },
+ },
+ },
+ ],
};
// 灏嗙敓鎴愮殑杩炴帴绾挎坊鍔犲埌echarts鍥捐〃鐨刼ption涓�
option.series[0].links = links;
@@ -1111,10 +1133,10 @@
text: "",
subtext: "",
sublink: "",
- left: "center"
+ left: "center",
},
tooltip: {
- trigger: "item"
+ trigger: "item",
},
bmap: {
center: data[0].value,
@@ -1126,123 +1148,123 @@
featureType: "water",
elementType: "all",
stylers: {
- color: "#86a1ac"
- }
+ color: "#86a1ac",
+ },
},
{
featureType: "land",
elementType: "all",
stylers: {
- color: "#f1d99d"
- }
+ color: "#f1d99d",
+ },
},
{
featureType: "railway",
elementType: "all",
stylers: {
- visibility: "off"
- }
+ visibility: "off",
+ },
},
{
featureType: "highway",
elementType: "all",
stylers: {
- color: "#f1d99d"
- }
+ color: "#f1d99d",
+ },
},
{
featureType: "highway",
elementType: "labels",
stylers: {
- visibility: "off"
- }
+ visibility: "off",
+ },
},
{
featureType: "arterial",
elementType: "geometry",
stylers: {
- color: "#f1d99d"
- }
+ color: "#f1d99d",
+ },
},
{
featureType: "arterial",
elementType: "geometry.fill",
stylers: {
- color: "#f1d99d"
- }
+ color: "#f1d99d",
+ },
},
{
featureType: "poi",
elementType: "all",
stylers: {
- visibility: "off"
- }
+ visibility: "off",
+ },
},
{
featureType: "green",
elementType: "all",
stylers: {
- visibility: "off"
- }
+ visibility: "off",
+ },
},
{
featureType: "subway",
elementType: "all",
stylers: {
- visibility: "off"
- }
+ visibility: "off",
+ },
},
{
featureType: "manmade",
elementType: "all",
stylers: {
- color: "#f1d99d"
- }
+ color: "#f1d99d",
+ },
},
{
featureType: "local",
elementType: "all",
stylers: {
- color: "#f1d99d"
- }
+ color: "#f1d99d",
+ },
},
{
featureType: "local",
elementType: "labels",
stylers: {
- visibility: "off"
- }
+ visibility: "off",
+ },
},
{
featureType: "arterial",
elementType: "labels",
stylers: {
- visibility: "off"
- }
+ visibility: "off",
+ },
},
{
featureType: "boundary",
elementType: "all",
stylers: {
- color: "#f1d99d"
- }
+ color: "#f1d99d",
+ },
},
{
featureType: "building",
elementType: "all",
stylers: {
- color: "#f1d99d"
- }
+ color: "#f1d99d",
+ },
},
{
featureType: "label",
elementType: "labels.text.fill",
stylers: {
- color: "#000"
- }
- }
- ]
- }
+ color: "#000",
+ },
+ },
+ ],
+ },
},
series: [
{
@@ -1252,18 +1274,18 @@
data: data,
symbolSize: 0,
encode: {
- value: 2
+ value: 2,
},
label: {
formatter: "{b}",
position: "right",
- show: false
+ show: false,
},
emphasis: {
label: {
- show: true
- }
- }
+ show: true,
+ },
+ },
},
{
name: "",
@@ -1272,32 +1294,32 @@
data: data,
symbolSize: 20,
encode: {
- value: 2
+ value: 2,
},
showEffectOn: "render",
rippleEffect: {
- brushType: "stroke"
+ brushType: "stroke",
},
label: {
formatter: "{b}",
position: "right",
- show: false
+ show: false,
},
itemStyle: {
color: "#ec7b43",
shadowBlur: 10,
- shadowColor: "#333"
+ shadowColor: "#333",
},
emphasis: {
- scale: false
+ scale: false,
},
- zlevel: 1
- }
- ]
+ zlevel: 1,
+ },
+ ],
};
option && myChart.setOption(option);
- }
- }
+ },
+ },
};
</script>
diff --git a/src/pages/characterMap/characterMap.vue b/src/pages/characterMap/characterMap.vue
index 5abd983..5532d72 100644
--- a/src/pages/characterMap/characterMap.vue
+++ b/src/pages/characterMap/characterMap.vue
@@ -1,8 +1,10 @@
<template>
- <view style="width: 100%;height: 100%;display: flex;flex-direction: column;">
+ <view
+ style="width: 100%; height: 100%; display: flex; flex-direction: column"
+ >
<headNav :idIndex="1 + ''" text="涓尰浜虹墿鏁版嵁搴�" />
<el-button class="getBack" @click="goBack">杩斿洖</el-button>
- <view style="flex: 1;overflow: hidden;">
+ <view style="flex: 1; overflow: hidden">
<!-- 鍦板浘 -->
<!-- <view id="spaceTime" style="height: 90vh;width: 100%;position: relative;"></view> -->
<div id="map"></div>
@@ -25,9 +27,13 @@
>
<li>鍑虹敓浜巤{ basicInfo.nativePlace || "-" }}</li>
<li>
- <span v-if="basicInfo.birthYear">{{basicInfo.birthYear}}</span>
- <span v-if="basicInfo.nativePlace">{{basicInfo.nativePlace}}</span>
- <span v-if="basicInfo.nowPlace">锛堜粖{{basicInfo.nowPlace}}锛�</span>
+ <span v-if="basicInfo.birthYear">{{ basicInfo.birthYear }}</span>
+ <span v-if="basicInfo.nativePlace">{{
+ basicInfo.nativePlace
+ }}</span>
+ <span v-if="basicInfo.nowPlace"
+ >锛堜粖{{ basicInfo.nowPlace }}锛�</span
+ >
</li>
</ul>
<ul
@@ -97,7 +103,7 @@
deathYear: "",
nativePlace: "",
nowPlace: "",
- }
+ },
};
},
@@ -118,7 +124,7 @@
initMap(info) {
var map = L.map("map", {
attributionControl: false,
- preferCanvas: true
+ preferCanvas: true,
}).setView([35.91667, 110.41667], 5);
// L.tileLayer(
@@ -129,26 +135,33 @@
.chinaProvider("TianDiTu.Normal.Map", {
key: "76bc34ead7e30e663a4eded8aeaf5860",
maxZoom: 18,
- minZoom: 5
+ minZoom: 5,
+ })
+ .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
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 ripple'></div>",
iconSize: [80, 80],
- className: "map-circle"
+ className: "map-circle",
});
this.map = map;
if (info && info.length) {
for (let i = 0; i < info.length; i++) {
const item = info[i];
const marker1 = L.marker([item.ycoord, item.xcoord], {
- icon: icon
+ icon: icon,
}).addTo(map);
marker1.on("click", (e) => {
this.menuNav = true;
@@ -180,7 +193,7 @@
getPersonInfoFun() {
getPersonInfo({
id: this.$route.query.id,
- type: "PERSON_SPACE_TIME"
+ type: "PERSON_SPACE_TIME",
}).then((res) => {
this.initMap(res.object.personSpaceTimeList);
});
@@ -189,7 +202,7 @@
getBasicInfo() {
getPersonInfo({
id: this.$route.query.id,
- type: "PERSON_BASIC"
+ type: "PERSON_BASIC",
}).then((res) => {
this.basicInfo.name = res.object.personFieldList.find(
(f) => f.fieldName == "WEAK_NAME"
@@ -250,40 +263,40 @@
const data = [
{
name: "娴烽棬",
- value: 9
+ value: 9,
},
{
name: "閲戞槍",
- value: 19
+ value: 19,
},
{
name: "娉夊窞",
- value: 21
+ value: 21,
},
{
name: "琛㈠窞",
- value: 177
+ value: 177,
},
{
name: "寤婂潑",
- value: 193
+ value: 193,
},
{
name: "鑿忔辰",
- value: 194
+ value: 194,
},
{
name: "鍚堣偉",
- value: 229
+ value: 229,
},
{
name: "姝︽眽",
- value: 273
+ value: 273,
},
{
name: "鍟婁笁澶х熆鍙婅鍒板簳鏄皝寤哄＋澶уか澶у笀鍌呭氨",
- value: 279
- }
+ value: 279,
+ },
];
const geoCoordMap = {
娴烽棬: [121.15, 31.89],
@@ -313,7 +326,7 @@
鑿忔辰: [115.480656, 35.23375],
鍚堣偉: [117.27, 31.86],
姝︽眽: ["浣犲ソ", 30.52],
- 鍟婁笁澶х熆鍙婅鍒板簳鏄皝寤哄＋澶уか澶у笀鍌呭氨: [125.03, 46.58]
+ 鍟婁笁澶х熆鍙婅鍒板簳鏄皝寤哄＋澶уか澶у笀鍌呭氨: [125.03, 46.58],
};
const convertData = function (data) {
var res = [];
@@ -322,7 +335,7 @@
if (geoCoord) {
res.push({
name: data[i].name,
- value: geoCoord.concat(data[i].value)
+ value: geoCoord.concat(data[i].value),
});
}
}
@@ -330,7 +343,7 @@
};
option = {
tooltip: {
- trigger: "item"
+ trigger: "item",
},
bmap: {
center: [104.114129, 37.550339], // 璋冩暣鍦板浘涓績鐐逛綅缃�
@@ -342,60 +355,60 @@
featureType: "water",
elementType: "all",
stylers: {
- color: "#d1d1d1"
- }
+ color: "#d1d1d1",
+ },
},
{
featureType: "land",
elementType: "all",
stylers: {
- color: "#f3f3f3"
- }
+ color: "#f3f3f3",
+ },
},
{
featureType: "manmade",
elementType: "all",
stylers: {
- color: "#d1d1d1"
- }
+ color: "#d1d1d1",
+ },
},
{
featureType: "local",
elementType: "all",
stylers: {
- color: "#d1d1d1"
- }
+ color: "#d1d1d1",
+ },
},
{
featureType: "arterial",
elementType: "labels",
stylers: {
- visibility: "off"
- }
+ visibility: "off",
+ },
},
{
featureType: "boundary",
elementType: "all",
stylers: {
- color: "#fefefe"
- }
+ color: "#fefefe",
+ },
},
{
featureType: "building",
elementType: "all",
stylers: {
- color: "#d1d1d1"
- }
+ color: "#d1d1d1",
+ },
},
{
featureType: "label",
elementType: "labels.text.fill",
stylers: {
- color: "#999999"
- }
- }
- ]
- }
+ color: "#999999",
+ },
+ },
+ ],
+ },
},
series: [
{
@@ -412,11 +425,11 @@
return val[2] / 10;
},
encode: {
- value: 2
+ value: 2,
},
showEffectOn: "render",
rippleEffect: {
- brushType: "stroke"
+ brushType: "stroke",
},
label: {
formatter: "{b}",
@@ -434,18 +447,18 @@
},
show: true,
fontSize: 12,
- borderRadius: 30
+ borderRadius: 30,
},
itemStyle: {
shadowBlur: 10,
- shadowColor: "#333"
+ shadowColor: "#333",
},
emphasis: {
- scale: true
+ scale: true,
},
- zlevel: 1
- }
- ]
+ zlevel: 1,
+ },
+ ],
};
let menuNav1 = this.menuNav;
let menuNav2 = this.menuNav;
@@ -468,8 +481,8 @@
// 淇敼 Vue 缁勪欢鐨勬暟鎹紝渚嬪鏄剧ず鑿滃崟瀵艰埅
this.menuNav = !this.menuNav;
// 鏃剁┖鍦板浘鐨勬暟鎹�
- }
- }
+ },
+ },
};
</script>
diff --git a/src/pages/territory/territory.vue b/src/pages/territory/territory.vue
index b50c8c8..64fbbbd 100644
--- a/src/pages/territory/territory.vue
+++ b/src/pages/territory/territory.vue
@@ -426,6 +426,7 @@
nativePlace: item?.content1,
barnch: item?.MEDICAL_BRANCH[0]?.content1,
medical: item?.MEDICAL_EXPERTISE[0]?.content1,
+ id: item.id,
};
this.$nextTick(() => {
this.isTop =
@@ -446,7 +447,6 @@
dynasty: this.dynasty1Color,
}).then(async (res) => {
const totalCount = res.object;
- console.log(totalCount, "totalCount");
if (totalCount % 200 == 0) {
times = totalCount / 200 - 1;
} else {
@@ -461,7 +461,6 @@
markerList = [...markerList, ...curData];
}
if (i == times) {
- console.log(markerList, "markerList");
this.initMap(markerList);
this.SearchArr = markerList.map((item) => ({
birthAndDeath: item?.BIRTH_YEAR[0]?.content1
@@ -588,6 +587,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
@@ -651,6 +657,7 @@
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";
@@ -677,7 +684,7 @@
// 鏌ョ湅鏇村>>
viewMoreClick() {
uni.navigateTo({
- url: "/pages/character/detail",
+ url: "/pages/character/detail?id=" + this.currentMark.id,
});
},
},
--
Gitblit v1.9.1