From dbc61c1b1eda6318dbe76a4a73ac9b3d08c2b15b Mon Sep 17 00:00:00 2001
From: QYF-GitLab1 <1940665526@qq.com>
Date: 星期二, 23 七月 2024 17:41:19 +0800
Subject: [PATCH] Merge branch 'master' of http://182.92.203.7:2001/r/TCM_CharacterLibrary
---
src/pages/academicSchools/index.vue | 720 +++++++++++++++++++++++++++++++++++++++++------------------
1 files changed, 497 insertions(+), 223 deletions(-)
diff --git a/src/pages/academicSchools/index.vue b/src/pages/academicSchools/index.vue
index 8ecc0ed..a369d13 100644
--- a/src/pages/academicSchools/index.vue
+++ b/src/pages/academicSchools/index.vue
@@ -37,7 +37,7 @@
@click="onSearch({ text: item }, index)"
:class="{ cursor: true, active: hotAciveIndex === index }"
v-for="(item, index) in hotKeyList"
- :key="item"
+ :key="item.name"
>
{{ item.name }}
</li>
@@ -45,7 +45,12 @@
</view>
<view v-if="isAdvancedSearch" class="searchDialog">
<h3 style="margin-bottom: 0.2rem">楂樼骇鎼滅储</h3>
- <el-form label-width="100px" :model="formData" size="mini">
+ <el-form
+ label-width="100px"
+ :model="formData"
+ ref="searchForm"
+ size="mini"
+ >
<el-row>
<el-col :span="8">
<el-form-item label="濮撳悕/鍒悕锛�">
@@ -54,14 +59,16 @@
</el-col>
<el-col :span="8">
<el-form-item label="娲诲姩鍦帮細">
- <el-select
- style="width: 100%"
- v-model="formData.actively"
- placeholder="璇烽�夋嫨娲诲姩鍦�"
- >
- <!-- <el-option label="鍖哄煙涓�" value="shanghai"></el-option> -->
- <!-- <el-option label="鍖哄煙浜�" value="beijing"></el-option> -->
- </el-select>
+ <div class="selectActivelyBox" @click="selectActively">
+ <p v-if="formData.actively.length == 0">璇烽�夋嫨娲诲姩鍦�</p>
+ <el-tag
+ v-for="item in formData.actively"
+ :key="item.id"
+ size="small"
+ closable
+ >{{ item.name }}</el-tag
+ >
+ </div>
</el-form-item>
</el-col>
<el-col :span="8">
@@ -74,45 +81,62 @@
<el-col :span="8">
<el-form-item label="浜虹墿鏍囩锛�">
<el-select
+ multiple
style="width: 100%"
v-model="formData.personTags"
placeholder="璇烽�夋嫨浜虹墿鏍囩"
>
- <!-- <el-option label="鍖哄煙涓�" value="shanghai"></el-option> -->
- <!-- <el-option label="鍖哄煙浜�" value="beijing"></el-option> -->
+ <el-option
+ v-for="item in personTag"
+ :key="item.id"
+ :label="item.name"
+ :value="item.id"
+ ></el-option>
</el-select>
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="绀句細韬唤锛�">
<el-select
+ multiple
style="width: 100%"
v-model="formData.socialIdentity"
placeholder="璇烽�夋嫨绀句細韬唤"
>
- <!-- <el-option label="鍖哄煙涓�" value="shanghai"></el-option> -->
- <!-- <el-option label="鍖哄煙浜�" value="beijing"></el-option> -->
+ <el-option
+ v-for="item in socialDistinction"
+ :key="item.id"
+ :label="item.name"
+ :value="item.id"
+ ></el-option>
</el-select>
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="鏃舵湡锛�">
<el-select
+ multiple
style="width: 100%"
v-model="formData.period"
placeholder="璇烽�夋嫨鏃舵湡"
>
- <!-- <el-option label="鍖哄煙涓�" value="shanghai"></el-option> -->
- <!-- <el-option label="鍖哄煙浜�" value="beijing"></el-option> -->
+ <el-option
+ v-for="item in dynastyData"
+ :key="item.dynastyId"
+ :label="item.name"
+ :value="item.dynastyId"
+ ></el-option>
</el-select>
</el-form-item>
</el-col>
</el-row>
+ <div style="text-align: right">
+ <el-button type="primary" size="mini" @click="searchFun"
+ >鎼滅储</el-button
+ >
+ <el-button size="mini" @click="resetForm">閲嶇疆</el-button>
+ </div>
</el-form>
- <div style="text-align: right">
- <el-button type="primary" size="mini">鎼滅储</el-button>
- <el-button size="mini">閲嶇疆</el-button>
- </div>
</view>
<div v-if="showPerson" class="personDialog">
<i
@@ -193,6 +217,14 @@
</div>
<div class="btn" @click="spaceTimeArr(detailData.id)">鏌ョ湅鏇村>>></div>
</div>
+ <el-drawer
+ title="鍦板潃鍒楄〃"
+ :visible.sync="drawer"
+ direction="rtl"
+ :before-close="handleClose"
+ >
+ <span>鎴戞潵鍟�!</span>
+ </el-drawer>
</view>
</template>
@@ -202,6 +234,9 @@
getHotSearch,
getPDataStatistics,
academicSearch,
+ getPersonTag,
+ getSocialDistinction,
+ getDynastyAll
} from "@/api/index.js";
import * as echarts from "echarts";
export default {
@@ -217,22 +252,17 @@
// 鐑棬鎼滅储
hotKeyList: [],
searchKey: "",
-
// 鍒嗙被
categories: [],
- // 浜虹墿淇℃伅
- infoOfPersons: [],
- // 瀛︽湳娴佹淳
- infoOfSchools: [],
// 褰撳墠浜虹墿淇℃伅
ownInfo: null,
detailData: {
- name: "",
+ name: ""
},
isAdvancedSearch: false,
formData: {
name: "",
- actively: "",
+ actively: [],
works: "",
personTags: "",
socialIdentity: "",
@@ -243,14 +273,23 @@
personPageInfo: {
totalCount: 0,
page: 1,
- limit: 10,
+ limit: 10
},
+ personTag: [],
+ socialDistinction: [],
+ dynastyData: [],
+ drawer: false,
+ infoOfPersons: [],
+ infoOfSchools: [],
+ nodeDatas: [],
+ links: []
};
},
mounted() {
this.getData();
- // this.echartsArr();
this.hotSearch();
+ // 鑾峰彇浜虹墿鏍囩銆佺ぞ浼氳韩浠�
+ this.getOptionInfo();
// 鐩戝惉绐楀彛澶у皬鍙樺寲
window.addEventListener("resize", this.relation);
},
@@ -258,6 +297,36 @@
this.searchKey = options.keyword;
},
methods: {
+ getOptionInfo() {
+ getDynastyAll().then((res) => {
+ this.dynastyData = res.list;
+ });
+ getPersonTag().then((res) => {
+ this.personTag = res.list;
+ });
+ getSocialDistinction().then((res) => {
+ this.socialDistinction = res.list;
+ });
+ },
+ resetForm(formName) {
+ this.formData = {
+ name: "",
+ actively: [],
+ works: "",
+ personTags: "",
+ socialIdentity: "",
+ period: ""
+ };
+ },
+ searchFun() {
+ console.log(this.formData);
+ },
+ selectActively() {
+ this.drawer = true;
+ },
+ handleClose(done) {
+ done();
+ },
// 鑾峰彇浜虹墿鍏崇郴
getPersonInfo(arr, str, newArr, order, type, parent) {
for (let i = 0; i < arr.length; i++) {
@@ -273,7 +342,7 @@
parentName: parent?.NAME[0]?.content1 ?? parent.parentName,
name: personInfo?.NAME[0]?.content1,
category: type,
- symbolSize: 15,
+ symbolSize: 15
};
if (order > 80) {
order = 80;
@@ -375,7 +444,7 @@
const data = item[str]?.map((e) => {
return {
...e,
- personId: item.personId,
+ personId: item.personId
};
});
if (ele[str] && data?.length) {
@@ -387,9 +456,6 @@
}
return arr;
},
-
- // 鏂囩尞
-
//鏁扮粍鍘婚噸
deduplicateArray(arr, idKey) {
// 浣跨敤涓�涓緟鍔╁璞℃潵璺熻釜宸茬粡瑙佽繃鐨処D
@@ -414,152 +480,379 @@
getData() {
this.loading = true;
getPersonData(this.currentId).then((res) => {
- console.log(res,'res')
- this.nodes = [];
- this.relationships = [];
- let kinData = [];
- let teacher = [];
- let literature = [];
- let social = [];
- let place = [];
- let school = [];
- if (res && res.success && res.object) {
- this.infoOfPersons = res.object?.infoOfPersons;
- this.infoOfSchools = res.object?.infoOfSchools;
- console.log(res.object);
- if (res.object?.personChain) {
- this.ownInfo = this.infoOfPersons.find(
- (item) => item.id == res.object?.personChain.personId
- );
- const obj = res.object?.personChain;
- if (obj.kinList?.length) {
- let newArr = [];
- this.categories.push({ name: "浜插睘鍏崇郴" });
- this.getPersonInfo(
- obj.kinList,
- "kinList",
- newArr,
- 1,
- 0,
- this.ownInfo
- );
- kinData = [...newArr];
- }
- if (obj.teacherStudentList?.length) {
- this.categories.push({ name: "甯堟壙鍏崇郴" });
- let newArr = [];
- this.getPersonInfo(
- obj.teacherStudentList,
- "teacherStudentList",
- newArr,
- 1,
- 1,
- this.ownInfo
- );
- teacher = [...newArr];
- }
- if (obj.literatureList?.length) {
- this.categories.push({ name: "鏂囩尞浣滃搧" });
- let newArr = [];
- const data = this.changeLiterature(
- obj.literatureList,
- "literatureList"
- );
- this.getPersonInfo(
- data,
- "literatureList",
- newArr,
- 1,
- 2,
- this.ownInfo
- );
- literature = [...newArr];
- }
- if (obj.socialList?.length) {
- let newArr = [];
- this.categories.push({ name: "绀句細鍏崇郴" });
- const data = this.changeLiterature(obj.socialList, "socialList");
- this.getPersonInfo(
- data,
- "socialList",
- newArr,
- 1,
- 3,
- this.ownInfo
- );
- social = [...newArr];
- }
- if (obj.placeList?.length) {
- this.categories.push({ name: "娲诲姩鍦�" });
- let newArr = [];
- const data = this.changeLiterature(obj.placeList, "placeList");
- this.getPersonInfo(data, "placeList", newArr, 1, 4, this.ownInfo);
- place = [...newArr];
- }
- if (obj.schoolList?.length) {
- this.categories.push({ name: "瀛︽湳娴佹淳" });
- let newArr = [];
- const data = this.changeLiterature(obj.schoolList, "schoolList");
- this.getPersonInfo(
- data,
- "schoolList",
- newArr,
- 1,
- 5,
- this.ownInfo
- );
- school = [...newArr];
- }
- }
- const personData = [
- ...kinData,
- ...teacher,
- ...literature,
- ...social,
- ...place,
- ...school,
- ];
-
- personData.forEach((item) => {
- this.nodes.push({
- name: item.name,
- id: item.personId,
- ...item,
- });
- let obj = {
- source: item.parentName,
- target: item.name,
- relation: item.relationTypeName || "", // 濡傛灉瀛樺湪 relationName 瀛楁鍒欎娇鐢紝鍚﹀垯涓虹┖瀛楃涓�
- };
- this.relationships.push(obj);
- });
- }
+ console.log("1111111111111", res);
+ this.infoOfPersons = res.object.infoOfPersons;
+ this.infoOfSchools = res.object.infoOfSchools;
+ this.nodeDatas = [];
+ this.links = [];
+ this.handleData([res.object.personChain], null);
+ console.log("this.nodeDatas", this.nodeDatas);
+ console.log("this.links", this.links);
this.loading = false;
this.relation();
+ // this.nodes = [];
+ // this.relationships = [];
+ // let kinData = [];
+ // let teacher = [];
+ // let literature = [];
+ // let social = [];
+ // let place = [];
+ // let school = [];
+ // if (res && res.success && res.object) {
+ // this.infoOfPersons = res.object?.infoOfPersons;
+ // this.infoOfSchools = res.object?.infoOfSchools;
+
+ // if (res.object?.personChain) {
+ // this.ownInfo = this.infoOfPersons.find(
+ // (item) => item.id == res.object?.personChain.personId
+ // );
+ // const obj = res.object?.personChain;
+ // if (obj.kinList?.length) {
+ // let newArr = [];
+ // this.categories.push({ name: "浜插睘鍏崇郴" });
+ // this.getPersonInfo(
+ // obj.kinList,
+ // "kinList",
+ // newArr,
+ // 1,
+ // 0,
+ // this.ownInfo
+ // );
+ // kinData = [...newArr];
+ // }
+ // if (obj.teacherStudentList?.length) {
+ // this.categories.push({ name: "甯堟壙鍏崇郴" });
+ // let newArr = [];
+ // this.getPersonInfo(
+ // obj.teacherStudentList,
+ // "teacherStudentList",
+ // newArr,
+ // 1,
+ // 1,
+ // this.ownInfo
+ // );
+ // teacher = [...newArr];
+ // }
+ // if (obj.literatureList?.length) {
+ // this.categories.push({ name: "鏂囩尞浣滃搧" });
+ // let newArr = [];
+ // const data = this.changeLiterature(
+ // obj.literatureList,
+ // "literatureList"
+ // );
+ // this.getPersonInfo(
+ // data,
+ // "literatureList",
+ // newArr,
+ // 1,
+ // 2,
+ // this.ownInfo
+ // );
+ // literature = [...newArr];
+ // // console.log(literature, "literature");
+ // }
+ // if (obj.socialList?.length) {
+ // let newArr = [];
+ // this.categories.push({ name: "绀句細鍏崇郴" });
+ // const data = this.changeLiterature(obj.socialList, "socialList");
+ // this.getPersonInfo(
+ // data,
+ // "socialList",
+ // newArr,
+ // 1,
+ // 3,
+ // this.ownInfo
+ // );
+ // social = [...newArr];
+ // }
+ // if (obj.placeList?.length) {
+ // this.categories.push({ name: "娲诲姩鍦�" });
+ // let newArr = [];
+ // const data = this.changeLiterature(obj.placeList, "placeList");
+ // console.log(data, "place");
+ // this.getPersonInfo(data, "placeList", newArr, 1, 4, this.ownInfo);
+ // place = [...newArr];
+ // }
+ // if (obj.schoolList?.length) {
+ // this.categories.push({ name: "瀛︽湳娴佹淳" });
+ // let newArr = [];
+ // const data = this.changeLiterature(obj.schoolList, "schoolList");
+ // this.getPersonInfo(
+ // data,
+ // "schoolList",
+ // newArr,
+ // 1,
+ // 5,
+ // this.ownInfo
+ // );
+ // school = [...newArr];
+ // }
+ // }
+ // const personData = [
+ // ...kinData,
+ // ...teacher,
+ // ...literature,
+ // ...social,
+ // ...place,
+ // ...school
+ // ];
+
+ // personData.forEach((item) => {
+ // this.nodes.push({
+ // name: item.name,
+ // id: item.personId,
+ // ...item
+ // });
+ // let obj = {
+ // source: item.parentName,
+ // target: item.name,
+ // relation: item.relationTypeName || "" // 濡傛灉瀛樺湪 relationName 瀛楁鍒欎娇鐢紝鍚﹀垯涓虹┖瀛楃涓�
+ // };
+ // this.relationships.push(obj);
+ // });
+ // }
+
});
},
+ // 閫掑綊澶勭悊鎵�鏈夊眰绾ф暟鎹�
+ handleData(data, parent) {
+ for (let i = 0; i < data.length; i++) {
+ const item = data[i];
+ // 澶勭悊node/link
+ if (!parent) {
+ // 褰撳墠浜虹墿
+ item.mainId = item.personId + "_p";
+ const mainPerson = this.infoOfPersons.find(
+ (pItem) => pItem.id == item.personId
+ );
+ this.nodeDatas.push({
+ id: item.mainId,
+ name: mainPerson.NAME[0].content1,
+ itemStyle: {
+ color: "#244a7b"
+ }
+ });
+ } else {
+ switch (parent.thisType) {
+ case 1:
+ item.mainId = item.personId + "_p";
+ if (
+ this.nodeDatas.findIndex((cItem) => cItem.id == item.mainId) ==
+ -1
+ ) {
+ const p = this.infoOfPersons.find(
+ (pItem) => pItem.id == item.personId
+ );
+ if (p) {
+ this.nodeDatas.push({
+ id: item.mainId,
+ name: p.NAME[0].content1,
+ itemStyle: {
+ color: "#5470c6"
+ }
+ });
+ }
+ }
+ this.links.push({
+ source: item.mainId,
+ target: parent.mainId,
+ label: {
+ show: true,
+ formatter: item.relationTypeName,
+ color: "#2C2C2C",
+ fontSize: 14,
+ backgroundColor: "rgba(255, 255, 255, 1)",
+ padding: [3, 8],
+ borderRadius: 30,
+ position: "middle", // 璁剧疆鏍囩鏂囨湰鍦ㄧ嚎鐨勪腑闂翠綅缃笂灞呬腑鏄剧ず
+ distance: -10 // 灏嗘爣绛炬斁缃湪杩炴帴绾夸笂
+ }
+ });
+ break;
+ case 2:
+ item.mainId = item.literatureId + "_l";
+ if (
+ this.nodeDatas.findIndex((cItem) => cItem.id == item.mainId) ==
+ -1
+ ) {
+ this.nodeDatas.push({
+ id: item.mainId,
+ name: item.literatureName,
+ itemStyle: {
+ color: "#fac858"
+ }
+ });
+ }
+ this.links.push({
+ source: item.mainId,
+ target: parent.mainId
+ });
+ break;
+ case 3:
+ item.mainId = item.ancientName + "_a";
+ if (
+ this.nodeDatas.findIndex((cItem) => cItem.id == item.mainId) ==
+ -1
+ ) {
+ this.nodeDatas.push({
+ id: item.mainId,
+ name: item.ancientName,
+ itemStyle: {
+ color: "#ea7ccc"
+ }
+ });
+ }
+ this.links.push({
+ source: item.mainId,
+ target: parent.mainId
+ });
+ break;
+ case 4:
+ item.mainId = item.schoolId + "_s";
+ if (
+ this.nodeDatas.findIndex((cItem) => cItem.id == item.mainId) ==
+ -1
+ ) {
+ const s = this.infoOfSchools.find(
+ (sItem) => sItem.schoolId == item.schoolId
+ );
+ console.log(this.infoOfSchools);
+ console.log(item.schoolId);
+ console.log(s);
+ if (s) {
+ this.nodeDatas.push({
+ id: item.mainId,
+ name: s.name[0],
+ itemStyle: {
+ color: "#9a60b4"
+ }
+ });
+ }
+ }
+ this.links.push({
+ source: item.mainId,
+ target: parent.mainId
+ });
+ break;
+ case 5:
+ item.mainId = item.personId + "_p";
+ if (
+ this.nodeDatas.findIndex((cItem) => cItem.id == item.mainId) ==
+ -1
+ ) {
+ const p = this.infoOfPersons.find(
+ (pItem) => pItem.id == item.personId
+ );
+ if (p) {
+ this.nodeDatas.push({
+ id: item.mainId,
+ name: p.NAME[0].content1,
+ itemStyle: {
+ color: "#ee6666"
+ }
+ });
+ }
+ }
+ this.links.push({
+ source: item.mainId,
+ target: parent.mainId,
+ label: {
+ show: true,
+ formatter: item.relationTypeName,
+ color: "#2C2C2C",
+ fontSize: 14,
+ backgroundColor: "rgba(255, 255, 255, 1)",
+ padding: [3, 8],
+ borderRadius: 30,
+ position: "middle", // 璁剧疆鏍囩鏂囨湰鍦ㄧ嚎鐨勪腑闂翠綅缃笂灞呬腑鏄剧ず
+ distance: -10 // 灏嗘爣绛炬斁缃湪杩炴帴绾夸笂
+ }
+ });
+ break;
+ case 6:
+ item.mainId = item.personId + "_p";
+ if (
+ this.nodeDatas.findIndex((cItem) => cItem.id == item.mainId) ==
+ -1
+ ) {
+ const p = this.infoOfPersons.find(
+ (pItem) => pItem.id == item.personId
+ );
+ if (p) {
+ this.nodeDatas.push({
+ id: item.mainId,
+ name: p.NAME[0].content1,
+ itemStyle: {
+ color: "#3dae7b"
+ }
+ });
+ }
+ }
+ this.links.push({
+ source: item.mainId,
+ target: parent.mainId,
+ label: {
+ show: true,
+ formatter: item.relationTypeName,
+ color: "#2C2C2C",
+ fontSize: 14,
+ backgroundColor: "rgba(255, 255, 255, 1)",
+ padding: [3, 8],
+ borderRadius: 30,
+ position: "middle", // 璁剧疆鏍囩鏂囨湰鍦ㄧ嚎鐨勪腑闂翠綅缃笂灞呬腑鏄剧ず
+ distance: -10 // 灏嗘爣绛炬斁缃湪杩炴帴绾夸笂
+ }
+ });
+ break;
+ }
+ }
+
+ // 浜插睘鍏崇郴
+ if (item.kinList && item.kinList.length) {
+ this.handleData(item.kinList, { ...item, thisType: 1 });
+ }
+ // 鏂囩尞浣滃搧
+ if (item.literatureList && item.literatureList.length) {
+ this.handleData(item.literatureList, { ...item, thisType: 2 });
+ }
+ // 娲诲姩鍦�
+ if (item.placeList && item.placeList.length) {
+ this.handleData(item.placeList, { ...item, thisType: 3 });
+ }
+ // 瀛︽湳娴佹淳
+ if (item.schoolList && item.schoolList.length) {
+ this.handleData(item.schoolList, { ...item, thisType: 4 });
+ }
+ // 绀句細鍏崇郴
+ if (item.socialList && item.socialList.length) {
+ this.handleData(item.socialList, { ...item, thisType: 5 });
+ }
+ // 甯堟壙鍏崇郴
+ if (item.teacherStudentList && item.teacherStudentList.length) {
+ this.handleData(item.teacherStudentList, { ...item, thisType: 6 });
+ }
+ }
+ },
+
// 鍏崇郴鍥捐氨
relation() {
var chartDom = document.getElementById("relation");
var myChart = echarts.init(chartDom);
// 鍋囪鎮ㄦ湁鑺傜偣鍚嶇О鍜屽畠浠箣闂寸殑鍏崇郴鏁版嵁
- var nodes = this.deduplicateArray(this.nodes, "id");
- var relationships = this.relationships;
-
- nodes = nodes.map((item) => {
- let size = item.symbolSize;
- for (let i = 0; i < relationships.length; i++) {
- const linkItem = relationships[i];
- if (linkItem.source == item.parentName) {
+ this.nodeDatas = this.nodeDatas.map((item) => {
+ let size = 15;
+ for (let i = 0; i < this.links.length; i++) {
+ const linkItem = this.links[i];
+ if (linkItem.source == item.id) {
size += 5;
}
- if (linkItem.target == item.parentName) {
+ if (linkItem.target == item.id) {
size += 5;
}
}
return {
...item,
- symbolSize: size > 80 ? 80 : size,
+ symbolSize: size > 80 ? 80 : size
};
});
@@ -584,44 +877,6 @@
SymbolSize = 70;
Distance = 22;
}
- // 鏍规嵁鍏崇郴鏁版嵁鐢熸垚杩炴帴绾�
- var links = [];
- relationships.forEach((relationship, i) => {
- var sourceIndex = nodes.findIndex(
- (node) => node.parentName === relationship.source
- );
- var targetIndex = nodes.findIndex(
- (node) => node.name === relationship.target
- );
- if (relationship.relation) {
- if (sourceIndex !== -1 && targetIndex !== -1) {
- links.push({
- source: sourceIndex,
- target: targetIndex,
- label: {
- show: true,
- formatter: function (params) {
- // 浣跨敤鍑芥暟鍔ㄦ�佺敓鎴愭爣绛惧唴瀹�
- // return relationships.find(rel => rel.source === nodes[params.data
- // .source] && rel.target === nodes[params.data.target])
- // .relation;
- return relationship.relation;
- }, // 璁剧疆鍏崇郴鏍囩鍐呭涓�"Child-Parent"
- color: "#2C2C2C",
- fontSize: FontSize - 2,
- backgroundColor: "rgba(255, 255, 255, 1)",
- padding: [3, 8],
- borderRadius: 30,
- position: "middle", // 璁剧疆鏍囩鏂囨湰鍦ㄧ嚎鐨勪腑闂翠綅缃笂灞呬腑鏄剧ず
- // z: -1, // 璁剧疆鏍囩鐨剒杞撮珮搴︼紝浣垮叾姣旇繛鎺ョ嚎鏇撮珮
- distance: -10, // 灏嗘爣绛炬斁缃湪杩炴帴绾夸笂
- },
- });
- }
- }
- });
- // 鏍规嵁nodes鍔ㄦ�佺敓鎴愯妭鐐规暟鎹�
- var nodeData = nodes;
var option;
option = {
legend: [
@@ -631,8 +886,8 @@
orient: "vertical",
data: this.categories.map(function (a) {
return a.name;
- }),
- },
+ })
+ }
],
series: [
{
@@ -640,35 +895,37 @@
legendHoverLink: false,
layout: "force",
symbolSize: 15,
- data: nodeData,
- links: links,
- categories: this.categories,
+ data: this.nodeDatas,
+ links: this.links,
+ categories: [{
+
+ }],
roam: true,
label: {
show: true,
position: "right",
- formatter: "{b}",
+ formatter: "{b}"
},
scaleLimit: {
min: 0.4,
- max: 2,
+ max: 2
},
lineStyle: {
color: "source",
- curveness: 0.2,
+ curveness: 0.2
},
emphasis: {
focus: "adjacency",
lineStyle: {
- width: 5,
- },
+ width: 5
+ }
},
force: {
repulsion: 600,
- edgeLength: 300,
- },
- },
- ],
+ edgeLength: 300
+ }
+ }
+ ]
};
// 璁剧疆鐐瑰嚮浜嬩欢鐩戝惉
myChart.off("click");
@@ -710,7 +967,7 @@
i += 1;
return e["content" + i];
}).join("銆�") ?? "",
- biography: data?.BIOGRAPHY ?? "",
+ biography: data?.BIOGRAPHY ?? ""
};
this.detailData = obj;
},
@@ -739,7 +996,7 @@
academicSearch({
keyword: key,
page: this.personPageInfo.page,
- pageSize: this.personPageInfo.limit,
+ pageSize: this.personPageInfo.limit
}).then((res) => {
this.personList = res.list.map((item) => {
return {
@@ -760,7 +1017,7 @@
division:
item.medicalBranchList && item.medicalBranchList.length
? item.medicalBranchList[0].content1
- : "-",
+ : "-"
};
});
this.showPerson = true;
@@ -770,7 +1027,7 @@
spaceTimeArr(id) {
// 鍏崇郴鍥剧殑鏁版嵁
uni.navigateTo({
- url: "/pages/character/detail?id=" + id,
+ url: "/pages/character/detail?id=" + id
});
},
// 鑾峰彇鏈濅唬echarts鐨勬暟鎹�
@@ -794,7 +1051,7 @@
this.hotKeyList = indexList.map((item) => {
return {
id: item,
- name: res.object[item],
+ name: res.object[item]
};
});
});
@@ -809,8 +1066,8 @@
// document.querySelector(".fbox1").style.height = box1Height + "px";
// }
// });
- },
- },
+ }
+ }
};
</script>
@@ -947,4 +1204,21 @@
cursor: pointer;
}
}
+
+.selectActivelyBox {
+ cursor: pointer;
+ border: 1px solid #dcdfe6;
+ border-radius: 4px;
+ padding: 0 0.12rem;
+ font-size: 12px;
+ color: #c0c4cc;
+}
+
+.el-drawer__wrapper {
+ top: 0.86rem;
+}
+
+::v-deep .el-drawer__open .el-drawer.rtl {
+ width: 50% !important;
+}
</style>
--
Gitblit v1.9.1