From 513c40a4f3f5d6c520f05791801d1bcf5287e467 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=B7=AF=20=E8=8C=83?= Date: Tue, 23 Dec 2025 09:52:16 +0800 Subject: [PATCH] =?UTF-8?q?fix(vote):=20=E4=BF=AE=E5=A4=8D=E6=8A=95?= =?UTF-8?q?=E7=A5=A8=E9=A1=B5=E9=9D=A2=E6=B7=98=E6=B1=B0=E6=95=B0=E6=8D=AE?= =?UTF-8?q?=E6=98=BE=E7=A4=BA=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - 将变量声明从 var 改为 let 以修复数据过滤逻辑 - 修改电力工程的淘汰条件判断逻辑，只在符合条件时显示消息 - 优化淘汰数量显示格式，添加"目前："前缀以提高可读性 - 修复确认对话框中的 HTML 格式显示问题 - 添加 dangerouslyUseHTMLString 选项以正确渲染 HTML 内容 --- .../wwwroot/html/yjbvote20251222/index.html | 50 ++++++++++--------- 1 file changed, 27 insertions(+), 23 deletions(-) diff --git a/20220330_Vote/Ewide.Web.Entry/wwwroot/html/yjbvote20251222/index.html b/20220330_Vote/Ewide.Web.Entry/wwwroot/html/yjbvote20251222/index.html index 2c96820..567872b 100644 --- a/20220330_Vote/Ewide.Web.Entry/wwwroot/html/yjbvote20251222/index.html +++ b/20220330_Vote/Ewide.Web.Entry/wwwroot/html/yjbvote20251222/index.html @@ -128,30 +128,32 @@ maximum-scale=1.0, user-scalable=no"/> async submit() { let _this = this; await this.checkcode().then(a => { - if (a == false) + if (a === false) return; - var msg1 = ""; - var msg2 = ""; - var all_no_select_num = 0; - var select_false_list = []; - var all_select_false_num = 0; - var all_select_true_num = 0; - var allselects = []; - for (var i = 0; i < _this.projects.length; i++) { - var _p = _this.projects[i]; + let msg1 = ""; + let msg2 = ""; + let all_no_select_num = 0; + let select_false_list = []; + let all_select_false_num = 0; + let all_select_true_num = 0; + let allselects = []; + for (let i = 0; i < _this.projects.length; i++) { + let _p = _this.projects[i]; if (_p.data.length > 0) { - // var no_select = _p.data.filter(a => { return !a.vote }).length; + // let no_select = _p.data.filter(a => { return !a.vote }).length; // all_no_select_num += no_select; // if (no_select > 0) { // msg1 += `

目前[` + _p.name + `]未选择的有` + no_select + `个

`; // } - var select_false = _p.data.filter(a => { + let select_false = _p.data.filter(a => { return a.vote == "false" }).length; select_false_list.push(select_false); // if (select_false < 1) { - if(_p.name!=="电力工程") - msg2 += `目前[` + _p.name + `]淘汰的有 ` + select_false + ` 个\n`; + if (_p.name === "电力工程" && select_false === 0) { + } else { + msg2 += `[` + _p.name + `]淘汰的有 ` + select_false + ` 个； \n`; + } // } all_select_false_num += select_false; all_select_true_num += _p.data.filter(a => { @@ -182,7 +184,7 @@ maximum-scale=1.0, user-scalable=no"/> // }).catch(err => { // console.log(err) // }); - alert("房屋建筑工程不少于 10 个淘汰！\n\n" + msg2); + alert("房屋建筑工程不少于 10 个淘汰！\n目前：\n" + msg2); return; } //市政不少于4个 @@ -193,7 +195,7 @@ maximum-scale=1.0, user-scalable=no"/> // }).catch(err => { // console.log(err) // }); - alert("市政基础设施工程不少于 5 个淘汰！\n\n" + msg2); + alert("市政基础设施工程不少于 5 个淘汰！\n目前：\n" + msg2); return; } //交通不少于1个 @@ -204,7 +206,7 @@ maximum-scale=1.0, user-scalable=no"/> // }).catch(err => { // console.log(err) // }); - alert("轨道交通工程不少于 2 个淘汰！\n\n" + msg2); + alert("轨道交通工程不少于 2 个淘汰！\n目前：\n" + msg2); return; } ////水利不少于1个 @@ -221,10 +223,12 @@ maximum-scale=1.0, user-scalable=no"/> alert("淘汰总数必须大于17个"); return; } - this.$confirm('您此次选择了同意' + all_select_true_num + '个，淘汰' + all_select_false_num + '个，是否继续提交?', '提示', { + this.$confirm(`您此次选择了同意` + all_select_true_num + `个，淘汰` + all_select_false_num + `个，是否继续提交?
目前：
` + + msg2.replaceAll('\n', '
'), '提示', { confirmButtonText: '确定', cancelButtonText: '取消', - type: 'warning' + type: 'warning', + dangerouslyUseHTMLString: true }).then(() => { _this.loading = true; axios({ @@ -269,14 +273,14 @@ maximum-scale=1.0, user-scalable=no"/> responseType: "json", }).then(function (response) { //console.log(response) - var _data = response.data.data.data - var typeList = response.data.data.typeList + let _data = response.data.data.data + let typeList = response.data.data.typeList _data.map(a => { a.vote = !a.vote ? '' : a.vote.toString(); return a; }); - for (var i = 0; i < typeList.length; i++) { - var _p = _data.filter(a => { + for (let i = 0; i < typeList.length; i++) { + let _p = _data.filter(a => { return a.type == i; }); _this.projects.push({name: typeList[i], data: _p})