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

---
 src/views/achievements/index.vue |  433 +++++++++++++++++++++++-------------------------------
 1 files changed, 184 insertions(+), 249 deletions(-)

diff --git a/src/views/achievements/index.vue b/src/views/achievements/index.vue
index 06dc4a5..71406e4 100644
--- a/src/views/achievements/index.vue
+++ b/src/views/achievements/index.vue
@@ -1,253 +1,180 @@
 <template>
   <div class="page">
     <div class="page-header">
-      <p>鐜嬫案鐐庨櫌澹鏈垚鏋�</p>
+      <p>
+        <span>鐜嬫案鐐庨櫌澹鏈垚鏋�</span>
+      </p>
     </div>
     <div class="page-main-father">
-    <div class="page-main">
-      <!-- 鎼滅储妗� -->
-      <ul class="page-input">
-        <li class="input-main">
-          <SearchBox />
-        </li>
-        <li class="input-txt" @click="isDisplay = !isDisplay">
-          楂樼骇妫�绱�
-          <img :src="[isDisplay ? topIcon : bottomIcon]" alt="" />
-        </li>
-      </ul>
-      <!-- 楂樼骇鎼滅储 -->
-      <div v-if="isDisplay" class="page-search">
-        <MyForm
-          class="myfrom"
-          @submit="
+      <div class="page-main">
+        <!-- 鎼滅储妗� -->
+        <ul class="page-input">
+          <li class="input-main">
+            <SearchBox />
+          </li>
+          <li class="input-txt" @click="isDisplay = !isDisplay">
+            楂樼骇妫�绱�
+            <img :src="[isDisplay ? topIcon : bottomIcon]" alt="" />
+          </li>
+        </ul>
+        <!-- 楂樼骇鎼滅储 -->
+        <div v-if="isDisplay" class="page-search">
+          <MyForm class="myfrom" @submit="
             (data) => {
               CurrentPage = 1;
               onSubmit(data);
             }
-          "
-          @reset="resetForm"
-          :from="from"
-        />
-      </div>
-      <!-- 鎼滅储缁撴灉 -->
-      <div class="page-content">
-        <div class="content-left">
-          <!-- 绫诲瀷 -->
-          <ul>
-            <li class="left-title">
-              <span>{{ category.title }}</span>
-              <p @click="category.isDisplay = !category.isDisplay">
-                <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"
-                  v-model="item.checked"
-                  :title="item.name"
-                  >{{ item.name }}</el-checkbox
-                >
-                <span class="">{{ item.num }}</span>
-              </div>
-            </li>
-          </ul>
-          <!-- 骞村害 -->
-          <ul>
-            <li class="left-title">
-              <div>
-                <span>{{ annual.title }}</span>
-                <span>
-                  鏃堕棿
-                  <img
-                    class="sort-Icon"
-                    :src="[isDisplay ? sortTop : sortBottom]"
-                    alt=""
-                  />
-                </span>
-                <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="" />
-              </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
-                >
-                <span class="">{{ item.num }}</span>
-              </div>
-              <p
-                class="annual-footer"
-                v-if="annual.list && annual.list.length > 5"
-                @click="shrinkClick('a', '骞村害')"
-              >
-                {{ activeBox !== "a" ? "鏇村  鈭�" : "鏀惰捣  鈭�" }}
-              </p>
-            </li>
-          </ul>
-          <!-- 鏂囩尞鏉ユ簮 -->
-          <ul>
-            <li class="left-title">
-              <div>
-                <span>{{ sources.title }}</span>
-                <span>
-                  鏂囩尞閲�
-                  <img
-                    class="sort-Icon"
-                    :src="[isDisplay ? sortBottom : sortTop]"
-                    alt=""
-                  />
-                </span>
-              </div>
-              <p @click="sources.isDisplay = !sources.isDisplay">
-                <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
-                >
-                <span class="">{{ item.num }}</span>
-              </div>
-              <p
-                class="sources-footer"
-                v-if="sources.list && sources.list.length > 5"
-                @click="shrinkClick('b', '鏂囩尞鏉ユ簮')"
-              >
-                {{ activeBox !== "b" ? "鏇村  鈭�" : "鏀惰捣  鈭�" }}
-              </p>
-            </li>
-          </ul>
-          <!-- 瀛︾ -->
-          <ul>
-            <li class="left-title">
-              <span>{{ subject.title }}</span>
-              <p @click="subject.isDisplay = !subject.isDisplay">
-                <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
-                >
-                <span class="">{{ item.num }}</span>
-              </div>
-            </li>
-          </ul>
+          " @reset="resetForm" :from="from" />
         </div>
-        <div class="content-right">
-          <!-- title閮ㄥ垎 -->
-          <ul class="right-header">
-            <li v-for="(item, index) in associationList" :key="index">
-              <p>{{ item.type }} : {{ item.content }}</p>
-              <img :src="errorIcon" alt="" />
-            </li>
-          </ul>
-          <!-- 鍏眡x鏉� -->
-          <ul class="right-number">
-            <ul class="number-number">
-              鍏辨壘鍒�<span>{{ resultList.length }}</span
-              >鏉$粨鏋�
+        <!-- 鎼滅储缁撴灉 -->
+        <div class="page-content">
+          <div class="content-left">
+            <!-- 绫诲瀷 -->
+            <ul>
+              <li class="left-title">
+                <span>{{ category.title }}</span>
+                <p @click="category.isDisplay = !category.isDisplay">
+                  <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>
+              </li>
             </ul>
-            <ul class="number-time">
-              鍙戣〃鏃堕棿
-              <span><img :src="sortBottom" alt="" /></span>
+            <!-- 骞村害 -->
+            <ul>
+              <li class="left-title">
+                <div>
+                  <span>{{ annual.title }}</span>
+                  <span>
+                    鏃堕棿
+                    <img class="sort-Icon" :src="[isDisplay ? sortTop : sortBottom]" alt="" />
+                  </span>
+                  <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="" />
+                </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>
+                  <span class="">{{ item.num }}</span>
+                </div>
+                <p class="annual-footer" v-if="annual.list && annual.list.length > 5" @click="shrinkClick('a', '骞村害')">
+                  {{ activeBox !== "a" ? "鏇村 鈭�" : "鏀惰捣 鈭�" }}
+                </p>
+              </li>
             </ul>
-          </ul>
-          <!-- 缁撴灉灞曠ず -->
-          <ul
-            class="right-main"
-            v-for="(item, index) in resultList"
-            :key="index"
-          >
-            <li class="main-name">
-              <p>{{ item.name }}</p>
-              <p>
-                <el-button @click="goPage(item)">璇︽儏</el-button>
-                <el-button>AI鏅鸿兘闃呰</el-button>
-              </p>
-            </li>
-            <li class="main-sources">
-              <span>{{ item.type }}</span>
-              <span>{{ item.sources }}</span>
-              <span>{{ item.time }}</span>
-            </li>
-            <li class="main-author">
-              {{ item.author }}
-            </li>
-            <li class="main-title" :title="item.title">
-              <span>鎽樿: </span>{{ item.title }}
-            </li>
-            <li class="main-keyword">
-              <span>鍏抽敭璇嶏細</span>
-              <span
-                class="keyWord"
-                v-for="(citem, cindex) in item.keyword"
-                :key="cindex"
-              >
-                {{ citem.name }}
-              </span>
-            </li>
-          </ul>
-          <!-- 鍒嗛〉 -->
-          <div class="pagination">
-            <el-pagination
-              class="msg-pagination-container"
-              :background="isBackground"
-              layout="prev, pager, next"
-              :total="200"
-            >
-            </el-pagination>
+            <!-- 鏂囩尞鏉ユ簮 -->
+            <ul>
+              <li class="left-title">
+                <div>
+                  <span>{{ sources.title }}</span>
+                  <span>
+                    鏂囩尞閲�
+                    <img class="sort-Icon" :src="[isDisplay ? sortBottom : sortTop]" alt="" />
+                  </span>
+                </div>
+                <p @click="sources.isDisplay = !sources.isDisplay">
+                  <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>
+                  <span class="">{{ item.num }}</span>
+                </div>
+                <p class="sources-footer" v-if="sources.list && sources.list.length > 5"
+                  @click="shrinkClick('b', '鏂囩尞鏉ユ簮')">
+                  {{ activeBox !== "b" ? "鏇村 鈭�" : "鏀惰捣 鈭�" }}
+                </p>
+              </li>
+            </ul>
+            <!-- 瀛︾ -->
+            <ul>
+              <li class="left-title">
+                <span>{{ subject.title }}</span>
+                <p @click="subject.isDisplay = !subject.isDisplay">
+                  <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>
+                  <span class="">{{ item.num }}</span>
+                </div>
+              </li>
+            </ul>
+          </div>
+          <div class="content-right">
+            <!-- title閮ㄥ垎 -->
+            <ul class="right-header">
+              <li v-for="(item, index) in associationList" :key="index">
+                <p>{{ item.type }} : {{ item.content }}</p>
+                <img :src="errorIcon" alt="" />
+              </li>
+            </ul>
+            <!-- 鍏眡x鏉� -->
+            <ul class="right-number">
+              <ul class="number-number">
+                鍏辨壘鍒�<span>{{ resultList.length }}</span>鏉$粨鏋�
+              </ul>
+              <ul class="number-time">
+                鍙戣〃鏃堕棿
+                <span><img :src="sortBottom" alt="" /></span>
+              </ul>
+            </ul>
+            <!-- 缁撴灉灞曠ず -->
+            <ul class="right-main" v-for="(item, index) in resultList" :key="index">
+              <li class="main-name">
+                <p>{{ item.name }}</p>
+                <p>
+                  <el-button @click="goPage(item)">璇︽儏</el-button>
+                  <el-button>AI鏅鸿兘闃呰</el-button>
+                </p>
+              </li>
+              <li class="main-sources">
+                <span>{{ item.type }}</span>
+                <span>{{ item.sources }}</span>
+                <span>{{ item.time }}</span>
+              </li>
+              <li class="main-author">
+                {{ item.author }}
+              </li>
+              <li class="main-title" :title="item.title">
+                <span>鎽樿: </span>{{ item.title }}
+              </li>
+              <li class="main-keyword">
+                <span>鍏抽敭璇嶏細</span>
+                <span class="keyWord" v-for="(citem, cindex) in item.keyword" :key="cindex">
+                  {{ citem.name }}
+                </span>
+              </li>
+            </ul>
+            <!-- 鍒嗛〉 -->
+            <div class="pagination">
+              <el-pagination class="msg-pagination-container" :background="isBackground" layout="prev, pager, next"
+                :total="200">
+              </el-pagination>
+            </div>
           </div>
         </div>
       </div>
     </div>
-  </div>
   </div>
 </template>
 
@@ -648,7 +575,7 @@
   },
 
   methods: {
-    async onSubmit(val) {},
+    async onSubmit(val) { },
     //閲嶇疆鎼滅储缁撴灉
     resetForm() {
       // this.onSearch("");
@@ -687,30 +614,39 @@
   background-color: #e9e1d4;
   position: relative;
   overflow: hidden;
+  display: flex;
+  flex-direction: column;
 }
 
 .page-header {
-  background-color: #e9e1d4;
+  padding: 8px 0;
   height: 9.4%;
   width: 100%;
   text-align: left;
   border-bottom: 2px solid #937950;
+  background-color: #e9e1d4;
   position: sticky;
   top: 0;
-  z-index: 10;
+  z-index: 100;
+
   p {
-    padding: 1.6% 0 1.55% 0;
+    height: 100%;
     font-family: Alimama DongFangDaKai;
     font-size: 30px;
     text-indent: 1em;
     border-bottom: 1px solid #937950;
+    display: flex;
+    align-items: center;
   }
 }
 
-.page-main-father{
-  height: calc(100% - 9.4%);
+.page-main-father {
+  flex: 1;
   width: 100%;
+  height: 100%;
   overflow: auto;
+  padding-top: 1%;
+  padding-bottom: 2%;
 }
 
 .page-main {
@@ -843,13 +779,14 @@
     border-bottom: 1px solid #e4dace;
     padding: 10px;
     display: flex;
-    align-items: center;
     flex-wrap: wrap;
   }
 
   .category-main {
     width: 50%;
     margin-bottom: 10px;
+    display: flex;
+    align-items: center;
 
     span {
       font-family: Source Han Sans;
@@ -897,7 +834,10 @@
   }
 
   .el-checkbox {
+    vertical-align: middle;
+    font-family: "Tahoma";
     width: 70%;
+    vertical-align: middle;
   }
 
   /* 璁剧疆榧犳爣缁忚繃瀵瑰嬀妗嗭紝瀵瑰嬀妗嗚竟妗嗙殑棰滆壊 */
@@ -910,15 +850,12 @@
     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;
   }
@@ -1149,9 +1086,7 @@
   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;

--
Gitblit v1.9.1