From c6189f35d8744bf9c90bc15fd132ceb2a51d902c Mon Sep 17 00:00:00 2001
From: 杨磊 <505174330@qq.com>
Date: 星期一, 28 四月 2025 19:29:52 +0800
Subject: [PATCH] bug修改
---
src/views/achievements/index.vue | 122 +++++++++++++++++++++++++---------------
1 files changed, 76 insertions(+), 46 deletions(-)
diff --git a/src/views/achievements/index.vue b/src/views/achievements/index.vue
index 80fc281..42bb078 100644
--- a/src/views/achievements/index.vue
+++ b/src/views/achievements/index.vue
@@ -170,7 +170,7 @@
</li>
</ul>
<!-- 瀛︾ -->
- <ul>
+ <!-- <ul>
<li class="left-title">
<span>{{ subject.title }}</span>
<p @click="subject.isDisplay = !subject.isDisplay">
@@ -196,7 +196,7 @@
<span class="">{{ item.num }}</span>
</div>
</li>
- </ul>
+ </ul> -->
</div>
<div
class="content-right"
@@ -257,7 +257,10 @@
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"
@@ -370,7 +373,7 @@
{
type: "input",
label: "鏍囥��棰�",
- name: "title",
+ name: "Name",
value: "",
},
{
@@ -447,39 +450,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,
- },
+
],
},
// 鏂囩尞鏉ユ簮
@@ -495,30 +494,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,
- },
+
],
},
// 瀛︾
@@ -573,7 +568,7 @@
author: "浣滆��",
keyword: "鍏抽敭璇�",
source: "鏉ユ簮",
- title: "鏍囬",
+ Name: "鏍囬",
year: "骞翠唤",
},
};
@@ -617,16 +612,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();
},
//閲嶇疆鎼滅储缁撴灉
@@ -658,7 +660,6 @@
//鑾峰彇涓嬫媺閫夋嫨妗嗙殑鍐呭
async getSelectData() {
- this.loading = true;
try {
// 鍚屾椂鍙戣捣涓や釜寮傛璇锋眰锛屽苟绛夊緟瀹冧滑鐨勭粨鏋�
const [subjectListResult, resourceListResult] = await Promise.all([
@@ -706,13 +707,17 @@
// 鎼滅储
handleSearch(isText) {
+ 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();
}
@@ -720,6 +725,7 @@
// 璇锋眰鏁版嵁
getItemList() {
+ this.loading = true;
let searchData = {}; // 鍒濆鍖栦竴涓┖瀵硅薄鏉ュ瓨鍌ㄦ悳绱㈡暟鎹�
if (this.inputValue) {
// 濡傛灉杈撳叆鍊煎瓨鍦�
@@ -748,6 +754,8 @@
}
}
}
+ console.log(searchData, "searchData1");
+
if (this.associationList && this.associationList.length) {
this.associationList.forEach((item) => {
if (item.value == "year") {
@@ -755,7 +763,7 @@
const startDate = item.content.split("/")[0] + "/01/01 00:00:00";
searchData[item.value + ">="] = startDate;
searchData[item.value + "<="] = endDate;
- } else {
+ } else if (item.value) {
searchData[item.value + "*"] = item.content;
}
});
@@ -814,7 +822,22 @@
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) {
@@ -1239,6 +1262,10 @@
color: #937950;
margin-bottom: 5px;
+ p {
+ overflow: hidden;
+ }
+
::v-deep .el-button {
font-size: 14px;
background-color: transparent;
@@ -1288,7 +1315,7 @@
border-left: 1px solid #2c2c2c;
}
- margin-bottom: 10px;
+ margin-bottom: 15px;
}
.main-author {
@@ -1309,7 +1336,7 @@
overflow: hidden;
display: -webkit-box;
-webkit-box-orient: vertical;
- -webkit-line-clamp: 4;
+ -webkit-line-clamp: 3;
span {
font-family: Source Han Sans;
@@ -1392,6 +1419,9 @@
border-radius: 5px;
border: 1px solid #cccccc;
}
+:deep.el-pagination.is-background .el-pager li:not(.disabled):hover{
+ color: #937950
+}
</style>
<style>
--
Gitblit v1.9.1