From f3e5b489e30a921c03ef8b97e1cd845b65ea5d9d Mon Sep 17 00:00:00 2001
From: YM <479443481@qq.com>
Date: 星期三, 05 六月 2024 18:17:16 +0800
Subject: [PATCH] 1
---
src/pages/character/detail.vue | 631 +++++++++++++++++++++++++++++++--------------------------
1 files changed, 344 insertions(+), 287 deletions(-)
diff --git a/src/pages/character/detail.vue b/src/pages/character/detail.vue
index 857b0fa..2333598 100644
--- a/src/pages/character/detail.vue
+++ b/src/pages/character/detail.vue
@@ -1,25 +1,15 @@
<template>
<view class="relative">
- <headNav
- :idIndex="1 + ''"
- text="涓尰浜虹墿鏁版嵁搴�"
- />
+ <headNav :idIndex="1 + ''" text="涓尰浜虹墿鏁版嵁搴�" />
<view class="Midde flex">
- <el-button
- class="MiddeBack flex flex-center"
- @click="goBack"
- >杩斿洖</el-button>
- <view
- style="width: 70%"
- class="flex flex-center flex-column"
+ <el-button class="MiddeBack flex flex-center" @click="goBack"
+ >杩斿洖</el-button
>
+ <view style="width: 70%" class="flex flex-center flex-column">
<view style="font-weight: bold; font-size: 0.2rem">{{
detailInfo.NAME
}}</view>
- <ul
- class="flex"
- style="line-height: 1.2; margin: 0.15rem 0"
- >
+ <ul class="flex" style="line-height: 1.2; margin: 0.15rem 0">
<li
style="
background-color: #fff;
@@ -83,20 +73,22 @@
<view
id="copyBox"
class="fz font-family"
+ :title="biogData.length ? biogData[0].content : ''"
style="
- font-size: 0.13rem;
+ font-size: 0.14rem;
font-weight: normal;
- line-height: 0.2rem;
+ line-height: 2;
letter-spacing: 0.03rem;
cursor: pointer;
+ display: -webkit-box;
+ -webkit-box-orient: vertical;
+ -webkit-line-clamp: 4;
+ overflow: hidden;
"
>
{{ biogData.length ? biogData[0].content : "-" }}
</view>
- <view
- class="flex"
- style="width: 100%; margin: 0.25rem 0 0.15rem 0"
- >
+ <view class="flex" style="width: 100%; margin: 0.25rem 0 0.15rem 0">
<view>
<!-- <el-button style="padding: 10rpx;" size="mini" icon="el-icon-folder-add">鏀惰棌</el-button> -->
<el-button
@@ -104,16 +96,15 @@
class="yinyong flex"
@click="copyText"
>
- <img
- src="@/static/image/yinyong.png"
- alt=""
- />寮曠敤</el-button>
+ <img src="@/static/image/yinyong.png" alt="" />寮曠敤</el-button
+ >
</view>
- <!-- v-if="biogData.length > 1" -->
<view
+ v-if="biogData.length > 1"
style="font-size: 0.12rem; color: #244a7b; cursor: pointer"
@click="ProfileClick"
- >闃呰鏇村></view>
+ >闃呰鏇村></view
+ >
</view>
</view>
<view style="width: 5%"></view>
@@ -126,10 +117,7 @@
style="padding-right: 0.2rem; width: 2.8rem"
>
<div class="grid-content bg-purple-dark flex flex-column">
- <el-card
- class="box-card"
- style="width: 100%; height: 2.06rem"
- >
+ <el-card class="box-card" style="width: 100%; height: 2.06rem">
<div
class="clearfix flex"
style="
@@ -138,11 +126,14 @@
padding-bottom: 0.1rem;
"
>
- <span style="
+ <span
+ style="
margin-left: 0.12rem;
font-size: 0.14rem;
font-weight: 900;
- ">鍏崇郴鍥捐氨</span>
+ "
+ >鍏崇郴鍥捐氨</span
+ >
<!-- <el-button icon="el-icon-rank" style="float: right; padding: 3px 0;" type="text"></el-button> -->
<img
src="@/static/image/fangda.png"
@@ -151,10 +142,7 @@
alt=""
/>
</div>
- <view
- id="relation"
- style="height: 1.51rem; width: 100%"
- ></view>
+ <view id="relation" style="height: 1.51rem; width: 100%"></view>
</el-card>
<el-card
class="box-card"
@@ -171,6 +159,7 @@
<span>鏃剁┖鍦板浘</span>
<!-- <el-button icon="el-icon-rank" style="float: right; padding: 3px 0" type="text"></el-button> -->
<img
+ v-if="markerList && markerList.length > 0"
src="@/static/image/fangda.png"
@click="fangdaClick(2)"
style="width: 0.18rem; height: 0.18rem; cursor: pointer"
@@ -179,7 +168,19 @@
<view
id="spaceTime"
style="height: 1.51rem; width: 100%; position: relative"
- ></view>
+ >
+ <p
+ v-if="markerList && markerList.length == 0"
+ style="
+ margin-top: 0.5rem;
+ color: #666;
+ text-align: center;
+ font-size: 12px;
+ "
+ >
+ 鏆傛棤鏁版嵁
+ </p>
+ </view>
</el-card>
<el-card style="width: 100%; height: 2.06rem">
<div
@@ -219,18 +220,9 @@
</div>
</div>
<!-- 鍙充晶 -->
- <div
- :span="18"
- class="BoxRight"
- >
- <div
- class="grid-content bg-purple-dark"
- style="width: 100%"
- >
- <el-card
- class="box-card"
- style="padding: 0"
- >
+ <div :span="18" class="BoxRight">
+ <div class="grid-content bg-purple-dark" style="width: 100%">
+ <el-card class="box-card" style="padding: 0">
<div
class="clearfix"
style="
@@ -248,60 +240,36 @@
class="box-card"
style="min-height: 1.91rem; margin: 0.2rem 0"
>
- <el-tabs
- ref="tabs"
- v-model="activeName"
- @tab-click="handleClick"
- >
- <el-tab-pane
- label="浠ｈ〃钁椾綔"
- data-id="1"
- name="representative"
- >
+ <el-tabs ref="tabs" v-model="activeName" @tab-click="handleClick">
+ <el-tab-pane label="浠ｈ〃钁椾綔" data-id="1" name="representative">
<Table1
:data="tableData1"
:columns="tableColumns1"
:height="400"
/>
</el-tab-pane>
- <el-tab-pane
- label="浜插睘鍏崇郴"
- data-id="2"
- name="family "
- >
+ <el-tab-pane label="浜插睘鍏崇郴" data-id="2" name="family ">
<Table1
:data="tableData2"
:columns="tableColumns2"
:height="400"
/>
</el-tab-pane>
- <el-tab-pane
- label="甯堟壙鍏崇郴"
- data-id="3"
- name="mentoring "
- >
+ <el-tab-pane label="甯堟壙鍏崇郴" data-id="3" name="mentoring ">
<Table1
:data="tableData3"
:columns="tableColumns2"
:height="400"
/>
</el-tab-pane>
- <el-tab-pane
- label="绀句細鍏崇郴"
- data-id="4"
- name="society"
- >
+ <el-tab-pane label="绀句細鍏崇郴" data-id="4" name="society">
<Table1
:data="tableData4"
:columns="tableColumns2"
:height="400"
/>
</el-tab-pane>
- <el-tab-pane
- label="娲诲姩骞磋氨"
- data-id="5"
- name="activity"
- >
+ <el-tab-pane label="娲诲姩骞磋氨" data-id="5" name="activity">
<Table1
:data="tableData5"
:columns="tableColumns3"
@@ -350,11 +318,9 @@
>
<span>鐜颁唬鐮旂┒</span>
</div>
- <ul
- class="font-family"
- style="font-size: 0.13rem; line-height: 2"
- >
+ <ul class="font-family" style="font-size: 0.13rem; line-height: 2">
<li
+ style="cursor: pointer"
v-for="(item, index) in personResearchList"
:key="index"
@click="toLink(item)"
@@ -362,7 +328,7 @@
{{ "[" + Number(index + 1) + "]" + item.achievementName }}
</li>
<div
- v-if="personResearchList.length == 0"
+ v-if="!personResearchList || personResearchList.length == 0"
style="color: #666; text-align: center; font-size: 16px"
>
鏆傛棤鏁版嵁
@@ -374,19 +340,24 @@
</div>
<!-- 杩斿洖椤堕儴 -->
- <el-col style="position: absolute; bottom: 1rem; left: 1.2rem">
+ <el-col
+ style="
+ position: absolute;
+ bottom: 1rem;
+ left: 1.2rem;
+ width: 0.6rem;
+ height: 0.6rem;
+ "
+ >
<el-button
- style="width: 0.5rem; height: 0.5rem; font-size: 0.3rem"
+ style="font-size: 0.3rem"
icon="el-icon-top"
circle
@click="scrollToTop"
></el-button>
</el-col>
<!-- 涓汉灏忎紶 -->
- <el-dialog
- :visible.sync="isProfile"
- :modal-append-to-body="false"
- >
+ <el-dialog :visible.sync="isProfile" :modal-append-to-body="false">
<view class="ProfileNav flex flex-center"> 涓汉灏忎紶 </view>
<view
style="padding: 0.44rem 0.3rem; min-height: 7.32rem"
@@ -409,7 +380,9 @@
</view>
<view class="flex">
<view></view>
- <view style="font-weight: 700; color: #2c2c2c">鈥斺�攞{ item.pageNo }}</view>
+ <view style="font-weight: 700; color: #2c2c2c"
+ >鈥斺�攞{ item.bookName }}</view
+ >
</view>
</view>
</view>
@@ -428,6 +401,7 @@
import {
getFuzzySearch,
getPersonInfo,
+ getRelationTypeTreeList,
getWebBasic,
getIntroduction,
getSource,
@@ -435,13 +409,15 @@
getPersonBiog,
getPersonWritings,
getPersonRelationAtSchool,
- getSpaceTime,
+ getSpaceTime
} from "@/api/index.js";
-import { getImg } from "@/static/tool.js";
+import { getImg, getFile } from "@/static/tool.js";
+import L from "leaflet";
+import "leaflet.chinatmsproviders";
export default {
components: {
- Table1,
+ Table1
},
data() {
return {
@@ -462,60 +438,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: [],
@@ -525,6 +501,7 @@
nodes: [],
relationships: [],
personResearchList: [],
+ markerList: []
};
},
onLoad(options) {
@@ -559,8 +536,7 @@
},
methods: {
copyText() {
- console.log(navigator.clipboard);
- const textToCopy = this.biogData[0].content + ";鏉ユ簮锛氫腑鍖诲尰瀛︿汉鐗╂暟鎹簱";
+ const textToCopy = this.biogData[0].content + " 鏉ユ簮锛氫腑鍖诲尰瀛︿汉鐗╃煡璇嗗簱";
const textarea = document.createElement("textarea");
textarea.value = textToCopy;
document.body.appendChild(textarea);
@@ -569,17 +545,23 @@
document.body.removeChild(textarea);
this.$message({
message: "澶嶅埗鎴愬姛锛�",
- type: "success",
+ type: "success"
});
},
toLink(item) {
- window.open(item.url);
+ console.log(item);
+ if (item.url) {
+ window.open(item.url);
+ }
+ if (item.filePath) {
+ window.open(getFile(item.filePath));
+ }
},
getData() {
// 鍩烘湰淇℃伅
getPersonInfo({
id: this.detailId,
- type: "PERSON_BASIC",
+ type: "PERSON_BASIC"
}).then((res) => {
const obj = {};
if (
@@ -602,53 +584,39 @@
//鐜颁唬鐮旂┒
getPersonInfo({
id: this.detailId,
- type: "PERSON_RESEARCH",
+ type: "PERSON_RESEARCH"
}).then((res) => {
this.personResearchList = res.object.personResearchList;
});
- getPersonInfo({
- id: this.detailId,
- type: "PERSON_RELATIONS",
- }).then((res) => {
- console.log(res, "PERSON_RELATIONS");
- this.personRelationList = res.object.personRelationList;
- if (this.personRelationList.length) {
- this.tableData4 = this.personRelationList.map((f) => {
- return {
- a: f.nodeName,
- b: f.relationTypeName,
- };
- });
- }
- });
+
getWebBasic({
- personId: this.detailId,
+ personId: this.detailId
}).then((res) => {
- console.log(res, "resres");
const obj = res.object;
if (obj.school) {
getIntroduction(Number(obj.school)).then((sres) => {
- console.log(sres, "sres");
- handleData(obj, sres);
+ this.handleData(obj, sres);
});
} else {
- handleData(obj);
+ this.handleData(obj);
}
});
// 娲诲姩骞磋氨
getPersonInfo({
id: this.detailId,
- type: "PERSON_SPACE_TIME",
+ type: "PERSON_SPACE_TIME"
}).then((res) => {
- this.tableData5 = res.object.personSpaceTimeList.map((item) => {
- return {
- a: item.time,
- b: item.activityName,
- c: item.activityAddrOld,
- d: item.desc, // 杩欓噷缂哄皯娲诲姩鎻忚堪瀛楁
- };
- });
+ if (res.object.personSpaceTimeList) {
+ this.tableData5 = res.object.personSpaceTimeList.map((item) => {
+ return {
+ a: item.time,
+ b: item.activityName,
+ c: item.activityAddrOld,
+ d: item.desc // 杩欓噷缂哄皯娲诲姩鎻忚堪瀛楁
+ };
+ });
+ }
});
},
handleData(obj, sres) {
@@ -657,39 +625,39 @@
list: [
{
name: "鍒悕",
- value: obj.alias || "-",
+ value: obj.alias || "-"
},
{
name: "瀛�",
- value: obj.zi || "-",
+ value: obj.zi || "-"
},
{
name: "鍙�",
- value: obj.hao || "-",
+ value: obj.hao || "-"
},
{
name: "鎵�澶勬椂鏈�",
- value: obj.dynastyDesc || "-",
+ value: obj.dynastyDesc || "-"
},
{
name: "姘戞棌",
- value: obj.ethnic || "-",
- },
- ],
+ value: obj.ethnic || "-"
+ }
+ ]
},
{
list: [
{
name: "绫嶈疮",
- value: obj.native || "-",
+ value: obj.native || "-"
},
{
name: "鎬у埆",
- value: obj.gender || "-",
+ value: obj.gender || "-"
},
{
name: "鑱屽畼",
- value: obj.official || "-",
+ value: obj.official || "-"
},
{
name: "娴佹淳",
@@ -699,45 +667,45 @@
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 {
content: item.content1,
- pageNo: "銆�" + item.pageNo + "銆� " + "P " + item.pageNo, // 杩欓噷鍙湁bookid鏃犳硶鍖归厤鍒颁功鍚�
+ bookName: "銆�" + item.bookName + "銆� " + "P " + item.pageNo // 杩欓噷鍙湁bookid鏃犳硶鍖归厤鍒颁功鍚�
};
});
});
},
getWritings() {
getPersonWritings({
- personId: this.detailId,
+ personId: this.detailId
}).then((res) => {
this.tableData1 = res.list.map((item) => {
return {
@@ -745,23 +713,82 @@
b: item.dynasty,
c: item.writeWay,
d: item.classify,
- e: this.detailInfo.NAME,
+ e: this.detailInfo.NAME
};
});
});
},
getRelationship() {
+ getRelationTypeTreeList().then(res=>{
+ console.log(res,"getRelationTypeTreeList");
+ console.log(res);
+ })
+ // getPersonRelationAtSchool({
+ // personId: this.detailId,
+ // }).then((res) => {
+ // this.personRelationList = res.object.personRelationList;
+ // if (this.personRelationList.length) {
+ // this.tableData4 = this.personRelationList.map((f) => {
+ // return {
+ // a: f.nodeName,
+ // b: f.relationTypeName,
+ // };
+ // });
+ // }
+ // });
+ getPersonInfo({
+ id: this.detailId,
+ type: "PERSON_RELATIONS"
+ }).then((res) => {
+ this.tableData4
+ console.log(res,"PERSON_RELATIONS");
+ });
+ // 绀句細鍏崇郴
getPersonRelationAtSchool({
personId: this.detailId,
- // relationSearchTypeEO: "SOCIAL"
+ relationSearchTypeEO: "SOCIAL"
}).then((res) => {
- console.log(res, "getPersonRelationAtSchool");
- // 杩欓噷鎺ュ彛鏈夐棶棰�
+ if (res.list && res.list.length) {
+ this.tableData4 = res.list.map((f) => {
+ return {
+ a: f.name1,
+ b: f.relationName
+ };
+ });
+ }
+ });
+ // 浜插睘鍏崇郴
+ getPersonRelationAtSchool({
+ personId: this.detailId,
+ relationSearchTypeEO: "KINSHIP"
+ }).then((res) => {
+ if (res.list && res.list.length) {
+ this.tableData2 = res.list.map((f) => {
+ return {
+ a: f.name1,
+ b: f.relationName
+ };
+ });
+ }
+ });
+ // 甯堟壙鍏崇郴
+ getPersonRelationAtSchool({
+ personId: this.detailId,
+ relationSearchTypeEO: "INHERITANCE"
+ }).then((res) => {
+ if (res.list && res.list.length) {
+ this.tableData3 = res.list.map((f) => {
+ return {
+ a: f.name1,
+ b: f.relationName
+ };
+ });
+ }
});
},
getMappingData(name) {
getFuzzySearch({
- keyword: name,
+ keyword: name
}).then((res) => {
this.nodes = [];
this.relationships = [];
@@ -774,22 +801,22 @@
(node) => node.id === item.identifier2 && node.name === item.name2
);
// 璇佹槑涓嶅瓨鍦�
- if (exists1 !== true) {
+ if (item.name1 && exists1 !== true) {
this.nodes.push({
name: item.name1,
- id: item.identifier1,
+ id: item.identifier1
});
}
- if (exists2 !== true) {
+ 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);
});
@@ -799,31 +826,56 @@
},
getMapInfo() {
getSpaceTime({
- personId: this.detailId,
+ personId: this.detailId
}).then((res) => {
- console.log(res, "getSpaceTime");
- const data = res.list.map((item) => {
- return {
- name: item.activityName,
- value: [item.xcoord, item.ycoord],
- };
- });
- // 鏃剁┖鍦板浘
- loadBMap("1NJdwrI1CfT6lrykVhDkmWgsO6O2bjQK").then(() => {
- this.spaceTime(data);
- });
+ if (res.list && res.list.length) {
+ const data = res.list.map((item) => {
+ return {
+ name: item.activityName,
+ value: [item.xcoord, item.ycoord]
+ };
+ });
+ this.markerList = data;
+ // 鏃剁┖鍦板浘
+ this.initMap(data[0]);
+ }
+
+ // loadBMap("1NJdwrI1CfT6lrykVhDkmWgsO6O2bjQK").then(() => {
+ // this.spaceTime(data);
+ // });
});
},
-
+ initMap(markerList) {
+ var map = L.map("spaceTime", {
+ preferCanvas: true,
+ attributionControl: false
+ }).setView([markerList.value[1], markerList.value[0]], 13);
+ L.tileLayer
+ .chinaProvider("TianDiTu.Normal.Map", {
+ 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"
+ });
+ this.map = map;
+ const temp_mark = L.marker([markerList.value[1], markerList.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
});
}
},
@@ -839,13 +891,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:
@@ -948,8 +1000,8 @@
position: "middle", // 璁剧疆鏍囩鏂囨湰鍦ㄧ嚎鐨勪腑闂翠綅缃笂灞呬腑鏄剧ず
// bottom: -(FontSize+10),
z: 10, // 璁剧疆鏍囩鐨剒杞撮珮搴︼紝浣垮叾姣旇繛鎺ョ嚎鏇撮珮
- distance: -(Distance + 1), // 灏嗘爣绛炬斁缃湪杩炴帴绾夸笂
- },
+ distance: -(Distance + 1) // 灏嗘爣绛炬斁缃湪杩炴帴绾夸笂
+ }
});
}
}
@@ -964,8 +1016,8 @@
itemStyle: {
color: "#eae0eb", // 鍙互鏍规嵁绱㈠紩璁剧疆涓嶅悓鐨勯鑹�
borderWidth: BorderWidth,
- borderColor: "#996f9f",
- },
+ borderColor: "#996f9f"
+ }
};
});
var option;
@@ -975,14 +1027,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,
@@ -996,7 +1048,7 @@
label: {
show: true,
color: "black", // 璁剧疆鑺傜偣鏂囧瓧棰滆壊涓洪粦鑹�
- fontSize: FontSize, // 璁剧疆鏂囧瓧澶у皬
+ fontSize: FontSize // 璁剧疆鏂囧瓧澶у皬
},
edgeSymbol: ["circle"],
edgeSymbolSize: [4, 10],
@@ -1005,16 +1057,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;
@@ -1033,37 +1085,15 @@
var myChart = echarts.init(chartDom);
var option;
- // const data = [
- // {
- // name: "娴烽棬",
- // value: [121.15, 31.89]
- // },
- // {
- // name: "閯傚皵澶氭柉",
- // value: [109.781327, 39.608266]
- // },
- // {
- // name: "鎷涜繙",
- // value: [120.38, 37.35]
- // },
- // {
- // name: "鑸熷北",
- // value: [122.207216, 29.985295]
- // },
- // {
- // name: "榻愰綈鍝堝皵",
- // value: [123.97, 47.33]
- // }
- // ];
option = {
title: {
text: "",
subtext: "",
sublink: "",
- left: "center",
+ left: "center"
},
tooltip: {
- trigger: "item",
+ trigger: "item"
},
bmap: {
center: data[0].value,
@@ -1075,123 +1105,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: [
{
@@ -1201,18 +1231,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: "",
@@ -1221,32 +1251,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>
@@ -1293,10 +1323,6 @@
::v-deep .el-dialog__body {
padding: 0;
-}
-
-::v-deep .el-dialog__wrapper {
- z-index: 999999999999999 !important;
}
.ProfileNav {
@@ -1455,4 +1481,35 @@
.BoxRight .box-card {
margin-bottom: 0.2rem !important;
}
+::v-deep .map-circle-name {
+ width: 20px;
+ height: 20px;
+ border-radius: 50%;
+ background-color: rgb(222, 142, 102);
+}
+::v-deep .ripple {
+ border-radius: 50%;
+ position: relative;
+ overflow: hidden;
+}
+
+::v-deep .ripple::before {
+ content: "";
+ position: absolute;
+ top: 50%;
+ left: 50%;
+ width: 150%; /* Ensure it covers the entire parent */
+ height: 150%;
+ background: rgba(255, 255, 255, 0.5);
+ border-radius: 50%;
+ transform: translate(-50%, -50%) scale(1);
+ animation: ripple-animation 1s infinite linear;
+}
+
+@keyframes ripple-animation {
+ to {
+ transform: translate(-50%, -50%) scale(0);
+ opacity: 0;
+ }
+}
</style>
--
Gitblit v1.9.1