From 1b96387adc1d44ff967453227cc4fc7927c1ac57 Mon Sep 17 00:00:00 2001
From: fly-l <1420031550@qq.com>
Date: Thu, 28 Mar 2024 10:18:58 +0800
Subject: [PATCH] =?UTF-8?q?2024-03-28=20=E5=9F=B9=E8=AE=AD=E6=8E=A5?=
 =?UTF-8?q?=E5=8F=A3=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 SGGL/BLL/API/HSSE/APITrainingTaskService.cs   |   2 +-
 SGGL/BLL/BLL.csproj                           |   4 +-
 SGGL/BLL/OpenService/GetDataService.cs        |   2 +-
 SGGL/FineUIPro.Web/ErrLog.txt                 |  21 ++
 .../HSSE/InApproveManager/EquipmentIn.aspx    | 248 +++++++++---------
 .../InApproveManager/EquipmentInItemEdit.aspx |  45 ++++
 .../EquipmentInItemEdit.aspx.designer.cs      |  63 +++++
 .../APIItem/HSSE/TrainingTaskItemItem.cs      |   2 +-
 8 files changed, 259 insertions(+), 128 deletions(-)

diff --git a/SGGL/BLL/API/HSSE/APITrainingTaskService.cs b/SGGL/BLL/API/HSSE/APITrainingTaskService.cs
index 41709ef3..3518b1b5 100644
--- a/SGGL/BLL/API/HSSE/APITrainingTaskService.cs
+++ b/SGGL/BLL/API/HSSE/APITrainingTaskService.cs
@@ -80,7 +80,7 @@ namespace BLL
                                         PlanId = x.PlanId,
 										StartTime = x.StartTime,
 										EndTime =x.EndTime,
-										LearnTime=x.LearnTime,
+										LearningTime=x.LearnTime,
 										VideoProgress = x.VideoProgress,
                                         PersonId = x.PersonId,
                                         TrainingItemCode = x.TrainingItemCode,
diff --git a/SGGL/BLL/BLL.csproj b/SGGL/BLL/BLL.csproj
index ed68de8b..133a65d1 100644
--- a/SGGL/BLL/BLL.csproj
+++ b/SGGL/BLL/BLL.csproj
@@ -150,8 +150,8 @@
     <Reference Include="Microsoft.CSharp" />
     <Reference Include="System.Data" />
     <Reference Include="System.Xml" />
-    <Reference Include="ThoughtWorks.QRCode">
-      <HintPath>..\..\..\..\五环施工平台\SGGL_CWCEC\SGGL\BLL\bin\Debug\ThoughtWorks.QRCode.dll</HintPath>
+    <Reference Include="ThoughtWorks.QRCode, Version=1.0.4778.30637, Culture=neutral, processorArchitecture=MSIL">
+      <HintPath>..\packages\ThoughtWorks.QRCode.1.1.0\lib\ThoughtWorks.QRCode.dll</HintPath>
     </Reference>
     <Reference Include="WindowsBase" />
   </ItemGroup>
diff --git a/SGGL/BLL/OpenService/GetDataService.cs b/SGGL/BLL/OpenService/GetDataService.cs
index f18016c6..981e0671 100644
--- a/SGGL/BLL/OpenService/GetDataService.cs
+++ b/SGGL/BLL/OpenService/GetDataService.cs
@@ -39,7 +39,7 @@ namespace BLL
                                     PersonId = item.UserId,
                                     TrainingItemCode = dataItem.TrainingItemCode,
                                     TrainingItemName = dataItem.TrainingItemName,
-									LearnTime = dataItem.LearnTime,
+									LearnTime = dataItem.LearningTime,
                                     AttachUrl = dataItem.AttachUrl,
                                 };
 
diff --git a/SGGL/FineUIPro.Web/ErrLog.txt b/SGGL/FineUIPro.Web/ErrLog.txt
index 50e4f8e5..5c6e5f29 100644
--- a/SGGL/FineUIPro.Web/ErrLog.txt
+++ b/SGGL/FineUIPro.Web/ErrLog.txt
@@ -1690,3 +1690,24 @@ IP地址:::1
 
 出错时间:02/02/2024 15:29:25
 
+
+错误信息开始=====>
+错误类型:HttpCompileException
+错误信息:d:\数据\诺必达\成达\test\sggl_cd\SGGL\FineUIPro.Web\HSSE\InApproveManager\EquipmentIn.aspx(141): error CS1061: “ASP.hsse_inapprovemanager_equipmentin_aspx”不包含“btnMenuIsIn_Click”的定义，并且找不到可接受类型为“ASP.hsse_inapprovemanager_equipmentin_aspx”的第一个参数的扩展方法“btnMenuIsIn_Click”(是否缺少 using 指令或程序集引用?)
+错误堆栈:
+   在 System.Web.Compilation.BuildManager.CompileWebFile(VirtualPath virtualPath)
+   在 System.Web.Compilation.BuildManager.GetVPathBuildResultInternal(VirtualPath virtualPath, Boolean noBuild, Boolean allowCrossApp, Boolean allowBuildInPrecompile, Boolean throwIfNotFound, Boolean ensureIsUpToDate)
+   在 System.Web.Compilation.BuildManager.GetVPathBuildResultWithNoAssert(HttpContext context, VirtualPath virtualPath, Boolean noBuild, Boolean allowCrossApp, Boolean allowBuildInPrecompile, Boolean throwIfNotFound, Boolean ensureIsUpToDate)
+   在 System.Web.Compilation.BuildManager.GetVirtualPathObjectFactory(VirtualPath virtualPath, HttpContext context, Boolean allowCrossApp, Boolean throwIfNotFound)
+   在 System.Web.Compilation.BuildManager.CreateInstanceFromVirtualPath(VirtualPath virtualPath, Type requiredBaseType, HttpContext context, Boolean allowCrossApp)
+   在 System.Web.UI.PageHandlerFactory.GetHandlerHelper(HttpContext context, String requestType, VirtualPath virtualPath, String physicalPath)
+   在 System.Web.UI.PageHandlerFactory.GetHandler(HttpContext context, String requestType, String virtualPath, String path)
+   在 System.Web.HttpApplication.MaterializeHandlerExecutionStep.System.Web.HttpApplication.IExecutionStep.Execute()
+   在 System.Web.HttpApplication.ExecuteStepImpl(IExecutionStep step)
+   在 System.Web.HttpApplication.ExecuteStep(IExecutionStep step, Boolean& completedSynchronously)
+出错时间:03/21/2024 15:24:09
+出错文件:http://localhost:1295/HSSE/InApproveManager/EquipmentIn.aspx
+IP地址:::1
+
+出错时间:03/21/2024 15:24:09
+
diff --git a/SGGL/FineUIPro.Web/HSSE/InApproveManager/EquipmentIn.aspx b/SGGL/FineUIPro.Web/HSSE/InApproveManager/EquipmentIn.aspx
index 0b2273b1..859c858e 100644
--- a/SGGL/FineUIPro.Web/HSSE/InApproveManager/EquipmentIn.aspx
+++ b/SGGL/FineUIPro.Web/HSSE/InApproveManager/EquipmentIn.aspx
@@ -8,43 +8,41 @@
 </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" EnableColumnLines="true" DataKeyNames="EquipmentInItemId,EquipmentInId" ForceFit="true"
-                DataIDField="EquipmentInItemId" AllowSorting="true" SortField="EquipmentInCode" SortDirection="DESC" OnSort="Grid1_Sort"
-                AllowPaging="true" IsDatabasePaging="true" PageSize="10" OnPageIndexChange="Grid1_PageIndexChange"
-                EnableRowDoubleClickEvent="true" OnRowDoubleClick="Grid1_RowDoubleClick" EnableTextSelection="True">
-                <Toolbars>
-                    <f:Toolbar ID="Toolbar2" Position="Top" runat="server" ToolbarAlign="Left">
-                        <Items>
-                            <f:ToolbarFill ID="ToolbarFill1" runat="server">
-                            </f:ToolbarFill>
-                            <f:Button ID="btnNew" ToolTip="新增" Icon="Add" EnablePostBack="false" Hidden="true" Text="新增"
-                                runat="server">
-                            </f:Button>                 
-                            <f:Button ID="btnOut" OnClick="btnOut_Click" runat="server" ToolTip="导出" Icon="FolderUp" Text="导出"
-                                EnableAjax="false" DisableControlBeforePostBack="false">
-                            </f:Button>
-                        </Items>
-                    </f:Toolbar>
-                </Toolbars>
-                <Columns>
-                    <f:TemplateField ColumnID="tfNumber" Width="50px" HeaderText="序号" HeaderTextAlign="Center"
-                        TextAlign="Center">
-                        <ItemTemplate>
-                            <asp:Label ID="labNumber" runat="server" Text='<%# Grid1.PageIndex * Grid1.PageSize + Container.DataItemIndex + 1 %>'></asp:Label>
-                        </ItemTemplate>
-                    </f:TemplateField>
-                    <%--<f:RenderField Width="120px" ColumnID="EquipmentInCode" DataField="EquipmentInCode"
+        <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" EnableColumnLines="true" DataKeyNames="EquipmentInItemId,EquipmentInId" ForceFit="true"
+                    DataIDField="EquipmentInItemId" AllowSorting="true" SortField="EquipmentInCode" SortDirection="DESC" OnSort="Grid1_Sort"
+                    AllowPaging="true" IsDatabasePaging="true" PageSize="10" OnPageIndexChange="Grid1_PageIndexChange"
+                    EnableRowDoubleClickEvent="true" OnRowDoubleClick="Grid1_RowDoubleClick" EnableTextSelection="True">
+                    <Toolbars>
+                        <f:Toolbar ID="Toolbar2" Position="Top" runat="server" ToolbarAlign="Left">
+                            <Items>
+                                <f:ToolbarFill ID="ToolbarFill1" runat="server">
+                                </f:ToolbarFill>
+                                <f:Button ID="btnNew" ToolTip="新增" Icon="Add" EnablePostBack="false" Hidden="true" Text="新增"
+                                    runat="server">
+                                </f:Button>
+                                <f:Button ID="btnOut" OnClick="btnOut_Click" runat="server" ToolTip="导出" Icon="FolderUp" Text="导出"
+                                    EnableAjax="false" DisableControlBeforePostBack="false">
+                                </f:Button>
+                            </Items>
+                        </f:Toolbar>
+                    </Toolbars>
+                    <Columns>
+                        <f:TemplateField ColumnID="tfNumber" Width="50px" HeaderText="序号" HeaderTextAlign="Center"
+                            TextAlign="Center">
+                            <ItemTemplate>
+                                <asp:Label ID="labNumber" runat="server" Text='<%# Grid1.PageIndex * Grid1.PageSize + Container.DataItemIndex + 1 %>'></asp:Label>
+                            </ItemTemplate>
+                        </f:TemplateField>
+                        <%--<f:RenderField Width="120px" ColumnID="EquipmentInCode" DataField="EquipmentInCode"
                         SortField="EquipmentInCode" FieldType="String" HeaderText="编号" HeaderTextAlign="Center"
                         TextAlign="Left">
                     </f:RenderField>
-                    <f:RenderField Width="250px" ColumnID="UnitName" DataField="UnitName" SortField="UnitName"
-                        FieldType="String" HeaderText="单位名称" HeaderTextAlign="Center" TextAlign="Left">
-                    </f:RenderField>
+                   
                     <f:RenderField Width="150px" ColumnID="CarNumber" DataField="CarNumber" SortField="CarNumber"
                         FieldType="String" HeaderText="车牌号" HeaderTextAlign="Center" TextAlign="Left">
                     </f:RenderField>
@@ -52,103 +50,107 @@
                         SortField="SubProjectName" FieldType="String" HeaderText="分包工程" HeaderTextAlign="Center"
                         TextAlign="Left">
                     </f:RenderField>--%>
-                     <f:RenderField Width="150px" ColumnID="CarNumber" DataField="CarNumber" SortField="CarNumber"
-                        FieldType="String" HeaderText="车牌号" HeaderTextAlign="Center" TextAlign="Left">
-                    </f:RenderField>
-                    <f:TemplateField ColumnID="tfSpecialEquipmentId" HeaderText="设备" Width="100px" HeaderTextAlign="Center">
-                                <ItemTemplate>
-                                    <asp:Label ID="lblSpecialEquipmentId" runat="server" Text='<%#ConvertEqiupment(Eval("SpecialEquipmentId")) %>'></asp:Label>
-                                </ItemTemplate>
-                            </f:TemplateField>
-                            <f:RenderField Width="100px" ColumnID="SizeModel" DataField="SizeModel" SortField="SizeModel"
-                                FieldType="String" HeaderText="规格型号" HeaderTextAlign="Center" TextAlign="Left">
-                            </f:RenderField>
-                            <f:RenderField Width="140px" ColumnID="OwnerCheck" DataField="OwnerCheck" SortField="OwnerCheck"
-                                FieldType="String" HeaderText="进场前自查自检情况" HeaderTextAlign="Center" TextAlign="Left">
-                            </f:RenderField>
-                            <f:RenderField Width="130px" ColumnID="CertificateNum" DataField="CertificateNum"
-                                SortField="CertificateNum" FieldType="String" HeaderText="施工设备合格证号" HeaderTextAlign="Center"
-                                TextAlign="Left">
-                            </f:RenderField>
-                            <f:RenderField Width="130px" ColumnID="SafetyInspectionNum" DataField="SafetyInspectionNum"
-                                SortField="SafetyInspectionNum" FieldType="String" HeaderText="安全检验合格证号" HeaderTextAlign="Center"
-                                TextAlign="Left">
-                            </f:RenderField>
-                            <f:RenderField Width="100px" ColumnID="DrivingLicenseNum" DataField="DrivingLicenseNum"
-                                SortField="DrivingLicenseNum" FieldType="String" HeaderText="驾驶证号" HeaderTextAlign="Center"
-                                TextAlign="Left">
-                            </f:RenderField>
-                            <f:RenderField Width="100px" ColumnID="RegistrationNum" DataField="RegistrationNum"
-                                SortField="RegistrationNum" FieldType="String" HeaderText="行驶证号" HeaderTextAlign="Center"
-                                TextAlign="Left">
-                            </f:RenderField>
-                            <f:RenderField Width="120px" ColumnID="OperationQualificationNum" DataField="OperationQualificationNum"
-                                SortField="OperationQualificationNum" FieldType="String" HeaderText="操作资质证号"
-                                HeaderTextAlign="Center" TextAlign="Left">
-                            </f:RenderField>
-                            <f:RenderField Width="100px" ColumnID="InsuranceNum" DataField="InsuranceNum" SortField="InsuranceNum"
-                                FieldType="String" HeaderText="交险保单号" HeaderTextAlign="Center" TextAlign="Left">
-                            </f:RenderField>
-                            <f:RenderField Width="100px" ColumnID="CommercialInsuranceNum" DataField="CommercialInsuranceNum"
-                                SortField="CommercialInsuranceNum" FieldType="String" HeaderText="商业险保单号" HeaderTextAlign="Center"
-                                TextAlign="Left">
-                            </f:RenderField>
+                        <f:RenderField Width="250px" ColumnID="UnitName" DataField="UnitName" SortField="UnitName"
+                                       FieldType="String" HeaderText="单位名称" HeaderTextAlign="Center" TextAlign="Left">
+                        </f:RenderField>
+                        <f:TemplateField ColumnID="tfSpecialEquipmentId" HeaderText="设备名称" Width="100px" HeaderTextAlign="Center">
+                            <ItemTemplate>
+                                <asp:Label ID="lblSpecialEquipmentId" runat="server" Text='<%#ConvertEqiupment(Eval("SpecialEquipmentId")) %>'></asp:Label>
+                            </ItemTemplate>
+                        </f:TemplateField>
+                        <f:RenderField Width="100px" ColumnID="SizeModel" DataField="SizeModel" SortField="SizeModel"
+                                       FieldType="String" HeaderText="规格型号" HeaderTextAlign="Center" TextAlign="Left">
+                        </f:RenderField>
+                        <f:RenderField Width="150px" ColumnID="CarNumber" DataField="CarNumber" SortField="CarNumber"
+                            FieldType="String" HeaderText="车牌号" HeaderTextAlign="Center" TextAlign="Left">
+                        </f:RenderField>
+
+                        <f:RenderField Width="140px" ColumnID="OwnerCheck" DataField="OwnerCheck" SortField="OwnerCheck"
+                            FieldType="String" HeaderText="进场前自查自检情况" HeaderTextAlign="Center" TextAlign="Left">
+                        </f:RenderField>
+                        <f:RenderField Width="130px" ColumnID="CertificateNum" DataField="CertificateNum"
+                            SortField="CertificateNum" FieldType="String" HeaderText="施工设备合格证号" HeaderTextAlign="Center"
+                            TextAlign="Left">
+                        </f:RenderField>
+                        <f:RenderField Width="130px" ColumnID="SafetyInspectionNum" DataField="SafetyInspectionNum"
+                            SortField="SafetyInspectionNum" FieldType="String" HeaderText="安全检验合格证号" HeaderTextAlign="Center"
+                            TextAlign="Left">
+                        </f:RenderField>
+                        <f:RenderField Width="100px" ColumnID="DrivingLicenseNum" DataField="DrivingLicenseNum"
+                            SortField="DrivingLicenseNum" FieldType="String" HeaderText="驾驶证号" HeaderTextAlign="Center"
+                            TextAlign="Left">
+                        </f:RenderField>
+                        <f:RenderField Width="100px" ColumnID="RegistrationNum" DataField="RegistrationNum"
+                            SortField="RegistrationNum" FieldType="String" HeaderText="行驶证号" HeaderTextAlign="Center"
+                            TextAlign="Left">
+                        </f:RenderField>
+                        <f:RenderField Width="120px" ColumnID="OperationQualificationNum" DataField="OperationQualificationNum"
+                            SortField="OperationQualificationNum" FieldType="String" HeaderText="操作资质证号"
+                            HeaderTextAlign="Center" TextAlign="Left">
+                        </f:RenderField>
+                        <f:RenderField Width="100px" ColumnID="InsuranceNum" DataField="InsuranceNum" SortField="InsuranceNum"
+                            FieldType="String" HeaderText="交险保单号" HeaderTextAlign="Center" TextAlign="Left">
+                        </f:RenderField>
+                        <f:RenderField Width="100px" ColumnID="CommercialInsuranceNum" DataField="CommercialInsuranceNum"
+                            SortField="CommercialInsuranceNum" FieldType="String" HeaderText="商业险保单号" HeaderTextAlign="Center"
+                            TextAlign="Left">
+                        </f:RenderField>
                         <f:CheckBoxField Width="60px" SortField="IsUsed" RenderAsStaticField="true" DataField="IsUsed"
                             HeaderText="在用" HeaderTextAlign="Center" TextAlign="Center">
                         </f:CheckBoxField>
-                     <f:CheckBoxField Width="60px" SortField="IsIn" RenderAsStaticField="true" DataField="IsIn"
+                        <f:CheckBoxField Width="60px" SortField="IsIn" RenderAsStaticField="true" DataField="IsIn"
                             HeaderText="在场" HeaderTextAlign="Center" TextAlign="Center">
                         </f:CheckBoxField>
-                <%--    <f:WindowField TextAlign="Left" Width="160px" WindowID="WindowAtt" HeaderText="附件"
+                        <%--    <f:WindowField TextAlign="Left" Width="160px" WindowID="WindowAtt" HeaderText="附件"
                         Text="详细" ToolTip="附件上传查看" DataIFrameUrlFields="EquipmentInId" DataIFrameUrlFormatString="~/AttachFile/webuploader.aspx?toKeyId={0}&path=FileUpload/EquipmentInAttachUrl&menuId=3E167389-4775-4AC3-9D31-2E570682EDA1"
                         IFrameUrl="~/alert.aspx" ExpandUnusedSpace="True" HeaderTextAlign="Center" />--%>
-                </Columns>
-                <Listeners>
-                    <f:Listener Event="beforerowcontextmenu" Handler="onRowContextMenu" />
-                </Listeners>
-                <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>
-                </PageItems>
-            </f:Grid>
-        </Items>
-    </f:Panel>
-    <f:Window ID="Window1" Title="特种设备机具管理" Hidden="true" EnableIFrame="true" EnableMaximize="true"
-        Target="Parent" EnableResize="false" runat="server" OnClose="Window1_Close" IsModal="true"
-        Width="1024px" Height="600px">
-    </f:Window>
-    <f:Window ID="WindowAtt" Title="附件" Hidden="true" EnableIFrame="true" EnableMaximize="true"
-        Target="Parent" EnableResize="false" runat="server" IsModal="true" Width="700px"
-        Height="500px">
-    </f:Window>
-    <f:Menu ID="Menu1" runat="server">
-        <f:MenuButton ID="btnMenuEdit" OnClick="btnMenuEdit_Click" Icon="Pencil" EnablePostBack="true"
-            Hidden="true" runat="server" Text="编辑">
-        </f:MenuButton>
-        <f:MenuButton ID="btnMenuIsUsed" OnClick="btnMenuIsUsed_Click" Icon="ArrowUp" EnablePostBack="true"
-            Hidden="true" runat="server" Text="在用">
-        </f:MenuButton>
-      
-        <f:MenuButton ID="btnMenuIsNotUsed" OnClick="btnMenuIsNotUsed_Click" Icon="ArrowDown" EnablePostBack="true"
-            Hidden="true" runat="server" Text="不在用">
-        </f:MenuButton>
+                    </Columns>
+                    <Listeners>
+                        <f:Listener Event="beforerowcontextmenu" Handler="onRowContextMenu" />
+                    </Listeners>
+                    <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>
+                    </PageItems>
+                </f:Grid>
+            </Items>
+        </f:Panel>
+        <f:Window ID="Window1" Title="特种设备机具管理" Hidden="true" EnableIFrame="true" EnableMaximize="true"
+            Target="Parent" EnableResize="false" runat="server" OnClose="Window1_Close" IsModal="true"
+            Width="1024px" Height="600px">
+        </f:Window>
+        <f:Window ID="WindowAtt" Title="附件" Hidden="true" EnableIFrame="true" EnableMaximize="true"
+            Target="Parent" EnableResize="false" runat="server" IsModal="true" Width="700px"
+            Height="500px">
+        </f:Window>
+        <f:Menu ID="Menu1" runat="server">
+            <f:MenuButton ID="btnMenuEdit" OnClick="btnMenuEdit_Click" Icon="Pencil" EnablePostBack="true"
+                Hidden="true" runat="server" Text="编辑">
+            </f:MenuButton>
+            <f:MenuButton ID="btnMenuIsUsed" OnClick="btnMenuIsUsed_Click" Icon="ArrowUp" EnablePostBack="true"
+                Hidden="true" runat="server" Text="在用">
+            </f:MenuButton>
 
-        <f:MenuButton ID="btnMenuIsIn" OnClick="btnMenuIsIn_Click" Icon="ArrowUp" EnablePostBack="true"
-            Hidden="true" runat="server" Text="在场">
-        </f:MenuButton>
-           <f:MenuButton ID="btnMenuIsNotIn" OnClick="btnMenuIsNotIn_Click" Icon="ArrowDown" EnablePostBack="true"
-            Hidden="true" runat="server" Text="出场">
-        </f:MenuButton>
-        <f:MenuButton ID="btnMenuDelete" OnClick="btnMenuDelete_Click" EnablePostBack="true"
-            Hidden="true" Icon="Delete" ConfirmText="删除选中行？" ConfirmTarget="Parent" runat="server"
-            Text="删除">
-        </f:MenuButton>
-    </f:Menu>
+            <f:MenuButton ID="btnMenuIsNotUsed" OnClick="btnMenuIsNotUsed_Click" Icon="ArrowDown" EnablePostBack="true"
+                Hidden="true" runat="server" Text="不在用">
+            </f:MenuButton>
+
+            <f:MenuButton ID="btnMenuIsIn" OnClick="btnMenuIsIn_Click" Icon="ArrowUp" EnablePostBack="true"
+                Hidden="true" runat="server" Text="在场">
+            </f:MenuButton>
+            <f:MenuButton ID="btnMenuIsNotIn" OnClick="btnMenuIsNotIn_Click" Icon="ArrowDown" EnablePostBack="true"
+                Hidden="true" runat="server" Text="出场">
+            </f:MenuButton>
+            <f:MenuButton ID="btnMenuDelete" OnClick="btnMenuDelete_Click" EnablePostBack="true"
+                Hidden="true" Icon="Delete" ConfirmText="删除选中行？" ConfirmTarget="Parent" runat="server"
+                Text="删除">
+            </f:MenuButton>
+        </f:Menu>
     </form>
     <script type="text/javascript">
         var menuID = '<%= Menu1.ClientID %>';
diff --git a/SGGL/FineUIPro.Web/HSSE/InApproveManager/EquipmentInItemEdit.aspx b/SGGL/FineUIPro.Web/HSSE/InApproveManager/EquipmentInItemEdit.aspx
index 2f4b7cd1..c72a15c8 100644
--- a/SGGL/FineUIPro.Web/HSSE/InApproveManager/EquipmentInItemEdit.aspx
+++ b/SGGL/FineUIPro.Web/HSSE/InApproveManager/EquipmentInItemEdit.aspx
@@ -27,6 +27,19 @@
                     </f:TextBox>
                 </Items>
             </f:FormRow>
+       
+            <f:FormRow>
+                <Items>
+                    <f:DatePicker runat="server" ID="dt1" Label="设备资质有效期"  LabelAlign="Right" MaxLength="50" LabelWidth="150px"/>
+                </Items>
+            </f:FormRow>
+            <f:FormRow>
+                <Items>
+                    <f:DatePicker runat="server" ID="DatePicker1" Label="进场时间"  LabelAlign="Right" MaxLength="50" LabelWidth="150px"/>
+                </Items>
+            </f:FormRow>
+            
+          
             <f:FormRow>
                 <Items>
                     <f:TextBox ID="txtOwnerCheck" runat="server" Label="进场前自查自检情况" LabelAlign="Right"
@@ -69,6 +82,12 @@
                     </f:TextBox>
                 </Items>
             </f:FormRow>
+            <f:FormRow>
+                <Items>
+                    <f:TextBox ID="TextBox1" runat="server" Label="保额"  LabelAlign="Right" MaxLength="50" LabelWidth="150px">
+                    </f:TextBox>
+                </Items>
+            </f:FormRow>
             <f:FormRow>
                 <Items>
                     <f:TextBox ID="txtInsuranceNum" runat="server" Label="交险保单号" LabelAlign="Right" MaxLength="50" LabelWidth="150px">
@@ -82,6 +101,32 @@
                     </f:TextBox>
                 </Items>
             </f:FormRow>
+            <f:FormRow>
+                <Items>
+                    <f:TextBox ID="TextBox2" runat="server" Label="操作人员姓名" LabelAlign="Right"
+                               MaxLength="50" LabelWidth="150px">
+                    </f:TextBox>
+                </Items>
+            </f:FormRow>
+            <f:FormRow>
+                <Items>
+                    <f:TextBox ID="TextBox3" runat="server" Label="操作人员身份证号" LabelAlign="Right"
+                               MaxLength="50" LabelWidth="150px">
+                    </f:TextBox>
+                </Items>
+            </f:FormRow>
+            <f:FormRow>
+                <Items>
+                    <f:DatePicker runat="server" ID="DatePicker2" Label="操作人员资质有效期"  LabelAlign="Right" MaxLength="50" LabelWidth="150px"/>
+                </Items>
+            </f:FormRow>
+            <f:FormRow>
+                <Items>
+                    <f:TextBox ID="TextBox4" runat="server" Label="发证部门" LabelAlign="Right"
+                               MaxLength="50" LabelWidth="150px">
+                    </f:TextBox>
+                </Items>
+            </f:FormRow>
             <f:FormRow>
                 <Items>
                     <f:CheckBox runat="server" ID="cbIsUsed" LabelWidth="150px" LabelAlign="Right" Label="在用"></f:CheckBox>
diff --git a/SGGL/FineUIPro.Web/HSSE/InApproveManager/EquipmentInItemEdit.aspx.designer.cs b/SGGL/FineUIPro.Web/HSSE/InApproveManager/EquipmentInItemEdit.aspx.designer.cs
index 42013c8a..284fd539 100644
--- a/SGGL/FineUIPro.Web/HSSE/InApproveManager/EquipmentInItemEdit.aspx.designer.cs
+++ b/SGGL/FineUIPro.Web/HSSE/InApproveManager/EquipmentInItemEdit.aspx.designer.cs
@@ -59,6 +59,24 @@ namespace FineUIPro.Web.HSSE.InApproveManager
         /// </remarks>
         protected global::FineUIPro.TextBox txtSizeModel;
 
+        /// <summary>
+        /// dt1 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.DatePicker dt1;
+
+        /// <summary>
+        /// DatePicker1 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.DatePicker DatePicker1;
+
         /// <summary>
         /// txtOwnerCheck 控件。
         /// </summary>
@@ -113,6 +131,15 @@ namespace FineUIPro.Web.HSSE.InApproveManager
         /// </remarks>
         protected global::FineUIPro.TextBox txtOperationQualificationNum;
 
+        /// <summary>
+        /// TextBox1 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.TextBox TextBox1;
+
         /// <summary>
         /// txtInsuranceNum 控件。
         /// </summary>
@@ -131,6 +158,42 @@ namespace FineUIPro.Web.HSSE.InApproveManager
         /// </remarks>
         protected global::FineUIPro.TextBox txtCommercialInsuranceNum;
 
+        /// <summary>
+        /// TextBox2 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.TextBox TextBox2;
+
+        /// <summary>
+        /// TextBox3 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.TextBox TextBox3;
+
+        /// <summary>
+        /// DatePicker2 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.DatePicker DatePicker2;
+
+        /// <summary>
+        /// TextBox4 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.TextBox TextBox4;
+
         /// <summary>
         /// cbIsUsed 控件。
         /// </summary>
diff --git a/SGGL/Model/APIItem/HSSE/TrainingTaskItemItem.cs b/SGGL/Model/APIItem/HSSE/TrainingTaskItemItem.cs
index 924a8faa..1e290bfa 100644
--- a/SGGL/Model/APIItem/HSSE/TrainingTaskItemItem.cs
+++ b/SGGL/Model/APIItem/HSSE/TrainingTaskItemItem.cs
@@ -93,7 +93,7 @@ namespace Model
 			get;
 			set;
 		}
-		public int? LearnTime
+		public int? LearningTime
 		{
 			get;
 			set;