From f961a7e1d262afcc37b0743fcd9cec0f9fc1cbc2 Mon Sep 17 00:00:00 2001
From: QYF-GitLab1 <1940665526@qq.com>
Date: 星期五, 26 七月 2024 11:37:06 +0800
Subject: [PATCH] Merge branch 'master' of http://182.92.203.7:2001/r/TCM_CharacterLibrary
---
src/pages/academicSchools/index.vue | 140 +++++++++++++++++++++++++---------------------
1 files changed, 75 insertions(+), 65 deletions(-)
diff --git a/src/pages/academicSchools/index.vue b/src/pages/academicSchools/index.vue
index 0bb5433..a54811b 100644
--- a/src/pages/academicSchools/index.vue
+++ b/src/pages/academicSchools/index.vue
@@ -135,12 +135,21 @@
<el-button
size="mini"
style="background-color: #244a7b; color: #fff"
- @click="searchFun"
+ @click="
+ () => {
+ searchKey = '';
+ formData.page = 1;
+ searchFun();
+ }
+ "
>鎼滅储</el-button
>
<el-button size="mini" @click="resetForm">閲嶇疆</el-button>
</div>
</el-form>
+ <div style="font-size: 14px">
+ 娉�:褰撳墠鏁版嵁杈冨锛屽彲鑳戒細鍑虹幇鍗℃鐨勬儏鍐碉紝璇峰敖閲忕簿纭煡璇㈡垨鏌ョ湅鏌愪竴绫绘暟鎹叧绯�
+ </div>
<div class="fromTable">
<el-table
:data="tableData"
@@ -201,7 +210,7 @@
background
@size-change="handleSizeChangeForm"
@current-change="handleCurrentChangeForm"
- :current-page="formData.currentPage"
+ :current-page="formData.page"
:page-sizes="[10, 20, 60, 100]"
:page-size="formData.pageSize"
layout="total, sizes, prev, pager, next, jumper"
@@ -372,7 +381,7 @@
background
@size-change="handleSizeChange"
@current-change="handleCurrentChange"
- :current-page="currentPage"
+ :current-page="page"
:page-sizes="[10, 20, 60, 100]"
:page-size="pageSize"
layout="total, sizes, prev, pager, next, jumper"
@@ -420,19 +429,19 @@
// 鍒嗙被
categories: [
{
- name: "浜插睘鍏崇郴"
+ name: "浜插睘鍏崇郴",
},
{
- name: "甯堟壙鍏崇郴"
+ name: "甯堟壙鍏崇郴",
},
{
- name: "鏂囩尞浣滃搧"
+ name: "鏂囩尞浣滃搧",
},
{
- name: "绀句細鍏崇郴"
+ name: "绀句細鍏崇郴",
},
{
- name: "娲诲姩鍦�"
+ name: "娲诲姩鍦�",
},
{
name: "瀛︽湳鍥捐氨"
@@ -441,7 +450,7 @@
// 褰撳墠浜虹墿淇℃伅
ownInfo: null,
detailData: {
- name: ""
+ name: "",
},
isAdvancedSearch: false,
formData: {
@@ -461,7 +470,7 @@
personPageInfo: {
totalCount: 0,
page: 1,
- limit: 10
+ limit: 10,
},
personTag: [],
socialDistinction: [],
@@ -480,7 +489,7 @@
infoOfPersons: [],
infoOfSchools: [],
nodeDatas: [],
- links: []
+ links: [],
};
},
mounted() {
@@ -499,6 +508,7 @@
methods: {
// 鎼滅储鍦板潃
searchAddress() {
+ this.page = 1;
this.gridData = [];
this.getAddressList();
},
@@ -526,7 +536,7 @@
return {
...item,
name: item.currentName,
- id: item.dynastyId
+ id: item.dynastyId,
};
});
this.formData.actively = data;
@@ -547,7 +557,7 @@
return {
...item,
name: item.currentName,
- id: item.dynastyId
+ id: item.dynastyId,
};
});
this.formData.actively = data;
@@ -558,7 +568,7 @@
getAddressList() {
const data = {
page: this.page,
- pageSize: this.pageSize
+ pageSize: this.pageSize,
};
if (this.dynastyId != "") {
data["dynastyId"] = this.dynastyId;
@@ -574,7 +584,7 @@
this.gridData = res?.list?.map((item, i) => {
return {
...item,
- index: i
+ index: i,
};
});
} else {
@@ -608,6 +618,8 @@
pageSize: 10,
total: 0,
};
+ this.formData.page = 1;
+ this.searchFun();
},
searchFun() {
const palceData = this.formData.actively?.map((item) => {
@@ -746,7 +758,7 @@
parentName: parent?.NAME[0]?.content1 ?? parent.parentName,
name: personInfo?.NAME[0]?.content1,
category: type,
- symbolSize: 15
+ symbolSize: 15,
};
if (order > 80) {
order = 80;
@@ -848,7 +860,7 @@
const data = item[str]?.map((e) => {
return {
...e,
- personId: item.personId
+ personId: item.personId,
};
});
if (ele[str] && data?.length) {
@@ -1037,8 +1049,8 @@
id: item.mainId,
name: mainPerson.NAME[0].content1,
itemStyle: {
- color: "#244a7b"
- }
+ color: "#244a7b",
+ },
});
} else {
switch (parent.thisType) {
@@ -1055,7 +1067,7 @@
this.nodeDatas.push({
category: 0,
id: item.mainId,
- name: p.NAME[0].content1
+ name: p.NAME[0].content1,
});
}
}
@@ -1071,8 +1083,8 @@
padding: [3, 8],
borderRadius: 30,
position: "middle", // 璁剧疆鏍囩鏂囨湰鍦ㄧ嚎鐨勪腑闂翠綅缃笂灞呬腑鏄剧ず
- distance: -10 // 灏嗘爣绛炬斁缃湪杩炴帴绾夸笂
- }
+ distance: -10, // 灏嗘爣绛炬斁缃湪杩炴帴绾夸笂
+ },
});
break;
case 2:
@@ -1084,12 +1096,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:
@@ -1101,12 +1113,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:
@@ -1122,13 +1134,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:
@@ -1144,7 +1156,7 @@
this.nodeDatas.push({
category: 3,
id: item.mainId,
- name: p.NAME[0].content1
+ name: p.NAME[0].content1,
});
}
}
@@ -1160,8 +1172,8 @@
padding: [3, 8],
borderRadius: 30,
position: "middle", // 璁剧疆鏍囩鏂囨湰鍦ㄧ嚎鐨勪腑闂翠綅缃笂灞呬腑鏄剧ず
- distance: -10 // 灏嗘爣绛炬斁缃湪杩炴帴绾夸笂
- }
+ distance: -10, // 灏嗘爣绛炬斁缃湪杩炴帴绾夸笂
+ },
});
break;
case 6:
@@ -1177,7 +1189,7 @@
this.nodeDatas.push({
category: 1,
id: item.mainId,
- name: p.NAME[0].content1
+ name: p.NAME[0].content1,
});
}
}
@@ -1193,8 +1205,8 @@
padding: [3, 8],
borderRadius: 30,
position: "middle", // 璁剧疆鏍囩鏂囨湰鍦ㄧ嚎鐨勪腑闂翠綅缃笂灞呬腑鏄剧ず
- distance: -10 // 灏嗘爣绛炬斁缃湪杩炴帴绾夸笂
- }
+ distance: -10, // 灏嗘爣绛炬斁缃湪杩炴帴绾夸笂
+ },
});
break;
}
@@ -1245,7 +1257,7 @@
}
return {
...item,
- symbolSize: size > 80 ? 80 : size
+ symbolSize: size > 80 ? 80 : size,
};
});
@@ -1279,8 +1291,8 @@
orient: "vertical",
data: this.categories.map(function (a) {
return a.name;
- })
- }
+ }),
+ },
],
series: [
{
@@ -1295,27 +1307,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",
@@ -1323,8 +1335,8 @@
"#fac858",
"#ee6666",
"#ea7ccc",
- "#9a60b4"
- ]
+ "#9a60b4",
+ ],
};
// 璁剧疆鐐瑰嚮浜嬩欢鐩戝惉
myChart.off("click");
@@ -1369,7 +1381,7 @@
i += 1;
return e["content" + i];
}).join("銆�") ?? "",
- biography: data?.BIOGRAPHY ?? ""
+ biography: data?.BIOGRAPHY ?? "",
};
this.detailData = obj;
}
@@ -1381,23 +1393,21 @@
div.style.left = e.offsetX + 50 + "px";
div.style.top = e.offsetY - 50 + "px";
const data = this.infoOfSchools?.find((i) => i.schoolId == id);
- console.log(data);
- debugger
const obj = {
id: params.data.id,
name: data.name[0],
- character: data.important_PEOPLE
- ? data.important_PEOPLE.map((item) => item.content2).join("銆�")
+ character: data.important_people
+ ? data.important_people.map((item) => item.personName).join("銆�")
: "",
- skilledDoctor: data.important_PHYSICIAN
- ? data.important_PHYSICIAN.map((item) => item.content2).join("銆�")
+ skilledDoctor: data.important_physician
+ ? data.important_physician.map((item) => item.personName).join("銆�")
: "",
- works: data.important_WORK
- ? data.important_WORK.map((item) => item.content).join("銆�")
+ works: data.important_work
+ ? data.important_work.map((item) => item.literatureTitle).join("銆�")
: "",
- thought: data.school_THOUGHT
- ? data.school_THOUGHT.map((item) => item.content).join("銆�")
- : ""
+ thought: data.school_introduction
+ ? data.school_introduction.map((item) => item).join("銆�")
+ : "",
};
this.detailData = obj;
}
@@ -1450,7 +1460,7 @@
division:
item.medicalBranchList && item.medicalBranchList.length
? item.medicalBranchList[0].content1
- : "-"
+ : "-",
};
});
this.showPerson = true;
@@ -1461,7 +1471,7 @@
spaceTimeArr(id) {
// 鍏崇郴鍥剧殑鏁版嵁
uni.navigateTo({
- url: "/pages/character/detail?id=" + id
+ url: "/pages/character/detail?id=" + id,
});
},
@@ -1487,7 +1497,7 @@
this.hotKeyList = indexList.map((item) => {
return {
id: item,
- name: res.object[item]
+ name: res.object[item],
};
});
});
@@ -1503,8 +1513,8 @@
// document.querySelector(".fbox1").style.height = box1Height + "px";
// }
// });
- }
- }
+ },
+ },
};
</script>
@@ -1630,7 +1640,7 @@
min-height: 240px;
display: none;
position: fixed;
- z-index: 99999999;
+ z-index: 99;
border-radius: 2px;
background: #fff;
}
--
Gitblit v1.9.1