diff --git a/DataBase/版本日志/SGGLDB_V2024-11-07-gaofei.sql b/DataBase/版本日志/SGGLDB_V2024-11-07-gaofei.sql
index afdef161..feee6ccc 100644
--- a/DataBase/版本日志/SGGLDB_V2024-11-07-gaofei.sql
+++ b/DataBase/版本日志/SGGLDB_V2024-11-07-gaofei.sql
@@ -1,4 +1,8 @@
alter table HSSE_ConstructionRisk add SubUnitDutyPerson nvarchar(50) null
alter table HSSE_ConstructionRisk add MainUnitDutyPerson nvarchar(50) null
alter table HSSE_ConstructionRisk add MainUnitCheckPerson nvarchar(500) null
+GO
+alter table [dbo].[HSSE_ConstructionRiskCheck] alter column [Rectification] nvarchar(500) null
+GO
+alter table [dbo].[HSSE_ConstructionRiskControl] alter column Measures nvarchar(500) null
GO
\ No newline at end of file
diff --git a/SGGL/BLL/Common/Const.cs b/SGGL/BLL/Common/Const.cs
index 8913eb77..60b1b75c 100644
--- a/SGGL/BLL/Common/Const.cs
+++ b/SGGL/BLL/Common/Const.cs
@@ -3495,6 +3495,11 @@ namespace BLL
/// 施工作业风险导入模板
///
public const string ConstructionRiskTemplateUrl = "File\\Excel\\DataIn\\施工作业风险导入模板.xls";
+
+ ///
+ /// 施工作业风险导出模板
+ ///
+ public const string ConstructionRiskOutTemplateUrl = "File\\Excel\\DataOut\\每周施工作业风险动态管控表.xlsx";
#endregion
#region 初始化上传路径
diff --git a/SGGL/BLL/HSSE/Hazard/ConstructionRiskListService.cs b/SGGL/BLL/HSSE/Hazard/ConstructionRiskListService.cs
index 488c7870..f3e37884 100644
--- a/SGGL/BLL/HSSE/Hazard/ConstructionRiskListService.cs
+++ b/SGGL/BLL/HSSE/Hazard/ConstructionRiskListService.cs
@@ -174,6 +174,36 @@ namespace BLL
}
}
+ ///
+ /// 获取作业风险描述下拉项
+ ///
+ ///
+ public static ListItem[] LicenseDesList()
+ {
+ ListItem[] lis = new ListItem[20];
+ lis[0] = new ListItem("物体打击", "物体打击");
+ lis[1] = new ListItem("车辆伤害", "车辆伤害");
+ lis[2] = new ListItem("机械伤害", "机械伤害");
+ lis[3] = new ListItem("起重伤害", "起重伤害");
+ lis[4] = new ListItem("触电", "触电");
+ lis[5] = new ListItem("淹溺", "淹溺");
+ lis[6] = new ListItem("灼烫", "灼烫");
+ lis[7] = new ListItem("火灾", "火灾");
+ lis[8] = new ListItem("高处坠落", "高处坠落");
+ lis[9] = new ListItem("坍塌", "坍塌");
+ lis[10] = new ListItem("冒顶片帮", "冒顶片帮");
+ lis[11] = new ListItem("透水", "透水");
+ lis[12] = new ListItem("放炮", "放炮");
+ lis[13] = new ListItem("火药爆炸", "火药爆炸");
+ lis[14] = new ListItem("瓦斯爆炸", "瓦斯爆炸");
+ lis[15] = new ListItem("锅炉爆炸", "锅炉爆炸");
+ lis[16] = new ListItem("容器爆炸", "容器爆炸");
+ lis[17] = new ListItem("其他爆炸", "其他爆炸");
+ lis[18] = new ListItem("中毒和窒息", "中毒和窒息");
+ lis[19] = new ListItem("其他伤害", "其他伤害");
+ return lis;
+ }
+
///
/// 获取风险等级下拉项
///
diff --git a/SGGL/FineUIPro.Web/File/Excel/DataIn/施工作业风险导入模板.xls b/SGGL/FineUIPro.Web/File/Excel/DataIn/施工作业风险导入模板.xls
index ce18a034..b1ab96ec 100644
Binary files a/SGGL/FineUIPro.Web/File/Excel/DataIn/施工作业风险导入模板.xls and b/SGGL/FineUIPro.Web/File/Excel/DataIn/施工作业风险导入模板.xls differ
diff --git a/SGGL/FineUIPro.Web/File/Excel/DataOut/每周施工作业风险动态管控表.xlsx b/SGGL/FineUIPro.Web/File/Excel/DataOut/每周施工作业风险动态管控表.xlsx
new file mode 100644
index 00000000..edd06195
Binary files /dev/null and b/SGGL/FineUIPro.Web/File/Excel/DataOut/每周施工作业风险动态管控表.xlsx differ
diff --git a/SGGL/FineUIPro.Web/HSSE/Hazard/ConstructionRisk.aspx b/SGGL/FineUIPro.Web/HSSE/Hazard/ConstructionRisk.aspx
index 43910f09..7a409f7c 100644
--- a/SGGL/FineUIPro.Web/HSSE/Hazard/ConstructionRisk.aspx
+++ b/SGGL/FineUIPro.Web/HSSE/Hazard/ConstructionRisk.aspx
@@ -6,6 +6,23 @@
施工作业风险
+