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 | 233 ++++++++++++++++++++++++++++++++++++++-------------------
1 files changed, 154 insertions(+), 79 deletions(-)
diff --git a/src/views/achievements/index.vue b/src/views/achievements/index.vue
index 5042a2b..b147315 100644
--- a/src/views/achievements/index.vue
+++ b/src/views/achievements/index.vue
@@ -105,7 +105,7 @@
</li>
</ul>
<!-- 瀛︾ -->
- <ul>
+ <!-- <ul>
<li class="left-title">
<span>{{ subject.title }}</span>
<p @click="subject.isDisplay = !subject.isDisplay">
@@ -119,7 +119,7 @@
<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)">
@@ -150,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>
@@ -160,12 +160,21 @@
</li>
<li class="main-title" :title="item.cleanAbstract" v-if="item.abstract">
<span>鎽樿: </span>
- <span class="page-main-abstract" v-html="item.cleanAbstract"></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"
- @click="() => handleSearch({ text: citem, type: 'keyWords', label: '鍏抽敭璇�' })">
+ <span class="keyWord" v-for="(citem, cindex) in item.keyWords" :key="cindex" @click="
+ () =>
+ handleSearch({
+ text: citem,
+ type: 'keyWords',
+ label: '鍏抽敭璇�',
+ })
+ ">
{{ citem }}
</span>
</li>
@@ -173,7 +182,7 @@
<!-- 鍒嗛〉 -->
<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>
@@ -253,7 +262,7 @@
{
type: "input",
label: "鏍囥��棰�",
- name: "title",
+ name: "Name",
value: "",
},
{
@@ -330,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,
- },
+
],
},
// 鏂囩尞鏉ユ簮
@@ -378,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,
- },
+
],
},
// 瀛︾
@@ -450,13 +451,13 @@
resultList: [],
total: 0,
paginationPage: 1,
- loading: false,
+ loading: true,
labelList: {
abstract: "鎽樿",
author: "浣滆��",
keyword: "鍏抽敭璇�",
source: "鏉ユ簮",
- title: "鏍囬",
+ Name: "鏍囬",
year: "骞翠唤",
},
};
@@ -467,14 +468,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();
},
@@ -493,16 +501,23 @@
},
async onSubmit(val) {
+ console.log(val, "val");
+ console.log(this.associationList, "associationList");
+
for (let key in val) {
if (val[key] != "") {
- this.associationList.push({
- type: this.labelList[key],
- content: val[key],
- value: 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]
+ }
}
}
- console.log(this.associationList, "this.associationList");
this.getItemList();
},
//閲嶇疆鎼滅储缁撴灉
@@ -534,7 +549,6 @@
//鑾峰彇涓嬫媺閫夋嫨妗嗙殑鍐呭
async getSelectData() {
- this.loading = true;
try {
// 鍚屾椂鍙戣捣涓や釜寮傛璇锋眰锛屽苟绛夊緟瀹冧滑鐨勭粨鏋�
const [subjectListResult, resourceListResult] = await Promise.all([
@@ -577,18 +591,21 @@
);
this.inputValue = "";
// 閫氱煡鐖剁粍浠舵暟鎹凡鏀瑰彉
- this.getItemList()
+ this.getItemList();
},
// 鎼滅储
handleSearch(isText) {
- this.associationList = []
+ console.log(isText, "isText");
+ 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();
}
@@ -596,20 +613,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;
@@ -618,13 +642,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",
@@ -636,6 +673,7 @@
? this.categoryChecList
: this.resourceTypeValueList,
source: [],
+ isbn: [],
year: [],
abstract: [],
keyWords: [],
@@ -663,24 +701,27 @@
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
+ 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) => {
+ })
+ .catch((error) => {
// 鎵撳嵃閿欒淇℃伅
console.error("鑾峰彇鏁版嵁澶辫触:", error);
});
// 婊氬姩鍒伴〉闈㈤《閮�
this.$nextTick(() => {
- const pageMain = document.querySelector('.page-main-father');
+ const pageMain = document.querySelector(".page-main-father");
if (pageMain) {
pageMain.scrollTo({
top: 0,
- behavior: 'smooth'
+ behavior: "smooth",
});
}
});
@@ -691,11 +732,11 @@
this.getItemList(); // 閲嶆柊鑾峰彇鏁版嵁
// 婊氬姩鍒伴〉闈㈤《閮�
this.$nextTick(() => {
- const pageMain = document.querySelector('.page-main-father');
+ const pageMain = document.querySelector(".page-main-father");
if (pageMain) {
pageMain.scrollTo({
top: 0,
- behavior: 'smooth'
+ behavior: "smooth",
});
}
});
@@ -704,6 +745,22 @@
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>
@@ -744,7 +801,6 @@
::v-deep .el-loading-spinner {
.el-loading-text {
-
font-size: 14px;
color: #937950;
}
@@ -754,7 +810,6 @@
color: #937950;
}
}
-
.page-main-father {
flex: 1;
@@ -812,10 +867,8 @@
font-family: Source Han Sans;
font-size: 14px;
font-weight: bold;
- color: #2C2C2C;
-
+ color: #2c2c2c;
}
-
}
.input-txt {
@@ -868,7 +921,6 @@
background-color: transparent;
color: #937950;
border: 1px solid #937950;
- ;
cursor: pointer;
&:hover {
@@ -1128,10 +1180,31 @@
}
}
+ .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;
}
@@ -1184,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;
@@ -1265,6 +1338,10 @@
border-radius: 5px;
border: 1px solid #cccccc;
}
+
+:deep.el-pagination.is-background .el-pager li:not(.disabled):hover {
+ color: #937950
+}
</style>
<style>
@@ -1272,9 +1349,7 @@
color: #937950 !important;
border-color: #937950 !important;
font-weight: bold;
-
}
-
.el-select-dropdown__item.selected {
color: #937950 !important;
@@ -1285,4 +1360,4 @@
border-color: #937950;
font-weight: bold;
}
-</style>
\ No newline at end of file
+</style>
--
Gitblit v1.9.1