From 4462b0aeecbf3b6d11f7a0f744e8bca64b0994e1 Mon Sep 17 00:00:00 2001
From: tianq <tianq@hgzp.com.cn>
Date: Mon, 3 Apr 2023 11:13:06 +0800
Subject: [PATCH] bugs

---
 src/views/dataBoard/renfang/index.vue      |   7 +-
 src/views/dataBoard/renfang/resi/class.vue | 259 +++++++++++----------
 src/views/main-navbar.vue                  | 247 +++++++-------------
 src/views/modules/home/index.vue           |  10 +-
 src/views/modules/shequ/chaxun.vue         |   7 +-
 5 files changed, 238 insertions(+), 292 deletions(-)

diff --git a/src/views/dataBoard/renfang/index.vue b/src/views/dataBoard/renfang/index.vue
index 0d5552b4c..69f8f7304 100644
--- a/src/views/dataBoard/renfang/index.vue
+++ b/src/views/dataBoard/renfang/index.vue
@@ -292,7 +292,7 @@
 						<div class="list" v-if="resiCategoryData.length > 0">
 							<div
 								class="item"
-								@click="toResiClassPage(item.code, item.name)"
+								@click="toResiClassPage('normal',item.code, item.name)"
 								:key="item.code + index"
 								v-for="(item, index) in resiCategoryData"
 							>
@@ -332,7 +332,7 @@
 							v-if="resiCategoryForecastData.length > 0"
 						>
 							<div
-								@click="toResiClassPage(item.code, item.name)"
+								@click="toResiClassPage('ai',item.code, item.name)"
 								class="item"
 								:key="item.code + index"
 								v-for="(
@@ -561,13 +561,14 @@ export default {
 			this.loading = true;
 		},
 
-		toResiClassPage(type_id = "", type_name) {
+		toResiClassPage(pageType,type_id = "", type_name) {
 			this.$router.push({
 				path: "/dataBoard/renfang/resi-class",
 				query: {
 					org_id: this.orgId,
 					type_id,
 					type_name,
+					pageType
 				},
 			});
 		},
diff --git a/src/views/dataBoard/renfang/resi/class.vue b/src/views/dataBoard/renfang/resi/class.vue
index 4f8e9da32..60303c8b9 100644
--- a/src/views/dataBoard/renfang/resi/class.vue
+++ b/src/views/dataBoard/renfang/resi/class.vue
@@ -1,35 +1,16 @@
 <template>
 	<div class="g-pgi">
 		<!-- 组织路由 -->
-		<cpt-bread
-			:separator="'/'"
-			@tap="handleClickBreadItem"
-			:breadList="breadList"
-		></cpt-bread>
+		<cpt-bread :separator="'/'" @tap="handleClickBreadItem" :breadList="breadList"></cpt-bread>
 
 		<div class="m-title">
-			<img
-				class="title_img"
-				src="@/assets/images/index/list-logo.png"
-				alt
-			/>
+			<img class="title_img" src="@/assets/images/index/list-logo.png" alt />
 			<div class="tip_title">{{ tableTitle }}</div>
 			<div class="title_line"></div>
 
 			<div class="second-select" v-if="type_id == 'special_popu'">
-				<el-select
-					v-model="subclassId"
-					:popper-append-to-body="false"
-					placeholder="请选择"
-				>
-					<el-option
-						v-for="item in subclassList"
-						:key="item.value"
-						:label="item.label"
-						:value="item.value"
-						@click.native="handleChangeDate(item.value)"
-					>
-					</el-option>
+				<el-select v-model="subclassId" :popper-append-to-body="false" placeholder="请选择">
+					<el-option v-for="item in subclassList" :key="item.value" :label="item.label" :value="item.value" @click.native="handleChangeDate(item.value)"></el-option>
 				</el-select>
 			</div>
 		</div>
@@ -47,56 +28,51 @@
 			></cpt-tb>
 		</div>
 
-		<resi-details
-			@close="displayedResiId = ''"
-			:resi-id="displayedResiId"
-			v-if="displayedResiId"
-		/>
+		<resi-details @close="displayedResiId = ''" :resi-id="displayedResiId" v-if="displayedResiId" />
 	</div>
 </template>
 
 <script>
-import cptTb from "@/views/dataBoard/cpts/tb";
-import cptBread from "@/views/dataBoard/renfang/cpts/bread";
-import resiDetails from "@/views/dataBoard/cpts/resi-details";
-import { requestPostBi } from "@/js/dai/request-bipass";
-import getQueryPara from "dai-js/modules/getQueryPara";
+import cptTb from '@/views/dataBoard/cpts/tb';
+import cptBread from '@/views/dataBoard/renfang/cpts/bread';
+import resiDetails from '@/views/dataBoard/cpts/resi-details';
+import { requestPostBi } from '@/js/dai/request-bipass';
+import getQueryPara from 'dai-js/modules/getQueryPara';
 
 export default {
-	name: "resi-list",
+	name: 'resi-list',
 
 	components: {
 		cptTb,
 		cptBread,
-		resiDetails,
+		resiDetails
 	},
 
 	data() {
 		return {
 			breadList: [
 				{
-					type: "back",
+					type: 'back',
 					meta: {
-						title: "人房总览",
-					},
+						title: '人房总览'
+					}
 				},
 				{
 					meta: {
-						title: "居民类别",
-					},
-				},
+						title: '居民类别'
+					}
+				}
 			],
 
-			tableTitle: "居民类别",
-			searchName: "",
-
-			orgLevel: "",
-			org_id: "",
-			type_id: "", // 居民类别
-
+			tableTitle: '居民类别',
+			searchName: '',
+			pageType: '',
+			orgLevel: '',
+			org_id: '',
+			type_id: '', // 居民类别
+			type_name: '',
 			loading: true,
-			pageSize:
-				parseInt(localStorage.getItem("dataBoard_PageSize")) || 20,
+			pageSize: parseInt(localStorage.getItem('dataBoard_PageSize')) || 20,
 			pageNo: 1,
 			total: 0,
 			srcTableData: [],
@@ -104,73 +80,65 @@ export default {
 
 			colList: [
 				{
-					align: "left",
-					width: "5%",
+					align: 'left',
+					width: '5%'
 				},
 				{
-					align: "left",
-					width: "10%",
+					align: 'left',
+					width: '10%'
 				},
 				{
-					align: "left",
-					width: "20%",
+					align: 'left',
+					width: '20%'
 				},
 				{
-					align: "left",
-					width: "20%",
+					align: 'left',
+					width: '20%'
 				},
 				{
-					align: "left",
-					width: "15%",
+					align: 'left',
+					width: '15%'
 				},
 				{
-					align: "left",
-					width: "10%",
+					align: 'left',
+					width: '10%'
 				},
 				{
-					align: "left",
-					width: "5%",
+					align: 'left',
+					width: '5%'
 				},
 				{
-					align: "left",
-					width: "10%",
+					align: 'left',
+					width: '10%'
 				},
 				{
-					align: "left",
-					width: "10%",
-				},
+					align: 'left',
+					width: '10%'
+				}
 			],
 
-			header: [
-				"序号",
-				"姓名",
-				"所属网格",
-				"所属房屋",
-				"联系电话",
-				"证件号",
-				"性别",
-				"出生日期",
-				"操作",
-			],
+			header: ['序号', '姓名', '所属网格', '所属房屋', '联系电话', '证件号', '性别', '出生日期', '操作'],
 
-			displayedResiId: "",
+			displayedResiId: '',
 
 			subclassList: [],
-			subclassId: "",
+			subclassId: ''
 		};
 	},
 
 	activated() {
-		this.org_id = getQueryPara("org_id");
-		this.type_id = getQueryPara("type_id");
-		const type_name = getQueryPara("type_name");
-		this.breadList[1].meta.title = type_name + "居民列表";
-		this.tableTitle = type_name + "居民列表";
+		this.org_id = getQueryPara('org_id');
+		this.type_id = getQueryPara('type_id');
+		this.pageType = getQueryPara('pageType');
+		this.type_name = getQueryPara('type_name');
+		const type_name = getQueryPara('type_name');
+		this.breadList[1].meta.title = type_name + '居民列表';
+		this.tableTitle = type_name + '居民列表';
 
 		this.pageNo = 1;
 		this.getList();
 		this.getCount();
-		if (this.type_id == "special_popu") {
+		if (this.type_id == 'special_popu') {
 			this.getSubclass();
 		}
 	},
@@ -180,12 +148,12 @@ export default {
 			this.pageNo = 1;
 			this.getList();
 			this.getCount();
-		},
+		}
 	},
 
 	methods: {
 		handleClickBreadItem({ item }) {
-			if (item.type == "back") {
+			if (item.type == 'back') {
 				this.$router.back();
 			}
 		},
@@ -203,25 +171,25 @@ export default {
 		},
 
 		handleSizeChange(pageSize) {
-			localStorage.setItem("dataBoard_PageSize", pageSize);
+			localStorage.setItem('dataBoard_PageSize', pageSize);
 			this.pageSize = pageSize;
 			this.getList();
 		},
 
 		async getSubclass() {
-			console.log("=================getSubclass");
+			console.log('=================getSubclass');
 			const { org_id, type_id } = this;
 			this.loading = true;
 
-			const url = "special_type_list";
+			const url = 'special_type_list';
 
 			const { data, code, msg } = await requestPostBi(
 				url,
 				{
 					queryParam: {
 						org_id,
-						type_id,
-					},
+						type_id
+					}
 				},
 				{
 					// mockId: 62648939,
@@ -234,7 +202,7 @@ export default {
 				this.subclassList = data.map((item, index) => {
 					return {
 						label: item.type_name,
-						value: item.type_id,
+						value: item.type_id
 					};
 				});
 			} else {
@@ -243,20 +211,33 @@ export default {
 		},
 
 		async getList() {
+			console.log('dddddddddddddddddddd', this.type_name);
 			const { org_id, type_id, subclassId, pageNo, pageSize } = this;
 			this.loading = true;
-
-			const url = "resident_class_list";
+			let url = '';
+			let queryParam = {};
+			if (this.pageType == 'normal') {
+				url = 'resident_class_list';
+				queryParam = {
+					org_id,
+					type_id: subclassId || type_id,
+					pageNo,
+					pageSize
+				};
+			} else {
+				url = 'resident_class_predict_list';
+				queryParam = {
+					org_id,
+					resi_class_name: this.type_name,
+					page_num:pageNo,
+					page_size:pageSize
+				};
+			}
 
 			const { data, code, msg } = await requestPostBi(
 				url,
 				{
-					queryParam: {
-						org_id,
-						type_id: subclassId || type_id,
-						pageNo,
-						pageSize,
-					},
+					queryParam
 				},
 				{
 					// mockId: 60069169,
@@ -268,21 +249,37 @@ export default {
 			if (code === 0) {
 				this.srcTableData = data;
 				// this.total = data.total;
-
+if (this.pageType == 'normal') {
 				this.list = data.map((item, index) => {
 					return [
 						index + 1,
-						item.user_name ? item.user_name : "--",
-						item.grid ? item.grid : "--",
-						item.house ? item.house : "--",
-						item.telephone ? item.telephone : "--",
-						item.idcard ? item.idcard : "--",
-						item.gender ? item.gender : "--",
-						item.birthday ? item.birthday : "--",
-
-						{ type: "operate", list: ["查看"] },
+						item.user_name ? item.user_name : '--',
+						item.grid ? item.grid : '--',
+						item.house ? item.house : '--',
+						item.telephone ? item.telephone : '--',
+						item.idcard ? item.idcard : '--',
+						item.gender ? item.gender : '--',
+						item.birthday ? item.birthday : '--',
+
+						{ type: 'operate', list: ['查看'] }
 					];
 				});
+				}else{
+					this.list = data.map((item, index) => {
+						return [
+							index + 1,
+							item.name ? item.name : '--',
+							item.grid ? item.grid : '--',
+							item.house ? item.house : '--',
+							item.telephone ? item.telephone : '--',
+							item.idcard ? item.idcard : '--',
+							item.gender ? item.gender : '--',
+							item.birthday ? item.birthday : '--',
+					
+							{ type: 'operate', list: ['查看'] }
+						];
+					});
+				}
 			} else {
 				this.$message.error(msg);
 			}
@@ -291,17 +288,31 @@ export default {
 		async getCount() {
 			const { org_id, type_id, subclassId, pageNo, pageSize } = this;
 
-			const url = "resident_class_list_total";
+			let url = '';
+			let queryParam = {};
+
+			if (this.pageType == 'normal') {
+				url = 'resident_class_list_total';
+				queryParam = {
+					org_id,
+					type_id: subclassId || type_id,
+					pageNo,
+					pageSize
+				};
+			} else {
+				url = 'resident_class_predict_total';
+				queryParam = {
+					org_id,
+					resi_class_name: this.type_name,
+					page_num:pageNo,
+					page_size:pageSize
+				};
+			}
 
 			const { data, code, msg } = await requestPostBi(
 				url,
 				{
-					queryParam: {
-						org_id,
-						type_id: subclassId || type_id,
-						pageNo,
-						pageSize,
-					},
+					queryParam
 				},
 				{
 					// mockId: 63070913,
@@ -313,12 +324,12 @@ export default {
 			} else {
 				this.$message.error(msg);
 			}
-		},
+		}
 	},
 
 	destroyed() {
-		console.log("我已经离开了！");
-	},
+		console.log('我已经离开了！');
+	}
 };
 </script>
 
diff --git a/src/views/main-navbar.vue b/src/views/main-navbar.vue
index ca7eeca3c..02004d01f 100644
--- a/src/views/main-navbar.vue
+++ b/src/views/main-navbar.vue
@@ -2,76 +2,38 @@
 	<div>
 		<nav v-if="showHeader" class="aui-navbar">
 			<div class="aui-navbar__header">
-				<div class="aui-navbar__logo">
-					<img
-						v-if="$store.state.user.headUrl"
-						:src="$store.state.user.headUrl"
-					/>
-				</div>
+				<div class="aui-navbar__logo"><img v-if="$store.state.user.headUrl" :src="$store.state.user.headUrl" /></div>
 				<h1 class="aui-navbar__brand">
-					<a class="aui-navbar__brand-lg" href="javascript:;">{{
-						this.$store.state.user.agencyName
-					}}</a>
-					<a class="aui-navbar__brand-mini" href="javascript:;">{{
-						this.$store.state.user.agencyName.slice(0, 2)
-					}}</a>
+					<a class="aui-navbar__brand-lg" href="javascript:;">{{ this.$store.state.user.agencyName }}</a>
+					<a class="aui-navbar__brand-mini" href="javascript:;">{{ this.$store.state.user.agencyName.slice(0, 2) }}</a>
 				</h1>
 			</div>
 
 			<div class="aui-navbar__body">
 				<el-menu class="aui-navbar__menu mr-auto" mode="horizontal">
-					<el-menu-item
-						v-if="false"
-						index="1"
-						@click="
-							$store.state.sidebarFold = !$store.state.sidebarFold
-						"
-					>
-						<svg
-							class="icon-svg aui-navbar__icon-menu aui-navbar__icon-menu--switch"
-							aria-hidden="true"
-						>
-							<use xlink:href="#icon-outdent"></use>
-						</svg>
+					<el-menu-item v-if="false" index="1" @click="$store.state.sidebarFold = !$store.state.sidebarFold">
+						<svg class="icon-svg aui-navbar__icon-menu aui-navbar__icon-menu--switch" aria-hidden="true"><use xlink:href="#icon-outdent"></use></svg>
 					</el-menu-item>
 
 					<el-menu-item v-if="true" index="2" @click="refresh()">
-						<svg
-							class="icon-svg aui-navbar__icon-menu"
-							aria-hidden="true"
-						>
-							<use xlink:href="#icon-sync"></use>
-						</svg>
+						<svg class="icon-svg aui-navbar__icon-menu" aria-hidden="true"><use xlink:href="#icon-sync"></use></svg>
 					</el-menu-item>
 				</el-menu>
 
-				<el-menu
-					class="aui-navbar__menu"
-					mode="horizontal"
-					style="min-width: 180px"
-				>
-					<el-menu-item
-						index="3"
-						@click="handleCLickNav"
-					>
+				<el-menu class="aui-navbar__menu" mode="horizontal" style="min-width: 180px">
+					<el-menu-item index="3" @click="handleCLickNav">
 						<div class="nav-item">
 							<img src="~@/assets/images/main/nav-sjdb.png" />
 							<span>数据看板</span>
 						</div>
 					</el-menu-item>
-					<el-menu-item
-						index="3"
-						@click="$router.push({ name: 'dataBoard' })"
-					>
+					<el-menu-item index="3" @click="$router.push({ name: 'dataBoard' })">
 						<div class="nav-item">
 							<img src="~@/assets/images/main/nav-zntb.png" />
 							<span>智能填报</span>
 						</div>
 					</el-menu-item>
-					<el-menu-item
-						index="3"
-						@click="$router.push({ name: 'dataBoard' })"
-					>
+					<el-menu-item index="3" @click="$router.push({ name: 'dataBoard' })">
 						<div class="nav-item">
 							<img src="~@/assets/images/main/nav-sjjy.png" />
 							<span>数据校验</span>
@@ -79,174 +41,143 @@
 					</el-menu-item>
 				</el-menu>
 
-				<el-menu
-					class="aui-navbar__menu"
-					mode="horizontal"
-					style="min-width: 180px"
-				>
+				<el-menu class="aui-navbar__menu" mode="horizontal" style="min-width: 180px">
 					<el-menu-item index="3" @click="toImportRecord">
 						<div class="img-nav">
-							<div class="img-wrap">
-								<img src="~@/assets/images/main/time.png" />
-							</div>
+							<div class="img-wrap"><img src="~@/assets/images/main/time.png" /></div>
 						</div>
 					</el-menu-item>
 
 					<el-menu-item index="2" @click="toNoticePage">
 						<div class="img-nav" :class="{ 'z-on': false }">
-							<span class="corner-dot" v-if="unreadMsgNum > 0">{{
-								unreadMsgNum
-							}}</span>
-							<div class="img-wrap">
-								<img src="~@/assets/images/main/hint.png" />
-							</div>
+							<span class="corner-dot" v-if="unreadMsgNum > 0">{{ unreadMsgNum }}</span>
+							<div class="img-wrap"><img src="~@/assets/images/main/hint.png" /></div>
 						</div>
 					</el-menu-item>
 
 					<el-menu-item index="1" class="aui-navbar__avatar">
 						<el-dropdown placement="bottom" :show-timeout="0">
 							<span class="el-dropdown-link">
-								<img
-									v-if="$store.state.user.gender === '2'"
-									src="~@/assets/images/main/default-avatar.png"
-								/>
-								<img
-									v-else
-									src="~@/assets/images/main/default-avatar.png"
-								/>
+								<img v-if="$store.state.user.gender === '2'" src="~@/assets/images/main/default-avatar.png" />
+								<img v-else src="~@/assets/images/main/default-avatar.png" />
 								<span>{{ $store.state.user.realName }}</span>
 								<i class="el-icon-arrow-down"></i>
 							</span>
 							<el-dropdown-menu slot="dropdown">
-								<el-dropdown-item
-									@click.native="updatePasswordHandle()"
-									>{{
-										$t("updatePassword.title")
-									}}</el-dropdown-item
-								>
-								<el-dropdown-item
-									@click.native="logoutHandle()"
-									>{{ $t("logout") }}</el-dropdown-item
-								>
+								<el-dropdown-item @click.native="updatePasswordHandle()">{{ $t('updatePassword.title') }}</el-dropdown-item>
+								<el-dropdown-item @click.native="logoutHandle()">{{ $t('logout') }}</el-dropdown-item>
 							</el-dropdown-menu>
 						</el-dropdown>
 					</el-menu-item>
 				</el-menu>
 			</div>
 			<!-- 弹窗, 修改密码 -->
-			<update-password-work
-				v-if="updatePassowrdVisible"
-				ref="updatePassowrd"
-			></update-password-work>
+			<update-password-work v-if="updatePassowrdVisible" ref="updatePassowrd"></update-password-work>
 		</nav>
 		<nav v-else class="aui-navbar main-line"></nav>
 
-		<div
-			class="m-newMsg"
-			v-if="noticeList.length > 0 && displayedNoticeList"
-		>
+		<div class="m-newMsg" v-if="noticeList.length > 0 && displayedNoticeList">
 			<div class="title">新提醒</div>
-			<div class="btn-close" @click="displayedNoticeList = false">
-				<img src="~@/assets/images/main/close.png" />
-			</div>
+			<div class="btn-close" @click="displayedNoticeList = false"><img src="~@/assets/images/main/close.png" /></div>
 			<div class="row">
 				<span class="date">{{ noticeList[0].createdTime }}</span>
 				<i class="i-new">NEW</i>
 			</div>
-			<div class="cnt" @click="toNoticePage">
-				{{ noticeList[0].content }}
-			</div>
+			<div class="cnt" @click="toNoticePage()">{{ noticeList[0].content }}</div>
 		</div>
 	</div>
 </template>
 
 <script>
-import { messages } from "@/i18n";
-import screenfull from "screenfull";
-import UpdatePasswordWork from "./main-navbar-update-password-work";
-import { clearLoginInfo } from "@/utils";
-import { requestPost, requestGet } from "@/js/dai/request";
-import nextTick from "dai-js/tools/nextTick";
+import { messages } from '@/i18n';
+import screenfull from 'screenfull';
+import UpdatePasswordWork from './main-navbar-update-password-work';
+import { clearLoginInfo } from '@/utils';
+import { requestPost, requestGet } from '@/js/dai/request';
+import nextTick from 'dai-js/tools/nextTick';
 
 export default {
-	inject: ["refresh"],
+	inject: ['refresh'],
 	data() {
 		return {
 			showHeader: true,
 			i18nMessages: messages,
 			updatePassowrdVisible: false,
-			customerName: "",
+			customerName: '',
 
 			unreadMsgNum: 0,
 
 			noticeList: [],
 
-			displayedNoticeList: true,
+			displayedNoticeList: true
 		};
 	},
 	components: {
-		UpdatePasswordWork,
+		UpdatePasswordWork
 	},
 	created() {
-		let platformToken = localStorage.getItem("showHeader") || "";
-		if (
-			typeof platformToken !== "undefined" &&
-			platformToken !== "undefined" &&
-			platformToken !== ""
-		) {
+		let platformToken = localStorage.getItem('showHeader') || '';
+		if (typeof platformToken !== 'undefined' && platformToken !== 'undefined' && platformToken !== '') {
 			this.showHeader = false;
 		}
 		this.changeCustomerName();
-		console.log("=============================", this.userType);
+		console.log('=============================', this.userType);
 
 		this.pollGetNoticeData();
 	},
 	computed: {
 		userType() {
-			return localStorage.getItem("userType");
-		},
+			return localStorage.getItem('userType');
+		}
 	},
 	methods: {
+		async readClearOne(item) {
+			console.log('item', item);
+			const url = `/message/intelligentMessage/msg/clearOne/?msgId=${item.id}`;
+			const { data, code, msg } = await requestPost(url);
+			if (code == 0) {
+				
+			} else if (code >= 8000) {
+				this.$message.error(msg);
+			}
+		},
 		toNoticePage() {
 			this.displayedNoticeList = false;
-			this.$router.replace("/main/home-notice");
+			this.readClearOne(this.noticeList[0]);
+
+			this.$router.replace('/main/home-notice');
 		},
-		toImportRecord(){
-			this.$router.replace("/main/importRecord-index");
+		toImportRecord() {
+			this.$router.replace('/main/importRecord-index');
 		},
 		toIndexPage() {
-			this.$router.replace("/index");
+			this.$router.replace('/index');
 		},
 		// 通过menuId与动态(菜单)路由进行匹配跳转至指定路由
 		gotoRouteHandle(menuId, idx) {
-			var route = window.SITE_CONFIG["dynamicMenuRoutes"].filter(
-				(item) => item.meta.menuId === menuId
-			)[0];
+			var route = window.SITE_CONFIG['dynamicMenuRoutes'].filter(item => item.meta.menuId === menuId)[0];
 			if (route) {
-				if (route.meta.iframeURL.endsWith("【跳转新页面】")) {
+				if (route.meta.iframeURL.endsWith('【跳转新页面】')) {
 					return window.open(route.meta.iframeURL.slice(0, -7));
 				} else {
 					this.$router.push({ name: route.name });
 				}
 			}
 			this.$store.state.LevelOneMenuActiveName = menuId;
-			this.$store.state.sidebarActiveSubMenuList =
-				this.$store.state.sidebarMenuList[idx].children || [];
-			console.log("this.$store.state", this.$store.state);
-			console.log("this.$route", this.$route);
+			this.$store.state.sidebarActiveSubMenuList = this.$store.state.sidebarMenuList[idx].children || [];
+			console.log('this.$store.state', this.$store.state);
+			console.log('this.$route', this.$route);
 		},
 		changeCustomerName(customerName) {
-			this.customerName =
-				localStorage.getItem("customerName") ||
-				"党建引领基层治理互联管理平台";
+			this.customerName = localStorage.getItem('customerName') || '党建引领基层治理互联管理平台';
 		},
 		// 全屏
 		fullscreenHandle() {
 			if (!screenfull.enabled) {
 				return this.$message({
-					message: this.$t("fullscreen.prompt"),
-					type: "warning",
-					duration: 500,
+					message: this.$t('fullscreen.prompt'),
+					type: 'warning',
+					duration: 500
 				});
 			}
 			screenfull.toggle();
@@ -260,25 +191,18 @@ export default {
 		},
 		// 退出
 		logoutHandle() {
-			this.$confirm(
-				this.$t("prompt.info", { handle: this.$t("logout") }),
-				this.$t("prompt.title"),
-				{
-					confirmButtonText: this.$t("confirm"),
-					cancelButtonText: this.$t("cancel"),
-					type: "warning",
-				}
-			)
+			this.$confirm(this.$t('prompt.info', { handle: this.$t('logout') }), this.$t('prompt.title'), {
+				confirmButtonText: this.$t('confirm'),
+				cancelButtonText: this.$t('cancel'),
+				type: 'warning'
+			})
 				.then(() => {
 					//关闭所有标签页
 					// tabs, 关闭全部
-					this.$store.state.contentTabs =
-						this.$store.state.contentTabs.filter(
-							(item) => item.name === "home"
-						);
+					this.$store.state.contentTabs = this.$store.state.contentTabs.filter(item => item.name === 'home');
 
 					this.$http
-						.post("/auth/login/logout")
+						.post('/auth/login/logout')
 						.then(({ data: res }) => {
 							if (res.code !== 0) {
 								//别处登陆时 退出不提示 直接跳登陆页即可
@@ -288,7 +212,7 @@ export default {
 							}
 
 							clearLoginInfo();
-							this.$router.push({ name: "login" });
+							this.$router.push({ name: 'login' });
 							// if (localStorage.getItem('userType') === 'work') {
 							//   this.$router.push({ name: 'loginWork' })
 							// } else {
@@ -308,16 +232,16 @@ export default {
 
 		// 智能提醒数据
 		async getNoticeData() {
-			const url = "/message/intelligentMessage/msg/notice";
+			const url = '/message/intelligentMessage/msg/notice';
 			const { data, code, msg } = await requestGet(url, {});
 			if (code === 0) {
-				console.log("列表请求成功！！！！！！！！！！！！！！");
+				console.log('列表请求成功！！！！！！！！！！！！！！');
 				if (data.unreadNum > 0 && this.unreadMsgNum < data.unreadNum) {
 					this.getNoticeList();
 					this.displayedNoticeList = true;
-					setTimeout(()=>{
+					setTimeout(() => {
 						this.displayedNoticeList = false;
-					},5000)
+					}, 5000);
 				}
 				this.unreadMsgNum = data.unreadNum;
 			} else {
@@ -326,11 +250,11 @@ export default {
 
 		//加载组织数据
 		async getNoticeList() {
-			const url = "/message/intelligentMessage/page";
+			const url = '/message/intelligentMessage/page';
 			let params = {
 				page: this.pageNo,
 				limit: this.pageSize,
-				readFlag: 0,
+				readFlag: 0
 			};
 
 			const { data, code, msg } = await requestGet(url, params);
@@ -341,19 +265,19 @@ export default {
 				this.$message.error(msg);
 			}
 		},
-		handleCLickNav(){
-						let routeData = this.$router.resolve({
-				name: "dataBoard"
+		handleCLickNav() {
+			let routeData = this.$router.resolve({
+				name: 'dataBoard'
 			});
 			// window.open(this.$router.push({ name: 'dataBoard' }))
 			window.open(routeData.href, '_blank');
-		},
-	},
+		}
+	}
 };
 </script>
 
 <style lang="scss" scoped>
-@import "~@/assets/scss/c/function.scss";
+@import '~@/assets/scss/c/function.scss';
 
 .main-line {
 	height: 50px;
@@ -392,10 +316,9 @@ export default {
 	padding: 16px;
 	width: 320px;
 	background: #ffffff;
-	box-shadow: 0px 6px 16px 0px rgba(0, 0, 0, 0.08),
-		0px 3px 6px -4px rgba(0, 0, 0, 0.12);
+	box-shadow: 0px 6px 16px 0px rgba(0, 0, 0, 0.08), 0px 3px 6px -4px rgba(0, 0, 0, 0.12);
 	border-radius: 4px;
-	
+
 	.title {
 		margin-bottom: 16px;
 		height: 22px;
@@ -450,7 +373,7 @@ export default {
 		font-weight: 400;
 		line-height: 22px;
 		cursor: pointer;
-		&:hover{
+		&:hover {
 			color: #0056d6 !important;
 		}
 	}
diff --git a/src/views/modules/home/index.vue b/src/views/modules/home/index.vue
index a8f6510e5..540cdc2c4 100644
--- a/src/views/modules/home/index.vue
+++ b/src/views/modules/home/index.vue
@@ -11,13 +11,13 @@
 						<div class="tabs">
 							<div
 								:class="{ 'z-on': searchData.type == 'jumin' }"
-								@click="searchData.type = 'jumin'"
+								@click="searchDataTab('jumin')"
 							>
 								查居民
 							</div>
 							<div
 								:class="{ 'z-on': searchData.type == 'fangwu' }"
-								@click="searchData.type = 'fangwu'"
+								@click="searchDataTab('fangwu')"
 							>
 								查房屋
 							</div>
@@ -349,6 +349,11 @@ export default {
 		);
 	},
 	methods: {
+		searchDataTab(str){
+		
+			searchData.type = str;
+			this.handleClickSearchBtn();
+		},
 		handleClickCategory(item) {
 			this.$router.push({
 				path: "/main/base-resi",
@@ -384,6 +389,7 @@ export default {
 		},
 
 		handleClickSearchBtn() {
+			console.log("dddd")
 			const {
 				searchData: { type, searchKey },
 			} = this;
diff --git a/src/views/modules/shequ/chaxun.vue b/src/views/modules/shequ/chaxun.vue
index cd67066b4..1d4d6b69e 100644
--- a/src/views/modules/shequ/chaxun.vue
+++ b/src/views/modules/shequ/chaxun.vue
@@ -754,9 +754,11 @@ export default {
     },
 
     handleClickSearchBtn() {
+		
       const {
         searchData: { type, searchKey },
       } = this;
+	  console.log("ddddddddd",type)
       if (!searchKey) return this.$message.error("请输入搜索条件");
       if (type == "jumin") {
         this.searchJumin.pageNo = 1;
@@ -885,7 +887,10 @@ export default {
       }
     },
     handelClickTab(type){
-      this.searchData.type = type
+		console.log(type)
+      this.searchData.type = type;
+	  
+	  this.handleClickSearchBtn()
       // this.searchData.searchKey = ''
     }
   },