lpf/SGGL_SHJ
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_SeDin_New

Browse Source
This commit is contained in:
李鹏飞
2025-02-18 17:39:11 +08:00
parent 96d8567515 7f4a21f841
commit b318f103e5
12 changed files with 285 additions and 86 deletions
Download Patch File Download Diff File Expand all files Collapse all files
DataBase/版本日志/SGGLDB_V2025-02-18-001-gaofei.sql
+3
View File
@@ -0,0 +1,3 @@
alter table HSSE_ConstructionRisk add IsLarge bit null
alter table HSSE_ConstructionRisk add IsSuperLarge bit null
GO
SGGL/BLL/HSSE/Hazard/ConstructionRiskListService.cs
+36 -1
View File
@@ -48,6 +48,8 @@ namespace BLL
UnitId = constructionRisk.UnitId, UnitId = constructionRisk.UnitId,
RiskLevel = constructionRisk.RiskLevel, RiskLevel = constructionRisk.RiskLevel,
Coordinate = constructionRisk.Coordinate, Coordinate = constructionRisk.Coordinate,
IsLarge = constructionRisk.IsLarge,
IsSuperLarge = constructionRisk.IsSuperLarge,
SubUnitDutyPerson = constructionRisk.SubUnitDutyPerson, SubUnitDutyPerson = constructionRisk.SubUnitDutyPerson,
MainUnitDutyPerson = constructionRisk.MainUnitDutyPerson, MainUnitDutyPerson = constructionRisk.MainUnitDutyPerson,
MainUnitCheckPerson = constructionRisk.MainUnitCheckPerson, MainUnitCheckPerson = constructionRisk.MainUnitCheckPerson,
@@ -142,6 +144,8 @@ namespace BLL
newHazardList.UnitId = hazardList.UnitId; newHazardList.UnitId = hazardList.UnitId;
newHazardList.RiskLevel = hazardList.RiskLevel; newHazardList.RiskLevel = hazardList.RiskLevel;
newHazardList.Coordinate = hazardList.Coordinate; newHazardList.Coordinate = hazardList.Coordinate;
newHazardList.IsLarge = hazardList.IsLarge;
newHazardList.IsSuperLarge = hazardList.IsSuperLarge;
newHazardList.SubUnitDutyPerson = hazardList.SubUnitDutyPerson; newHazardList.SubUnitDutyPerson = hazardList.SubUnitDutyPerson;
newHazardList.MainUnitDutyPerson = hazardList.MainUnitDutyPerson; newHazardList.MainUnitDutyPerson = hazardList.MainUnitDutyPerson;
newHazardList.MainUnitCheckPerson = hazardList.MainUnitCheckPerson; newHazardList.MainUnitCheckPerson = hazardList.MainUnitCheckPerson;
@@ -175,7 +179,27 @@ namespace BLL
} }
/// <summary> /// <summary>
/// 获取作业风险描述下拉项 /// 获取涉及的高风险作业下拉项
/// </summary>
/// <returns></returns>
public static ListItem[] RefLicenseList()
{
ListItem[] lis = new ListItem[10];
lis[0] = new ListItem("不涉及", "不涉及");
lis[1] = new ListItem("动火作业", "动火作业");
lis[2] = new ListItem("高处作业", "高处作业");
lis[3] = new ListItem("受限空间作业", "受限空间作业");
lis[4] = new ListItem("射线作业", "射线作业");
lis[5] = new ListItem("断路（占道）作业", "断路（占道）作业");
lis[6] = new ListItem("夜间施工作业", "夜间施工作业");
lis[7] = new ListItem("吊装作业", "吊装作业");
lis[8] = new ListItem("动土作业", "动土作业");
lis[9] = new ListItem("试压作业", "试压作业");
return lis;
}
/// <summary>
/// 获取作业风险下拉项
/// </summary> /// </summary>
/// <returns></returns> /// <returns></returns>
public static ListItem[] LicenseDesList() public static ListItem[] LicenseDesList()
@@ -230,6 +254,17 @@ namespace BLL
return lis; return lis;
} }
/// <summary>
/// 获取风险等级下拉项
/// </summary>
/// <returns></returns>
public static ListItem[] RiskLevelList3()
{
ListItem[] lis = new ListItem[1];
lis[0] = new ListItem("重大风险", "重大风险");
return lis;
}
/// <summary> /// <summary>
/// 根据状态选择下一步办理类型 /// 根据状态选择下一步办理类型
/// </summary> /// </summary>
SGGL/FineUIPro.Web/File/Excel/DataIn/施工作业风险导入模板.xls
BIN
View File
Binary file not shown.
SGGL/FineUIPro.Web/HSSE/Hazard/ConstructionRisk.aspx
+2 -2
View File
@@ -88,7 +88,7 @@
HeaderTextAlign="Center"> HeaderTextAlign="Center">
</f:RenderField> </f:RenderField>
<f:RenderField Width="200px" ColumnID="LicenseDes" DataField="LicenseDes" <f:RenderField Width="200px" ColumnID="LicenseDes" DataField="LicenseDes"
SortField="LicenseDes" FieldType="String" HeaderText="作业风险描述" TextAlign="Left" SortField="LicenseDes" FieldType="String" HeaderText="作业风险" TextAlign="Left"
HeaderTextAlign="Center"> HeaderTextAlign="Center">
</f:RenderField> </f:RenderField>
<f:RenderField Width="100px" ColumnID="RiskLevel" DataField="RiskLevel" <f:RenderField Width="100px" ColumnID="RiskLevel" DataField="RiskLevel"
@@ -125,7 +125,7 @@
</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="Top" EnableResize="true" runat="server" OnClose="Window1_Close" IsModal="true" Target="Top" EnableResize="true" runat="server" OnClose="Window1_Close" IsModal="true"
Width="1000px" Height="600px"> Width="1000px" Height="800px">
</f:Window> </f:Window>
<f:Window ID="Window2" Title="施工作业风险" Hidden="true" EnableIFrame="true" EnableMaximize="true" <f:Window ID="Window2" Title="施工作业风险" Hidden="true" EnableIFrame="true" EnableMaximize="true"
Target="Top" EnableResize="true" runat="server" OnClose="Window2_Close" IsModal="true" Target="Top" EnableResize="true" runat="server" OnClose="Window2_Close" IsModal="true"
SGGL/FineUIPro.Web/HSSE/Hazard/ConstructionRiskEdit.aspx
+24 -12
View File
@@ -22,9 +22,18 @@
<Rows> <Rows>
<f:FormRow> <f:FormRow>
<Items> <Items>
<f:DropDownList ID="drpWorkArea" runat="server" EnableEdit="true" Label="主项" LabelWidth="140px" ShowRedStar="true">
</f:DropDownList>
<f:DropDownList ID="drpUnit" runat="server" EnableEdit="true" Label="施工单位" LabelWidth="140px" <f:DropDownList ID="drpUnit" runat="server" EnableEdit="true" Label="施工单位" LabelWidth="140px"
AutoPostBack="true" OnSelectedIndexChanged="drpUnit_SelectedIndexChanged"> AutoPostBack="true" OnSelectedIndexChanged="drpUnit_SelectedIndexChanged">
</f:DropDownList> </f:DropDownList>
<f:DropDownList ID="drpSubUnitDutyPerson" runat="server" EnableEdit="true" Label="施工单位责任人" LabelWidth="140px" ShowRedStar="true"
>
</f:DropDownList>
</Items>
</f:FormRow>
<f:FormRow >
<Items>
<f:DatePicker runat="server" DateFormatString="yyyy-MM-dd" Label="本周开始日期" ID="dpDateA" LabelWidth="140px" AutoPostBack="true" <f:DatePicker runat="server" DateFormatString="yyyy-MM-dd" Label="本周开始日期" ID="dpDateA" LabelWidth="140px" AutoPostBack="true"
ShowRedStar="true" Required="true" EnableDateSelectEvent="true" OnDateSelect="dpDateA_SelectedIndexChanged"> ShowRedStar="true" Required="true" EnableDateSelectEvent="true" OnDateSelect="dpDateA_SelectedIndexChanged">
</f:DatePicker> </f:DatePicker>
@@ -32,24 +41,26 @@
ShowRedStar="true" Required="true"> ShowRedStar="true" Required="true">
</f:DatePicker> </f:DatePicker>
<f:Label runat="server"></f:Label>
</Items> </Items>
</f:FormRow> </f:FormRow>
<f:FormRow ColumnWidths="66% 34%"> <f:FormRow ColumnWidths="66% 34%">
<Items> <Items>
<f:TextBox runat="server" ID="txtConstructionContent" LabelWidth="140px" Label="施工内容" ShowRedStar="true" Required="true"></f:TextBox> <f:TextBox runat="server" ID="txtConstructionContent" LabelWidth="140px" Label="施工内容" ShowRedStar="true" Required="true"></f:TextBox>
<f:DropDownList ID="drpSubUnitDutyPerson" runat="server" EnableEdit="true" Label="施工单位责任人" LabelWidth="140px" ShowRedStar="true" <f:Label runat="server"></f:Label>
> </Items>
</f:DropDownList>
</Items>
</f:FormRow> </f:FormRow>
<f:FormRow> <f:FormRow ColumnWidths="66% 17% 17%">
<Items> <Items>
<f:DropDownList ID="drpWorkArea" runat="server" EnableEdit="true" Label="主项" LabelWidth="140px" ShowRedStar="true">
</f:DropDownList>
<f:DropDownList ID="drpRefLicense" runat="server" EnableEdit="true" Label="涉及的高风险作业" LabelWidth="140px" EnableMultiSelect="true" <f:DropDownList ID="drpRefLicense" runat="server" EnableEdit="true" Label="涉及的高风险作业" LabelWidth="140px" EnableMultiSelect="true"
AutoPostBack="true" OnSelectedIndexChanged="drpRefLicense_SelectedIndexChanged"> AutoPostBack="true" OnSelectedIndexChanged="drpRefLicense_SelectedIndexChanged">
</f:DropDownList> </f:DropDownList>
<f:CheckBox runat="server" ID="cbIsLarge" Text="危大工程" AutoPostBack="true" OnCheckedChanged="cbIsLarge_CheckedChanged"></f:CheckBox>
<f:CheckBox runat="server" ID="cbIsSuperLarge" AutoPostBack="true" Text="超危大工程" OnCheckedChanged="cbIsLarge_CheckedChanged"></f:CheckBox>
</Items>
</f:FormRow>
<f:FormRow ColumnWidths="34% 66%">
<Items>
<f:DropDownList ID="drpRiskLevel" runat="server" EnableEdit="true" Label="风险等级" LabelWidth="140px" ShowRedStar="true" <f:DropDownList ID="drpRiskLevel" runat="server" EnableEdit="true" Label="风险等级" LabelWidth="140px" ShowRedStar="true"
AutoPostBack="true"> AutoPostBack="true">
<%--<f:ListItem Value="低风险" Text="低风险" /> <%--<f:ListItem Value="低风险" Text="低风险" />
@@ -57,11 +68,12 @@
<f:ListItem Value="较大风险" Text="较大风险" /> <f:ListItem Value="较大风险" Text="较大风险" />
<f:ListItem Value="重大风险" Text="重大风险" />--%> <f:ListItem Value="重大风险" Text="重大风险" />--%>
</f:DropDownList> </f:DropDownList>
</Items> <f:Label runat="server"></f:Label>
</Items>
</f:FormRow> </f:FormRow>
<f:FormRow> <f:FormRow>
<Items> <Items>
<f:DropDownList ID="drpLicenseDes" runat="server" EnableEdit="true" Label="作业风险描述" EnableMultiSelect="true" LabelWidth="140px" ShowRedStar="true"> <f:DropDownList ID="drpLicenseDes" runat="server" EnableEdit="true" Label="作业风险" EnableMultiSelect="true" LabelWidth="140px" ShowRedStar="true">
<%--<f:ListItem Value="物体打击" Text="物体打击" /> <%--<f:ListItem Value="物体打击" Text="物体打击" />
<f:ListItem Value="车辆伤害" Text="车辆伤害" /> <f:ListItem Value="车辆伤害" Text="车辆伤害" />
<f:ListItem Value="机械伤害" Text="机械伤害" /> <f:ListItem Value="机械伤害" Text="机械伤害" />
@@ -93,7 +105,7 @@
</f:FormRow> </f:FormRow>
<f:FormRow> <f:FormRow>
<Items> <Items>
<f:Grid ID="Grid1" ShowBorder="true" ShowHeader="false" runat="server" <f:Grid ID="Grid1" ShowBorder="true" ShowHeader="false" runat="server" Height="300px"
DataIDField="ControlId" DataKeyNames="ControlId" ForceFit="true" DataIDField="ControlId" DataKeyNames="ControlId" ForceFit="true"
EnableMultiSelect="true" ShowGridHeader="true" EnableColumnLines="true" AllowSorting="true" EnableMultiSelect="true" ShowGridHeader="true" EnableColumnLines="true" AllowSorting="true"
SortField="ShowIndex" SortDirection="ASC" EnableRowDoubleClickEvent="true" SortField="ShowIndex" SortDirection="ASC" EnableRowDoubleClickEvent="true"
SGGL/FineUIPro.Web/HSSE/Hazard/ConstructionRiskEdit.aspx.cs
+51 -6
View File
@@ -123,6 +123,14 @@ namespace FineUIPro.Web.HSSE.Hazard
{ {
this.drpLicenseDes.SelectedValueArray = constructionRisk.LicenseDes.Split(','); this.drpLicenseDes.SelectedValueArray = constructionRisk.LicenseDes.Split(',');
} }
if (constructionRisk.IsLarge == true)
{
this.cbIsLarge.Checked = true;
}
if (constructionRisk.IsSuperLarge == true)
{
this.cbIsSuperLarge.Checked = true;
}
this.hdCoordinate.Text = constructionRisk.Coordinate; this.hdCoordinate.Text = constructionRisk.Coordinate;
constructionRiskControls = (from x in Funs.DB.HSSE_ConstructionRiskControl where x.ConstructionRiskId == this.ConstructionRiskId orderby x.ShowIndex select x).ToList(); constructionRiskControls = (from x in Funs.DB.HSSE_ConstructionRiskControl where x.ConstructionRiskId == this.ConstructionRiskId orderby x.ShowIndex select x).ToList();
gvApprove.DataSource = BLL.ConstructionRiskApproveService.getListData(this.ConstructionRiskId); gvApprove.DataSource = BLL.ConstructionRiskApproveService.getListData(this.ConstructionRiskId);
@@ -199,11 +207,10 @@ namespace FineUIPro.Web.HSSE.Hazard
///区域下拉框 ///区域下拉框
BLL.MainItemService.InitMainItemDownList(this.drpWorkArea, this.ProjectId, true); BLL.MainItemService.InitMainItemDownList(this.drpWorkArea, this.ProjectId, true);
drpRefLicense.DataValueField = "LicenseTypeName"; drpRefLicense.DataValueField = "Value";
drpRefLicense.DataTextField = "LicenseTypeName"; drpRefLicense.DataTextField = "Text";
drpRefLicense.DataSource = (from x in Funs.DB.Base_LicenseType orderby x.LicenseTypeCode select x).ToList(); drpRefLicense.DataSource = BLL.ConstructionRiskListService.RefLicenseList();
drpRefLicense.DataBind(); drpRefLicense.DataBind();
Funs.FineUIPleaseSelect(this.drpRefLicense);
this.drpRiskLevel.DataTextField = "Text"; this.drpRiskLevel.DataTextField = "Text";
this.drpRiskLevel.DataValueField = "Value"; this.drpRiskLevel.DataValueField = "Value";
this.drpRiskLevel.DataSource = BLL.ConstructionRiskListService.RiskLevelList(); this.drpRiskLevel.DataSource = BLL.ConstructionRiskListService.RiskLevelList();
@@ -388,6 +395,14 @@ namespace FineUIPro.Web.HSSE.Hazard
{ {
newConstructionRisk.SubUnitDutyPerson = this.drpSubUnitDutyPerson.SelectedValue; newConstructionRisk.SubUnitDutyPerson = this.drpSubUnitDutyPerson.SelectedValue;
} }
if (this.cbIsLarge.Checked)
{
newConstructionRisk.IsLarge = true;
}
if (this.cbIsSuperLarge.Checked)
{
newConstructionRisk.IsSuperLarge = true;
}
newConstructionRisk.DateA = Funs.GetNewDateTime(this.dpDateA.Text.Trim()); newConstructionRisk.DateA = Funs.GetNewDateTime(this.dpDateA.Text.Trim());
newConstructionRisk.DateZ = Funs.GetNewDateTime(this.dpDateZ.Text.Trim()); newConstructionRisk.DateZ = Funs.GetNewDateTime(this.dpDateZ.Text.Trim());
if (this.drpLicenseDes.SelectedValueArray.Length == 1 && this.drpLicenseDes.SelectedValue == BLL.Const._Null) if (this.drpLicenseDes.SelectedValueArray.Length == 1 && this.drpLicenseDes.SelectedValue == BLL.Const._Null)
@@ -627,7 +642,7 @@ namespace FineUIPro.Web.HSSE.Hazard
protected void btnAdd_Click(object sender, EventArgs e) protected void btnAdd_Click(object sender, EventArgs e)
{ {
if (string.IsNullOrEmpty(this.ConstructionRiskId)) if (string.IsNullOrEmpty(this.hdConstructionRiskId.Text))
{ {
this.hdConstructionRiskId.Text = SQLHelper.GetNewID(typeof(Model.Hazard_EnvironmentalRiskList)); this.hdConstructionRiskId.Text = SQLHelper.GetNewID(typeof(Model.Hazard_EnvironmentalRiskList));
} }
@@ -643,7 +658,7 @@ namespace FineUIPro.Web.HSSE.Hazard
protected void drpRefLicense_SelectedIndexChanged(object sender, EventArgs e) protected void drpRefLicense_SelectedIndexChanged(object sender, EventArgs e)
{ {
if (this.drpRefLicense.SelectedValueArray.Length == 1 && this.drpRefLicense.SelectedValue == BLL.Const._Null) if (this.drpRefLicense.SelectedValueArray.Length == 1 && this.drpRefLicense.SelectedValue == "不涉及")
{ {
this.drpRiskLevel.DataSource = BLL.ConstructionRiskListService.RiskLevelList(); this.drpRiskLevel.DataSource = BLL.ConstructionRiskListService.RiskLevelList();
} }
@@ -654,6 +669,14 @@ namespace FineUIPro.Web.HSSE.Hazard
this.drpRiskLevel.DataBind(); this.drpRiskLevel.DataBind();
Funs.FineUIPleaseSelect(this.drpRiskLevel); Funs.FineUIPleaseSelect(this.drpRiskLevel);
this.drpRiskLevel.SelectedValue = BLL.Const._Null; this.drpRiskLevel.SelectedValue = BLL.Const._Null;
foreach (var item in this.drpRefLicense.SelectedValueArray)
{
if (item == "不涉及")
{
this.drpRefLicense.SelectedValue = "不涉及";
break;
}
}
} }
#region 选择施工内容 #region 选择施工内容
@@ -771,5 +794,27 @@ namespace FineUIPro.Web.HSSE.Hazard
this.drpMainUnitCheckPerson.SelectedValueArray = strs.ToArray(); this.drpMainUnitCheckPerson.SelectedValueArray = strs.ToArray();
} }
} }
protected void cbIsLarge_CheckedChanged(object sender, CheckedEventArgs e)
{
if (this.cbIsSuperLarge.Checked)
{
this.drpRiskLevel.DataSource = BLL.ConstructionRiskListService.RiskLevelList3();
}
else
{
if (this.cbIsLarge.Checked)
{
this.drpRiskLevel.DataSource = BLL.ConstructionRiskListService.RiskLevelList2();
}
else
{
this.drpRiskLevel.DataSource = BLL.ConstructionRiskListService.RiskLevelList();
}
}
this.drpRiskLevel.DataBind();
Funs.FineUIPleaseSelect(this.drpRiskLevel);
this.drpRiskLevel.SelectedValue = BLL.Const._Null;
}
} }
} }
SGGL/FineUIPro.Web/HSSE/Hazard/ConstructionRiskEdit.aspx.designer.cs
Generated
+36 -18
View File
@@ -39,6 +39,15 @@ namespace FineUIPro.Web.HSSE.Hazard {
/// </remarks> /// </remarks>
protected global::FineUIPro.Form SimpleForm1; protected global::FineUIPro.Form SimpleForm1;
/// <summary>
/// drpWorkArea 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.DropDownList drpWorkArea;
/// <summary> /// <summary>
/// drpUnit 控件。 /// drpUnit 控件。
/// </summary> /// </summary>
@@ -48,6 +57,15 @@ namespace FineUIPro.Web.HSSE.Hazard {
/// </remarks> /// </remarks>
protected global::FineUIPro.DropDownList drpUnit; protected global::FineUIPro.DropDownList drpUnit;
/// <summary>
/// drpSubUnitDutyPerson 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.DropDownList drpSubUnitDutyPerson;
/// <summary> /// <summary>
/// dpDateA 控件。 /// dpDateA 控件。
/// </summary> /// </summary>
@@ -75,24 +93,6 @@ namespace FineUIPro.Web.HSSE.Hazard {
/// </remarks> /// </remarks>
protected global::FineUIPro.TextBox txtConstructionContent; protected global::FineUIPro.TextBox txtConstructionContent;
/// <summary>
/// drpSubUnitDutyPerson 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.DropDownList drpSubUnitDutyPerson;
/// <summary>
/// drpWorkArea 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.DropDownList drpWorkArea;
/// <summary> /// <summary>
/// drpRefLicense 控件。 /// drpRefLicense 控件。
/// </summary> /// </summary>
@@ -102,6 +102,24 @@ namespace FineUIPro.Web.HSSE.Hazard {
/// </remarks> /// </remarks>
protected global::FineUIPro.DropDownList drpRefLicense; protected global::FineUIPro.DropDownList drpRefLicense;
/// <summary>
/// cbIsLarge 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.CheckBox cbIsLarge;
/// <summary>
/// cbIsSuperLarge 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.CheckBox cbIsSuperLarge;
/// <summary> /// <summary>
/// drpRiskLevel 控件。 /// drpRiskLevel 控件。
/// </summary> /// </summary>
SGGL/FineUIPro.Web/HSSE/Hazard/ConstructionRiskMap.aspx.cs
+3 -3
View File
@@ -19,7 +19,7 @@ namespace FineUIPro.Web.ProjectData
{ {
string strSql = @"SELECT b.[MainItemId],b.[Coordinate],b.[MainItemName],count(*) num ,max(case when RiskLevel='低风险' then 1 when RiskLevel='一般风险' then 2 when RiskLevel='较大风险' then 3 else 4 end) RiskLevel string strSql = @"SELECT b.[MainItemId],b.[Coordinate],b.[MainItemName],count(*) num ,max(case when RiskLevel='低风险' then 1 when RiskLevel='一般风险' then 2 when RiskLevel='较大风险' then 3 else 4 end) RiskLevel
FROM [dbo].[HSSE_ConstructionRisk] a left join [dbo].[ProjectData_MainItem] b on a.[WorkAreaId]=b.[MainItemId] FROM [dbo].[HSSE_ConstructionRisk] a left join [dbo].[ProjectData_MainItem] b on a.[WorkAreaId]=b.[MainItemId]
where a.ProjectId=@ProjectId and a.States='4' where a.ProjectId=@ProjectId and a.States!='5'
group by b.[MainItemId],b.[Coordinate],b.[MainItemName]"; group by b.[MainItemId],b.[Coordinate],b.[MainItemName]";
List<SqlParameter> listStr = new List<SqlParameter>(); List<SqlParameter> listStr = new List<SqlParameter>();
listStr.Add(new SqlParameter("@ProjectId", CurrUser.LoginProjectId)); listStr.Add(new SqlParameter("@ProjectId", CurrUser.LoginProjectId));
@@ -55,7 +55,7 @@ namespace FineUIPro.Web.ProjectData
,[ProjectId] ,[ProjectId]
,[Coordinate] ,[Coordinate]
FROM [dbo].[HSSE_ConstructionRisk] a left join Base_Unit b on a.[UnitId] = b.[UnitId] FROM [dbo].[HSSE_ConstructionRisk] a left join Base_Unit b on a.[UnitId] = b.[UnitId]
where a.WorkAreaId=@WorkAreaId and a.States='4' where a.WorkAreaId=@WorkAreaId and a.States!='5'
"; ";
//if (!string.IsNullOrEmpty(RiskLevel)) //if (!string.IsNullOrEmpty(RiskLevel))
@@ -85,7 +85,7 @@ namespace FineUIPro.Web.ProjectData
string riskLevel = ""; string riskLevel = "";
string strSql = @"SELECT b.[MainItemId],b.[Coordinate],b.[MainItemName],count(*) num ,max(case when RiskLevel='低风险' then 1 when RiskLevel='一般风险' then 2 when RiskLevel='较大风险' then 3 else 4 end) RiskLevel string strSql = @"SELECT b.[MainItemId],b.[Coordinate],b.[MainItemName],count(*) num ,max(case when RiskLevel='低风险' then 1 when RiskLevel='一般风险' then 2 when RiskLevel='较大风险' then 3 else 4 end) RiskLevel
FROM [dbo].[HSSE_ConstructionRisk] a left join [dbo].[ProjectData_MainItem] b on a.[WorkAreaId]=b.[MainItemId] FROM [dbo].[HSSE_ConstructionRisk] a left join [dbo].[ProjectData_MainItem] b on a.[WorkAreaId]=b.[MainItemId]
where a.ProjectId=@ProjectId and a.States='4' where a.ProjectId=@ProjectId and a.States!='5'
"; ";
List<SqlParameter> listStr = new List<SqlParameter>(); List<SqlParameter> listStr = new List<SqlParameter>();
listStr.Add(new SqlParameter("@ProjectId", CurrUser.LoginProjectId)); listStr.Add(new SqlParameter("@ProjectId", CurrUser.LoginProjectId));
SGGL/FineUIPro.Web/HSSE/Hazard/ConstructionRiskView.aspx
+33 -20
View File
@@ -22,46 +22,59 @@
<Rows> <Rows>
<f:FormRow> <f:FormRow>
<Items> <Items>
<f:DropDownList ID="drpWorkArea" runat="server" EnableEdit="true" Label="主项" Readonly="true" LabelWidth="140px" ShowRedStar="true">
</f:DropDownList>
<f:DropDownList ID="drpUnit" runat="server" EnableEdit="true" Readonly="true" Label="施工单位" LabelWidth="140px" <f:DropDownList ID="drpUnit" runat="server" EnableEdit="true" Readonly="true" Label="施工单位" LabelWidth="140px"
AutoPostBack="true"> AutoPostBack="true">
</f:DropDownList> </f:DropDownList>
<f:DatePicker runat="server" DateFormatString="yyyy-MM-dd" Readonly="true" Label="本周开始日期" ID="dpDateA" LabelWidth="140px" AutoPostBack="true" <f:DropDownList ID="drpSubUnitDutyPerson" runat="server" EnableEdit="true" Label="施工单位责任人" LabelWidth="140px" Readonly="true"
ShowRedStar="true" Required="true" EnableDateSelectEvent="true" OnDateSelect="dpDateA_SelectedIndexChanged">
</f:DatePicker>
<f:DatePicker runat="server" DateFormatString="yyyy-MM-dd" Readonly="true" Label="本周结束日期" ID="dpDateZ" LabelWidth="140px"
ShowRedStar="true" Required="true">
</f:DatePicker>
</Items>
</f:FormRow>
<f:FormRow ColumnWidths="66% 34%">
<Items>
<f:TextBox runat="server" ID="txtConstructionContent" LabelWidth="140px" Label="施工内容" ShowRedStar="true" Required="true"></f:TextBox>
<f:DropDownList ID="drpSubUnitDutyPerson" runat="server" EnableEdit="true" Label="施工单位责任人" LabelWidth="140px" Readonly="true"
> >
</f:DropDownList> </f:DropDownList>
</Items> </Items>
</f:FormRow> </f:FormRow>
<f:FormRow> <f:FormRow>
<Items> <Items>
<f:DropDownList ID="drpWorkArea" runat="server" EnableEdit="true" Label="主项" Readonly="true" LabelWidth="140px" ShowRedStar="true"> <f:DatePicker runat="server" DateFormatString="yyyy-MM-dd" Readonly="true" Label="本周开始日期" ID="dpDateA" LabelWidth="140px" AutoPostBack="true"
</f:DropDownList> ShowRedStar="true" Required="true" EnableDateSelectEvent="true" OnDateSelect="dpDateA_SelectedIndexChanged">
</f:DatePicker>
<f:DatePicker runat="server" DateFormatString="yyyy-MM-dd" Readonly="true" Label="本周结束日期" ID="dpDateZ" LabelWidth="140px"
ShowRedStar="true" Required="true">
</f:DatePicker>
<f:Label runat="server"></f:Label>
</Items>
</f:FormRow>
<f:FormRow ColumnWidths="66% 34%">
<Items>
<f:TextBox runat="server" ID="txtConstructionContent" LabelWidth="140px" Label="施工内容" ShowRedStar="true" Required="true"></f:TextBox>
<f:Label runat="server"></f:Label>
</Items>
</f:FormRow>
<f:FormRow>
<Items>
<f:DropDownList ID="drpRefLicense" runat="server" EnableEdit="true" Label="涉及的高风险作业" Readonly="true" LabelWidth="140px" EnableMultiSelect="true" <f:DropDownList ID="drpRefLicense" runat="server" EnableEdit="true" Label="涉及的高风险作业" Readonly="true" LabelWidth="140px" EnableMultiSelect="true"
AutoPostBack="true" OnSelectedIndexChanged="drpRefLicense_SelectedIndexChanged"> AutoPostBack="true" OnSelectedIndexChanged="drpRefLicense_SelectedIndexChanged">
</f:DropDownList> </f:DropDownList>
<f:DropDownList ID="drpRiskLevel" runat="server" EnableEdit="true" Label="风险等级" Readonly="true" LabelWidth="140px" ShowRedStar="true" <f:CheckBox runat="server" ID="cbIsLarge" Text="危大工程"></f:CheckBox>
<f:CheckBox runat="server" ID="cbIsSuperLarge" Text="超危大工程"></f:CheckBox>
</Items>
</f:FormRow>
<f:FormRow ColumnWidths="34% 66%">
<Items>
<f:DropDownList ID="drpRiskLevel" runat="server" EnableEdit="true" Label="风险等级" LabelWidth="140px" ShowRedStar="true"
AutoPostBack="true"> AutoPostBack="true">
<%--<f:ListItem Value="低风险" Text="低风险" /> <%--<f:ListItem Value="低风险" Text="低风险" />
<f:ListItem Value="一般风险" Text="一般风险" /> <f:ListItem Value="一般风险" Text="一般风险" />
<f:ListItem Value="较大风险" Text="较大风险" /> <f:ListItem Value="较大风险" Text="较大风险" />
<f:ListItem Value="重大风险" Text="重大风险" />--%> <f:ListItem Value="重大风险" Text="重大风险" />--%>
</f:DropDownList> </f:DropDownList>
</Items> <f:Label runat="server"></f:Label>
</Items>
</f:FormRow> </f:FormRow>
<f:FormRow> <f:FormRow>
<Items> <Items>
<f:DropDownList ID="drpLicenseDes" runat="server" EnableEdit="true" Readonly="true" Label="作业风险描述" EnableMultiSelect="true" LabelWidth="140px" ShowRedStar="true"> <f:DropDownList ID="drpLicenseDes" runat="server" EnableEdit="true" Readonly="true" Label="作业风险" EnableMultiSelect="true" LabelWidth="140px" ShowRedStar="true">
<%--<f:ListItem Value="物体打击" Text="物体打击" /> <%--<f:ListItem Value="物体打击" Text="物体打击" />
<f:ListItem Value="车辆伤害" Text="车辆伤害" /> <f:ListItem Value="车辆伤害" Text="车辆伤害" />
<f:ListItem Value="机械伤害" Text="机械伤害" /> <f:ListItem Value="机械伤害" Text="机械伤害" />
@@ -93,7 +106,7 @@
</f:FormRow> </f:FormRow>
<f:FormRow> <f:FormRow>
<Items> <Items>
<f:Grid ID="Grid1" ShowBorder="true" ShowHeader="false" runat="server" <f:Grid ID="Grid1" ShowBorder="true" ShowHeader="false" runat="server" Height="300px"
DataIDField="ControlId" DataKeyNames="ControlId" ForceFit="true" DataIDField="ControlId" DataKeyNames="ControlId" ForceFit="true"
EnableMultiSelect="true" ShowGridHeader="true" EnableColumnLines="true" AllowSorting="true" EnableMultiSelect="true" ShowGridHeader="true" EnableColumnLines="true" AllowSorting="true"
SortField="ShowIndex" SortDirection="ASC" EnableRowDoubleClickEvent="true" SortField="ShowIndex" SortDirection="ASC" EnableRowDoubleClickEvent="true"
SGGL/FineUIPro.Web/HSSE/Hazard/ConstructionRiskView.aspx.cs
+11 -4
View File
@@ -106,6 +106,14 @@ namespace FineUIPro.Web.HSSE.Hazard
{ {
this.txtConstructionContent.Text = HttpUtility.HtmlDecode(constructionRisk.ConstructionContent); this.txtConstructionContent.Text = HttpUtility.HtmlDecode(constructionRisk.ConstructionContent);
} }
if (constructionRisk.IsLarge == true)
{
this.cbIsLarge.Checked = true;
}
if (constructionRisk.IsSuperLarge == true)
{
this.cbIsSuperLarge.Checked = true;
}
this.hdConstructionContentId.Text = constructionRisk.ConstructionContentId; this.hdConstructionContentId.Text = constructionRisk.ConstructionContentId;
if (!string.IsNullOrEmpty(constructionRisk.RiskLevel)) if (!string.IsNullOrEmpty(constructionRisk.RiskLevel))
{ {
@@ -149,11 +157,10 @@ namespace FineUIPro.Web.HSSE.Hazard
///区域下拉框 ///区域下拉框
BLL.MainItemService.InitMainItemDownList(this.drpWorkArea, this.ProjectId, true); BLL.MainItemService.InitMainItemDownList(this.drpWorkArea, this.ProjectId, true);
drpRefLicense.DataValueField = "LicenseTypeName"; drpRefLicense.DataValueField = "Value";
drpRefLicense.DataTextField = "LicenseTypeName"; drpRefLicense.DataTextField = "Text";
drpRefLicense.DataSource = (from x in Funs.DB.Base_LicenseType orderby x.LicenseTypeCode select x).ToList(); drpRefLicense.DataSource = BLL.ConstructionRiskListService.RefLicenseList();
drpRefLicense.DataBind(); drpRefLicense.DataBind();
Funs.FineUIPleaseSelect(this.drpRefLicense);
this.drpRiskLevel.DataTextField = "Text"; this.drpRiskLevel.DataTextField = "Text";
this.drpRiskLevel.DataValueField = "Value"; this.drpRiskLevel.DataValueField = "Value";
this.drpRiskLevel.DataSource = BLL.ConstructionRiskListService.RiskLevelList(); this.drpRiskLevel.DataSource = BLL.ConstructionRiskListService.RiskLevelList();
SGGL/FineUIPro.Web/HSSE/Hazard/ConstructionRiskView.aspx.designer.cs
Generated
+36 -18
View File
@@ -39,6 +39,15 @@ namespace FineUIPro.Web.HSSE.Hazard {
/// </remarks> /// </remarks>
protected global::FineUIPro.Form SimpleForm1; protected global::FineUIPro.Form SimpleForm1;
/// <summary>
/// drpWorkArea 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.DropDownList drpWorkArea;
/// <summary> /// <summary>
/// drpUnit 控件。 /// drpUnit 控件。
/// </summary> /// </summary>
@@ -48,6 +57,15 @@ namespace FineUIPro.Web.HSSE.Hazard {
/// </remarks> /// </remarks>
protected global::FineUIPro.DropDownList drpUnit; protected global::FineUIPro.DropDownList drpUnit;
/// <summary>
/// drpSubUnitDutyPerson 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.DropDownList drpSubUnitDutyPerson;
/// <summary> /// <summary>
/// dpDateA 控件。 /// dpDateA 控件。
/// </summary> /// </summary>
@@ -75,24 +93,6 @@ namespace FineUIPro.Web.HSSE.Hazard {
/// </remarks> /// </remarks>
protected global::FineUIPro.TextBox txtConstructionContent; protected global::FineUIPro.TextBox txtConstructionContent;
/// <summary>
/// drpSubUnitDutyPerson 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.DropDownList drpSubUnitDutyPerson;
/// <summary>
/// drpWorkArea 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.DropDownList drpWorkArea;
/// <summary> /// <summary>
/// drpRefLicense 控件。 /// drpRefLicense 控件。
/// </summary> /// </summary>
@@ -102,6 +102,24 @@ namespace FineUIPro.Web.HSSE.Hazard {
/// </remarks> /// </remarks>
protected global::FineUIPro.DropDownList drpRefLicense; protected global::FineUIPro.DropDownList drpRefLicense;
/// <summary>
/// cbIsLarge 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.CheckBox cbIsLarge;
/// <summary>
/// cbIsSuperLarge 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.CheckBox cbIsSuperLarge;
/// <summary> /// <summary>
/// drpRiskLevel 控件。 /// drpRiskLevel 控件。
/// </summary> /// </summary>
SGGL/Model/Model.cs
+48
View File
@@ -104762,6 +104762,10 @@ namespace Model
private string _MainUnitCheckPerson; private string _MainUnitCheckPerson;
private System.Nullable<bool> _IsLarge;
private System.Nullable<bool> _IsSuperLarge;
#region 可扩展性方法定义 #region 可扩展性方法定义
partial void OnLoaded(); partial void OnLoaded();
partial void OnValidate(System.Data.Linq.ChangeAction action); partial void OnValidate(System.Data.Linq.ChangeAction action);
@@ -104800,6 +104804,10 @@ namespace Model
partial void OnMainUnitDutyPersonChanged(); partial void OnMainUnitDutyPersonChanged();
partial void OnMainUnitCheckPersonChanging(string value); partial void OnMainUnitCheckPersonChanging(string value);
partial void OnMainUnitCheckPersonChanged(); partial void OnMainUnitCheckPersonChanged();
partial void OnIsLargeChanging(System.Nullable<bool> value);
partial void OnIsLargeChanged();
partial void OnIsSuperLargeChanging(System.Nullable<bool> value);
partial void OnIsSuperLargeChanged();
#endregion #endregion
public HSSE_ConstructionRisk() public HSSE_ConstructionRisk()
@@ -105147,6 +105155,46 @@ namespace Model
} }
} }
[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_IsLarge", DbType="Bit")]
public System.Nullable<bool> IsLarge
{
get
{
return this._IsLarge;
}
set
{
if ((this._IsLarge != value))
{
this.OnIsLargeChanging(value);
this.SendPropertyChanging();
this._IsLarge = value;
this.SendPropertyChanged("IsLarge");
this.OnIsLargeChanged();
}
}
}
[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_IsSuperLarge", DbType="Bit")]
public System.Nullable<bool> IsSuperLarge
{
get
{
return this._IsSuperLarge;
}
set
{
if ((this._IsSuperLarge != value))
{
this.OnIsSuperLargeChanging(value);
this.SendPropertyChanging();
this._IsSuperLarge = value;
this.SendPropertyChanged("IsSuperLarge");
this.OnIsSuperLargeChanged();
}
}
}
public event PropertyChangingEventHandler PropertyChanging; public event PropertyChangingEventHandler PropertyChanging;
public event PropertyChangedEventHandler PropertyChanged; public event PropertyChangedEventHandler PropertyChanged;