From 6938616d7e67a8822569420f6bddd8754a63d574 Mon Sep 17 00:00:00 2001
From: 杨磊 <505174330@qq.com>
Date: 星期一, 28 四月 2025 16:36:23 +0800
Subject: [PATCH] Merge branch 'master' of http://182.92.203.7:2001/r/wyyDatabase

---
 src/views/achievements/index.vue |   68 ++++++++++++++++++++++++++-------
 1 files changed, 53 insertions(+), 15 deletions(-)

diff --git a/src/views/achievements/index.vue b/src/views/achievements/index.vue
index 80fc281..a69ae53 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: "",
           },
           {
@@ -573,7 +576,7 @@
         author: "浣滆��",
         keyword: "鍏抽敭璇�",
         source: "鏉ユ簮",
-        title: "鏍囬",
+        Name: "鏍囬",
         year: "骞翠唤",
       },
     };
@@ -617,16 +620,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 +668,6 @@
 
     //鑾峰彇涓嬫媺閫夋嫨妗嗙殑鍐呭
     async getSelectData() {
-      this.loading = true;
       try {
         // 鍚屾椂鍙戣捣涓や釜寮傛璇锋眰锛屽苟绛夊緟瀹冧滑鐨勭粨鏋�
         const [subjectListResult, resourceListResult] = await Promise.all([
@@ -706,13 +715,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 +733,7 @@
 
     // 璇锋眰鏁版嵁
     getItemList() {
+      this.loading = true;
       let searchData = {}; // 鍒濆鍖栦竴涓┖瀵硅薄鏉ュ瓨鍌ㄦ悳绱㈡暟鎹�
       if (this.inputValue) {
         // 濡傛灉杈撳叆鍊煎瓨鍦�
@@ -748,6 +762,8 @@
           }
         }
       }
+      console.log(searchData, "searchData1");
+
       if (this.associationList && this.associationList.length) {
         this.associationList.forEach((item) => {
           if (item.value == "year") {
@@ -755,7 +771,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 +830,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 +1270,10 @@
         color: #937950;
         margin-bottom: 5px;
 
+        p {
+          overflow: hidden;
+        }
+
         ::v-deep .el-button {
           font-size: 14px;
           background-color: transparent;
@@ -1288,7 +1323,7 @@
           border-left: 1px solid #2c2c2c;
         }
 
-        margin-bottom: 10px;
+        margin-bottom: 15px;
       }
 
       .main-author {
@@ -1309,7 +1344,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 +1427,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