From 0032956dbee695a610a7c5e2625d71351495a9ad Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=8C=83=E9=9C=B2=E5=B0=A7?= Date: Thu, 29 Jun 2023 20:11:20 +0800 Subject: [PATCH] =?UTF-8?q?=E5=89=8D=E5=8F=B0=E9=A1=B5=E9=9D=A2=E6=95=B4?= =?UTF-8?q?=E4=BD=93=E4=BF=9D=E5=AD=98=E5=8A=9F=E8=83=BD=E5=AE=8C=E5=96=84?= =?UTF-8?q?=E5=92=8C=E5=90=8E=E5=8F=B0=E8=AF=BB=E5=8F=96=E7=A4=BE=E5=8C=BA?= =?UTF-8?q?=E5=88=97=E8=A1=A8=E5=92=8C=E8=AF=BB=E5=8F=96=E5=B9=A2=E5=88=97?= =?UTF-8?q?=E8=A1=A8=E7=9A=84=E5=8A=9F=E8=83=BD=E5=BC=80=E5=8F=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Controllers/OutsideWallController.cs | 4 + .../Views/OutsideWall/BuildingResult.cshtml | 573 ++++++++++++++++++ .../Views/OutsideWall/Index.cshtml | 88 +-- .../Views/OutsideWall/Result.cshtml | 448 +++++++++++--- .../0026f1fa-e8dc-4d3f-8289-0f378c2c3fb4.png | Bin 0 -> 1011 bytes .../15fbbc7c-1f59-49b3-b54a-715d6094e33a.jpg | Bin 0 -> 216338 bytes .../1613ca29-eefd-43f0-9d92-45fc1e0771c6.png | Bin 0 -> 122178 bytes .../326455ea-fdfd-4e34-bc43-6fc89b3148aa.jpg | Bin 0 -> 220542 bytes .../35d2ecc4-2a50-44c2-a94a-5d701ce102e4.jpg | Bin 0 -> 851051 bytes .../3bf7b606-67e4-4ad3-bcf0-1a2afb89f053.jpg | Bin 0 -> 20947 bytes .../46c175e8-d8a0-4e22-a15a-0dba738545fb.jpg | Bin 0 -> 20947 bytes .../505d7d2a-0d8c-440b-b6f7-8dcd37504ed7.jpg | Bin 0 -> 851051 bytes .../5baf82e5-cc27-4b51-a924-285029018efb.jpg | Bin 0 -> 1613 bytes .../6a7948cb-15c1-4087-9df9-08e1be4f2cee.jpg | Bin 0 -> 347707 bytes .../73af5207-6903-4096-b0c5-9a3ff4ae6571.jpg | Bin 0 -> 112468 bytes .../73c0cd6c-af2a-4cad-9319-bcaf6a39fc1d.png | Bin 0 -> 6610 bytes .../75d90184-71d7-4f55-8797-cc59fce9d44d.jpg | Bin 0 -> 131705 bytes .../7a9ae7f9-3797-4494-a065-fa5a014b261d.png | Bin 0 -> 122178 bytes .../7dbfc267-5a98-4554-aff5-7651738445d6.jpg | Bin 0 -> 112468 bytes .../83316f8c-0cb2-4aea-8c40-b8bb4412c542.jpg | Bin 0 -> 347707 bytes .../938c94ca-689c-49c2-a39b-ecd4bfb87d87.jpg | Bin 0 -> 131705 bytes .../971e79f3-6cc0-4a39-a897-3f55fb9a3dbd.png | Bin 0 -> 383718 bytes .../ac705dba-f191-4ccd-a66c-8ce299e20eb4.jpg | Bin 0 -> 216338 bytes .../ae96da27-bfdf-44a7-a0f9-971e0c64e00f.jpg | Bin 0 -> 347707 bytes .../d2f7f624-97c7-496b-97ed-3ed0b28eb455.jpg | Bin 0 -> 20947 bytes .../ee7616b7-734b-48d3-b088-0e0db3b1bf24.jpg | Bin 0 -> 220542 bytes .../ApiController/OutsideWallService.cs | 166 ++++- .../Vote.Services/Dto/OutsideWallInput.cs | 28 +- .../Vote.Services/Entities/outside_wall.cs | 1 + .../Entities/outside_wall_building_photo.cs | 10 + .../Entities/outside_wall_photo.cs | 10 + 20220330_Vote/Vote.Services/Vote.Services.xml | 15 +- 32 files changed, 1184 insertions(+), 159 deletions(-) create mode 100644 20220330_Vote/Ewide.Web.Entry/Views/OutsideWall/BuildingResult.cshtml create mode 100644 20220330_Vote/Ewide.Web.Entry/wwwroot/Upload/Default/0026f1fa-e8dc-4d3f-8289-0f378c2c3fb4.png create mode 100644 20220330_Vote/Ewide.Web.Entry/wwwroot/Upload/Default/15fbbc7c-1f59-49b3-b54a-715d6094e33a.jpg create mode 100644 20220330_Vote/Ewide.Web.Entry/wwwroot/Upload/Default/1613ca29-eefd-43f0-9d92-45fc1e0771c6.png create mode 100644 20220330_Vote/Ewide.Web.Entry/wwwroot/Upload/Default/326455ea-fdfd-4e34-bc43-6fc89b3148aa.jpg create mode 100644 20220330_Vote/Ewide.Web.Entry/wwwroot/Upload/Default/35d2ecc4-2a50-44c2-a94a-5d701ce102e4.jpg create mode 100644 20220330_Vote/Ewide.Web.Entry/wwwroot/Upload/Default/3bf7b606-67e4-4ad3-bcf0-1a2afb89f053.jpg create mode 100644 20220330_Vote/Ewide.Web.Entry/wwwroot/Upload/Default/46c175e8-d8a0-4e22-a15a-0dba738545fb.jpg create mode 100644 20220330_Vote/Ewide.Web.Entry/wwwroot/Upload/Default/505d7d2a-0d8c-440b-b6f7-8dcd37504ed7.jpg create mode 100644 20220330_Vote/Ewide.Web.Entry/wwwroot/Upload/Default/5baf82e5-cc27-4b51-a924-285029018efb.jpg create mode 100644 20220330_Vote/Ewide.Web.Entry/wwwroot/Upload/Default/6a7948cb-15c1-4087-9df9-08e1be4f2cee.jpg create mode 100644 20220330_Vote/Ewide.Web.Entry/wwwroot/Upload/Default/73af5207-6903-4096-b0c5-9a3ff4ae6571.jpg create mode 100644 20220330_Vote/Ewide.Web.Entry/wwwroot/Upload/Default/73c0cd6c-af2a-4cad-9319-bcaf6a39fc1d.png create mode 100644 20220330_Vote/Ewide.Web.Entry/wwwroot/Upload/Default/75d90184-71d7-4f55-8797-cc59fce9d44d.jpg create mode 100644 20220330_Vote/Ewide.Web.Entry/wwwroot/Upload/Default/7a9ae7f9-3797-4494-a065-fa5a014b261d.png create mode 100644 20220330_Vote/Ewide.Web.Entry/wwwroot/Upload/Default/7dbfc267-5a98-4554-aff5-7651738445d6.jpg create mode 100644 20220330_Vote/Ewide.Web.Entry/wwwroot/Upload/Default/83316f8c-0cb2-4aea-8c40-b8bb4412c542.jpg create mode 100644 20220330_Vote/Ewide.Web.Entry/wwwroot/Upload/Default/938c94ca-689c-49c2-a39b-ecd4bfb87d87.jpg create mode 100644 20220330_Vote/Ewide.Web.Entry/wwwroot/Upload/Default/971e79f3-6cc0-4a39-a897-3f55fb9a3dbd.png create mode 100644 20220330_Vote/Ewide.Web.Entry/wwwroot/Upload/Default/ac705dba-f191-4ccd-a66c-8ce299e20eb4.jpg create mode 100644 20220330_Vote/Ewide.Web.Entry/wwwroot/Upload/Default/ae96da27-bfdf-44a7-a0f9-971e0c64e00f.jpg create mode 100644 20220330_Vote/Ewide.Web.Entry/wwwroot/Upload/Default/d2f7f624-97c7-496b-97ed-3ed0b28eb455.jpg create mode 100644 20220330_Vote/Ewide.Web.Entry/wwwroot/Upload/Default/ee7616b7-734b-48d3-b088-0e0db3b1bf24.jpg 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 @@
-

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

+

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

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