From 451101c60a6cefd24c4ac6335a2cbd64c00af9dc Mon Sep 17 00:00:00 2001 From: xiaju <1784803958@qq.com> Date: Thu, 4 Jun 2026 12:28:34 +0800 Subject: [PATCH] =?UTF-8?q?=E6=8A=A5=E8=A1=A8=E7=AE=A1=E7=90=86=EF=BC=9A?= =?UTF-8?q?=E5=AE=89=E5=85=A8=E3=80=81=E8=81=8C=E4=B8=9A=E5=81=A5=E5=BA=B7?= =?UTF-8?q?=E5=8D=B1=E5=AE=B3=E5=9B=A0=E7=B4=A0=E6=B8=85=E5=8D=95=E8=A1=A5?= =?UTF-8?q?=E5=85=85=E4=BA=8B=E6=95=85=E5=88=86=E7=B1=BB?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- DataBase/版本日志/SGGLDB_V2026-06-04-xiaj.sql | 11 +++ .../HazardFactorOccHealthService.cs | 2 + .../HazardFactor/HazardFactorSafetyService.cs | 2 + .../DataIn/安全危害因素数据导入模板.xlsx | Bin 10343 -> 10565 bytes .../DataIn/职业健康危害因素数据导入模板.xlsx | Bin 10343 -> 10563 bytes .../HazardFactor/HazardFactorOccHealth.aspx | 2 + .../HazardFactorOccHealthEdit.aspx | 24 ++++- .../HazardFactorOccHealthEdit.aspx.cs | 8 +- ...HazardFactorOccHealthEdit.aspx.designer.cs | 31 +++--- .../HazardFactorOccHealthIn.aspx.cs | 90 +++++++++++------- .../HazardFactorOccHealthSummary.aspx | 2 + .../HazardFactorOccHealthSummary.aspx.cs | 4 +- .../HazardFactorOccHealthView.aspx | 28 ++++-- .../HazardFactorOccHealthView.aspx.cs | 4 +- ...HazardFactorOccHealthView.aspx.designer.cs | 31 +++--- .../HazardFactor/HazardFactorSafety.aspx | 2 + .../HazardFactor/HazardFactorSafetyEdit.aspx | 24 ++++- .../HazardFactorSafetyEdit.aspx.cs | 8 +- .../HazardFactorSafetyEdit.aspx.designer.cs | 31 +++--- .../HazardFactor/HazardFactorSafetyIn.aspx.cs | 90 +++++++++++------- .../HazardFactorSafetySummary.aspx | 2 + .../HazardFactorSafetySummary.aspx.cs | 4 +- .../HazardFactor/HazardFactorSafetyView.aspx | 26 +++-- .../HazardFactorSafetyView.aspx.cs | 4 +- .../HazardFactorSafetyView.aspx.designer.cs | 31 +++--- SGGL/Model/Model.cs | 52 +++++++++- 26 files changed, 366 insertions(+), 147 deletions(-) create mode 100644 DataBase/版本日志/SGGLDB_V2026-06-04-xiaj.sql diff --git a/DataBase/版本日志/SGGLDB_V2026-06-04-xiaj.sql b/DataBase/版本日志/SGGLDB_V2026-06-04-xiaj.sql new file mode 100644 index 00000000..b465705d --- /dev/null +++ b/DataBase/版本日志/SGGLDB_V2026-06-04-xiaj.sql @@ -0,0 +1,11 @@ + + + + + +ALTER TABLE HazardFactor_Safety +ADD AccidentType NVARCHAR(200) null; +GO +ALTER TABLE HazardFactor_OccHealth +ADD AccidentType NVARCHAR(200) null; +GO diff --git a/SGGL/BLL/ReportManage/HazardFactor/HazardFactorOccHealthService.cs b/SGGL/BLL/ReportManage/HazardFactor/HazardFactorOccHealthService.cs index 963a29a3..9ab74520 100644 --- a/SGGL/BLL/ReportManage/HazardFactor/HazardFactorOccHealthService.cs +++ b/SGGL/BLL/ReportManage/HazardFactor/HazardFactorOccHealthService.cs @@ -41,6 +41,7 @@ namespace BLL newModel.JobStep = model.JobStep; newModel.Hazard = model.Hazard; newModel.Consequence = model.Consequence; + newModel.AccidentType = model.AccidentType; newModel.Illegality = model.Illegality; newModel.BaseRiskSeverity = model.BaseRiskSeverity; newModel.BaseRiskProbability = model.BaseRiskProbability; @@ -76,6 +77,7 @@ namespace BLL newModel.JobStep = model.JobStep; newModel.Hazard = model.Hazard; newModel.Consequence = model.Consequence; + newModel.AccidentType = model.AccidentType; newModel.Illegality = model.Illegality; newModel.BaseRiskSeverity = model.BaseRiskSeverity; newModel.BaseRiskProbability = model.BaseRiskProbability; diff --git a/SGGL/BLL/ReportManage/HazardFactor/HazardFactorSafetyService.cs b/SGGL/BLL/ReportManage/HazardFactor/HazardFactorSafetyService.cs index a6dfbb38..9aff9876 100644 --- a/SGGL/BLL/ReportManage/HazardFactor/HazardFactorSafetyService.cs +++ b/SGGL/BLL/ReportManage/HazardFactor/HazardFactorSafetyService.cs @@ -41,6 +41,7 @@ namespace BLL newModel.JobStep = model.JobStep; newModel.Hazard = model.Hazard; newModel.Consequence = model.Consequence; + newModel.AccidentType = model.AccidentType; newModel.Illegality = model.Illegality; newModel.BaseRiskSeverity = model.BaseRiskSeverity; newModel.BaseRiskProbability = model.BaseRiskProbability; @@ -76,6 +77,7 @@ namespace BLL newModel.JobStep = model.JobStep; newModel.Hazard = model.Hazard; newModel.Consequence = model.Consequence; + newModel.AccidentType = model.AccidentType; newModel.Illegality = model.Illegality; newModel.BaseRiskSeverity = model.BaseRiskSeverity; newModel.BaseRiskProbability = model.BaseRiskProbability; diff --git a/SGGL/FineUIPro.Web/File/Excel/DataIn/安全危害因素数据导入模板.xlsx b/SGGL/FineUIPro.Web/File/Excel/DataIn/安全危害因素数据导入模板.xlsx index 0054822843446b51ff7283f455d052146a3a9d0a..996225cd30f3e93da17fd7595a322d3cac426fa7 100644 GIT binary patch delta 5882 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 delta 5629 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 A^Z)<= diff --git a/SGGL/FineUIPro.Web/File/Excel/DataIn/职业健康危害因素数据导入模板.xlsx b/SGGL/FineUIPro.Web/File/Excel/DataIn/职业健康危害因素数据导入模板.xlsx index d605bb4368926ee0a2c47f5c6eb265a8ffc722f3..34934a3c4eeb7d372e1effb6e54aadd626ea37ba 100644 GIT binary patch delta 5881 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 RuHgS~6lUc>XJ-0``5%LTDi{C& delta 5636 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 diff --git a/SGGL/FineUIPro.Web/ReportManage/HazardFactor/HazardFactorOccHealth.aspx b/SGGL/FineUIPro.Web/ReportManage/HazardFactor/HazardFactorOccHealth.aspx index ee3a1725..532d1ae9 100644 --- a/SGGL/FineUIPro.Web/ReportManage/HazardFactor/HazardFactorOccHealth.aspx +++ b/SGGL/FineUIPro.Web/ReportManage/HazardFactor/HazardFactorOccHealth.aspx @@ -93,6 +93,8 @@ + + diff --git a/SGGL/FineUIPro.Web/ReportManage/HazardFactor/HazardFactorOccHealthEdit.aspx b/SGGL/FineUIPro.Web/ReportManage/HazardFactor/HazardFactorOccHealthEdit.aspx index 58da84f8..4b19d0a2 100644 --- a/SGGL/FineUIPro.Web/ReportManage/HazardFactor/HazardFactorOccHealthEdit.aspx +++ b/SGGL/FineUIPro.Web/ReportManage/HazardFactor/HazardFactorOccHealthEdit.aspx @@ -39,7 +39,19 @@ - + <%-- + --%> + + + + + + + + + + + @@ -47,6 +59,12 @@ + + + + + + @@ -90,12 +108,12 @@ - + <%-- - + --%> diff --git a/SGGL/FineUIPro.Web/ReportManage/HazardFactor/HazardFactorOccHealthEdit.aspx.cs b/SGGL/FineUIPro.Web/ReportManage/HazardFactor/HazardFactorOccHealthEdit.aspx.cs index 9d829371..813e96eb 100644 --- a/SGGL/FineUIPro.Web/ReportManage/HazardFactor/HazardFactorOccHealthEdit.aspx.cs +++ b/SGGL/FineUIPro.Web/ReportManage/HazardFactor/HazardFactorOccHealthEdit.aspx.cs @@ -77,7 +77,9 @@ namespace FineUIPro.Web.ReportManage.HazardFactor this.txtWorkPlace.Text = model.WorkPlace; this.txtJobStep.Text = model.JobStep; this.txtHazard.Text = model.Hazard; - this.txtConsequence.Text = model.Consequence; + //this.txtConsequence.Text = model.Consequence; + this.rblConsequence.SelectedValue = model.Consequence; + this.txtAccidentType.Text = model.AccidentType; this.rblIllegality.SelectedValue = model.Illegality ? "1" : "0"; this.txtBaseRiskSeverity.Text = model.BaseRiskSeverity.ToString(); this.txtBaseRiskProbability.Text = model.BaseRiskProbability.ToString(); @@ -160,7 +162,9 @@ namespace FineUIPro.Web.ReportManage.HazardFactor model.WorkPlace = this.txtWorkPlace.Text.Trim(); model.JobStep = this.txtJobStep.Text.Trim(); model.Hazard = this.txtHazard.Text.Trim(); - model.Consequence = this.txtConsequence.Text.Trim(); + //model.Consequence = this.txtConsequence.Text.Trim(); + model.Consequence = this.rblConsequence.SelectedValue; + model.AccidentType = this.txtAccidentType.Text.Trim(); model.Illegality = this.rblIllegality.SelectedValue == "1"; model.BaseRiskSeverity = int.Parse(this.txtBaseRiskSeverity.Text.Trim()); model.BaseRiskProbability = int.Parse(this.txtBaseRiskProbability.Text.Trim()); diff --git a/SGGL/FineUIPro.Web/ReportManage/HazardFactor/HazardFactorOccHealthEdit.aspx.designer.cs b/SGGL/FineUIPro.Web/ReportManage/HazardFactor/HazardFactorOccHealthEdit.aspx.designer.cs index 6d44ee01..985836da 100644 --- a/SGGL/FineUIPro.Web/ReportManage/HazardFactor/HazardFactorOccHealthEdit.aspx.designer.cs +++ b/SGGL/FineUIPro.Web/ReportManage/HazardFactor/HazardFactorOccHealthEdit.aspx.designer.cs @@ -96,13 +96,22 @@ namespace FineUIPro.Web.ReportManage.HazardFactor protected global::FineUIPro.TextArea txtHazard; /// - /// txtConsequence 控件。 + /// rblConsequence 控件。 /// /// /// 自动生成的字段。 /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// - protected global::FineUIPro.TextBox txtConsequence; + protected global::FineUIPro.RadioButtonList rblConsequence; + + /// + /// txtAccidentType 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.TextBox txtAccidentType; /// /// rblIllegality 控件。 @@ -113,6 +122,15 @@ namespace FineUIPro.Web.ReportManage.HazardFactor /// protected global::FineUIPro.RadioButtonList rblIllegality; + /// + /// txtNetRiskControlMeasures 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.TextArea txtNetRiskControlMeasures; + /// /// Panel1 控件。 /// @@ -212,15 +230,6 @@ namespace FineUIPro.Web.ReportManage.HazardFactor /// protected global::FineUIPro.Form Form4; - /// - /// txtNetRiskControlMeasures 控件。 - /// - /// - /// 自动生成的字段。 - /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 - /// - protected global::FineUIPro.TextArea txtNetRiskControlMeasures; - /// /// txtNetRiskSeverity 控件。 /// diff --git a/SGGL/FineUIPro.Web/ReportManage/HazardFactor/HazardFactorOccHealthIn.aspx.cs b/SGGL/FineUIPro.Web/ReportManage/HazardFactor/HazardFactorOccHealthIn.aspx.cs index 0cec0cde..5965d66a 100644 --- a/SGGL/FineUIPro.Web/ReportManage/HazardFactor/HazardFactorOccHealthIn.aspx.cs +++ b/SGGL/FineUIPro.Web/ReportManage/HazardFactor/HazardFactorOccHealthIn.aspx.cs @@ -78,9 +78,10 @@ namespace FineUIPro.Web.ReportManage.HazardFactor } } - public static int Cols = 19;//列数 + public static int Cols = 20;//列数 public static List validLevelStrings = new List { "低风险", "一般风险", "较大风险", "重大风险" }; + public static List validConsequenceStrings = new List { "人员伤亡", "财产损失", "环境破坏", "公司声誉" }; #endregion @@ -269,22 +270,23 @@ namespace FineUIPro.Web.ReportManage.HazardFactor string rData2 = row[2]?.ToString().Trim(); // 作业内容/步骤 string rData3 = row[3]?.ToString().Trim(); // 危害因素描述 string rData4 = row[4]?.ToString().Trim(); // 主要后果 - string rData5 = row[5]?.ToString().Trim(); // 违法 - string rData6 = row[6]?.ToString().Trim(); // 固有风险-严重性 - string rData7 = row[7]?.ToString().Trim(); // 固有风险-可能性 - string rData8 = row[8]?.ToString().Trim(); // 固有风险-得分 - string rData9 = row[9]?.ToString().Trim(); // 固有风险-风险级别 - string rData10 = row[10]?.ToString().Trim(); // 固有风险-可接受 - string rData11 = row[11]?.ToString().Trim(); // 残留风险-现有控制措施 - string rData12 = row[12]?.ToString().Trim(); // 残留风险-严重性 - string rData13 = row[13]?.ToString().Trim(); // 残留风险-可能性 - string rData14 = row[14]?.ToString().Trim(); // 残留风险-得分 - string rData15 = row[15]?.ToString().Trim(); // 残留风险-风险级别 - string rData16 = row[16]?.ToString().Trim(); // 残留风险-可接受 - string rData17 = row[17]?.ToString().Trim(); // 新增或变更的控制措施 - string rData18 = row[18]?.ToString().Trim(); // 责任部门 + string rData5 = row[5]?.ToString().Trim(); // 事故分类 + string rData6 = row[6]?.ToString().Trim(); // 违法 + string rData7 = row[7]?.ToString().Trim(); // 固有风险-严重性 + string rData8 = row[8]?.ToString().Trim(); // 固有风险-可能性 + string rData9 = row[9]?.ToString().Trim(); // 固有风险-得分 + string rData10 = row[10]?.ToString().Trim(); // 固有风险-风险级别 + string rData11 = row[11]?.ToString().Trim(); // 固有风险-可接受 + string rData12 = row[12]?.ToString().Trim(); // 残留风险-现有控制措施 + string rData13 = row[13]?.ToString().Trim(); // 残留风险-严重性 + string rData14 = row[14]?.ToString().Trim(); // 残留风险-可能性 + string rData15 = row[15]?.ToString().Trim(); // 残留风险-得分 + string rData16 = row[16]?.ToString().Trim(); // 残留风险-风险级别 + string rData17 = row[17]?.ToString().Trim(); // 残留风险-可接受 + string rData18 = row[18]?.ToString().Trim(); // 新增或变更的控制措施 + string rData19 = row[19]?.ToString().Trim(); // 责任部门 - rData17 = rData17 == "无" ? string.Empty : rData17; + rData18 = rData18 == "无" ? string.Empty : rData18; string Year = string.Empty; string Month = string.Empty; @@ -292,6 +294,7 @@ namespace FineUIPro.Web.ReportManage.HazardFactor string JobStep = string.Empty; string Hazard = string.Empty; string Consequence = string.Empty; + string AccidentType = string.Empty; bool Illegality = false; int BaseRiskSeverity = 0; int BaseRiskProbability = 0; @@ -351,16 +354,32 @@ namespace FineUIPro.Web.ReportManage.HazardFactor } if (!string.IsNullOrEmpty(rData4)) { - Consequence = rData4; + //Consequence = rData4; + if (!validConsequenceStrings.Any(x => x == rData4)) + { + lstError.Add(new ErrorInfo { Row = displayRow, Column = "主要后果", Reason = "只能是[人员伤亡/财产损失/环境破坏/公司声誉]！" }); + } + else + { + Consequence = rData4; + } } else { lstError.Add(new ErrorInfo { Row = displayRow, Column = "主要后果", Reason = "不能为空" }); } - Illegality = !string.IsNullOrEmpty(rData5) && rData5 == "是"; - if (!string.IsNullOrEmpty(rData6)) + if (!string.IsNullOrEmpty(rData5)) { - if (!int.TryParse(rData6, out int ct)) + AccidentType = rData5; + } + else + { + lstError.Add(new ErrorInfo { Row = displayRow, Column = "事故分类", Reason = "不能为空" }); + } + Illegality = !string.IsNullOrEmpty(rData6) && rData6 == "是"; + if (!string.IsNullOrEmpty(rData7)) + { + if (!int.TryParse(rData7, out int ct)) { lstError.Add(new ErrorInfo { Row = displayRow, Column = "固有风险严重性", Reason = "格式错误" }); } @@ -369,9 +388,9 @@ namespace FineUIPro.Web.ReportManage.HazardFactor BaseRiskSeverity = ct; } } - if (!string.IsNullOrEmpty(rData7)) + if (!string.IsNullOrEmpty(rData8)) { - if (!int.TryParse(rData7, out int ct)) + if (!int.TryParse(rData8, out int ct)) { lstError.Add(new ErrorInfo { Row = displayRow, Column = "固有风险可能性", Reason = "格式错误" }); } @@ -386,19 +405,19 @@ namespace FineUIPro.Web.ReportManage.HazardFactor { BaseRiskLevel = baseRiskLevel.RiskLevelName; } - BaseRiskAcceptabity = !string.IsNullOrEmpty(rData10) && rData10 == "否" ? false : true; - if (!string.IsNullOrEmpty(rData11)) + BaseRiskAcceptabity = !string.IsNullOrEmpty(rData11) && rData11 == "否" ? false : true; + if (!string.IsNullOrEmpty(rData12)) { - NetRiskControlMeasures = rData11; + NetRiskControlMeasures = rData12; } else { lstError.Add(new ErrorInfo { Row = displayRow, Column = "现有控制措施", Reason = "不能为空" }); } - if (!string.IsNullOrEmpty(rData12)) + if (!string.IsNullOrEmpty(rData13)) { - if (!int.TryParse(rData12, out int ct)) + if (!int.TryParse(rData13, out int ct)) { lstError.Add(new ErrorInfo { Row = displayRow, Column = "残留风险严重性", Reason = "格式错误" }); } @@ -407,9 +426,9 @@ namespace FineUIPro.Web.ReportManage.HazardFactor NetRiskSeverity = ct; } } - if (!string.IsNullOrEmpty(rData13)) + if (!string.IsNullOrEmpty(rData14)) { - if (!int.TryParse(rData13, out int ct)) + if (!int.TryParse(rData14, out int ct)) { lstError.Add(new ErrorInfo { Row = displayRow, Column = "残留风险可能性", Reason = "格式错误" }); } @@ -424,15 +443,15 @@ namespace FineUIPro.Web.ReportManage.HazardFactor { NetRiskLevel = netRiskLevel.RiskLevelName; } - NetRiskAcceptabity = !string.IsNullOrEmpty(rData16) && rData16 == "否" ? false : true; + NetRiskAcceptabity = !string.IsNullOrEmpty(rData17) && rData17 == "否" ? false : true; - if (!string.IsNullOrEmpty(rData17)) - { - AdditionalControlMeasures = rData17; - } if (!string.IsNullOrEmpty(rData18)) { - ResponsibleDepartment = rData18; + AdditionalControlMeasures = rData18; + } + if (!string.IsNullOrEmpty(rData19)) + { + ResponsibleDepartment = rData19; } if (lstError.Any()) @@ -469,6 +488,7 @@ namespace FineUIPro.Web.ReportManage.HazardFactor JobStep = JobStep, Hazard = Hazard, Consequence = Consequence, + AccidentType = AccidentType, Illegality = Illegality, BaseRiskSeverity = BaseRiskSeverity, BaseRiskProbability = BaseRiskProbability, diff --git a/SGGL/FineUIPro.Web/ReportManage/HazardFactor/HazardFactorOccHealthSummary.aspx b/SGGL/FineUIPro.Web/ReportManage/HazardFactor/HazardFactorOccHealthSummary.aspx index 4bdbb07d..89a34607 100644 --- a/SGGL/FineUIPro.Web/ReportManage/HazardFactor/HazardFactorOccHealthSummary.aspx +++ b/SGGL/FineUIPro.Web/ReportManage/HazardFactor/HazardFactorOccHealthSummary.aspx @@ -105,6 +105,8 @@ + + diff --git a/SGGL/FineUIPro.Web/ReportManage/HazardFactor/HazardFactorOccHealthSummary.aspx.cs b/SGGL/FineUIPro.Web/ReportManage/HazardFactor/HazardFactorOccHealthSummary.aspx.cs index 907bc250..53560795 100644 --- a/SGGL/FineUIPro.Web/ReportManage/HazardFactor/HazardFactorOccHealthSummary.aspx.cs +++ b/SGGL/FineUIPro.Web/ReportManage/HazardFactor/HazardFactorOccHealthSummary.aspx.cs @@ -65,11 +65,11 @@ namespace FineUIPro.Web.ReportManage.HazardFactor sb.Append("WITH CTE AS ( "); if (dedupe == "0") {//按月 - sb.Append("SELECT ROW_NUMBER() OVER (PARTITION BY tba.Year,tba.Month,tba.WorkPlace,tba.JobStep,tba.Hazard,tba.Consequence,tba.Illegality,tba.BaseRiskSeverity,tba.BaseRiskProbability,tba.BaseRiskScore,tba.BaseRiskLevel,tba.BaseRiskAcceptabity,tba.NetRiskControlMeasures,tba.NetRiskSeverity,tba.NetRiskProbability,tba.NetRiskScore,tba.NetRiskLevel,tba.NetRiskAcceptabity,tba.AdditionalControlMeasures ORDER BY CompileDate desc) as rn,tba.* "); + sb.Append("SELECT ROW_NUMBER() OVER (PARTITION BY tba.Year,tba.Month,tba.WorkPlace,tba.JobStep,tba.Hazard,tba.Consequence,tba.AccidentType,tba.Illegality,tba.BaseRiskSeverity,tba.BaseRiskProbability,tba.BaseRiskScore,tba.BaseRiskLevel,tba.BaseRiskAcceptabity,tba.NetRiskControlMeasures,tba.NetRiskSeverity,tba.NetRiskProbability,tba.NetRiskScore,tba.NetRiskLevel,tba.NetRiskAcceptabity,tba.AdditionalControlMeasures ORDER BY CompileDate desc) as rn,tba.* "); } else {//按年 - sb.Append("SELECT ROW_NUMBER() OVER (PARTITION BY tba.Year,tba.WorkPlace,tba.JobStep,tba.Hazard,tba.Consequence,tba.Illegality,tba.BaseRiskSeverity,tba.BaseRiskProbability,tba.BaseRiskScore,tba.BaseRiskLevel,tba.BaseRiskAcceptabity,tba.NetRiskControlMeasures,tba.NetRiskSeverity,tba.NetRiskProbability,tba.NetRiskScore,tba.NetRiskLevel,tba.NetRiskAcceptabity,tba.AdditionalControlMeasures ORDER BY CompileDate desc) as rn,tba.* "); + sb.Append("SELECT ROW_NUMBER() OVER (PARTITION BY tba.Year,tba.WorkPlace,tba.JobStep,tba.Hazard,tba.Consequence,tba.AccidentType,tba.Illegality,tba.BaseRiskSeverity,tba.BaseRiskProbability,tba.BaseRiskScore,tba.BaseRiskLevel,tba.BaseRiskAcceptabity,tba.NetRiskControlMeasures,tba.NetRiskSeverity,tba.NetRiskProbability,tba.NetRiskScore,tba.NetRiskLevel,tba.NetRiskAcceptabity,tba.AdditionalControlMeasures ORDER BY CompileDate desc) as rn,tba.* "); } } else diff --git a/SGGL/FineUIPro.Web/ReportManage/HazardFactor/HazardFactorOccHealthView.aspx b/SGGL/FineUIPro.Web/ReportManage/HazardFactor/HazardFactorOccHealthView.aspx index d04eac46..5c845ad8 100644 --- a/SGGL/FineUIPro.Web/ReportManage/HazardFactor/HazardFactorOccHealthView.aspx +++ b/SGGL/FineUIPro.Web/ReportManage/HazardFactor/HazardFactorOccHealthView.aspx @@ -45,14 +45,32 @@ - + <%-- + --%> + + + + + + + + + + + - + + + + + + + @@ -96,12 +114,6 @@ - - - - - - diff --git a/SGGL/FineUIPro.Web/ReportManage/HazardFactor/HazardFactorOccHealthView.aspx.cs b/SGGL/FineUIPro.Web/ReportManage/HazardFactor/HazardFactorOccHealthView.aspx.cs index a108f514..bec0ce47 100644 --- a/SGGL/FineUIPro.Web/ReportManage/HazardFactor/HazardFactorOccHealthView.aspx.cs +++ b/SGGL/FineUIPro.Web/ReportManage/HazardFactor/HazardFactorOccHealthView.aspx.cs @@ -63,7 +63,9 @@ namespace FineUIPro.Web.ReportManage.HazardFactor this.txtWorkPlace.Text = model.WorkPlace; this.txtJobStep.Text = model.JobStep; this.txtHazard.Text = model.Hazard; - this.txtConsequence.Text = model.Consequence; + //this.txtConsequence.Text = model.Consequence; + this.rblConsequence.SelectedValue = model.Consequence; + this.txtAccidentType.Text = model.AccidentType; this.rblIllegality.SelectedValue = model.Illegality ? "1" : "0"; this.txtBaseRiskSeverity.Text = model.BaseRiskSeverity.ToString(); this.txtBaseRiskProbability.Text = model.BaseRiskProbability.ToString(); diff --git a/SGGL/FineUIPro.Web/ReportManage/HazardFactor/HazardFactorOccHealthView.aspx.designer.cs b/SGGL/FineUIPro.Web/ReportManage/HazardFactor/HazardFactorOccHealthView.aspx.designer.cs index 26ed9970..4c97647a 100644 --- a/SGGL/FineUIPro.Web/ReportManage/HazardFactor/HazardFactorOccHealthView.aspx.designer.cs +++ b/SGGL/FineUIPro.Web/ReportManage/HazardFactor/HazardFactorOccHealthView.aspx.designer.cs @@ -105,13 +105,22 @@ namespace FineUIPro.Web.ReportManage.HazardFactor protected global::FineUIPro.TextArea txtHazard; /// - /// txtConsequence 控件。 + /// rblConsequence 控件。 /// /// /// 自动生成的字段。 /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// - protected global::FineUIPro.TextBox txtConsequence; + protected global::FineUIPro.RadioButtonList rblConsequence; + + /// + /// txtAccidentType 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.TextBox txtAccidentType; /// /// rblIllegality 控件。 @@ -122,6 +131,15 @@ namespace FineUIPro.Web.ReportManage.HazardFactor /// protected global::FineUIPro.RadioButtonList rblIllegality; + /// + /// txtNetRiskControlMeasures 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.TextArea txtNetRiskControlMeasures; + /// /// Panel1 控件。 /// @@ -221,15 +239,6 @@ namespace FineUIPro.Web.ReportManage.HazardFactor /// protected global::FineUIPro.Form Form4; - /// - /// txtNetRiskControlMeasures 控件。 - /// - /// - /// 自动生成的字段。 - /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 - /// - protected global::FineUIPro.TextArea txtNetRiskControlMeasures; - /// /// txtNetRiskSeverity 控件。 /// diff --git a/SGGL/FineUIPro.Web/ReportManage/HazardFactor/HazardFactorSafety.aspx b/SGGL/FineUIPro.Web/ReportManage/HazardFactor/HazardFactorSafety.aspx index 19d552eb..2f4446a6 100644 --- a/SGGL/FineUIPro.Web/ReportManage/HazardFactor/HazardFactorSafety.aspx +++ b/SGGL/FineUIPro.Web/ReportManage/HazardFactor/HazardFactorSafety.aspx @@ -93,6 +93,8 @@ + + diff --git a/SGGL/FineUIPro.Web/ReportManage/HazardFactor/HazardFactorSafetyEdit.aspx b/SGGL/FineUIPro.Web/ReportManage/HazardFactor/HazardFactorSafetyEdit.aspx index 79f9313e..3a3274c3 100644 --- a/SGGL/FineUIPro.Web/ReportManage/HazardFactor/HazardFactorSafetyEdit.aspx +++ b/SGGL/FineUIPro.Web/ReportManage/HazardFactor/HazardFactorSafetyEdit.aspx @@ -39,7 +39,19 @@ - + <%-- + --%> + + + + + + + + + + + @@ -47,6 +59,12 @@ + + + + + + @@ -90,12 +108,12 @@ - + <%-- - + --%> diff --git a/SGGL/FineUIPro.Web/ReportManage/HazardFactor/HazardFactorSafetyEdit.aspx.cs b/SGGL/FineUIPro.Web/ReportManage/HazardFactor/HazardFactorSafetyEdit.aspx.cs index 4804f9dc..9011ff0d 100644 --- a/SGGL/FineUIPro.Web/ReportManage/HazardFactor/HazardFactorSafetyEdit.aspx.cs +++ b/SGGL/FineUIPro.Web/ReportManage/HazardFactor/HazardFactorSafetyEdit.aspx.cs @@ -76,7 +76,9 @@ namespace FineUIPro.Web.ReportManage.HazardFactor this.txtWorkPlace.Text = model.WorkPlace; this.txtJobStep.Text = model.JobStep; this.txtHazard.Text = model.Hazard; - this.txtConsequence.Text = model.Consequence; + //this.txtConsequence.Text = model.Consequence; + this.rblConsequence.SelectedValue = model.Consequence; + this.txtAccidentType.Text = model.AccidentType; this.rblIllegality.SelectedValue = model.Illegality ? "1" : "0"; this.txtBaseRiskSeverity.Text = model.BaseRiskSeverity.ToString(); this.txtBaseRiskProbability.Text = model.BaseRiskProbability.ToString(); @@ -159,7 +161,9 @@ namespace FineUIPro.Web.ReportManage.HazardFactor model.WorkPlace = this.txtWorkPlace.Text.Trim(); model.JobStep = this.txtJobStep.Text.Trim(); model.Hazard = this.txtHazard.Text.Trim(); - model.Consequence = this.txtConsequence.Text.Trim(); + //model.Consequence = this.txtConsequence.Text.Trim(); + model.Consequence = this.rblConsequence.SelectedValue; + model.AccidentType = this.txtAccidentType.Text.Trim(); model.Illegality = this.rblIllegality.SelectedValue == "1"; model.BaseRiskSeverity = int.Parse(this.txtBaseRiskSeverity.Text.Trim()); model.BaseRiskProbability = int.Parse(this.txtBaseRiskProbability.Text.Trim()); diff --git a/SGGL/FineUIPro.Web/ReportManage/HazardFactor/HazardFactorSafetyEdit.aspx.designer.cs b/SGGL/FineUIPro.Web/ReportManage/HazardFactor/HazardFactorSafetyEdit.aspx.designer.cs index 45ffe01b..ca400157 100644 --- a/SGGL/FineUIPro.Web/ReportManage/HazardFactor/HazardFactorSafetyEdit.aspx.designer.cs +++ b/SGGL/FineUIPro.Web/ReportManage/HazardFactor/HazardFactorSafetyEdit.aspx.designer.cs @@ -96,13 +96,22 @@ namespace FineUIPro.Web.ReportManage.HazardFactor protected global::FineUIPro.TextArea txtHazard; /// - /// txtConsequence 控件。 + /// rblConsequence 控件。 /// /// /// 自动生成的字段。 /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// - protected global::FineUIPro.TextBox txtConsequence; + protected global::FineUIPro.RadioButtonList rblConsequence; + + /// + /// txtAccidentType 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.TextBox txtAccidentType; /// /// rblIllegality 控件。 @@ -113,6 +122,15 @@ namespace FineUIPro.Web.ReportManage.HazardFactor /// protected global::FineUIPro.RadioButtonList rblIllegality; + /// + /// txtNetRiskControlMeasures 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.TextArea txtNetRiskControlMeasures; + /// /// Panel1 控件。 /// @@ -212,15 +230,6 @@ namespace FineUIPro.Web.ReportManage.HazardFactor /// protected global::FineUIPro.Form Form4; - /// - /// txtNetRiskControlMeasures 控件。 - /// - /// - /// 自动生成的字段。 - /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 - /// - protected global::FineUIPro.TextArea txtNetRiskControlMeasures; - /// /// txtNetRiskSeverity 控件。 /// diff --git a/SGGL/FineUIPro.Web/ReportManage/HazardFactor/HazardFactorSafetyIn.aspx.cs b/SGGL/FineUIPro.Web/ReportManage/HazardFactor/HazardFactorSafetyIn.aspx.cs index 23a598dc..9a3726f2 100644 --- a/SGGL/FineUIPro.Web/ReportManage/HazardFactor/HazardFactorSafetyIn.aspx.cs +++ b/SGGL/FineUIPro.Web/ReportManage/HazardFactor/HazardFactorSafetyIn.aspx.cs @@ -78,9 +78,10 @@ namespace FineUIPro.Web.ReportManage.HazardFactor } } - public static int Cols = 19;//列数 + public static int Cols = 20;//列数 public static List validLevelStrings = new List { "低风险", "一般风险", "较大风险", "重大风险" }; + public static List validConsequenceStrings = new List { "人员伤亡", "财产损失", "环境破坏", "公司声誉" }; #endregion @@ -269,22 +270,23 @@ namespace FineUIPro.Web.ReportManage.HazardFactor string rData2 = row[2]?.ToString().Trim(); // 作业内容/步骤 string rData3 = row[3]?.ToString().Trim(); // 危害因素描述 string rData4 = row[4]?.ToString().Trim(); // 主要后果 - string rData5 = row[5]?.ToString().Trim(); // 违法 - string rData6 = row[6]?.ToString().Trim(); // 固有风险-严重性 - string rData7 = row[7]?.ToString().Trim(); // 固有风险-可能性 - string rData8 = row[8]?.ToString().Trim(); // 固有风险-得分 - string rData9 = row[9]?.ToString().Trim(); // 固有风险-风险级别 - string rData10 = row[10]?.ToString().Trim(); // 固有风险-可接受 - string rData11 = row[11]?.ToString().Trim(); // 残留风险-现有控制措施 - string rData12 = row[12]?.ToString().Trim(); // 残留风险-严重性 - string rData13 = row[13]?.ToString().Trim(); // 残留风险-可能性 - string rData14 = row[14]?.ToString().Trim(); // 残留风险-得分 - string rData15 = row[15]?.ToString().Trim(); // 残留风险-风险级别 - string rData16 = row[16]?.ToString().Trim(); // 残留风险-可接受 - string rData17 = row[17]?.ToString().Trim(); // 新增或变更的控制措施 - string rData18 = row[18]?.ToString().Trim(); // 责任部门 + string rData5 = row[5]?.ToString().Trim(); // 事故分类 + string rData6 = row[6]?.ToString().Trim(); // 违法 + string rData7 = row[7]?.ToString().Trim(); // 固有风险-严重性 + string rData8 = row[8]?.ToString().Trim(); // 固有风险-可能性 + string rData9 = row[9]?.ToString().Trim(); // 固有风险-得分 + string rData10 = row[10]?.ToString().Trim(); // 固有风险-风险级别 + string rData11 = row[11]?.ToString().Trim(); // 固有风险-可接受 + string rData12 = row[12]?.ToString().Trim(); // 残留风险-现有控制措施 + string rData13 = row[13]?.ToString().Trim(); // 残留风险-严重性 + string rData14 = row[14]?.ToString().Trim(); // 残留风险-可能性 + string rData15 = row[15]?.ToString().Trim(); // 残留风险-得分 + string rData16 = row[16]?.ToString().Trim(); // 残留风险-风险级别 + string rData17 = row[17]?.ToString().Trim(); // 残留风险-可接受 + string rData18 = row[18]?.ToString().Trim(); // 新增或变更的控制措施 + string rData19 = row[19]?.ToString().Trim(); // 责任部门 - rData17 = rData17 == "无" ? string.Empty : rData17; + rData18 = rData18 == "无" ? string.Empty : rData18; string Year = string.Empty; string Month = string.Empty; @@ -292,6 +294,7 @@ namespace FineUIPro.Web.ReportManage.HazardFactor string JobStep = string.Empty; string Hazard = string.Empty; string Consequence = string.Empty; + string AccidentType = string.Empty; bool Illegality = false; int BaseRiskSeverity = 0; int BaseRiskProbability = 0; @@ -351,16 +354,32 @@ namespace FineUIPro.Web.ReportManage.HazardFactor } if (!string.IsNullOrEmpty(rData4)) { - Consequence = rData4; + //Consequence = rData4; + if (!validConsequenceStrings.Any(x => x == rData4)) + { + lstError.Add(new ErrorInfo { Row = displayRow, Column = "主要后果", Reason = "只能是[人员伤亡/财产损失/环境破坏/公司声誉]！" }); + } + else + { + Consequence = rData4; + } } else { lstError.Add(new ErrorInfo { Row = displayRow, Column = "主要后果", Reason = "不能为空" }); } - Illegality = !string.IsNullOrEmpty(rData5) && rData5 == "是"; - if (!string.IsNullOrEmpty(rData6)) + if (!string.IsNullOrEmpty(rData5)) { - if (!int.TryParse(rData6, out int ct)) + AccidentType = rData5; + } + else + { + lstError.Add(new ErrorInfo { Row = displayRow, Column = "事故分类", Reason = "不能为空" }); + } + Illegality = !string.IsNullOrEmpty(rData6) && rData6 == "是"; + if (!string.IsNullOrEmpty(rData7)) + { + if (!int.TryParse(rData7, out int ct)) { lstError.Add(new ErrorInfo { Row = displayRow, Column = "固有风险严重性", Reason = "格式错误" }); } @@ -369,9 +388,9 @@ namespace FineUIPro.Web.ReportManage.HazardFactor BaseRiskSeverity = ct; } } - if (!string.IsNullOrEmpty(rData7)) + if (!string.IsNullOrEmpty(rData8)) { - if (!int.TryParse(rData7, out int ct)) + if (!int.TryParse(rData8, out int ct)) { lstError.Add(new ErrorInfo { Row = displayRow, Column = "固有风险可能性", Reason = "格式错误" }); } @@ -386,19 +405,19 @@ namespace FineUIPro.Web.ReportManage.HazardFactor { BaseRiskLevel = baseRiskLevel.RiskLevelName; } - BaseRiskAcceptabity = !string.IsNullOrEmpty(rData10) && rData10 == "否" ? false : true; - if (!string.IsNullOrEmpty(rData11)) + BaseRiskAcceptabity = !string.IsNullOrEmpty(rData11) && rData11 == "否" ? false : true; + if (!string.IsNullOrEmpty(rData12)) { - NetRiskControlMeasures = rData11; + NetRiskControlMeasures = rData12; } else { lstError.Add(new ErrorInfo { Row = displayRow, Column = "现有控制措施", Reason = "不能为空" }); } - if (!string.IsNullOrEmpty(rData12)) + if (!string.IsNullOrEmpty(rData13)) { - if (!int.TryParse(rData12, out int ct)) + if (!int.TryParse(rData13, out int ct)) { lstError.Add(new ErrorInfo { Row = displayRow, Column = "残留风险严重性", Reason = "格式错误" }); } @@ -407,9 +426,9 @@ namespace FineUIPro.Web.ReportManage.HazardFactor NetRiskSeverity = ct; } } - if (!string.IsNullOrEmpty(rData13)) + if (!string.IsNullOrEmpty(rData14)) { - if (!int.TryParse(rData13, out int ct)) + if (!int.TryParse(rData14, out int ct)) { lstError.Add(new ErrorInfo { Row = displayRow, Column = "残留风险可能性", Reason = "格式错误" }); } @@ -424,15 +443,15 @@ namespace FineUIPro.Web.ReportManage.HazardFactor { NetRiskLevel = netRiskLevel.RiskLevelName; } - NetRiskAcceptabity = !string.IsNullOrEmpty(rData16) && rData16 == "否" ? false : true; + NetRiskAcceptabity = !string.IsNullOrEmpty(rData17) && rData17 == "否" ? false : true; - if (!string.IsNullOrEmpty(rData17)) - { - AdditionalControlMeasures = rData17; - } if (!string.IsNullOrEmpty(rData18)) { - ResponsibleDepartment = rData18; + AdditionalControlMeasures = rData18; + } + if (!string.IsNullOrEmpty(rData19)) + { + ResponsibleDepartment = rData19; } if (lstError.Any()) @@ -469,6 +488,7 @@ namespace FineUIPro.Web.ReportManage.HazardFactor JobStep = JobStep, Hazard = Hazard, Consequence = Consequence, + AccidentType = AccidentType, Illegality = Illegality, BaseRiskSeverity = BaseRiskSeverity, BaseRiskProbability = BaseRiskProbability, diff --git a/SGGL/FineUIPro.Web/ReportManage/HazardFactor/HazardFactorSafetySummary.aspx b/SGGL/FineUIPro.Web/ReportManage/HazardFactor/HazardFactorSafetySummary.aspx index 27b4f181..e3067307 100644 --- a/SGGL/FineUIPro.Web/ReportManage/HazardFactor/HazardFactorSafetySummary.aspx +++ b/SGGL/FineUIPro.Web/ReportManage/HazardFactor/HazardFactorSafetySummary.aspx @@ -105,6 +105,8 @@ + + diff --git a/SGGL/FineUIPro.Web/ReportManage/HazardFactor/HazardFactorSafetySummary.aspx.cs b/SGGL/FineUIPro.Web/ReportManage/HazardFactor/HazardFactorSafetySummary.aspx.cs index 324165e3..b6b1c0f1 100644 --- a/SGGL/FineUIPro.Web/ReportManage/HazardFactor/HazardFactorSafetySummary.aspx.cs +++ b/SGGL/FineUIPro.Web/ReportManage/HazardFactor/HazardFactorSafetySummary.aspx.cs @@ -65,11 +65,11 @@ namespace FineUIPro.Web.ReportManage.HazardFactor sb.Append("WITH CTE AS ( "); if (dedupe == "0") {//按月 - sb.Append("SELECT ROW_NUMBER() OVER (PARTITION BY tba.Year,tba.Month,tba.WorkPlace,tba.JobStep,tba.Hazard,tba.Consequence,tba.Illegality,tba.BaseRiskSeverity,tba.BaseRiskProbability,tba.BaseRiskScore,tba.BaseRiskLevel,tba.BaseRiskAcceptabity,tba.NetRiskControlMeasures,tba.NetRiskSeverity,tba.NetRiskProbability,tba.NetRiskScore,tba.NetRiskLevel,tba.NetRiskAcceptabity,tba.AdditionalControlMeasures ORDER BY CompileDate desc) as rn,tba.* "); + sb.Append("SELECT ROW_NUMBER() OVER (PARTITION BY tba.Year,tba.Month,tba.WorkPlace,tba.JobStep,tba.Hazard,tba.Consequence,tba.AccidentType,tba.Illegality,tba.BaseRiskSeverity,tba.BaseRiskProbability,tba.BaseRiskScore,tba.BaseRiskLevel,tba.BaseRiskAcceptabity,tba.NetRiskControlMeasures,tba.NetRiskSeverity,tba.NetRiskProbability,tba.NetRiskScore,tba.NetRiskLevel,tba.NetRiskAcceptabity,tba.AdditionalControlMeasures ORDER BY CompileDate desc) as rn,tba.* "); } else {//按年 - sb.Append("SELECT ROW_NUMBER() OVER (PARTITION BY tba.Year,tba.WorkPlace,tba.JobStep,tba.Hazard,tba.Consequence,tba.Illegality,tba.BaseRiskSeverity,tba.BaseRiskProbability,tba.BaseRiskScore,tba.BaseRiskLevel,tba.BaseRiskAcceptabity,tba.NetRiskControlMeasures,tba.NetRiskSeverity,tba.NetRiskProbability,tba.NetRiskScore,tba.NetRiskLevel,tba.NetRiskAcceptabity,tba.AdditionalControlMeasures ORDER BY CompileDate desc) as rn,tba.* "); + sb.Append("SELECT ROW_NUMBER() OVER (PARTITION BY tba.Year,tba.WorkPlace,tba.JobStep,tba.Hazard,tba.Consequence,tba.AccidentType,tba.Illegality,tba.BaseRiskSeverity,tba.BaseRiskProbability,tba.BaseRiskScore,tba.BaseRiskLevel,tba.BaseRiskAcceptabity,tba.NetRiskControlMeasures,tba.NetRiskSeverity,tba.NetRiskProbability,tba.NetRiskScore,tba.NetRiskLevel,tba.NetRiskAcceptabity,tba.AdditionalControlMeasures ORDER BY CompileDate desc) as rn,tba.* "); } } else diff --git a/SGGL/FineUIPro.Web/ReportManage/HazardFactor/HazardFactorSafetyView.aspx b/SGGL/FineUIPro.Web/ReportManage/HazardFactor/HazardFactorSafetyView.aspx index 295b3915..feccd925 100644 --- a/SGGL/FineUIPro.Web/ReportManage/HazardFactor/HazardFactorSafetyView.aspx +++ b/SGGL/FineUIPro.Web/ReportManage/HazardFactor/HazardFactorSafetyView.aspx @@ -45,7 +45,19 @@ - + <%-- + --%> + + + + + + + + + + + @@ -53,6 +65,12 @@ + + + + + + @@ -96,12 +114,6 @@ - - - - - - diff --git a/SGGL/FineUIPro.Web/ReportManage/HazardFactor/HazardFactorSafetyView.aspx.cs b/SGGL/FineUIPro.Web/ReportManage/HazardFactor/HazardFactorSafetyView.aspx.cs index b94b5b92..17631420 100644 --- a/SGGL/FineUIPro.Web/ReportManage/HazardFactor/HazardFactorSafetyView.aspx.cs +++ b/SGGL/FineUIPro.Web/ReportManage/HazardFactor/HazardFactorSafetyView.aspx.cs @@ -62,7 +62,9 @@ namespace FineUIPro.Web.ReportManage.HazardFactor this.txtWorkPlace.Text = model.WorkPlace; this.txtJobStep.Text = model.JobStep; this.txtHazard.Text = model.Hazard; - this.txtConsequence.Text = model.Consequence; + //this.txtConsequence.Text = model.Consequence; + this.rblConsequence.SelectedValue = model.Consequence; + this.txtAccidentType.Text = model.AccidentType; this.rblIllegality.SelectedValue = model.Illegality ? "1" : "0"; this.txtBaseRiskSeverity.Text = model.BaseRiskSeverity.ToString(); this.txtBaseRiskProbability.Text = model.BaseRiskProbability.ToString(); diff --git a/SGGL/FineUIPro.Web/ReportManage/HazardFactor/HazardFactorSafetyView.aspx.designer.cs b/SGGL/FineUIPro.Web/ReportManage/HazardFactor/HazardFactorSafetyView.aspx.designer.cs index 0fd50b76..08bac186 100644 --- a/SGGL/FineUIPro.Web/ReportManage/HazardFactor/HazardFactorSafetyView.aspx.designer.cs +++ b/SGGL/FineUIPro.Web/ReportManage/HazardFactor/HazardFactorSafetyView.aspx.designer.cs @@ -105,13 +105,22 @@ namespace FineUIPro.Web.ReportManage.HazardFactor protected global::FineUIPro.TextArea txtHazard; /// - /// txtConsequence 控件。 + /// rblConsequence 控件。 /// /// /// 自动生成的字段。 /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// - protected global::FineUIPro.TextBox txtConsequence; + protected global::FineUIPro.RadioButtonList rblConsequence; + + /// + /// txtAccidentType 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.TextBox txtAccidentType; /// /// rblIllegality 控件。 @@ -122,6 +131,15 @@ namespace FineUIPro.Web.ReportManage.HazardFactor /// protected global::FineUIPro.RadioButtonList rblIllegality; + /// + /// txtNetRiskControlMeasures 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.TextArea txtNetRiskControlMeasures; + /// /// Panel1 控件。 /// @@ -221,15 +239,6 @@ namespace FineUIPro.Web.ReportManage.HazardFactor /// protected global::FineUIPro.Form Form4; - /// - /// txtNetRiskControlMeasures 控件。 - /// - /// - /// 自动生成的字段。 - /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 - /// - protected global::FineUIPro.TextArea txtNetRiskControlMeasures; - /// /// txtNetRiskSeverity 控件。 /// diff --git a/SGGL/Model/Model.cs b/SGGL/Model/Model.cs index 5498255e..264852e5 100644 --- a/SGGL/Model/Model.cs +++ b/SGGL/Model/Model.cs @@ -88199,7 +88199,7 @@ namespace Model } } - [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_UnitName", DbType="NVarChar(50)")] + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_UnitName", DbType="NVarChar(200)")] public string UnitName { get @@ -88239,7 +88239,7 @@ namespace Model } } - [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_ProjectName", DbType="NVarChar(50)")] + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_ProjectName", DbType="NVarChar(200)")] public string ProjectName { get @@ -171049,6 +171049,8 @@ namespace Model private string _UnitProjectName; + private string _AccidentType; + #region 可扩展性方法定义 partial void OnLoaded(); partial void OnValidate(System.Data.Linq.ChangeAction action); @@ -171109,6 +171111,8 @@ namespace Model partial void OnUnitIdChanged(); partial void OnUnitProjectNameChanging(string value); partial void OnUnitProjectNameChanged(); + partial void OnAccidentTypeChanging(string value); + partial void OnAccidentTypeChanged(); #endregion public HazardFactor_OccHealth() @@ -171676,6 +171680,26 @@ namespace Model } } + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_AccidentType", DbType="NVarChar(200)")] + public string AccidentType + { + get + { + return this._AccidentType; + } + set + { + if ((this._AccidentType != value)) + { + this.OnAccidentTypeChanging(value); + this.SendPropertyChanging(); + this._AccidentType = value; + this.SendPropertyChanged("AccidentType"); + this.OnAccidentTypeChanged(); + } + } + } + public event PropertyChangingEventHandler PropertyChanging; public event PropertyChangedEventHandler PropertyChanged; @@ -171759,6 +171783,8 @@ namespace Model private string _UnitProjectName; + private string _AccidentType; + #region 可扩展性方法定义 partial void OnLoaded(); partial void OnValidate(System.Data.Linq.ChangeAction action); @@ -171819,6 +171845,8 @@ namespace Model partial void OnUnitIdChanged(); partial void OnUnitProjectNameChanging(string value); partial void OnUnitProjectNameChanged(); + partial void OnAccidentTypeChanging(string value); + partial void OnAccidentTypeChanged(); #endregion public HazardFactor_Safety() @@ -172386,6 +172414,26 @@ namespace Model } } + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_AccidentType", DbType="NVarChar(200)")] + public string AccidentType + { + get + { + return this._AccidentType; + } + set + { + if ((this._AccidentType != value)) + { + this.OnAccidentTypeChanging(value); + this.SendPropertyChanging(); + this._AccidentType = value; + this.SendPropertyChanged("AccidentType"); + this.OnAccidentTypeChanged(); + } + } + } + public event PropertyChangingEventHandler PropertyChanging; public event PropertyChangedEventHandler PropertyChanged;