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 |  549 ++++++++++++++++++++++++++++++++++++++++++------------
 1 files changed, 425 insertions(+), 124 deletions(-)

diff --git a/src/views/achievements/index.vue b/src/views/achievements/index.vue
index dcba3bc..42bb078 100644
--- a/src/views/achievements/index.vue
+++ b/src/views/achievements/index.vue
@@ -19,12 +19,17 @@
         </ul>
         <!-- 楂樼骇鎼滅储 -->
         <div v-if="isDisplay" class="page-search">
-          <MyForm class="myfrom" @submit="
-            (data) => {
-              CurrentPage = 1;
-              onSubmit(data);
-            }
-          " @reset="resetForm" :from="from" />
+          <MyForm
+            class="myfrom"
+            @submit="
+              (data) => {
+                CurrentPage = 1;
+                onSubmit(data);
+              }
+            "
+            @reset="resetForm"
+            :from="from"
+          />
         </div>
         <!-- 鎼滅储缁撴灉 -->
         <div class="page-content">
@@ -34,14 +39,31 @@
               <li class="left-title">
                 <span>{{ category.title }}</span>
                 <p @click="category.isDisplay = !category.isDisplay">
-                  <img :src="[category.isDisplay ? topIcon : bottomIcon]" alt="" />
+                  <img
+                    :src="[category.isDisplay ? topIcon : bottomIcon]"
+                    alt=""
+                  />
                 </p>
               </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>
+                <div
+                  class="category-main"
+                  v-for="(item, index) in category.list"
+                  :key="index"
+                >
+                  <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>
@@ -52,25 +74,50 @@
                   <span>{{ annual.title }}</span>
                   <span>
                     鏃堕棿
-                    <img class="sort-Icon" :src="[isDisplay ? sortTop : sortBottom]" alt="" />
+                    <img
+                      class="sort-Icon"
+                      :src="[isDisplay ? sortTop : sortBottom]"
+                      alt=""
+                    />
                   </span>
-                  <span>鏂囩尞閲�
-                    <img class="sort-Icon" :src="[isDisplay ? sortBottom : sortTop]" alt="" />
+                  <span
+                    >鏂囩尞閲�
+                    <img
+                      class="sort-Icon"
+                      :src="[isDisplay ? sortBottom : sortTop]"
+                      alt=""
+                    />
                   </span>
                 </div>
                 <p @click="annual.isDisplay = !annual.isDisplay">
-                  <img :src="[annual.isDisplay ? topIcon : bottomIcon]" alt="" />
+                  <img
+                    :src="[annual.isDisplay ? topIcon : bottomIcon]"
+                    alt=""
+                  />
                 </p>
               </li>
               <li class="left-main" v-if="annual.isDisplay">
-                <div class="annual-main" :style="{
-                  display: index + 1 > professionIndex ? 'none' : '',
-                }" v-for="(item, index) in annual.list" :key="index">
-                  <el-checkbox class="el-checkbox" v-model="item.checked" :title="item.years">{{ item.years
-                  }}</el-checkbox>
+                <div
+                  class="annual-main"
+                  :style="{
+                    display: index + 1 > professionIndex ? 'none' : '',
+                  }"
+                  v-for="(item, index) in annual.list"
+                  :key="index"
+                >
+                  <el-checkbox
+                    class="el-checkbox"
+                    v-model="item.checked"
+                    :title="item.years"
+                    >{{ item.years }}</el-checkbox
+                  >
                   <span class="">{{ item.num }}</span>
                 </div>
-                <p class="annual-footer" v-if="annual.list && annual.list.length > 5" @click="shrinkClick('a', '骞村害')">
+                <p
+                  class="annual-footer"
+                  v-if="annual.list && annual.list.length > 5"
+                  @click="shrinkClick('a', '骞村害')"
+                >
                   {{ activeBox !== "a" ? "鏇村 鈭�" : "鏀惰捣 鈭�" }}
                 </p>
               </li>
@@ -82,65 +129,112 @@
                   <span>{{ sources.title }}</span>
                   <span>
                     鏂囩尞閲�
-                    <img class="sort-Icon" :src="[isDisplay ? sortBottom : sortTop]" alt="" />
+                    <img
+                      class="sort-Icon"
+                      :src="[isDisplay ? sortBottom : sortTop]"
+                      alt=""
+                    />
                   </span>
                 </div>
                 <p @click="sources.isDisplay = !sources.isDisplay">
-                  <img :src="[sources.isDisplay ? topIcon : bottomIcon]" alt="" />
+                  <img
+                    :src="[sources.isDisplay ? topIcon : bottomIcon]"
+                    alt=""
+                  />
                 </p>
               </li>
               <li class="left-main" v-if="sources.isDisplay">
-                <div class="sources-main" v-for="(item, index) in sources.list" :key="index" :style="{
-                  display: index + 1 > dynastyIndex ? 'none' : '',
-                }">
-                  <el-checkbox class="el-checkbox" :title="item.name" v-model="item.checked">{{ item.name
-                  }}</el-checkbox>
+                <div
+                  class="sources-main"
+                  v-for="(item, index) in sources.list"
+                  :key="index"
+                  :style="{
+                    display: index + 1 > dynastyIndex ? 'none' : '',
+                  }"
+                >
+                  <el-checkbox
+                    class="el-checkbox"
+                    :title="item.name"
+                    v-model="item.checked"
+                    >{{ item.name }}</el-checkbox
+                  >
                   <span class="">{{ item.num }}</span>
                 </div>
-                <p class="sources-footer" v-if="sources.list && sources.list.length > 5"
-                  @click="shrinkClick('b', '鏂囩尞鏉ユ簮')">
+                <p
+                  class="sources-footer"
+                  v-if="sources.list && sources.list.length > 5"
+                  @click="shrinkClick('b', '鏂囩尞鏉ユ簮')"
+                >
                   {{ activeBox !== "b" ? "鏇村 鈭�" : "鏀惰捣 鈭�" }}
                 </p>
               </li>
             </ul>
             <!-- 瀛︾ -->
-            <ul>
+            <!-- <ul>
               <li class="left-title">
                 <span>{{ subject.title }}</span>
                 <p @click="subject.isDisplay = !subject.isDisplay">
-                  <img :src="[subject.isDisplay ? topIcon : bottomIcon]" alt="" />
+                  <img
+                    :src="[subject.isDisplay ? topIcon : bottomIcon]"
+                    alt=""
+                  />
                 </p>
               </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>
+                <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"
+                    @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)">
+          <div
+            class="content-right"
+            v-loading="loading"
+            element-loading-text="妫�绱㈢粨鏋滃姞杞戒腑"
+            element-loading-spinner="el-icon-loading"
+            element-loading-background="rgba(0, 0, 0, 0)"
+          >
             <!-- title閮ㄥ垎 -->
             <ul class="right-header">
               <li v-for="(item, index) in associationList" :key="index">
                 <p>{{ item.type }} : {{ item.content }}</p>
-                <img @click="removeAssociationList(item.content)" :src="errorIcon" alt="" />
+                <img
+                  @click="removeAssociationList(item.content)"
+                  :src="errorIcon"
+                  alt=""
+                />
               </li>
             </ul>
             <!-- 鍏眡x鏉� -->
             <ul class="right-number">
               <ul class="number-number">
-                鍏辨壘鍒�<span>{{ this.total }}</span>鏉＄粨鏋�
+                鍏辨壘鍒�<span>{{ this.total }}</span
+                >鏉＄粨鏋�
               </ul>
               <ul class="number-time">
                 鍙戣〃鏃堕棿
-                <span><img :src="sortBottom" alt="" /></span>
+                <span @click="sortChange()"
+                  ><img :src="!postedSortInfo ? sortBottom : sortTop" alt=""
+                /></span>
               </ul>
             </ul>
             <!-- 缁撴灉灞曠ず -->
-            <ul class="right-main" v-for="(item, index) in resultList" :key="index">
+            <ul
+              class="right-main"
+              v-for="(item, index) in resultList"
+              :key="index"
+            >
               <li class="main-name">
                 <p>{{ item.name }}</p>
                 <p>
@@ -157,25 +251,53 @@
               <li class="main-author">
                 {{ item.author }}
               </li>
-              <li class="main-title" :title="item.cleanAbstract" v-if="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" v-if="item.keyWords && item.keyWords.length > 0">
+              <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>
             </ul>
             <!-- 鍒嗛〉 -->
             <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">
+              <el-pagination
+                @current-change="handleCurrentChange"
+                class="msg-pagination-container"
+                :background="isBackground"
+                layout="prev, pager, next"
+                :total="total"
+                :page-size="6"
+              >
               </el-pagination>
             </div>
+            <el-empty v-if="!loading && !resultList.length"></el-empty>
           </div>
-          <el-empty v-if="!loading && !resultList.length"></el-empty>
         </div>
       </div>
     </div>
@@ -251,7 +373,7 @@
           {
             type: "input",
             label: "鏍囥��棰�",
-            name: "title",
+            name: "Name",
             value: "",
           },
           {
@@ -315,6 +437,10 @@
           },
         ],
       },
+      categoryChecList: [],
+      subjectCheckList: [],
+
+      postedSortInfo: true,
       // 骞村害
       annual: {
         title: "骞村害",
@@ -324,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,
-          },
+     
         ],
       },
       // 鏂囩尞鏉ユ簮
@@ -372,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,
-          },
+  
         ],
       },
       // 瀛︾
@@ -445,6 +563,14 @@
       total: 0,
       paginationPage: 1,
       loading: false,
+      labelList: {
+        abstract: "鎽樿",
+        author: "浣滆��",
+        keyword: "鍏抽敭璇�",
+        source: "鏉ユ簮",
+        Name: "鏍囬",
+        year: "骞翠唤",
+      },
     };
   },
   mounted() {
@@ -452,7 +578,59 @@
   },
 
   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("");
@@ -482,21 +660,21 @@
 
     //鑾峰彇涓嬫媺閫夋嫨妗嗙殑鍐呭
     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);
       }
@@ -524,39 +702,50 @@
       );
       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.inputValue = isText.text;
+        this.inputType = isText.type;
         this.associationList.push({
           type: isText.label,
           content: isText.text,
+          value: isText.type,
         });
-        this.getItemList()
+        this.getItemList();
       }
     },
 
     // 璇锋眰鏁版嵁
     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;
@@ -565,17 +754,38 @@
           }
         }
       }
+      console.log(searchData, "searchData1");
+
+      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 if (item.value) {
+            searchData[item.value + "*"] = item.content;
+          }
+        });
+      }
+      console.log(searchData, "searchData");
       MG.resource
         .getItem({
           path: "*",
           queryType: "*",
           paging: {
             start: (this.paginationPage - 1) * 6,
-            size: 6
+            size: 6,
+          },
+          sort: {
+            year: this.postedSortInfo ? "Desc" : "Asc",
           },
           fields: {
             cmsType: ["cmsItem"],
-            "resourceType*": this.resourceTypeValueList,
+            "resourceType*":
+              this.categoryChecList.length > 0
+                ? this.categoryChecList
+                : this.resourceTypeValueList,
             source: [],
             year: [],
             abstract: [],
@@ -585,6 +795,7 @@
             AIReading: [],
             file: [],
             IssueNumber: [],
+            "subjectAffiliation*": this.subjectCheckList,
             ...searchData,
           },
         })
@@ -592,21 +803,41 @@
           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.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
+            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) {
@@ -614,16 +845,19 @@
       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",
           });
         }
       });
     },
-
+    sortChange() {
+      this.postedSortInfo = !this.postedSortInfo;
+      this.getItemList();
+    },
   },
 };
 </script>
@@ -662,6 +896,18 @@
   }
 }
 
+::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%;
@@ -685,15 +931,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;
     }
   }
 
@@ -746,11 +1017,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;
         }
       }
@@ -874,12 +1145,15 @@
     border-color: #d1d1d1;
   }
 
-  ::v-deep .el-checkbox .el-checkbox__input.is-checked+.el-checkbox__label {
+  ::v-deep .el-checkbox .el-checkbox__input.is-checked + .el-checkbox__label {
     color: #2c2c2c;
   }
 
   ::v-deep .el-checkbox .el-checkbox__input.is-checked .el-checkbox__inner,
-  ::v-deep .el-checkbox .el-checkbox__input.is-indeterminate .el-checkbox__inner {
+  ::v-deep
+    .el-checkbox
+    .el-checkbox__input.is-indeterminate
+    .el-checkbox__inner {
     border-color: #8f7a5a;
     background-color: #8f7a5a;
   }
@@ -913,6 +1187,7 @@
 
     .right-header {
       display: flex;
+      flex-wrap: wrap;
 
       li {
         background: #ffffff;
@@ -924,6 +1199,8 @@
         font-family: Poppins;
         font-size: 13px;
         color: #937950;
+        line-height: 20px;
+        margin-bottom: 10px;
 
         img {
           cursor: pointer;
@@ -983,16 +1260,21 @@
         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;
           }
         }
@@ -1004,7 +1286,6 @@
           background-color: #87a8b9;
           color: #fff;
           margin-right: 10px;
-
         }
 
         span:nth-child(2) {
@@ -1013,7 +1294,6 @@
           font-weight: 350;
           padding-right: 10px;
           color: #333;
-
         }
 
         span:nth-child(3) {
@@ -1035,9 +1315,7 @@
           border-left: 1px solid #2c2c2c;
         }
 
-
-
-        margin-bottom: 10px;
+        margin-bottom: 15px;
       }
 
       .main-author {
@@ -1058,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;
@@ -1132,11 +1410,34 @@
   border: 1px solid #cccccc;
 }
 
-:deep.msg-pagination-container.is-background .el-pager li:not(.disabled).active {
+:deep.msg-pagination-container.is-background
+  .el-pager
+  li:not(.disabled).active {
   /*褰撳墠閫変腑椤垫暟鐨勬牱寮忚繘琛屼慨鏀�*/
   background-color: #937950;
   color: #fff;
   border-radius: 5px;
   border: 1px solid #cccccc;
 }
-</style>
\ No newline at end of file
+: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