From 12d99c9a0dc366df61e10101b3e0821e1add6adb Mon Sep 17 00:00:00 2001
From: QYF-GitLab1 <1940665526@qq.com>
Date: 星期二, 23 七月 2024 17:40:13 +0800
Subject: [PATCH] 1
---
src/pages/academicSchools/index.vue | 376 ++++++++++++++++++++++++++++++++++++++++------------
1 files changed, 286 insertions(+), 90 deletions(-)
diff --git a/src/pages/academicSchools/index.vue b/src/pages/academicSchools/index.vue
index edb01c5..8ecc0ed 100644
--- a/src/pages/academicSchools/index.vue
+++ b/src/pages/academicSchools/index.vue
@@ -4,7 +4,14 @@
>
<headNav :idIndex="'6'" text="瀛︽湳娴佹淳" />
<!-- 楂樼骇鎼滅储 -->
- <view style="margin-left: 0.6rem; margin-top: 0.1rem; display: flex">
+ <view
+ style="
+ padding-left: 0.6rem;
+ margin-top: 0.1rem;
+ display: flex;
+ position: relative;
+ "
+ >
<advancedSearch
@onSearch="onSearch"
placehold="璇疯緭鍏ュ叧閿瓧"
@@ -32,10 +39,111 @@
v-for="(item, index) in hotKeyList"
:key="item"
>
- {{ item }}
+ {{ item.name }}
</li>
</ul>
</view>
+ <view v-if="isAdvancedSearch" class="searchDialog">
+ <h3 style="margin-bottom: 0.2rem">楂樼骇鎼滅储</h3>
+ <el-form label-width="100px" :model="formData" size="mini">
+ <el-row>
+ <el-col :span="8">
+ <el-form-item label="濮撳悕/鍒悕锛�">
+ <el-input v-model="formData.name"></el-input>
+ </el-form-item>
+ </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>
+ </el-form-item>
+ </el-col>
+ <el-col :span="8">
+ <el-form-item label="浣滃搧锛�">
+ <el-input v-model="formData.works"></el-input>
+ </el-form-item>
+ </el-col>
+ </el-row>
+ <el-row>
+ <el-col :span="8">
+ <el-form-item label="浜虹墿鏍囩锛�">
+ <el-select
+ style="width: 100%"
+ v-model="formData.personTags"
+ placeholder="璇烽�夋嫨浜虹墿鏍囩"
+ >
+ <!-- <el-option label="鍖哄煙涓�" value="shanghai"></el-option> -->
+ <!-- <el-option label="鍖哄煙浜�" value="beijing"></el-option> -->
+ </el-select>
+ </el-form-item>
+ </el-col>
+ <el-col :span="8">
+ <el-form-item label="绀句細韬唤锛�">
+ <el-select
+ style="width: 100%"
+ v-model="formData.socialIdentity"
+ placeholder="璇烽�夋嫨绀句細韬唤"
+ >
+ <!-- <el-option label="鍖哄煙涓�" value="shanghai"></el-option> -->
+ <!-- <el-option label="鍖哄煙浜�" value="beijing"></el-option> -->
+ </el-select>
+ </el-form-item>
+ </el-col>
+ <el-col :span="8">
+ <el-form-item label="鏃舵湡锛�">
+ <el-select
+ style="width: 100%"
+ v-model="formData.period"
+ placeholder="璇烽�夋嫨鏃舵湡"
+ >
+ <!-- <el-option label="鍖哄煙涓�" value="shanghai"></el-option> -->
+ <!-- <el-option label="鍖哄煙浜�" value="beijing"></el-option> -->
+ </el-select>
+ </el-form-item>
+ </el-col>
+ </el-row>
+ </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
+ class="el-icon-circle-close closeBtn"
+ @click="
+ () => {
+ showPerson = false;
+ }
+ "
+ ></i>
+ <el-table :data="personList" style="width: 100%">
+ <el-table-column prop="name" label="濮撳悕">
+ <template slot-scope="scope">
+ <span
+ style="color: #409eff; cursor: pointer"
+ @click="
+ () => {
+ currentId = scope.row.id;
+ getData();
+ }
+ "
+ >{{ scope.row.name }}</span
+ >
+ </template>
+ </el-table-column>
+ <el-table-column prop="age" label="鏃朵唬"> </el-table-column>
+ <el-table-column prop="nativePlace" label="绫嶈疮"> </el-table-column>
+ <el-table-column prop="alias" label="鍒悕"> </el-table-column>
+ <el-table-column prop="division" label="鍖诲鍒嗙"> </el-table-column>
+ </el-table>
+ </div>
</view>
<!-- 鍏崇郴琛ㄥ湴鍥� -->
@@ -57,6 +165,19 @@
>
鏆傛棤鐩稿叧鏁版嵁
</div>
+ <div
+ v-if="loading"
+ v-loading="loading"
+ style="
+ position: absolute;
+ top: 30%;
+ left: 0;
+ right: 0;
+ text-align: center;
+ font-size: 0.2rem;
+ color: #666;
+ "
+ ></div>
</div>
<div id="customDialog" class="customDialog">
<div class="title">
@@ -79,7 +200,8 @@
import {
getPersonData,
getHotSearch,
- getPDataStatistics
+ getPDataStatistics,
+ academicSearch,
} from "@/api/index.js";
import * as echarts from "echarts";
export default {
@@ -105,9 +227,24 @@
// 褰撳墠浜虹墿淇℃伅
ownInfo: null,
detailData: {
- name: ""
+ name: "",
},
- isAdvancedSearch: false
+ isAdvancedSearch: false,
+ formData: {
+ name: "",
+ actively: "",
+ works: "",
+ personTags: "",
+ socialIdentity: "",
+ period: ""
+ },
+ showPerson: false,
+ personList: [],
+ personPageInfo: {
+ totalCount: 0,
+ page: 1,
+ limit: 10,
+ },
};
},
mounted() {
@@ -132,12 +269,15 @@
const obj = {
personId: ele.personId,
parentId: parent.id,
- id2: personInfo.id,
relationTypeName: ele.relationTypeName,
parentName: parent?.NAME[0]?.content1 ?? parent.parentName,
- name2: personInfo?.NAME[0]?.content1,
- category: type
+ name: personInfo?.NAME[0]?.content1,
+ category: type,
+ symbolSize: 15,
};
+ if (order > 80) {
+ order = 80;
+ }
if (str == "literatureList") {
obj.relationTypeName = ele.literatureName;
}
@@ -152,7 +292,7 @@
}
newArr.push(obj);
if (ele["kinList"] && ele["kinList"]?.length) {
- order++;
+ order += 15;
this.getPersonInfo(
ele["kinList"],
"kinList",
@@ -163,7 +303,7 @@
);
}
if (ele["teacherStudentList"] && ele["teacherStudentList"]?.length) {
- order++;
+ order += 15;
this.getPersonInfo(
ele["teacherStudentList"],
"teacherStudentList",
@@ -178,7 +318,7 @@
ele["literatureList"],
"literatureList"
);
- order++;
+ order += 15;
this.getPersonInfo(
data,
"literatureList",
@@ -191,7 +331,7 @@
if (ele["socialList"] && ele["socialList"]?.length) {
const data = this.changeLiterature(ele["socialList"], "socialList");
- order++;
+ order += 15;
this.getPersonInfo(
data,
"socialList",
@@ -203,12 +343,12 @@
}
if (ele["placeList"] && ele["placeList"]?.length) {
const data = this.changeLiterature(ele["placeList"], "placeList");
- order++;
+ order += 15;
this.getPersonInfo(data, "placeList", newArr, order, 4, personInfo);
}
if (ele["schoolList"] && ele["schoolList"]?.length) {
const data = this.changeLiterature(ele["schoolList"], "schoolList");
- order++;
+ order += 15;
this.getPersonInfo(
data,
"schoolList",
@@ -229,16 +369,16 @@
if (!ele.personId && ele.personList?.length) {
ele.literatureList = [];
ele.personId = this.ownInfo.id;
- if (ele[str] && ele[str]?.length) {
- for (let j = 0; j < ele.personList.length; j++) {
- const item = ele.personList[j];
+ if (ele["personList"] && ele["personList"]?.length) {
+ for (let j = 0; j < ele["personList"].length; j++) {
+ const item = ele["personList"][j];
const data = item[str]?.map((e) => {
return {
...e,
- personId: item.personId
+ personId: item.personId,
};
});
- if (data?.length) {
+ if (ele[str] && data?.length) {
ele[str].push(...data);
}
}
@@ -247,6 +387,8 @@
}
return arr;
},
+
+ // 鏂囩尞
//鏁扮粍鍘婚噸
deduplicateArray(arr, idKey) {
@@ -272,6 +414,7 @@
getData() {
this.loading = true;
getPersonData(this.currentId).then((res) => {
+ console.log(res,'res')
this.nodes = [];
this.relationships = [];
let kinData = [];
@@ -281,9 +424,9 @@
let place = [];
let school = [];
if (res && res.success && res.object) {
- // console.log(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
@@ -331,7 +474,6 @@
this.ownInfo
);
literature = [...newArr];
- // console.log(literature, "literature");
}
if (obj.socialList?.length) {
let newArr = [];
@@ -375,43 +517,19 @@
...literature,
...social,
...place,
- ...school
+ ...school,
];
- // const k = personData.filter((item) => item.category == 0);
- // const t = personData.filter((item) => item.category == 1);
- // const l = personData.filter((item) => item.category == 2);
- // const o = personData.filter((item) => item.category == 3);
- // const p = personData.filter((item) => item.category == 4);
- // const s = personData.filter((item) => item.category == 5);
- // const nodesList = [...k, ...t, ...l, ...o, ...p, ...s];
- // console.log(nodesList);
+
personData.forEach((item) => {
- let exists1 = this.nodes.some(
- (node) =>
- node.id === item.parentId && node.name === item.parentName
- );
- let exists2 = this.nodes.some(
- (node) => node.id === item.parentId && node.name === item.name2
- );
- // 璇佹槑涓嶅瓨鍦�
- if (item.name1 && exists1 !== true) {
- this.nodes.push({
- name: item.parentName,
- id: item.parentId,
- ...item
- });
- }
- if (item.name2 && exists2 !== true) {
- this.nodes.push({
- name: item.name2,
- id: item.id2,
- ...item
- });
- }
+ this.nodes.push({
+ name: item.name,
+ id: item.personId,
+ ...item,
+ });
let obj = {
source: item.parentName,
- target: item.name2,
- relation: item.relationTypeName || "" // 濡傛灉瀛樺湪 relationName 瀛楁鍒欎娇鐢紝鍚﹀垯涓虹┖瀛楃涓�
+ target: item.name,
+ relation: item.relationTypeName || "", // 濡傛灉瀛樺湪 relationName 瀛楁鍒欎娇鐢紝鍚﹀垯涓虹┖瀛楃涓�
};
this.relationships.push(obj);
});
@@ -427,6 +545,23 @@
// 鍋囪鎮ㄦ湁鑺傜偣鍚嶇О鍜屽畠浠箣闂寸殑鍏崇郴鏁版嵁
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) {
+ size += 5;
+ }
+ if (linkItem.target == item.parentName) {
+ size += 5;
+ }
+ }
+ return {
+ ...item,
+ symbolSize: size > 80 ? 80 : size,
+ };
+ });
let FontSize = 12; // 瀛椾綋澶у皬
let BorderWidth = 2; // 杈规澶у皬
@@ -453,7 +588,7 @@
var links = [];
relationships.forEach((relationship, i) => {
var sourceIndex = nodes.findIndex(
- (node) => node.name === relationship.source
+ (node) => node.parentName === relationship.source
);
var targetIndex = nodes.findIndex(
(node) => node.name === relationship.target
@@ -479,8 +614,8 @@
borderRadius: 30,
position: "middle", // 璁剧疆鏍囩鏂囨湰鍦ㄧ嚎鐨勪腑闂翠綅缃笂灞呬腑鏄剧ず
// z: -1, // 璁剧疆鏍囩鐨剒杞撮珮搴︼紝浣垮叾姣旇繛鎺ョ嚎鏇撮珮
- distance: -10 // 灏嗘爣绛炬斁缃湪杩炴帴绾夸笂
- }
+ distance: -10, // 灏嗘爣绛炬斁缃湪杩炴帴绾夸笂
+ },
});
}
}
@@ -489,13 +624,6 @@
var nodeData = nodes;
var option;
option = {
- backgroundColor: {
- type: "image",
- image: "/static/image/characterRelationBg.png",
- size: "100% 100%", // 鑳屾櫙鍥剧墖鐨勫昂瀵革紝鍙互鏄櫨鍒嗘瘮鎴栬�呭儚绱�
- position: "center center" // 鑳屾櫙鍥剧墖鐨勪綅缃紝鍙互鏄� top, bottom, middle 鎴栬�呯櫨鍒嗘瘮
- },
- tooltip: {},
legend: [
{
left: 20,
@@ -503,13 +631,13 @@
orient: "vertical",
data: this.categories.map(function (a) {
return a.name;
- })
- }
+ }),
+ },
],
series: [
{
type: "graph",
- legendHoverLink: true,
+ legendHoverLink: false,
layout: "force",
symbolSize: 15,
data: nodeData,
@@ -519,31 +647,28 @@
label: {
show: true,
position: "right",
- formatter: "{b}"
- },
- labelLayout: {
- hideOverlap: true
+ 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");
@@ -585,7 +710,7 @@
i += 1;
return e["content" + i];
}).join("銆�") ?? "",
- biography: data?.BIOGRAPHY ?? ""
+ biography: data?.BIOGRAPHY ?? "",
};
this.detailData = obj;
},
@@ -595,26 +720,57 @@
},
// 鍩虹鎼滅储
onSearch(val, index) {
+ console.log(val);
if (index !== undefined) {
+ // 鐑棬鎼滅储鍏抽敭瀛楋紝鐩存帴鏌ヨ鏁版嵁
this.searchKey = "";
this.hotAciveIndex = index;
+ this.currentId = val.text.id;
+ this.getData();
} else {
this.hotAciveIndex = "";
+ // 鎼滅储鍏堟樉绀轰汉鐗╁垪琛�
+ this.personPageInfo.page = 1;
+ this.searchPerson(val.text);
}
- this.getData(val.text);
},
- // 鐐瑰嚮涓嬮潰鐨勬湞浠ｆ寜閽�
- dynastyBottomClick(item) {
- this.dynastyColor = item.id;
- this.onSearch({
- text: item.name
+ // 鏍规嵁鍏抽敭瀛楁绱汉鐗�
+ searchPerson(key) {
+ academicSearch({
+ keyword: key,
+ page: this.personPageInfo.page,
+ pageSize: this.personPageInfo.limit,
+ }).then((res) => {
+ this.personList = res.list.map((item) => {
+ return {
+ id: item.personId,
+ name: item.name,
+ age:
+ item.periodList && item.periodList.length
+ ? item.periodList[0].content2
+ : "-",
+ nativePlace:
+ item.nativePlaceList && item.nativePlaceList.length
+ ? item.nativePlaceList[0].content1
+ : "-",
+ alias:
+ item.aliasList && item.aliasList.length
+ ? item.aliasList[0].content2
+ : "-",
+ division:
+ item.medicalBranchList && item.medicalBranchList.length
+ ? item.medicalBranchList[0].content1
+ : "-",
+ };
+ });
+ this.showPerson = true;
});
},
// 鍏崇郴鍥� 鐐瑰嚮閲岄潰鐨勫厓绱�
spaceTimeArr(id) {
// 鍏崇郴鍥剧殑鏁版嵁
uni.navigateTo({
- url: "/pages/character/detail?id=" + id
+ url: "/pages/character/detail?id=" + id,
});
},
// 鑾峰彇鏈濅唬echarts鐨勬暟鎹�
@@ -636,7 +792,10 @@
const indexList = Object.keys(res.object);
indexList.sort((a, b) => parseInt(b) - parseInt(a));
this.hotKeyList = indexList.map((item) => {
- return res.object[item];
+ return {
+ id: item,
+ name: res.object[item],
+ };
});
});
},
@@ -651,15 +810,19 @@
// }
// });
},
- }
+ },
};
</script>
<style>
-#relatio {
+#relation {
width: 100%;
height: 100%;
position: relative;
+ background-image: url("../../static/image/characterRelationBg.png");
+ background-size: 100% 100%;
+ background-repeat: no-repeat;
+ background-position: center;
}
.customDialog {
@@ -751,4 +914,37 @@
}
}
}
+
+.searchDialog {
+ position: absolute;
+ top: 0.68rem;
+ left: 0;
+ right: 0;
+ z-index: 999;
+ padding: 0.1rem 0.4rem;
+ background: #fff;
+ min-height: 2rem;
+}
+
+.personDialog {
+ position: absolute;
+ top: 0.68rem;
+ z-index: 999;
+ padding: 0.1rem;
+ background: #fff;
+ border-radius: 6px;
+ box-shadow: 0 0 10px -3px #000;
+ .closeBtn {
+ position: absolute;
+ right: -10px;
+ top: -10px;
+ width: 24px;
+ height: 24px;
+ font-size: 24px;
+ background-color: #fff;
+ border-radius: 50%;
+ color: #f56c6c;
+ cursor: pointer;
+ }
+}
</style>
--
Gitblit v1.9.1