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 | 123 +++---
src/pages/character/detail.vue | 342 +++++++++---------
src/pages/academicGenres/chart.vue | 60 +-
src/pages/character/index.vue | 19
src/components/footer/footer.vue | 2
src/pages/inherit/index.vue | 18
src/pages/index/index.vue | 143 +++----
src/pages/changePassword/changePassword.vue | 72 +--
src/pages/academicGenres/detail.vue | 110 +++---
src/pages/forgetPass/forgetPass.vue | 65 +-
src/pages/knowledgeBase/knowledgeBase.vue | 69 ++-
11 files changed, 513 insertions(+), 510 deletions(-)
diff --git a/src/components/footer/footer.vue b/src/components/footer/footer.vue
index ec656e9..1c20837 100644
--- a/src/components/footer/footer.vue
+++ b/src/components/footer/footer.vue
@@ -65,7 +65,7 @@
/* left: 0px; */
bottom: 0px;
left: 0;
- z-index: 999999999999999999999999999999999999999999;
+ z-index: 9999999999;
padding: 0.19rem 0;
width: 100%;
background-color: #e6eff8;
diff --git a/src/pages/academicGenres/chart.vue b/src/pages/academicGenres/chart.vue
index 3cc5b8c..7d98e9a 100644
--- a/src/pages/academicGenres/chart.vue
+++ b/src/pages/academicGenres/chart.vue
@@ -389,17 +389,17 @@
.NavTop {
background-color: #0c274c;
padding: 25rpx;
+}
+.NavTop img {
+ width: 30rpx;
+ height: 30rpx;
+ vertical-align: middle;
+}
+
+.NavTop .NavTopr {
img {
- width: 30rpx;
- height: 30rpx;
- vertical-align: middle;
- }
-
- .NavTopr {
- img {
- margin-right: 10rpx;
- }
+ margin-right: 10rpx;
}
}
@@ -411,30 +411,30 @@
padding: 0.18rem 0.23rem 0;
align-items: flex-start;
height: 1.43rem;
+}
- view {
- color: #000;
- }
+.Midde view {
+ color: #000;
+}
- .MiddeBack {
- width: 0.6rem;
- height: 0.24rem;
- font-size: 0.12rem;
- padding: 0;
- border-radius: 0;
- border: 1px solid #9e9e9e;
- color: #000;
- }
+.Midde .MiddeBack {
+ width: 0.6rem;
+ height: 0.24rem;
+ font-size: 0.12rem;
+ padding: 0;
+ border-radius: 0;
+ border: 1px solid #9e9e9e;
+ color: #000;
+}
- .Lists {
- li {
- width: 0.96rem;
- height: 0.3rem;
- border: 1px solid #597aa5;
- line-height: 0.3rem;
- text-align: center;
- font-size: 0.14rem;
- }
+.Midde .Lists {
+ li {
+ width: 0.96rem;
+ height: 0.3rem;
+ border: 1px solid #597aa5;
+ line-height: 0.3rem;
+ text-align: center;
+ font-size: 0.14rem;
}
}
diff --git a/src/pages/academicGenres/detail.vue b/src/pages/academicGenres/detail.vue
index e42a8b2..e3a5388 100644
--- a/src/pages/academicGenres/detail.vue
+++ b/src/pages/academicGenres/detail.vue
@@ -307,17 +307,17 @@
.NavTop {
background-color: #0c274c;
padding: 25rpx;
+}
+.NavTop img {
+ width: 30rpx;
+ height: 30rpx;
+ vertical-align: middle;
+}
+
+.NavTop .NavTopr {
img {
- width: 30rpx;
- height: 30rpx;
- vertical-align: middle;
- }
-
- .NavTopr {
- img {
- margin-right: 10rpx;
- }
+ margin-right: 10rpx;
}
}
@@ -328,66 +328,64 @@
padding: 0.18rem 0.23rem 0;
align-items: flex-start;
height: 1.43rem;
+}
- view {
- color: #000;
- }
+.Midde view {
+ color: #000;
+}
- .MiddeBack {
- width: 0.6rem;
- height: 0.24rem;
- font-size: 0.12rem;
- padding: 0;
- border-radius: 0;
- border: 1px solid #9e9e9e;
- color: #000;
- }
+.Midde .MiddeBack {
+ width: 0.6rem;
+ height: 0.24rem;
+ font-size: 0.12rem;
+ padding: 0;
+ border-radius: 0;
+ border: 1px solid #9e9e9e;
+ color: #000;
+}
- .Lists {
- li {
- width: 0.96rem;
- height: 0.3rem;
- border: 1px solid #597aa5;
- line-height: 0.3rem;
- text-align: center;
- font-size: 0.14rem;
- }
- }
+.Midde .Lists li {
+ width: 0.96rem;
+ height: 0.3rem;
+ border: 1px solid #597aa5;
+ line-height: 0.3rem;
+ text-align: center;
+ font-size: 0.14rem;
}
.Bottom {
overflow: hidden;
padding: 0.39rem 1.21rem !important;
+}
- .Bottom_top {
- justify-content: flex-start;
- align-items: flex-start;
- padding: 0 1.59rem;
+.Bottom .Bottom_top {
+ justify-content: flex-start;
+ align-items: flex-start;
+ padding: 0 1.59rem;
+}
- .BBimage {
- width: 4rem;
- height: 2rem;
- margin-right: 0.49rem;
- }
+.Bottom .Bottom_top .BBimage {
+ width: 4rem;
+ height: 2rem;
+ margin-right: 0.49rem;
+}
- .author {
- flex: 1;
- overflow: hidden;
- color: #000;
+.Bottom .Bottom_top .author {
+ flex: 1;
+ overflow: hidden;
+ color: #000;
+}
- li {
- line-height: 0.22rem;
- font-size: 0.14rem;
- margin-top: 0.18rem;
- color: #2c2c2c;
- }
- }
- }
+.Bottom .Bottom_top .author li {
+ line-height: 0.22rem;
+ font-size: 0.14rem;
+ margin-top: 0.18rem;
+ color: #2c2c2c;
+}
- .BBimage {
- width: 50%;
- height: 350rpx;
- }
+.BBimage {
+ width: 50%;
+ height: 350rpx;
}
.Bottom_Bot {
diff --git a/src/pages/academicSchools/index.vue b/src/pages/academicSchools/index.vue
index 2d1985b..03b83bd 100644
--- a/src/pages/academicSchools/index.vue
+++ b/src/pages/academicSchools/index.vue
@@ -429,19 +429,19 @@
// 鍒嗙被
categories: [
{
- name: "浜插睘鍏崇郴",
+ name: "浜插睘鍏崇郴"
},
{
- name: "甯堟壙鍏崇郴",
+ name: "甯堟壙鍏崇郴"
},
{
- name: "鏂囩尞浣滃搧",
+ name: "鏂囩尞浣滃搧"
},
{
- name: "绀句細鍏崇郴",
+ name: "绀句細鍏崇郴"
},
{
- name: "娲诲姩鍦�",
+ name: "娲诲姩鍦�"
},
{
name: "瀛︽湳娴佹淳"
@@ -450,7 +450,7 @@
// 褰撳墠浜虹墿淇℃伅
ownInfo: null,
detailData: {
- name: "",
+ name: ""
},
isAdvancedSearch: false,
formData: {
@@ -470,7 +470,7 @@
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 {
@@ -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");
@@ -1383,7 +1383,7 @@
i += 1;
return e["content" + i];
}).join("銆�") ?? "",
- biography: data?.BIOGRAPHY ?? "",
+ biography: data?.BIOGRAPHY ?? ""
};
this.detailData = obj;
}
@@ -1466,7 +1466,7 @@
division:
item.medicalBranchList && item.medicalBranchList.length
? item.medicalBranchList[0].content1
- : "-",
+ : "-"
};
});
this.showPerson = true;
@@ -1510,7 +1510,7 @@
this.hotKeyList = indexList.map((item) => {
return {
id: item,
- name: res.object[item],
+ name: res.object[item]
};
});
});
@@ -1526,8 +1526,8 @@
// document.querySelector(".fbox1").style.height = box1Height + "px";
// }
// });
- },
- },
+ }
+ }
};
</script>
@@ -1726,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 {
@@ -1757,7 +1758,10 @@
background: #fff;
border-radius: 6px;
box-shadow: 0 0 10px -3px #000;
- .closeBtn {
+
+}
+
+.personDialog .closeBtn {
position: absolute;
right: -10px;
top: -10px;
@@ -1769,7 +1773,6 @@
color: #f56c6c;
cursor: pointer;
}
-}
.selectActivelyBox {
cursor: pointer;
diff --git a/src/pages/changePassword/changePassword.vue b/src/pages/changePassword/changePassword.vue
index 9489408..95ff854 100644
--- a/src/pages/changePassword/changePassword.vue
+++ b/src/pages/changePassword/changePassword.vue
@@ -5,8 +5,8 @@
class="Ttop flex flex-center flex-wrap"
style="flex-direction: column"
>
- <view ></view>
- <view ref="Rtop">
+ <view></view>
+ <view ref="Rtop">
<text class="login"></text>
<text
style="
@@ -51,7 +51,7 @@
</view>
</view>
<el-form
- :label-width="160"
+ :label-width="160"
:hide-required-asterisk="true"
ref="formLogin2"
label-position="right"
@@ -251,7 +251,7 @@
{
name: "鍦板煙鍥捐氨",
id: 4
- },
+ }
// {
// name: "涓尰鍖讳簨鍒跺害",
// id: 5
@@ -292,7 +292,7 @@
// alert('submit!鎴愬姛');
getchangePassword(Obj).then((res) => {
if (res.success == true) {
- this.$message.success('淇敼鎴愬姛');
+ this.$message.success("淇敼鎴愬姛");
uni.navigateTo({
url: "/pages/Login/Login"
});
@@ -463,7 +463,6 @@
width: 88px;
color: #244a7b;
font-size: 0.14rem;
-
}
::v-deep .el-form-item {
@@ -497,25 +496,25 @@
height: 100vh;
color: #fff;
+}
- .repository {
- width: 100% !important;
- /* margin-top: 19px; */
- /* height: 68%; */
- display: flex;
- flex-direction: column;
- justify-content: space-around;
- align-items: center;
+.container .repository {
+ width: 100% !important;
+ /* margin-top: 19px; */
+ /* height: 68%; */
+ display: flex;
+ flex-direction: column;
+ justify-content: space-around;
+ align-items: center;
- .Ttop {
- margin-top: 0.38rem;
- margin-bottom: 1.22rem;
- }
+ .Ttop {
+ margin-top: 0.38rem;
+ margin-bottom: 1.22rem;
+ }
- .r-top {
- font-size: 40rpx !important;
- margin: 10rpx 0;
- }
+ .r-top {
+ font-size: 40rpx !important;
+ margin: 10rpx 0;
}
}
@@ -572,21 +571,20 @@
/* flex-wrap: wrap; */
padding: 0 20px;
text-align: center;
-
- li {
- background-color: #fff;
- color: black;
- height: 600rpx;
- display: flex;
- justify-content: space-between;
- flex-direction: column;
- align-items: center;
- border: 1rpx solid #fff;
- padding: 50rpx 65rpx;
- /* padding: 58rpx 128rpx 88rpx; */
- text-align: center;
- background: #ebf4ff;
- }
+}
+.secretary li {
+ background-color: #fff;
+ color: black;
+ height: 600rpx;
+ display: flex;
+ justify-content: space-between;
+ flex-direction: column;
+ align-items: center;
+ border: 1rpx solid #fff;
+ padding: 50rpx 65rpx;
+ /* padding: 58rpx 128rpx 88rpx; */
+ text-align: center;
+ background: #ebf4ff;
}
.Bbottom {
diff --git a/src/pages/character/detail.vue b/src/pages/character/detail.vue
index 1ba522f..d4c28cb 100644
--- a/src/pages/character/detail.vue
+++ b/src/pages/character/detail.vue
@@ -289,7 +289,7 @@
<span>鐩稿叧闄勮〃/鍥惧儚</span>
</div>
<view>
- <div style="overflow: auto;display: flex;">
+ <div style="overflow: auto; display: flex">
<div v-for="item in imageList" :key="item" :title="item.name">
<el-image
:title="item.name"
@@ -418,7 +418,7 @@
getPersonWritings,
getPersonRelationAtSchool,
getSpaceTime,
- getDynastyData,
+ getDynastyData
} from "@/api/index.js";
import { getImg } from "@/static/tool.js";
import L from "leaflet";
@@ -426,7 +426,7 @@
export default {
components: {
- Table1,
+ Table1
},
data() {
return {
@@ -447,62 +447,62 @@
tableColumns1: [
{
prop: "a",
- label: "姝ｄ功鍚�",
+ label: "姝ｄ功鍚�"
},
{
prop: "e",
- label: "浣滆��",
+ label: "浣滆��"
},
{
prop: "b",
- label: "钁椾綔骞�",
+ label: "钁椾綔骞�"
},
{
prop: "c",
- label: "钁椾綔鏂瑰紡",
+ label: "钁椾綔鏂瑰紡"
},
{
prop: "d",
- label: "鎬荤洰鍒嗙被",
- },
+ label: "鎬荤洰鍒嗙被"
+ }
],
tableColumns2: [
{
prop: "a",
- label: "鍏崇郴浜�",
+ label: "鍏崇郴浜�"
},
{
prop: "b",
- label: "鍏崇郴绫诲瀷",
+ label: "鍏崇郴绫诲瀷"
},
{
prop: "c",
- label: "鑰冩嵁",
+ label: "鑰冩嵁"
},
{
prop: "d",
width: 300,
showOverflowTooltip: true,
- label: "鍑哄",
- },
+ label: "鍑哄"
+ }
],
tableColumns3: [
{
prop: "a",
- label: "娲诲姩鏃堕棿鍖洪棿",
+ label: "娲诲姩鏃堕棿鍖洪棿"
},
{
prop: "b",
- label: "娲诲姩鍚嶇О",
+ label: "娲诲姩鍚嶇О"
},
{
prop: "c",
- label: "娲诲姩鍦扮偣",
+ label: "娲诲姩鍦扮偣"
},
{
prop: "d",
- label: "娲诲姩鎻忚堪",
- },
+ label: "娲诲姩鎻忚堪"
+ }
],
tableData1: [],
tableData2: [],
@@ -512,7 +512,7 @@
nodes: [],
relationships: [],
personResearchList: [],
- markerList: [],
+ markerList: []
};
},
onLoad(options) {
@@ -557,7 +557,7 @@
document.body.removeChild(textarea);
this.$message({
message: "澶嶅埗鎴愬姛锛�",
- type: "success",
+ type: "success"
});
},
toLink(item) {
@@ -572,7 +572,7 @@
// 鍩烘湰淇℃伅
getPersonInfo({
id: this.detailId,
- type: "PERSON_BASIC",
+ type: "PERSON_BASIC"
}).then((res) => {
const obj = {};
if (
@@ -590,7 +590,7 @@
this.detailInfo = obj;
getDynastyAll().then((dynastyData) => {
getWebBasic({
- personId: this.detailId,
+ personId: this.detailId
}).then((res) => {
const obj = res.object;
if (obj.school) {
@@ -609,7 +609,7 @@
//鐜颁唬鐮旂┒
getPersonInfo({
id: this.detailId,
- type: "PERSON_RESEARCH",
+ type: "PERSON_RESEARCH"
}).then((res) => {
this.personResearchList = res.object.personResearchList;
});
@@ -617,7 +617,7 @@
// 娲诲姩骞磋氨
getPersonInfo({
id: this.detailId,
- type: "PERSON_SPACE_TIME",
+ type: "PERSON_SPACE_TIME"
}).then((res) => {
if (res.object.personSpaceTimeList) {
this.tableData5 = res.object.personSpaceTimeList.map((item) => {
@@ -625,7 +625,7 @@
a: item.time,
b: item.activityName,
c: item.activityAddrOld,
- d: item.desc,
+ d: item.desc
};
});
}
@@ -637,15 +637,15 @@
list: [
{
name: "濮撳悕",
- value: obj.name || "-",
+ value: obj.name || "-"
},
{
name: "瀛�",
- value: obj.zi || "-",
+ value: obj.zi || "-"
},
{
name: "鍙�",
- value: obj.hao || "-",
+ value: obj.hao || "-"
},
{
name: "鎵�澶勬椂鏈�",
@@ -656,25 +656,25 @@
uni.navigateTo({
url:
"/pages/knowledgeBase/knowledgeBase?dynasty=" +
- obj.dynastyId,
+ obj.dynastyId
});
- },
+ }
},
{
name: "姘戞棌",
- value: obj.ethnic || "-",
- },
- ],
+ value: obj.ethnic || "-"
+ }
+ ]
},
{
list: [
{
name: "绫嶈疮",
- value: obj.native || "-",
+ value: obj.native || "-"
},
{
name: "鎬у埆",
- value: obj.gender || "-",
+ value: obj.gender || "-"
},
{
name: "鑱屽畼",
@@ -683,9 +683,9 @@
uni.navigateTo({
url:
"/pages/knowledgeBase/knowledgeBase?isAdvancedSearch=1&official=" +
- obj.official,
+ obj.official
});
- },
+ }
},
{
name: "娴佹淳",
@@ -695,38 +695,38 @@
sres.object.school_NAME &&
sres.object.school_NAME.length
? sres.object.school_NAME[0].content
- : "-",
+ : "-"
},
{
name: "瀛︽湳鐗圭偣",
- value: obj.features || "-",
- },
- ],
- },
+ value: obj.features || "-"
+ }
+ ]
+ }
];
},
getSourceData() {
getSource({
- personId: this.detailId,
+ personId: this.detailId
}).then((res) => {
this.sourceDataList = res.list;
});
},
getImages() {
getPersonImages({
- personId: this.detailId,
+ personId: this.detailId
}).then((res) => {
this.imageList = res.list.map((item) => {
return {
src: getImg(item.filePath),
- name: item.desc,
+ name: item.desc
};
});
});
},
getBiog() {
getPersonBiog({
- personId: this.detailId,
+ personId: this.detailId
}).then((res) => {
this.biogData = res.list.map((item) => {
return {
@@ -735,14 +735,14 @@
"銆�" +
item.bookName +
"銆� " +
- (item.pageNo ? "P " + item.pageNo : ""), // 杩欓噷鍙湁bookid鏃犳硶鍖归厤鍒颁功鍚�
+ (item.pageNo ? "P " + item.pageNo : "") // 杩欓噷鍙湁bookid鏃犳硶鍖归厤鍒颁功鍚�
};
});
});
},
getBiog() {
getPersonBiog({
- personId: this.detailId,
+ personId: this.detailId
}).then((res) => {
this.biogData = res.list.map((item) => {
return {
@@ -751,14 +751,14 @@
"銆�" +
item.bookName +
"銆� " +
- (item.pageNo ? "P " + item.pageNo : ""), // 杩欓噷鍙湁bookid鏃犳硶鍖归厤鍒颁功鍚�
+ (item.pageNo ? "P " + item.pageNo : "") // 杩欓噷鍙湁bookid鏃犳硶鍖归厤鍒颁功鍚�
};
});
});
},
getWritings() {
getPersonWritings({
- personId: this.detailId,
+ personId: this.detailId
}).then((res) => {
this.tableData1 = res.list.map((item) => {
return {
@@ -766,7 +766,7 @@
b: item.dynasty,
c: item.writeWay,
d: item.classify,
- e: this.detailInfo.NAME,
+ e: this.detailInfo.NAME
};
});
});
@@ -774,7 +774,7 @@
getRelationship() {
getPersonInfo({
id: this.detailId,
- type: "PERSON_RELATIONS",
+ type: "PERSON_RELATIONS"
}).then((res) => {
this.tableData4;
if (res.object.personRelationMap.kin.length) {
@@ -791,7 +791,7 @@
.name +
"銆� P" +
f.pageNo
- : "",
+ : ""
};
});
}
@@ -810,7 +810,7 @@
.name +
"銆� P" +
f.pageNo
- : "",
+ : ""
};
}
);
@@ -829,7 +829,7 @@
.name +
"銆� P" +
f.pageNo
- : "",
+ : ""
};
});
}
@@ -837,7 +837,7 @@
},
getMappingData() {
getFuzzySearch({
- personId: this.detailId,
+ personId: this.detailId
}).then((res) => {
this.nodes = [];
this.relationships = [];
@@ -853,19 +853,19 @@
if (item.name1 && exists1 !== true) {
this.nodes.push({
name: item.name1,
- id: item.identifier1,
+ id: item.identifier1
});
}
if (item.name2 && exists2 !== true) {
this.nodes.push({
name: item.name2,
- id: item.identifier2,
+ id: item.identifier2
});
}
let obj = {
source: item.name1,
target: item.name2,
- relation: item.relationName || "", // 濡傛灉瀛樺湪 relationName 瀛楁鍒欎娇鐢紝鍚﹀垯涓虹┖瀛楃涓�
+ relation: item.relationName || "" // 濡傛灉瀛樺湪 relationName 瀛楁鍒欎娇鐢紝鍚﹀垯涓虹┖瀛楃涓�
};
this.relationships.push(obj);
});
@@ -875,7 +875,7 @@
},
getMapInfo() {
getSpaceTime({
- personId: this.detailId,
+ personId: this.detailId
}).then((res) => {
if (res.list && res.list.length) {
const data = [];
@@ -884,7 +884,7 @@
if (item.xcoord && item.ycoord) {
const obj = {
name: item.activityName,
- value: [item.xcoord, item.ycoord],
+ value: [item.xcoord, item.ycoord]
};
data.push(obj);
}
@@ -905,36 +905,36 @@
initMap(markerList) {
var map = L.map("spaceTime", {
preferCanvas: true,
- attributionControl: false,
+ attributionControl: false
}).setView([markerList[0].value[1], markerList[0].value[0]], 13);
L.tileLayer
.chinaProvider("TianDiTu.Normal.Map", {
key: "76bc34ead7e30e663a4eded8aeaf5860",
maxZoom: 18,
- minZoom: 3,
+ minZoom: 3
})
.addTo(map);
L.tileLayer
.chinaProvider("TianDiTu.Normal.Annotion", {
key: "76bc34ead7e30e663a4eded8aeaf5860",
maxZoom: 18,
- minZoom: 3,
+ minZoom: 3
})
.addTo(map);
let icon = L.divIcon({
html: "<div class='map-circle-name ripple'></div>",
iconSize: [80, 80],
- className: "map-circle",
+ className: "map-circle"
});
this.map = map;
const temp_mark = L.marker([markerList.value[1], markerList.value[0]], {
- icon: icon,
+ icon: icon
}).addTo(map);
if (markerList.length) {
for (let i = 0; i < markerList.length; i++) {
const item = markerList[i];
const temp_mark = L.marker([item.value[1], item.value[0]], {
- icon: icon,
+ icon: icon
}).addTo(map);
}
}
@@ -943,11 +943,11 @@
fangdaClick(index) {
if (index == 1) {
uni.navigateTo({
- url: "/pages/character/index?keyword=" + this.detailInfo.NAME,
+ url: "/pages/character/index?keyword=" + this.detailInfo.NAME
});
} else if (index == 2) {
uni.navigateTo({
- url: "/pages/characterMap/characterMap?id=" + this.detailId,
+ url: "/pages/characterMap/characterMap?id=" + this.detailId
});
}
},
@@ -963,13 +963,13 @@
scrollToTop() {
window.scrollTo({
top: 0,
- behavior: "smooth", // 浣跨敤骞虫粦婊氬姩
+ behavior: "smooth" // 浣跨敤骞虫粦婊氬姩
});
},
openFileClick(index) {
let obj = {
id: this.detailId,
- type: "Person",
+ type: "Person"
};
switch (index) {
case 1:
@@ -1031,8 +1031,8 @@
position: "middle", // 璁剧疆鏍囩鏂囨湰鍦ㄧ嚎鐨勪腑闂翠綅缃笂灞呬腑鏄剧ず
// bottom: -(FontSize+10),
z: 10, // 璁剧疆鏍囩鐨剒杞撮珮搴︼紝浣垮叾姣旇繛鎺ョ嚎鏇撮珮
- distance: -(Distance + 1), // 灏嗘爣绛炬斁缃湪杩炴帴绾夸笂
- },
+ distance: -(Distance + 1) // 灏嗘爣绛炬斁缃湪杩炴帴绾夸笂
+ }
});
}
}
@@ -1047,8 +1047,8 @@
itemStyle: {
color: "#eae0eb", // 鍙互鏍规嵁绱㈠紩璁剧疆涓嶅悓鐨勯鑹�
borderWidth: BorderWidth,
- borderColor: "#996f9f",
- },
+ borderColor: "#996f9f"
+ }
};
});
var option;
@@ -1058,14 +1058,14 @@
top: FontSize + 10,
subtextStyle: {
fontSize: FontSize, // 璁剧疆鍓爣棰樻枃瀛楀ぇ灏忎负 14px
- color: "#2C2C2C",
- },
+ color: "#2C2C2C"
+ }
},
backgroundColor: {
type: "image",
image: "/static/image/characterRelationBg.png",
size: "100% 100%", // 鑳屾櫙鍥剧墖鐨勫昂瀵革紝鍙互鏄櫨鍒嗘瘮鎴栬�呭儚绱�
- position: "center center", // 鑳屾櫙鍥剧墖鐨勪綅缃紝鍙互鏄� top, bottom, middle 鎴栬�呯櫨鍒嗘瘮
+ position: "center center" // 鑳屾櫙鍥剧墖鐨勪綅缃紝鍙互鏄� top, bottom, middle 鎴栬�呯櫨鍒嗘瘮
},
tooltip: {},
animationDurationUpdate: 1500,
@@ -1079,7 +1079,7 @@
label: {
show: true,
color: "black", // 璁剧疆鑺傜偣鏂囧瓧棰滆壊涓洪粦鑹�
- fontSize: FontSize, // 璁剧疆鏂囧瓧澶у皬
+ fontSize: FontSize // 璁剧疆鏂囧瓧澶у皬
},
edgeSymbol: ["circle"],
edgeSymbolSize: [4, 10],
@@ -1088,16 +1088,16 @@
lineStyle: {
opacity: 0.9,
width: 2,
- curveness: 0.3,
+ curveness: 0.3
},
emphasis: {
focus: "adjacency",
lineStyle: {
- width: 10,
- },
- },
- },
- ],
+ width: 10
+ }
+ }
+ }
+ ]
};
// 灏嗙敓鎴愮殑杩炴帴绾挎坊鍔犲埌echarts鍥捐〃鐨刼ption涓�
option.series[0].links = links;
@@ -1121,10 +1121,10 @@
text: "",
subtext: "",
sublink: "",
- left: "center",
+ left: "center"
},
tooltip: {
- trigger: "item",
+ trigger: "item"
},
bmap: {
center: data[0].value,
@@ -1136,123 +1136,123 @@
featureType: "water",
elementType: "all",
stylers: {
- color: "#86a1ac",
- },
+ color: "#86a1ac"
+ }
},
{
featureType: "land",
elementType: "all",
stylers: {
- color: "#f1d99d",
- },
+ color: "#f1d99d"
+ }
},
{
featureType: "railway",
elementType: "all",
stylers: {
- visibility: "off",
- },
+ visibility: "off"
+ }
},
{
featureType: "highway",
elementType: "all",
stylers: {
- color: "#f1d99d",
- },
+ color: "#f1d99d"
+ }
},
{
featureType: "highway",
elementType: "labels",
stylers: {
- visibility: "off",
- },
+ visibility: "off"
+ }
},
{
featureType: "arterial",
elementType: "geometry",
stylers: {
- color: "#f1d99d",
- },
+ color: "#f1d99d"
+ }
},
{
featureType: "arterial",
elementType: "geometry.fill",
stylers: {
- color: "#f1d99d",
- },
+ color: "#f1d99d"
+ }
},
{
featureType: "poi",
elementType: "all",
stylers: {
- visibility: "off",
- },
+ visibility: "off"
+ }
},
{
featureType: "green",
elementType: "all",
stylers: {
- visibility: "off",
- },
+ visibility: "off"
+ }
},
{
featureType: "subway",
elementType: "all",
stylers: {
- visibility: "off",
- },
+ visibility: "off"
+ }
},
{
featureType: "manmade",
elementType: "all",
stylers: {
- color: "#f1d99d",
- },
+ color: "#f1d99d"
+ }
},
{
featureType: "local",
elementType: "all",
stylers: {
- color: "#f1d99d",
- },
+ color: "#f1d99d"
+ }
},
{
featureType: "local",
elementType: "labels",
stylers: {
- visibility: "off",
- },
+ visibility: "off"
+ }
},
{
featureType: "arterial",
elementType: "labels",
stylers: {
- visibility: "off",
- },
+ visibility: "off"
+ }
},
{
featureType: "boundary",
elementType: "all",
stylers: {
- color: "#f1d99d",
- },
+ color: "#f1d99d"
+ }
},
{
featureType: "building",
elementType: "all",
stylers: {
- color: "#f1d99d",
- },
+ color: "#f1d99d"
+ }
},
{
featureType: "label",
elementType: "labels.text.fill",
stylers: {
- color: "#000",
- },
- },
- ],
- },
+ color: "#000"
+ }
+ }
+ ]
+ }
},
series: [
{
@@ -1262,18 +1262,18 @@
data: data,
symbolSize: 0,
encode: {
- value: 2,
+ value: 2
},
label: {
formatter: "{b}",
position: "right",
- show: false,
+ show: false
},
emphasis: {
label: {
- show: true,
- },
- },
+ show: true
+ }
+ }
},
{
name: "",
@@ -1282,47 +1282,45 @@
data: data,
symbolSize: 20,
encode: {
- value: 2,
+ value: 2
},
showEffectOn: "render",
rippleEffect: {
- brushType: "stroke",
+ brushType: "stroke"
},
label: {
formatter: "{b}",
position: "right",
- show: false,
+ show: false
},
itemStyle: {
color: "#ec7b43",
shadowBlur: 10,
- shadowColor: "#333",
+ shadowColor: "#333"
},
emphasis: {
- scale: false,
+ scale: false
},
- zlevel: 1,
- },
- ],
+ zlevel: 1
+ }
+ ]
};
option && myChart.setOption(option);
- },
- },
+ }
+ }
};
</script>
<style>
/* Table1琛ㄦ牸閲岄潰鐨勬暟鎹� */
-::v-deep .is-leaf {
- .cell {
+::v-deep .is-leaf .cell {
font-size: 0.14rem !important;
height: 0.4rem !important;
line-height: 0.4rem !important;
}
}
-::v-deep .el-table__body {
- .cell {
+::v-deep .el-table__body .cell {
font-size: 0.14rem !important;
height: 0.4rem !important;
line-height: 0.4rem !important;
@@ -1374,16 +1372,16 @@
padding: 15rpx 25rpx;
color: #fff !important;
- img {
- width: 30rpx;
- height: 30rpx;
- vertical-align: middle;
- }
+}
+.NavTop img {
+ width: 30rpx;
+ height: 30rpx;
+ vertical-align: middle;
+}
- .NavTopr {
- img {
- margin-right: 10rpx;
- }
+.NavTop .NavTopr {
+ img {
+ margin-right: 10rpx;
}
}
@@ -1391,9 +1389,9 @@
width: 100%;
height: 30rpx;
- img {
- vertical-align: top;
- }
+}
+.mImage img {
+ vertical-align: top;
}
.Midde {
@@ -1404,28 +1402,28 @@
align-items: flex-start;
padding: 0.18rem 0.24rem;
- view {
- color: #000;
- }
+}
+.Midde view {
+ color: #000;
+}
- .MiddeBack {
- width: 0.6rem;
- height: 0.24rem;
- font-size: 0.12rem;
- padding: 0;
- border: 1px solid #9e9e9e;
- }
+.Midde .MiddeBack {
+ width: 0.6rem;
+ height: 0.24rem;
+ font-size: 0.12rem;
+ padding: 0;
+ border: 1px solid #9e9e9e;
}
.yinyong {
font-size: 0.12rem;
- img {
- width: 0.12rem;
- height: 0.1rem;
- vertical-align: top;
- margin-right: 0.03rem;
- }
+}
+.yinyong img {
+ width: 0.12rem;
+ height: 0.1rem;
+ vertical-align: top;
+ margin-right: 0.03rem;
}
.el-dialog__wrapper {
diff --git a/src/pages/character/index.vue b/src/pages/character/index.vue
index 676fcff..9fc8a27 100644
--- a/src/pages/character/index.vue
+++ b/src/pages/character/index.vue
@@ -594,15 +594,14 @@
.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;
}
</style>
diff --git a/src/pages/forgetPass/forgetPass.vue b/src/pages/forgetPass/forgetPass.vue
index f9a3fff..0c6f72e 100644
--- a/src/pages/forgetPass/forgetPass.vue
+++ b/src/pages/forgetPass/forgetPass.vue
@@ -654,26 +654,24 @@
height: 100vh;
color: #fff;
+}
+.container .repository {
+ width: 100% !important;
+ /* margin-top: 19px; */
+ /* height: 68%; */
+ display: flex;
+ flex-direction: column;
+ justify-content: space-around;
+ align-items: center;
+}
+.container .repository .Ttop {
+ margin-top: 0.38rem;
+ margin-bottom: 1.22rem;
+}
- .repository {
- width: 100% !important;
- /* margin-top: 19px; */
- /* height: 68%; */
- display: flex;
- flex-direction: column;
- justify-content: space-around;
- align-items: center;
-
- .Ttop {
- margin-top: 0.38rem;
- margin-bottom: 1.22rem;
- }
-
- .r-top {
- font-size: 40rpx !important;
- margin: 10rpx 0;
- }
- }
+.container .repository .r-top {
+ font-size: 40rpx !important;
+ margin: 10rpx 0;
}
.login {
@@ -729,21 +727,20 @@
/* flex-wrap: wrap; */
padding: 0 20px;
text-align: center;
-
- li {
- background-color: #fff;
- color: black;
- height: 600rpx;
- display: flex;
- justify-content: space-between;
- flex-direction: column;
- align-items: center;
- border: 1rpx solid #fff;
- padding: 50rpx 65rpx;
- /* padding: 58rpx 128rpx 88rpx; */
- text-align: center;
- background: #ebf4ff;
- }
+}
+.secretary li {
+ background-color: #fff;
+ color: black;
+ height: 600rpx;
+ display: flex;
+ justify-content: space-between;
+ flex-direction: column;
+ align-items: center;
+ border: 1rpx solid #fff;
+ padding: 50rpx 65rpx;
+ /* padding: 58rpx 128rpx 88rpx; */
+ text-align: center;
+ background: #ebf4ff;
}
.Bbottom {
diff --git a/src/pages/index/index.vue b/src/pages/index/index.vue
index 10c5c47..cd477d6 100644
--- a/src/pages/index/index.vue
+++ b/src/pages/index/index.vue
@@ -150,7 +150,7 @@
import Footer1 from "@/components/footer/footer.vue";
export default {
components: {
- Footer1,
+ Footer1
},
data() {
return {
@@ -169,55 +169,55 @@
pass: "",
checkPass: "",
cellphoneORmailbox: "",
- verifyCode: "",
+ verifyCode: ""
},
// 鐧诲綍鐢ㄦ埛璐﹀彿
loginData: {
// 璐﹀彿
loginID: "",
- pass: "",
+ pass: ""
},
// 閲嶇疆瀵嗙爜
resetDataPass: {
cellphoneORmailbox: "",
verifyCode: "",
newPass: "",
- checkPass: "",
+ checkPass: ""
},
// 淇敼瀵嗙爜
amendDataPass: {
loginID: "",
originalPass: "",
newPass: "",
- checkPass: "",
+ checkPass: ""
},
// 涔︾睄鏁版嵁
listData: [
{
name: "鍘嗕唬浜虹墿",
- id: 1,
+ id: 1
},
{
name: "瀹跺浼犳壙",
- id: 2,
+ id: 2
},
{
name: "瀛︽湳鍥捐氨",
- id: 6,
+ id: 6
},
{
name: "瀛︽湳娴佹淳",
- id: 3,
+ id: 3
},
{
name: "鍦板煙鍥捐氨",
- id: 4,
- },
+ id: 4
+ }
// {
// name: "涓尰鍖讳簨鍒跺害",
// id: 5
// }
- ],
+ ]
};
},
onLoad() {
@@ -225,7 +225,7 @@
success: function (info) {
// console.log('灞忓箷鐨勫搴︼細' + info.windowWidth);
// console.log('灞忓箷鐨勯珮搴︼細' + info.windowHeight);
- },
+ }
});
},
mounted() {
@@ -236,7 +236,7 @@
// 鎼滅储
onSearch(val) {
uni.navigateTo({
- url: "/pages/knowledgeBase/knowledgeBase?keyword=" + val.text,
+ url: "/pages/knowledgeBase/knowledgeBase?keyword=" + val.text
});
},
// 鎼滅储
@@ -247,7 +247,7 @@
if (this.searchInput.trim() !== "") {
uni.navigateTo({
url:
- "/pages/knowledgeBase/knowledgeBase?keyword=" + this.searchInput,
+ "/pages/knowledgeBase/knowledgeBase?keyword=" + this.searchInput
});
}
this.searchInput = "";
@@ -260,30 +260,30 @@
if (item.id == 1) {
uni.navigateTo({
// url: '/pages/character/detail?id=' + item.id
- url: "/pages/character/index?id=" + item.id,
+ url: "/pages/character/index?id=" + item.id
});
} else if (item.id == 2) {
uni.navigateTo({
- url: "/pages/inherit/index?id=" + item.id,
+ url: "/pages/inherit/index?id=" + item.id
});
// uni.navigateTo({
// url: '/pages/shiyiHome/shiyiHome'
// })
} else if (item.id == 3) {
uni.navigateTo({
- url: "/pages/academicGenres/index?id=" + item.id,
+ url: "/pages/academicGenres/index?id=" + item.id
});
} else if (item.id == 4) {
uni.navigateTo({
- url: "/pages/territory/territory?id=" + item.id,
+ url: "/pages/territory/territory?id=" + item.id
});
} else if (item.id == 5) {
uni.navigateTo({
- url: "/pages/TcmSystem/TcmSystem?id=" + item.id,
+ url: "/pages/TcmSystem/TcmSystem?id=" + item.id
});
} else if (item.id == 6) {
uni.navigateTo({
- url: "/pages/academicSchools/index",
+ url: "/pages/academicSchools/index"
});
}
},
@@ -315,7 +315,7 @@
// token 涓嶅瓨鍦�
this.isCommand = false;
uni.navigateTo({
- url: "/pages/Login/Login",
+ url: "/pages/Login/Login"
});
}
} else if (index == 3) {
@@ -326,7 +326,7 @@
handleCommand(int) {
if (int == 1) {
uni.navigateTo({
- url: "/pages/changePassword/changePassword",
+ url: "/pages/changePassword/changePassword"
});
} else if (int == 2) {
uni.showModal({
@@ -343,15 +343,15 @@
//閫�鍑烘垚鍔燂紒骞惰烦杞埌鍏朵粬椤甸潰
this.$message.success("閫�鍑烘垚鍔�");
uni.reLaunch({
- url: "/pages/Login/Login",
+ url: "/pages/Login/Login"
});
});
}
- },
+ }
});
}
- },
- },
+ }
+ }
};
</script>
@@ -493,12 +493,11 @@
.secretary li {
width: 1.3rem !important;
height: 4rem !important;
-
- span {
- width: 0.5rem !important;
- height: 70% !important;
- font-size: 0.25rem !important;
- }
+ }
+ .secretary li span {
+ width: 0.5rem !important;
+ height: 70% !important;
+ font-size: 0.25rem !important;
}
.hua {
@@ -558,12 +557,11 @@
.secretary li {
width: 1.3rem !important;
height: 4rem !important;
-
- span {
- width: 0.5rem !important;
- height: 70% !important;
- font-size: 0.25rem !important;
- }
+ }
+ .secretary li span {
+ width: 0.5rem !important;
+ height: 70% !important;
+ font-size: 0.25rem !important;
}
/* 楂樼骇鎼滅储 */
@@ -660,26 +658,24 @@
height: 100vh;
color: #fff;
+}
+.container .repository {
+ width: 100% !important;
+ /* margin-top: 19px; */
+ /* height: 68%; */
+ display: flex;
+ flex-direction: column;
+ justify-content: space-around;
+ align-items: center;
+}
+.container .repository .Ttop {
+ margin-top: 0.38rem;
+ margin-bottom: 1.22rem;
+}
- .repository {
- width: 100% !important;
- /* margin-top: 19px; */
- /* height: 68%; */
- display: flex;
- flex-direction: column;
- justify-content: space-around;
- align-items: center;
-
- .Ttop {
- margin-top: 0.38rem;
- margin-bottom: 1.22rem;
- }
-
- .r-top {
- font-size: 40rpx !important;
- margin: 10rpx 0;
- }
- }
+.container .repository .r-top {
+ font-size: 40rpx !important;
+ margin: 10rpx 0;
}
.login {
@@ -735,22 +731,21 @@
/* flex-wrap: wrap; */
padding: 0 20px;
text-align: center;
-
- li {
- background-color: #fff;
- color: black;
- width: 1.6rem;
- height: 4.8rem;
- display: flex;
- justify-content: center;
- flex-direction: column;
- align-items: center;
- text-align: center;
- background: #ebf4ff;
- font-weight: 600;
- margin: 0 0.21rem;
- cursor: pointer;
- }
+}
+.secretary li {
+ background-color: #fff;
+ color: black;
+ width: 1.6rem;
+ height: 4.8rem;
+ display: flex;
+ justify-content: center;
+ flex-direction: column;
+ align-items: center;
+ text-align: center;
+ background: #ebf4ff;
+ font-weight: 600;
+ margin: 0 0.21rem;
+ cursor: pointer;
}
::v-deep .cleanupBtn {
diff --git a/src/pages/inherit/index.vue b/src/pages/inherit/index.vue
index ead04a9..54d0f9d 100644
--- a/src/pages/inherit/index.vue
+++ b/src/pages/inherit/index.vue
@@ -71,7 +71,7 @@
</div>
</div>
</div>
- <div class="condition" v-if="openSearch">
+ <div class="condition" v-if="openSearch">
<div style="font-weight: 700; line-height: 0.25rem">鏉′欢閫夋嫨</div>
<div class="filterList">
<div class="conditionItem" @click="changeCondition(3)">
@@ -430,15 +430,13 @@
};
</script>
<style scoped>
-.Lists {
- li {
- width: 0.96rem;
- height: 0.3rem;
- border: 1px solid #da7a2b;
- line-height: 0.3rem;
- text-align: center;
- font-size: 0.14rem;
- }
+.Lists li {
+ width: 0.96rem;
+ height: 0.3rem;
+ border: 1px solid #da7a2b;
+ line-height: 0.3rem;
+ text-align: center;
+ font-size: 0.14rem;
}
.MiddeBack {
width: 0.6rem;
diff --git a/src/pages/knowledgeBase/knowledgeBase.vue b/src/pages/knowledgeBase/knowledgeBase.vue
index 111bf5d..3371c48 100644
--- a/src/pages/knowledgeBase/knowledgeBase.vue
+++ b/src/pages/knowledgeBase/knowledgeBase.vue
@@ -47,7 +47,16 @@
class="advancedSeaTrue1"
>
<h3>楂樼骇鎼滅储</h3>
- <MyForm @submit="onSubmit" @reset="resetForm" :from="from" />
+ <MyForm
+ @submit="
+ (data) => {
+ CurrentPage = 1;
+ onSubmit(data);
+ }
+ "
+ @reset="resetForm"
+ :from="from"
+ />
</view>
</view>
<uni-row
@@ -382,7 +391,7 @@
// 琛ㄦ牸鐨勬暟缁�
tableData: [],
// 鍒嗛〉鐨勬�绘暟
- total: 100,
+ total: 0,
// 褰撳墠椤�
CurrentPage: 1,
// 涓�椤垫樉绀哄灏戞潯鏁版嵁
@@ -641,6 +650,10 @@
document.querySelector(".fbox1").style.height = box1Height + "px";
}
});
+ if (this.isAdvancedSearch) {
+ this.keywords = "";
+ this.CurrentPage = 1;
+ }
},
// 楂樼骇鎼滅储
async onSubmit(val) {
@@ -657,7 +670,7 @@
this.dynasty.id = currentDynasty.dynastyId;
}
this.submitData = val;
- this.CurrentPage = 1;
+
let Obj = {
keywords: "", //鎼滅储妗嗘绱�
name: val.name, //濮撳悕
@@ -669,7 +682,6 @@
dynasty: val.dynasty, //鏈濅唬id
dynastyId: this.dynasty.id, //鏈濅唬id
institution: val.institution, //鏈烘瀯
- bookId: null, //鏉ユ簮id
page: this.CurrentPage,
pageSize: this.pageSize
};
@@ -760,14 +772,22 @@
PrevClick(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 });
+ }
}
},
// 涓嬩竴椤�
NextClick(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 });
+ }
}
}
}
@@ -861,29 +881,26 @@
.lightBo {
font-size: 0.14rem !important;
-
- .is-leaf {
- background-color: #c1d3ea !important;
- color: #2c2c2c !important;
- font-weight: 400;
-
- .cell {
- height: 0.3rem !important;
- line-height: 0.3rem !important;
- }
- }
}
- .el-table__body-wrapper {
- .el-table__row {
- height: 0.46rem !important;
- line-height: 0.46rem !important;
+ .lightBo .is-leaf {
+ background-color: #c1d3ea !important;
+ color: #2c2c2c !important;
+ font-weight: 400;
+ }
- .cell {
- height: 0.3rem !important;
- line-height: 0.3rem !important;
- }
- }
+ .lightBo .is-leaf .cell {
+ height: 0.3rem !important;
+ line-height: 0.3rem !important;
+ }
+
+ .el-table__body-wrapper .el-table__row {
+ height: 0.46rem !important;
+ line-height: 0.46rem !important;
+ }
+ .el-table__body-wrapper .el-table__row .cell {
+ height: 0.3rem !important;
+ line-height: 0.3rem !important;
}
}
--
Gitblit v1.9.1