From 01413795feed90bf84afc4ceb520f52a6511cb6a Mon Sep 17 00:00:00 2001
From: QYF-GitLab1 <1940665526@qq.com>
Date: 星期五, 26 七月 2024 11:36:20 +0800
Subject: [PATCH] 1

---
 src/pages/academicSchools/index.vue |   67 +++++++++++++++++----------------
 1 files changed, 35 insertions(+), 32 deletions(-)

diff --git a/src/pages/academicSchools/index.vue b/src/pages/academicSchools/index.vue
index e8a2f12..0a9d719 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"
@@ -298,11 +307,10 @@
         <span @click="closeDom">鍏抽棴</span>
       </div>
       <div class="content">
-        <p>濮撳悕锛歿{ detailData.name }}</p>
-        <p>鍒悕锛歿{ detailData.alias }}</p>
-        <p>绫嶈疮锛歿{ detailData.nativePlace }}</p>
-        <p>鍖诲鍒嗙锛� {{ detailData.medicalBranch }}</p>
-        <p>灏忎紶锛歿{ detailData.biography }}</p>
+        <p>浠h〃浜虹墿锛歿{ detailData.character }}</p>
+        <p>閲嶈鍖诲锛歿{ detailData.skilledDoctor }}</p>
+        <p>浠h〃鎬ц憲浣滐細{{ detailData.works }}</p>
+        <p>瀛︽淳鎬濇兂锛� {{ detailData.thought }}</p>
       </div>
       <div class="btn" @click="spaceTimeArr(detailData.id)">鏌ョ湅鏇村>>></div>
     </div>
@@ -373,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"
@@ -500,10 +508,11 @@
   methods: {
     // 鎼滅储鍦板潃
     searchAddress() {
+      this.page = 1;
       this.gridData = [];
       this.getAddressList();
     },
-    //  鍒嗛〉
+    // 鍒嗛〉
     handleSizeChange(val) {
       this.pageSize = val;
       this.getAddressList();
@@ -609,6 +618,8 @@
         pageSize: 10,
         total: 0,
       };
+      this.formData.page = 1;
+      this.searchFun();
     },
     searchFun() {
       const palceData = this.formData.actively?.map((item) => {
@@ -1381,30 +1392,22 @@
         div.style.display = "block";
         div.style.left = e.offsetX + 50 + "px";
         div.style.top = e.offsetY - 50 + "px";
-        const data = this.infoOfPersons?.find((i) => i.id == id);
+        const data = this.infoOfSchools?.find((i) => i.schoolId == id);
         const obj = {
           id: params.data.id,
-          name:
-            data?.NAME?.map((e, i) => {
-              i += 1;
-              return e["content" + i];
-            }).join("銆�") ?? "",
-          alias:
-            data?.ALIAS?.map((e, i) => {
-              i += 1;
-              return e["content" + i];
-            }).join("銆�") ?? "",
-          nativePlace:
-            data?.NATIVE_PLACE?.map((e, i) => {
-              i += 1;
-              return e["content" + i];
-            }).join("銆�") ?? "",
-          medicalBranch:
-            data?.MEDICAL_BRANCH?.map((e, i) => {
-              i += 1;
-              return e["content" + i];
-            }).join("銆�") ?? "",
-          biography: data?.BIOGRAPHY ?? "",
+          name: data.name[0],
+          character: data.important_people
+            ? data.important_people.map((item) => item.personName).join("銆�")
+            : "",
+          skilledDoctor: data.important_physician
+            ? data.important_physician.map((item) => item.personName).join("銆�")
+            : "",
+          works: data.important_work
+            ? data.important_work.map((item) => item.literatureTitle).join("銆�")
+            : "",
+          thought: data.school_introduction
+            ? data.school_introduction.map((item) => item).join("銆�")
+            : "",
         };
         this.detailData = obj;
       }
@@ -1637,7 +1640,7 @@
   min-height: 240px;
   display: none;
   position: fixed;
-  z-index: 99999999;
+  z-index: 99;
   border-radius: 2px;
   background: #fff;
 }

--
Gitblit v1.9.1