From 0f3805cc33bf479fc0f44d456dfb20eb8528fe92 Mon Sep 17 00:00:00 2001
From: 杨磊 <505174330@qq.com>
Date: 星期一, 20 五月 2024 17:44:37 +0800
Subject: [PATCH] 地域图谱
---
src/pages/character/detail.vue | 141 ++++++--------------
src/pages/territory/territory.vue | 233 ++++++++++++++++++++++----------
src/api/index.js | 8 +
3 files changed, 209 insertions(+), 173 deletions(-)
diff --git a/src/api/index.js b/src/api/index.js
index bc821c5..7cca411 100644
--- a/src/api/index.js
+++ b/src/api/index.js
@@ -123,6 +123,14 @@
params: data
});
};
+// 鍖诲浜虹墿鐭ヨ瘑搴� 浜虹墿鍏崇郴
+export const getNodeCount = (data) => {
+ return req1({
+ url: "/inheritMedical/nodeCount",
+ method: "post",
+ params: data
+ });
+};
// 鍖诲浜虹墿鐭ヨ瘑搴� 钁楄堪
export const getPersonWritings = (data) => {
diff --git a/src/pages/character/detail.vue b/src/pages/character/detail.vue
index 857b0fa..7664ed8 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;
@@ -93,10 +83,7 @@
>
{{ 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 +91,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
style="font-size: 0.12rem; color: #244a7b; cursor: pointer"
@click="ProfileClick"
- >闃呰鏇村></view>
+ >闃呰鏇村></view
+ >
</view>
</view>
<view style="width: 5%"></view>
@@ -126,10 +112,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 +121,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 +137,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"
@@ -219,18 +202,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 +222,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,10 +300,7 @@
>
<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
v-for="(item, index) in personResearchList"
:key="index"
@@ -383,10 +330,7 @@
></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 +353,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>
@@ -606,20 +552,19 @@
}).then((res) => {
this.personResearchList = res.object.personResearchList;
});
- getPersonInfo({
- id: this.detailId,
- type: "PERSON_RELATIONS",
+ getPersonRelationAtSchool({
+ personId: this.detailId,
}).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,
- };
- });
- }
+ // 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,
@@ -730,7 +675,7 @@
this.biogData = res.list.map((item) => {
return {
content: item.content1,
- pageNo: "銆�" + item.pageNo + "銆� " + "P " + item.pageNo, // 杩欓噷鍙湁bookid鏃犳硶鍖归厤鍒颁功鍚�
+ bookName: "銆�" + item.bookName + "銆� " + "P " + item.pageNo, // 杩欓噷鍙湁bookid鏃犳硶鍖归厤鍒颁功鍚�
};
});
});
diff --git a/src/pages/territory/territory.vue b/src/pages/territory/territory.vue
index 74aae92..7fc64d2 100644
--- a/src/pages/territory/territory.vue
+++ b/src/pages/territory/territory.vue
@@ -1,11 +1,7 @@
<template>
<view class="pageBox">
<!-- 椤堕儴瀵艰埅 -->
- <headNav
- :idIndex="idIndex"
- text="涓尰鍦板煙鍖昏氨"
- style="z-index:999"
- />
+ <headNav :idIndex="idIndex" text="涓尰鍦板煙鍖昏氨" style="z-index: 999" />
<view
class="flex flex-center"
style="width: 100%; margin: 0.2rem 0 0.34rem; justify-content: flex-start"
@@ -18,11 +14,7 @@
: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"
@@ -50,10 +42,7 @@
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>
@@ -73,10 +62,7 @@
top: 2.2rem;
"
>
- <div
- slot="header"
- class="clearfix"
- >
+ <div slot="header" class="clearfix">
<span>浜虹墿 ({{ SearchArr.length }})</span>
<el-button
style="
@@ -87,12 +73,10 @@
"
@click="isSearch = false"
type="text"
- >鍏抽棴</el-button>
+ >鍏抽棴</el-button
+ >
</div>
- <view
- class=""
- style="overflow: auto; height: 2.5rem"
- >
+ <view class="" style="overflow: auto; height: 2.5rem">
<ul
class="information"
v-for="(item, index) in SearchArr"
@@ -126,10 +110,7 @@
"
:style="{ top: isTop, left: isLeft }"
>
- <div
- slot="header"
- class="clearfix"
- >
+ <div slot="header" class="clearfix">
<span v-if="currentMark">{{
currentMark.name ? currentMark.name : "-"
}}</span>
@@ -142,12 +123,10 @@
"
@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 : "-" }}
@@ -164,7 +143,8 @@
@click="viewMoreClick"
style="width: 100%; padding: 3px 0; font-size: 0.12rem; color: #597aa5"
type="text"
- >鏌ョ湅鏇村>></el-button>
+ >鏌ョ湅鏇村>></el-button
+ >
</el-card>
<div id="map"></div>
<!-- 鏈濅唬 -->
@@ -182,7 +162,7 @@
class="flex flex-center"
style="height: 0.35rem; background-color: #fff; color: #244a7b"
>
- {{ item.coord }}
+ {{ item.start }}
</view>
<view
class="flex flex-center font-family"
@@ -201,7 +181,7 @@
background: dynasty1Color == item.id ? '#244A7B' : '#597AA5',
}"
>
- {{ item.name }}
+ {{ item.dynastyChs }}
</view>
</li>
</ul>
@@ -216,7 +196,7 @@
import * as echarts from "echarts";
import "echarts/extension/bmap/bmap";
import "leaflet.chinatmsproviders";
-import { getRetrieval } from "@/api/index.js";
+import { getRetrieval, getDynasty } from "@/api/index.js";
export default {
data() {
return {
@@ -250,7 +230,7 @@
},
],
// 涓嬮潰鐨勬湞浠�1
- dynasty1Color: 1,
+ dynasty1Color: "",
dynasty1: [
{
name: "澶忔湞",
@@ -333,12 +313,12 @@
// 鏈濅唬
dynasty: [
{
- name: "澶忔湞",
+ name: "澶�",
color: "#90BBD8",
id: 1,
},
{
- name: "鍟嗘湞",
+ name: "鍟�",
color: "#EDD28B",
id: 2,
},
@@ -348,24 +328,29 @@
id: 3,
},
{
- name: "绉︽湞",
+ name: "绉�",
color: "#9CC27A",
id: 4,
},
{
- name: "姹夋湞",
+ name: "姹�",
color: "#5B6CB9",
id: 5,
},
{
- name: "闅嬫湞",
+ name: "闅�",
color: "#8860A8",
id: 6,
},
{
- name: "鍞愭湞",
+ name: "鍞�",
color: "#DE8E66",
id: 7,
+ },
+ {
+ name: "鏄�",
+ color: "#DE8E66",
+ id: 8,
},
],
// 鎼滅储鍚庢槸鍚︽樉绀哄脊妗�
@@ -392,14 +377,17 @@
console.log("optionsoptionsoptions", options.id);
},
mounted() {
- // this.$nextTick(() => {
- // loadBMap("1NJdwrI1CfT6lrykVhDkmWgsO6O2bjQK").then(() => {
- // this.innt();
- // });
- // })
+ this.getDynastyList();
+
this.getDataList();
},
methods: {
+ getDynastyList() {
+ getDynasty().then((res) => {
+ console.log(res, "123123");
+ this.dynasty1 = res.list;
+ });
+ },
showCard(info) {
console.log(info);
console.log(this.markerList);
@@ -409,35 +397,51 @@
this.map.setView(latlng, 10);
},
getDataList() {
- getRetrieval({ keyword: this.keyword, dynasty: "" }).then((res) => {
- let markerList = [];
- const listData = res.object.personList;
- for (let i = 0; i < listData.length; i++) {
- const item = listData[i];
- if (item.NATIVE_PLACE?.length > 0) {
- item.NATIVE_PLACE.forEach((citem) => {
- if (citem.xCoord && citem.yCoord) {
- markerList.push({ ...citem, ...item });
+ getRetrieval({ keyword: this.keyword, dynasty: this.dynasty1Color }).then(
+ (res) => {
+ 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) {
+ item.NATIVE_PLACE.forEach((citem) => {
+ if (citem.xCoord && citem.yCoord) {
+ const currentDynasty = this.dynasty1.find(
+ (f) => f.id == item.PERIOD[0].content1
+ );
+ if (currentDynasty) {
+ item.dynastyInfo = currentDynasty;
+ }
+ markerList.push({ ...citem, ...item });
+ }
+ });
}
- });
+ }
+ console.log(markerList, "markerList");
+ this.initMap(markerList);
+ this.SearchArr = markerList.map((item) => ({
+ 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;
}
}
- this.initMap(markerList);
- this.SearchArr = markerList.map((item) => ({
- 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;
- });
+ );
},
//鍒濆鍖栧湴鍥�
initMap(markerList) {
+ this.isEchTrue = false;
+ if (this.map) {
+ this.map.remove();
+ }
var map = L.map("map", {
preferCanvas: true,
attributionControl: false,
@@ -457,9 +461,6 @@
popupAnchor: [1, -24], // 璇ョ偣鏄浉瀵逛簬iconAnchor寮瑰嚭淇℃伅鐨勪綅缃� 杩欎釜鏄垜鎵嬪姩璋冨嚭鏉ョ殑锛屾枃妗ｉ粯璁ゅ師濮嬪�兼槸[-1锛�-76]锛屾垜鏄幓涓�鍗婂�硷紝鍙栦竴鍗婂�艰皟鍑烘潵鐨�
});
- let htmlStr = '<p><span class="map-circle-name">';
- ('</span><br><span class="map-circle-count">');
- ("</span><p/>");
let icon = L.divIcon({
html: "<div class='map-circle-name'></div>",
iconSize: [80, 80],
@@ -469,6 +470,38 @@
if (markerList.length) {
for (let i = 0; i < markerList.length; i++) {
const item = markerList[i];
+ let currentClassName = "map-circle-name";
+ switch (item.dynastyInfo.dynastyChs) {
+ case "澶�":
+ currentClassName = "map-circle-xia";
+ break;
+ case "鍟�":
+ currentClassName = "map-circle-shang";
+ break;
+ case "瑗垮懆":
+ currentClassName = "map-circle-zhou";
+ break;
+ case "绉�":
+ currentClassName = "map-circle-qin";
+ break;
+ case "姹�":
+ currentClassName = "map-circle-han";
+ break;
+ case "闅�":
+ currentClassName = "map-circle-sui";
+ break;
+ case "鍞�":
+ currentClassName = "map-circle-tang";
+ break;
+ case "鏄�":
+ currentClassName = "map-circle-ming";
+ break;
+ }
+ let icon = L.divIcon({
+ html: `<div class='${currentClassName}'></div>`,
+ iconSize: [80, 80],
+ className: "map-circle",
+ });
const temp_mark = L.marker([item.yCoord, item.xCoord], {
icon: icon,
}).addTo(map);
@@ -500,6 +533,7 @@
dynastyBottomClick(id) {
console.log(id);
this.dynasty1Color = id;
+ this.getDataList();
},
onSearch(val) {
this.isSearch = true;
@@ -527,8 +561,57 @@
width: 20px;
height: 20px;
border-radius: 50%;
- background-color: #2070bc;
+ background-color: rgb(144, 187, 216);
}
+::v-deep .map-circle-xia {
+ width: 20px;
+ height: 20px;
+ border-radius: 50%;
+ background-color: rgb(144, 187, 216);
+}
+::v-deep .map-circle-shang {
+ width: 20px;
+ height: 20px;
+ border-radius: 50%;
+ background-color: rgb(237, 210, 139);
+}
+::v-deep .map-circle-zhou {
+ width: 20px;
+ height: 20px;
+ border-radius: 50%;
+ background-color: rgb(207, 116, 109);
+}
+::v-deep .map-circle-qin {
+ width: 20px;
+ height: 20px;
+ border-radius: 50%;
+ background-color: rgb(156, 194, 122);
+}
+::v-deep .map-circle-han {
+ width: 20px;
+ height: 20px;
+ border-radius: 50%;
+ background-color: rgb(91, 108, 185);
+}
+::v-deep .map-circle-sui {
+ width: 20px;
+ height: 20px;
+ border-radius: 50%;
+ background-color: rgb(136, 96, 168);
+}
+::v-deep .map-circle-tang {
+ width: 20px;
+ height: 20px;
+ border-radius: 50%;
+ background-color: rgb(136, 96, 168);
+}
+::v-deep .map-circle-ming {
+ width: 20px;
+ height: 20px;
+ border-radius: 50%;
+ background-color: rgb(222, 142, 102);
+}
+
.pageBox {
width: 100%;
height: 100%;
--
Gitblit v1.9.1