diff --git a/20220330_Vote/Ewide.Web.Entry/wwwroot/ExcelTemplate/2024年度宁波市结构优质认定项目投票结果.xlsx b/20220330_Vote/Ewide.Web.Entry/wwwroot/ExcelTemplate/2024年度宁波市结构优质认定项目投票结果.xlsx new file mode 100644 index 0000000..7879937 Binary files /dev/null and b/20220330_Vote/Ewide.Web.Entry/wwwroot/ExcelTemplate/2024年度宁波市结构优质认定项目投票结果.xlsx differ diff --git a/20220330_Vote/Ewide.Web.Entry/wwwroot/ExcelTemplate/OutPut/20231109162356-2023年度甬江杯投票.xlsx b/20220330_Vote/Ewide.Web.Entry/wwwroot/ExcelTemplate/OutPut/20231110125727-2023年度甬江杯投票.xlsx similarity index 54% rename from 20220330_Vote/Ewide.Web.Entry/wwwroot/ExcelTemplate/OutPut/20231109162356-2023年度甬江杯投票.xlsx rename to 20220330_Vote/Ewide.Web.Entry/wwwroot/ExcelTemplate/OutPut/20231110125727-2023年度甬江杯投票.xlsx index f7a2b3c..a7c6afc 100644 Binary files a/20220330_Vote/Ewide.Web.Entry/wwwroot/ExcelTemplate/OutPut/20231109162356-2023年度甬江杯投票.xlsx and b/20220330_Vote/Ewide.Web.Entry/wwwroot/ExcelTemplate/OutPut/20231110125727-2023年度甬江杯投票.xlsx differ diff --git a/20220330_Vote/Ewide.Web.Entry/wwwroot/ExcelTemplate/OutPut/20241113183710-2024年度宁波市结构优质认定项目投票结果.xlsx b/20220330_Vote/Ewide.Web.Entry/wwwroot/ExcelTemplate/OutPut/20241113183710-2024年度宁波市结构优质认定项目投票结果.xlsx new file mode 100644 index 0000000..9296835 Binary files /dev/null and b/20220330_Vote/Ewide.Web.Entry/wwwroot/ExcelTemplate/OutPut/20241113183710-2024年度宁波市结构优质认定项目投票结果.xlsx differ diff --git a/20220330_Vote/Ewide.Web.Entry/wwwroot/ExcelTemplate/OutPut/20241113184154-2024年度宁波市结构优质认定项目投票结果.xlsx b/20220330_Vote/Ewide.Web.Entry/wwwroot/ExcelTemplate/OutPut/20241113184154-2024年度宁波市结构优质认定项目投票结果.xlsx new file mode 100644 index 0000000..c9c0b70 Binary files /dev/null and b/20220330_Vote/Ewide.Web.Entry/wwwroot/ExcelTemplate/OutPut/20241113184154-2024年度宁波市结构优质认定项目投票结果.xlsx differ diff --git a/20220330_Vote/Ewide.Web.Entry/wwwroot/ExcelTemplate/OutPut/20241113184334-2024年度宁波市结构优质认定项目投票结果.xlsx b/20220330_Vote/Ewide.Web.Entry/wwwroot/ExcelTemplate/OutPut/20241113184334-2024年度宁波市结构优质认定项目投票结果.xlsx new file mode 100644 index 0000000..a459669 Binary files /dev/null and b/20220330_Vote/Ewide.Web.Entry/wwwroot/ExcelTemplate/OutPut/20241113184334-2024年度宁波市结构优质认定项目投票结果.xlsx differ diff --git a/20220330_Vote/Ewide.Web.Entry/wwwroot/html/yjbvote/VoteResult.html b/20220330_Vote/Ewide.Web.Entry/wwwroot/html/yjbvote/VoteResult.html index f5454ec..dd5a562 100644 --- a/20220330_Vote/Ewide.Web.Entry/wwwroot/html/yjbvote/VoteResult.html +++ b/20220330_Vote/Ewide.Web.Entry/wwwroot/html/yjbvote/VoteResult.html @@ -13,7 +13,7 @@
-

2023年度宁波市“甬江建设杯”选票结果

+

2024年度宁波市“结构优质认定项目”选票结果

@@ -70,7 +70,7 @@ location = 'Expert.html' }, export_excel() { - this.download('/gb/yjb/api/projects/download', this.dateFormat("YYYYmmddHHMMSS", new Date()) + "-2023年度甬江杯投票.xlsx", this.loading_false); + this.download('/gb/yjb/api/projects/download', this.dateFormat("YYYYmmddHHMMSS", new Date()) + "-2024年度宁波市“结构优质认定项目”选票结果.xlsx", this.loading_false); }, check_login() { this.token = window.sessionStorage.getItem('__TOKEN'); diff --git a/20220330_Vote/Ewide.Web.Entry/wwwroot/html/yjbvote/index.html b/20220330_Vote/Ewide.Web.Entry/wwwroot/html/yjbvote/index.html index f062263..65d801d 100644 --- a/20220330_Vote/Ewide.Web.Entry/wwwroot/html/yjbvote/index.html +++ b/20220330_Vote/Ewide.Web.Entry/wwwroot/html/yjbvote/index.html @@ -15,7 +15,7 @@ maximum-scale=1.0, user-scalable=no" />
-

2023年度宁波市“甬江建设杯”选票

+

2024年度宁波市“结构优质认定项目”选票

@@ -87,9 +87,10 @@ maximum-scale=1.0, user-scalable=no" /> let _this = this; //检验码 if (this.logincode.length < 6) { - this.$alert(`
提交码输入错误
`, '错误', { - confirmButtonText: '确定', dangerouslyUseHTMLString: true, center: true, closeOnClickModal: true - }).then(a => { }).catch(err => { console.log(err) }); + //this.$alert(`
提交码输入错误
`, '错误', { + // confirmButtonText: '确定', dangerouslyUseHTMLString: true, center: true, closeOnClickModal: true + //}).then(a => { }).catch(err => { console.log(err) }); + alert("提交码输入错误"); return false; } return new Promise((resolve, reject) => { @@ -101,9 +102,10 @@ maximum-scale=1.0, user-scalable=no" /> responseType: "json", }).then(async response => { if (response.data.data != true) { - _this.$alert(`
提交码输入错误
`, '错误', { - confirmButtonText: '确定', dangerouslyUseHTMLString: true, center: true, closeOnClickModal: true - }).then(a => { }).catch(err => { console.log(err) }); + //_this.$alert(`
提交码输入错误
`, '错误', { + // confirmButtonText: '确定', dangerouslyUseHTMLString: true, center: true, closeOnClickModal: true + //}).then(a => { }).catch(err => { console.log(err) }); + alert("提交码输入错误"); reject(); } else { resolve(true) @@ -150,9 +152,10 @@ maximum-scale=1.0, user-scalable=no" /> } } if (all_no_select_num > 0) { - this.$alert(`
请全部选择完毕后再次提交！
` + msg1, '错误', { - confirmButtonText: '确定', dangerouslyUseHTMLString: true, center: true, closeOnClickModal: true - }).then(a => { }).catch(err => { console.log(err) }); + //this.$alert(`
请全部选择完毕后再次提交！
` + msg1, '错误', { + // confirmButtonText: '确定', dangerouslyUseHTMLString: true, center: true, closeOnClickModal: true + //}).then(a => { }).catch(err => { console.log(err) }); + alert("请全部选择完毕后再次提交"); return; } debugger @@ -162,40 +165,41 @@ maximum-scale=1.0, user-scalable=no" /> // }).then(a => { }).catch(err => { console.log(err) }); // return; //} - //房建不少于5个 - if (select_false_list[0] < 5) { - this.$alert(`
房建工程不少于5个淘汰！
` + msg2, '错误', { - confirmButtonText: '确定', dangerouslyUseHTMLString: true, center: true, closeOnClickModal: true - }).then(a => { }).catch(err => { console.log(err) }); - return; - } - //市政不少于4个 - if (select_false_list[1] < 1) { - this.$alert(`
市政工程不少于4个淘汰！
` + msg2, '错误', { - confirmButtonText: '确定', dangerouslyUseHTMLString: true, center: true, closeOnClickModal: true - }).then(a => { }).catch(err => { console.log(err) }); - return; - } - //交通不少于1个 - if (select_false_list[3] < 1) { - this.$alert(`
交通工程不少于1个淘汰！
` + msg2, '错误', { - confirmButtonText: '确定', dangerouslyUseHTMLString: true, center: true, closeOnClickModal: true - }).then(a => { }).catch(err => { console.log(err) }); - return; - } - //水利不少于1个 - if (select_false_list[4] < 1) { - this.$alert(`
水利工程不少于1个淘汰！
` + msg2, '错误', { - confirmButtonText: '确定', dangerouslyUseHTMLString: true, center: true, closeOnClickModal: true - }).then(a => { }).catch(err => { console.log(err) }); - return; - } - //if (all_select_false_num != 8) { - // this.$alert(`
淘汰总数只能等于8个！
` + msg2, '错误', { + ////房建不少于5个 + //if (select_false_list[0] < 5) { + // this.$alert(`
房建工程不少于5个淘汰！
` + msg2, '错误', { // confirmButtonText: '确定', dangerouslyUseHTMLString: true, center: true, closeOnClickModal: true // }).then(a => { }).catch(err => { console.log(err) }); // return; //} + ////市政不少于4个 + //if (select_false_list[1] < 1) { + // this.$alert(`
市政工程不少于4个淘汰！
` + msg2, '错误', { + // confirmButtonText: '确定', dangerouslyUseHTMLString: true, center: true, closeOnClickModal: true + // }).then(a => { }).catch(err => { console.log(err) }); + // return; + //} + ////交通不少于1个 + //if (select_false_list[3] < 1) { + // this.$alert(`
交通工程不少于1个淘汰！
` + msg2, '错误', { + // confirmButtonText: '确定', dangerouslyUseHTMLString: true, center: true, closeOnClickModal: true + // }).then(a => { }).catch(err => { console.log(err) }); + // return; + //} + ////水利不少于1个 + //if (select_false_list[4] < 1) { + // this.$alert(`
水利工程不少于1个淘汰！
` + msg2, '错误', { + // confirmButtonText: '确定', dangerouslyUseHTMLString: true, center: true, closeOnClickModal: true + // }).then(a => { }).catch(err => { console.log(err) }); + // return; + //} + if (all_select_false_num <= 21) { + //this.$alert(`
淘汰总数必须大于21个！
` + msg2, '错误', { + // confirmButtonText: '确定', dangerouslyUseHTMLString: true, center: true, closeOnClickModal: true + //}).then(a => { }).catch(err => { console.log(err) }); + alert("淘汰总数必须大于21个"); + return; + } this.$confirm('您此次选择了同意' + all_select_true_num + '个，淘汰' + all_select_false_num + '个，是否继续提交?', '提示', { confirmButtonText: '确定', cancelButtonText: '取消', @@ -210,13 +214,15 @@ maximum-scale=1.0, user-scalable=no" /> responseType: "json", }).then(async response => { if (response.data.data != true) { - _this.$alert(`
` + response.data.message + `
`, '错误', { - confirmButtonText: '确定', dangerouslyUseHTMLString: true, center: true, closeOnClickModal: true - }).then(a => { }).catch(err => { console.log(err) }); + //_this.$alert(`
` + response.data.message + `
`, '错误', { + // confirmButtonText: '确定', dangerouslyUseHTMLString: true, center: true, closeOnClickModal: true + //}).then(a => { }).catch(err => { console.log(err) }); + alert(response.data.message); } else { - _this.$alert(`
提交成功
`, '成功', { - confirmButtonText: '确定', dangerouslyUseHTMLString: true, center: true, closeOnClickModal: true - }).then(a => { }).catch(err => { console.log(err) }); + //_this.$alert(`
提交成功
`, '成功', { + // confirmButtonText: '确定', dangerouslyUseHTMLString: true, center: true, closeOnClickModal: true + //}).then(a => { }).catch(err => { console.log(err) }); + alert("提交成功"); } _this.loading = false; }).catch(async error => { diff --git a/20220330_Vote/Vote.Services/ApiController/ProjectsService.cs b/20220330_Vote/Vote.Services/ApiController/ProjectsService.cs index 3ceae26..e8dea7a 100644 --- a/20220330_Vote/Vote.Services/ApiController/ProjectsService.cs +++ b/20220330_Vote/Vote.Services/ApiController/ProjectsService.cs @@ -51,7 +51,7 @@ namespace Vote.Services.ApiController [Microsoft.AspNetCore.Authorization.AllowAnonymous] public async Task List(ProjectsInput args) { - var typeList = new List { "房建工程", "市政工程", "轨道工程", "电力工程", "交通工程", "水利工程" }; + var typeList = new List { "房建工程", "市政工程", "轨道交通工程" };//, "电力工程", "交通工程", "水利工程" }; var data = await rep_Projects.DetachedEntities.Where(p => !p.IsDeleted) .Where(args.type != null, a => (int)a.type == args.type) .ProjectToType() @@ -167,7 +167,7 @@ namespace Vote.Services.ApiController // data4, // data5 //}; - var typeList = new List { "房建工程", "市政工程", "轨道工程", "电力工程", "交通工程", "水利工程" }; + var typeList = new List { "房建工程", "市政工程", "轨道交通工程" };//, "电力工程", "交通工程", "水利工程" }; return new { data, typeList }; } /// diff --git a/20220330_Vote/Vote.Services/Dto/ProjectsInput.cs b/20220330_Vote/Vote.Services/Dto/ProjectsInput.cs index ff898db..c114036 100644 --- a/20220330_Vote/Vote.Services/Dto/ProjectsInput.cs +++ b/20220330_Vote/Vote.Services/Dto/ProjectsInput.cs @@ -93,8 +93,8 @@ namespace Vote.Services.Dto { get { - return yes_count >= 11; - //return (yes_count / (yes_count + no_count)) >= (2.0 / 3.0); + return yes_count > 12; + // return (yes_count / (yes_count + no_count)) >= (2.0 / 3.0); } } /// diff --git a/20220330_Vote/Vote.Services/Tools/ExcelHelper.cs b/20220330_Vote/Vote.Services/Tools/ExcelHelper.cs index 46b7516..23821cf 100644 --- a/20220330_Vote/Vote.Services/Tools/ExcelHelper.cs +++ b/20220330_Vote/Vote.Services/Tools/ExcelHelper.cs @@ -118,7 +118,7 @@ namespace Vote.Services.Tools { try { - string template_name = "2023年度甬江杯投票.xlsx"; + string template_name = "2024年度宁波市结构优质认定项目投票结果.xlsx"; string excelFilePath = $"{App.WebHostEnvironment.WebRootPath}\\ExcelTemplate\\{template_name}"; string outputPath = string.Empty; if (!string.IsNullOrEmpty(excelFilePath)) diff --git a/20220330_Vote/doc/2024年结构优质认定项目投票清单1113.xlsx b/20220330_Vote/doc/2024年结构优质认定项目投票清单1113.xlsx new file mode 100644 index 0000000..4ef3781 Binary files /dev/null and b/20220330_Vote/doc/2024年结构优质认定项目投票清单1113.xlsx differ