diff --git a/20220330_Vote/Ewide.Web.Entry/Controllers/OutsideWallController.cs b/20220330_Vote/Ewide.Web.Entry/Controllers/OutsideWallController.cs index fd37ab6..5aa63c3 100644 --- a/20220330_Vote/Ewide.Web.Entry/Controllers/OutsideWallController.cs +++ b/20220330_Vote/Ewide.Web.Entry/Controllers/OutsideWallController.cs @@ -14,5 +14,9 @@ namespace Ewide.Web.Entry.Controllers { return View(); } + public IActionResult BuildingResult() + { + return View(); + } } } diff --git a/20220330_Vote/Ewide.Web.Entry/Views/OutsideWall/BuildingResult.cshtml b/20220330_Vote/Ewide.Web.Entry/Views/OutsideWall/BuildingResult.cshtml new file mode 100644 index 0000000..c1c59ce --- /dev/null +++ b/20220330_Vote/Ewide.Web.Entry/Views/OutsideWall/BuildingResult.cshtml @@ -0,0 +1,573 @@ +@* + For more information on enabling MVC for empty projects, visit https://go.microsoft.com/fwlink/?LinkID=397860 +*@ +@{ +} + + + + + + + + + + + + + + +
+

宁波既有建筑外墙脱落问卷调查结果-幢列表

+ + + + + + + + + + + + 查询 + 重置 + + + + + + + + + + + + + + @* + + + + + + + + + + + + + + + + *@ + + +

+ 查看社区统计 + 导出Excel +

+ + +
+ + + + + + + \ No newline at end of file diff --git a/20220330_Vote/Ewide.Web.Entry/Views/OutsideWall/Index.cshtml b/20220330_Vote/Ewide.Web.Entry/Views/OutsideWall/Index.cshtml index 4ef89ae..3ef23cc 100644 --- a/20220330_Vote/Ewide.Web.Entry/Views/OutsideWall/Index.cshtml +++ b/20220330_Vote/Ewide.Web.Entry/Views/OutsideWall/Index.cshtml @@ -42,8 +42,8 @@ *@ - @*:on-change="fileChange"*@ - + @*:on-change="fileChange" multiple *@ +
上传外墙照片
只能上传jpg/png文件，且不超过500kb
@@ -165,22 +165,22 @@ 8.7 问题照片：@* :on-change="fileChange1"*@ - +
上传东面照片
只能上传jpg/png文件，且不超过500kb
 - +
上传西面照片
只能上传jpg/png文件，且不超过500kb
 - +
上传南面照片
只能上传jpg/png文件，且不超过500kb
 - +
上传北面照片
只能上传jpg/png文件，且不超过500kb
@@ -689,42 +689,59 @@ this.$refs[formName].validate((valid) => { if (valid) { if (_this.form.isExistProblem == '0') { - _this.submit2(); + this.$confirm('确定提交吗？', '提示', { + confirmButtonText: '确定', + cancelButtonText: '取消', + type: 'warning' + }).then(() => { + _this.submit2(); + }).catch(() => { + + }); } else { - if (this.$refs[formNameChild]) + if (this.$refs[formNameChild]) { this.$refs[formNameChild].validate((valid) => { if (valid) { debugger - _this.submit2(); + this.$confirm('确定提交吗？', '提示', { + confirmButtonText: '确定', + cancelButtonText: '取消', + type: 'warning' + }).then(() => { + _this.submit2(); + }).catch(() => { + + }); + } else { + this.$message({ + message: '幢信息问卷未填写完整', + type: 'warning' + }); } }); + } else { + this.$message({ + message: '存在问题请展开幢信息进行问卷填写', + type: 'warning' + }); + } } + } else { + this.$message({ + message: '社区信息问卷未填写完整', + type: 'warning' + }); } }); }, submit2() { - debugger; + const loading = this.$loading({ + lock: true, + text: '提交中...请稍候', + spinner: 'el-icon-loading', + background: 'rgba(0, 0, 0, 0.7)' + }); let _this = this; - //let config = { - // //formData 提交请求头有两种 multipart/form-data 和 application/x-www-form-urlencoded - // // multipart/form-data 用于type=file 的input提交 - // headers: { - // "Content-Type": "multipart/form-data" - // } - //}; - //const fd = new FormData() - //fd.append('appid', "123") - //fd.append('wall', _this.form) - //for (let _i in _this.fileList) { - // fd.append('file', _i) - //} - //axios.post('/gb/yjb/api/outsidewall/submit', fd, config).then(res => { - // debugger - //}).catch(error => { - // console.log(error); - //}); - - axios({ headers: { 'Content-Type': 'multipart/form-data' }, method: 'post', @@ -732,10 +749,9 @@ data: _this.form, responseType: "json", }).then(async response => { - if (response.data?.data?.success == true) { - let token = response.data.data.token; - localStorage.setItem("_token", token) - _this.$alert(`
提交成功
`, '成功', { + debugger; + if (response.data?.success == true) { + _this.$alert(`
提交成功,您的提交码是:` + response.data?.data + `
请牢记提交码。
`, '提交成功', { confirmButtonText: '确定', dangerouslyUseHTMLString: true, center: true, closeOnClickModal: true }).then(a => { }).catch(err => { console.log(err) }); } else { @@ -743,14 +759,14 @@ confirmButtonText: '确定', dangerouslyUseHTMLString: true, center: true, closeOnClickModal: true }).then(a => { }).catch(err => { console.log(err) }); } - _this.loading = false; + loading.close(); }).catch(async error => { console.log(error) _this.$message({ type: 'error', message: error.message }) - _this.loading = false; + loading.close(); }) }, getFormData(object) { diff --git a/20220330_Vote/Ewide.Web.Entry/Views/OutsideWall/Result.cshtml b/20220330_Vote/Ewide.Web.Entry/Views/OutsideWall/Result.cshtml index 6404474..e73ed74 100644 --- a/20220330_Vote/Ewide.Web.Entry/Views/OutsideWall/Result.cshtml +++ b/20220330_Vote/Ewide.Web.Entry/Views/OutsideWall/Result.cshtml @@ -18,88 +18,149 @@
-

宁波既有建筑外墙脱落问卷调查 报名结果

+

宁波既有建筑外墙脱落问卷调查结果

- + - + + + 查询 重置 - +