From 8bffcbb7f5fca4e1e7a308f6f786b63d0773704c Mon Sep 17 00:00:00 2001
From: zhongshujie <2862698242@qq.com>
Date: 星期一, 28 四月 2025 19:28:29 +0800
Subject: [PATCH] 页面优化
---
src/views/achievements/index.vue | 431 ++++++++++++++++++++++++++++++-----------------------
1 files changed, 241 insertions(+), 190 deletions(-)
diff --git a/src/views/achievements/index.vue b/src/views/achievements/index.vue
index 087462f..37c181e 100644
--- a/src/views/achievements/index.vue
+++ b/src/views/achievements/index.vue
@@ -19,17 +19,12 @@
</ul>
<!-- 楂樼骇鎼滅储 -->
<div v-if="isDisplay" class="page-search">
- <MyForm
- class="myfrom"
- @submit="
- (data) => {
- CurrentPage = 1;
- onSubmit(data);
- }
- "
- @reset="resetForm"
- :from="from"
- />
+ <MyForm class="myfrom" @submit="
+ (data) => {
+ CurrentPage = 1;
+ onSubmit(data);
+ }
+ " @reset="resetForm" :from="from" />
</div>
<!-- 鎼滅储缁撴灉 -->
<div class="page-content">
@@ -39,31 +34,15 @@
<li class="left-title">
<span>{{ category.title }}</span>
<p @click="category.isDisplay = !category.isDisplay">
- <img
- :src="[category.isDisplay ? topIcon : bottomIcon]"
- alt=""
- />
+ <img :src="[category.isDisplay ? topIcon : bottomIcon]" alt="" />
</p>
</li>
<li class="left-main" v-if="category.isDisplay">
- <div
- class="category-main"
- v-for="(item, index) in category.list"
- :key="index"
- >
- <el-checkbox
- class="el-checkbox"
- v-model="item.checked"
- :title="item.name"
- @change="categoryChange(item)"
- style="display: inline-block; vertical-align: middle"
- >{{ item.name }}</el-checkbox
- >
- <span
- class=""
- style="display: inline-block; vertical-align: middle"
- >{{ item.num }}</span
- >
+ <div class="category-main" v-for="(item, index) in category.list" :key="index">
+ <el-checkbox class="el-checkbox" v-model="item.checked" :title="item.name"
+ @change="categoryChange(item)" style="display: inline-block; vertical-align: middle">{{ item.name
+ }}</el-checkbox>
+ <span class="" style="display: inline-block; vertical-align: middle">{{ item.num }}</span>
</div>
</li>
</ul>
@@ -74,50 +53,25 @@
<span>{{ annual.title }}</span>
<span>
鏃堕棿
- <img
- class="sort-Icon"
- :src="[isDisplay ? sortTop : sortBottom]"
- alt=""
- />
+ <img class="sort-Icon" :src="[isDisplay ? sortTop : sortBottom]" alt="" />
</span>
- <span
- >鏂囩尞閲�
- <img
- class="sort-Icon"
- :src="[isDisplay ? sortBottom : sortTop]"
- alt=""
- />
+ <span>鏂囩尞閲�
+ <img class="sort-Icon" :src="[isDisplay ? sortBottom : sortTop]" alt="" />
</span>
</div>
<p @click="annual.isDisplay = !annual.isDisplay">
- <img
- :src="[annual.isDisplay ? topIcon : bottomIcon]"
- alt=""
- />
+ <img :src="[annual.isDisplay ? topIcon : bottomIcon]" alt="" />
</p>
</li>
<li class="left-main" v-if="annual.isDisplay">
- <div
- class="annual-main"
- :style="{
- display: index + 1 > professionIndex ? 'none' : '',
- }"
- v-for="(item, index) in annual.list"
- :key="index"
- >
- <el-checkbox
- class="el-checkbox"
- v-model="item.checked"
- :title="item.years"
- >{{ item.years }}</el-checkbox
- >
+ <div class="annual-main" :style="{
+ display: index + 1 > professionIndex ? 'none' : '',
+ }" v-for="(item, index) in annual.list" :key="index">
+ <el-checkbox class="el-checkbox" v-model="item.checked" :title="item.years">{{ item.years
+ }}</el-checkbox>
<span class="">{{ item.num }}</span>
</div>
- <p
- class="annual-footer"
- v-if="annual.list && annual.list.length > 5"
- @click="shrinkClick('a', '骞村害')"
- >
+ <p class="annual-footer" v-if="annual.list && annual.list.length > 5" @click="shrinkClick('a', '骞村害')">
{{ activeBox !== "a" ? "鏇村 鈭�" : "鏀惰捣 鈭�" }}
</p>
</li>
@@ -129,42 +83,23 @@
<span>{{ sources.title }}</span>
<span>
鏂囩尞閲�
- <img
- class="sort-Icon"
- :src="[isDisplay ? sortBottom : sortTop]"
- alt=""
- />
+ <img class="sort-Icon" :src="[isDisplay ? sortBottom : sortTop]" alt="" />
</span>
</div>
<p @click="sources.isDisplay = !sources.isDisplay">
- <img
- :src="[sources.isDisplay ? topIcon : bottomIcon]"
- alt=""
- />
+ <img :src="[sources.isDisplay ? topIcon : bottomIcon]" alt="" />
</p>
</li>
<li class="left-main" v-if="sources.isDisplay">
- <div
- class="sources-main"
- v-for="(item, index) in sources.list"
- :key="index"
- :style="{
- display: index + 1 > dynastyIndex ? 'none' : '',
- }"
- >
- <el-checkbox
- class="el-checkbox"
- :title="item.name"
- v-model="item.checked"
- >{{ item.name }}</el-checkbox
- >
+ <div class="sources-main" v-for="(item, index) in sources.list" :key="index" :style="{
+ display: index + 1 > dynastyIndex ? 'none' : '',
+ }">
+ <el-checkbox class="el-checkbox" :title="item.name" v-model="item.checked">{{ item.name
+ }}</el-checkbox>
<span class="">{{ item.num }}</span>
</div>
- <p
- class="sources-footer"
- v-if="sources.list && sources.list.length > 5"
- @click="shrinkClick('b', '鏂囩尞鏉ユ簮')"
- >
+ <p class="sources-footer" v-if="sources.list && sources.list.length > 5"
+ @click="shrinkClick('b', '鏂囩尞鏉ユ簮')">
{{ activeBox !== "b" ? "鏇村 鈭�" : "鏀惰捣 鈭�" }}
</p>
</li>
@@ -174,67 +109,39 @@
<li class="left-title">
<span>{{ subject.title }}</span>
<p @click="subject.isDisplay = !subject.isDisplay">
- <img
- :src="[subject.isDisplay ? topIcon : bottomIcon]"
- alt=""
- />
+ <img :src="[subject.isDisplay ? topIcon : bottomIcon]" alt="" />
</p>
</li>
<li class="left-main" v-if="subject.isDisplay">
- <div
- class="category-main"
- v-for="(item, index) in subject.list"
- :key="index"
- >
- <el-checkbox
- class="el-checkbox"
- v-model="item.checked"
- :title="item.name"
- @change="subjectChange(item)"
- >{{ item.name }}</el-checkbox
- >
+ <div class="category-main" v-for="(item, index) in subject.list" :key="index">
+ <el-checkbox class="el-checkbox" v-model="item.checked" :title="item.name"
+ @change="subjectChange(item)">{{ item.name }}</el-checkbox>
<span class="">{{ item.num }}</span>
</div>
</li>
</ul>
</div>
- <div
- class="content-right"
- v-loading="loading"
- element-loading-text="妫�绱㈢粨鏋滃姞杞戒腑"
- element-loading-spinner="el-icon-loading"
- element-loading-background="rgba(0, 0, 0, 0)"
- >
+ <div class="content-right" v-loading="loading" element-loading-text="妫�绱㈢粨鏋滃姞杞戒腑"
+ element-loading-spinner="el-icon-loading" element-loading-background="rgba(0, 0, 0, 0)">
<!-- title閮ㄥ垎 -->
<ul class="right-header">
<li v-for="(item, index) in associationList" :key="index">
<p>{{ item.type }} : {{ item.content }}</p>
- <img
- @click="removeAssociationList(item.content)"
- :src="errorIcon"
- alt=""
- />
+ <img @click="removeAssociationList(item.content)" :src="errorIcon" alt="" />
</li>
</ul>
<!-- 鍏眡x鏉� -->
<ul class="right-number">
<ul class="number-number">
- 鍏辨壘鍒�<span>{{ this.total }}</span
- >鏉＄粨鏋�
+ 鍏辨壘鍒�<span>{{ this.total }}</span>鏉＄粨鏋�
</ul>
<ul class="number-time">
鍙戣〃鏃堕棿
- <span @click="sortChange()"
- ><img :src="!postedSortInfo ? sortBottom : sortTop" alt=""
- /></span>
+ <span @click="sortChange()"><img :src="!postedSortInfo ? sortBottom : sortTop" alt="" /></span>
</ul>
</ul>
<!-- 缁撴灉灞曠ず -->
- <ul
- class="right-main"
- v-for="(item, index) in resultList"
- :key="index"
- >
+ <ul class="right-main" v-for="(item, index) in resultList" :key="index">
<li class="main-name">
<p>{{ item.name }}</p>
<p>
@@ -243,7 +150,7 @@
</p>
</li>
<li class="main-sources">
- <span>{{ item.resourceTypeName }}</span>
+ <span :class="getResourceTypeClass(item.cmsItemType)">{{ item.resourceTypeName }}</span>
<span>{{ item.source }}</span>
<span>{{ item.year }}</span>
<span v-if="item.DOI">doi锛歿{ item.DOI }}</span>
@@ -253,33 +160,30 @@
</li>
<li class="main-title" :title="item.cleanAbstract" v-if="item.abstract">
<span>鎽樿: </span>
- <span class="page-main-abstract" v-html="item.abstract"></span>
+ <span class="page-main-abstract" v-html="item.cleanAbstract"></span>
</li>
<li class="main-keyword" v-if="item.keyWords && item.keyWords.length > 0">
<span>鍏抽敭璇嶏細</span>
- <span
- class="keyWord"
- v-for="(citem, cindex) in item.keyWords"
- :key="cindex"
- >
+ <span class="keyWord" v-for="(citem, cindex) in item.keyWords" :key="cindex" @click="
+ () =>
+ handleSearch({
+ text: citem,
+ type: 'keyWords',
+ label: '鍏抽敭璇�',
+ })
+ ">
{{ citem }}
</span>
</li>
</ul>
<!-- 鍒嗛〉 -->
<div class="pagination" v-if="total > 6">
- <el-pagination
- @current-change="handleCurrentChange"
- class="msg-pagination-container"
- :background="isBackground"
- layout="prev, pager, next"
- :total="total"
- :page-size="6"
- >
+ <el-pagination @current-change="handleCurrentChange" class="msg-pagination-container"
+ :background="isBackground" layout="prev, pager, next" :total="total" :page-size="10">
</el-pagination>
</div>
+ <el-empty v-if="!loading && !resultList.length"></el-empty>
</div>
- <el-empty v-if="!loading && !resultList.length"></el-empty>
</div>
</div>
</div>
@@ -552,7 +456,7 @@
resultList: [],
total: 0,
paginationPage: 1,
- loading: false,
+ loading: true,
labelList: {
abstract: "鎽樿",
author: "浣滆��",
@@ -569,14 +473,21 @@
methods: {
categoryChange(val) {
- console.log(val, "val");
if (val.checked) {
this.categoryChecList.push(val.value);
+ this.associationList.push({
+ type: "绫诲瀷",
+ content: val.name,
+ });
} else {
const index = this.categoryChecList.findIndex(
(item) => item === val.value
);
+ const index2 = this.associationList.findIndex(
+ (item) => item.name === val.name
+ );
this.categoryChecList.splice(index, 1);
+ this.associationList.splice(index2, 1);
}
this.getItemList();
},
@@ -636,7 +547,6 @@
//鑾峰彇涓嬫媺閫夋嫨妗嗙殑鍐呭
async getSelectData() {
- this.loading = true;
try {
// 鍚屾椂鍙戣捣涓や釜寮傛璇锋眰锛屽苟绛夊緟瀹冧滑鐨勭粨鏋�
const [subjectListResult, resourceListResult] = await Promise.all([
@@ -679,18 +589,20 @@
);
this.inputValue = "";
// 閫氱煡鐖剁粍浠舵暟鎹凡鏀瑰彉
- this.getItemList()
+ this.getItemList();
},
// 鎼滅储
handleSearch(isText) {
- this.associationList = []
+ this.associationList = [];
+ console.log(isText, "isText");
if (isText.text != "") {
this.inputValue = isText.text;
this.inputType = isText.type;
this.associationList.push({
type: isText.label,
content: isText.text,
+ value: isText.type,
});
this.getItemList();
}
@@ -698,20 +610,27 @@
// 璇锋眰鏁版嵁
getItemList() {
+ this.loading = true;
let searchData = {}; // 鍒濆鍖栦竴涓┖瀵硅薄鏉ュ瓨鍌ㄦ悳绱㈡暟鎹�
- if (this.inputValue) { // 濡傛灉杈撳叆鍊煎瓨鍦�
- if (this.inputType != "all") { // 濡傛灉杈撳叆绫诲瀷涓嶆槸"all"
+ if (this.inputValue) {
+ // 濡傛灉杈撳叆鍊煎瓨鍦�
+ if (this.inputType != "all") {
+ // 濡傛灉杈撳叆绫诲瀷涓嶆槸"all"
// 灏嗚緭鍏ュ�间笌杈撳叆绫诲瀷鍏宠仈锛屽苟娣诲姞涓�涓槦鍙�(*)浣滀负鍚庣紑
searchData[this.inputType + "*"] = this.inputValue;
- } else { // 濡傛灉杈撳叆绫诲瀷鏄�"all"
+ } else {
+ // 濡傛灉杈撳叆绫诲瀷鏄�"all"
// 閬嶅巻杈撳叆閫夐」
for (let index = 0; index < this.inputOptions.length; index++) {
const item = this.inputOptions[index]; // 鑾峰彇褰撳墠閫夐」
- if (item.value !== "all") { // 濡傛灉褰撳墠閫夐」鐨勫�间笉鏄�"all"
- if (!Object.keys(searchData).length) { // 濡傛灉searchData鏄┖鐨�
+ if (item.value !== "all") {
+ // 濡傛灉褰撳墠閫夐」鐨勫�间笉鏄�"all"
+ if (!Object.keys(searchData).length) {
+ // 濡傛灉searchData鏄┖鐨�
// 灏嗙涓�涓�夐」鐨勫�间笌杈撳叆鍊煎叧鑱旓紝骞舵坊鍔犱竴涓槦鍙�(*)浣滀负鍚庣紑
searchData[item.value + "*"] = this.inputValue;
- } else { // 濡傛灉searchData涓嶆槸绌虹殑
+ } else {
+ // 濡傛灉searchData涓嶆槸绌虹殑
// 浣跨敤"||"浣滀负鍓嶇紑锛屽皢鍚庣画閫夐」鐨勫�间笌杈撳叆鍊煎叧鑱旓紝骞舵坊鍔犱竴涓槦鍙�(*)浣滀负鍚庣紑
// 杩欓�氬父鐢ㄤ簬鏋勫缓涓�涓�昏緫鎴栵紙OR锛夋煡璇�
searchData["||" + item.value + "*"] = this.inputValue;
@@ -720,13 +639,26 @@
}
}
}
+ // if (this.associationList && this.associationList.length) {
+ // this.associationList.forEach((item) => {
+ // if (item.value == "year") {
+ // const endDate = item.content.split("/")[0] + "/12/31 23:59:59";
+ // const startDate = item.content.split("/")[0] + "/01/01 00:00:00";
+ // searchData[item.value + ">="] = startDate;
+ // searchData[item.value + "<="] = endDate;
+ // } else {
+ // searchData["||" + item.value + "*"] = item.content;
+ // }
+ // });
+ // }
+ console.log(searchData, "searchData");
MG.resource
.getItem({
path: "*",
queryType: "*",
paging: {
- start: (this.paginationPage - 1) * 6,
- size: 6,
+ start: (this.paginationPage - 1) * 10,
+ size: 10,
},
sort: {
year: this.postedSortInfo ? "Desc" : "Asc",
@@ -738,6 +670,7 @@
? this.categoryChecList
: this.resourceTypeValueList,
source: [],
+ isbn: [],
year: [],
abstract: [],
keyWords: [],
@@ -761,19 +694,23 @@
// 璁剧疆涓�涓粯璁ゅ�兼垨鑰呰繘琛屽叾浠栭敊璇鐞�
item.keyWords = [];
}
- // item.cleanAbstract = item.abstract.replace(/<[^>]+>/g, "");
- const foundItem = this.category.list.find((citem) => citem.value == item.cmsItemType);
- item.resourceTypeName = foundItem ? foundItem.name : '';
- })
- this.resultList = res.datas
+ if (item.abstract) {
+ item.cleanAbstract = item.abstract.replace(/<[^>]+>/g, "");
+ }
+
+ const foundItem = this.category.list.find(
+ (citem) => citem.value == item.cmsItemType
+ );
+ item.resourceTypeName = foundItem ? foundItem.name : "";
+ });
+ this.resultList = res.datas;
this.total = res.total;
this.loading = false;
+ }).catch((error) => {
+ // 鎵撳嵃閿欒淇℃伅
+ console.error("鑾峰彇鏁版嵁澶辫触:", error);
});
- },
- // 澶勭悊椤电爜鍙樺寲
- handleCurrentChange(newPage) {
- this.paginationPage = newPage;
- this.getItemList(); // 閲嶆柊鑾峰彇鏁版嵁
+
// 婊氬姩鍒伴〉闈㈤《閮�
this.$nextTick(() => {
const pageMain = document.querySelector('.page-main-father');
@@ -785,10 +722,41 @@
}
});
},
+ // 澶勭悊椤电爜鍙樺寲
+ handleCurrentChange(newPage) {
+ this.paginationPage = newPage;
+ this.getItemList(); // 閲嶆柊鑾峰彇鏁版嵁
+ // 婊氬姩鍒伴〉闈㈤《閮�
+ this.$nextTick(() => {
+ const pageMain = document.querySelector(".page-main-father");
+ if (pageMain) {
+ pageMain.scrollTo({
+ top: 0,
+ behavior: "smooth",
+ });
+ }
+ });
+ },
sortChange() {
this.postedSortInfo = !this.postedSortInfo;
this.getItemList();
},
+ getResourceTypeClass(typeName) {
+ switch (typeName) {
+ case 'journal':
+ return 'journal-color';
+ case 'books':
+ return 'books-color';
+ case 'video':
+ return 'video-color';
+ case 'audio':
+ return 'audio-color';
+ case 'newspaper':
+ return 'newspaper-color';
+ default:
+ return 'other-color';
+ }
+ }
},
};
</script>
@@ -827,6 +795,18 @@
}
}
+::v-deep .el-loading-spinner {
+ .el-loading-text {
+ font-size: 14px;
+ color: #937950;
+ }
+
+ .el-icon-loading {
+ font-size: 14px;
+ color: #937950;
+ }
+}
+
.page-main-father {
flex: 1;
width: 100%;
@@ -850,15 +830,40 @@
background-color: #fefbf5;
border: 1px solid #e4dace;
- .input-main {
+ ::v-deep(.input-main) {
padding: 15px 0;
display: flex;
justify-content: center;
width: 90%;
border-right: 2px solid #e4dace;
+ font-weight: bold;
.input-with-select {
width: 50%;
+ font-weight: bold;
+ }
+
+ .el-select .el-input.is-focus .el-input__inner {
+ color: #937950 !important;
+ border-color: #937950 !important;
+ font-weight: bold;
+ }
+
+ .el-select-dropdown__item.selected {
+ color: #937950 !important;
+ font-weight: bold;
+ }
+
+ .el-select .el-input__inner:focus {
+ border-color: #937950;
+ font-weight: bold;
+ }
+
+ .el-select .el-input__inner {
+ font-family: Source Han Sans;
+ font-size: 14px;
+ font-weight: bold;
+ color: #2c2c2c;
}
}
@@ -911,11 +916,11 @@
font-size: 14px;
background-color: transparent;
color: #937950;
- border: 1px solid #6f5a3a;
+ border: 1px solid #937950;
cursor: pointer;
&:hover {
- background-color: #6f5a3a;
+ background-color: #937950;
color: #fffdf8;
}
}
@@ -1039,15 +1044,12 @@
border-color: #d1d1d1;
}
- ::v-deep .el-checkbox .el-checkbox__input.is-checked + .el-checkbox__label {
+ ::v-deep .el-checkbox .el-checkbox__input.is-checked+.el-checkbox__label {
color: #2c2c2c;
}
::v-deep .el-checkbox .el-checkbox__input.is-checked .el-checkbox__inner,
- ::v-deep
- .el-checkbox
- .el-checkbox__input.is-indeterminate
- .el-checkbox__inner {
+ ::v-deep .el-checkbox .el-checkbox__input.is-indeterminate .el-checkbox__inner {
border-color: #8f7a5a;
background-color: #8f7a5a;
}
@@ -1081,6 +1083,7 @@
.right-header {
display: flex;
+ flex-wrap: wrap;
li {
background: #ffffff;
@@ -1092,6 +1095,8 @@
font-family: Poppins;
font-size: 13px;
color: #937950;
+ line-height: 20px;
+ margin-bottom: 10px;
img {
cursor: pointer;
@@ -1151,25 +1156,51 @@
font-size: 16px;
font-weight: bold;
color: #937950;
+ margin-bottom: 5px;
+
+ p {
+ overflow: hidden;
+ }
::v-deep .el-button {
font-size: 14px;
background-color: transparent;
color: #937950;
- border: 1px solid #6f5a3a;
+ border: 1px solid #937950;
border-radius: 0;
&:hover {
- background-color: #6f5a3a;
+ background-color: #937950;
color: #fffdf8;
}
}
}
+ .journal-color {
+ background-color: #87a8b9;
+ }
+ .books-color {
+ background-color: #C48787;
+ }
+ .video-color {
+ background-color: #6F8F5A;
+ }
+ .audio-color {
+ background-color: #937950;
+ }
+ .newspaper-color {
+ background-color: #8D77B3;
+ }
+ .other-color {
+ background-color: #009F9F;
+ }
+
+
+
.main-sources {
span:nth-child(1) {
padding: 3px 5px;
- background-color: #87a8b9;
+
color: #fff;
margin-right: 10px;
}
@@ -1201,7 +1232,7 @@
border-left: 1px solid #2c2c2c;
}
- margin-bottom: 10px;
+ margin-bottom: 15px;
}
.main-author {
@@ -1222,7 +1253,7 @@
overflow: hidden;
display: -webkit-box;
-webkit-box-orient: vertical;
- -webkit-line-clamp: 4;
+ -webkit-line-clamp: 3;
span {
font-family: Source Han Sans;
@@ -1296,13 +1327,33 @@
border: 1px solid #cccccc;
}
-:deep.msg-pagination-container.is-background
- .el-pager
- li:not(.disabled).active {
+:deep.msg-pagination-container.is-background .el-pager li:not(.disabled).active {
/*褰撳墠閫変腑椤垫暟鐨勬牱寮忚繘琛屼慨鏀�*/
background-color: #937950;
color: #fff;
border-radius: 5px;
border: 1px solid #cccccc;
}
-</style>
\ No newline at end of file
+
+:deep.el-pagination.is-background .el-pager li:not(.disabled):hover {
+ color: #937950
+}
+</style>
+
+<style>
+.el-input.is-focus .el-input__inner {
+ color: #937950 !important;
+ border-color: #937950 !important;
+ font-weight: bold;
+}
+
+.el-select-dropdown__item.selected {
+ color: #937950 !important;
+ font-weight: bold;
+}
+
+.el-select .el-input__inner:focus {
+ border-color: #937950;
+ font-weight: bold;
+}
+</style>
--
Gitblit v1.9.1