人房总览bug

src/views/dataBoard/cpts/map/popup.vue

@@ -54,7 +54,7 @@
 					<span>{{ info.classtype || "--" }}</span>
 				</div>
 
-				<div class="operate">
+				<div class="operate" v-if="false">
 					<div
 						@click="handleClickBtn('create-demand')"
 						v-if="info.agencyId == $store.state.user.agencyId"
@@ -154,6 +154,10 @@
 					<span class="field">楼长电话：</span>
 					<span>{{ info.hm_phone || "--" }}</span>
 				</div>
+				<div class="item">
+					<span class="field">详细地址：</span>
+					<span>{{ info.location || "--" }}</span>
+				</div>
 			</div>
 
 			<div v-if="type === '4'">
@@ -195,9 +199,13 @@
 					<span>{{ info.holder_phone || "--" }}</span>
 				</div>
 				<div class="item">
-					<span class="field">房主身份证：</span>
+					<span class="field">房主证件号：</span>
 					<span>{{ info.holder_idcard || "--" }}</span>
 				</div>
+				<div class="item">
+					<span class="field">备注：</span>
+					<span>{{ info.remark || "--" }}</span>
+				</div>
 			</div>
 		</div>
 	</div>

src/views/dataBoard/renfang/cpts/fwgl.vue

@@ -42,7 +42,7 @@
 
 						<div
 							class="row-item marginleft10"
-							@click="toListPage('self_dwelling', '自住房屋')"
+							@click="toListPage('self_dwelling', '自住')"
 						>
 							<div class="item-one">
 								<img
@@ -62,7 +62,7 @@
 					</div>
 					<div
 						class="right-row margintop18"
-						@click="toListPage('lease', '出租房屋')"
+						@click="toListPage('lease', '出租')"
 					>
 						<div class="row-item">
 							<div class="item-one">
@@ -81,7 +81,7 @@
 
 						<div
 							class="row-item marginleft10"
-							@click="toListPage('unused', '闲置房屋')"
+							@click="toListPage('unused', '闲置')"
 						>
 							<div class="item-one">
 								<img

src/views/dataBoard/renfang/cpts/rkfx.vue

@@ -126,7 +126,7 @@ export default {
 		handleClickItem(item) {
 			const { type, name } = item;
 			this.$router.push({
-				path: "/dataBoard/renfang/resi-list",
+				path: "/dataBoard/renfang/resi-analyze",
 				query: {
 					org_id: this.orgId,
 					type,

src/views/dataBoard/renfang/cpts/rkyj.vue

@@ -245,6 +245,7 @@ export default {
 			.item-num {
 				width: 33%;
 				text-align: center;
+				cursor: pointer;
 				.img {
 					display: inline-block;
 					width: 32px;

src/views/dataBoard/renfang/index.vue

@@ -151,7 +151,7 @@
 
 							<input
 								type="text"
-								placeholder="输入关键词搜索"
+								placeholder="搜索本组织及下级的居民、小区、楼栋、房屋"
 								@keyup.enter="handleSearch"
 								v-model="searchModule.keyword"
 							/>
@@ -265,9 +265,15 @@
 								src="~@/assets/images/shuju/renfang/index/znyc.png"
 							/>
 							<span>智能预测</span>
-							<img
+
-								src="~@/assets/images/shuju/renfang/index/i-hint.png"
+							<el-tooltip placement="top">
-							/>
+								<div slot="content">
+									根据智能分类设置规则，预测来年育龄妇女、老年人、空巢老人、独居老人分别有多少人
+								</div>
+								<img
+									src="~@/assets/images/shuju/renfang/index/i-hint.png"
+								/>
+							</el-tooltip>
 						</div>
 
 						<div
@@ -326,6 +332,7 @@
 							v-if="resiCategoryForecastData.length > 0"
 						>
 							<div
+								@click="toResiClassPage(item.code, item.name)"
 								class="item"
 								:key="item.code + index"
 								v-for="(

src/views/dataBoard/renfang/resi/analyze.vue

@@ -128,8 +128,8 @@ export default {
 				"姓名",
 				"所属网格",
 				"所属房屋",
-				"手机",
+				"联系电话",
-				"身份证",
+				"证件号",
 				"性别",
 				"出生日期",
 				"操作",

src/views/dataBoard/renfang/resi/class.vue

@@ -16,7 +16,7 @@
 			<div class="tip_title">{{ tableTitle }}</div>
 			<div class="title_line"></div>
 
-			<div class="second-select" v-if="type_id == '6'">
+			<div class="second-select" v-if="type_id == 'special_popu'">
 				<el-select
 					v-model="subclassId"
 					:popper-append-to-body="false"
@@ -146,8 +146,8 @@ export default {
 				"姓名",
 				"所属网格",
 				"所属房屋",
-				"手机",
+				"联系电话",
-				"身份证",
+				"证件号",
 				"性别",
 				"出生日期",
 				"操作",
@@ -170,7 +170,7 @@ export default {
 		this.pageNo = 1;
 		this.getList();
 		this.getCount();
-		if (this.type_id == "6") {
+		if (this.type_id == "special_popu") {
 			this.getSubclass();
 		}
 	},
@@ -213,7 +213,7 @@ export default {
 			const { org_id, type_id } = this;
 			this.loading = true;
 
-			const url = "resident_analyze_list";
+			const url = "special_type_list";
 
 			const { data, code, msg } = await requestPostBi(
 				url,
@@ -253,8 +253,7 @@ export default {
 				{
 					queryParam: {
 						org_id,
-						type_id,
+						type_id: subclassId || type_id,
-						subclassId,
 						pageNo,
 						pageSize,
 					},
@@ -299,8 +298,7 @@ export default {
 				{
 					queryParam: {
 						org_id,
-						type_id,
+						type_id: subclassId || type_id,
-						subclassId,
 						pageNo,
 						pageSize,
 					},

src/views/dataBoard/renfang/resi/list.vue

@@ -128,8 +128,8 @@ export default {
 				"姓名",
 				"所属网格",
 				"所属房屋",
-				"手机",
+				"联系电话",
-				"身份证",
+				"证件号",
 				"性别",
 				"出生日期",
 				"操作",

src/views/dataBoard/renfang/warn/resi.vue

@@ -116,8 +116,8 @@ export default {
 				"姓名",
 				"所属网格",
 				"所属房屋",
-				"手机",
+				"联系电话",
-				"身份证",
+				"证件号",
 				"性别",
 				"出生日期",
 				"操作",

src/views/modules/base/smartImport.vue

@@ -161,6 +161,8 @@ export default {
 
 			importCode: "",
 			importOption: { exist: {}, notExist: {} },
+
+			fileData: null,
 		};
 	},
 
@@ -374,6 +376,7 @@ export default {
 						];
 						this.importOption = data.option;
 						this.importCode = data.code;
+						this.fileData = file;
 					} else this.$message.error(res.data.msg);
 				})
 				.catch((err) => {
@@ -389,11 +392,6 @@ export default {
 		async handleComfirm() {
 			this.importLoading = true;
 			this.importBtnTitle = "正在上传中...";
-			this.$message({
-				showClose: true,
-				message: "导入中，请到系统管理-导入记录中查看进度",
-				duration: 0,
-			});
 			const { importOption, importCode, dataList } = this;
 			dataList.forEach((item) => {
 				if (!item.exist) {
@@ -411,8 +409,30 @@ export default {
 				.then((res) => {
 					console.log("res-up", res);
 					if (res.data.code == 0 && res.data.msg == "success") {
-						// this.$message.success('导入成功')
+						this.upload2(this.fileData, this.importCode);
-						this.dataList = [];
+					} else this.$message.error(res.data.msg);
+				})
+				.catch((err) => {
+					console.log("失败", err);
+					file.onError(); //上传失败的文件会从文件列表中删除
+					// this.$message.error('导入失败')
+				});
+			this.importLoading = false;
+			this.importBtnTitle = "导入";
+		},
+
+		async upload2(file, code) {
+			this.importLoading = true;
+			this.importBtnTitle = "正在上次中...";
+			const formData = new FormData(); //FormData对象，添加参数只能通过append('key', value)的形式添加
+			formData.append("file", file.file); //添加文件对象
+			formData.append("code", code); //添加文件对象
+			await this.$http
+				.post("/actual/base/residentBaseInfo/importExcel", formData)
+				.then((res) => {
+					console.log("res-up", res);
+					if (res.data.code == 0 && res.data.msg == "success") {
+						this.afterSuccess();
 					} else this.$message.error(res.data.msg);
 				})
 				.catch((err) => {
@@ -422,6 +442,20 @@ export default {
 				});
 			this.importLoading = false;
 			this.importBtnTitle = "导入";
+			this.$refs.upload.clearFiles();
+		},
+
+		afterSuccess() {
+			this.$message({
+				showClose: true,
+				message: "导入成功，请到系统管理-导入记录中查看进度",
+				duration: 0,
+			});
+
+			this.dataList = [];
+			this.importOption = {};
+			this.importCode = "";
+			this.fileData = null;
 		},
 
 		// 取消