From edeade7ac238fa7a018ccf23caa61e7c346272da Mon Sep 17 00:00:00 2001
From: mk <2403457699@qq.com>
Date: Wed, 29 Mar 2023 09:19:42 +0800
Subject: [PATCH] =?UTF-8?q?nav=E8=B7=B3=E8=BD=AC=E5=AF=BC=E5=85=A5?=
 =?UTF-8?q?=E8=AE=B0=E5=BD=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/main-navbar.vue                |  6 +++--
 src/views/modules/importRecord/index.vue |  4 +--
 src/views/modules/shequ/chaxun.vue       | 33 ++++++++++++++++--------
 3 files changed, 28 insertions(+), 15 deletions(-)

diff --git a/src/views/main-navbar.vue b/src/views/main-navbar.vue
index 8c562f8f2..51c5574ee 100644
--- a/src/views/main-navbar.vue
+++ b/src/views/main-navbar.vue
@@ -84,7 +84,7 @@
 					mode="horizontal"
 					style="min-width: 180px"
 				>
-					<el-menu-item index="3" @click="fullscreenHandle()">
+					<el-menu-item index="3" @click="toImportRecord">
 						<div class="img-nav">
 							<div class="img-wrap">
 								<img src="~@/assets/images/main/time.png" />
@@ -211,7 +211,9 @@ export default {
 			this.displayedNoticeList = false;
 			this.$router.replace("/main/home-notice");
 		},
-
+		toImportRecord(){
+			this.$router.replace("/main/importRecord-index");
+		},
 		toIndexPage() {
 			this.$router.replace("/index");
 		},
diff --git a/src/views/modules/importRecord/index.vue b/src/views/modules/importRecord/index.vue
index be1dd7675..41c0a7db6 100644
--- a/src/views/modules/importRecord/index.vue
+++ b/src/views/modules/importRecord/index.vue
@@ -1,12 +1,12 @@
 <template>
   <div class="resi-container">
-    <el-card class="resi-card-table">
+    <el-card class="">
       <el-table
         :data="tableData"
         border
         style="width: 100%"
         :height="tableHeight"
-        class="resi-table"
+        class=""
       >
         <el-table-column label="序号" type="index" align="center" width="50" />
         <el-table-column prop="originFileName" label="文件名">
diff --git a/src/views/modules/shequ/chaxun.vue b/src/views/modules/shequ/chaxun.vue
index 1cbf87d7d..cb9b62a79 100644
--- a/src/views/modules/shequ/chaxun.vue
+++ b/src/views/modules/shequ/chaxun.vue
@@ -9,13 +9,13 @@
         <div class="tabs">
           <div
             :class="{ 'z-on': searchData.type == 'jumin' }"
-            @click="searchData.type = 'jumin'"
+            @click="handelClickTab('jumin')"
           >
             查居民
           </div>
           <div
             :class="{ 'z-on': searchData.type == 'fangwu' }"
-            @click="searchData.type = 'fangwu'"
+            @click="handelClickTab('fangwu')"
           >
             查房屋
           </div>
@@ -204,6 +204,12 @@
 							</template>
               </template>
             </el-table-column>
+            <el-table-column  label="备注" align="center"   :show-overflow-tooltip="true">
+              <template slot-scope="scope" label="备注">
+                {{scope.row.remark}}
+              </template>
+            </el-table-column>
+          
 
             <el-table-column fixed="right" label="操作" align="center">
               <template slot-scope="scope">
@@ -352,7 +358,7 @@ export default {
     return {
       searchStatus: "ini", //ing over
       searchData: {
-        type: "jumin",
+        type: "fangwu",
         searchKey: "",
       },
 
@@ -424,14 +430,14 @@ export default {
             width: 110,
             options: [],
           },
-          {
-            itemId: "20220422102809_1011",
-            label: "备注",
-            columnName: "remark",
-            itemType: "textarea",
-            width: 110,
-            options: [],
-          },
+          // {
+          //   itemId: "20220422102809_1011",
+          //   label: "备注",
+          //   columnName: "remark",
+          //   itemType: "textarea",
+          //   width: 110,
+          //   options: [],
+          // },
           // {
           //   itemId: "20220422102809_1012",
           //   label: "居民分类",
@@ -719,6 +725,7 @@ export default {
   },
   methods: {
     firstSearch() {
+      console.log(getQueryPara("type"));
       this.searchData.searchKey = getQueryPara("searchKey");
       this.searchData.type = getQueryPara("type");
       this.handleClickSearchBtn();
@@ -871,6 +878,10 @@ export default {
       } else {
       }
     },
+    handelClickTab(type){
+      this.searchData.type = type
+      // this.searchData.searchKey = ''
+    }
   },
 };
 </script>