From 2b06902e25978254f39bef49ed3cf6b1cab1c033 Mon Sep 17 00:00:00 2001
From: 杨磊 <505174330@qq.com>
Date: 星期五, 26 七月 2024 11:53:09 +0800
Subject: [PATCH] Merge branch 'master' of http://182.92.203.7:2001/r/TCM_CharacterLibrary

---
 src/pages/knowledgeBase/knowledgeBase.vue |   51 ++++++++++++++++++++++++++++++---------------------
 1 files changed, 30 insertions(+), 21 deletions(-)

diff --git a/src/pages/knowledgeBase/knowledgeBase.vue b/src/pages/knowledgeBase/knowledgeBase.vue
index 0562beb..111bf5d 100644
--- a/src/pages/knowledgeBase/knowledgeBase.vue
+++ b/src/pages/knowledgeBase/knowledgeBase.vue
@@ -1,13 +1,13 @@
 <template>
   <view>
     <!-- 椤堕儴 -->
-    <headNav idIndex="0" text="涓浗鍖诲浜虹墿鐭ヨ瘑搴�" />
+    <headNav idIndex="0" text="涓浗鍘嗕唬鍖诲浜虹墿鐭ヨ瘑搴�" />
     <!-- 鎼滅储 -->
     <view class="flex flex-center Search">
       <!-- <luanqing-search class="search_bar" @onSearch="onSearch"></luanqing-search> -->
       <advancedSearch
         @onSearch="onSearch"
-        placehold="杈撳叆濮撳悕/鍒悕/鏈濅唬/浼犱富鑱屼笟鎼滅储"
+        placehold="杈撳叆濮撳悕/鍒悕/鏃舵湡/浼犱富鑱屼笟鎼滅储"
         :isAvancedTrue="false"
         :keyword="keywords"
       />
@@ -207,7 +207,7 @@
             label="鎬у埆"
             width="70"
           ></el-table-column>
-          <el-table-column prop="period" label="鏃朵唬"></el-table-column>
+          <el-table-column prop="period" label="鏃舵湡"></el-table-column>
           <el-table-column
             prop="birthYear"
             label="鐢熷勾"
@@ -309,12 +309,12 @@
               }
             ]
           },
-          {
-            type: "input",
-            label: "鑱屽畼",
-            name: "official",
-            value: ""
-          },
+          // {
+          //   type: "input",
+          //   label: "鑱屽畼",
+          //   name: "official",
+          //   value: ""
+          // },
           {
             type: "select",
             label: "鎬у埆",
@@ -337,16 +337,16 @@
           },
           {
             type: "input",
-            label: "鏃堕棿",
+            label: "鏃舵湡",
             name: "dynasty",
             value: ""
-          },
-          {
-            type: "select",
-            label: "鏈烘瀯",
-            name: "institution",
-            options: []
           }
+          // {
+          //   type: "select",
+          //   label: "鏈烘瀯",
+          //   name: "institution",
+          //   options: []
+          // }
         ]
       },
 
@@ -365,7 +365,7 @@
       activeBox: null,
       // 鏃舵湡
       dynasty: {
-        title: "鏃朵唬",
+        title: "鏃舵湡",
         id: "",
         index: "",
         list: []
@@ -397,7 +397,8 @@
         tagId: "",
         official: "",
         genderType: ""
-      }
+      },
+      aSearchData: ""
     };
   },
   onLoad(options) {
@@ -643,6 +644,9 @@
     },
     // 楂樼骇鎼滅储
     async onSubmit(val) {
+      this.keywords = "";
+      this.hotAciveIndex = "";
+      this.aSearchData = val;
       this.profession.index = Number(val.tagId);
       this.profession.id = Number(val.tagId);
       const currentDynasty = this.dynasty.list.find(
@@ -681,6 +685,7 @@
     // 鍩虹鎼滅储
     async onSearch(val, index) {
       this.keywords = val.text;
+      this.aSearchData = "";
       if (index !== undefined) {
         this.keywords = "";
         this.hotAciveIndex = index;
@@ -744,21 +749,25 @@
     CurrentChange(val) {
       if (this.CurrentPage != val) {
         this.CurrentPage = val;
-        this.onSearch("");
+        if (this.isAdvancedSearch) {
+          this.onSubmit(this.aSearchData);
+        } else {
+          this.onSearch({ text: this.keywords });
+        }
       }
     },
     // 涓婁竴椤�
     PrevClick(val) {
       if (this.CurrentPage != val) {
         this.CurrentPage = val;
-        this.onSearch("");
+        this.onSearch({ text: this.keywords });
       }
     },
     // 涓嬩竴椤�
     NextClick(val) {
       if (this.CurrentPage != val) {
         this.CurrentPage = val;
-        this.onSearch("");
+        this.onSearch({ text: this.keywords });
       }
     }
   }

--
Gitblit v1.9.1