lpf/SGGL_SHJ
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

20230904 wbs维度数据仓库实现

Browse Source
This commit is contained in:
杨红卫
2023-09-04 17:13:55 +08:00
parent e1e1d5394a
commit 78871bae92
21 changed files with 950 additions and 223 deletions
Download Patch File Download Diff File Expand all files Collapse all files
SGGL/FineUIPro.Web/HSSE/Accident/AccidentPersonRecord.aspx
+3 -3
View File
@@ -47,7 +47,7 @@
<Columns>
<f:RowNumberField EnablePagingNumber="true" HeaderText="序号" Width="50px" HeaderTextAlign="Center"
TextAlign="Center" />
<f:RenderField Width="120px" ColumnID="AccidentTypeName" DataField="AccidentTypeName"
<f:RenderField Width="110px" ColumnID="AccidentTypeName" DataField="AccidentTypeName"
SortField="AccidentTypeName" FieldType="String" HeaderText="事故类型" HeaderTextAlign="Center"
TextAlign="Left">
</f:RenderField>
@@ -61,7 +61,7 @@
<f:RenderField Width="90px" ColumnID="PersonName" DataField="PersonName" SortField="PersonName"
FieldType="String" HeaderText="人员" HeaderTextAlign="Center" TextAlign="Left">
</f:RenderField>
<f:RenderField Width="90px" ColumnID="CardNo" DataField="CardNo" SortField="CardNo"
<f:RenderField Width="110px" ColumnID="CardNo" DataField="CardNo" SortField="CardNo"
FieldType="String" HeaderText="卡号" HeaderTextAlign="Center" TextAlign="Left">
</f:RenderField>
<%-- <f:RenderField Width="160px" ColumnID="IdentityCard" DataField="IdentityCard" SortField="IdentityCard"
@@ -113,7 +113,7 @@
</f:Panel>
<f:Window ID="Window1" Title="HSE事故(对人员)记录" Hidden="true" EnableIFrame="true" EnableMaximize="true"
Target="Parent" EnableResize="false" runat="server" IsModal="true" Width="1200px"
Height="600px">
Height="650px">
</f:Window>
<f:Menu ID="Menu1" runat="server">
<f:MenuButton ID="btnMenuEdit" OnClick="btnMenuEdit_Click" Icon="Pencil" EnablePostBack="true"
SGGL/FineUIPro.Web/HSSE/Accident/AccidentPersonRecordEdit.aspx
+114 -102
View File
@@ -12,108 +12,120 @@
</head>
<body>
<form id="form1" runat="server">
<f:PageManager ID="PageManager1" runat="server" AutoSizePanelID="SimpleForm1"/>
<f:Form ID="SimpleForm1" ShowBorder="false" ShowHeader="false" Title="HSE事故(对人员)记录"
AutoScroll="true" BodyPadding="10px" runat="server" RedStarPosition="BeforeText"
LabelAlign="Right">
<Rows>
<f:FormRow>
<Items>
<f:TextBox ID="txtProjectName" runat="server" Label="项目" LabelAlign="Right" MaxLength="50" LabelWidth="110px"
Readonly="true">
</f:TextBox>
</Items>
</f:FormRow>
<f:FormRow>
<Items>
<f:DropDownList ID="drpWorkAreaId" runat="server" Label="单位工程" LabelAlign="Right"
EnableEdit="true" Required="true" ShowRedStar="true" LabelWidth="110px">
</f:DropDownList>
<f:DatePicker ID="txtAccidentDate" runat="server" Label="发生时间" LabelAlign="Right"
EnableEdit="true" Required="true" ShowRedStar="true" LabelWidth="110px">
</f:DatePicker>
<f:DropDownList ID="drpAccidentTypeId" runat="server" Label="事故类别" LabelAlign="Right"
EnableEdit="true" Required="true" ShowRedStar="true" LabelWidth="110px">
</f:DropDownList>
<f:CheckBox runat="server" ID="ckIsAttempt" Label="未遂"> </f:CheckBox>
</Items>
</f:FormRow>
<f:FormRow>
<Items>
<f:DropDownList ID="drpPersonId" runat="server" Label="人员姓名" LabelAlign="Right" EnableEdit="true"
Required="true" ShowRedStar="true" LabelWidth="110px">
</f:DropDownList>
<f:DropDownList ID="drpInjury" runat="server" Label="伤害情况" LabelAlign="Right" EnableEdit="true" LabelWidth="110px">
</f:DropDownList>
<f:TextBox ID="txtInjuryPart" runat="server" Label="受伤部位" LabelAlign="Right" MaxLength="50" LabelWidth="110px">
</f:TextBox>
<f:TextBox ID="txtHssePersons" runat="server" Label="责任区安全员" LabelAlign="Right" MaxLength="50" LabelWidth="110px">
</f:TextBox>
</Items>
</f:FormRow>
<f:FormRow>
<Items>
<f:TextArea ID="txtInjuryResult" runat="server" Label="事故经过及原因" LabelAlign="Right"
MaxLength="500" Height="50px">
</f:TextArea>
</Items>
</f:FormRow>
<f:FormRow>
<Items>
<f:TextArea ID="txtPreventiveAction" runat="server" Label="预防事故重复发生的措施" LabelAlign="Right"
MaxLength="500" Height="50px">
</f:TextArea>
</Items>
</f:FormRow>
<f:FormRow>
<Items>
<f:TextArea ID="txtHandleOpinion" runat="server" Label="处理意见" LabelAlign="Right"
MaxLength="500" Height="50px">
</f:TextArea>
</Items>
</f:FormRow>
<f:FormRow>
<Items>
<f:HtmlEditor runat="server" Label="事故报告" ID="txtFileContents" ShowLabel="false"
Editor="UMEditor" BasePath="~/res/umeditor/" ToolbarSet="Full" Height="200" LabelAlign="Right">
</f:HtmlEditor>
</Items>
</f:FormRow>
<f:FormRow>
<Items>
<f:ContentPanel ID="ContentPanel1" runat="server" ShowHeader="false" EnableCollapse="true"
BodyPadding="0px">
<uc1:FlowOperateControl ID="ctlAuditFlow" runat="server" />
</f:ContentPanel>
</Items>
</f:FormRow>
</Rows>
<Toolbars>
<f:Toolbar ID="Toolbar1" Position="Bottom" ToolbarAlign="Right" runat="server">
<Items>
<f:Label runat="server" ID="lbTemp">
</f:Label>
<f:Button ID="btnAttachUrl" Text="附件" ToolTip="附件上传及查看" Icon="TableCell" runat="server"
OnClick="btnAttachUrl_Click" ValidateForms="SimpleForm1">
</f:Button>
<f:ToolbarFill ID="ToolbarFill1" runat="server">
</f:ToolbarFill>
<f:Button ID="btnSave" Icon="SystemSave" runat="server" Text="保存" ValidateForms="SimpleForm1"
OnClick="btnSave_Click">
</f:Button>
<f:Button ID="btnSubmit" Icon="SystemSaveNew" runat="server" Text="提交" ValidateForms="SimpleForm1"
OnClick="btnSubmit_Click">
</f:Button>
<f:Button ID="btnClose" EnablePostBack="false" Text="关闭" runat="server" Icon="SystemClose">
</f:Button>
</Items>
</f:Toolbar>
</Toolbars>
</f:Form>
<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:PageManager ID="PageManager1" runat="server" AutoSizePanelID="SimpleForm1" />
<f:Form ID="SimpleForm1" ShowBorder="false" ShowHeader="false" Title="HSE事故(对人员)记录"
AutoScroll="true" BodyPadding="10px" runat="server" RedStarPosition="BeforeText"
LabelAlign="Right" LabelWidth="110px" EnableTableStyle="true">
<Rows>
<f:FormRow>
<Items>
<f:TextBox ID="txtProjectName" runat="server" Label="项目" LabelAlign="Right" MaxLength="50"
Readonly="true" Hidden="true">
</f:TextBox>
</Items>
</f:FormRow>
<f:FormRow>
<Items>
<f:DropDownList ID="drpWorkAreaId" runat="server" Label="单位工程" LabelAlign="Right"
EnableEdit="true" Required="true" ShowRedStar="true" >
</f:DropDownList>
<f:DatePicker ID="txtAccidentDate" runat="server" Label="发生时间" LabelAlign="Right"
EnableEdit="true" Required="true" ShowRedStar="true" >
</f:DatePicker>
<f:DropDownList ID="drpAccidentTypeId" runat="server" Label="事故类别" LabelAlign="Right"
EnableEdit="true" Required="true" ShowRedStar="true" >
</f:DropDownList>
</Items>
</f:FormRow>
<f:FormRow>
<Items>
<f:DropDownList ID="drpPersonId" runat="server" Label="人员姓名" LabelAlign="Right" EnableEdit="true"
Required="true" ShowRedStar="true" >
</f:DropDownList>
<f:DropDownList ID="drpInjury" runat="server" Label="伤害情况" LabelAlign="Right" EnableEdit="true" >
</f:DropDownList>
<f:TextBox ID="txtInjuryPart" runat="server" Label="受伤部位" LabelAlign="Right" MaxLength="50" >
</f:TextBox>
</Items>
</f:FormRow>
<f:FormRow ColumnWidths="33% 50% 5% 10%">
<Items>
<f:TextBox ID="txtHssePersons" runat="server" Label="责任区安全员" LabelAlign="Right" MaxLength="50" >
</f:TextBox>
<f:Label runat="server" ID="txtWorkPackageName" Label="分部分项工程" ShowRedStar="true" LabelWidth="120px"></f:Label>
<f:Button ID="btSearch" ToolTip="选择" Icon="SystemSearch" runat="server" OnClick="btSearch_Click">
</f:Button>
<f:CheckBox runat="server" ID="ckIsAttempt" Label="未遂"></f:CheckBox>
<f:TextBox runat="server" ID="hdWorkPackageId" Hidden="true"></f:TextBox>
</Items>
</f:FormRow>
<f:FormRow>
<Items>
<f:TextArea ID="txtInjuryResult" runat="server" Label="事故经过及原因" LabelAlign="Right"
MaxLength="500" Height="40px">
</f:TextArea>
</Items>
</f:FormRow>
<f:FormRow>
<Items>
<f:TextArea ID="txtPreventiveAction" runat="server" Label="预防事故重复发生的措施" LabelAlign="Right"
MaxLength="500" Height="40px">
</f:TextArea>
</Items>
</f:FormRow>
<f:FormRow>
<Items>
<f:TextArea ID="txtHandleOpinion" runat="server" Label="处理意见" LabelAlign="Right"
MaxLength="500" Height="40px">
</f:TextArea>
</Items>
</f:FormRow>
<f:FormRow>
<Items>
<f:HtmlEditor runat="server" Label="事故报告" ID="txtFileContents" ShowLabel="false"
Editor="UMEditor" BasePath="~/res/umeditor/" ToolbarSet="Full" Height="160" LabelAlign="Right">
</f:HtmlEditor>
</Items>
</f:FormRow>
<f:FormRow>
<Items>
<f:ContentPanel ID="ContentPanel1" runat="server" ShowHeader="false" EnableCollapse="true"
BodyPadding="0px">
<uc1:FlowOperateControl ID="ctlAuditFlow" runat="server" />
</f:ContentPanel>
</Items>
</f:FormRow>
</Rows>
<Toolbars>
<f:Toolbar ID="Toolbar1" Position="Bottom" ToolbarAlign="Right" runat="server">
<Items>
<f:Label runat="server" ID="lbTemp">
</f:Label>
<f:Button ID="btnAttachUrl" Text="附件" ToolTip="附件上传及查看" Icon="TableCell" runat="server"
OnClick="btnAttachUrl_Click" ValidateForms="SimpleForm1">
</f:Button>
<f:ToolbarFill ID="ToolbarFill1" runat="server">
</f:ToolbarFill>
<f:Button ID="btnSave" Icon="SystemSave" runat="server" Text="保存" ValidateForms="SimpleForm1"
OnClick="btnSave_Click">
</f:Button>
<f:Button ID="btnSubmit" Icon="SystemSaveNew" runat="server" Text="提交" ValidateForms="SimpleForm1"
OnClick="btnSubmit_Click">
</f:Button>
<f:Button ID="btnClose" EnablePostBack="false" Text="关闭" runat="server" Icon="SystemClose">
</f:Button>
</Items>
</f:Toolbar>
</Toolbars>
</f:Form>
<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:Window ID="Window1" Title="WBS" Hidden="true" EnableIFrame="true" EnableMaximize="true"
Target="Self" EnableResize="false" runat="server" IsModal="true" OnClose="Window1_Close"
Width="800px" Height="650px">
</f:Window>
</form>
</body>
</html>
SGGL/FineUIPro.Web/HSSE/Accident/AccidentPersonRecordEdit.aspx.cs
+22 -1
View File
@@ -102,6 +102,9 @@ namespace FineUIPro.Web.HSSE.Accident
{
this.ckIsAttempt.Checked = true;
}
this.hdWorkPackageId.Text = accidentPersonRecord.WorkPackageId;
this.txtWorkPackageName.Text= accidentPersonRecord.WorkPackageName;
}
}
else
@@ -239,6 +242,8 @@ namespace FineUIPro.Web.HSSE.Accident
accidentPersonRecord.CompileMan = this.CurrUser.PersonId;
accidentPersonRecord.CompileDate = DateTime.Now;
accidentPersonRecord.States = BLL.Const.State_0;
accidentPersonRecord.WorkPackageName = this.txtWorkPackageName.Text;
accidentPersonRecord.WorkPackageId = this.hdWorkPackageId.Text;
if (type == BLL.Const.BtnSubmit)
{
var flowOperate = Funs.DB.Sys_FlowOperate.FirstOrDefault(x => x.DataId == this.AccidentPersonRecordId && x.State == BLL.Const.State_2 && x.IsClosed == true);
@@ -259,7 +264,7 @@ namespace FineUIPro.Web.HSSE.Accident
}
else
{
this.AccidentPersonRecordId = SQLHelper.GetNewID(typeof(Model.Accident_AccidentPersonRecord));
this.AccidentPersonRecordId = SQLHelper.GetNewID();
accidentPersonRecord.AccidentPersonRecordId = this.AccidentPersonRecordId;
BLL.AccidentPersonRecordService.AddAccidentPersonRecord(accidentPersonRecord);
BLL.LogService.AddSys_Log(this.CurrUser, string.Empty, this.AccidentPersonRecordId, BLL.Const.ProjectAccidentPersonRecordMenuId, Const.BtnAdd);
@@ -299,5 +304,21 @@ namespace FineUIPro.Web.HSSE.Accident
PageContext.RegisterStartupScript(WindowAtt.GetShowReference(String.Format("~/AttachFile/webuploader.aspx?toKeyId={0}&path=FileUpload/AccidentPersonRecordAttachUrl&menuId={1}", this.AccidentPersonRecordId, BLL.Const.ProjectAccidentPersonRecordMenuId)));
}
#endregion
protected void btSearch_Click(object sender, EventArgs e)
{
PageContext.RegisterStartupScript(Window1.GetSaveStateReference(hdWorkPackageId.ClientID)
+ Window1.GetShowReference(String.Format("~/DigData/ShowProjectWBS.aspx?levle={0}", 3, "选择WBS - ")));
}
protected void Window1_Close(object sender, WindowCloseEventArgs e)
{
var getReturnValues = Funs.GetStrListByStr(this.hdWorkPackageId.Text, '&');
if (getReturnValues.Count() > 1)
{
this.hdWorkPackageId.Text = getReturnValues[0].ToString();
this.txtWorkPackageName.Text = getReturnValues[1].ToString();
}
}
}
}
SGGL/FineUIPro.Web/HSSE/Accident/AccidentPersonRecordEdit.aspx.designer.cs
Generated
+45 -9
View File
@@ -77,15 +77,6 @@ namespace FineUIPro.Web.HSSE.Accident
/// </remarks>
protected global::FineUIPro.DropDownList drpAccidentTypeId;
/// <summary>
/// ckIsAttempt 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.CheckBox ckIsAttempt;
/// <summary>
/// drpPersonId 控件。
/// </summary>
@@ -122,6 +113,42 @@ namespace FineUIPro.Web.HSSE.Accident
/// </remarks>
protected global::FineUIPro.TextBox txtHssePersons;
/// <summary>
/// txtWorkPackageName 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Label txtWorkPackageName;
/// <summary>
/// btSearch 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Button btSearch;
/// <summary>
/// ckIsAttempt 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.CheckBox ckIsAttempt;
/// <summary>
/// hdWorkPackageId 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.TextBox hdWorkPackageId;
/// <summary>
/// txtInjuryResult 控件。
/// </summary>
@@ -247,5 +274,14 @@ namespace FineUIPro.Web.HSSE.Accident
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Window WindowAtt;
/// <summary>
/// Window1 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Window Window1;
}
}
SGGL/FineUIPro.Web/HSSE/Accident/AccidentPersonRecordView.aspx
+14 -8
View File
@@ -31,8 +31,7 @@
Readonly="true">
</f:TextBox>
<f:TextBox ID="txtAccidentDate" runat="server" Label="发生时间" LabelAlign="Right" Readonly="true" LabelWidth="110px">
</f:TextBox>
<f:CheckBox runat="server" ID="ckIsAttempt" Label="未遂" Readonly="true"> </f:CheckBox>
</f:TextBox>
</Items>
</f:FormRow>
<f:FormRow>
@@ -42,36 +41,43 @@
<f:TextBox ID="txtInjury" runat="server" Label="伤害情况" LabelAlign="Right" Readonly="true" LabelWidth="110px">
</f:TextBox>
<f:TextBox ID="txtInjuryPart" runat="server" Label="受伤部位" LabelAlign="Right" Readonly="true" LabelWidth="110px">
</f:TextBox>
</Items>
</f:FormRow>
<f:FormRow>
<Items>
<f:TextBox ID="txtHssePersons" runat="server" Label="责任区安全员" LabelAlign="Right" Readonly="true" LabelWidth="110px">
</f:TextBox>
<f:TextBox ID="txtHssePersons" runat="server" Label="责任区安全员" LabelAlign="Right" Readonly="true" LabelWidth="110px">
</f:TextBox>
<f:TextBox runat="server" ID="txtWorkPackageName" Label="分部分项工程" Readonly="true" LabelWidth="120px"></f:TextBox>
<f:CheckBox runat="server" ID="ckIsAttempt" Label="未遂" Readonly="true"> </f:CheckBox>
</Items>
</f:FormRow>
<f:FormRow>
<Items>
<f:TextArea ID="txtInjuryResult" runat="server" Label="事故经过及原因" LabelAlign="Right"
Readonly="true" Height="50px">
Readonly="true" Height="40px">
</f:TextArea>
</Items>
</f:FormRow>
<f:FormRow>
<Items>
<f:TextArea ID="txtPreventiveAction" runat="server" Label="预防事故重复发生的措施" LabelAlign="Right"
Readonly="true" Height="50px">
Readonly="true" Height="40px">
</f:TextArea>
</Items>
</f:FormRow>
<f:FormRow>
<Items>
<f:TextArea ID="txtHandleOpinion" runat="server" Label="处理意见" LabelAlign="Right"
Readonly="true" Height="50px">
Readonly="true" Height="40px">
</f:TextArea>
</Items>
</f:FormRow>
<f:FormRow>
<Items>
<f:HtmlEditor runat="server" Label="事故报告" ID="txtFileContents" ShowLabel="false"
Editor="UMEditor" BasePath="~/res/umeditor/" ToolbarSet="Full" Height="200" LabelAlign="Right">
Editor="UMEditor" BasePath="~/res/umeditor/" ToolbarSet="Full" Height="160" LabelAlign="Right">
</f:HtmlEditor>
</Items>
</f:FormRow>
SGGL/FineUIPro.Web/HSSE/Accident/AccidentPersonRecordView.aspx.cs
+1
View File
@@ -97,6 +97,7 @@ namespace FineUIPro.Web.HSSE.Accident
this.txtPreventiveAction.Text = accidentPersonRecord.PreventiveAction;
this.txtHandleOpinion.Text = accidentPersonRecord.HandleOpinion;
this.txtFileContents.Text = HttpUtility.HtmlDecode(accidentPersonRecord.FileContent);
this.txtWorkPackageName.Text = accidentPersonRecord.WorkPackageName;
}
}
///初始化审核菜单
SGGL/FineUIPro.Web/HSSE/Accident/AccidentPersonRecordView.aspx.designer.cs
Generated
+18 -9
View File
@@ -77,15 +77,6 @@ namespace FineUIPro.Web.HSSE.Accident
/// </remarks>
protected global::FineUIPro.TextBox txtAccidentDate;
/// <summary>
/// ckIsAttempt 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.CheckBox ckIsAttempt;
/// <summary>
/// txtPersonName 控件。
/// </summary>
@@ -122,6 +113,24 @@ namespace FineUIPro.Web.HSSE.Accident
/// </remarks>
protected global::FineUIPro.TextBox txtHssePersons;
/// <summary>
/// txtWorkPackageName 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.TextBox txtWorkPackageName;
/// <summary>
/// ckIsAttempt 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.CheckBox ckIsAttempt;
/// <summary>
/// txtInjuryResult 控件。
/// </summary>