增强HSE检查的功能

DataBase/版本日志/SGGLDB_WH_2024-7-16-01-phf.sql

@@ -0,0 +1,77 @@
+ALTER VIEW [dbo].[View_Hazard_HazardRegister]
+AS
+SELECT Registration.HazardRegisterId, 
+	Registration.HazardCode, 
+	Registration.RegisterDate, 
+	Registration.RegisterDef, 
+	Registration.Rectification, 
+	Registration.Place, 
+	Registration.ResponsibleUnit, 
+	Registration.Observer, 
+	Registration.Risk_Level,
+	Registration.RectifiedDate, 
+	Registration.ProjectId, 
+	Project.UnitId AS PUnitId,
+	ProjectUnit.UnitName AS PUnitName,
+	Registration.states,
+	Registration.IsEffective,
+	Registration.ResponsibleMan,
+	Registration.CheckManId,
+	Registration.CheckTime,
+	Registration.RectificationPeriod,
+	Registration.ImageUrl,
+	Registration.RectificationImageUrl,
+	Registration.RectificationTime,
+	Registration.ConfirmMan,
+	Registration.ConfirmDate,
+	Registration.HandleIdea, 
+	Registration.CutPayment, 
+	Registration.ProblemTypes, 
+	Registration.CheckSpecialId,
+	Registration.CheckItemDetailId,
+	Registration.SupCheckItemSetId,
+	Registration.CheckItemSetId,
+	Registration.SafeSupervisionId,
+	Registration.SafeSupervisionIsOK,
+	Project.ProjectName,
+	Registration.CheckCycle,
+	ISNULL(WorkArea.UnitWorkName,'') AS WorkAreaName,
+	Unit.UnitName  as ResponsibilityUnitName,
+	User1.UserName AS ResponsibilityManName,
+	ISNULL(User1.Telephone,'') AS ResponsibilityManTel,
+	User2.UserName AS CheckManName,
+	ISNULL(User2.Telephone,'') AS  CheckManTel,
+	User2.UnitId AS SendUnitId,
+	User3.UserName AS ConfirmManName,
+	ISNULL(User3.Telephone,'') AS  ConfirmManTel,
+	User4.UserName AS ResponsibilityManName2,
+	ISNULL(User4.Telephone,'') AS  ResponsibilityMan2Tel,
+	(CASE WHEN Registration.states='1' and (Registration.SafeSupervisionIsOK is null OR Registration.SafeSupervisionIsOK=0) THEN '´ýÕû¸Ä' 
+	WHEN Registration.states='1' and Registration.SafeSupervisionIsOK=1 THEN 'ºÏ¸ñ' 
+	WHEN Registration.states='2' THEN 'ÒÑÕû¸Ä-´ý¸´²éÑéÊÕ' 
+	WHEN Registration.states='3' THEN 'Òѱջ·' 
+	ELSE 'ÒÑ×÷·Ï' END ) AS StatesStr,
+	RegisterTypes.RegisterTypesId,
+	RegisterTypes.RegisterTypesName,
+	Registration.DIC_ID,
+	Registration.CCManIds,
+	CCManNames = STUFF(( SELECT ',' + UserName FROM Sys_User
+				    where PATINDEX('%,' + RTRIM(Sys_User.UserId) + ',%',',' + Registration.CCManIds + ',')>0
+					ORDER BY PATINDEX('%,' + RTRIM(Registration.CCManIds) + ',%',',' + Registration.CCManIds + ',')
+					FOR XML PATH('')), 1, 1,''),
+	Registration.Requirements,
+	Registration.Type,
+	Registration.HiddenType
+FROM dbo.HSSE_Hazard_HazardRegister AS Registration
+LEFT JOIN dbo.Base_Project AS Project ON Project.ProjectId = Registration.ProjectId
+LEFT JOIN dbo.Base_Unit AS ProjectUnit ON Project.UnitId = ProjectUnit.UnitId
+LEFT JOIN dbo.WBS_UnitWork AS WorkArea ON WorkArea.UnitWorkId = Registration.Place 
+LEFT JOIN dbo.HSSE_Hazard_HazardRegisterTypes AS RegisterTypes ON RegisterTypes.RegisterTypesId = Registration.RegisterTypesId 
+LEFT JOIN dbo.Base_Unit AS Unit ON Unit.UnitId = Registration.ResponsibleUnit
+LEFT JOIN dbo.Sys_User AS User1 ON User1.UserId = Registration.ResponsibleMan   
+LEFT JOIN dbo.Sys_User AS User2 ON User2.UserId = Registration.CheckManId
+LEFT JOIN dbo.Sys_User AS User3 ON User3.UserId = Registration.ConfirmMan
+LEFT JOIN dbo.Sys_User AS User4 ON User4.UserId = Registration.ResponsibleMan2
+
+
+GO

DataBase/版本日志/SGGLDB_WH_2024-7-16-phf.sql

@@ -0,0 +1,51 @@
+--hse巡检增加隐患类型
+alter table HSSE_Hazard_HazardRegister
+add HiddenType nvarchar(50) NULL;
+
+--专项检查增加隐患类型
+alter table Check_CheckSpecialDetail
+add HiddenType nvarchar(50) NULL;
+
+--综合检查增加隐患类型和级别
+alter table Check_CheckColligationDetail
+add HiddenHazardType nvarchar(50) NULL;
+
+alter table Check_CheckColligationDetail
+add HiddenType nvarchar(50) NULL;
+
+--隐患整改单增加隐患类型和级别
+alter table Check_RectifyNoticesItem
+add HiddenType nvarchar(50) NULL;
+
+alter table Check_RectifyNoticesItem
+add HiddenHazardType nvarchar(50) NULL;
+
+
+
+--增加隐患类型
+insert into Sys_Const(ID,ConstValue,ConstText,SortIndex,GroupId)
+values(newid(),'高处坠落','高处坠落',1,'Hiddendangertype')
+insert into Sys_Const(ID,ConstValue,ConstText,SortIndex,GroupId)
+values(newid(),'物体打击','物体打击',2,'Hiddendangertype')
+insert into Sys_Const(ID,ConstValue,ConstText,SortIndex,GroupId)
+values(newid(),'车辆伤害','车辆伤害',3,'Hiddendangertype')
+insert into Sys_Const(ID,ConstValue,ConstText,SortIndex,GroupId)
+values(newid(),'机械伤害','机械伤害',4,'Hiddendangertype')
+insert into Sys_Const(ID,ConstValue,ConstText,SortIndex,GroupId)
+values(newid(),'起重伤害','起重伤害',5,'Hiddendangertype')
+insert into Sys_Const(ID,ConstValue,ConstText,SortIndex,GroupId)
+values(newid(),'触电','触电',6,'Hiddendangertype')
+insert into Sys_Const(ID,ConstValue,ConstText,SortIndex,GroupId)
+values(newid(),'火灾','火灾',7,'Hiddendangertype')
+insert into Sys_Const(ID,ConstValue,ConstText,SortIndex,GroupId)
+values(newid(),'灼烫','灼烫',8,'Hiddendangertype')
+insert into Sys_Const(ID,ConstValue,ConstText,SortIndex,GroupId)
+values(newid(),'坍塌','坍塌',9,'Hiddendangertype')
+insert into Sys_Const(ID,ConstValue,ConstText,SortIndex,GroupId)
+values(newid(),'淹溺','淹溺',10,'Hiddendangertype')
+insert into Sys_Const(ID,ConstValue,ConstText,SortIndex,GroupId)
+values(newid(),'爆炸','爆炸',11,'Hiddendangertype')
+insert into Sys_Const(ID,ConstValue,ConstText,SortIndex,GroupId)
+values(newid(),'中毒窒息','中毒窒息',12,'Hiddendangertype')
+insert into Sys_Const(ID,ConstValue,ConstText,SortIndex,GroupId)
+values(newid(),'环境损害','环境损害',13,'Hiddendangertype')

DataBase/版本日志/SGGLDB_WH_2024-7-17-phf.sql

@@ -0,0 +1,42 @@
+ALTER VIEW [dbo].[View_Check_CheckColligationDetail]  AS 
+/*综合大检查明细列表视图*/
+SELECT checkColligationDetail.CheckColligationDetailId, 
+checkColligationDetail.CheckColligationId, 
+checkColligationDetail.CheckItem, 
+checkColligationDetail.CheckItemType,
+checkColligationDetail.Unqualified,
+checkColligationDetail.CheckArea,
+checkColligationDetail.UnitId,
+checkColligationDetail.HandleStep,
+checkColligationDetail.CompleteStatus,
+(CASE WHEN checkColligationDetail.CompleteStatus =1 THEN '是' 
+			WHEN checkColligationDetail.CompleteStatus =0 THEN '否' ELSE '' END) AS  CompleteStatusName,
+checkColligationDetail.LimitedDate,
+checkColligationDetail.CompletedDate,
+checkColligationDetail.Suggestions,
+checkColligationDetail.CheckContent,
+CASE WHEN checkColligationDetail.CheckContent IS NOT NULL THEN checkColligationDetail.CheckContent
+ELSE checkItemSet.CheckItemName END AS CheckItemStr,
+checkColligationDetail.WorkArea,
+unit.UnitName,
+const.ConstText AS HandleStepStr,
+checkColligationDetail.HiddenDangerType,
+checkColligationDetail.HiddenDangerLevel,
+person.UserName AS PersonName,
+
+checkColligationDetail.HiddenType,
+checkColligationDetail.HiddenHazardType
+
+FROM dbo.Check_CheckColligationDetail AS checkColligationDetail
+--LEFT JOIN dbo.Check_ProjectCheckItemDetail AS checkItemDetail ON checkItemDetail.CheckItemDetailId=checkColligationDetail.CheckItem
+LEFT JOIN dbo.Technique_CheckItemSet AS checkItemSet ON checkItemSet.CheckItemSetId=checkColligationDetail.CheckItem
+LEFT JOIN dbo.Base_Unit AS unit ON unit.UnitId=checkColligationDetail.UnitId
+LEFT JOIN dbo.Sys_User AS person ON person.UserId = checkColligationDetail.PersonId
+LEFT JOIN Sys_Const AS const ON const.ConstValue = checkColligationDetail.HandleStep AND const.GroupId='HandleStep'
+
+GO
+
+
+insert into Sys_Menu(MenuId,MenuName,Url,SortIndex,SuperMenu,MenuType,IsOffice,IsEnd,IsUsed)
+values('5DC49905-6A1C-4353-A06C-D9D1A8D6B6F9','隐患排查与治理统计','HSSE/Check/HiddenTroubleManager.aspx',130,'467A0CB9-737D-4451-965E-869EBC3A4BD6','Menu_HSSE',0,1,1)
+go

SGGL/BLL/API/HSSE/APICheckSpecialService.cs

@@ -337,6 +337,8 @@ namespace BLL
                                       CheckItemDetailContent = x.CheckItemSetContent,
                                       Rectification_Date = string.Format("{0:yyyy-MM-dd}", x.Rectification_Date),
                                       CheckOpinions = x.CheckOpinions,
+
+                                      HiddenType=x.HiddenType
                                   };
                     return getInfo.ToList();
                 }
@@ -427,7 +429,8 @@ namespace BLL
                                   CheckItemDetailSetId=x.CheckItemSetId,
                                   CheckItemDetailContent=x.CheckItemSetContent,
                                   Rectification_Date= string.Format("{0:yyyy-MM-dd}", x.Rectification_Date),
-                                  CheckOpinions=x.CheckOpinions
+                                  CheckOpinions=x.CheckOpinions,
+                                  HiddenType=x.HiddenType
                               };
                 return getInfo.First();
             }
@@ -468,6 +471,7 @@ namespace BLL
                         CheckItemSetContent= newDetail.CheckItemDetailContent,
                         Rectification_Date = Funs.GetNewDateTime(newDetail.Rectification_Date),
                         CheckOpinions=newDetail.CheckOpinions,
+                        HiddenType=newDetail.HiddenType,
                     };
                     if (newCheckSpecialDetail.CompleteStatus == false && newCheckSpecialDetail.HandleStep.Contains("1") && string.IsNullOrEmpty(newCheckSpecialDetail.HiddenHazardType))
                     {
@@ -515,6 +519,7 @@ namespace BLL
                         updateDetail.CheckItemSetContent = newDetail.CheckItemDetailContent;
                         updateDetail.Rectification_Date = Funs.GetNewDateTime(newDetail.Rectification_Date);
                         updateDetail.CheckOpinions = newDetail.CheckOpinions;
+                        updateDetail.HiddenType = newDetail.HiddenType;
                         db.SubmitChanges();
                     }
                     ////保存附件

SGGL/BLL/API/HSSE/APIHazardRegisterService.cs

@@ -80,6 +80,10 @@ namespace BLL
                     IsWx = "Y",
                     CCManIds = hazardRegister.CCManIds,
                     Requirements = hazardRegister.Requirements,
+
+                    Risk_Level = hazardRegister.Risk_Level,
+                    HiddenType= hazardRegister.HiddenType
+
                 };
                 var RegisterTypesDt = db.HSSE_Hazard_HazardRegisterTypes.FirstOrDefault(x => x.RegisterTypesId == newHazardRegister.RegisterTypesId);
                 if (RegisterTypesDt != null && RegisterTypesDt.HazardRegisterType == "4")
@@ -173,6 +177,7 @@ namespace BLL
                                            ResponsibilityManName = db.Sys_User.First(User => x.ResponsibleMan == User.UserId).UserName,
                                            RectificationTime = x.RectificationTime,
                                            Risk_Level = x.Risk_Level,
+                                           HiddenType=x.HiddenType
 
                                        }).OrderBy(x => x.CheckTime).Skip(Funs.PageSize * (pageIndex - 1)).Take(Funs.PageSize).ToList();
                 return hazardRegisters;

SGGL/BLL/API/HSSE/APIRectifyNoticesService.cs

@@ -107,6 +107,9 @@ namespace BLL
                                   IsRectify = x.IsRectify,
                                   PhotoBeforeUrl = APIUpLoadFileService.getFileUrl(x.RectifyNoticesItemId + "#1", null),
                                   PhotoAfterUrl = APIUpLoadFileService.getFileUrl(x.RectifyNoticesItemId + "#2", null),
+
+                                  HiddenType=x.HiddenType,
+                                  HiddenHazardType=x.HiddenHazardType
                               };
                 return getInfo.ToList();
             }
@@ -473,6 +476,9 @@ namespace BLL
                                 LimitTime = Funs.GetNewDateTime(rItem.LimitTime),
                                 RectifyResults = null,
                                 IsRectify = null,
+
+                                HiddenType=rItem.HiddenType,
+                                HiddenHazardType=rItem.HiddenHazardType
                             };
                             db.Check_RectifyNoticesItem.InsertOnSubmit(newItem);
                             db.SubmitChanges();

SGGL/BLL/Common/ConstValue.cs

@@ -423,5 +423,18 @@ namespace BLL
             }
         }
 
+        public static List<Model.DropDownItem> getHiddenTypeList(string groupid)
+        {
+            var list = (from x in Funs.DB.Sys_Const
+                        where x.GroupId== groupid
+                        orderby x.SortIndex
+                        select new Model.DropDownItem
+                        {
+                            Text = x.ConstText,
+                            Values = x.ConstValue
+                        }).ToList();
+            return list;
+        }
+
     }
 }

SGGL/BLL/HSSE/HiddenInspection/HSSE_Hazard_HazardRegisterService.cs

@@ -70,6 +70,8 @@ namespace BLL
             newHazardRegister.DIC_ID = hazardRegister.DIC_ID;
             newHazardRegister.Risk_Level = hazardRegister.Risk_Level;
             newHazardRegister.Type=hazardRegister.Type;
+
+            newHazardRegister.HiddenType = hazardRegister.HiddenType;
             db.HSSE_Hazard_HazardRegister.InsertOnSubmit(newHazardRegister);
             db.SubmitChanges();
         }
@@ -112,6 +114,7 @@ namespace BLL
                     newHazardRegister.DIC_ID = hazardRegister.DIC_ID;
                     newHazardRegister.Type = hazardRegister.Type;
 
+                    newHazardRegister.HiddenType = hazardRegister.HiddenType;
                     //把附件表的路径复制过来
                     Model.AttachFile file = BLL.AttachFileService.GetAttachFile(hazardRegister.HazardRegisterId, Const.HSSE_HiddenRectificationListMenuId);
                     if (file != null)

SGGL/FineUIPro.Web/HSSE/Check/CheckColligationDetailEdit.aspx

@@ -29,6 +29,21 @@
                     </f:TextBox>
                 </Items>
             </f:FormRow>
+
+            <f:FormRow>
+                <Items>
+                    <f:DropDownList runat="server" EnableSimulateTree="True" Label="隐患级别" ID="dpHiddenHazardType" ShowRedStar="true">
+                         <f:ListItem Text="一般"  Value="一般" Selected="true"/>
+                         <f:ListItem Text="重大"  Value="重大"/>
+                    </f:DropDownList> 
+
+                    <f:DropDownList ID="drpHiddenType" runat="server" Label="隐患类型" EnableEdit="true" LabelAlign="Right"  ShowRedStar="true"
+                               Required="true" EmptyText="--请选择--" AutoSelectFirstItem="false" 
+                            AutoPostBack="true" >
+                      </f:DropDownList>
+                </Items>
+            </f:FormRow>
+
             <f:FormRow>
                 <Items>
                     <f:TextArea ID="txtUnqualified" runat="server" MaxLength="3000" Label="不合格项描述">

SGGL/FineUIPro.Web/HSSE/Check/CheckColligationDetailEdit.aspx.cs

@@ -55,6 +55,8 @@ namespace FineUIPro.Web.HSSE.Check
                 this.ProjectId = this.CurrUser.LoginProjectId;
                 this.InitDropDownList();
                 this.CheckColligationDetailId = Request.Params["CheckColligationDetailId"];
+                ConstValue.InitConstValueDropDownList(drpHiddenType, "Hiddendangertype", false);
+
                 if (!string.IsNullOrEmpty(this.CheckColligationDetailId))
                 {
                     var checkColligationDetail = BLL.Check_CheckColligationDetailService.GetCheckColligationDetailByCheckColligationDetailId(this.CheckColligationDetailId);
@@ -99,6 +101,8 @@ namespace FineUIPro.Web.HSSE.Check
                         {
                             this.drpCompleteStatus.SelectedValue = "False";
                         }
+                        drpHiddenType.SelectedValue = checkColligationDetail.HiddenType;
+                        dpHiddenHazardType.SelectedValue = checkColligationDetail.HiddenHazardType;
                     }
                 }
             }
@@ -138,6 +142,11 @@ namespace FineUIPro.Web.HSSE.Check
                 detail.Unqualified = this.txtUnqualified.Text.Trim();
                 detail.Suggestions = this.txtSuggestions.Text.Trim();
                 detail.WorkArea = this.txtWorkArea.Text.Trim();
+
+                //新增隐患级别和隐患类型
+                detail.HiddenHazardType = dpHiddenHazardType.SelectedValue;
+                detail.HiddenType = drpHiddenType.SelectedValue;
+
                 if (this.drpUnit.SelectedValue != BLL.Const._Null)
                 {
                     detail.UnitId = this.drpUnit.SelectedValue;

SGGL/FineUIPro.Web/HSSE/Check/CheckColligationDetailEdit.aspx.designer.cs

@@ -7,11 +7,13 @@
 // </自动生成>
 //------------------------------------------------------------------------------
 
-namespace FineUIPro.Web.HSSE.Check {
+namespace FineUIPro.Web.HSSE.Check
-    
+{
-    
+
-    public partial class CheckColligationDetailEdit {
+
-        
+    public partial class CheckColligationDetailEdit
+    {
+
         /// <summary>
         /// form1 控件。
         /// </summary>
@@ -20,7 +22,7 @@ namespace FineUIPro.Web.HSSE.Check {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::System.Web.UI.HtmlControls.HtmlForm form1;
-        
+
         /// <summary>
         /// PageManager1 控件。
         /// </summary>
@@ -29,7 +31,7 @@ namespace FineUIPro.Web.HSSE.Check {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.PageManager PageManager1;
-        
+
         /// <summary>
         /// SimpleForm1 控件。
         /// </summary>
@@ -38,7 +40,7 @@ namespace FineUIPro.Web.HSSE.Check {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.Form SimpleForm1;
-        
+
         /// <summary>
         /// txtCheckItemType 控件。
         /// </summary>
@@ -47,7 +49,7 @@ namespace FineUIPro.Web.HSSE.Check {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.TextBox txtCheckItemType;
-        
+
         /// <summary>
         /// txtCheckItem 控件。
         /// </summary>
@@ -56,7 +58,25 @@ namespace FineUIPro.Web.HSSE.Check {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.TextBox txtCheckItem;
-        
+
+        /// <summary>
+        /// dpHiddenHazardType 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.DropDownList dpHiddenHazardType;
+
+        /// <summary>
+        /// drpHiddenType 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.DropDownList drpHiddenType;
+
         /// <summary>
         /// txtUnqualified 控件。
         /// </summary>
@@ -65,7 +85,7 @@ namespace FineUIPro.Web.HSSE.Check {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.TextArea txtUnqualified;
-        
+
         /// <summary>
         /// txtSuggestions 控件。
         /// </summary>
@@ -74,7 +94,7 @@ namespace FineUIPro.Web.HSSE.Check {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.TextArea txtSuggestions;
-        
+
         /// <summary>
         /// txtWorkArea 控件。
         /// </summary>
@@ -83,7 +103,7 @@ namespace FineUIPro.Web.HSSE.Check {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.TextBox txtWorkArea;
-        
+
         /// <summary>
         /// drpWorkArea 控件。
         /// </summary>
@@ -92,7 +112,7 @@ namespace FineUIPro.Web.HSSE.Check {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.DropDownList drpWorkArea;
-        
+
         /// <summary>
         /// drpUnit 控件。
         /// </summary>
@@ -101,7 +121,7 @@ namespace FineUIPro.Web.HSSE.Check {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.DropDownList drpUnit;
-        
+
         /// <summary>
         /// drpHandleStep 控件。
         /// </summary>
@@ -110,7 +130,7 @@ namespace FineUIPro.Web.HSSE.Check {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.DropDownList drpHandleStep;
-        
+
         /// <summary>
         /// txtLimitedDate 控件。
         /// </summary>
@@ -119,7 +139,7 @@ namespace FineUIPro.Web.HSSE.Check {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.DatePicker txtLimitedDate;
-        
+
         /// <summary>
         /// drpCompleteStatus 控件。
         /// </summary>
@@ -128,7 +148,7 @@ namespace FineUIPro.Web.HSSE.Check {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.DropDownList drpCompleteStatus;
-        
+
         /// <summary>
         /// l1 控件。
         /// </summary>
@@ -137,7 +157,7 @@ namespace FineUIPro.Web.HSSE.Check {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.Label l1;
-        
+
         /// <summary>
         /// Label1 控件。
         /// </summary>
@@ -146,7 +166,7 @@ namespace FineUIPro.Web.HSSE.Check {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.Label Label1;
-        
+
         /// <summary>
         /// Toolbar1 控件。
         /// </summary>
@@ -155,7 +175,7 @@ namespace FineUIPro.Web.HSSE.Check {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.Toolbar Toolbar1;
-        
+
         /// <summary>
         /// lbTemp 控件。
         /// </summary>
@@ -164,7 +184,7 @@ namespace FineUIPro.Web.HSSE.Check {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.Label lbTemp;
-        
+
         /// <summary>
         /// btnAttachUrl 控件。
         /// </summary>
@@ -173,7 +193,7 @@ namespace FineUIPro.Web.HSSE.Check {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.Button btnAttachUrl;
-        
+
         /// <summary>
         /// ToolbarFill1 控件。
         /// </summary>
@@ -182,7 +202,7 @@ namespace FineUIPro.Web.HSSE.Check {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.ToolbarFill ToolbarFill1;
-        
+
         /// <summary>
         /// btnSave 控件。
         /// </summary>
@@ -191,7 +211,7 @@ namespace FineUIPro.Web.HSSE.Check {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.Button btnSave;
-        
+
         /// <summary>
         /// btnClose 控件。
         /// </summary>
@@ -200,7 +220,7 @@ namespace FineUIPro.Web.HSSE.Check {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.Button btnClose;
-        
+
         /// <summary>
         /// WindowAtt 控件。
         /// </summary>

SGGL/FineUIPro.Web/HSSE/Check/CheckColligationEdit.aspx

@@ -105,7 +105,7 @@
                             </f:RenderField>--%>
                             <f:LinkButtonField Width="120px" HeaderText="检查项" ConfirmTarget="Parent" CommandName="click"
                         TextAlign="Center" ToolTip="点击增加一条相同记录" DataTextField="CheckItemStr" ColumnID="CheckItemStr" />
-                            <f:RenderField Width="220px" ColumnID="Unqualified" DataField="Unqualified" SortField="Unqualified"
+                            <f:RenderField minWidth="120px" ColumnID="Unqualified" DataField="Unqualified" SortField="Unqualified"
                                 FieldType="String" HeaderTextAlign="Center" TextAlign="Left" HeaderText="不合格项描述" ExpandUnusedSpace="true">
                             </f:RenderField>
                             <f:RenderField Width="150px" ColumnID="Suggestions" DataField="Suggestions" SortField="Suggestions"
@@ -114,9 +114,15 @@
                             <f:RenderField Width="110px" ColumnID="WorkArea" DataField="WorkArea" SortField="WorkArea"
                                 FieldType="String" HeaderTextAlign="Center" TextAlign="Left" HeaderText="单位工程">
                             </f:RenderField>
-                            <f:RenderField Width="220px" ColumnID="UnitName" DataField="UnitName" SortField="UnitName"
+                            <f:RenderField Width="150px" ColumnID="UnitName" DataField="UnitName" SortField="UnitName"
                                 FieldType="String" HeaderTextAlign="Center" TextAlign="Left" HeaderText="责任单位">
                             </f:RenderField>
+                            <f:RenderField Width="150px" ColumnID="HiddenType" DataField="HiddenType" SortField="HiddenType"
+                                FieldType="String" HeaderTextAlign="Center" TextAlign="Left" HeaderText="隐患类型">
+                            </f:RenderField>
+                            <f:RenderField Width="150px" ColumnID="HiddenHazardType" DataField="HiddenHazardType" SortField="HiddenHazardType"
+                                FieldType="String" HeaderTextAlign="Center" TextAlign="Left" HeaderText="隐患级别">
+                            </f:RenderField>
                             <f:RenderField Width="100px" ColumnID="HandleStepStr" DataField="HandleStepStr" SortField="HandleStepStr"
                                 FieldType="String" HeaderTextAlign="Center" TextAlign="Left" HeaderText="处理措施">
                             </f:RenderField>
@@ -124,7 +130,7 @@
                                 FieldType="Date" Renderer="Date" RendererArgument="yyyy-MM-dd" HeaderText="限时时间"
                                 HeaderTextAlign="Center" TextAlign="Center">
                             </f:RenderField>
-                            <f:TemplateField Width="75px" HeaderText="整改情况" HeaderTextAlign="Center" TextAlign="Center">
+                            <f:TemplateField Width="100px" HeaderText="整改情况" HeaderTextAlign="Center" TextAlign="Center">
                                 <ItemTemplate>
                                     <asp:Label ID="Label3" runat="server" Text='<%# ConvertCompleteStatus(Eval("CompleteStatus")) %>'
                                         ToolTip='<%# ConvertCompleteStatus(Eval("CompleteStatus")) %>'></asp:Label>

SGGL/FineUIPro.Web/HSSE/Check/CheckColligationView.aspx

@@ -98,6 +98,12 @@
                             <f:RenderField Width="220px" ColumnID="UnitName" DataField="UnitName" SortField="UnitName"
                                 FieldType="String" HeaderTextAlign="Center" TextAlign="Left" HeaderText="责任单位">
                             </f:RenderField>
+                            <f:RenderField Width="150px" ColumnID="HiddenType" DataField="HiddenType" SortField="HiddenType"
+                                FieldType="String" HeaderTextAlign="Center" TextAlign="Left" HeaderText="隐患类型">
+                            </f:RenderField>
+                            <f:RenderField Width="150px" ColumnID="HiddenHazardType" DataField="HiddenHazardType" SortField="HiddenHazardType"
+                                FieldType="String" HeaderTextAlign="Center" TextAlign="Left" HeaderText="隐患级别">
+                            </f:RenderField>
                             <f:RenderField Width="100px" ColumnID="HandleStepStr" DataField="HandleStepStr" SortField="HandleStepStr"
                                 FieldType="String" HeaderTextAlign="Center" TextAlign="Left" HeaderText="处理措施">
                             </f:RenderField>

SGGL/FineUIPro.Web/HSSE/Check/CheckSpecialView.aspx

@@ -74,7 +74,7 @@
                           <%--  <f:RenderField Width="160px" ColumnID="CheckItemName" DataField="CheckItemName" SortField="CheckItemName"
                                 FieldType="String" HeaderTextAlign="Center" TextAlign="Left" HeaderText="问题类型">                                
                             </f:RenderField>--%>
-                            <f:RenderField Width="650px" ColumnID="CheckItemSetContent" DataField="CheckItemSetContent" SortField="CheckItemSetContent"
+                            <f:RenderField Width="500px" ColumnID="CheckItemSetContent" DataField="CheckItemSetContent" SortField="CheckItemSetContent"
                                 FieldType="String" HeaderTextAlign="Center" TextAlign="Left" HeaderText="检查内容">                                
                             </f:RenderField>
                             <f:RenderField Width="160px" ColumnID="Rectification_Date" DataField="Rectification_Date" SortField="Rectification_Date"
@@ -87,7 +87,7 @@
                             <f:LinkButtonField Width="150px" ColumnID="HandleStepLink" DataTextField="HandleStepLink" DataToolTipField="HandleStepLink" HeaderText="处理措施"
                                  CommandName="click" EnableAjax="false"  />                            
                             <f:RenderField Width="80px" ColumnID="HiddenHazardTypeName" DataField="HiddenHazardTypeName" SortField="HiddenHazardTypeName"
-                                FieldType="String" HeaderTextAlign="Center" TextAlign="Left" HeaderText="隐患类别">
+                                FieldType="String" HeaderTextAlign="Center" TextAlign="Left" HeaderText="隐患级别">
                             </f:RenderField>
                             <%--<f:LinkButtonField Width="140px" HeaderText="处理措施" ConfirmTarget="Parent" CommandName="click"
                                  TextAlign="Center"  DataTextField="HandleStepLink" ColumnID="HandleStepLink" />    --%>

SGGL/FineUIPro.Web/HSSE/Check/HiddenTroubleManager.aspx

@@ -0,0 +1,67 @@
+<%@ Page Language="C#" AutoEventWireup="true" CodeBehind="HiddenTroubleManager.aspx.cs" Inherits="FineUIPro.Web.HSSE.Check.HiddenTroubleManager" %>
+
+<!DOCTYPE html>
+
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head runat="server">
+<meta http-equiv="Content-Type" content="text/html; charset=utf-8"/>
+    <title>隐患排查与治理统计</title>
+</head>
+<body>
+    <form id="form1" runat="server">
+        <f:PageManager ID="PageManager1" AutoSizePanelID="Panel1" runat="server" />
+          <f:Panel ID="Panel1" runat="server" Margin="5px" BodyPadding="5px" ShowBorder="false"
+            ShowHeader="false" Layout="VBox" BoxConfigAlign="Stretch">
+            <Items>
+                <f:Grid ID="Grid1" ShowBorder="true" ShowHeader="false" Title="隐患排查与治理统计" EnableCollapse="true"
+                    runat="server" BoxFlex="1" DataKeyNames="DataId" DataIDField="DataId" AllowSorting="true"
+                    EnableColumnLines="true" AllowPaging="true" 
+                    IsDatabasePaging="true" PageSize="15" OnPageIndexChange="Grid1_PageIndexChange" EnableTextSelection="True" AllowColumnLocking="true">
+                    <Toolbars>
+                        <f:Toolbar ID="Toolbar2" Position="Top" runat="server" ToolbarAlign="Left">
+                            <Items>
+                                <f:DatePicker runat="server" DateFormatString="yyyy-MM-dd" Label="开始日期" ID="txtStartTime"
+                                    AutoPostBack="true" OnTextChanged="TextBox_TextChanged" LabelAlign="right" Width="210px" LabelWidth="80px">
+                                </f:DatePicker>
+                                <f:DatePicker runat="server" DateFormatString="yyyy-MM-dd" Label="结束日期" ID="txtEndTime"
+                                    AutoPostBack="true" OnTextChanged="TextBox_TextChanged" LabelAlign="right" Width="210px" LabelWidth="80px">
+                                </f:DatePicker>
+                                
+                                <f:ToolbarFill ID="ToolbarFill1" runat="server">
+                                </f:ToolbarFill>
+                                <f:Button ID="btnSearch" ToolTip="统计" Icon="SystemSearch" OnClick="TextBox_TextChanged" runat="server">
+                                </f:Button>
+                                <f:Button ID="btnOut" OnClick="btnOut_Click" runat="server" ToolTip="导出" Icon="FolderUp"
+                                    EnableAjax="false" DisableControlBeforePostBack="false">
+                                </f:Button>
+                            </Items>
+                        </f:Toolbar>
+                    </Toolbars>
+                    <Columns>
+                        <f:TemplateField ColumnID="tfPageIndex" Width="50px" HeaderText="序号" HeaderTextAlign="Center" TextAlign="Center"
+                            EnableLock="true" Locked="true">
+                            <ItemTemplate>
+                                <asp:Label ID="lblPageIndex" runat="server" Text='<%# Grid1.PageIndex * Grid1.PageSize + Container.DataItemIndex + 1 %>'></asp:Label>
+                            </ItemTemplate>
+                        </f:TemplateField>
+                        
+
+                   
+                    </Columns>
+                    <PageItems>
+                        <f:ToolbarSeparator ID="ToolbarSeparator1" runat="server">
+                        </f:ToolbarSeparator>
+                        <f:ToolbarText ID="ToolbarText1" runat="server" Text="每页记录数：">
+                        </f:ToolbarText>
+                        <f:DropDownList runat="server" ID="ddlPageSize" Width="80px" AutoPostBack="true"
+                            OnSelectedIndexChanged="ddlPageSize_SelectedIndexChanged">
+                        </f:DropDownList>
+                        <f:ToolbarFill runat="server">
+                        </f:ToolbarFill>
+                    </PageItems>
+                </f:Grid>
+            </Items>
+        </f:Panel>
+    </form>
+</body>
+</html>

SGGL/FineUIPro.Web/HSSE/Check/HiddenTroubleManager.aspx.cs

@@ -0,0 +1,17 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Web;
+using System.Web.UI;
+using System.Web.UI.WebControls;
+
+namespace FineUIPro.Web.HSSE.Check
+{
+    public partial class HiddenTroubleManager : System.Web.UI.Page
+    {
+        protected void Page_Load(object sender, EventArgs e)
+        {
+
+        }
+    }
+}

SGGL/FineUIPro.Web/HSSE/Check/HiddenTroubleManager.aspx.designer.cs

@@ -0,0 +1,143 @@
+//------------------------------------------------------------------------------
+// <自动生成>
+//     此代码由工具生成。
+//
+//     对此文件的更改可能导致不正确的行为，如果
+//     重新生成代码，则所做更改将丢失。
+// </自动生成>
+//------------------------------------------------------------------------------
+
+namespace FineUIPro.Web.HSSE.Check
+{
+
+
+    public partial class HiddenTroubleManager
+    {
+
+        /// <summary>
+        /// form1 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::System.Web.UI.HtmlControls.HtmlForm form1;
+
+        /// <summary>
+        /// PageManager1 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.PageManager PageManager1;
+
+        /// <summary>
+        /// Panel1 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.Panel Panel1;
+
+        /// <summary>
+        /// Grid1 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.Grid Grid1;
+
+        /// <summary>
+        /// Toolbar2 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.Toolbar Toolbar2;
+
+        /// <summary>
+        /// txtStartTime 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.DatePicker txtStartTime;
+
+        /// <summary>
+        /// txtEndTime 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.DatePicker txtEndTime;
+
+        /// <summary>
+        /// ToolbarFill1 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.ToolbarFill ToolbarFill1;
+
+        /// <summary>
+        /// btnSearch 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.Button btnSearch;
+
+        /// <summary>
+        /// btnOut 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.Button btnOut;
+
+        /// <summary>
+        /// lblPageIndex 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::System.Web.UI.WebControls.Label lblPageIndex;
+
+        /// <summary>
+        /// ToolbarSeparator1 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.ToolbarSeparator ToolbarSeparator1;
+
+        /// <summary>
+        /// ToolbarText1 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.ToolbarText ToolbarText1;
+
+        /// <summary>
+        /// ddlPageSize 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.DropDownList ddlPageSize;
+    }
+}

SGGL/FineUIPro.Web/HSSE/Check/RectifyNoticesAdd.aspx

@@ -58,7 +58,7 @@
                                    <f:DatePicker runat="server" DateFormatString="yyyy-MM-dd" Label="检查日期" ID="txtCheckedDate" 
                                     LabelAlign="right" ShowRedStar="true">
                                 </f:DatePicker>
-                                <f:DropDownList ID="drpHiddenHazardType" runat="server" Label="隐患类别" LabelAlign="Right" EnableEdit="true">
+                                <f:DropDownList ID="drpHiddenHazardType" runat="server" Label="隐患类别" LabelAlign="Right" EnableEdit="true" Hidden="true">
                                     <f:ListItem Text="一般" Value="1" Selected="true" />
                                     <f:ListItem Text="较大" Value="2" />
                                     <f:ListItem Text="重大" Value="3" />
@@ -85,27 +85,51 @@
                                             SortField="RectifyNoticesItemId" FieldType="String" HeaderTextAlign="Center" TextAlign="Center"
                                             Hidden="true">
                                         </f:RenderField>
-                                        <f:RenderField Width="300px" ColumnID="WrongContent" DataField="WrongContent" FieldType="string" 
+                                        <f:RenderField minWidth="300px" ColumnID="WrongContent" DataField="WrongContent" FieldType="string" 
                                             HeaderText="具体位置及隐患内容" ExpandUnusedSpace="true" HeaderTextAlign="Center" TextAlign="Left">
                                             <Editor>
                                                 <f:TextBox ID="tWrongContent" runat="server" MaxLength="800" ShowRedStar="true" Required="true">
                                                 </f:TextBox>
                                             </Editor>
                                         </f:RenderField>                                         
-                                        <f:RenderField Width="250px" ColumnID="Requirement" DataField="Requirement" FieldType="string"
+                                        <f:RenderField minWidth="250px" ColumnID="Requirement" DataField="Requirement" FieldType="string"
                                             HeaderText="整改要求" HeaderTextAlign="Center" TextAlign="Left">
                                             <Editor>
                                                 <f:TextBox ID="tRequirement" runat="server" MaxLength="800" ShowRedStar="true" Required="true">
                                                 </f:TextBox>
                                             </Editor>
                                         </f:RenderField>
-                                       <f:RenderField Width="140px" ColumnID="LimitTime" DataField="LimitTime" FieldType="Date"
+                                       <f:RenderField minWidth="140px" ColumnID="LimitTime" DataField="LimitTime" FieldType="Date"
                                                 Renderer="Date" RendererArgument="yyyy-MM-dd" HeaderText="整改期限">
                                                 <Editor>
                                                     <f:DatePicker ID="txtLimitTimes" Required="true" runat="server">
                                                     </f:DatePicker>
                                                 </Editor>
                                             </f:RenderField>
+
+                                         <f:RenderField minWidth="250px" ColumnID="HiddenHazardType" DataField="HiddenHazardType" FieldType="string"
+                                            HeaderText="隐患级别" HeaderTextAlign="Center" TextAlign="Left">
+                                            <Editor>
+                                                 <f:DropDownList runat="server" EnableSimulateTree="True" ID="dpHiddenHazardType" ShowRedStar="true">
+                                                     <f:ListItem Text="一般"  Value="一般" Selected="true"/>
+                                                     <f:ListItem Text="重大"  Value="重大"/>
+                                                </f:DropDownList> 
+                                            </Editor>
+                                        </f:RenderField>
+
+                                         <f:RenderField minWidth="250px" ColumnID="HiddenType" DataField="HiddenType" FieldType="string"
+                                            HeaderText="隐患类型" HeaderTextAlign="Center" TextAlign="Left">
+                                            <Editor>
+                                               <f:DropDownList ID="drpHiddenType" runat="server" EnableEdit="true" LabelAlign="Right"  ShowRedStar="true"
+                                                       Required="true"  AutoSelectFirstItem="true" 
+                                                    AutoPostBack="true" >
+                                              </f:DropDownList>
+                                            </Editor>
+                                        </f:RenderField>
+
+
+
+
                                         <f:LinkButtonField HeaderText="整改前" ConfirmTarget="Top" Width="80" CommandName="AttachUrl"
                                            HeaderTextAlign="Center" TextAlign="Center" ToolTip="整改照片" Text="详细" />                                      
                                         <f:LinkButtonField ID="del" ColumnID="del" HeaderText="删除" Width="60px"  HeaderTextAlign="Center" 

SGGL/FineUIPro.Web/HSSE/Check/RectifyNoticesAdd.aspx.cs

@@ -48,6 +48,8 @@ namespace FineUIPro.Web.HSSE.Check
                 BLL.UserService.InitFlowOperateControlUserDropDownList(this.drpCheckMan, this.CurrUser.LoginProjectId, null, true);
                 //专业
                 BLL.CNProfessionalService.InitCNProfessionalDownList(this.drpCNProfessionalId, true);
+
+                ConstValue.InitConstValueDropDownList(drpHiddenType, "Hiddendangertype", false);
                 //Funs.FineUIPleaseSelect(drpIsRectify);
                 RectifyNoticesId = Request.Params["RectifyNoticesId"];
                 var getRectifyNotices = RectifyNoticesService.GetRectifyNoticesById(RectifyNoticesId);
@@ -102,7 +104,7 @@ namespace FineUIPro.Web.HSSE.Check
         {
             if (!string.IsNullOrEmpty(this.RectifyNoticesId))
             {
-                string strSql = @"select RectifyNoticesItemId, RectifyNoticesId, WrongContent, Requirement, LimitTime, RectifyResults, IsRectify  from [dbo].[Check_RectifyNoticesItem] ";
+                string strSql = @"select RectifyNoticesItemId, RectifyNoticesId, WrongContent, Requirement, LimitTime, RectifyResults, IsRectify,HiddenType,HiddenHazardType  from [dbo].[Check_RectifyNoticesItem] ";
                 List<SqlParameter> listStr = new List<SqlParameter>();
                 strSql += "where RectifyNoticesId = @RectifyNoticesId";
                 listStr.Add(new SqlParameter("@RectifyNoticesId", RectifyNoticesId));
@@ -150,7 +152,9 @@ namespace FineUIPro.Web.HSSE.Check
             List<Model.Check_RectifyNoticesItem> view = getViewTestPlanTrainingList();
             Model.Check_RectifyNoticesItem notice = new Model.Check_RectifyNoticesItem
             {
-                RectifyNoticesItemId = SQLHelper.GetNewID()
+                RectifyNoticesItemId = SQLHelper.GetNewID(),
+                HiddenHazardType="一般",
+                HiddenType=drpHiddenType.SelectedValue
             };
             view.Add(notice);
             //将gd数据保存在list中
@@ -176,6 +180,8 @@ namespace FineUIPro.Web.HSSE.Check
                     string rectifyNoticesItemId = values.Value<string>("RectifyNoticesItemId");
                     string requirement = values.Value<string>("Requirement");
                     string limitTime = values.Value<string>("LimitTime");
+                    string HiddenHazardType = values.Value<string>("HiddenHazardType");
+                    string HiddenType= values.Value<string>("HiddenType");
                     var item = new Check_RectifyNoticesItem
                     {
                         RectifyNoticesItemId = rectifyNoticesItemId,
@@ -183,6 +189,8 @@ namespace FineUIPro.Web.HSSE.Check
                         WrongContent = wrongContent,
                         Requirement = requirement,
                         LimitTime =Funs.GetNewDateTime( limitTime),
+                        HiddenHazardType= HiddenHazardType,
+                        HiddenType= HiddenType
                     };
                     view.Add(item);
                 }

SGGL/FineUIPro.Web/HSSE/Check/RectifyNoticesAdd.aspx.designer.cs

@@ -7,11 +7,13 @@
 // </自动生成>
 //------------------------------------------------------------------------------
 
-namespace FineUIPro.Web.HSSE.Check {
+namespace FineUIPro.Web.HSSE.Check
-    
+{
-    
+
-    public partial class RectifyNoticesAdd {
+
-        
+    public partial class RectifyNoticesAdd
+    {
+
         /// <summary>
         /// form1 控件。
         /// </summary>
@@ -20,7 +22,7 @@ namespace FineUIPro.Web.HSSE.Check {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::System.Web.UI.HtmlControls.HtmlForm form1;
-        
+
         /// <summary>
         /// PageManager1 控件。
         /// </summary>
@@ -29,7 +31,7 @@ namespace FineUIPro.Web.HSSE.Check {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.PageManager PageManager1;
-        
+
         /// <summary>
         /// Panel4 控件。
         /// </summary>
@@ -38,7 +40,7 @@ namespace FineUIPro.Web.HSSE.Check {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.Panel Panel4;
-        
+
         /// <summary>
         /// SimpleForm1 控件。
         /// </summary>
@@ -47,7 +49,7 @@ namespace FineUIPro.Web.HSSE.Check {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.Form SimpleForm1;
-        
+
         /// <summary>
         /// Toolbar1 控件。
         /// </summary>
@@ -56,7 +58,7 @@ namespace FineUIPro.Web.HSSE.Check {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.Toolbar Toolbar1;
-        
+
         /// <summary>
         /// hdRectifyNoticesId 控件。
         /// </summary>
@@ -65,7 +67,7 @@ namespace FineUIPro.Web.HSSE.Check {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.HiddenField hdRectifyNoticesId;
-        
+
         /// <summary>
         /// btnSave 控件。
         /// </summary>
@@ -74,7 +76,7 @@ namespace FineUIPro.Web.HSSE.Check {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.Button btnSave;
-        
+
         /// <summary>
         /// btnSubmit 控件。
         /// </summary>
@@ -83,7 +85,7 @@ namespace FineUIPro.Web.HSSE.Check {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.Button btnSubmit;
-        
+
         /// <summary>
         /// btnClose 控件。
         /// </summary>
@@ -92,7 +94,7 @@ namespace FineUIPro.Web.HSSE.Check {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.Button btnClose;
-        
+
         /// <summary>
         /// txtRectifyNoticesCode 控件。
         /// </summary>
@@ -101,7 +103,7 @@ namespace FineUIPro.Web.HSSE.Check {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.TextBox txtRectifyNoticesCode;
-        
+
         /// <summary>
         /// drpUnitId 控件。
         /// </summary>
@@ -110,7 +112,7 @@ namespace FineUIPro.Web.HSSE.Check {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.DropDownList drpUnitId;
-        
+
         /// <summary>
         /// drpWorkAreaId 控件。
         /// </summary>
@@ -119,7 +121,7 @@ namespace FineUIPro.Web.HSSE.Check {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.DropDownList drpWorkAreaId;
-        
+
         /// <summary>
         /// drpCheckMan 控件。
         /// </summary>
@@ -128,7 +130,7 @@ namespace FineUIPro.Web.HSSE.Check {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.DropDownList drpCheckMan;
-        
+
         /// <summary>
         /// txtCheckPerson 控件。
         /// </summary>
@@ -137,7 +139,7 @@ namespace FineUIPro.Web.HSSE.Check {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.TextBox txtCheckPerson;
-        
+
         /// <summary>
         /// txtCheckedDate 控件。
         /// </summary>
@@ -146,7 +148,7 @@ namespace FineUIPro.Web.HSSE.Check {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.DatePicker txtCheckedDate;
-        
+
         /// <summary>
         /// drpHiddenHazardType 控件。
         /// </summary>
@@ -155,7 +157,7 @@ namespace FineUIPro.Web.HSSE.Check {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.DropDownList drpHiddenHazardType;
-        
+
         /// <summary>
         /// drpCNProfessionalId 控件。
         /// </summary>
@@ -164,7 +166,7 @@ namespace FineUIPro.Web.HSSE.Check {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.DropDownList drpCNProfessionalId;
-        
+
         /// <summary>
         /// Grid1 控件。
         /// </summary>
@@ -173,7 +175,7 @@ namespace FineUIPro.Web.HSSE.Check {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.Grid Grid1;
-        
+
         /// <summary>
         /// toolAdd 控件。
         /// </summary>
@@ -182,7 +184,7 @@ namespace FineUIPro.Web.HSSE.Check {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.Toolbar toolAdd;
-        
+
         /// <summary>
         /// btnAdd 控件。
         /// </summary>
@@ -191,7 +193,7 @@ namespace FineUIPro.Web.HSSE.Check {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.Button btnAdd;
-        
+
         /// <summary>
         /// tWrongContent 控件。
         /// </summary>
@@ -200,7 +202,7 @@ namespace FineUIPro.Web.HSSE.Check {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.TextBox tWrongContent;
-        
+
         /// <summary>
         /// tRequirement 控件。
         /// </summary>
@@ -209,7 +211,7 @@ namespace FineUIPro.Web.HSSE.Check {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.TextBox tRequirement;
-        
+
         /// <summary>
         /// txtLimitTimes 控件。
         /// </summary>
@@ -218,7 +220,25 @@ namespace FineUIPro.Web.HSSE.Check {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.DatePicker txtLimitTimes;
-        
+
+        /// <summary>
+        /// dpHiddenHazardType 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.DropDownList dpHiddenHazardType;
+
+        /// <summary>
+        /// drpHiddenType 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.DropDownList drpHiddenType;
+
         /// <summary>
         /// del 控件。
         /// </summary>
@@ -227,7 +247,7 @@ namespace FineUIPro.Web.HSSE.Check {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.LinkButtonField del;
-        
+
         /// <summary>
         /// drpSignPerson 控件。
         /// </summary>
@@ -236,7 +256,7 @@ namespace FineUIPro.Web.HSSE.Check {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.DropDownList drpSignPerson;
-        
+
         /// <summary>
         /// gvFlowOperate 控件。
         /// </summary>
@@ -245,7 +265,7 @@ namespace FineUIPro.Web.HSSE.Check {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.Grid gvFlowOperate;
-        
+
         /// <summary>
         /// lblPageIndex 控件。
         /// </summary>
@@ -254,7 +274,7 @@ namespace FineUIPro.Web.HSSE.Check {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::System.Web.UI.WebControls.Label lblPageIndex;
-        
+
         /// <summary>
         /// WindowAtt 控件。
         /// </summary>

SGGL/FineUIPro.Web/HSSE/Check/RectifyNoticesAudit.aspx

@@ -48,7 +48,7 @@
                             <Items>
                                 <f:TextBox runat="server" Label="检查日期" ID="txtCheckedDate" LabelAlign="right" Readonly="true">
                                 </f:TextBox>
-                                <f:DropDownList ID="drpHiddenHazardType" runat="server" Label="隐患类别" LabelAlign="Right" Readonly="true">
+                                <f:DropDownList ID="drpHiddenHazardType" runat="server" Label="隐患类别" LabelAlign="Right" Readonly="true" Hidden="true">
                                      <f:ListItem Text="一般" Value="1" Selected="true" />
                                     <f:ListItem Text="较大" Value="2" />
                                     <f:ListItem Text="重大" Value="3" />
@@ -62,31 +62,52 @@
                                     DataKeyNames="RectifyNoticesItemId" DataIDField="RectifyNoticesItemId" EnableColumnLines="true" PageSize="500"
                                     AllowSorting="true" SortField="RectifyNoticesItemId" SortDirection="ASC" EnableTextSelection="True" MinHeight="240px">
                                     <Columns>
-                                        <f:RenderField Width="300px" ColumnID="WrongContent" DataField="WrongContent" FieldType="string"
+                                        <f:RenderField minWidth="300px" ColumnID="WrongContent" DataField="WrongContent" FieldType="string"
                                             HeaderText="具体位置及隐患内容" ExpandUnusedSpace="true" HeaderTextAlign="Center" TextAlign="Left">
                                         </f:RenderField>
-                                        <f:RenderField Width="250px" ColumnID="Requirement" DataField="Requirement" FieldType="string"
+                                        <f:RenderField minWidth="250px" ColumnID="Requirement" DataField="Requirement" FieldType="string"
                                             HeaderText="整改要求" HeaderTextAlign="Center" TextAlign="Left">
                                         </f:RenderField>
-                                        <f:RenderField Width="100px" ColumnID="LimitTime" DataField="LimitTime" FieldType="Date"
+                                        <f:RenderField minWidth="100px" ColumnID="LimitTime" DataField="LimitTime" FieldType="Date"
                                             Renderer="Date" RendererArgument="yyyy-MM-dd" HeaderText="整改期限">
                                         </f:RenderField>
-                                          <f:TemplateField ColumnID="tfImageUrl1" Width="110px" HeaderText="整改前" HeaderTextAlign="Center"
+
+                                        <f:RenderField minWidth="250px" ColumnID="HiddenHazardType" DataField="HiddenHazardType" FieldType="string"
+                                            HeaderText="隐患级别" HeaderTextAlign="Center" TextAlign="Left">
+                                            <Editor>
+                                                 <f:DropDownList runat="server" EnableSimulateTree="True" ID="dpHiddenHazardType" ShowRedStar="true">
+                                                     <f:ListItem Text="一般"  Value="一般" Selected="true"/>
+                                                     <f:ListItem Text="重大"  Value="重大"/>
+                                                </f:DropDownList> 
+                                            </Editor>
+                                        </f:RenderField>
+
+                                         <f:RenderField minWidth="250px" ColumnID="HiddenType" DataField="HiddenType" FieldType="string"
+                                            HeaderText="隐患类型" HeaderTextAlign="Center" TextAlign="Left">
+                                            <Editor>
+                                               <f:DropDownList ID="drpHiddenType" runat="server" EnableEdit="true" LabelAlign="Right"  ShowRedStar="true"
+                                                       Required="true"  AutoSelectFirstItem="true" 
+                                                    AutoPostBack="true" >
+                                              </f:DropDownList>
+                                            </Editor>
+                                        </f:RenderField>
+
+                                          <f:TemplateField ColumnID="tfImageUrl1" minWidth="110px" HeaderText="整改前" HeaderTextAlign="Center"
                                             TextAlign="Left">
                                             <ItemTemplate>
                                                 <asp:Label ID="lbImageUrl" runat="server" Text='<%# ConvertImageUrlByImage(Eval("RectifyNoticesItemId")) %>'></asp:Label>
                                             </ItemTemplate>
                                         </f:TemplateField>
-                                        <f:RenderField Width="150px" ColumnID="RectifyResults" DataField="RectifyResults" FieldType="string" 
+                                        <f:RenderField minWidth="150px" ColumnID="RectifyResults" DataField="RectifyResults" FieldType="string" 
                                                 HeaderText="整改结果" HeaderTextAlign="Center" TextAlign="Left">
                                         </f:RenderField>
-                                        <f:TemplateField ColumnID="tfImageUrl2" Width="110px" HeaderText="整改后" HeaderTextAlign="Center"
+                                        <f:TemplateField ColumnID="tfImageUrl2" minWidth="110px" HeaderText="整改后" HeaderTextAlign="Center"
                                             TextAlign="Left">
                                             <ItemTemplate>
                                                 <asp:Label ID="Label2" runat="server" Text='<%# ConvertImgUrlByImage(Eval("RectifyNoticesItemId")) %>'> %>'></asp:Label>
                                             </ItemTemplate>
                                         </f:TemplateField>
-                                        <f:RenderField Width="90px" ColumnID="IsRectifyName" DataField="IsRectifyName" FieldType="string"
+                                        <f:RenderField minWidth="90px" ColumnID="IsRectifyName" DataField="IsRectifyName" FieldType="string"
                                             HeaderText="合格" HeaderTextAlign="Center" TextAlign="Center">
                                         </f:RenderField>
                                     </Columns>

SGGL/FineUIPro.Web/HSSE/Check/RectifyNoticesAudit.aspx.cs

@@ -67,7 +67,8 @@ namespace FineUIPro.Web.HSSE.Check
             if (!string.IsNullOrEmpty(this.RectifyNoticesId))
             {
                 string strSql = @"select RectifyNoticesItemId, RectifyNoticesId, WrongContent, Requirement, LimitTime, RectifyResults
-                            ,IsRectify,(CASE WHEN IsRectify=1 THEN '合格' WHEN IsRectify=0 THEN '不合格' ELSE '' END) AS IsRectifyName
+                            ,IsRectify,(CASE WHEN IsRectify=1 THEN '合格' WHEN IsRectify=0 THEN '不合格' ELSE '' END) AS IsRectifyName,
+                        HiddenType,HiddenHazardType
                         from [dbo].[Check_RectifyNoticesItem] ";
                 List<SqlParameter> listStr = new List<SqlParameter>();
                 strSql += "where RectifyNoticesId = @RectifyNoticesId";

SGGL/FineUIPro.Web/HSSE/Check/RectifyNoticesAudit.aspx.designer.cs

@@ -7,11 +7,13 @@
 // </自动生成>
 //------------------------------------------------------------------------------
 
-namespace FineUIPro.Web.HSSE.Check {
+namespace FineUIPro.Web.HSSE.Check
-    
+{
-    
+
-    public partial class RectifyNoticesAudit {
+
-        
+    public partial class RectifyNoticesAudit
+    {
+
         /// <summary>
         /// form1 控件。
         /// </summary>
@@ -20,7 +22,7 @@ namespace FineUIPro.Web.HSSE.Check {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::System.Web.UI.HtmlControls.HtmlForm form1;
-        
+
         /// <summary>
         /// PageManager1 控件。
         /// </summary>
@@ -29,7 +31,7 @@ namespace FineUIPro.Web.HSSE.Check {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.PageManager PageManager1;
-        
+
         /// <summary>
         /// SimpleForm1 控件。
         /// </summary>
@@ -38,7 +40,7 @@ namespace FineUIPro.Web.HSSE.Check {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.Form SimpleForm1;
-        
+
         /// <summary>
         /// Toolbar1 控件。
         /// </summary>
@@ -47,7 +49,7 @@ namespace FineUIPro.Web.HSSE.Check {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.Toolbar Toolbar1;
-        
+
         /// <summary>
         /// hdRectifyNoticesId 控件。
         /// </summary>
@@ -56,7 +58,7 @@ namespace FineUIPro.Web.HSSE.Check {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.HiddenField hdRectifyNoticesId;
-        
+
         /// <summary>
         /// btnSubmit 控件。
         /// </summary>
@@ -65,7 +67,7 @@ namespace FineUIPro.Web.HSSE.Check {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.Button btnSubmit;
-        
+
         /// <summary>
         /// btnClose 控件。
         /// </summary>
@@ -74,7 +76,7 @@ namespace FineUIPro.Web.HSSE.Check {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.Button btnClose;
-        
+
         /// <summary>
         /// txtRectifyNoticesCode 控件。
         /// </summary>
@@ -83,7 +85,7 @@ namespace FineUIPro.Web.HSSE.Check {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.TextBox txtRectifyNoticesCode;
-        
+
         /// <summary>
         /// txtUnit 控件。
         /// </summary>
@@ -92,7 +94,7 @@ namespace FineUIPro.Web.HSSE.Check {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.TextBox txtUnit;
-        
+
         /// <summary>
         /// txtWorkArea 控件。
         /// </summary>
@@ -101,7 +103,7 @@ namespace FineUIPro.Web.HSSE.Check {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.TextBox txtWorkArea;
-        
+
         /// <summary>
         /// txtCheckMan 控件。
         /// </summary>
@@ -110,7 +112,7 @@ namespace FineUIPro.Web.HSSE.Check {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.TextBox txtCheckMan;
-        
+
         /// <summary>
         /// txtCheckPerson 控件。
         /// </summary>
@@ -119,7 +121,7 @@ namespace FineUIPro.Web.HSSE.Check {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.TextBox txtCheckPerson;
-        
+
         /// <summary>
         /// txtCheckedDate 控件。
         /// </summary>
@@ -128,7 +130,7 @@ namespace FineUIPro.Web.HSSE.Check {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.TextBox txtCheckedDate;
-        
+
         /// <summary>
         /// drpHiddenHazardType 控件。
         /// </summary>
@@ -137,7 +139,7 @@ namespace FineUIPro.Web.HSSE.Check {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.DropDownList drpHiddenHazardType;
-        
+
         /// <summary>
         /// Grid1 控件。
         /// </summary>
@@ -146,7 +148,25 @@ namespace FineUIPro.Web.HSSE.Check {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.Grid Grid1;
-        
+
+        /// <summary>
+        /// dpHiddenHazardType 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.DropDownList dpHiddenHazardType;
+
+        /// <summary>
+        /// drpHiddenType 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.DropDownList drpHiddenType;
+
         /// <summary>
         /// lbImageUrl 控件。
         /// </summary>
@@ -155,7 +175,7 @@ namespace FineUIPro.Web.HSSE.Check {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::System.Web.UI.WebControls.Label lbImageUrl;
-        
+
         /// <summary>
         /// Label2 控件。
         /// </summary>
@@ -164,7 +184,7 @@ namespace FineUIPro.Web.HSSE.Check {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::System.Web.UI.WebControls.Label Label2;
-        
+
         /// <summary>
         /// rdbIsAgree 控件。
         /// </summary>
@@ -173,7 +193,7 @@ namespace FineUIPro.Web.HSSE.Check {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.RadioButtonList rdbIsAgree;
-        
+
         /// <summary>
         /// drpOperateMan 控件。
         /// </summary>
@@ -182,7 +202,7 @@ namespace FineUIPro.Web.HSSE.Check {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.DropDownList drpOperateMan;
-        
+
         /// <summary>
         /// trOpinion 控件。
         /// </summary>
@@ -191,7 +211,7 @@ namespace FineUIPro.Web.HSSE.Check {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.FormRow trOpinion;
-        
+
         /// <summary>
         /// txtOpinion 控件。
         /// </summary>
@@ -200,7 +220,7 @@ namespace FineUIPro.Web.HSSE.Check {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.TextArea txtOpinion;
-        
+
         /// <summary>
         /// step1_person2 控件。
         /// </summary>
@@ -209,7 +229,7 @@ namespace FineUIPro.Web.HSSE.Check {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.FormRow step1_person2;
-        
+
         /// <summary>
         /// GroupPanel1 控件。
         /// </summary>
@@ -218,7 +238,7 @@ namespace FineUIPro.Web.HSSE.Check {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.GroupPanel GroupPanel1;
-        
+
         /// <summary>
         /// drpProfessionalEngineer 控件。
         /// </summary>
@@ -227,7 +247,7 @@ namespace FineUIPro.Web.HSSE.Check {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.DropDownList drpProfessionalEngineer;
-        
+
         /// <summary>
         /// drpConstructionManager 控件。
         /// </summary>
@@ -236,7 +256,7 @@ namespace FineUIPro.Web.HSSE.Check {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.DropDownList drpConstructionManager;
-        
+
         /// <summary>
         /// drpProjectManager 控件。
         /// </summary>
@@ -245,7 +265,7 @@ namespace FineUIPro.Web.HSSE.Check {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.DropDownList drpProjectManager;
-        
+
         /// <summary>
         /// gvFlowOperate 控件。
         /// </summary>
@@ -254,7 +274,7 @@ namespace FineUIPro.Web.HSSE.Check {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.Grid gvFlowOperate;
-        
+
         /// <summary>
         /// lblPageIndex 控件。
         /// </summary>
@@ -263,7 +283,7 @@ namespace FineUIPro.Web.HSSE.Check {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::System.Web.UI.WebControls.Label lblPageIndex;
-        
+
         /// <summary>
         /// WindowAtt 控件。
         /// </summary>

SGGL/FineUIPro.Web/HSSE/Check/RectifyNoticesView.aspx

@@ -47,7 +47,7 @@
                             <Items>
                                 <f:TextBox runat="server" Label="检查日期" ID="txtCheckedDate" LabelWidth="110px"  Readonly="true">
                                 </f:TextBox>
-                                <f:TextBox ID="drpHiddenHazardType" runat="server" Label="隐患类别" LabelWidth="110px" Readonly="true">
+                                <f:TextBox ID="drpHiddenHazardType" runat="server" Label="隐患类别" LabelWidth="110px" Readonly="true" Hidden="true">
                                 </f:TextBox>
                                 <f:TextBox ID="txtProfessionalName" runat="server" Label="专业" LabelWidth="110px" Readonly="true">
                                 </f:TextBox>
@@ -65,31 +65,43 @@
                                                 <asp:Label ID="Label1" runat="server" Text='<%# Grid1.PageIndex * Grid1.PageSize + Container.DataItemIndex + 1 %>'></asp:Label>
                                             </ItemTemplate>
                                         </f:TemplateField>
-                                        <f:RenderField Width="200px" ColumnID="WrongContent" DataField="WrongContent" ExpandUnusedSpace="true"
+                                        <f:RenderField minWidth="200px" ColumnID="WrongContent" DataField="WrongContent" ExpandUnusedSpace="true"
                                             FieldType="String" HeaderText="具体位置及隐患内容" HeaderTextAlign="Center" TextAlign="Left">
                                         </f:RenderField>
-                                        <f:RenderField Width="150px" ColumnID="Requirement" DataField="Requirement"
+                                        <f:RenderField minWidth="150px" ColumnID="Requirement" DataField="Requirement"
                                             FieldType="String" HeaderText="整改要求" HeaderTextAlign="Center" TextAlign="Left">
                                         </f:RenderField>
-                                        <f:RenderField Width="150px" ColumnID="LimitTime" DataField="LimitTime"
+                                        <f:RenderField minWidth="150px" ColumnID="LimitTime" DataField="LimitTime"
                                              Renderer="Date" RendererArgument="yyyy-MM-dd" HeaderText="整改期限" HeaderTextAlign="Center" TextAlign="Left">
                                         </f:RenderField>
-                                        <f:TemplateField ColumnID="tfImageUrl1" Width="110px" HeaderText="整改前" HeaderTextAlign="Center"
+                                        <f:TemplateField ColumnID="tfImageUrl1" minWidth="110px" HeaderText="整改前" HeaderTextAlign="Center"
                                             TextAlign="Left">
                                             <ItemTemplate>
                                                 <asp:Label ID="lbImageUrl" runat="server" Text='<%# ConvertImageUrlByImage(Eval("RectifyNoticesItemId")) %>'></asp:Label>
                                             </ItemTemplate>
                                         </f:TemplateField>
-                                        <f:RenderField Width="150px" ColumnID="RectifyResults" DataField="RectifyResults" FieldType="string" 
+
+                                        <f:RenderField minWidth="250px" ColumnID="HiddenHazardType" DataField="HiddenHazardType" FieldType="string"
+                                            HeaderText="隐患级别" HeaderTextAlign="Center" TextAlign="Left">
+                                           
+                                        </f:RenderField>
+
+                                         <f:RenderField minWidth="250px" ColumnID="HiddenType" DataField="HiddenType" FieldType="string"
+                                            HeaderText="隐患类型" HeaderTextAlign="Center" TextAlign="Left">
+                                           
+                                        </f:RenderField>
+
+
+                                        <f:RenderField minWidth="150px" ColumnID="RectifyResults" DataField="RectifyResults" FieldType="string" 
                                                 HeaderText="整改结果" HeaderTextAlign="Center" TextAlign="Center">
                                         </f:RenderField>
-                                        <f:TemplateField ColumnID="tfImageUrl2" Width="110px" HeaderText="整改后" HeaderTextAlign="Center"
+                                        <f:TemplateField ColumnID="tfImageUrl2" minWidth="110px" HeaderText="整改后" HeaderTextAlign="Center"
                                             TextAlign="Left">
                                             <ItemTemplate>
                                                 <asp:Label ID="Label2" runat="server" Text='<%# ConvertImgUrlByImage(Eval("RectifyNoticesItemId")) %>'> %>'></asp:Label>
                                             </ItemTemplate>
                                         </f:TemplateField>
-                                        <f:RenderField Width="90px" ColumnID="IsRectify" DataField="IsRectify" FieldType="string"
+                                        <f:RenderField minWidth="90px" ColumnID="IsRectify" DataField="IsRectify" FieldType="string"
                                             HeaderText="合格" HeaderTextAlign="Center" TextAlign="Center">
                                         </f:RenderField>
                                     </Columns>

SGGL/FineUIPro.Web/HSSE/Check/RectifyNoticesView.aspx.cs

@@ -61,7 +61,7 @@ namespace FineUIPro.Web.HSSE.Check
         public void BindGrid1()
         {
             string strSql = @"select RectifyNoticesItemId, RectifyNoticesId, WrongContent, Requirement, LimitTime, RectifyResults
-                , (case IsRectify when 'True' then '合格' when 'False' then '不合格' else '' end) As IsRectify 
+                , (case IsRectify when 'True' then '合格' when 'False' then '不合格' else '' end) As IsRectify ,HiddenType,HiddenHazardType
                 from [dbo].[Check_RectifyNoticesItem] ";
             List<SqlParameter> listStr = new List<SqlParameter>();
             strSql += "where RectifyNoticesId = @RectifyNoticesId";

SGGL/FineUIPro.Web/HSSE/HiddenInspection/HiddenRectificationAdd.aspx

@@ -17,8 +17,8 @@
                 <Items>
                     <f:DropDownList runat="server" EnableSimulateTree="True" Label="检查项" ID="drpRegisterTypes" >
                     </f:DropDownList>
-                    <f:DropDownList runat="server" EnableSimulateTree="True" Label="级别" ID="dpRiskLevel" >
+                    <f:DropDownList runat="server" EnableSimulateTree="True" Label="隐患级别" ID="dpRiskLevel" >
-                         <f:ListItem Text="一般"  Value="一般"/>
+                         <f:ListItem Text="一般"  Value="一般" Selected="true"/>
                          <f:ListItem Text="重大"  Value="重大"/>
                     </f:DropDownList> 
                 </Items>
@@ -73,6 +73,16 @@
                     <f:NumberBox ID="txtCutPayment" runat="server" Label="罚款金额" LabelAlign="Right" Text="0" NoNegative="true" NoDecimal="true"></f:NumberBox>
                 </Items>
             </f:FormRow>
+
+            <f:FormRow>
+                <Items>
+                    <f:DropDownList ID="drpHiddenType" runat="server" Label="隐患类型" EnableEdit="true" LabelAlign="Right"  ShowRedStar="true"
+                               Required="true" EmptyText="--请选择--" AutoSelectFirstItem="false" 
+                            AutoPostBack="true" >
+                      </f:DropDownList>
+                </Items>
+            </f:FormRow>
+
         </Rows>
         <Toolbars>
             <f:Toolbar ID="Toolbar1" Position="Bottom" ToolbarAlign="Right" runat="server">

SGGL/FineUIPro.Web/HSSE/HiddenInspection/HiddenRectificationAdd.aspx.cs

@@ -83,6 +83,8 @@ namespace FineUIPro.Web.HSSE.HiddenInspection
                     Type = Request.Params["Type"];
 
                     this.btnClose.OnClientClick = ActiveWindow.GetHideReference();
+                  
+                    ConstValue.InitConstValueDropDownList(drpHiddenType, "Hiddendangertype", false);
 
                     UnitService.InitUnitByProjectIdUnitTypeDropDownList(this.drpUnit, this.CurrUser.LoginProjectId, Const.ProjectUnitType_2, true);
                     UnitWorkService.InitUnitWorkDownList(this.drpWorkArea, this.CurrUser.LoginProjectId, true);
@@ -163,6 +165,7 @@ namespace FineUIPro.Web.HSSE.HiddenInspection
                                 this.txtHandleIdea.Hidden = false;
                                 this.txtHandleIdea.Text = registration.HandleIdea;
                             }
+                            drpHiddenType.SelectedValue = registration.HiddenType;
                         }
                     }
                 }
@@ -274,6 +277,8 @@ namespace FineUIPro.Web.HSSE.HiddenInspection
             register.CheckManId = this.hdCheckManId.Text;
             register.CutPayment = Funs.GetNewIntOrZero(this.txtCutPayment.Text.Trim());
             register.States = "1";    //待整改
+
+            register.HiddenType = drpHiddenType.SelectedValue;
             if (!string.IsNullOrEmpty(HazardRegisterId))
             {
                 register.HazardRegisterId = HazardRegisterId;

SGGL/FineUIPro.Web/HSSE/HiddenInspection/HiddenRectificationAdd.aspx.designer.cs

@@ -7,11 +7,13 @@
 // </自动生成>
 //------------------------------------------------------------------------------
 
-namespace FineUIPro.Web.HSSE.HiddenInspection {
+namespace FineUIPro.Web.HSSE.HiddenInspection
-    
+{
-    
+
-    public partial class HiddenRectificationAdd {
+
-        
+    public partial class HiddenRectificationAdd
+    {
+
         /// <summary>
         /// form1 控件。
         /// </summary>
@@ -20,7 +22,7 @@ namespace FineUIPro.Web.HSSE.HiddenInspection {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::System.Web.UI.HtmlControls.HtmlForm form1;
-        
+
         /// <summary>
         /// PageManager1 控件。
         /// </summary>
@@ -29,7 +31,7 @@ namespace FineUIPro.Web.HSSE.HiddenInspection {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.PageManager PageManager1;
-        
+
         /// <summary>
         /// SimpleForm1 控件。
         /// </summary>
@@ -38,7 +40,7 @@ namespace FineUIPro.Web.HSSE.HiddenInspection {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.Form SimpleForm1;
-        
+
         /// <summary>
         /// drpRegisterTypes 控件。
         /// </summary>
@@ -47,7 +49,7 @@ namespace FineUIPro.Web.HSSE.HiddenInspection {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.DropDownList drpRegisterTypes;
-        
+
         /// <summary>
         /// dpRiskLevel 控件。
         /// </summary>
@@ -56,7 +58,7 @@ namespace FineUIPro.Web.HSSE.HiddenInspection {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.DropDownList dpRiskLevel;
-        
+
         /// <summary>
         /// drpUnit 控件。
         /// </summary>
@@ -65,7 +67,7 @@ namespace FineUIPro.Web.HSSE.HiddenInspection {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.DropDownList drpUnit;
-        
+
         /// <summary>
         /// drpWorkArea 控件。
         /// </summary>
@@ -74,7 +76,7 @@ namespace FineUIPro.Web.HSSE.HiddenInspection {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.DropDownList drpWorkArea;
-        
+
         /// <summary>
         /// txtRegisterDef 控件。
         /// </summary>
@@ -83,7 +85,7 @@ namespace FineUIPro.Web.HSSE.HiddenInspection {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.TextArea txtRegisterDef;
-        
+
         /// <summary>
         /// txtRequirements 控件。
         /// </summary>
@@ -92,7 +94,7 @@ namespace FineUIPro.Web.HSSE.HiddenInspection {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.TextArea txtRequirements;
-        
+
         /// <summary>
         /// txtHandleIdea 控件。
         /// </summary>
@@ -101,7 +103,7 @@ namespace FineUIPro.Web.HSSE.HiddenInspection {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.TextBox txtHandleIdea;
-        
+
         /// <summary>
         /// drpResponsibleMan 控件。
         /// </summary>
@@ -110,7 +112,7 @@ namespace FineUIPro.Web.HSSE.HiddenInspection {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.DropDownList drpResponsibleMan;
-        
+
         /// <summary>
         /// txtRectificationPeriod 控件。
         /// </summary>
@@ -119,7 +121,7 @@ namespace FineUIPro.Web.HSSE.HiddenInspection {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.DatePicker txtRectificationPeriod;
-        
+
         /// <summary>
         /// txtCheckManName 控件。
         /// </summary>
@@ -128,7 +130,7 @@ namespace FineUIPro.Web.HSSE.HiddenInspection {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.TextBox txtCheckManName;
-        
+
         /// <summary>
         /// txtCheckTime 控件。
         /// </summary>
@@ -137,7 +139,7 @@ namespace FineUIPro.Web.HSSE.HiddenInspection {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.TextBox txtCheckTime;
-        
+
         /// <summary>
         /// UploadAttach 控件。
         /// </summary>
@@ -146,7 +148,7 @@ namespace FineUIPro.Web.HSSE.HiddenInspection {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.LinkButton UploadAttach;
-        
+
         /// <summary>
         /// txtCutPayment 控件。
         /// </summary>
@@ -155,7 +157,16 @@ namespace FineUIPro.Web.HSSE.HiddenInspection {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.NumberBox txtCutPayment;
-        
+
+        /// <summary>
+        /// drpHiddenType 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.DropDownList drpHiddenType;
+
         /// <summary>
         /// Toolbar1 控件。
         /// </summary>
@@ -164,7 +175,7 @@ namespace FineUIPro.Web.HSSE.HiddenInspection {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.Toolbar Toolbar1;
-        
+
         /// <summary>
         /// ToolbarFill1 控件。
         /// </summary>
@@ -173,7 +184,7 @@ namespace FineUIPro.Web.HSSE.HiddenInspection {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.ToolbarFill ToolbarFill1;
-        
+
         /// <summary>
         /// ckType 控件。
         /// </summary>
@@ -182,7 +193,7 @@ namespace FineUIPro.Web.HSSE.HiddenInspection {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.RadioButtonList ckType;
-        
+
         /// <summary>
         /// hdCheckManId 控件。
         /// </summary>
@@ -191,7 +202,7 @@ namespace FineUIPro.Web.HSSE.HiddenInspection {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.HiddenField hdCheckManId;
-        
+
         /// <summary>
         /// btnSave 控件。
         /// </summary>
@@ -200,7 +211,7 @@ namespace FineUIPro.Web.HSSE.HiddenInspection {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.Button btnSave;
-        
+
         /// <summary>
         /// btnClose 控件。
         /// </summary>
@@ -209,7 +220,7 @@ namespace FineUIPro.Web.HSSE.HiddenInspection {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.Button btnClose;
-        
+
         /// <summary>
         /// Window1 控件。
         /// </summary>

SGGL/FineUIPro.Web/HSSE/HiddenInspection/HiddenRectificationConfirm.aspx

@@ -30,6 +30,15 @@
                 </Items>
             </f:FormRow>
             
+             <f:FormRow>
+                <Items>
+                    <f:TextBox ID="txtRiskLevel" runat="server" Label="隐患级别" Readonly="true">
+                    </f:TextBox>
+                    <f:TextBox ID="txtHiddenType" runat="server" Label="隐患类型" Readonly="true">
+                    </f:TextBox>
+                </Items>
+            </f:FormRow>
+
             <f:FormRow>
                 <Items>
                     <f:TextArea ID="txtRegisterDef" runat="server" Label="问题描述" Readonly="true">

SGGL/FineUIPro.Web/HSSE/HiddenInspection/HiddenRectificationConfirm.aspx.cs

@@ -118,6 +118,9 @@ namespace FineUIPro.Web.HSSE.HiddenInspection
                                 this.txtOldHandleIdea.Text = registration.HandleIdea;
                             }
                         }
+
+                        txtRiskLevel.Text = registration.Risk_Level;
+                        txtHiddenType.Text = registration.HiddenType;
                     }
                 }
             }

SGGL/FineUIPro.Web/HSSE/HiddenInspection/HiddenRectificationConfirm.aspx.designer.cs

@@ -7,11 +7,13 @@
 // </自动生成>
 //------------------------------------------------------------------------------
 
-namespace FineUIPro.Web.HSSE.HiddenInspection {
+namespace FineUIPro.Web.HSSE.HiddenInspection
-    
+{
-    
+
-    public partial class HiddenRectificationConfirm {
+
-        
+    public partial class HiddenRectificationConfirm
+    {
+
         /// <summary>
         /// form1 控件。
         /// </summary>
@@ -20,7 +22,7 @@ namespace FineUIPro.Web.HSSE.HiddenInspection {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::System.Web.UI.HtmlControls.HtmlForm form1;
-        
+
         /// <summary>
         /// PageManager1 控件。
         /// </summary>
@@ -29,7 +31,7 @@ namespace FineUIPro.Web.HSSE.HiddenInspection {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.PageManager PageManager1;
-        
+
         /// <summary>
         /// SimpleForm1 控件。
         /// </summary>
@@ -38,7 +40,7 @@ namespace FineUIPro.Web.HSSE.HiddenInspection {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.Form SimpleForm1;
-        
+
         /// <summary>
         /// txtRegisterTypesName 控件。
         /// </summary>
@@ -47,7 +49,7 @@ namespace FineUIPro.Web.HSSE.HiddenInspection {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.TextBox txtRegisterTypesName;
-        
+
         /// <summary>
         /// txtType 控件。
         /// </summary>
@@ -56,7 +58,7 @@ namespace FineUIPro.Web.HSSE.HiddenInspection {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.TextBox txtType;
-        
+
         /// <summary>
         /// txtUnitName 控件。
         /// </summary>
@@ -65,7 +67,7 @@ namespace FineUIPro.Web.HSSE.HiddenInspection {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.TextBox txtUnitName;
-        
+
         /// <summary>
         /// txtWorkAreaName 控件。
         /// </summary>
@@ -74,7 +76,25 @@ namespace FineUIPro.Web.HSSE.HiddenInspection {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.TextBox txtWorkAreaName;
-        
+
+        /// <summary>
+        /// txtRiskLevel 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.TextBox txtRiskLevel;
+
+        /// <summary>
+        /// txtHiddenType 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.TextBox txtHiddenType;
+
         /// <summary>
         /// txtRegisterDef 控件。
         /// </summary>
@@ -83,7 +103,7 @@ namespace FineUIPro.Web.HSSE.HiddenInspection {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.TextArea txtRegisterDef;
-        
+
         /// <summary>
         /// txtRequirements 控件。
         /// </summary>
@@ -92,7 +112,7 @@ namespace FineUIPro.Web.HSSE.HiddenInspection {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.TextArea txtRequirements;
-        
+
         /// <summary>
         /// txtOldHandleIdea 控件。
         /// </summary>
@@ -101,7 +121,7 @@ namespace FineUIPro.Web.HSSE.HiddenInspection {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.TextBox txtOldHandleIdea;
-        
+
         /// <summary>
         /// txtResponsibleManName 控件。
         /// </summary>
@@ -110,7 +130,7 @@ namespace FineUIPro.Web.HSSE.HiddenInspection {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.TextBox txtResponsibleManName;
-        
+
         /// <summary>
         /// txtRectificationPeriod 控件。
         /// </summary>
@@ -119,7 +139,7 @@ namespace FineUIPro.Web.HSSE.HiddenInspection {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.TextBox txtRectificationPeriod;
-        
+
         /// <summary>
         /// txtCheckManName 控件。
         /// </summary>
@@ -128,7 +148,7 @@ namespace FineUIPro.Web.HSSE.HiddenInspection {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.TextBox txtCheckManName;
-        
+
         /// <summary>
         /// txtCheckTime 控件。
         /// </summary>
@@ -137,7 +157,7 @@ namespace FineUIPro.Web.HSSE.HiddenInspection {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.TextBox txtCheckTime;
-        
+
         /// <summary>
         /// UploadAttach 控件。
         /// </summary>
@@ -146,7 +166,7 @@ namespace FineUIPro.Web.HSSE.HiddenInspection {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.LinkButton UploadAttach;
-        
+
         /// <summary>
         /// txtCutPayment 控件。
         /// </summary>
@@ -155,7 +175,7 @@ namespace FineUIPro.Web.HSSE.HiddenInspection {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.NumberBox txtCutPayment;
-        
+
         /// <summary>
         /// txtRectification 控件。
         /// </summary>
@@ -164,7 +184,7 @@ namespace FineUIPro.Web.HSSE.HiddenInspection {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.TextArea txtRectification;
-        
+
         /// <summary>
         /// UploadAttachR 控件。
         /// </summary>
@@ -173,7 +193,7 @@ namespace FineUIPro.Web.HSSE.HiddenInspection {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.LinkButton UploadAttachR;
-        
+
         /// <summary>
         /// ckConfirm 控件。
         /// </summary>
@@ -182,7 +202,7 @@ namespace FineUIPro.Web.HSSE.HiddenInspection {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.RadioButtonList ckConfirm;
-        
+
         /// <summary>
         /// txtHandleIdea 控件。
         /// </summary>
@@ -191,7 +211,7 @@ namespace FineUIPro.Web.HSSE.HiddenInspection {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.TextBox txtHandleIdea;
-        
+
         /// <summary>
         /// Toolbar1 控件。
         /// </summary>
@@ -200,7 +220,7 @@ namespace FineUIPro.Web.HSSE.HiddenInspection {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.Toolbar Toolbar1;
-        
+
         /// <summary>
         /// ToolbarFill1 控件。
         /// </summary>
@@ -209,7 +229,7 @@ namespace FineUIPro.Web.HSSE.HiddenInspection {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.ToolbarFill ToolbarFill1;
-        
+
         /// <summary>
         /// btnSave 控件。
         /// </summary>
@@ -218,7 +238,7 @@ namespace FineUIPro.Web.HSSE.HiddenInspection {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.Button btnSave;
-        
+
         /// <summary>
         /// btnClose 控件。
         /// </summary>
@@ -227,7 +247,7 @@ namespace FineUIPro.Web.HSSE.HiddenInspection {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.Button btnClose;
-        
+
         /// <summary>
         /// Window1 控件。
         /// </summary>

SGGL/FineUIPro.Web/HSSE/HiddenInspection/HiddenRectificationRectify.aspx

@@ -30,6 +30,15 @@
                 </Items>
             </f:FormRow>
             
+             <f:FormRow>
+                <Items>
+                    <f:TextBox ID="txtRiskLevel" runat="server" Label="隐患级别" Readonly="true">
+                    </f:TextBox>
+                    <f:TextBox ID="txtHiddenType" runat="server" Label="隐患类型" Readonly="true">
+                    </f:TextBox>
+                </Items>
+            </f:FormRow>
+
             <f:FormRow>
                 <Items>
                     <f:TextArea ID="txtRegisterDef" runat="server" Label="问题描述" Readonly="true">

SGGL/FineUIPro.Web/HSSE/HiddenInspection/HiddenRectificationRectify.aspx.cs

@@ -109,6 +109,8 @@ namespace FineUIPro.Web.HiddenInspection
                             this.txtHandleIdea.Hidden = false;
                             this.txtHandleIdea.Text = registration.HandleIdea;
                         }
+                        txtRiskLevel.Text = registration.Risk_Level;
+                        txtHiddenType.Text = registration.HiddenType;
                     }
                 }
             }

SGGL/FineUIPro.Web/HSSE/HiddenInspection/HiddenRectificationRectify.aspx.designer.cs

@@ -7,11 +7,13 @@
 // </自动生成>
 //------------------------------------------------------------------------------
 
-namespace FineUIPro.Web.HiddenInspection {
+namespace FineUIPro.Web.HiddenInspection
-    
+{
-    
+
-    public partial class HiddenRectificationRectify {
+
-        
+    public partial class HiddenRectificationRectify
+    {
+
         /// <summary>
         /// form1 控件。
         /// </summary>
@@ -20,7 +22,7 @@ namespace FineUIPro.Web.HiddenInspection {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::System.Web.UI.HtmlControls.HtmlForm form1;
-        
+
         /// <summary>
         /// PageManager1 控件。
         /// </summary>
@@ -29,7 +31,7 @@ namespace FineUIPro.Web.HiddenInspection {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.PageManager PageManager1;
-        
+
         /// <summary>
         /// SimpleForm1 控件。
         /// </summary>
@@ -38,7 +40,7 @@ namespace FineUIPro.Web.HiddenInspection {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.Form SimpleForm1;
-        
+
         /// <summary>
         /// txtRegisterTypesName 控件。
         /// </summary>
@@ -47,7 +49,7 @@ namespace FineUIPro.Web.HiddenInspection {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.TextBox txtRegisterTypesName;
-        
+
         /// <summary>
         /// txtType 控件。
         /// </summary>
@@ -56,7 +58,7 @@ namespace FineUIPro.Web.HiddenInspection {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.TextBox txtType;
-        
+
         /// <summary>
         /// txtUnitName 控件。
         /// </summary>
@@ -65,7 +67,7 @@ namespace FineUIPro.Web.HiddenInspection {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.TextBox txtUnitName;
-        
+
         /// <summary>
         /// txtWorkAreaName 控件。
         /// </summary>
@@ -74,7 +76,25 @@ namespace FineUIPro.Web.HiddenInspection {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.TextBox txtWorkAreaName;
-        
+
+        /// <summary>
+        /// txtRiskLevel 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.TextBox txtRiskLevel;
+
+        /// <summary>
+        /// txtHiddenType 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.TextBox txtHiddenType;
+
         /// <summary>
         /// txtRegisterDef 控件。
         /// </summary>
@@ -83,7 +103,7 @@ namespace FineUIPro.Web.HiddenInspection {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.TextArea txtRegisterDef;
-        
+
         /// <summary>
         /// txtRequirements 控件。
         /// </summary>
@@ -92,7 +112,7 @@ namespace FineUIPro.Web.HiddenInspection {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.TextArea txtRequirements;
-        
+
         /// <summary>
         /// txtHandleIdea 控件。
         /// </summary>
@@ -101,7 +121,7 @@ namespace FineUIPro.Web.HiddenInspection {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.TextBox txtHandleIdea;
-        
+
         /// <summary>
         /// txtResponsibleManName 控件。
         /// </summary>
@@ -110,7 +130,7 @@ namespace FineUIPro.Web.HiddenInspection {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.TextBox txtResponsibleManName;
-        
+
         /// <summary>
         /// txtRectificationPeriod 控件。
         /// </summary>
@@ -119,7 +139,7 @@ namespace FineUIPro.Web.HiddenInspection {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.TextBox txtRectificationPeriod;
-        
+
         /// <summary>
         /// txtCheckManName 控件。
         /// </summary>
@@ -128,7 +148,7 @@ namespace FineUIPro.Web.HiddenInspection {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.TextBox txtCheckManName;
-        
+
         /// <summary>
         /// txtCheckTime 控件。
         /// </summary>
@@ -137,7 +157,7 @@ namespace FineUIPro.Web.HiddenInspection {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.TextBox txtCheckTime;
-        
+
         /// <summary>
         /// UploadAttach 控件。
         /// </summary>
@@ -146,7 +166,7 @@ namespace FineUIPro.Web.HiddenInspection {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.LinkButton UploadAttach;
-        
+
         /// <summary>
         /// txtCutPayment 控件。
         /// </summary>
@@ -155,7 +175,7 @@ namespace FineUIPro.Web.HiddenInspection {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.NumberBox txtCutPayment;
-        
+
         /// <summary>
         /// txtRectification 控件。
         /// </summary>
@@ -164,7 +184,7 @@ namespace FineUIPro.Web.HiddenInspection {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.TextArea txtRectification;
-        
+
         /// <summary>
         /// UploadAttachR 控件。
         /// </summary>
@@ -173,7 +193,7 @@ namespace FineUIPro.Web.HiddenInspection {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.LinkButton UploadAttachR;
-        
+
         /// <summary>
         /// Toolbar1 控件。
         /// </summary>
@@ -182,7 +202,7 @@ namespace FineUIPro.Web.HiddenInspection {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.Toolbar Toolbar1;
-        
+
         /// <summary>
         /// ToolbarFill1 控件。
         /// </summary>
@@ -191,7 +211,7 @@ namespace FineUIPro.Web.HiddenInspection {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.ToolbarFill ToolbarFill1;
-        
+
         /// <summary>
         /// btnSave 控件。
         /// </summary>
@@ -200,7 +220,7 @@ namespace FineUIPro.Web.HiddenInspection {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.Button btnSave;
-        
+
         /// <summary>
         /// btnClose 控件。
         /// </summary>
@@ -209,7 +229,7 @@ namespace FineUIPro.Web.HiddenInspection {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.Button btnClose;
-        
+
         /// <summary>
         /// Window1 控件。
         /// </summary>

SGGL/FineUIPro.Web/HSSE/HiddenInspection/HiddenRectificationView.aspx

@@ -25,6 +25,9 @@
                 <Items>
                     <f:TextBox ID="txtRegisterTypesName" runat="server" Label="检查项" Readonly="true">
                     </f:TextBox>
+
+                    <f:TextBox ID="txtRiskLevel" runat="server" Label="隐患级别" Readonly="true">
+                    </f:TextBox>
                 </Items>
             </f:FormRow>
             <f:FormRow>
@@ -69,6 +72,13 @@
                     </f:TextBox>
                 </Items>
             </f:FormRow>
+            <f:FormRow>
+                <Items>
+                     <f:TextBox ID="txtHiddenType" runat="server" Label="隐患类型" Readonly="true">
+                    </f:TextBox>
+                </Items>
+            </f:FormRow>
+
             <f:FormRow ColumnWidths="8% 92%">
                 <Items>
                     <f:Label runat="server" ID="lblImageUrl" Label="整改前图片">

SGGL/FineUIPro.Web/HSSE/HiddenInspection/HiddenRectificationView.aspx.cs

@@ -87,6 +87,9 @@ namespace FineUIPro.Web.HSSE.HiddenInspection
                         this.RectificationImageUrl = registration.RectificationImageUrl;
                         this.divImageUrl.InnerHtml = BLL.UploadAttachmentService.ShowAttachment("../../", this.ImageUrl);
                         this.divRectificationImageUrl.InnerHtml = BLL.UploadAttachmentService.ShowAttachment("../../", this.RectificationImageUrl);
+
+                        txtRiskLevel.Text = registration.Risk_Level;
+                        txtHiddenType.Text = registration.HiddenType;
                         //var punishRecords = (from x in Funs.DB.View_Common_PunishRecord
                         //                     where x.HazardRegisterId == this.HazardRegisterId
                         //                     orderby x.PunishDate descending

SGGL/FineUIPro.Web/HSSE/HiddenInspection/HiddenRectificationView.aspx.designer.cs

@@ -7,11 +7,13 @@
 // </自动生成>
 //------------------------------------------------------------------------------
 
-namespace FineUIPro.Web.HSSE.HiddenInspection {
+namespace FineUIPro.Web.HSSE.HiddenInspection
-    
+{
-    
+
-    public partial class HiddenRectificationView {
+
-        
+    public partial class HiddenRectificationView
+    {
+
         /// <summary>
         /// form1 控件。
         /// </summary>
@@ -20,7 +22,7 @@ namespace FineUIPro.Web.HSSE.HiddenInspection {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::System.Web.UI.HtmlControls.HtmlForm form1;
-        
+
         /// <summary>
         /// PageManager1 控件。
         /// </summary>
@@ -29,7 +31,7 @@ namespace FineUIPro.Web.HSSE.HiddenInspection {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.PageManager PageManager1;
-        
+
         /// <summary>
         /// SimpleForm1 控件。
         /// </summary>
@@ -38,7 +40,7 @@ namespace FineUIPro.Web.HSSE.HiddenInspection {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.Form SimpleForm1;
-        
+
         /// <summary>
         /// txtWorkAreaName 控件。
         /// </summary>
@@ -47,7 +49,7 @@ namespace FineUIPro.Web.HSSE.HiddenInspection {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.TextBox txtWorkAreaName;
-        
+
         /// <summary>
         /// txtResponsibilityUnitName 控件。
         /// </summary>
@@ -56,7 +58,7 @@ namespace FineUIPro.Web.HSSE.HiddenInspection {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.TextBox txtResponsibilityUnitName;
-        
+
         /// <summary>
         /// txtRegisterTypesName 控件。
         /// </summary>
@@ -65,7 +67,16 @@ namespace FineUIPro.Web.HSSE.HiddenInspection {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.TextBox txtRegisterTypesName;
-        
+
+        /// <summary>
+        /// txtRiskLevel 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.TextBox txtRiskLevel;
+
         /// <summary>
         /// txtProblemDescription 控件。
         /// </summary>
@@ -74,7 +85,7 @@ namespace FineUIPro.Web.HSSE.HiddenInspection {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.TextArea txtProblemDescription;
-        
+
         /// <summary>
         /// txtRequirements 控件。
         /// </summary>
@@ -83,7 +94,7 @@ namespace FineUIPro.Web.HSSE.HiddenInspection {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.TextArea txtRequirements;
-        
+
         /// <summary>
         /// txtTakeSteps 控件。
         /// </summary>
@@ -92,7 +103,7 @@ namespace FineUIPro.Web.HSSE.HiddenInspection {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.TextArea txtTakeSteps;
-        
+
         /// <summary>
         /// txtResponsibilityManName 控件。
         /// </summary>
@@ -101,7 +112,7 @@ namespace FineUIPro.Web.HSSE.HiddenInspection {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.TextBox txtResponsibilityManName;
-        
+
         /// <summary>
         /// txtRectificationPeriod 控件。
         /// </summary>
@@ -110,7 +121,7 @@ namespace FineUIPro.Web.HSSE.HiddenInspection {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.TextBox txtRectificationPeriod;
-        
+
         /// <summary>
         /// txtCheckManName 控件。
         /// </summary>
@@ -119,7 +130,7 @@ namespace FineUIPro.Web.HSSE.HiddenInspection {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.TextBox txtCheckManName;
-        
+
         /// <summary>
         /// txtCheckTime 控件。
         /// </summary>
@@ -128,7 +139,7 @@ namespace FineUIPro.Web.HSSE.HiddenInspection {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.TextBox txtCheckTime;
-        
+
         /// <summary>
         /// txtRectificationTime 控件。
         /// </summary>
@@ -137,7 +148,7 @@ namespace FineUIPro.Web.HSSE.HiddenInspection {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.TextBox txtRectificationTime;
-        
+
         /// <summary>
         /// txtStates 控件。
         /// </summary>
@@ -146,7 +157,16 @@ namespace FineUIPro.Web.HSSE.HiddenInspection {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.TextBox txtStates;
-        
+
+        /// <summary>
+        /// txtHiddenType 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.TextBox txtHiddenType;
+
         /// <summary>
         /// lblImageUrl 控件。
         /// </summary>
@@ -155,7 +175,7 @@ namespace FineUIPro.Web.HSSE.HiddenInspection {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.Label lblImageUrl;
-        
+
         /// <summary>
         /// ContentPanel2 控件。
         /// </summary>
@@ -164,7 +184,7 @@ namespace FineUIPro.Web.HSSE.HiddenInspection {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.ContentPanel ContentPanel2;
-        
+
         /// <summary>
         /// divImageUrl 控件。
         /// </summary>
@@ -173,7 +193,7 @@ namespace FineUIPro.Web.HSSE.HiddenInspection {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::System.Web.UI.HtmlControls.HtmlGenericControl divImageUrl;
-        
+
         /// <summary>
         /// lblRectificationImageUrl 控件。
         /// </summary>
@@ -182,7 +202,7 @@ namespace FineUIPro.Web.HSSE.HiddenInspection {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.Label lblRectificationImageUrl;
-        
+
         /// <summary>
         /// ContentPanel1 控件。
         /// </summary>
@@ -191,7 +211,7 @@ namespace FineUIPro.Web.HSSE.HiddenInspection {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.ContentPanel ContentPanel1;
-        
+
         /// <summary>
         /// divRectificationImageUrl 控件。
         /// </summary>
@@ -200,7 +220,7 @@ namespace FineUIPro.Web.HSSE.HiddenInspection {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::System.Web.UI.HtmlControls.HtmlGenericControl divRectificationImageUrl;
-        
+
         /// <summary>
         /// Toolbar1 控件。
         /// </summary>
@@ -209,7 +229,7 @@ namespace FineUIPro.Web.HSSE.HiddenInspection {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.Toolbar Toolbar1;
-        
+
         /// <summary>
         /// ToolbarFill1 控件。
         /// </summary>
@@ -218,7 +238,7 @@ namespace FineUIPro.Web.HSSE.HiddenInspection {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.ToolbarFill ToolbarFill1;
-        
+
         /// <summary>
         /// btnClose 控件。
         /// </summary>

SGGL/Model/APIItem/DropDownItem.cs

@@ -0,0 +1,21 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace Model
+{
+    public class DropDownItem
+    {
+        public string Text { get; set; }
+
+        public string Values { get; set; }
+
+        public string Counts { get; set; }
+
+        public string Mtype { get; set; }
+
+        public string Ttype { get; set; }
+    }
+}

SGGL/Model/APIItem/HSSE/CheckSpecialDetailItem.cs

@@ -124,7 +124,7 @@ namespace Model
             set;
         }
         /// <summary>
-        /// 隐患类别
+        /// 隐患级别
         /// </summary>
         public string HiddenHazardType
         {
@@ -132,7 +132,7 @@ namespace Model
             set;
         }
         /// <summary>
-        /// 隐患类别名称
+        /// 隐患级别名称
         /// </summary>
         public string HiddenHazardTypeName
         {
@@ -207,5 +207,15 @@ namespace Model
         /// 处理意见
         /// </summary>
         public string CheckOpinions { get; set; }
+
+        /// <summary>
+        /// 隐患类型
+        /// </summary>
+        public string HiddenType
+        {
+            get;
+            set;
+        }
+        
     }
 }

SGGL/Model/APIItem/HSSE/HazardRegisterItem.cs

@@ -361,12 +361,21 @@ namespace Model
             set;
         }
         /// <summary>
-        /// 风险等级
+        /// 隐患级别
         /// </summary>
         public string Risk_Level
         {
             get;
             set;
         }
+
+        /// <summary>
+        /// 隐患类型
+        /// </summary>
+        public string HiddenType
+        {
+            get;
+            set;
+        }
     }
 }

SGGL/Model/APIItem/HSSE/RectifyNoticesItemItem.cs

@@ -82,5 +82,23 @@ namespace Model
             get;
             set;
         }
+
+        /// <summary>
+        /// 隐患级别
+        /// </summary>
+        public string HiddenType
+        {
+            get;
+            set;
+        }
+
+        /// <summary>
+        /// 隐患类型
+        /// </summary>
+        public string HiddenHazardType
+        {
+            get;
+            set;
+        }
     }
 }

SGGL/Model/Model.cs

@@ -54773,6 +54773,10 @@ namespace Model
 		
 		private string _PersonId;
 		
+		private string _HiddenHazardType;
+		
+		private string _HiddenType;
+		
 		private EntityRef<Base_Unit> _Base_Unit;
 		
 		private EntityRef<WBS_UnitWork> _WBS_UnitWork;
@@ -54817,6 +54821,10 @@ namespace Model
     partial void OnHiddenDangerLevelChanged();
     partial void OnPersonIdChanging(string value);
     partial void OnPersonIdChanged();
+    partial void OnHiddenHazardTypeChanging(string value);
+    partial void OnHiddenHazardTypeChanged();
+    partial void OnHiddenTypeChanging(string value);
+    partial void OnHiddenTypeChanged();
     #endregion
 		
 		public Check_CheckColligationDetail()
@@ -55194,6 +55202,46 @@ namespace Model
 			}
 		}
 		
+		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_HiddenHazardType", DbType="NVarChar(50)")]
+		public string HiddenHazardType
+		{
+			get
+			{
+				return this._HiddenHazardType;
+			}
+			set
+			{
+				if ((this._HiddenHazardType != value))
+				{
+					this.OnHiddenHazardTypeChanging(value);
+					this.SendPropertyChanging();
+					this._HiddenHazardType = value;
+					this.SendPropertyChanged("HiddenHazardType");
+					this.OnHiddenHazardTypeChanged();
+				}
+			}
+		}
+		
+		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_HiddenType", DbType="NVarChar(50)")]
+		public string HiddenType
+		{
+			get
+			{
+				return this._HiddenType;
+			}
+			set
+			{
+				if ((this._HiddenType != value))
+				{
+					this.OnHiddenTypeChanging(value);
+					this.SendPropertyChanging();
+					this._HiddenType = value;
+					this.SendPropertyChanged("HiddenType");
+					this.OnHiddenTypeChanged();
+				}
+			}
+		}
+		
 		[global::System.Data.Linq.Mapping.AssociationAttribute(Name="FK_Check_CheckColligationDetail_Base_Unit", Storage="_Base_Unit", ThisKey="UnitId", OtherKey="UnitId", IsForeignKey=true)]
 		public Base_Unit Base_Unit
 		{
@@ -62553,6 +62601,8 @@ namespace Model
 		
 		private string _CheckOpinions;
 		
+		private string _HiddenType;
+		
 		private EntityRef<WBS_UnitWork> _WBS_UnitWork;
 		
     #region 可扩展性方法定义
@@ -62605,6 +62655,8 @@ namespace Model
     partial void OnRectification_DateChanged();
     partial void OnCheckOpinionsChanging(string value);
     partial void OnCheckOpinionsChanged();
+    partial void OnHiddenTypeChanging(string value);
+    partial void OnHiddenTypeChanged();
     #endregion
 		
 		public Check_CheckSpecialDetail()
@@ -63077,6 +63129,26 @@ namespace Model
 			}
 		}
 		
+		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_HiddenType", DbType="NVarChar(50)")]
+		public string HiddenType
+		{
+			get
+			{
+				return this._HiddenType;
+			}
+			set
+			{
+				if ((this._HiddenType != value))
+				{
+					this.OnHiddenTypeChanging(value);
+					this.SendPropertyChanging();
+					this._HiddenType = value;
+					this.SendPropertyChanged("HiddenType");
+					this.OnHiddenTypeChanged();
+				}
+			}
+		}
+		
 		[global::System.Data.Linq.Mapping.AssociationAttribute(Name="FK_Check_CheckSpecialDetail_ProjectData_WorkArea", Storage="_WBS_UnitWork", ThisKey="CheckArea", OtherKey="UnitWorkId", IsForeignKey=true)]
 		public WBS_UnitWork WBS_UnitWork
 		{
@@ -75483,6 +75555,10 @@ namespace Model
 		
 		private string _RectifyId;
 		
+		private string _HiddenType;
+		
+		private string _HiddenHazardType;
+		
 		private EntityRef<Check_RectifyNotices> _Check_RectifyNotices;
 		
     #region 可扩展性方法定义
@@ -75505,6 +75581,10 @@ namespace Model
     partial void OnIsRectifyChanged();
     partial void OnRectifyIdChanging(string value);
     partial void OnRectifyIdChanged();
+    partial void OnHiddenTypeChanging(string value);
+    partial void OnHiddenTypeChanged();
+    partial void OnHiddenHazardTypeChanging(string value);
+    partial void OnHiddenHazardTypeChanged();
     #endregion
 		
 		public Check_RectifyNoticesItem()
@@ -75677,6 +75757,46 @@ namespace Model
 			}
 		}
 		
+		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_HiddenType", DbType="NVarChar(50)")]
+		public string HiddenType
+		{
+			get
+			{
+				return this._HiddenType;
+			}
+			set
+			{
+				if ((this._HiddenType != value))
+				{
+					this.OnHiddenTypeChanging(value);
+					this.SendPropertyChanging();
+					this._HiddenType = value;
+					this.SendPropertyChanged("HiddenType");
+					this.OnHiddenTypeChanged();
+				}
+			}
+		}
+		
+		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_HiddenHazardType", DbType="NVarChar(50)")]
+		public string HiddenHazardType
+		{
+			get
+			{
+				return this._HiddenHazardType;
+			}
+			set
+			{
+				if ((this._HiddenHazardType != value))
+				{
+					this.OnHiddenHazardTypeChanging(value);
+					this.SendPropertyChanging();
+					this._HiddenHazardType = value;
+					this.SendPropertyChanged("HiddenHazardType");
+					this.OnHiddenHazardTypeChanged();
+				}
+			}
+		}
+		
 		[global::System.Data.Linq.Mapping.AssociationAttribute(Name="FK_Check_RectifyNoticesItem_Check_RectifyNotices", Storage="_Check_RectifyNotices", ThisKey="RectifyNoticesId", OtherKey="RectifyNoticesId", IsForeignKey=true)]
 		public Check_RectifyNotices Check_RectifyNotices
 		{
@@ -103492,6 +103612,8 @@ namespace Model
 		
 		private System.Nullable<int> _States;
 		
+		private System.Nullable<int> _MaxLevel;
+		
     #region 可扩展性方法定义
     partial void OnLoaded();
     partial void OnValidate(System.Data.Linq.ChangeAction action);
@@ -103540,6 +103662,8 @@ namespace Model
     partial void OnSortChanged();
     partial void OnStatesChanging(System.Nullable<int> value);
     partial void OnStatesChanged();
+    partial void OnMaxLevelChanging(System.Nullable<int> value);
+    partial void OnMaxLevelChanged();
     #endregion
 		
 		public Control_PointCropping()
@@ -103987,6 +104111,26 @@ namespace Model
 			}
 		}
 		
+		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_MaxLevel", DbType="Int")]
+		public System.Nullable<int> MaxLevel
+		{
+			get
+			{
+				return this._MaxLevel;
+			}
+			set
+			{
+				if ((this._MaxLevel != value))
+				{
+					this.OnMaxLevelChanging(value);
+					this.SendPropertyChanging();
+					this._MaxLevel = value;
+					this.SendPropertyChanged("MaxLevel");
+					this.OnMaxLevelChanged();
+				}
+			}
+		}
+		
 		public event PropertyChangingEventHandler PropertyChanging;
 		
 		public event PropertyChangedEventHandler PropertyChanged;
@@ -176039,6 +176183,8 @@ namespace Model
 		
 		private System.Nullable<int> _Type;
 		
+		private string _HiddenType;
+		
 		private EntityRef<Base_Unit> _Base_Unit;
 		
 		private EntityRef<HSSE_Hazard_HazardRegisterTypes> _HSSE_Hazard_HazardRegisterTypes;
@@ -176137,6 +176283,8 @@ namespace Model
     partial void OnRisk_LevelChanged();
     partial void OnTypeChanging(System.Nullable<int> value);
     partial void OnTypeChanged();
+    partial void OnHiddenTypeChanging(string value);
+    partial void OnHiddenTypeChanged();
     #endregion
 		
 		public HSSE_Hazard_HazardRegister()
@@ -177054,6 +177202,26 @@ namespace Model
 			}
 		}
 		
+		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_HiddenType", DbType="NVarChar(50)")]
+		public string HiddenType
+		{
+			get
+			{
+				return this._HiddenType;
+			}
+			set
+			{
+				if ((this._HiddenType != value))
+				{
+					this.OnHiddenTypeChanging(value);
+					this.SendPropertyChanging();
+					this._HiddenType = value;
+					this.SendPropertyChanged("HiddenType");
+					this.OnHiddenTypeChanged();
+				}
+			}
+		}
+		
 		[global::System.Data.Linq.Mapping.AssociationAttribute(Name="FK_HSSE_Hazard_HazardRegister_Base_Unit", Storage="_Base_Unit", ThisKey="ResponsibleUnit", OtherKey="UnitId", IsForeignKey=true)]
 		public Base_Unit Base_Unit
 		{
@@ -399036,6 +399204,10 @@ namespace Model
 		
 		private string _PersonName;
 		
+		private string _HiddenType;
+		
+		private string _HiddenHazardType;
+		
 		public View_Check_CheckColligationDetail()
 		{
 		}
@@ -399375,6 +399547,38 @@ namespace Model
 				}
 			}
 		}
+		
+		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_HiddenType", DbType="NVarChar(50)")]
+		public string HiddenType
+		{
+			get
+			{
+				return this._HiddenType;
+			}
+			set
+			{
+				if ((this._HiddenType != value))
+				{
+					this._HiddenType = value;
+				}
+			}
+		}
+		
+		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_HiddenHazardType", DbType="NVarChar(50)")]
+		public string HiddenHazardType
+		{
+			get
+			{
+				return this._HiddenHazardType;
+			}
+			set
+			{
+				if ((this._HiddenHazardType != value))
+				{
+					this._HiddenHazardType = value;
+				}
+			}
+		}
 	}
 	
 	[global::System.Data.Linq.Mapping.TableAttribute(Name="dbo.View_Check_CheckDayDetail")]
@@ -409245,6 +409449,8 @@ namespace Model
 		
 		private System.Nullable<int> _Type;
 		
+		private string _HiddenType;
+		
 		public View_Hazard_HazardRegister()
 		{
 		}
@@ -410112,6 +410318,22 @@ namespace Model
 				}
 			}
 		}
+		
+		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_HiddenType", DbType="NVarChar(50)")]
+		public string HiddenType
+		{
+			get
+			{
+				return this._HiddenType;
+			}
+			set
+			{
+				if ((this._HiddenType != value))
+				{
+					this._HiddenType = value;
+				}
+			}
+		}
 	}
 	
 	[global::System.Data.Linq.Mapping.TableAttribute(Name="dbo.View_HJGL_Batch_PointBatch")]

SGGL/Model/Model.csproj

@@ -69,6 +69,7 @@
     <Compile Include="APIItem\CNCEC\UpCheckReportItem.cs" />
     <Compile Include="APIItem\CNCEC\UpCheckReportItemItem.cs" />
     <Compile Include="APIItem\CNCEC\UpCheckReportItemItem2.cs" />
+    <Compile Include="APIItem\DropDownItem.cs" />
     <Compile Include="APIItem\EnergyReport.cs" />
     <Compile Include="APIItem\EnergyReportItem.cs" />
     <Compile Include="APIItem\EPSummaryReport.cs" />

SGGL/WebAPI/Controllers/HSSE/HazardRegisterController.cs

@@ -171,5 +171,28 @@ namespace WebAPI.Controllers
             return responeData;
         }
         #endregion
+
+        #region 隐患类型下拉
+        /// <summary>
+        /// 隐患类型下拉
+        /// </summary>
+        /// <returns></returns>
+        public Model.ResponeData getHiddenTypeList()
+        {
+            var responeData = new Model.ResponeData();
+            try
+            {
+                var getDataList = BLL.ConstValue.getHiddenTypeList("Hiddendangertype");
+
+                responeData.data = new { getDataList };
+            }
+            catch (Exception ex)
+            {
+                responeData.code = 0;
+                responeData.message = ex.Message;
+            }
+            return responeData;
+        }
+        #endregion
     }
 }

SGGL/WebAPI/Properties/PublishProfiles/FolderProfile.pubxml.user

@@ -6,6 +6,7 @@
 <Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <PropertyGroup>
     <_PublishTargetUrl>E:\Package\中国五环工程有限公司\SGGLAPI</_PublishTargetUrl>
+    <History>True|2024-07-17T02:29:15.9472548Z;</History>
   </PropertyGroup>
   <ItemGroup>
     <File Include="Areas/HelpPage/HelpPage.css">
@@ -72,445 +73,445 @@
       <publishTime>07/17/2022 11:13:58</publishTime>
     </File>
     <File Include="bin/AipSdk.dll">
-      <publishTime>05/07/2022 06:29:26</publishTime>
+      <publishTime>05/07/2022 14:29:26</publishTime>
     </File>
     <File Include="bin/Antlr3.Runtime.dll">
-      <publishTime>09/10/2013 16:29:20</publishTime>
+      <publishTime>09/11/2013 00:29:20</publishTime>
     </File>
     <File Include="bin/Antlr3.Runtime.pdb">
-      <publishTime>09/10/2013 16:29:20</publishTime>
+      <publishTime>09/11/2013 00:29:20</publishTime>
     </File>
     <File Include="bin/AOP.Common.dll">
-      <publishTime>09/23/2018 23:07:04</publishTime>
+      <publishTime>03/11/2024 11:33:45</publishTime>
     </File>
     <File Include="bin/App_global.asax.compiled">
-      <publishTime>01/25/2024 09:19:42</publishTime>
+      <publishTime>07/17/2024 10:29:14</publishTime>
     </File>
     <File Include="bin/App_global.asax.dll">
-      <publishTime>01/25/2024 09:19:42</publishTime>
+      <publishTime>07/17/2024 10:29:14</publishTime>
     </File>
     <File Include="bin/Aspose.Words.dll">
-      <publishTime>08/03/2021 06:52:48</publishTime>
+      <publishTime>03/11/2024 11:23:37</publishTime>
     </File>
     <File Include="bin/BLL.dll">
-      <publishTime>01/25/2024 09:18:50</publishTime>
+      <publishTime>07/17/2024 10:28:56</publishTime>
     </File>
     <File Include="bin/BLL.dll.config">
-      <publishTime>08/10/2023 14:16:16</publishTime>
+      <publishTime>05/22/2024 09:42:30</publishTime>
     </File>
     <File Include="bin/BLL.pdb">
-      <publishTime>01/25/2024 09:18:50</publishTime>
+      <publishTime>07/17/2024 10:28:56</publishTime>
     </File>
     <File Include="bin/BouncyCastle.Crypto.dll">
-      <publishTime>12/17/2020 21:32:28</publishTime>
+      <publishTime>12/18/2020 05:32:28</publishTime>
     </File>
     <File Include="bin/EmitMapper.dll">
-      <publishTime>05/10/2011 13:28:12</publishTime>
+      <publishTime>05/10/2011 21:28:12</publishTime>
     </File>
     <File Include="bin/FineUIPro.dll">
-      <publishTime>05/08/2023 15:37:12</publishTime>
+      <publishTime>03/11/2024 11:23:36</publishTime>
     </File>
     <File Include="bin/ICSharpCode.SharpZipLib.dll">
-      <publishTime>05/08/2021 17:08:30</publishTime>
+      <publishTime>05/09/2021 01:08:30</publishTime>
     </File>
     <File Include="bin/ICSharpCode.SharpZipLib.pdb">
-      <publishTime>05/08/2021 17:08:30</publishTime>
+      <publishTime>05/09/2021 01:08:30</publishTime>
     </File>
     <File Include="bin/Microsoft.CodeDom.Providers.DotNetCompilerPlatform.dll">
-      <publishTime>05/24/2018 13:38:22</publishTime>
+      <publishTime>05/24/2018 21:38:22</publishTime>
     </File>
     <File Include="bin/Microsoft.Extensions.Logging.Abstractions.dll">
-      <publishTime>06/07/2018 00:26:54</publishTime>
+      <publishTime>06/07/2018 08:26:54</publishTime>
     </File>
     <File Include="bin/Microsoft.Web.Infrastructure.dll">
-      <publishTime>07/25/2012 11:48:56</publishTime>
+      <publishTime>07/25/2012 19:48:56</publishTime>
     </File>
     <File Include="bin/Model.dll">
-      <publishTime>01/25/2024 09:18:44</publishTime>
+      <publishTime>07/17/2024 10:28:50</publishTime>
     </File>
     <File Include="bin/Model.pdb">
-      <publishTime>01/25/2024 09:18:44</publishTime>
+      <publishTime>07/17/2024 10:28:50</publishTime>
     </File>
     <File Include="bin/netstandard.dll">
-      <publishTime>07/07/2022 09:01:04</publishTime>
+      <publishTime>03/11/2024 11:17:08</publishTime>
     </File>
     <File Include="bin/Newtonsoft.Json.dll">
-      <publishTime>11/27/2018 18:07:34</publishTime>
+      <publishTime>11/28/2018 02:07:34</publishTime>
     </File>
     <File Include="bin/Newtonsoft.Json.pdb">
-      <publishTime>11/27/2018 17:59:08</publishTime>
+      <publishTime>11/28/2018 01:59:08</publishTime>
     </File>
     <File Include="bin/NPOI.dll">
-      <publishTime>10/23/2021 01:07:54</publishTime>
+      <publishTime>10/23/2021 09:07:54</publishTime>
     </File>
     <File Include="bin/NPOI.OOXML.dll">
-      <publishTime>10/23/2021 01:07:56</publishTime>
-    </File>
-    <File Include="bin/NPOI.OOXML.pdb">
       <publishTime>10/23/2021 09:07:56</publishTime>
     </File>
+    <File Include="bin/NPOI.OOXML.pdb">
+      <publishTime>10/23/2021 17:07:56</publishTime>
+    </File>
     <File Include="bin/NPOI.OpenXml4Net.dll">
-      <publishTime>10/23/2021 01:07:54</publishTime>
+      <publishTime>10/23/2021 09:07:54</publishTime>
     </File>
     <File Include="bin/NPOI.OpenXml4Net.pdb">
-      <publishTime>10/23/2021 09:07:54</publishTime>
+      <publishTime>10/23/2021 17:07:54</publishTime>
     </File>
     <File Include="bin/NPOI.OpenXmlFormats.dll">
-      <publishTime>10/23/2021 01:07:54</publishTime>
+      <publishTime>10/23/2021 09:07:54</publishTime>
     </File>
     <File Include="bin/NPOI.OpenXmlFormats.pdb">
-      <publishTime>10/23/2021 09:07:54</publishTime>
+      <publishTime>10/23/2021 17:07:54</publishTime>
     </File>
     <File Include="bin/NPOI.pdb">
-      <publishTime>10/23/2021 09:07:54</publishTime>
+      <publishTime>10/23/2021 17:07:54</publishTime>
     </File>
     <File Include="bin/Quartz.dll">
-      <publishTime>09/18/2022 09:38:18</publishTime>
+      <publishTime>09/18/2022 17:38:18</publishTime>
     </File>
     <File Include="bin/RestSharp.dll">
-      <publishTime>12/08/2021 14:02:42</publishTime>
+      <publishTime>12/08/2021 22:02:42</publishTime>
     </File>
     <File Include="bin/roslyn/csc.exe">
-      <publishTime>05/24/2018 13:38:22</publishTime>
+      <publishTime>05/24/2018 21:38:22</publishTime>
     </File>
     <File Include="bin/roslyn/csc.exe.config">
-      <publishTime>05/24/2018 13:38:22</publishTime>
+      <publishTime>05/24/2018 21:38:22</publishTime>
     </File>
     <File Include="bin/roslyn/csc.rsp">
-      <publishTime>05/24/2018 13:38:22</publishTime>
+      <publishTime>05/24/2018 21:38:22</publishTime>
     </File>
     <File Include="bin/roslyn/csi.exe">
-      <publishTime>05/24/2018 13:38:22</publishTime>
+      <publishTime>05/24/2018 21:38:22</publishTime>
     </File>
     <File Include="bin/roslyn/csi.exe.config">
-      <publishTime>05/24/2018 13:38:22</publishTime>
+      <publishTime>05/24/2018 21:38:22</publishTime>
     </File>
     <File Include="bin/roslyn/csi.rsp">
-      <publishTime>05/24/2018 13:38:22</publishTime>
+      <publishTime>05/24/2018 21:38:22</publishTime>
     </File>
     <File Include="bin/roslyn/Microsoft.Build.Tasks.CodeAnalysis.dll">
-      <publishTime>05/24/2018 13:38:22</publishTime>
+      <publishTime>05/24/2018 21:38:22</publishTime>
     </File>
     <File Include="bin/roslyn/Microsoft.CodeAnalysis.CSharp.dll">
-      <publishTime>05/24/2018 13:38:24</publishTime>
+      <publishTime>05/24/2018 21:38:24</publishTime>
     </File>
     <File Include="bin/roslyn/Microsoft.CodeAnalysis.CSharp.Scripting.dll">
-      <publishTime>05/24/2018 13:38:24</publishTime>
+      <publishTime>05/24/2018 21:38:24</publishTime>
     </File>
     <File Include="bin/roslyn/Microsoft.CodeAnalysis.dll">
-      <publishTime>05/24/2018 13:38:24</publishTime>
+      <publishTime>05/24/2018 21:38:24</publishTime>
     </File>
     <File Include="bin/roslyn/Microsoft.CodeAnalysis.Scripting.dll">
-      <publishTime>05/24/2018 13:38:24</publishTime>
+      <publishTime>05/24/2018 21:38:24</publishTime>
     </File>
     <File Include="bin/roslyn/Microsoft.CodeAnalysis.VisualBasic.dll">
-      <publishTime>05/24/2018 13:38:24</publishTime>
+      <publishTime>05/24/2018 21:38:24</publishTime>
     </File>
     <File Include="bin/roslyn/Microsoft.CSharp.Core.targets">
-      <publishTime>05/24/2018 13:38:24</publishTime>
+      <publishTime>05/24/2018 21:38:24</publishTime>
     </File>
     <File Include="bin/roslyn/Microsoft.DiaSymReader.Native.amd64.dll">
-      <publishTime>05/24/2018 13:38:24</publishTime>
+      <publishTime>05/24/2018 21:38:24</publishTime>
     </File>
     <File Include="bin/roslyn/Microsoft.DiaSymReader.Native.x86.dll">
-      <publishTime>05/24/2018 13:38:24</publishTime>
+      <publishTime>05/24/2018 21:38:24</publishTime>
     </File>
     <File Include="bin/roslyn/Microsoft.Managed.Core.targets">
-      <publishTime>05/24/2018 13:38:24</publishTime>
+      <publishTime>05/24/2018 21:38:24</publishTime>
     </File>
     <File Include="bin/roslyn/Microsoft.VisualBasic.Core.targets">
-      <publishTime>05/24/2018 13:38:24</publishTime>
+      <publishTime>05/24/2018 21:38:24</publishTime>
     </File>
     <File Include="bin/roslyn/System.AppContext.dll">
-      <publishTime>05/24/2018 13:38:24</publishTime>
+      <publishTime>05/24/2018 21:38:24</publishTime>
     </File>
     <File Include="bin/roslyn/System.Collections.Immutable.dll">
-      <publishTime>05/24/2018 13:38:24</publishTime>
+      <publishTime>05/24/2018 21:38:24</publishTime>
     </File>
     <File Include="bin/roslyn/System.Console.dll">
-      <publishTime>05/24/2018 13:38:24</publishTime>
+      <publishTime>05/24/2018 21:38:24</publishTime>
     </File>
     <File Include="bin/roslyn/System.Diagnostics.FileVersionInfo.dll">
-      <publishTime>05/24/2018 13:38:24</publishTime>
+      <publishTime>05/24/2018 21:38:24</publishTime>
     </File>
     <File Include="bin/roslyn/System.Diagnostics.StackTrace.dll">
-      <publishTime>05/24/2018 13:38:24</publishTime>
+      <publishTime>05/24/2018 21:38:24</publishTime>
     </File>
     <File Include="bin/roslyn/System.IO.Compression.dll">
-      <publishTime>05/24/2018 13:38:24</publishTime>
+      <publishTime>05/24/2018 21:38:24</publishTime>
     </File>
     <File Include="bin/roslyn/System.IO.FileSystem.dll">
-      <publishTime>05/24/2018 13:38:24</publishTime>
+      <publishTime>05/24/2018 21:38:24</publishTime>
     </File>
     <File Include="bin/roslyn/System.IO.FileSystem.Primitives.dll">
-      <publishTime>05/24/2018 13:38:24</publishTime>
+      <publishTime>05/24/2018 21:38:24</publishTime>
     </File>
     <File Include="bin/roslyn/System.IO.Pipes.AccessControl.dll">
-      <publishTime>05/24/2018 13:38:24</publishTime>
+      <publishTime>05/24/2018 21:38:24</publishTime>
     </File>
     <File Include="bin/roslyn/System.IO.Pipes.dll">
-      <publishTime>05/24/2018 13:38:24</publishTime>
+      <publishTime>05/24/2018 21:38:24</publishTime>
     </File>
     <File Include="bin/roslyn/System.Reflection.Metadata.dll">
-      <publishTime>05/24/2018 13:38:24</publishTime>
+      <publishTime>05/24/2018 21:38:24</publishTime>
     </File>
     <File Include="bin/roslyn/System.Security.AccessControl.dll">
-      <publishTime>05/24/2018 13:38:24</publishTime>
+      <publishTime>05/24/2018 21:38:24</publishTime>
     </File>
     <File Include="bin/roslyn/System.Security.Claims.dll">
-      <publishTime>05/24/2018 13:38:24</publishTime>
+      <publishTime>05/24/2018 21:38:24</publishTime>
     </File>
     <File Include="bin/roslyn/System.Security.Cryptography.Algorithms.dll">
-      <publishTime>05/24/2018 13:38:24</publishTime>
+      <publishTime>05/24/2018 21:38:24</publishTime>
     </File>
     <File Include="bin/roslyn/System.Security.Cryptography.Encoding.dll">
-      <publishTime>05/24/2018 13:38:24</publishTime>
+      <publishTime>05/24/2018 21:38:24</publishTime>
     </File>
     <File Include="bin/roslyn/System.Security.Cryptography.Primitives.dll">
-      <publishTime>05/24/2018 13:38:24</publishTime>
+      <publishTime>05/24/2018 21:38:24</publishTime>
     </File>
     <File Include="bin/roslyn/System.Security.Cryptography.X509Certificates.dll">
-      <publishTime>05/24/2018 13:38:24</publishTime>
+      <publishTime>05/24/2018 21:38:24</publishTime>
     </File>
     <File Include="bin/roslyn/System.Security.Principal.Windows.dll">
-      <publishTime>05/24/2018 13:38:24</publishTime>
+      <publishTime>05/24/2018 21:38:24</publishTime>
     </File>
     <File Include="bin/roslyn/System.Text.Encoding.CodePages.dll">
-      <publishTime>05/24/2018 13:38:24</publishTime>
+      <publishTime>05/24/2018 21:38:24</publishTime>
     </File>
     <File Include="bin/roslyn/System.ValueTuple.dll">
-      <publishTime>05/24/2018 13:38:24</publishTime>
+      <publishTime>05/24/2018 21:38:24</publishTime>
     </File>
     <File Include="bin/roslyn/System.Xml.ReaderWriter.dll">
-      <publishTime>05/24/2018 13:38:24</publishTime>
+      <publishTime>05/24/2018 21:38:24</publishTime>
     </File>
     <File Include="bin/roslyn/System.Xml.XmlDocument.dll">
-      <publishTime>05/24/2018 13:38:24</publishTime>
+      <publishTime>05/24/2018 21:38:24</publishTime>
     </File>
     <File Include="bin/roslyn/System.Xml.XPath.dll">
-      <publishTime>05/24/2018 13:38:24</publishTime>
+      <publishTime>05/24/2018 21:38:24</publishTime>
     </File>
     <File Include="bin/roslyn/System.Xml.XPath.XDocument.dll">
-      <publishTime>05/24/2018 13:38:24</publishTime>
+      <publishTime>05/24/2018 21:38:24</publishTime>
     </File>
     <File Include="bin/roslyn/vbc.exe">
-      <publishTime>05/24/2018 13:38:24</publishTime>
+      <publishTime>05/24/2018 21:38:24</publishTime>
     </File>
     <File Include="bin/roslyn/vbc.exe.config">
-      <publishTime>05/24/2018 13:38:24</publishTime>
+      <publishTime>05/24/2018 21:38:24</publishTime>
     </File>
     <File Include="bin/roslyn/vbc.rsp">
-      <publishTime>05/24/2018 13:38:24</publishTime>
+      <publishTime>05/24/2018 21:38:24</publishTime>
     </File>
     <File Include="bin/roslyn/VBCSCompiler.exe">
-      <publishTime>05/24/2018 13:38:24</publishTime>
+      <publishTime>05/24/2018 21:38:24</publishTime>
     </File>
     <File Include="bin/roslyn/VBCSCompiler.exe.config">
-      <publishTime>05/24/2018 13:38:24</publishTime>
+      <publishTime>05/24/2018 21:38:24</publishTime>
     </File>
     <File Include="bin/SgManager.AI.dll">
-      <publishTime>01/25/2024 09:18:40</publishTime>
+      <publishTime>07/17/2024 10:28:48</publishTime>
     </File>
     <File Include="bin/SgManager.AI.dll.config">
-      <publishTime>09/02/2022 17:30:57</publishTime>
+      <publishTime>05/22/2024 09:42:30</publishTime>
     </File>
     <File Include="bin/SgManager.AI.pdb">
-      <publishTime>01/25/2024 09:18:40</publishTime>
+      <publishTime>07/17/2024 10:28:48</publishTime>
     </File>
     <File Include="bin/System.Buffers.dll">
-      <publishTime>02/19/2020 10:05:18</publishTime>
+      <publishTime>02/19/2020 18:05:18</publishTime>
     </File>
     <File Include="bin/System.Configuration.ConfigurationManager.dll">
       <publishTime>08/19/2022 19:55:18</publishTime>
     </File>
     <File Include="bin/System.Diagnostics.DiagnosticSource.dll">
-      <publishTime>04/14/2020 22:49:20</publishTime>
+      <publishTime>04/15/2020 06:49:20</publishTime>
     </File>
     <File Include="bin/System.Memory.dll">
-      <publishTime>02/19/2020 10:05:18</publishTime>
+      <publishTime>02/19/2020 18:05:18</publishTime>
     </File>
     <File Include="bin/System.Net.Http.Formatting.dll">
-      <publishTime>11/28/2018 13:00:36</publishTime>
+      <publishTime>11/28/2018 21:00:36</publishTime>
     </File>
     <File Include="bin/System.Numerics.Vectors.dll">
-      <publishTime>05/15/2018 13:29:44</publishTime>
+      <publishTime>05/15/2018 21:29:44</publishTime>
     </File>
     <File Include="bin/System.Runtime.CompilerServices.Unsafe.dll">
-      <publishTime>02/19/2020 10:05:16</publishTime>
+      <publishTime>02/19/2020 18:05:16</publishTime>
     </File>
     <File Include="bin/System.Web.Cors.dll">
-      <publishTime>11/28/2018 12:58:44</publishTime>
+      <publishTime>11/28/2018 20:58:44</publishTime>
     </File>
     <File Include="bin/System.Web.Helpers.dll">
-      <publishTime>02/01/2018 12:20:56</publishTime>
+      <publishTime>02/01/2018 20:20:56</publishTime>
     </File>
     <File Include="bin/System.Web.Http.Cors.dll">
-      <publishTime>11/28/2018 13:01:26</publishTime>
+      <publishTime>11/28/2018 21:01:26</publishTime>
     </File>
     <File Include="bin/System.Web.Http.dll">
-      <publishTime>11/28/2018 13:01:00</publishTime>
+      <publishTime>11/28/2018 21:01:00</publishTime>
     </File>
     <File Include="bin/System.Web.Http.WebHost.dll">
-      <publishTime>02/01/2018 12:19:26</publishTime>
+      <publishTime>02/01/2018 20:19:26</publishTime>
     </File>
     <File Include="bin/System.Web.Mvc.dll">
-      <publishTime>02/01/2018 12:16:32</publishTime>
+      <publishTime>02/01/2018 20:16:32</publishTime>
     </File>
     <File Include="bin/System.Web.Optimization.dll">
-      <publishTime>02/11/2014 15:26:04</publishTime>
+      <publishTime>02/11/2014 23:26:04</publishTime>
     </File>
     <File Include="bin/System.Web.Razor.dll">
-      <publishTime>02/01/2018 12:16:56</publishTime>
+      <publishTime>02/01/2018 20:16:56</publishTime>
     </File>
     <File Include="bin/System.Web.WebPages.Deployment.dll">
-      <publishTime>02/01/2018 12:20:56</publishTime>
+      <publishTime>02/01/2018 20:20:56</publishTime>
     </File>
     <File Include="bin/System.Web.WebPages.dll">
-      <publishTime>02/01/2018 12:20:56</publishTime>
+      <publishTime>02/01/2018 20:20:56</publishTime>
     </File>
     <File Include="bin/System.Web.WebPages.Razor.dll">
-      <publishTime>02/01/2018 12:20:56</publishTime>
+      <publishTime>02/01/2018 20:20:56</publishTime>
     </File>
     <File Include="bin/ThoughtWorks.QRCode.dll">
-      <publishTime>07/17/2022 11:13:58</publishTime>
+      <publishTime>03/11/2024 11:23:37</publishTime>
     </File>
     <File Include="bin/WebAPI.dll">
-      <publishTime>01/25/2024 09:18:54</publishTime>
+      <publishTime>07/17/2024 10:29:00</publishTime>
     </File>
     <File Include="bin/WebAPI.pdb">
-      <publishTime>01/25/2024 09:18:54</publishTime>
+      <publishTime>07/17/2024 10:29:00</publishTime>
     </File>
     <File Include="bin/WebAPI.xml">
-      <publishTime>01/25/2024 09:18:54</publishTime>
+      <publishTime>07/17/2024 10:29:00</publishTime>
     </File>
     <File Include="bin/WebGrease.dll">
-      <publishTime>01/23/2014 13:57:34</publishTime>
+      <publishTime>01/23/2014 21:57:34</publishTime>
     </File>
     <File Include="bin/zh-Hans/System.Net.Http.Formatting.resources.dll">
-      <publishTime>11/29/2018 13:26:02</publishTime>
+      <publishTime>11/29/2018 21:26:02</publishTime>
     </File>
     <File Include="bin/zh-Hans/System.Web.Helpers.resources.dll">
-      <publishTime>02/01/2018 12:21:00</publishTime>
+      <publishTime>02/01/2018 20:21:00</publishTime>
     </File>
     <File Include="bin/zh-Hans/System.Web.Http.resources.dll">
-      <publishTime>11/29/2018 13:26:30</publishTime>
+      <publishTime>11/29/2018 21:26:30</publishTime>
     </File>
     <File Include="bin/zh-Hans/System.Web.Http.WebHost.resources.dll">
-      <publishTime>02/01/2018 12:19:30</publishTime>
+      <publishTime>02/01/2018 20:19:30</publishTime>
     </File>
     <File Include="bin/zh-Hans/System.Web.Mvc.resources.dll">
-      <publishTime>02/01/2018 12:16:38</publishTime>
+      <publishTime>02/01/2018 20:16:38</publishTime>
     </File>
     <File Include="bin/zh-Hans/System.Web.Optimization.resources.dll">
-      <publishTime>02/11/2014 15:28:40</publishTime>
+      <publishTime>02/11/2014 23:28:40</publishTime>
     </File>
     <File Include="bin/zh-Hans/System.Web.Razor.resources.dll">
-      <publishTime>02/01/2018 12:17:00</publishTime>
+      <publishTime>02/01/2018 20:17:00</publishTime>
     </File>
     <File Include="bin/zh-Hans/System.Web.WebPages.Deployment.resources.dll">
-      <publishTime>02/01/2018 12:21:00</publishTime>
+      <publishTime>02/01/2018 20:21:00</publishTime>
     </File>
     <File Include="bin/zh-Hans/System.Web.WebPages.Razor.resources.dll">
-      <publishTime>02/01/2018 12:21:00</publishTime>
+      <publishTime>02/01/2018 20:21:00</publishTime>
     </File>
     <File Include="bin/zh-Hans/System.Web.WebPages.resources.dll">
-      <publishTime>02/01/2018 12:21:00</publishTime>
+      <publishTime>02/01/2018 20:21:00</publishTime>
     </File>
     <File Include="Content/bootstrap-theme.css">
-      <publishTime>07/17/2022 11:13:58</publishTime>
+      <publishTime>03/11/2024 11:23:37</publishTime>
     </File>
     <File Include="Content/bootstrap-theme.css.map">
-      <publishTime>07/17/2022 11:13:58</publishTime>
+      <publishTime>03/11/2024 11:23:37</publishTime>
     </File>
     <File Include="Content/bootstrap-theme.min.css">
-      <publishTime>07/17/2022 11:13:58</publishTime>
+      <publishTime>03/11/2024 11:23:37</publishTime>
     </File>
     <File Include="Content/bootstrap-theme.min.css.map">
-      <publishTime>07/17/2022 11:13:58</publishTime>
+      <publishTime>03/11/2024 11:23:37</publishTime>
     </File>
     <File Include="Content/bootstrap.css">
-      <publishTime>07/17/2022 11:13:58</publishTime>
+      <publishTime>03/11/2024 11:23:37</publishTime>
     </File>
     <File Include="Content/bootstrap.css.map">
-      <publishTime>07/17/2022 11:13:58</publishTime>
+      <publishTime>03/11/2024 11:23:37</publishTime>
     </File>
     <File Include="Content/bootstrap.min.css">
-      <publishTime>07/17/2022 11:13:58</publishTime>
+      <publishTime>03/11/2024 11:23:37</publishTime>
     </File>
     <File Include="Content/bootstrap.min.css.map">
-      <publishTime>07/17/2022 11:13:58</publishTime>
+      <publishTime>03/11/2024 11:23:37</publishTime>
     </File>
     <File Include="Content/Site.css">
-      <publishTime>07/17/2022 11:13:58</publishTime>
+      <publishTime>03/11/2024 11:23:37</publishTime>
     </File>
     <File Include="ErrLog.txt">
-      <publishTime>07/17/2022 11:13:58</publishTime>
+      <publishTime>03/11/2024 11:23:37</publishTime>
     </File>
     <File Include="favicon.ico">
-      <publishTime>07/17/2022 11:13:58</publishTime>
+      <publishTime>03/11/2024 11:23:37</publishTime>
     </File>
     <File Include="fonts/glyphicons-halflings-regular.eot">
-      <publishTime>07/17/2022 11:13:58</publishTime>
+      <publishTime>03/11/2024 11:23:37</publishTime>
     </File>
     <File Include="fonts/glyphicons-halflings-regular.svg">
-      <publishTime>07/17/2022 11:13:58</publishTime>
+      <publishTime>03/11/2024 11:23:37</publishTime>
     </File>
     <File Include="fonts/glyphicons-halflings-regular.ttf">
-      <publishTime>07/17/2022 11:13:58</publishTime>
+      <publishTime>03/11/2024 11:23:37</publishTime>
     </File>
     <File Include="fonts/glyphicons-halflings-regular.woff">
-      <publishTime>07/17/2022 11:13:58</publishTime>
+      <publishTime>03/11/2024 11:23:37</publishTime>
     </File>
     <File Include="fonts/glyphicons-halflings-regular.woff2">
-      <publishTime>07/17/2022 11:13:58</publishTime>
+      <publishTime>03/11/2024 11:23:37</publishTime>
     </File>
     <File Include="PrecompiledApp.config">
-      <publishTime>01/25/2024 09:19:21</publishTime>
+      <publishTime>07/17/2024 10:29:01</publishTime>
     </File>
     <File Include="Scripts/bootstrap.js">
-      <publishTime>07/17/2022 11:13:58</publishTime>
+      <publishTime>03/11/2024 11:23:37</publishTime>
     </File>
     <File Include="Scripts/bootstrap.min.js">
-      <publishTime>07/17/2022 11:13:58</publishTime>
+      <publishTime>03/11/2024 11:23:37</publishTime>
     </File>
     <File Include="Scripts/jquery-3.3.1.js">
-      <publishTime>07/17/2022 11:13:58</publishTime>
+      <publishTime>03/11/2024 11:23:37</publishTime>
     </File>
     <File Include="Scripts/jquery-3.3.1.min.js">
-      <publishTime>07/17/2022 11:13:58</publishTime>
+      <publishTime>03/11/2024 11:23:37</publishTime>
     </File>
     <File Include="Scripts/jquery-3.3.1.min.map">
-      <publishTime>07/17/2022 11:13:58</publishTime>
+      <publishTime>03/11/2024 11:23:37</publishTime>
     </File>
     <File Include="Scripts/jquery-3.3.1.slim.js">
-      <publishTime>07/17/2022 11:13:58</publishTime>
+      <publishTime>03/11/2024 11:23:37</publishTime>
     </File>
     <File Include="Scripts/jquery-3.3.1.slim.min.js">
-      <publishTime>07/17/2022 11:13:58</publishTime>
+      <publishTime>03/11/2024 11:23:37</publishTime>
     </File>
     <File Include="Scripts/jquery-3.3.1.slim.min.map">
-      <publishTime>07/17/2022 11:13:58</publishTime>
+      <publishTime>03/11/2024 11:23:37</publishTime>
     </File>
     <File Include="Scripts/modernizr-2.8.3.js">
-      <publishTime>07/17/2022 11:13:58</publishTime>
+      <publishTime>03/11/2024 11:23:37</publishTime>
     </File>
     <File Include="Views/Home/Index.cshtml">
-      <publishTime>07/17/2022 11:13:58</publishTime>
+      <publishTime>03/11/2024 11:23:37</publishTime>
     </File>
     <File Include="Views/Shared/Error.cshtml">
-      <publishTime>07/17/2022 11:13:58</publishTime>
+      <publishTime>03/11/2024 11:23:37</publishTime>
     </File>
     <File Include="Views/Shared/_Layout.cshtml">
-      <publishTime>07/17/2022 11:13:58</publishTime>
+      <publishTime>03/11/2024 11:23:37</publishTime>
     </File>
     <File Include="Views/Web.config">
-      <publishTime>08/25/2023 09:56:57</publishTime>
+      <publishTime>03/11/2024 11:23:37</publishTime>
     </File>
     <File Include="Views/_ViewStart.cshtml">
-      <publishTime>07/17/2022 11:13:58</publishTime>
+      <publishTime>03/11/2024 11:23:37</publishTime>
     </File>
     <File Include="Web.config">
-      <publishTime>09/02/2023 10:07:06</publishTime>
+      <publishTime>03/29/2024 10:55:01</publishTime>
     </File>
   </ItemGroup>
 </Project>

SGGL/WebAPI/WebAPI.csproj.user

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <PropertyGroup>
-    <LastActiveSolutionConfig>Release|Any CPU</LastActiveSolutionConfig>
+    <LastActiveSolutionConfig>Debug|Any CPU</LastActiveSolutionConfig>
     <UseIISExpress>true</UseIISExpress>
     <Use64BitIISExpress />
     <IISExpressSSLPort />
@@ -9,7 +9,7 @@
     <IISExpressWindowsAuthentication />
     <IISExpressUseClassicPipelineMode />
     <UseGlobalApplicationHostFile />
-    <NameOfLastUsedPublishProfile>FolderProfile</NameOfLastUsedPublishProfile>
+    <NameOfLastUsedPublishProfile>G:\公司项目\五环\CNCEC_SUBQHSE_WUHUAN\SGGL\WebAPI\Properties\PublishProfiles\FolderProfile.pubxml</NameOfLastUsedPublishProfile>
     <Controller_SelectedScaffolderID>ApiControllerEmptyScaffolder</Controller_SelectedScaffolderID>
     <Controller_SelectedScaffolderCategoryPath>root/Controller</Controller_SelectedScaffolderCategoryPath>
     <WebStackScaffolding_ControllerDialogWidth>600</WebStackScaffolding_ControllerDialogWidth>