ewide/number_zj
22
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

2024年度改动

Browse Source
This commit is contained in:
路 范
2024-11-13 18:44:55 +08:00
parent dd63efcfb7
commit 0676cf65ef
11 changed files with 59 additions and 53 deletions
Download Patch File Download Diff File Expand all files Collapse all files

BIN
20220330_Vote/Ewide.Web.Entry/wwwroot/ExcelTemplate/2024年度宁波市结构优质认定项目投票结果.xlsx Normal file
View File

Binary file not shown.

BIN
20220330_Vote/Ewide.Web.Entry/wwwroot/ExcelTemplate/OutPut/20231109162356-2023年度甬江杯投票.xlsx → 20220330_Vote/Ewide.Web.Entry/wwwroot/ExcelTemplate/OutPut/20231110125727-2023年度甬江杯投票.xlsx
View File

Binary file not shown.

BIN
20220330_Vote/Ewide.Web.Entry/wwwroot/ExcelTemplate/OutPut/20241113183710-2024年度宁波市结构优质认定项目投票结果.xlsx Normal file
View File

Binary file not shown.

BIN
20220330_Vote/Ewide.Web.Entry/wwwroot/ExcelTemplate/OutPut/20241113184154-2024年度宁波市结构优质认定项目投票结果.xlsx Normal file
View File

Binary file not shown.

BIN
20220330_Vote/Ewide.Web.Entry/wwwroot/ExcelTemplate/OutPut/20241113184334-2024年度宁波市结构优质认定项目投票结果.xlsx Normal file
View File

Binary file not shown.

4
20220330_Vote/Ewide.Web.Entry/wwwroot/html/yjbvote/VoteResult.html
View File

@@ -13,7 +13,7 @@
<body> <body>
<div id="app" v-loading="loading"> <div id="app" v-loading="loading">
<h3 style="text-align:center;">2023年度宁波市“甬江建设杯”选票结果</h3> <h3 style="text-align:center;">2024年度宁波市“结构优质认定项目”选票结果</h3>
<el-collapse style="width: 80%;margin:0 auto;"> <el-collapse style="width: 80%;margin:0 auto;">
<el-collapse-item v-for="(prolist,idx) in tableData" :title="prolist.name" :name="idx" v-show="prolist.data.length>0" :key="idx"> <el-collapse-item v-for="(prolist,idx) in tableData" :title="prolist.name" :name="idx" v-show="prolist.data.length>0" :key="idx">
<el-table :data="prolist.data" style="width:95%;margin:0 auto;"> <el-table :data="prolist.data" style="width:95%;margin:0 auto;">
@@ -70,7 +70,7 @@
location = 'Expert.html' location = 'Expert.html'
}, },
export_excel() { 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() { check_login() {
this.token = window.sessionStorage.getItem('__TOKEN'); this.token = window.sessionStorage.getItem('__TOKEN');

98
20220330_Vote/Ewide.Web.Entry/wwwroot/html/yjbvote/index.html
View File

@@ -15,7 +15,7 @@ maximum-scale=1.0, user-scalable=no" />
<body> <body>
<div id="app" v-loading="loading"> <div id="app" v-loading="loading">
<h3 style="text-align:center;">2023年度宁波市“甬江建设杯”选票</h3> <h3 style="text-align:center;">2024年度宁波市“结构优质认定项目”选票</h3>
<el-collapse> <el-collapse>
<el-collapse-item v-for="(prolist,idx) in projects" :title="prolist.name" :name="idx" v-show="prolist.data.length>0" :key="idx"> <el-collapse-item v-for="(prolist,idx) in projects" :title="prolist.name" :name="idx" v-show="prolist.data.length>0" :key="idx">
<el-descriptions class="margin-top" title="" :column="1" border v-for="project in prolist.data" :key="project.id"> <el-descriptions class="margin-top" title="" :column="1" border v-for="project in prolist.data" :key="project.id">
@@ -87,9 +87,10 @@ maximum-scale=1.0, user-scalable=no" />
let _this = this; let _this = this;
//检验码 //检验码
if (this.logincode.length < 6) { if (this.logincode.length < 6) {
this.$alert(`<div>提交码输入错误</div>`, '错误', { //this.$alert(`<div>提交码输入错误</div>`, '错误', {
confirmButtonText: '确定', dangerouslyUseHTMLString: true, center: true, closeOnClickModal: true // confirmButtonText: '确定', dangerouslyUseHTMLString: true, center: true, closeOnClickModal: true
}).then(a => { }).catch(err => { console.log(err) }); //}).then(a => { }).catch(err => { console.log(err) });
alert("提交码输入错误");
return false; return false;
} }
return new Promise((resolve, reject) => { return new Promise((resolve, reject) => {
@@ -101,9 +102,10 @@ maximum-scale=1.0, user-scalable=no" />
responseType: "json", responseType: "json",
}).then(async response => { }).then(async response => {
if (response.data.data != true) { if (response.data.data != true) {
_this.$alert(`<div>提交码输入错误</div>`, '错误', { //_this.$alert(`<div>提交码输入错误</div>`, '错误', {
confirmButtonText: '确定', dangerouslyUseHTMLString: true, center: true, closeOnClickModal: true // confirmButtonText: '确定', dangerouslyUseHTMLString: true, center: true, closeOnClickModal: true
}).then(a => { }).catch(err => { console.log(err) }); //}).then(a => { }).catch(err => { console.log(err) });
alert("提交码输入错误");
reject(); reject();
} else { } else {
resolve(true) resolve(true)
@@ -150,9 +152,10 @@ maximum-scale=1.0, user-scalable=no" />
} }
} }
if (all_no_select_num > 0) { if (all_no_select_num > 0) {
this.$alert(`<div>请全部选择完毕后再次提交！</div>` + msg1, '错误', { //this.$alert(`<div>请全部选择完毕后再次提交！</div>` + msg1, '错误', {
confirmButtonText: '确定', dangerouslyUseHTMLString: true, center: true, closeOnClickModal: true // confirmButtonText: '确定', dangerouslyUseHTMLString: true, center: true, closeOnClickModal: true
}).then(a => { }).catch(err => { console.log(err) }); //}).then(a => { }).catch(err => { console.log(err) });
alert("请全部选择完毕后再次提交");
return; return;
} }
debugger debugger
@@ -162,40 +165,41 @@ maximum-scale=1.0, user-scalable=no" />
// }).then(a => { }).catch(err => { console.log(err) }); // }).then(a => { }).catch(err => { console.log(err) });
// return; // return;
//} //}
//房建不少于5个 ////房建不少于5个
if (select_false_list[0] < 5) { //if (select_false_list[0] < 5) {
this.$alert(`<div>房建工程不少于5个淘汰！</div>` + msg2, '错误', { // this.$alert(`<div>房建工程不少于5个淘汰！</div>` + 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(`<div>市政工程不少于4个淘汰！</div>` + 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(`<div>交通工程不少于1个淘汰！</div>` + 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(`<div>水利工程不少于1个淘汰！</div>` + msg2, '错误', {
confirmButtonText: '确定', dangerouslyUseHTMLString: true, center: true, closeOnClickModal: true
}).then(a => { }).catch(err => { console.log(err) });
return;
}
//if (all_select_false_num != 8) {
// this.$alert(`<div>淘汰总数只能等于8个！</div>` + msg2, '错误', {
// confirmButtonText: '确定', dangerouslyUseHTMLString: true, center: true, closeOnClickModal: true // confirmButtonText: '确定', dangerouslyUseHTMLString: true, center: true, closeOnClickModal: true
// }).then(a => { }).catch(err => { console.log(err) }); // }).then(a => { }).catch(err => { console.log(err) });
// return; // return;
//} //}
////市政不少于4个
//if (select_false_list[1] < 1) {
// this.$alert(`<div>市政工程不少于4个淘汰！</div>` + 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(`<div>交通工程不少于1个淘汰！</div>` + 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(`<div>水利工程不少于1个淘汰！</div>` + msg2, '错误', {
// confirmButtonText: '确定', dangerouslyUseHTMLString: true, center: true, closeOnClickModal: true
// }).then(a => { }).catch(err => { console.log(err) });
// return;
//}
if (all_select_false_num <= 21) {
//this.$alert(`<div>淘汰总数必须大于21个！</div>` + 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 + '个，是否继续提交?', '提示', { this.$confirm('您此次选择了同意' + all_select_true_num + '个，淘汰' + all_select_false_num + '个，是否继续提交?', '提示', {
confirmButtonText: '确定', confirmButtonText: '确定',
cancelButtonText: '取消', cancelButtonText: '取消',
@@ -210,13 +214,15 @@ maximum-scale=1.0, user-scalable=no" />
responseType: "json", responseType: "json",
}).then(async response => { }).then(async response => {
if (response.data.data != true) { if (response.data.data != true) {
_this.$alert(`<div>` + response.data.message + `</div>`, '错误', { //_this.$alert(`<div>` + response.data.message + `</div>`, '错误', {
confirmButtonText: '确定', dangerouslyUseHTMLString: true, center: true, closeOnClickModal: true // confirmButtonText: '确定', dangerouslyUseHTMLString: true, center: true, closeOnClickModal: true
}).then(a => { }).catch(err => { console.log(err) }); //}).then(a => { }).catch(err => { console.log(err) });
alert(response.data.message);
} else { } else {
_this.$alert(`<div>提交成功</div>`, '成功', { //_this.$alert(`<div>提交成功</div>`, '成功', {
confirmButtonText: '确定', dangerouslyUseHTMLString: true, center: true, closeOnClickModal: true // confirmButtonText: '确定', dangerouslyUseHTMLString: true, center: true, closeOnClickModal: true
}).then(a => { }).catch(err => { console.log(err) }); //}).then(a => { }).catch(err => { console.log(err) });
alert("提交成功");
} }
_this.loading = false; _this.loading = false;
}).catch(async error => { }).catch(async error => {

4
20220330_Vote/Vote.Services/ApiController/ProjectsService.cs
View File

@@ -51,7 +51,7 @@ namespace Vote.Services.ApiController
[Microsoft.AspNetCore.Authorization.AllowAnonymous] [Microsoft.AspNetCore.Authorization.AllowAnonymous]
public async Task<dynamic> List(ProjectsInput args) public async Task<dynamic> List(ProjectsInput args)
{ {
var typeList = new List<string> { "房建工程", "市政工程", "轨道工程", "电力工程", "交通工程", "水利工程" }; var typeList = new List<string> { "房建工程", "市政工程", "轨道交通工程" };//, "电力工程", "交通工程", "水利工程" };
var data = await rep_Projects.DetachedEntities.Where(p => !p.IsDeleted) var data = await rep_Projects.DetachedEntities.Where(p => !p.IsDeleted)
.Where(args.type != null, a => (int)a.type == args.type) .Where(args.type != null, a => (int)a.type == args.type)
.ProjectToType<ProjectsOutput>() .ProjectToType<ProjectsOutput>()
@@ -167,7 +167,7 @@ namespace Vote.Services.ApiController
// data4, // data4,
// data5 // data5
//}; //};
var typeList = new List<string> { "房建工程", "市政工程", "轨道工程", "电力工程", "交通工程", "水利工程" }; var typeList = new List<string> { "房建工程", "市政工程", "轨道交通工程" };//, "电力工程", "交通工程", "水利工程" };
return new { data, typeList }; return new { data, typeList };
} }
/// <summary> /// <summary>

4
20220330_Vote/Vote.Services/Dto/ProjectsInput.cs
View File

@@ -93,8 +93,8 @@ namespace Vote.Services.Dto
{ {
get get
{ {
return yes_count >= 11; return yes_count > 12;
//return (yes_count / (yes_count + no_count)) >= (2.0 / 3.0); // return (yes_count / (yes_count + no_count)) >= (2.0 / 3.0);
} }
} }
/// <summary> /// <summary>

2
20220330_Vote/Vote.Services/Tools/ExcelHelper.cs
View File

@@ -118,7 +118,7 @@ namespace Vote.Services.Tools
{ {
try try
{ {
string template_name = "2023年度甬江杯投票.xlsx"; string template_name = "2024年度宁波市结构优质认定项目投票结果.xlsx";
string excelFilePath = $"{App.WebHostEnvironment.WebRootPath}\\ExcelTemplate\\{template_name}"; string excelFilePath = $"{App.WebHostEnvironment.WebRootPath}\\ExcelTemplate\\{template_name}";
string outputPath = string.Empty; string outputPath = string.Empty;
if (!string.IsNullOrEmpty(excelFilePath)) if (!string.IsNullOrEmpty(excelFilePath))

BIN
20220330_Vote/doc/2024年结构优质认定项目投票清单1113.xlsx Normal file
View File

Binary file not shown.