diff --git a/src/views/dataBoard/cpts/map/popup.vue b/src/views/dataBoard/cpts/map/popup.vue index 5cffd9376..4df2d793d 100644 --- a/src/views/dataBoard/cpts/map/popup.vue +++ b/src/views/dataBoard/cpts/map/popup.vue @@ -54,7 +54,7 @@ {{ info.classtype || "--" }} -
+
楼长电话: {{ info.hm_phone || "--" }}
+
+ 详细地址: + {{ info.location || "--" }} +
@@ -195,9 +199,13 @@ {{ info.holder_phone || "--" }}
- 房主身份证: + 房主证件号: {{ info.holder_idcard || "--" }}
+
+ 备注: + {{ info.remark || "--" }} +
diff --git a/src/views/dataBoard/renfang/cpts/fwgl.vue b/src/views/dataBoard/renfang/cpts/fwgl.vue index b8c4c91fd..d2c112759 100644 --- a/src/views/dataBoard/renfang/cpts/fwgl.vue +++ b/src/views/dataBoard/renfang/cpts/fwgl.vue @@ -42,7 +42,7 @@
@@ -81,7 +81,7 @@
@@ -265,9 +265,15 @@ src="~@/assets/images/shuju/renfang/index/znyc.png" /> 智能预测 - + + +
+ 根据智能分类设置规则,预测来年育龄妇女、老年人、空巢老人、独居老人分别有多少人 +
+ +
{{ tableTitle }}
-
+
{ @@ -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.dataList = []; + this.upload2(this.fileData, this.importCode); + } 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; }, // 取消