From e00361c6bcbb1a56f6dcda22b91bdfcb2736e263 Mon Sep 17 00:00:00 2001
From: YM <479443481@qq.com>
Date: 星期五, 26 七月 2024 15:56:27 +0800
Subject: [PATCH] 1
---
src/pages/academicSchools/index.vue | 188 +++++++++++++++++++++++++---------------------
1 files changed, 102 insertions(+), 86 deletions(-)
diff --git a/src/pages/academicSchools/index.vue b/src/pages/academicSchools/index.vue
index a54811b..03b83bd 100644
--- a/src/pages/academicSchools/index.vue
+++ b/src/pages/academicSchools/index.vue
@@ -299,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">
@@ -312,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="鍦板潃鍒楄〃"
@@ -322,12 +322,12 @@
class="customDrawer"
>
<div class="drawerContent">
- <div class="drawerTips">閬镐腑鐨勫湴鍧�锛�</div>
+ <div class="drawerTips">閫変腑鐨勫湴鍧�锛�</div>
<div class="drawerTable">
<div class="tableTabs">
<div class="inputItem">
<el-input
- placeholder="璜嬭几鍏ュ湴鍚嶆悳绱�"
+ placeholder="璇疯緭鍏ュ湴鍚嶆悳绱�"
v-model="tableKey"
class="input-with-select"
@keyup.enter="searchAddress"
@@ -341,7 +341,7 @@
</el-input>
</div>
<div class="selectItem">
- <el-select v-model="dynastyId" placeholder="璜嬮伕鎿囨檪鏈�">
+ <el-select v-model="dynastyId" placeholder="璇烽�夋嫨鏃舵湡">
<el-option
v-for="item in dynastyData"
:key="item.dynastyId + '0'"
@@ -361,14 +361,14 @@
>
<el-table-column type="selection" width="55"> </el-table-column>
<el-table-column prop="currentName" label="鍦板悕"> </el-table-column>
- <el-table-column width="250" label="骞翠唬鍗�闁�">
+ <el-table-column width="250" label="骞翠唬鍖洪棿">
<template slot-scope="scope">{{
scope.row.start + "-" + scope.row.end
}}</template>
</el-table-column>
<el-table-column
prop="dynastyName"
- label="鏅傛湡"
+ label="鏃舵湡"
width="250"
show-overflow-tooltip
>
@@ -390,9 +390,9 @@
</el-pagination>
</div>
<div class="drawerBtn">
- <el-button @click="setCurrent">鍏ㄩ伕鐣跺墠闋�</el-button>
- <el-button @click="setCurrent('cancle')">鍙栨秷鍏ㄩ伕</el-button>
- <el-button @click="drawer = false" type="primary">纰哄畾</el-button>
+ <el-button @click="setCurrent">鍏ㄩ�夊綋鍓嶉〉</el-button>
+ <el-button @click="setCurrent('cancle')">鍙栨秷鍏ㄩ��</el-button>
+ <el-button @click="drawer = false" type="primary">纭畾</el-button>
</div>
</div>
</el-drawer>
@@ -408,7 +408,7 @@
getSocialDistinction,
getDynastyAll,
getAdvancedData,
- getPlaceInfo,
+ getPlaceInfo
} from "@/api/index.js";
import * as echarts from "echarts";
export default {
@@ -429,28 +429,28 @@
// 鍒嗙被
categories: [
{
- name: "浜插睘鍏崇郴",
+ name: "浜插睘鍏崇郴"
},
{
- name: "甯堟壙鍏崇郴",
+ name: "甯堟壙鍏崇郴"
},
{
- name: "鏂囩尞浣滃搧",
+ name: "鏂囩尞浣滃搧"
},
{
- name: "绀句細鍏崇郴",
+ name: "绀句細鍏崇郴"
},
{
- name: "娲诲姩鍦�",
+ name: "娲诲姩鍦�"
},
{
- name: "瀛︽湳鍥捐氨"
+ name: "瀛︽湳娴佹淳"
}
],
// 褰撳墠浜虹墿淇℃伅
ownInfo: null,
detailData: {
- name: "",
+ name: ""
},
isAdvancedSearch: false,
formData: {
@@ -463,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: [],
@@ -489,7 +489,7 @@
infoOfPersons: [],
infoOfSchools: [],
nodeDatas: [],
- links: [],
+ links: []
};
},
mounted() {
@@ -536,7 +536,7 @@
return {
...item,
name: item.currentName,
- id: item.dynastyId,
+ id: item.dynastyId
};
});
this.formData.actively = data;
@@ -557,7 +557,7 @@
return {
...item,
name: item.currentName,
- id: item.dynastyId,
+ id: item.dynastyId
};
});
this.formData.actively = data;
@@ -568,7 +568,7 @@
getAddressList() {
const data = {
page: this.page,
- pageSize: this.pageSize,
+ pageSize: this.pageSize
};
if (this.dynastyId != "") {
data["dynastyId"] = this.dynastyId;
@@ -584,7 +584,7 @@
this.gridData = res?.list?.map((item, i) => {
return {
...item,
- index: i,
+ index: i
};
});
} else {
@@ -616,7 +616,7 @@
page: 1,
currentPage: 1,
pageSize: 10,
- total: 0,
+ total: 0
};
this.formData.page = 1;
this.searchFun();
@@ -626,7 +626,7 @@
return {
ancientName: item.ancientName ?? "",
dynastyId: item.dynastyId,
- currentName: item.currentName,
+ currentName: item.currentName
};
});
let Obj = {
@@ -637,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) => {
@@ -724,7 +724,7 @@
}
});
return data;
- }).join() ?? "",
+ }).join() ?? ""
};
});
if (res?.npage) {
@@ -758,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;
@@ -860,7 +860,7 @@
const data = item[str]?.map((e) => {
return {
...e,
- personId: item.personId,
+ personId: item.personId
};
});
if (ele[str] && data?.length) {
@@ -1049,8 +1049,8 @@
id: item.mainId,
name: mainPerson.NAME[0].content1,
itemStyle: {
- color: "#244a7b",
- },
+ color: "#244a7b"
+ }
});
} else {
switch (parent.thisType) {
@@ -1067,7 +1067,7 @@
this.nodeDatas.push({
category: 0,
id: item.mainId,
- name: p.NAME[0].content1,
+ name: p.NAME[0].content1
});
}
}
@@ -1083,8 +1083,8 @@
padding: [3, 8],
borderRadius: 30,
position: "middle", // 璁剧疆鏍囩鏂囨湰鍦ㄧ嚎鐨勪腑闂翠綅缃笂灞呬腑鏄剧ず
- distance: -10, // 灏嗘爣绛炬斁缃湪杩炴帴绾夸笂
- },
+ distance: -10 // 灏嗘爣绛炬斁缃湪杩炴帴绾夸笂
+ }
});
break;
case 2:
@@ -1096,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:
@@ -1113,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:
@@ -1134,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:
@@ -1156,7 +1156,7 @@
this.nodeDatas.push({
category: 3,
id: item.mainId,
- name: p.NAME[0].content1,
+ name: p.NAME[0].content1
});
}
}
@@ -1172,8 +1172,8 @@
padding: [3, 8],
borderRadius: 30,
position: "middle", // 璁剧疆鏍囩鏂囨湰鍦ㄧ嚎鐨勪腑闂翠綅缃笂灞呬腑鏄剧ず
- distance: -10, // 灏嗘爣绛炬斁缃湪杩炴帴绾夸笂
- },
+ distance: -10 // 灏嗘爣绛炬斁缃湪杩炴帴绾夸笂
+ }
});
break;
case 6:
@@ -1189,7 +1189,7 @@
this.nodeDatas.push({
category: 1,
id: item.mainId,
- name: p.NAME[0].content1,
+ name: p.NAME[0].content1
});
}
}
@@ -1205,8 +1205,8 @@
padding: [3, 8],
borderRadius: 30,
position: "middle", // 璁剧疆鏍囩鏂囨湰鍦ㄧ嚎鐨勪腑闂翠綅缃笂灞呬腑鏄剧ず
- distance: -10, // 灏嗘爣绛炬斁缃湪杩炴帴绾夸笂
- },
+ distance: -10 // 灏嗘爣绛炬斁缃湪杩炴帴绾夸笂
+ }
});
break;
}
@@ -1257,7 +1257,7 @@
}
return {
...item,
- symbolSize: size > 80 ? 80 : size,
+ symbolSize: size > 80 ? 80 : size
};
});
@@ -1291,8 +1291,8 @@
orient: "vertical",
data: this.categories.map(function (a) {
return a.name;
- }),
- },
+ })
+ }
],
series: [
{
@@ -1307,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",
@@ -1335,8 +1335,8 @@
"#fac858",
"#ee6666",
"#ea7ccc",
- "#9a60b4",
- ],
+ "#9a60b4"
+ ]
};
// 璁剧疆鐐瑰嚮浜嬩欢鐩戝惉
myChart.off("click");
@@ -1356,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);
@@ -1381,7 +1383,7 @@
i += 1;
return e["content" + i];
}).join("銆�") ?? "",
- biography: data?.BIOGRAPHY ?? "",
+ biography: data?.BIOGRAPHY ?? ""
};
this.detailData = obj;
}
@@ -1390,11 +1392,13 @@
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);
const obj = {
- id: params.data.id,
+ id: id,
name: data.name[0],
character: data.important_people
? data.important_people.map((item) => item.personName).join("銆�")
@@ -1406,8 +1410,8 @@
? data.important_work.map((item) => item.literatureTitle).join("銆�")
: "",
thought: data.school_introduction
- ? data.school_introduction.map((item) => item).join("銆�")
- : "",
+ ? data.school_introduction.join("銆�")
+ : ""
};
this.detailData = obj;
}
@@ -1416,6 +1420,8 @@
closeDom() {
const div = document.getElementById("customDialog");
div.style.display = "none";
+ const div2 = document.getElementById("schoolDialog");
+ div2.style.display = "none";
},
// 鍩虹鎼滅储
@@ -1460,7 +1466,7 @@
division:
item.medicalBranchList && item.medicalBranchList.length
? item.medicalBranchList[0].content1
- : "-",
+ : "-"
};
});
this.showPerson = true;
@@ -1468,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鐨勬暟鎹�
@@ -1497,7 +1510,7 @@
this.hotKeyList = indexList.map((item) => {
return {
id: item,
- name: res.object[item],
+ name: res.object[item]
};
});
});
@@ -1513,8 +1526,8 @@
// document.querySelector(".fbox1").style.height = box1Height + "px";
// }
// });
- },
- },
+ }
+ }
};
</script>
@@ -1640,7 +1653,7 @@
min-height: 240px;
display: none;
position: fixed;
- z-index: 99;
+ z-index: 9999999;
border-radius: 2px;
background: #fff;
}
@@ -1713,16 +1726,17 @@
.hotSearch {
font-size: 0.12rem;
color: #2c2c2c;
+}
- li {
- color: #244a7b;
- margin: 0 0.1rem;
- color: #244a7b;
- &.active {
- color: #027edc;
- font-weight: bold;
- }
- }
+.hotSearch li {
+ color: #244a7b;
+ margin: 0 0.1rem;
+ color: #244a7b;
+}
+
+.hotSearch li.active {
+ color: #027edc;
+ font-weight: bold;
}
.searchDialog {
@@ -1744,7 +1758,10 @@
background: #fff;
border-radius: 6px;
box-shadow: 0 0 10px -3px #000;
- .closeBtn {
+
+}
+
+.personDialog .closeBtn {
position: absolute;
right: -10px;
top: -10px;
@@ -1756,7 +1773,6 @@
color: #f56c6c;
cursor: pointer;
}
-}
.selectActivelyBox {
cursor: pointer;
--
Gitblit v1.9.1