From 48129fe367f32627d30968ae933ef779298e0b5c Mon Sep 17 00:00:00 2001 From: 10191 <506754232@qq.com> Date: Tue, 27 Jun 2023 21:09:40 +0800 Subject: [PATCH] =?UTF-8?q?=E8=80=83=E8=AF=95=E5=AF=BC=E5=87=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- SGGL/BLL/Common/PrinterDocService.cs | 52 ++++--- .../CQMS/ManageReport/ManagerMonthC.aspx | 12 +- SGGL/FineUIPro.Web/Web.config | 143 +++++++++--------- 3 files changed, 105 insertions(+), 102 deletions(-) diff --git a/SGGL/BLL/Common/PrinterDocService.cs b/SGGL/BLL/Common/PrinterDocService.cs index 77a46a8f..61aaf6fa 100644 --- a/SGGL/BLL/Common/PrinterDocService.cs +++ b/SGGL/BLL/Common/PrinterDocService.cs @@ -1410,6 +1410,8 @@ var getTestRecord = TestRecordService.GetTestRecordById(testRecordId); if (getTestRecord != null) { + var sysTestRule = Funs.DB.Sys_TestRule.FirstOrDefault(); + var getTestItems = from x in Funs.DB.Training_TestRecordItem where x.TestRecordId == testRecordId select x; @@ -1465,11 +1467,11 @@ sb.Append(""); sb.Append(""); - ///单项选择题 - sb.Append(""); - sb.AppendFormat(" ", "一、单项选择题 (每题2分，共50分)"); - sb.Append(""); + ///单项选择题 var getSingleItem = getTestItems.Where(x=> x.TestType == "1").ToList(); + sb.Append(""); + sb.AppendFormat(" ", "一、单项选择题 (每题"+ sysTestRule.SValue+ "分，共"+ (sysTestRule.SValue*getSingleItem.Count) + "分)"); + sb.Append(""); if (getSingleItem.Count > 0) { int num = 1; @@ -1478,7 +1480,7 @@ sb.Append(""); string Avstracts = item.Abstracts.Replace("　", "").Replace(" ", "").Replace("（", "(").Replace("）", ")").Replace("()", "(" + item.SelectedItem + ")"); - sb.AppendFormat(" ", num + "、" + Avstracts); + sb.AppendFormat(" ", num + "、" + Avstracts + " 正确答案："+ item.AnswerItems); sb.Append(""); sb.Append(""); string str = string.Empty; @@ -1502,26 +1504,27 @@ sb.AppendFormat(" ", str); sb.Append(""); - sb.Append(""); - sb.AppendFormat(" ", item.AnswerItems); - sb.Append(""); + //sb.Append(""); + //sb.AppendFormat(" ", item.AnswerItems); + //sb.Append(""); num++; } } - ///多项选择题 + ///多项选择题 + var getMultipleItem = getTestItems.Where(x => x.TestType == "2").ToList(); sb.Append(""); - sb.AppendFormat(" ", "二、多项选择题 (每题3分，共30分)"); + sb.AppendFormat(" ", "二、多项选择题 (每题"+ sysTestRule.MValue+ "分，共"+(getMultipleItem.Count * getMultipleItem.Count) +"分)"); sb.Append(""); - var getMultipleItem = getTestItems.Where(x => x.TestType == "2").ToList(); + if (getMultipleItem.Count > 0) { int num = 1; foreach (var item in getMultipleItem) { string Avstracts = item.Abstracts.Replace("　", "").Replace(" ", "").Replace("（", "(").Replace("）", ")").Replace("()", "(" + item.SelectedItem + ")"); - sb.AppendFormat(" ", num + "、" + Avstracts); + sb.AppendFormat(" ", num + "、" + Avstracts + " 正确答案：" + item.AnswerItems); sb.Append(""); sb.Append(""); string str = string.Empty; @@ -1544,18 +1547,19 @@ sb.AppendFormat(" ", str); sb.Append(""); - sb.Append(""); - sb.AppendFormat(" ", item.AnswerItems); - sb.Append(""); + //sb.Append(""); + //sb.AppendFormat(" ", item.AnswerItems); + //sb.Append(""); num++; } } - ///判断题 - sb.Append(""); - sb.AppendFormat(" ", "三、判断题 (每题1分，共20分)"); - sb.Append(""); + ///判断题 var getIsTrueItem = getTestItems.Where(x => x.TestType == "3").ToList(); + sb.Append(""); + sb.AppendFormat(" ", "三、判断题 (每题"+ sysTestRule.JValue + "分，共"+(sysTestRule.JValue+ getIsTrueItem.Count) + "分)"); + sb.Append(""); + if (getIsTrueItem.Count > 0) { int num = 1; @@ -1572,11 +1576,11 @@ if (Avstracts.IndexOf("（") > -1) Avstracts = Avstracts.Replace("（", "（" + item.SelectedItem == "（A" ? "（√" : "（×"); } - sb.AppendFormat(" ", num + "、" + Avstracts); - sb.Append(""); - sb.Append(""); - sb.AppendFormat(" ", item.AnswerItems== "=="? "√" : "×"); - sb.Append(""); + sb.AppendFormat(" ", num + "、" + Avstracts + "正确答案："+ item.AnswerItems == "A" ? "√" : "×"); + //sb.Append(""); + //sb.Append(""); + //sb.AppendFormat(" ", item.AnswerItems== "=="? "√" : "×"); + //sb.Append(""); num++; } } diff --git a/SGGL/FineUIPro.Web/CQMS/ManageReport/ManagerMonthC.aspx b/SGGL/FineUIPro.Web/CQMS/ManageReport/ManagerMonthC.aspx index eef88626..b5a5c4f3 100644 --- a/SGGL/FineUIPro.Web/CQMS/ManageReport/ManagerMonthC.aspx +++ b/SGGL/FineUIPro.Web/CQMS/ManageReport/ManagerMonthC.aspx @@ -173,28 +173,28 @@ if (params.rowValue.ReportItem === '一次拍片数' ) { var columnValue1 = me.getCellValue(rowId, columnId); var columnValue2 = me.getCellValue(me.data[params.rowIndex + 1].id, columnId); - me.updateCellValue(me.data[params.rowIndex + 2].id, columnId, (100.0 * columnValue1 / columnValue2).toFixed(2)); + me.updateCellValue(me.data[params.rowIndex + 2].id, columnId, (100.0 * columnValue2 /columnValue1 ).toFixed(2)); var columnValue3 = me.getCellValue(rowId, 'YearTotal'); var columnValue4 = me.getCellValue(me.data[params.rowIndex + 1].id, 'YearTotal'); - me.updateCellValue(me.data[params.rowIndex + 2].id, 'YearTotal', (100.0 * columnValue3 / columnValue4).toFixed(2)); + me.updateCellValue(me.data[params.rowIndex + 2].id, 'YearTotal', (100.0 * columnValue4 /columnValue3 ).toFixed(2)); var columnValue5 = me.getCellValue(rowId, 'ProjectTotal'); var columnValue6 = me.getCellValue(me.data[params.rowIndex + 1].id, 'ProjectTotal'); - me.updateCellValue(me.data[params.rowIndex + 2].id, 'ProjectTotal', (100.0 * columnValue5 / columnValue6).toFixed(2)); + me.updateCellValue(me.data[params.rowIndex + 2].id, 'ProjectTotal', (100.0 * columnValue6/ columnValue5).toFixed(2)); } else if ( params.rowValue.ReportItem === '一次合格数') { var columnValue1 = me.getCellValue(me.data[params.rowIndex - 1].id, columnId); var columnValue2 = me.getCellValue(rowId, columnId); - me.updateCellValue(me.data[params.rowIndex + 1].id, columnId, (100.0 * columnValue1 / columnValue2).toFixed(2)); + me.updateCellValue(me.data[params.rowIndex + 1].id, columnId, (100.0 * columnValue2 /columnValue1 ).toFixed(2)); var columnValue3 = me.getCellValue(me.data[params.rowIndex - 1].id, 'YearTotal'); var columnValue4 = me.getCellValue(rowId, 'YearTotal'); - me.updateCellValue(me.data[params.rowIndex + 1].id, 'YearTotal', (100.0 * columnValue3 / columnValue4).toFixed(2)); + me.updateCellValue(me.data[params.rowIndex + 1].id, 'YearTotal', (100.0 * columnValue4 /columnValue3 ).toFixed(2)); var columnValue5 = me.getCellValue(me.data[params.rowIndex - 1].id, 'ProjectTotal'); var columnValue6 = me.getCellValue(rowId, 'ProjectTotal'); - me.updateCellValue(me.data[params.rowIndex + 1].id, 'ProjectTotal', (100.0 * columnValue5 / columnValue6).toFixed(2)); + me.updateCellValue(me.data[params.rowIndex + 1].id, 'ProjectTotal', (100.0 * columnValue6 /columnValue5 ).toFixed(2)); } } diff --git a/SGGL/FineUIPro.Web/Web.config b/SGGL/FineUIPro.Web/Web.config index 04324e05..3229e5b5 100644 --- a/SGGL/FineUIPro.Web/Web.config +++ b/SGGL/FineUIPro.Web/Web.config @@ -1,4 +1,4 @@ - + -
+
- + - + - - - - - + + + + + - - - + + + - + - - - + + + - + - + - - - + + + - - + + - - - + + + - - + + - + - - + + - - + + - - - + + + - + - + - - + + - + - - - + + + - - - - + + + + - + - + - - + - + - + - - - - + + + + - + - - + + - + @@ -154,24 +153,24 @@ - - + + - - + + - - + + - - + + - - + +
{0}
{0}
{0}{0}
{0}
正确答案：{0}
正确答案：{0}
{0}{0}
{0}{0}
{0}
正确答案：{0}
正确答案：{0}
{0}
{0}
{0}
正确答案：{0}
{0}
正确答案：{0}