From de962e6331d7ebf3c660a3b0d7fa1dbdc81c645f Mon Sep 17 00:00:00 2001
From: 杨磊 <505174330@qq.com>
Date: 星期一, 28 四月 2025 19:30:04 +0800
Subject: [PATCH] Merge branch 'master' of http://182.92.203.7:2001/r/wyyDatabase
---
src/views/achievements/index.vue | 436 +++++++++++++++++++++++++++++++++++++++++-------------
1 files changed, 332 insertions(+), 104 deletions(-)
diff --git a/src/views/achievements/index.vue b/src/views/achievements/index.vue
index d4cab66..b147315 100644
--- a/src/views/achievements/index.vue
+++ b/src/views/achievements/index.vue
@@ -39,9 +39,10 @@
</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" style="display: inline-block; vertical-align: middle;"
- v-model="item.checked" :title="item.name">{{ item.name }}</el-checkbox>
- <span class="" style="display: inline-block; vertical-align: middle;">{{ item.num }}</span>
+ <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>
@@ -104,7 +105,7 @@
</li>
</ul>
<!-- 瀛︾ -->
- <ul>
+ <!-- <ul>
<li class="left-title">
<span>{{ subject.title }}</span>
<p @click="subject.isDisplay = !subject.isDisplay">
@@ -113,12 +114,12 @@
</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">{{ item.name
- }}</el-checkbox>
+ <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>
+ </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)">
@@ -136,7 +137,7 @@
</ul>
<ul class="number-time">
鍙戣〃鏃堕棿
- <span><img :src="sortBottom" alt="" /></span>
+ <span @click="sortChange()"><img :src="!postedSortInfo ? sortBottom : sortTop" alt="" /></span>
</ul>
</ul>
<!-- 缁撴灉灞曠ず -->
@@ -144,12 +145,12 @@
<li class="main-name">
<p>{{ item.name }}</p>
<p>
- <el-button @click="goPage(item)">璇︽儏</el-button>
+ <el-button @click="goPage(item.id)">璇︽儏</el-button>
<el-button>AI鏅鸿兘闃呰</el-button>
</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>
@@ -157,13 +158,23 @@
<li class="main-author">
{{ item.author }}
</li>
- <li class="main-title" :title="item.abstract">
+ <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">
+ <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>
@@ -171,9 +182,10 @@
<!-- 鍒嗛〉 -->
<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">
+ :background="isBackground" layout="prev, pager, next" :total="total" :page-size="10">
</el-pagination>
</div>
+ <el-empty v-if="!loading && !resultList.length"></el-empty>
</div>
</div>
</div>
@@ -195,6 +207,7 @@
},
data() {
return {
+ relatedList: [],
// 杈撳叆妗嗙殑鍐呭
inputValue: "",
// 閫夋嫨鐨勭被鍨�
@@ -249,7 +262,7 @@
{
type: "input",
label: "鏍囥��棰�",
- name: "title",
+ name: "Name",
value: "",
},
{
@@ -313,6 +326,10 @@
},
],
},
+ categoryChecList: [],
+ subjectCheckList: [],
+
+ postedSortInfo: true,
// 骞村害
annual: {
title: "骞村害",
@@ -322,39 +339,35 @@
list: [
{
years: "2025",
- num: 20,
+ num: 10,
check: false,
},
{
- years: "2025",
- num: 20,
+ years: "2024",
+ num: 18,
check: false,
},
{
- years: "2025",
- num: 20,
+ years: "2023",
+ num: 21,
check: false,
},
{
- years: "2025",
- num: 20,
+ years: "2022",
+ num: 19,
check: false,
},
{
- years: "2025",
- num: 20,
+ years: "2021",
+ num: 22,
check: false,
},
{
- years: "2025",
- num: 20,
+ years: "2020",
+ num: 24,
check: false,
},
- {
- years: "2025",
- num: 20,
- check: false,
- },
+
],
},
// 鏂囩尞鏉ユ簮
@@ -370,30 +383,26 @@
check: false,
},
{
- name: "鍖椾含涓尰鑽ぇ瀛﹀ぇ瀛﹀鎶�",
- num: 190,
+ name: "鍖椾含甯堣寖澶у",
+ num: 19,
+ check: false,
+ },
+ {
+ name: "涓浗涓尰绉戝闄�",
+ num: 22,
check: false,
},
{
name: "鍖椾含涓尰鑽ぇ瀛﹀ぇ瀛﹀鎶�",
- num: 190,
+ num: 31,
check: false,
},
{
- name: "鍖椾含涓尰鑽ぇ瀛﹀ぇ瀛﹀鎶�",
- num: 190,
+ name: "骞垮窞涓尰鑽ぇ瀛�",
+ num: 25,
check: false,
},
- {
- name: "鍖椾含涓尰鑽ぇ瀛﹀ぇ瀛﹀鎶�",
- num: 190,
- check: false,
- },
- {
- name: "鍖椾含涓尰鑽ぇ瀛﹀ぇ瀛﹀鎶�",
- num: 190,
- check: false,
- },
+
],
},
// 瀛︾
@@ -442,25 +451,82 @@
resultList: [],
total: 0,
paginationPage: 1,
- loading: false,
+ loading: true,
+ labelList: {
+ abstract: "鎽樿",
+ author: "浣滆��",
+ keyword: "鍏抽敭璇�",
+ source: "鏉ユ簮",
+ Name: "鏍囬",
+ year: "骞翠唤",
+ },
};
},
mounted() {
- this.getSelectContent();
- this.getLeftCheckbox()
this.getSelectData();
},
methods: {
- async onSubmit(val) { },
+ categoryChange(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();
+ },
+
+ subjectChange(val) {
+ console.log(val, "val");
+ if (val.checked) {
+ this.subjectCheckList.push(val.value);
+ } else {
+ const index = this.subjectCheckList.findIndex(
+ (item) => item === val.value
+ );
+ this.subjectCheckList.splice(index, 1);
+ }
+ this.getItemList();
+ },
+
+ async onSubmit(val) {
+ console.log(val, "val");
+ console.log(this.associationList, "associationList");
+
+ for (let key in val) {
+ if (val[key] != "") {
+ const hasKey = this.associationList.find((item) => item.value == key);
+ if (!hasKey) {
+ this.associationList.push({
+ type: this.labelList[key],
+ content: val[key],
+ value: key,
+ });
+ }else {
+ hasKey.content = val[key]
+ }
+ }
+ }
+ this.getItemList();
+ },
//閲嶇疆鎼滅储缁撴灉
resetForm() {
// this.onSearch("");
},
// 椤甸潰璺宠浆
- goPage(key) {
- console.log(key, "key");
- this.$router.push({ name: "details", params: { key: key } });
+ goPage(id) {
+ this.$router.push({ name: "details", query: { id } });
},
// 鏀惰捣鍜屽睍绀�
shrinkClick(key, name) {
@@ -480,29 +546,24 @@
this.activeBox = this.activeBox === "b" ? null : "b";
}
},
- // 鑾峰彇宸︿晶checkbox鏁版嵁
- getLeftCheckbox() {
-
-
- },
//鑾峰彇涓嬫媺閫夋嫨妗嗙殑鍐呭
async getSelectData() {
- this.loading = true;
try {
// 鍚屾椂鍙戣捣涓や釜寮傛璇锋眰锛屽苟绛夊緟瀹冧滑鐨勭粨鏋�
const [subjectListResult, resourceListResult] = await Promise.all([
this.getSelectContent(this.subjectAffiliationRefCode),
this.getSelectContent(this.resourceTypeRefCode),
]);
- this.subject.list = subjectListResult.option
+ console.log(subjectListResult.option);
+ this.subject.list = subjectListResult.option;
this.category.list = resourceListResult.option;
if (this.category.list && this.category.list.length) {
this.category.list.forEach((item) => {
- this.resourceTypeValueList.push(item.value)
+ this.resourceTypeValueList.push(item.value);
});
}
- this.getItemList()
+ this.getItemList();
} catch (error) {
console.error("鑾峰彇涓嬫媺妗嗘暟鎹け璐�:", error);
}
@@ -515,7 +576,6 @@
.getProductTypeField(requestData)
.then((res) => {
const selestList = JSON.parse(res[0].config);
- console.log(selestList, "涓嬫媺妗嗘暟鎹�");
return selestList;
})
.catch((error) => {
@@ -530,59 +590,90 @@
(item) => item.content !== value
);
this.inputValue = "";
- this.getItemList()
+ // 閫氱煡鐖剁粍浠舵暟鎹凡鏀瑰彉
+ this.getItemList();
},
// 鎼滅储
handleSearch(isText) {
- console.log(1234);
- console.log(isText, "鎼滅储123");
+ console.log(isText, "isText");
+ this.associationList = [];
+ console.log(isText, "isText");
if (isText.text != "") {
- this.inputValue = isText.text
- this.inputType = isText.type
+ this.inputValue = isText.text;
+ this.inputType = isText.type;
this.associationList.push({
type: isText.label,
content: isText.text,
+ value: isText.type,
});
- this.getItemList()
+ this.getItemList();
}
},
- // getTtem
+ // 璇锋眰鏁版嵁
getItemList() {
- let searchData = {};
+ this.loading = true;
+ let searchData = {}; // 鍒濆鍖栦竴涓┖瀵硅薄鏉ュ瓨鍌ㄦ悳绱㈡暟鎹�
if (this.inputValue) {
+ // 濡傛灉杈撳叆鍊煎瓨鍦�
if (this.inputType != "all") {
+ // 濡傛灉杈撳叆绫诲瀷涓嶆槸"all"
+ // 灏嗚緭鍏ュ�间笌杈撳叆绫诲瀷鍏宠仈锛屽苟娣诲姞涓�涓槦鍙�(*)浣滀负鍚庣紑
searchData[this.inputType + "*"] = this.inputValue;
} else {
+ // 濡傛灉杈撳叆绫诲瀷鏄�"all"
+ // 閬嶅巻杈撳叆閫夐」
for (let index = 0; index < this.inputOptions.length; index++) {
- const item = this.inputOptions[index];
- if (item.value !== "all" ) {
- console.log(item.value, "987");
+ const item = this.inputOptions[index]; // 鑾峰彇褰撳墠閫夐」
+ if (item.value !== "all") {
+ // 濡傛灉褰撳墠閫夐」鐨勫�间笉鏄�"all"
if (!Object.keys(searchData).length) {
- searchData[item.value + "*"] = this.inputValue
+ // 濡傛灉searchData鏄┖鐨�
+ // 灏嗙涓�涓�夐」鐨勫�间笌杈撳叆鍊煎叧鑱旓紝骞舵坊鍔犱竴涓槦鍙�(*)浣滀负鍚庣紑
+ searchData[item.value + "*"] = this.inputValue;
} else {
- searchData["||" + item.value + "*"] = this.inputValue
+ // 濡傛灉searchData涓嶆槸绌虹殑
+ // 浣跨敤"||"浣滀负鍓嶇紑锛屽皢鍚庣画閫夐」鐨勫�间笌杈撳叆鍊煎叧鑱旓紝骞舵坊鍔犱竴涓槦鍙�(*)浣滀负鍚庣紑
+ // 杩欓�氬父鐢ㄤ簬鏋勫缓涓�涓�昏緫鎴栵紙OR锛夋煡璇�
+ searchData["||" + item.value + "*"] = this.inputValue;
}
}
}
}
-
- console.log(searchData, "鎼滅储鏁版嵁123");
}
- debugger
+ // 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",
},
fields: {
cmsType: ["cmsItem"],
- "resourceType*": this.resourceTypeValueList,
+ "resourceType*":
+ this.categoryChecList.length > 0
+ ? this.categoryChecList
+ : this.resourceTypeValueList,
source: [],
+ isbn: [],
year: [],
abstract: [],
keyWords: [],
@@ -591,33 +682,85 @@
AIReading: [],
file: [],
IssueNumber: [],
+ "subjectAffiliation*": this.subjectCheckList,
...searchData,
},
})
.then((res) => {
- console.log(res, "鍏ㄩ儴鏁版嵁");
+ console.log(res, "鍏ㄩ儴鍐呭");
+
res.datas.forEach((item) => {
- item.year = moment(item.year).format("YYYY-MM-DD")
- if (typeof item.keyWords === 'string') {
+ item.year = moment(item.year).format("YYYY-MM-DD");
+ if (typeof item.keyWords === "string") {
item.keyWords = item.keyWords.split(";;");
} else {
// 璁剧疆涓�涓粯璁ゅ�兼垨鑰呰繘琛屽叾浠栭敊璇鐞�
item.keyWords = [];
}
- item.resourceTypeName = this.category.list.find((citem) => citem.value == item.cmsItemType).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);
+ });
+ // 婊氬姩鍒伴〉闈㈤《閮�
+ this.$nextTick(() => {
+ const pageMain = document.querySelector(".page-main-father");
+ if (pageMain) {
+ pageMain.scrollTo({
+ top: 0,
+ behavior: "smooth",
+ });
+ }
+ });
+ },
// 澶勭悊椤电爜鍙樺寲
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>
@@ -656,11 +799,23 @@
}
}
+::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%;
height: 100%;
- min-width: 1292px;
+ min-width: 1200px;
overflow: auto;
padding-top: 1%;
padding-bottom: 2%;
@@ -679,15 +834,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;
}
}
@@ -740,10 +920,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;
}
}
@@ -906,6 +1087,7 @@
.right-header {
display: flex;
+ flex-wrap: wrap;
li {
background: #ffffff;
@@ -917,6 +1099,8 @@
font-family: Poppins;
font-size: 13px;
color: #937950;
+ line-height: 20px;
+ margin-bottom: 10px;
img {
cursor: pointer;
@@ -976,28 +1160,53 @@
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;
-
}
span:nth-child(2) {
@@ -1006,7 +1215,6 @@
font-weight: 350;
padding-right: 10px;
color: #333;
-
}
span:nth-child(3) {
@@ -1028,9 +1236,7 @@
border-left: 1px solid #2c2c2c;
}
-
-
- margin-bottom: 10px;
+ margin-bottom: 15px;
}
.main-author {
@@ -1051,7 +1257,7 @@
overflow: hidden;
display: -webkit-box;
-webkit-box-orient: vertical;
- -webkit-line-clamp: 4;
+ -webkit-line-clamp: 3;
span {
font-family: Source Han Sans;
@@ -1132,4 +1338,26 @@
border-radius: 5px;
border: 1px solid #cccccc;
}
+
+: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