From 5affb08b5ac61563b5237c6ed5beedffda073e66 Mon Sep 17 00:00:00 2001
From: YM <479443481@qq.com>
Date: 星期五, 19 七月 2024 18:55:08 +0800
Subject: [PATCH] Merge branch 'master' of http://182.92.203.7:2001/r/TCM_CharacterLibrary
---
src/pages/academicSchools/index.vue | 62 +++++++++++++++++++++----------
1 files changed, 42 insertions(+), 20 deletions(-)
diff --git a/src/pages/academicSchools/index.vue b/src/pages/academicSchools/index.vue
index edb01c5..0aab590 100644
--- a/src/pages/academicSchools/index.vue
+++ b/src/pages/academicSchools/index.vue
@@ -57,6 +57,20 @@
>
鏆傛棤鐩稿叧鏁版嵁
</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">
@@ -136,8 +150,12 @@
relationTypeName: ele.relationTypeName,
parentName: parent?.NAME[0]?.content1 ?? parent.parentName,
name2: personInfo?.NAME[0]?.content1,
- category: type
+ category: type,
+ symbolSize: order,
};
+ if (order > 80) {
+ order = 80;
+ }
if (str == "literatureList") {
obj.relationTypeName = ele.literatureName;
}
@@ -152,7 +170,7 @@
}
newArr.push(obj);
if (ele["kinList"] && ele["kinList"]?.length) {
- order++;
+ order += 15;
this.getPersonInfo(
ele["kinList"],
"kinList",
@@ -163,7 +181,7 @@
);
}
if (ele["teacherStudentList"] && ele["teacherStudentList"]?.length) {
- order++;
+ order += 15;
this.getPersonInfo(
ele["teacherStudentList"],
"teacherStudentList",
@@ -178,7 +196,7 @@
ele["literatureList"],
"literatureList"
);
- order++;
+ order += 15;
this.getPersonInfo(
data,
"literatureList",
@@ -191,7 +209,7 @@
if (ele["socialList"] && ele["socialList"]?.length) {
const data = this.changeLiterature(ele["socialList"], "socialList");
- order++;
+ order += 15;
this.getPersonInfo(
data,
"socialList",
@@ -203,12 +221,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",
@@ -281,7 +299,7 @@
let place = [];
let school = [];
if (res && res.success && res.object) {
- // console.log(res.object);
+
this.infoOfPersons = res.object?.infoOfPersons;
this.infoOfSchools = res.object?.infoOfSchools;
if (res.object?.personChain) {
@@ -369,6 +387,9 @@
school = [...newArr];
}
}
+ console.log(kinData);
+ console.log(kinData.map(item=>item.name2).join("銆�"));
+ debugger
const personData = [
...kinData,
...teacher,
@@ -489,13 +510,13 @@
var nodeData = nodes;
var option;
option = {
- backgroundColor: {
- type: "image",
- image: "/static/image/characterRelationBg.png",
- size: "100% 100%", // 鑳屾櫙鍥剧墖鐨勫昂瀵革紝鍙互鏄櫨鍒嗘瘮鎴栬�呭儚绱�
- position: "center center" // 鑳屾櫙鍥剧墖鐨勪綅缃紝鍙互鏄� top, bottom, middle 鎴栬�呯櫨鍒嗘瘮
- },
- tooltip: {},
+ // backgroundColor: {
+ // type: "image",
+ // image: "/static/image/characterRelationBg.png",
+ // size: "100% 100%", // 鑳屾櫙鍥剧墖鐨勫昂瀵革紝鍙互鏄櫨鍒嗘瘮鎴栬�呭儚绱�
+ // position: "center center", // 鑳屾櫙鍥剧墖鐨勪綅缃紝鍙互鏄� top, bottom, middle 鎴栬�呯櫨鍒嗘瘮
+ // },
+ // tooltip: {},
legend: [
{
left: 20,
@@ -509,7 +530,7 @@
series: [
{
type: "graph",
- legendHoverLink: true,
+ legendHoverLink: false,
layout: "force",
symbolSize: 15,
data: nodeData,
@@ -520,9 +541,6 @@
show: true,
position: "right",
formatter: "{b}"
- },
- labelLayout: {
- hideOverlap: true
},
scaleLimit: {
min: 0.4,
@@ -656,10 +674,14 @@
</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 {
--
Gitblit v1.9.1