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

2024-03-28 培训接口修改

This commit is contained in:
李鹏飞 2024-03-28 10:18:58 +08:00
parent 3d64b164e2
commit 1b96387adc
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,
StartTime = x.StartTime,
EndTime =x.EndTime,
LearnTime=x.LearnTime,
LearningTime=x.LearnTime,
VideoProgress = x.VideoProgress,
PersonId = x.PersonId,
TrainingItemCode = x.TrainingItemCode,

4
SGGL/BLL/BLL.csproj
View File

@ -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>

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

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

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

@ -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

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

@ -42,9 +42,7 @@
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,10 +50,10 @@
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 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">
<f:TemplateField ColumnID="tfSpecialEquipmentId" HeaderText="设备名称" Width="100px" HeaderTextAlign="Center">
<ItemTemplate>
<asp:Label ID="lblSpecialEquipmentId" runat="server" Text='<%#ConvertEqiupment(Eval("SpecialEquipmentId")) %>'></asp:Label>
</ItemTemplate>
@ -63,6 +61,10 @@
<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>

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

@ -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>

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

@ -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>

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

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