From 2b06902e25978254f39bef49ed3cf6b1cab1c033 Mon Sep 17 00:00:00 2001
From: 杨磊 <505174330@qq.com>
Date: 星期五, 26 七月 2024 11:53:09 +0800
Subject: [PATCH] Merge branch 'master' of http://182.92.203.7:2001/r/TCM_CharacterLibrary
---
src/pages/academicSchools/index.vue | 189 ++++++++++++++++++++++++++--------------------
src/pages/Register/Register.vue | 4
src/pages/academicGenres/chart.vue | 2
src/api/index.js | 4
src/components/headNav/headNav.vue | 4
src/pages/index/index.vue | 4
src/pages/Login/Login.vue | 4
src/pages/academicGenres/index.vue | 2
src/pages/changePassword/changePassword.vue | 4
src/pages/academicGenres/detail.vue | 2
src/pages/knowledgeBase/knowledgeBase.vue | 15 +++
11 files changed, 133 insertions(+), 101 deletions(-)
diff --git a/src/api/index.js b/src/api/index.js
index 9f6ac7e..cff73ae 100644
--- a/src/api/index.js
+++ b/src/api/index.js
@@ -272,7 +272,7 @@
});
};
-// 瀛︽湳娴佹淳
+// 瀛︽湳鍥捐氨
export const getDynastyStatistics = () => {
return req1({
url: "/school/dynasty/statistics",
@@ -310,7 +310,7 @@
});
};
-// 鏌ヨ浜虹墿瀛︽湳娴佹淳
+// 鏌ヨ浜虹墿瀛︽湳鍥捐氨
export const getSchoolInfo = (id) => {
return req1({
url: "/person/chain/search/school?schoolId=" + id + "&maxStep=3",
diff --git a/src/components/headNav/headNav.vue b/src/components/headNav/headNav.vue
index 64c56dd..180027a 100644
--- a/src/components/headNav/headNav.vue
+++ b/src/components/headNav/headNav.vue
@@ -144,10 +144,10 @@
<span slot="title">瀹跺浼犳壙</span>
</el-menu-item>
<el-menu-item index="6">
- <span slot="title">瀛︽湳娴佹淳</span>
+ <span slot="title">瀛︽湳鍥捐氨</span>
</el-menu-item>
<el-menu-item index="3">
- <span slot="title">瀛︽湳鍥捐氨</span>
+ <span slot="title">瀛︽湳娴佹淳</span>
</el-menu-item>
<el-menu-item index="4">
<span slot="title">鍦板煙鍥捐氨</span>
diff --git a/src/pages/Login/Login.vue b/src/pages/Login/Login.vue
index bb49c2c..f118fc5 100644
--- a/src/pages/Login/Login.vue
+++ b/src/pages/Login/Login.vue
@@ -243,11 +243,11 @@
id: 2
},
{
- name: "瀛︽湳娴佹淳",
+ name: "瀛︽湳鍥捐氨",
id: 6
},
{
- name: "瀛︽湳鍥捐氨",
+ name: "瀛︽湳娴佹淳",
id: 3
},
{
diff --git a/src/pages/Register/Register.vue b/src/pages/Register/Register.vue
index 85cba92..63d83f8 100644
--- a/src/pages/Register/Register.vue
+++ b/src/pages/Register/Register.vue
@@ -301,11 +301,11 @@
id: 2
},
{
- name: "瀛︽湳娴佹淳",
+ name: "瀛︽湳鍥捐氨",
id: 6
},
{
- name: "瀛︽湳鍥捐氨",
+ name: "瀛︽湳娴佹淳",
id: 3
},
{
diff --git a/src/pages/academicGenres/chart.vue b/src/pages/academicGenres/chart.vue
index afae207..3cc5b8c 100644
--- a/src/pages/academicGenres/chart.vue
+++ b/src/pages/academicGenres/chart.vue
@@ -3,7 +3,7 @@
style="width: 100%; height: 100%; display: flex; flex-direction: column"
>
<!-- 椤堕儴瀵艰埅 -->
- <headNav :idIndex="3 + ''" text="瀛︽湳鍥捐氨" />
+ <headNav :idIndex="3 + ''" text="瀛︽湳娴佹淳" />
<view class="Midde flex">
<!-- <view class="MiddeBack">杩斿洖</view> -->
<el-button class="MiddeBack flex flex-center" @click="goBack"
diff --git a/src/pages/academicGenres/detail.vue b/src/pages/academicGenres/detail.vue
index 3b27a9b..e42a8b2 100644
--- a/src/pages/academicGenres/detail.vue
+++ b/src/pages/academicGenres/detail.vue
@@ -1,7 +1,7 @@
<template>
<view class="bag">
<!-- 椤堕儴瀵艰埅 -->
- <headNav idIndex="3" text="瀛︽湳鍥捐氨" />
+ <headNav idIndex="3" text="瀛︽湳娴佹淳" />
<view class="Midde flex">
<!-- <view class="MiddeBack">杩斿洖</view> -->
<el-button class="MiddeBack flex flex-center" @click="goBack"
diff --git a/src/pages/academicGenres/index.vue b/src/pages/academicGenres/index.vue
index 90a64e9..ebc146c 100644
--- a/src/pages/academicGenres/index.vue
+++ b/src/pages/academicGenres/index.vue
@@ -1,7 +1,7 @@
<template>
<view style="width: 100%;height: 100%;display: flex;flex-direction: column;">
<!-- 椤堕儴瀵艰埅 -->
- <headNav :idIndex="idIndex" text="瀛︽湳鍥捐氨" />
+ <headNav :idIndex="idIndex" text="瀛︽湳娴佹淳" />
<view id="line-chart" style="flex: 1;overflow: hidden;padding: 50px;"></view>
</view>
</template>
diff --git a/src/pages/academicSchools/index.vue b/src/pages/academicSchools/index.vue
index 1e8272e..c4735dc 100644
--- a/src/pages/academicSchools/index.vue
+++ b/src/pages/academicSchools/index.vue
@@ -2,7 +2,7 @@
<view
style="width: 100%; height: 100%; display: flex; flex-direction: column"
>
- <headNav :idIndex="'6'" text="瀛︽湳娴佹淳" />
+ <headNav :idIndex="'6'" text="瀛︽湳鍥捐氨" />
<!-- 楂樼骇鎼滅储 -->
<view
style="
@@ -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"
@@ -220,7 +229,7 @@
}
"
></i>
- <el-table :data="personList" style="width: 100%">
+ <el-table :data="personList" style="width: 100%" :max-height="600">
<el-table-column prop="name" label="濮撳悕">
<template slot-scope="scope">
<span
@@ -290,7 +299,7 @@
<p>鍖诲鍒嗙锛� {{ detailData.medicalBranch }}</p>
<p>灏忎紶锛歿{ detailData.biography }}</p>
</div>
- <div class="btn" @click="spaceTimeArr(detailData.id)">鏌ョ湅鏇村>>></div>
+ <div class="btn" @click="spaceTimeArr(detailData.id, 1)">鏌ョ湅鏇村>>></div>
</div>
<div id="schoolDialog" class="customDialog">
<div class="title">
@@ -303,7 +312,7 @@
<p>浠ｈ〃鎬ц憲浣滐細{{ detailData.works }}</p>
<p>瀛︽淳鎬濇兂锛� {{ detailData.thought }}</p>
</div>
- <div class="btn" @click="spaceTimeArr(detailData.id)">鏌ョ湅鏇村>>></div>
+ <div class="btn" @click="spaceTimeArr(detailData.id, 2)">鏌ョ湅鏇村>>></div>
</div>
<el-drawer
title="鍦板潃鍒楄〃"
@@ -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"
@@ -399,7 +408,7 @@
getSocialDistinction,
getDynastyAll,
getAdvancedData,
- getPlaceInfo,
+ getPlaceInfo
} from "@/api/index.js";
import * as echarts from "echarts";
export default {
@@ -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: {
@@ -454,14 +463,14 @@
page: 1,
currentPage: 1,
pageSize: 10,
- total: 0,
+ total: 0
},
showPerson: false,
personList: [],
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 {
@@ -606,15 +616,17 @@
page: 1,
currentPage: 1,
pageSize: 10,
- total: 0,
+ total: 0
};
+ this.formData.page = 1;
+ this.searchFun();
},
searchFun() {
const palceData = this.formData.actively?.map((item) => {
return {
ancientName: item.ancientName ?? "",
dynastyId: item.dynastyId,
- currentName: item.currentName,
+ currentName: item.currentName
};
});
let Obj = {
@@ -625,7 +637,7 @@
socialDistinctionIdList: this.formData.socialIdentity,
dynastyIdList: this.formData.period,
page: this.formData.page,
- pageSize: this.formData.pageSize,
+ pageSize: this.formData.pageSize
};
// // 鎼滅储
getAdvancedData(Obj).then((res) => {
@@ -712,7 +724,7 @@
}
});
return data;
- }).join() ?? "",
+ }).join() ?? ""
};
});
if (res?.npage) {
@@ -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) {
@@ -982,7 +994,7 @@
// place = [...newArr];
// }
// if (obj.schoolList?.length) {
- // this.categories.push({ name: "瀛︽湳娴佹淳" });
+ // this.categories.push({ name: "瀛︽湳鍥捐氨" });
// let newArr = [];
// const data = this.changeLiterature(obj.schoolList, "schoolList");
// this.getPersonInfo(
@@ -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;
}
@@ -1212,7 +1224,7 @@
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 });
}
@@ -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");
@@ -1344,6 +1356,8 @@
const e = params.event;
const div = document.getElementById("customDialog");
div.style.display = "block";
+ const div2 = document.getElementById("schoolDialog");
+ div2.style.display = "none";
div.style.left = e.offsetX + 50 + "px";
div.style.top = e.offsetY - 50 + "px";
const data = this.infoOfPersons?.find((i) => i.id == id);
@@ -1369,7 +1383,7 @@
i += 1;
return e["content" + i];
}).join("銆�") ?? "",
- biography: data?.BIOGRAPHY ?? ""
+ biography: data?.BIOGRAPHY ?? "",
};
this.detailData = obj;
}
@@ -1378,25 +1392,25 @@
const e = params.event;
const div = document.getElementById("schoolDialog");
div.style.display = "block";
+ const div2 = document.getElementById("customDialog");
+ div2.style.display = "none";
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,
+ id: 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.join("銆�")
: ""
};
this.detailData = obj;
@@ -1406,6 +1420,8 @@
closeDom() {
const div = document.getElementById("customDialog");
div.style.display = "none";
+ const div2 = document.getElementById("schoolDialog");
+ div2.style.display = "none";
},
// 鍩虹鎼滅储
@@ -1428,8 +1444,8 @@
searchPerson(key) {
academicSearch({
keyword: key,
- page: this.personPageInfo.page,
- pageSize: this.personPageInfo.limit
+ page: 1,
+ pageSize: 999
}).then((res) => {
this.personList = res.list.map((item) => {
return {
@@ -1450,7 +1466,7 @@
division:
item.medicalBranchList && item.medicalBranchList.length
? item.medicalBranchList[0].content1
- : "-"
+ : "-",
};
});
this.showPerson = true;
@@ -1458,11 +1474,18 @@
},
// 鍏崇郴鍥� 鐐瑰嚮閲岄潰鐨勫厓绱�
- spaceTimeArr(id) {
- // 鍏崇郴鍥剧殑鏁版嵁
- uni.navigateTo({
- url: "/pages/character/detail?id=" + id
- });
+ spaceTimeArr(id, type) {
+ if (type == 1) {
+ // 浜虹墿
+ uni.navigateTo({
+ url: "/pages/character/detail?id=" + id
+ });
+ } else {
+ // 瀛︽淳
+ uni.navigateTo({
+ url: "/pages/academicGenres/detail?id=" + id
+ });
+ }
},
// 鑾峰彇鏈濅唬echarts鐨勬暟鎹�
@@ -1487,7 +1510,7 @@
this.hotKeyList = indexList.map((item) => {
return {
id: item,
- name: res.object[item]
+ name: res.object[item],
};
});
});
@@ -1503,8 +1526,8 @@
// document.querySelector(".fbox1").style.height = box1Height + "px";
// }
// });
- }
- }
+ },
+ },
};
</script>
@@ -1630,7 +1653,7 @@
min-height: 240px;
display: none;
position: fixed;
- z-index: 99999999;
+ z-index: 9999999;
border-radius: 2px;
background: #fff;
}
diff --git a/src/pages/changePassword/changePassword.vue b/src/pages/changePassword/changePassword.vue
index 8eaf491..9489408 100644
--- a/src/pages/changePassword/changePassword.vue
+++ b/src/pages/changePassword/changePassword.vue
@@ -241,11 +241,11 @@
id: 2
},
{
- name: "瀛︽湳娴佹淳",
+ name: "瀛︽湳鍥捐氨",
id: 6
},
{
- name: "瀛︽湳鍥捐氨",
+ name: "瀛︽湳娴佹淳",
id: 3
},
{
diff --git a/src/pages/index/index.vue b/src/pages/index/index.vue
index 63770e5..10c5c47 100644
--- a/src/pages/index/index.vue
+++ b/src/pages/index/index.vue
@@ -202,11 +202,11 @@
id: 2,
},
{
- name: "瀛︽湳娴佹淳",
+ name: "瀛︽湳鍥捐氨",
id: 6,
},
{
- name: "瀛︽湳鍥捐氨",
+ name: "瀛︽湳娴佹淳",
id: 3,
},
{
diff --git a/src/pages/knowledgeBase/knowledgeBase.vue b/src/pages/knowledgeBase/knowledgeBase.vue
index 2c40043..111bf5d 100644
--- a/src/pages/knowledgeBase/knowledgeBase.vue
+++ b/src/pages/knowledgeBase/knowledgeBase.vue
@@ -340,7 +340,7 @@
label: "鏃舵湡",
name: "dynasty",
value: ""
- },
+ }
// {
// type: "select",
// label: "鏈烘瀯",
@@ -397,7 +397,8 @@
tagId: "",
official: "",
genderType: ""
- }
+ },
+ aSearchData: ""
};
},
onLoad(options) {
@@ -643,6 +644,9 @@
},
// 楂樼骇鎼滅储
async onSubmit(val) {
+ this.keywords = "";
+ this.hotAciveIndex = "";
+ this.aSearchData = val;
this.profession.index = Number(val.tagId);
this.profession.id = Number(val.tagId);
const currentDynasty = this.dynasty.list.find(
@@ -681,6 +685,7 @@
// 鍩虹鎼滅储
async onSearch(val, index) {
this.keywords = val.text;
+ this.aSearchData = "";
if (index !== undefined) {
this.keywords = "";
this.hotAciveIndex = index;
@@ -744,7 +749,11 @@
CurrentChange(val) {
if (this.CurrentPage != val) {
this.CurrentPage = val;
- this.onSearch({ text: this.keywords });
+ if (this.isAdvancedSearch) {
+ this.onSubmit(this.aSearchData);
+ } else {
+ this.onSearch({ text: this.keywords });
+ }
}
},
// 涓婁竴椤�
--
Gitblit v1.9.1