From e00361c6bcbb1a56f6dcda22b91bdfcb2736e263 Mon Sep 17 00:00:00 2001
From: YM <479443481@qq.com>
Date: 星期五, 26 七月 2024 15:56:27 +0800
Subject: [PATCH] 1

---
 src/pages/academicSchools/index.vue |   61 +++++++++++++++++++-----------
 1 files changed, 38 insertions(+), 23 deletions(-)

diff --git a/src/pages/academicSchools/index.vue b/src/pages/academicSchools/index.vue
index fcfbb37..03b83bd 100644
--- a/src/pages/academicSchools/index.vue
+++ b/src/pages/academicSchools/index.vue
@@ -135,12 +135,21 @@
             <el-button
               size="mini"
               style="background-color: #244a7b; color: #fff"
-              @click="searchFun"
+              @click="
+                () => {
+                  searchKey = '';
+                  formData.page = 1;
+                  searchFun();
+                }
+              "
               >鎼滅储</el-button
             >
             <el-button size="mini" @click="resetForm">閲嶇疆</el-button>
           </div>
         </el-form>
+        <div style="font-size: 14px">
+          娉�:褰撳墠鏁版嵁杈冨锛屽彲鑳戒細鍑虹幇鍗℃鐨勬儏鍐碉紝璇峰敖閲忕簿纭煡璇㈡垨鏌ョ湅鏌愪竴绫绘暟鎹叧绯�
+        </div>
         <div class="fromTable">
           <el-table
             :data="tableData"
@@ -201,7 +210,7 @@
               background
               @size-change="handleSizeChangeForm"
               @current-change="handleCurrentChangeForm"
-              :current-page="formData.currentPage"
+              :current-page="formData.page"
               :page-sizes="[10, 20, 60, 100]"
               :page-size="formData.pageSize"
               layout="total, sizes, prev, pager, next, jumper"
@@ -313,12 +322,12 @@
       class="customDrawer"
     >
       <div class="drawerContent">
-        <div class="drawerTips">閬镐腑鐨勫湴鍧�锛�</div>
+        <div class="drawerTips">閫変腑鐨勫湴鍧�锛�</div>
         <div class="drawerTable">
           <div class="tableTabs">
             <div class="inputItem">
               <el-input
-                placeholder="璜嬭几鍏ュ湴鍚嶆悳绱�"
+                placeholder="璇疯緭鍏ュ湴鍚嶆悳绱�"
                 v-model="tableKey"
                 class="input-with-select"
                 @keyup.enter="searchAddress"
@@ -332,7 +341,7 @@
               </el-input>
             </div>
             <div class="selectItem">
-              <el-select v-model="dynastyId" placeholder="璜嬮伕鎿囨檪鏈�">
+              <el-select v-model="dynastyId" placeholder="璇烽�夋嫨鏃舵湡">
                 <el-option
                   v-for="item in dynastyData"
                   :key="item.dynastyId + '0'"
@@ -352,14 +361,14 @@
           >
             <el-table-column type="selection" width="55"> </el-table-column>
             <el-table-column prop="currentName" label="鍦板悕"> </el-table-column>
-            <el-table-column width="250" label="骞翠唬鍗�闁�">
+            <el-table-column width="250" label="骞翠唬鍖洪棿">
               <template slot-scope="scope">{{
                 scope.row.start + "-" + scope.row.end
               }}</template>
             </el-table-column>
             <el-table-column
               prop="dynastyName"
-              label="鏅傛湡"
+              label="鏃舵湡"
               width="250"
               show-overflow-tooltip
             >
@@ -372,7 +381,7 @@
             background
             @size-change="handleSizeChange"
             @current-change="handleCurrentChange"
-            :current-page="currentPage"
+            :current-page="page"
             :page-sizes="[10, 20, 60, 100]"
             :page-size="pageSize"
             layout="total, sizes, prev, pager, next, jumper"
@@ -381,9 +390,9 @@
           </el-pagination>
         </div>
         <div class="drawerBtn">
-          <el-button @click="setCurrent">鍏ㄩ伕鐣跺墠闋�</el-button>
-          <el-button @click="setCurrent('cancle')">鍙栨秷鍏ㄩ伕</el-button>
-          <el-button @click="drawer = false" type="primary">纰哄畾</el-button>
+          <el-button @click="setCurrent">鍏ㄩ�夊綋鍓嶉〉</el-button>
+          <el-button @click="setCurrent('cancle')">鍙栨秷鍏ㄩ��</el-button>
+          <el-button @click="drawer = false" type="primary">纭畾</el-button>
         </div>
       </div>
     </el-drawer>
@@ -499,6 +508,7 @@
   methods: {
     // 鎼滅储鍦板潃
     searchAddress() {
+      this.page = 1;
       this.gridData = [];
       this.getAddressList();
     },
@@ -608,6 +618,8 @@
         pageSize: 10,
         total: 0
       };
+      this.formData.page = 1;
+      this.searchFun();
     },
     searchFun() {
       const palceData = this.formData.actively?.map((item) => {
@@ -1641,7 +1653,7 @@
   min-height: 240px;
   display: none;
   position: fixed;
-  z-index: 99999999;
+  z-index: 9999999;
   border-radius: 2px;
   background: #fff;
 }
@@ -1714,16 +1726,17 @@
 .hotSearch {
   font-size: 0.12rem;
   color: #2c2c2c;
+}
 
-  li {
-    color: #244a7b;
-    margin: 0 0.1rem;
-    color: #244a7b;
-    &.active {
-      color: #027edc;
-      font-weight: bold;
-    }
-  }
+.hotSearch li {
+  color: #244a7b;
+  margin: 0 0.1rem;
+  color: #244a7b;
+}
+
+.hotSearch li.active {
+  color: #027edc;
+  font-weight: bold;
 }
 
 .searchDialog {
@@ -1745,7 +1758,10 @@
   background: #fff;
   border-radius: 6px;
   box-shadow: 0 0 10px -3px #000;
-  .closeBtn {
+  
+}
+
+.personDialog .closeBtn {
     position: absolute;
     right: -10px;
     top: -10px;
@@ -1757,7 +1773,6 @@
     color: #f56c6c;
     cursor: pointer;
   }
-}
 
 .selectActivelyBox {
   cursor: pointer;

--
Gitblit v1.9.1