zhanghj
/
ChengDa_English
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'master' of http://47.104.102.122:3000/lpf/sggl_cd

This commit is contained in:
李超 2024-03-28 10:20:40 +08:00
parent 138692e94b 1b96387adc
commit 53473b9f66
8 changed files with 259 additions and 128 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
SGGL/BLL/API/HSSE/APITrainingTaskService.cs
View File

@ -80,7 +80,7 @@ namespace BLL
PlanId = x.PlanId, PlanId = x.PlanId,
StartTime = x.StartTime, StartTime = x.StartTime,
EndTime =x.EndTime, EndTime =x.EndTime,
LearnTime=x.LearnTime, LearningTime=x.LearnTime,
VideoProgress = x.VideoProgress, VideoProgress = x.VideoProgress,
PersonId = x.PersonId, PersonId = x.PersonId,
TrainingItemCode = x.TrainingItemCode, TrainingItemCode = x.TrainingItemCode,

4
SGGL/BLL/BLL.csproj
View File

@ -150,8 +150,8 @@
<Reference Include="Microsoft.CSharp" /> <Reference Include="Microsoft.CSharp" />
<Reference Include="System.Data" /> <Reference Include="System.Data" />
<Reference Include="System.Xml" /> <Reference Include="System.Xml" />
<Reference Include="ThoughtWorks.QRCode"> <Reference Include="ThoughtWorks.QRCode, Version=1.0.4778.30637, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\..\..\..\五环施工平台\SGGL_CWCEC\SGGL\BLL\bin\Debug\ThoughtWorks.QRCode.dll</HintPath> <HintPath>..\packages\ThoughtWorks.QRCode.1.1.0\lib\ThoughtWorks.QRCode.dll</HintPath>
</Reference> </Reference>
<Reference Include="WindowsBase" /> <Reference Include="WindowsBase" />
</ItemGroup> </ItemGroup>

2
SGGL/BLL/OpenService/GetDataService.cs
View File

@ -39,7 +39,7 @@ namespace BLL
PersonId = item.UserId, PersonId = item.UserId,
TrainingItemCode = dataItem.TrainingItemCode, TrainingItemCode = dataItem.TrainingItemCode,
TrainingItemName = dataItem.TrainingItemName, TrainingItemName = dataItem.TrainingItemName,
LearnTime = dataItem.LearnTime, LearnTime = dataItem.LearningTime,
AttachUrl = dataItem.AttachUrl, AttachUrl = dataItem.AttachUrl,
}; };

21
SGGL/FineUIPro.Web/ErrLog.txt
View File

@ -1690,3 +1690,24 @@ IP地址:::1
出错时间:02/02/2024 15:29:25 出错时间: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

246
SGGL/FineUIPro.Web/HSSE/InApproveManager/EquipmentIn.aspx
View File

@ -8,43 +8,41 @@
</head> </head>
<body> <body>
<form id="form1" runat="server"> <form id="form1" runat="server">
<f:PageManager ID="PageManager1" AutoSizePanelID="Panel1" runat="server" /> <f:PageManager ID="PageManager1" AutoSizePanelID="Panel1" runat="server" />
<f:Panel ID="Panel1" runat="server" Margin="5px" BodyPadding="5px" ShowBorder="false" <f:Panel ID="Panel1" runat="server" Margin="5px" BodyPadding="5px" ShowBorder="false"
ShowHeader="false" Layout="VBox" BoxConfigAlign="Stretch"> ShowHeader="false" Layout="VBox" BoxConfigAlign="Stretch">
<Items> <Items>
<f:Grid ID="Grid1" ShowBorder="true" ShowHeader="false" Title="特种设备机具管理" EnableCollapse="true" <f:Grid ID="Grid1" ShowBorder="true" ShowHeader="false" Title="特种设备机具管理" EnableCollapse="true"
runat="server" BoxFlex="1" EnableColumnLines="true" DataKeyNames="EquipmentInItemId,EquipmentInId" ForceFit="true" runat="server" BoxFlex="1" EnableColumnLines="true" DataKeyNames="EquipmentInItemId,EquipmentInId" ForceFit="true"
DataIDField="EquipmentInItemId" AllowSorting="true" SortField="EquipmentInCode" SortDirection="DESC" OnSort="Grid1_Sort" DataIDField="EquipmentInItemId" AllowSorting="true" SortField="EquipmentInCode" SortDirection="DESC" OnSort="Grid1_Sort"
AllowPaging="true" IsDatabasePaging="true" PageSize="10" OnPageIndexChange="Grid1_PageIndexChange" AllowPaging="true" IsDatabasePaging="true" PageSize="10" OnPageIndexChange="Grid1_PageIndexChange"
EnableRowDoubleClickEvent="true" OnRowDoubleClick="Grid1_RowDoubleClick" EnableTextSelection="True"> EnableRowDoubleClickEvent="true" OnRowDoubleClick="Grid1_RowDoubleClick" EnableTextSelection="True">
<Toolbars> <Toolbars>
<f:Toolbar ID="Toolbar2" Position="Top" runat="server" ToolbarAlign="Left"> <f:Toolbar ID="Toolbar2" Position="Top" runat="server" ToolbarAlign="Left">
<Items> <Items>
<f:ToolbarFill ID="ToolbarFill1" runat="server"> <f:ToolbarFill ID="ToolbarFill1" runat="server">
</f:ToolbarFill> </f:ToolbarFill>
<f:Button ID="btnNew" ToolTip="新增" Icon="Add" EnablePostBack="false" Hidden="true" Text="新增" <f:Button ID="btnNew" ToolTip="新增" Icon="Add" EnablePostBack="false" Hidden="true" Text="新增"
runat="server"> runat="server">
</f:Button> </f:Button>
<f:Button ID="btnOut" OnClick="btnOut_Click" runat="server" ToolTip="导出" Icon="FolderUp" Text="导出" <f:Button ID="btnOut" OnClick="btnOut_Click" runat="server" ToolTip="导出" Icon="FolderUp" Text="导出"
EnableAjax="false" DisableControlBeforePostBack="false"> EnableAjax="false" DisableControlBeforePostBack="false">
</f:Button> </f:Button>
</Items> </Items>
</f:Toolbar> </f:Toolbar>
</Toolbars> </Toolbars>
<Columns> <Columns>
<f:TemplateField ColumnID="tfNumber" Width="50px" HeaderText="序号" HeaderTextAlign="Center" <f:TemplateField ColumnID="tfNumber" Width="50px" HeaderText="序号" HeaderTextAlign="Center"
TextAlign="Center"> TextAlign="Center">
<ItemTemplate> <ItemTemplate>
<asp:Label ID="labNumber" runat="server" Text='<%# Grid1.PageIndex * Grid1.PageSize + Container.DataItemIndex + 1 %>'></asp:Label> <asp:Label ID="labNumber" runat="server" Text='<%# Grid1.PageIndex * Grid1.PageSize + Container.DataItemIndex + 1 %>'></asp:Label>
</ItemTemplate> </ItemTemplate>
</f:TemplateField> </f:TemplateField>
<%--<f:RenderField Width="120px" ColumnID="EquipmentInCode" DataField="EquipmentInCode" <%--<f:RenderField Width="120px" ColumnID="EquipmentInCode" DataField="EquipmentInCode"
SortField="EquipmentInCode" FieldType="String" HeaderText="编号" HeaderTextAlign="Center" SortField="EquipmentInCode" FieldType="String" HeaderText="编号" HeaderTextAlign="Center"
TextAlign="Left"> TextAlign="Left">
</f:RenderField> </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" <f:RenderField Width="150px" ColumnID="CarNumber" DataField="CarNumber" SortField="CarNumber"
FieldType="String" HeaderText="车牌号" HeaderTextAlign="Center" TextAlign="Left"> FieldType="String" HeaderText="车牌号" HeaderTextAlign="Center" TextAlign="Left">
</f:RenderField> </f:RenderField>
@ -52,103 +50,107 @@
SortField="SubProjectName" FieldType="String" HeaderText="分包工程" HeaderTextAlign="Center" SortField="SubProjectName" FieldType="String" HeaderText="分包工程" HeaderTextAlign="Center"
TextAlign="Left"> TextAlign="Left">
</f:RenderField>--%> </f:RenderField>--%>
<f:RenderField Width="150px" ColumnID="CarNumber" DataField="CarNumber" SortField="CarNumber" <f:RenderField Width="250px" ColumnID="UnitName" DataField="UnitName" SortField="UnitName"
FieldType="String" HeaderText="车牌号" HeaderTextAlign="Center" TextAlign="Left"> FieldType="String" HeaderText="单位名称" HeaderTextAlign="Center" TextAlign="Left">
</f:RenderField> </f:RenderField>
<f:TemplateField ColumnID="tfSpecialEquipmentId" HeaderText="设备" Width="100px" HeaderTextAlign="Center"> <f:TemplateField ColumnID="tfSpecialEquipmentId" HeaderText="设备名称" Width="100px" HeaderTextAlign="Center">
<ItemTemplate> <ItemTemplate>
<asp:Label ID="lblSpecialEquipmentId" runat="server" Text='<%#ConvertEqiupment(Eval("SpecialEquipmentId")) %>'></asp:Label> <asp:Label ID="lblSpecialEquipmentId" runat="server" Text='<%#ConvertEqiupment(Eval("SpecialEquipmentId")) %>'></asp:Label>
</ItemTemplate> </ItemTemplate>
</f:TemplateField> </f:TemplateField>
<f:RenderField Width="100px" ColumnID="SizeModel" DataField="SizeModel" SortField="SizeModel" <f:RenderField Width="100px" ColumnID="SizeModel" DataField="SizeModel" SortField="SizeModel"
FieldType="String" HeaderText="规格型号" HeaderTextAlign="Center" TextAlign="Left"> FieldType="String" HeaderText="规格型号" HeaderTextAlign="Center" TextAlign="Left">
</f:RenderField> </f:RenderField>
<f:RenderField Width="140px" ColumnID="OwnerCheck" DataField="OwnerCheck" SortField="OwnerCheck" <f:RenderField Width="150px" ColumnID="CarNumber" DataField="CarNumber" SortField="CarNumber"
FieldType="String" HeaderText="进场前自查自检情况" HeaderTextAlign="Center" TextAlign="Left"> FieldType="String" HeaderText="车牌号" HeaderTextAlign="Center" TextAlign="Left">
</f:RenderField> </f:RenderField>
<f:RenderField Width="130px" ColumnID="CertificateNum" DataField="CertificateNum"
SortField="CertificateNum" FieldType="String" HeaderText="施工设备合格证号" HeaderTextAlign="Center" <f:RenderField Width="140px" ColumnID="OwnerCheck" DataField="OwnerCheck" SortField="OwnerCheck"
TextAlign="Left"> FieldType="String" HeaderText="进场前自查自检情况" HeaderTextAlign="Center" TextAlign="Left">
</f:RenderField> </f:RenderField>
<f:RenderField Width="130px" ColumnID="SafetyInspectionNum" DataField="SafetyInspectionNum" <f:RenderField Width="130px" ColumnID="CertificateNum" DataField="CertificateNum"
SortField="SafetyInspectionNum" FieldType="String" HeaderText="安全检验合格证号" HeaderTextAlign="Center" SortField="CertificateNum" FieldType="String" HeaderText="施工设备合格证号" HeaderTextAlign="Center"
TextAlign="Left"> TextAlign="Left">
</f:RenderField> </f:RenderField>
<f:RenderField Width="100px" ColumnID="DrivingLicenseNum" DataField="DrivingLicenseNum" <f:RenderField Width="130px" ColumnID="SafetyInspectionNum" DataField="SafetyInspectionNum"
SortField="DrivingLicenseNum" FieldType="String" HeaderText="驾驶证号" HeaderTextAlign="Center" SortField="SafetyInspectionNum" FieldType="String" HeaderText="安全检验合格证号" HeaderTextAlign="Center"
TextAlign="Left"> TextAlign="Left">
</f:RenderField> </f:RenderField>
<f:RenderField Width="100px" ColumnID="RegistrationNum" DataField="RegistrationNum" <f:RenderField Width="100px" ColumnID="DrivingLicenseNum" DataField="DrivingLicenseNum"
SortField="RegistrationNum" FieldType="String" HeaderText="行驶证号" HeaderTextAlign="Center" SortField="DrivingLicenseNum" FieldType="String" HeaderText="驾驶证号" HeaderTextAlign="Center"
TextAlign="Left"> TextAlign="Left">
</f:RenderField> </f:RenderField>
<f:RenderField Width="120px" ColumnID="OperationQualificationNum" DataField="OperationQualificationNum" <f:RenderField Width="100px" ColumnID="RegistrationNum" DataField="RegistrationNum"
SortField="OperationQualificationNum" FieldType="String" HeaderText="操作资质证号" SortField="RegistrationNum" FieldType="String" HeaderText="行驶证号" HeaderTextAlign="Center"
HeaderTextAlign="Center" TextAlign="Left"> TextAlign="Left">
</f:RenderField> </f:RenderField>
<f:RenderField Width="100px" ColumnID="InsuranceNum" DataField="InsuranceNum" SortField="InsuranceNum" <f:RenderField Width="120px" ColumnID="OperationQualificationNum" DataField="OperationQualificationNum"
FieldType="String" HeaderText="交险保单号" HeaderTextAlign="Center" TextAlign="Left"> SortField="OperationQualificationNum" FieldType="String" HeaderText="操作资质证号"
</f:RenderField> HeaderTextAlign="Center" TextAlign="Left">
<f:RenderField Width="100px" ColumnID="CommercialInsuranceNum" DataField="CommercialInsuranceNum" </f:RenderField>
SortField="CommercialInsuranceNum" FieldType="String" HeaderText="商业险保单号" HeaderTextAlign="Center" <f:RenderField Width="100px" ColumnID="InsuranceNum" DataField="InsuranceNum" SortField="InsuranceNum"
TextAlign="Left"> FieldType="String" HeaderText="交险保单号" HeaderTextAlign="Center" TextAlign="Left">
</f:RenderField> </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" <f:CheckBoxField Width="60px" SortField="IsUsed" RenderAsStaticField="true" DataField="IsUsed"
HeaderText="在用" HeaderTextAlign="Center" TextAlign="Center"> HeaderText="在用" HeaderTextAlign="Center" TextAlign="Center">
</f:CheckBoxField> </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"> HeaderText="在场" HeaderTextAlign="Center" TextAlign="Center">
</f:CheckBoxField> </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" 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" />--%> IFrameUrl="~/alert.aspx" ExpandUnusedSpace="True" HeaderTextAlign="Center" />--%>
</Columns> </Columns>
<Listeners> <Listeners>
<f:Listener Event="beforerowcontextmenu" Handler="onRowContextMenu" /> <f:Listener Event="beforerowcontextmenu" Handler="onRowContextMenu" />
</Listeners> </Listeners>
<PageItems> <PageItems>
<f:ToolbarSeparator ID="ToolbarSeparator1" runat="server"> <f:ToolbarSeparator ID="ToolbarSeparator1" runat="server">
</f:ToolbarSeparator> </f:ToolbarSeparator>
<f:ToolbarText ID="ToolbarText1" runat="server" Text="每页记录数："> <f:ToolbarText ID="ToolbarText1" runat="server" Text="每页记录数：">
</f:ToolbarText> </f:ToolbarText>
<f:DropDownList runat="server" ID="ddlPageSize" Width="80px" AutoPostBack="true" <f:DropDownList runat="server" ID="ddlPageSize" Width="80px" AutoPostBack="true"
OnSelectedIndexChanged="ddlPageSize_SelectedIndexChanged"> OnSelectedIndexChanged="ddlPageSize_SelectedIndexChanged">
</f:DropDownList> </f:DropDownList>
</PageItems> </PageItems>
</f:Grid> </f:Grid>
</Items> </Items>
</f:Panel> </f:Panel>
<f:Window ID="Window1" Title="特种设备机具管理" Hidden="true" EnableIFrame="true" EnableMaximize="true" <f:Window ID="Window1" Title="特种设备机具管理" Hidden="true" EnableIFrame="true" EnableMaximize="true"
Target="Parent" EnableResize="false" runat="server" OnClose="Window1_Close" IsModal="true" Target="Parent" EnableResize="false" runat="server" OnClose="Window1_Close" IsModal="true"
Width="1024px" Height="600px"> Width="1024px" Height="600px">
</f:Window> </f:Window>
<f:Window ID="WindowAtt" Title="附件" Hidden="true" EnableIFrame="true" EnableMaximize="true" <f:Window ID="WindowAtt" Title="附件" Hidden="true" EnableIFrame="true" EnableMaximize="true"
Target="Parent" EnableResize="false" runat="server" IsModal="true" Width="700px" Target="Parent" EnableResize="false" runat="server" IsModal="true" Width="700px"
Height="500px"> Height="500px">
</f:Window> </f:Window>
<f:Menu ID="Menu1" runat="server"> <f:Menu ID="Menu1" runat="server">
<f:MenuButton ID="btnMenuEdit" OnClick="btnMenuEdit_Click" Icon="Pencil" EnablePostBack="true" <f:MenuButton ID="btnMenuEdit" OnClick="btnMenuEdit_Click" Icon="Pencil" EnablePostBack="true"
Hidden="true" runat="server" Text="编辑"> Hidden="true" runat="server" Text="编辑">
</f:MenuButton> </f:MenuButton>
<f:MenuButton ID="btnMenuIsUsed" OnClick="btnMenuIsUsed_Click" Icon="ArrowUp" EnablePostBack="true" <f:MenuButton ID="btnMenuIsUsed" OnClick="btnMenuIsUsed_Click" Icon="ArrowUp" EnablePostBack="true"
Hidden="true" runat="server" Text="在用"> Hidden="true" runat="server" Text="在用">
</f:MenuButton> </f:MenuButton>
<f:MenuButton ID="btnMenuIsNotUsed" OnClick="btnMenuIsNotUsed_Click" Icon="ArrowDown" EnablePostBack="true" <f:MenuButton ID="btnMenuIsNotUsed" OnClick="btnMenuIsNotUsed_Click" Icon="ArrowDown" EnablePostBack="true"
Hidden="true" runat="server" Text="不在用"> Hidden="true" runat="server" Text="不在用">
</f:MenuButton> </f:MenuButton>
<f:MenuButton ID="btnMenuIsIn" OnClick="btnMenuIsIn_Click" Icon="ArrowUp" EnablePostBack="true" <f:MenuButton ID="btnMenuIsIn" OnClick="btnMenuIsIn_Click" Icon="ArrowUp" EnablePostBack="true"
Hidden="true" runat="server" Text="在场"> Hidden="true" runat="server" Text="在场">
</f:MenuButton> </f:MenuButton>
<f:MenuButton ID="btnMenuIsNotIn" OnClick="btnMenuIsNotIn_Click" Icon="ArrowDown" EnablePostBack="true" <f:MenuButton ID="btnMenuIsNotIn" OnClick="btnMenuIsNotIn_Click" Icon="ArrowDown" EnablePostBack="true"
Hidden="true" runat="server" Text="出场"> Hidden="true" runat="server" Text="出场">
</f:MenuButton> </f:MenuButton>
<f:MenuButton ID="btnMenuDelete" OnClick="btnMenuDelete_Click" EnablePostBack="true" <f:MenuButton ID="btnMenuDelete" OnClick="btnMenuDelete_Click" EnablePostBack="true"
Hidden="true" Icon="Delete" ConfirmText="删除选中行？" ConfirmTarget="Parent" runat="server" Hidden="true" Icon="Delete" ConfirmText="删除选中行？" ConfirmTarget="Parent" runat="server"
Text="删除"> Text="删除">
</f:MenuButton> </f:MenuButton>
</f:Menu> </f:Menu>
</form> </form>
<script type="text/javascript"> <script type="text/javascript">
var menuID = '<%= Menu1.ClientID %>'; var menuID = '<%= Menu1.ClientID %>';

45
SGGL/FineUIPro.Web/HSSE/InApproveManager/EquipmentInItemEdit.aspx
View File

@ -27,6 +27,19 @@
</f:TextBox> </f:TextBox>
</Items> </Items>
</f:FormRow> </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> <f:FormRow>
<Items> <Items>
<f:TextBox ID="txtOwnerCheck" runat="server" Label="进场前自查自检情况" LabelAlign="Right" <f:TextBox ID="txtOwnerCheck" runat="server" Label="进场前自查自检情况" LabelAlign="Right"
@ -69,6 +82,12 @@
</f:TextBox> </f:TextBox>
</Items> </Items>
</f:FormRow> </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> <f:FormRow>
<Items> <Items>
<f:TextBox ID="txtInsuranceNum" runat="server" Label="交险保单号" LabelAlign="Right" MaxLength="50" LabelWidth="150px"> <f:TextBox ID="txtInsuranceNum" runat="server" Label="交险保单号" LabelAlign="Right" MaxLength="50" LabelWidth="150px">
@ -82,6 +101,32 @@
</f:TextBox> </f:TextBox>
</Items> </Items>
</f:FormRow> </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> <f:FormRow>
<Items> <Items>
<f:CheckBox runat="server" ID="cbIsUsed" LabelWidth="150px" LabelAlign="Right" Label="在用"></f:CheckBox> <f:CheckBox runat="server" ID="cbIsUsed" LabelWidth="150px" LabelAlign="Right" Label="在用"></f:CheckBox>

63
SGGL/FineUIPro.Web/HSSE/InApproveManager/EquipmentInItemEdit.aspx.designer.cs generated
View File

@ -59,6 +59,24 @@ namespace FineUIPro.Web.HSSE.InApproveManager
/// </remarks> /// </remarks>
protected global::FineUIPro.TextBox txtSizeModel; 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> /// <summary>
/// txtOwnerCheck 控件。 /// txtOwnerCheck 控件。
/// </summary> /// </summary>
@ -113,6 +131,15 @@ namespace FineUIPro.Web.HSSE.InApproveManager
/// </remarks> /// </remarks>
protected global::FineUIPro.TextBox txtOperationQualificationNum; protected global::FineUIPro.TextBox txtOperationQualificationNum;
/// <summary>
/// TextBox1 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.TextBox TextBox1;
/// <summary> /// <summary>
/// txtInsuranceNum 控件。 /// txtInsuranceNum 控件。
/// </summary> /// </summary>
@ -131,6 +158,42 @@ namespace FineUIPro.Web.HSSE.InApproveManager
/// </remarks> /// </remarks>
protected global::FineUIPro.TextBox txtCommercialInsuranceNum; 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> /// <summary>
/// cbIsUsed 控件。 /// cbIsUsed 控件。
/// </summary> /// </summary>

2
SGGL/Model/APIItem/HSSE/TrainingTaskItemItem.cs
View File

@ -93,7 +93,7 @@ namespace Model
get; get;
set; set;
} }
public int? LearnTime public int? LearningTime
{ {
get; get;
set; set;