From 69be26c788c74998941b7b7260dabfe3577fc92f Mon Sep 17 00:00:00 2001
From: QYF-GitLab1 <1940665526@qq.com>
Date: 星期四, 25 七月 2024 15:44:31 +0800
Subject: [PATCH] Merge branch 'master' of http://182.92.203.7:2001/r/TCM_CharacterLibrary
---
src/pages/academicSchools/index.vue | 153 ++++++++++++++++++++++++--------------------------
1 files changed, 73 insertions(+), 80 deletions(-)
diff --git a/src/pages/academicSchools/index.vue b/src/pages/academicSchools/index.vue
index e8a2f12..6ee81fc 100644
--- a/src/pages/academicSchools/index.vue
+++ b/src/pages/academicSchools/index.vue
@@ -298,11 +298,10 @@
<span @click="closeDom">鍏抽棴</span>
</div>
<div class="content">
- <p>濮撳悕锛歿{ detailData.name }}</p>
- <p>鍒悕锛歿{ detailData.alias }}</p>
- <p>绫嶈疮锛歿{ detailData.nativePlace }}</p>
- <p>鍖诲鍒嗙锛� {{ detailData.medicalBranch }}</p>
- <p>灏忎紶锛歿{ detailData.biography }}</p>
+ <p>浠ｈ〃浜虹墿锛歿{ detailData.character }}</p>
+ <p>閲嶈鍖诲锛歿{ detailData.skilledDoctor }}</p>
+ <p>浠ｈ〃鎬ц憲浣滐細{{ detailData.works }}</p>
+ <p>瀛︽淳鎬濇兂锛� {{ detailData.thought }}</p>
</div>
<div class="btn" @click="spaceTimeArr(detailData.id)">鏌ョ湅鏇村>>></div>
</div>
@@ -421,28 +420,28 @@
// 鍒嗙被
categories: [
{
- name: "浜插睘鍏崇郴",
+ name: "浜插睘鍏崇郴"
},
{
- name: "甯堟壙鍏崇郴",
+ name: "甯堟壙鍏崇郴"
},
{
- name: "鏂囩尞浣滃搧",
+ name: "鏂囩尞浣滃搧"
},
{
- name: "绀句細鍏崇郴",
+ name: "绀句細鍏崇郴"
},
{
- name: "娲诲姩鍦�",
+ name: "娲诲姩鍦�"
},
{
- name: "瀛︽湳娴佹淳",
- },
+ name: "瀛︽湳娴佹淳"
+ }
],
// 褰撳墠浜虹墿淇℃伅
ownInfo: null,
detailData: {
- name: "",
+ name: ""
},
isAdvancedSearch: false,
formData: {
@@ -462,7 +461,7 @@
personPageInfo: {
totalCount: 0,
page: 1,
- limit: 10,
+ limit: 10
},
personTag: [],
socialDistinction: [],
@@ -481,7 +480,7 @@
infoOfPersons: [],
infoOfSchools: [],
nodeDatas: [],
- links: [],
+ links: []
};
},
mounted() {
@@ -527,7 +526,7 @@
return {
...item,
name: item.currentName,
- id: item.dynastyId,
+ id: item.dynastyId
};
});
this.formData.actively = data;
@@ -548,7 +547,7 @@
return {
...item,
name: item.currentName,
- id: item.dynastyId,
+ id: item.dynastyId
};
});
this.formData.actively = data;
@@ -559,7 +558,7 @@
getAddressList() {
const data = {
page: this.page,
- pageSize: this.pageSize,
+ pageSize: this.pageSize
};
if (this.dynastyId != "") {
data["dynastyId"] = this.dynastyId;
@@ -575,7 +574,7 @@
this.gridData = res?.list?.map((item, i) => {
return {
...item,
- index: i,
+ index: i
};
});
} else {
@@ -747,7 +746,7 @@
parentName: parent?.NAME[0]?.content1 ?? parent.parentName,
name: personInfo?.NAME[0]?.content1,
category: type,
- symbolSize: 15,
+ symbolSize: 15
};
if (order > 80) {
order = 80;
@@ -849,7 +848,7 @@
const data = item[str]?.map((e) => {
return {
...e,
- personId: item.personId,
+ personId: item.personId
};
});
if (ele[str] && data?.length) {
@@ -1038,8 +1037,8 @@
id: item.mainId,
name: mainPerson.NAME[0].content1,
itemStyle: {
- color: "#244a7b",
- },
+ color: "#244a7b"
+ }
});
} else {
switch (parent.thisType) {
@@ -1056,7 +1055,7 @@
this.nodeDatas.push({
category: 0,
id: item.mainId,
- name: p.NAME[0].content1,
+ name: p.NAME[0].content1
});
}
}
@@ -1072,8 +1071,8 @@
padding: [3, 8],
borderRadius: 30,
position: "middle", // 璁剧疆鏍囩鏂囨湰鍦ㄧ嚎鐨勪腑闂翠綅缃笂灞呬腑鏄剧ず
- distance: -10, // 灏嗘爣绛炬斁缃湪杩炴帴绾夸笂
- },
+ distance: -10 // 灏嗘爣绛炬斁缃湪杩炴帴绾夸笂
+ }
});
break;
case 2:
@@ -1085,12 +1084,12 @@
this.nodeDatas.push({
category: 2,
id: item.mainId,
- name: item.literatureName,
+ name: item.literatureName
});
}
this.links.push({
source: item.mainId,
- target: parent.mainId,
+ target: parent.mainId
});
break;
case 3:
@@ -1102,12 +1101,12 @@
this.nodeDatas.push({
category: 4,
id: item.mainId,
- name: item.ancientName,
+ name: item.ancientName
});
}
this.links.push({
source: item.mainId,
- target: parent.mainId,
+ target: parent.mainId
});
break;
case 4:
@@ -1123,13 +1122,13 @@
this.nodeDatas.push({
category: 5,
id: item.mainId,
- name: s.name[0],
+ name: s.name[0]
});
}
}
this.links.push({
source: item.mainId,
- target: parent.mainId,
+ target: parent.mainId
});
break;
case 5:
@@ -1145,7 +1144,7 @@
this.nodeDatas.push({
category: 3,
id: item.mainId,
- name: p.NAME[0].content1,
+ name: p.NAME[0].content1
});
}
}
@@ -1161,8 +1160,8 @@
padding: [3, 8],
borderRadius: 30,
position: "middle", // 璁剧疆鏍囩鏂囨湰鍦ㄧ嚎鐨勪腑闂翠綅缃笂灞呬腑鏄剧ず
- distance: -10, // 灏嗘爣绛炬斁缃湪杩炴帴绾夸笂
- },
+ distance: -10 // 灏嗘爣绛炬斁缃湪杩炴帴绾夸笂
+ }
});
break;
case 6:
@@ -1178,7 +1177,7 @@
this.nodeDatas.push({
category: 1,
id: item.mainId,
- name: p.NAME[0].content1,
+ name: p.NAME[0].content1
});
}
}
@@ -1194,8 +1193,8 @@
padding: [3, 8],
borderRadius: 30,
position: "middle", // 璁剧疆鏍囩鏂囨湰鍦ㄧ嚎鐨勪腑闂翠綅缃笂灞呬腑鏄剧ず
- distance: -10, // 灏嗘爣绛炬斁缃湪杩炴帴绾夸笂
- },
+ distance: -10 // 灏嗘爣绛炬斁缃湪杩炴帴绾夸笂
+ }
});
break;
}
@@ -1246,7 +1245,7 @@
}
return {
...item,
- symbolSize: size > 80 ? 80 : size,
+ symbolSize: size > 80 ? 80 : size
};
});
@@ -1280,8 +1279,8 @@
orient: "vertical",
data: this.categories.map(function (a) {
return a.name;
- }),
- },
+ })
+ }
],
series: [
{
@@ -1296,27 +1295,27 @@
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
+ }
+ }
],
color: [
"#5470c6",
@@ -1324,8 +1323,8 @@
"#fac858",
"#ee6666",
"#ea7ccc",
- "#9a60b4",
- ],
+ "#9a60b4"
+ ]
};
// 璁剧疆鐐瑰嚮浜嬩欢鐩戝惉
myChart.off("click");
@@ -1370,7 +1369,7 @@
i += 1;
return e["content" + i];
}).join("銆�") ?? "",
- biography: data?.BIOGRAPHY ?? "",
+ biography: data?.BIOGRAPHY ?? ""
};
this.detailData = obj;
}
@@ -1381,30 +1380,24 @@
div.style.display = "block";
div.style.left = e.offsetX + 50 + "px";
div.style.top = e.offsetY - 50 + "px";
- const data = this.infoOfPersons?.find((i) => i.id == id);
+ const data = this.infoOfSchools?.find((i) => i.schoolId == id);
+ console.log(data);
+ debugger
const obj = {
id: params.data.id,
- name:
- data?.NAME?.map((e, i) => {
- i += 1;
- return e["content" + i];
- }).join("銆�") ?? "",
- alias:
- data?.ALIAS?.map((e, i) => {
- i += 1;
- return e["content" + i];
- }).join("銆�") ?? "",
- nativePlace:
- data?.NATIVE_PLACE?.map((e, i) => {
- i += 1;
- return e["content" + i];
- }).join("銆�") ?? "",
- medicalBranch:
- data?.MEDICAL_BRANCH?.map((e, i) => {
- i += 1;
- return e["content" + i];
- }).join("銆�") ?? "",
- biography: data?.BIOGRAPHY ?? "",
+ name: data.name[0],
+ character: data.important_PEOPLE
+ ? data.important_PEOPLE.map((item) => item.content2).join("銆�")
+ : "",
+ skilledDoctor: data.important_PHYSICIAN
+ ? data.important_PHYSICIAN.map((item) => item.content2).join("銆�")
+ : "",
+ works: data.important_WORK
+ ? data.important_WORK.map((item) => item.content).join("銆�")
+ : "",
+ thought: data.school_THOUGHT
+ ? data.school_THOUGHT.map((item) => item.content).join("銆�")
+ : ""
};
this.detailData = obj;
}
@@ -1436,7 +1429,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 {
@@ -1457,7 +1450,7 @@
division:
item.medicalBranchList && item.medicalBranchList.length
? item.medicalBranchList[0].content1
- : "-",
+ : "-"
};
});
this.showPerson = true;
@@ -1468,7 +1461,7 @@
spaceTimeArr(id) {
// 鍏崇郴鍥剧殑鏁版嵁
uni.navigateTo({
- url: "/pages/character/detail?id=" + id,
+ url: "/pages/character/detail?id=" + id
});
},
@@ -1494,7 +1487,7 @@
this.hotKeyList = indexList.map((item) => {
return {
id: item,
- name: res.object[item],
+ name: res.object[item]
};
});
});
@@ -1510,8 +1503,8 @@
// document.querySelector(".fbox1").style.height = box1Height + "px";
// }
// });
- },
- },
+ }
+ }
};
</script>
--
Gitblit v1.9.1