From 2561b4735c1c0b2c28fbd79f47854809cc5773a3 Mon Sep 17 00:00:00 2001
From: zhongshujie <2862698242@qq.com>
Date: 星期一, 28 四月 2025 19:29:09 +0800
Subject: [PATCH] Merge branch 'master' of http://182.92.203.7:2001/r/wyyDatabase

---
 src/assets/js/middleGround/api/resource.js |    2 ++
 src/views/achievements/index.vue           |   40 ++++++++++++++++++++++++++--------------
 src/views/chronology/index.vue             |    1 +
 3 files changed, 29 insertions(+), 14 deletions(-)

diff --git a/src/assets/js/middleGround/api/resource.js b/src/assets/js/middleGround/api/resource.js
index 112b320..78e69fb 100644
--- a/src/assets/js/middleGround/api/resource.js
+++ b/src/assets/js/middleGround/api/resource.js
@@ -89,6 +89,8 @@
     }).then((resp) => {
       if (resp.length > 0) {
         const data = resp[0];
+        console.log(data,'datas');
+        debugger
         const datas = handleQueryResourceListData({
           datas: data.datas,
           fields,
diff --git a/src/views/achievements/index.vue b/src/views/achievements/index.vue
index 37c181e..1c19aa8 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)">
@@ -160,7 +160,10 @@
               </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>
@@ -259,7 +262,7 @@
           {
             type: "input",
             label: "鏍囥��棰�",
-            name: "title",
+            name: "Name",
             value: "",
           },
           {
@@ -462,7 +465,7 @@
         author: "浣滆��",
         keyword: "鍏抽敭璇�",
         source: "鏉ユ簮",
-        title: "鏍囬",
+        Name: "鏍囬",
         year: "骞翠唤",
       },
     };
@@ -506,16 +509,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();
     },
     //閲嶇疆鎼滅储缁撴灉
@@ -594,6 +604,7 @@
 
     // 鎼滅储
     handleSearch(isText) {
+      console.log(isText, "isText");
       this.associationList = [];
       console.log(isText, "isText");
       if (isText.text != "") {
@@ -706,18 +717,19 @@
           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",
           });
         }
       });
diff --git a/src/views/chronology/index.vue b/src/views/chronology/index.vue
index 3165ba5..d2af371 100644
--- a/src/views/chronology/index.vue
+++ b/src/views/chronology/index.vue
@@ -402,6 +402,7 @@
   margin-left: -9px;
   z-index: 99;
   background: #fff;
+  cursor: pointer;
 }
 
 .item-text {

--
Gitblit v1.9.1