xiaju
/
SGGL_JT
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Compare commits

base: xiaju:55255c35fd70c8e9d04ce9fc58d58782cdc0821d
Branches Tags
xiaju:master
..
compare: xiaju:05821104714add46f33588996f37e7774000796d
Branches Tags
xiaju:master

No commits in common. "55255c35fd70c8e9d04ce9fc58d58782cdc0821d" and "05821104714add46f33588996f37e7774000796d" have entirely different histories.
55255c35fd ... 0582110471

10 changed files with 15 additions and 135 deletions
Show Stats Expand all files Collapse all files

5
SUBQHSE/FineUIPro.Web/FineUIPro.Web.csproj
View File

@ -729,7 +729,6 @@
<Content Include="File\Excel\DataIn\岗位考试试题模版.xls" />
<Content Include="File\Word\Person\安全教育培训打印整套（司索信号工）.doc" />
<Content Include="File\Word\Person\安全教育培训打印整套（塔吊司机）.doc" />
<Content Include="File\Word\Person\安全教育培训打印整套（安全员）.doc" />
<Content Include="File\Word\Person\安全教育培训打印整套（挖机司机）.doc" />
<Content Include="File\Word\Person\安全教育培训打印整套（施工电梯司机）.doc" />
<Content Include="File\Word\Person\安全教育培训打印整套（普工）.doc" />
@ -740,11 +739,9 @@
<Content Include="File\Word\Person\安全教育培训打印整套（渣土车司机）.doc" />
<Content Include="File\Word\Person\安全教育培训打印整套（班组管理员）.doc" />
<Content Include="File\Word\Person\安全教育培训打印整套（瓦工）.doc" />
<Content Include="File\Word\Person\安全教育培训打印整套（电工）.doc" />
<Content Include="File\Word\Person\安全教育培训打印整套（电焊工）.doc" />
<Content Include="File\Word\Person\安全教育培训打印整套（管理人员）.doc" />
<Content Include="File\Word\Person\安全教育培训打印整套（装配、灌浆工）.doc" />
<Content Include="File\Word\Person\安全教育培训打印整套（起重机司机）.doc" />
<Content Include="File\Word\Person\安全教育培训打印整套（钢筋工）.doc" />
<Content Include="File\Word\Person\安全教育培训打印整套（防水普工）.doc" />
<Content Include="HJGL\BaseInfo\Components.aspx" />
@ -2595,6 +2592,8 @@
<Content Include="HSSE\Doc\环境因素危险源导入说明.doc" />
<Content Include="HSSE\Doc\用户权限怎么设置.doc" />
<Content Include="HSSE\Doc\隐患整改单操作说明.doc" />
<Content Include="File\Word\Person\~%24经理工作任务书.doc" />
<Content Include="File\Word\Person\~WRL0001.tmp" />
<Content Include="File\Word\Person\安全专业工程师工作任务书.doc" />
<Content Include="File\Word\Person\安全经理工作任务书.doc" />
<Content Include="File\Word\Person\施工专业工程师工作任务书.doc" />

13
SUBQHSE/FineUIPro.Web/HSSE/HiddenInspection/HiddenRectificationAdd.aspx
View File

@ -15,7 +15,7 @@
<Rows>
<f:FormRow>
<Items>
<f:DropDownList runat="server" EnableSimulateTree="True" Label="检查项" ID="drpRegisterTypes" ShowRedStar="true" Required="true" OnSelectedIndexChanged="drpRegisterTypes_SelectedIndexChanged" AutoPostBack="true">
<f:DropDownList runat="server" EnableSimulateTree="True" Label="检查项" ID="drpRegisterTypes" >
</f:DropDownList>
<f:RadioButtonList ID="ckType" runat="server" Label="巡检周期"
Width="330px" Hidden="true">
@ -38,7 +38,6 @@
<Items>
<f:DropDownList runat="server" EnableSimulateTree="True" Label="级别" ID="dpRiskLevel" >
<f:ListItem Text="一般" Value="一般"/>
<f:ListItem Text="较大" Value="较大"/>
<f:ListItem Text="重大" Value="重大"/>
</f:DropDownList>
<f:DropDownList runat="server" EnableSimulateTree="True" Label="检查项" ID="DropDownList1" Hidden="true">
@ -47,18 +46,10 @@
</f:FormRow>
<f:FormRow>
<Items>
<f:DropDownList runat="server" ID="drpRegisterDef" Label="问题描述" ShowRedStar="true" Required="true" EnableEdit="true" ForceSelection="false" AutoSelectFirstItem="False" OnSelectedIndexChanged="drpRegisterDef_TextChanged" AutoPostBack="true">
</f:DropDownList>
</Items>
</f:FormRow>
<f:FormRow>
<Items>
<f:TextArea ID="txtRequirements" runat="server" Label="整改要求" ShowRedStar="true" Required="true">
<f:TextArea ID="txtRegisterDef" runat="server" Label="问题描述" ShowRedStar="true" Required="true">
</f:TextArea>
</Items>
</f:FormRow>
<f:FormRow>
<Items>
<f:TextBox runat="server" ID="txtHandleIdea" Label="复检问题描述" Hidden="true"></f:TextBox>

90
SUBQHSE/FineUIPro.Web/HSSE/HiddenInspection/HiddenRectificationAdd.aspx.cs
View File

@ -1,7 +1,6 @@
using BLL;
using System;
using System.Linq;
using System.Text;
namespace FineUIPro.Web.HSSE.HiddenInspection
{
@ -88,21 +87,10 @@ namespace FineUIPro.Web.HSSE.HiddenInspection
UnitWorkService.InitUnitWorkDownList(this.drpWorkArea, this.CurrUser.LoginProjectId, true);
UserService.InitUserProjectIdUnitTypeDropDownList(this.drpResponsibleMan, this.CurrUser.LoginProjectId, null, true);
var query = (from x in Funs.DB.Technique_Rectify
where x.IsEndLever.Value == true
select new
{
RegisterTypesId = x.RectifyId,
RegisterTypesName = x.RectifyName,
}).ToList();
this.drpRegisterTypes.DataTextField = "RegisterTypesName";
this.drpRegisterTypes.DataValueField = "RegisterTypesId";
// this.drpRegisterTypes.DataSource = BLL.HSSE_Hazard_HazardRegisterTypesService.GetHazardRegisterTypesList("1"); //安全巡检类型
this.drpRegisterTypes.DataSource = query; //安全巡检类型
this.drpRegisterTypes.DataSource = BLL.HSSE_Hazard_HazardRegisterTypesService.GetHazardRegisterTypesList("1"); //安全巡检类型
this.drpRegisterTypes.DataBind();
Funs.FineUIPleaseSelect(drpRegisterTypes);
if (!string.IsNullOrWhiteSpace(type))
{
this.drpRegisterTypes.Items.FindByText(type).Selected = true;
@ -139,7 +127,6 @@ namespace FineUIPro.Web.HSSE.HiddenInspection
if (!string.IsNullOrEmpty(registration.RegisterTypesId))
{
this.drpRegisterTypes.SelectedValue = registration.RegisterTypesId;
drpRegisterTypes_SelectedIndexChanged(null, null);
}
if (!string.IsNullOrEmpty(registration.CheckCycle))
{
@ -157,8 +144,8 @@ namespace FineUIPro.Web.HSSE.HiddenInspection
{
this.txtRectificationPeriod.Text = string.Format("{0:yyyy-MM-dd HH:mm:ss}", registration.RectificationPeriod);
}
this.drpRegisterDef.Text = registration.RegisterDef;
this.txtRequirements.Text = registration.Requirements;
this.txtRegisterDef.Text = registration.RegisterDef;
this.txtCutPayment.Text = registration.CutPayment.ToString();
this.drpCheckMan.SelectedValue = registration.CheckManId;
if (registration.CheckTime != null)
@ -181,7 +168,7 @@ namespace FineUIPro.Web.HSSE.HiddenInspection
if (control != null)
{
var risk = Funs.DB.HSSE_ConstructionRisk.FirstOrDefault(x => x.ConstructionRiskId == control.ConstructionRiskId);
// txtRegisterDef.Text = risk.LicenseDes;
txtRegisterDef.Text = risk.LicenseDes;
drpUnit.SelectedValue = risk.UnitId;
drpWorkArea.SelectedValue = risk.WorkAreaId;
}
@ -276,15 +263,7 @@ namespace FineUIPro.Web.HSSE.HiddenInspection
{
register.Place = this.drpWorkArea.SelectedValue;
}
if (this.drpRegisterDef.SelectedValue != null && this.drpRegisterDef.SelectedValue != BLL.Const._Null)
{
register.RegisterDef = this.drpRegisterDef.SelectedText.Trim();
}
else
{
register.RegisterDef = this.drpRegisterDef.Text.Trim();
}
register.Requirements = this.txtRequirements.Text.Trim();
register.RegisterDef = this.txtRegisterDef.Text.Trim();
if (this.drpResponsibleMan.SelectedValue != BLL.Const._Null)
{
register.ResponsibleMan = this.drpResponsibleMan.SelectedValue;
@ -343,64 +322,5 @@ namespace FineUIPro.Web.HSSE.HiddenInspection
}
#endregion
/// <summary>
/// 检查项
/// </summary>
/// <param name="sender"></param>
/// <param name="e"></param>
protected void drpRegisterTypes_SelectedIndexChanged(object sender, EventArgs e)
{
string selectedRegisterTypeId = this.drpRegisterTypes.SelectedValue;
if (!string.IsNullOrEmpty(selectedRegisterTypeId) && selectedRegisterTypeId != BLL.Const._Null)
{
var query = (from x in Funs.DB.Technique_RectifyItem
where x.RectifyId == this.drpRegisterTypes.SelectedValue
select new
{
x.RectifyItemId,
x.HazardSourcePoint,
x.RiskAnalysis,
x.RiskPrevention
}).ToList();
this.drpRegisterDef.DataTextField = "HazardSourcePoint";
this.drpRegisterDef.DataValueField = "RectifyItemId";
this.drpRegisterDef.DataSource = query; //安全巡检类型
this.drpRegisterDef.DataBind();
this.txtRequirements.Text = "";
}
}
/// <summary>
/// 问题描述下拉列表文本变更事件
/// </summary>
/// <param name="sender"></param>
/// <param name="e"></param>
protected void drpRegisterDef_TextChanged(object sender, EventArgs e)
{
//给整改要求赋值
string selectedRegisterDefId = this.drpRegisterDef.SelectedValue;
if (!string.IsNullOrEmpty(selectedRegisterDefId) && selectedRegisterDefId != BLL.Const._Null)
{
var query = (from x in Funs.DB.Technique_RectifyItem
where x.RectifyItemId == selectedRegisterDefId
select new
{
x.RectifyItemId,
x.HazardSourcePoint,
x.RiskAnalysis,
x.RiskPrevention
}).FirstOrDefault();
if (query != null)
{
this.txtRequirements.Text = query.RiskPrevention;
}
}
}
}
}

13
SUBQHSE/FineUIPro.Web/HSSE/HiddenInspection/HiddenRectificationAdd.aspx.designer.cs generated
View File

@ -96,22 +96,13 @@ namespace FineUIPro.Web.HSSE.HiddenInspection
protected global::FineUIPro.DropDownList DropDownList1;
/// <summary>
/// drpRegisterDef 控件。
/// txtRegisterDef 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.DropDownList drpRegisterDef;
/// <summary>
/// txtRequirements 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.TextArea txtRequirements;
protected global::FineUIPro.TextArea txtRegisterDef;
/// <summary>
/// txtHandleIdea 控件。

1
SUBQHSE/FineUIPro.Web/HSSE/HiddenInspection/HiddenRectificationList.aspx
View File

@ -106,7 +106,6 @@
<f:DropDownList runat="server" EnableSimulateTree="True" LabelWidth="70px" LabelAlign="Right" Width="160px" Label="级别" ID="dpRiskLevel" AutoPostBack="true" OnSelectedIndexChanged="TextBox_TextChanged">
<f:ListItem Text="-请选择-" Value="" />
<f:ListItem Text="一般" Value="一般" />
<f:ListItem Text="较大" Value="较大" />
<f:ListItem Text="重大" Value="重大" />
</f:DropDownList>
</Items>

6
SUBQHSE/FineUIPro.Web/HSSE/HiddenInspection/HiddenRectificationView.aspx
View File

@ -36,12 +36,6 @@
</f:TextArea>
</Items>
</f:FormRow>
<f:FormRow>
<Items>
<f:TextArea ID="txtRequirements" runat="server" Label="整改要求" Readonly="true" Height="64px">
</f:TextArea>
</Items>
</f:FormRow>
<f:FormRow>
<Items>
<f:TextArea ID="txtTakeSteps" runat="server" Label="采取措施" Readonly="true" Height="50px">

1
SUBQHSE/FineUIPro.Web/HSSE/HiddenInspection/HiddenRectificationView.aspx.cs
View File

@ -93,7 +93,6 @@ namespace FineUIPro.Web.HSSE.HiddenInspection
// select x).ToList();
//Grid1.DataSource = punishRecords;
//Grid1.DataBind();
this.txtRequirements.Text = registration.Requirements;
}
}
}

9
SUBQHSE/FineUIPro.Web/HSSE/HiddenInspection/HiddenRectificationView.aspx.designer.cs generated
View File

@ -86,15 +86,6 @@ namespace FineUIPro.Web.HSSE.HiddenInspection
/// </remarks>
protected global::FineUIPro.TextArea txtProblemDescription;
/// <summary>
/// txtRequirements 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.TextArea txtRequirements;
/// <summary>
/// txtTakeSteps 控件。
/// </summary>

6
SUBQHSE/FineUIPro.Web/common/main.aspx.cs
View File

@ -345,10 +345,8 @@ namespace FineUIPro.Web.common
},
measuringInstrumentsData = new
{//计量器具数据
// useNum = cqmsData.UseNum ?? 0,//计量器具
// okNum = cqmsData.OKNum ?? 0,//校准合格
useNum = inspectionMachineList.Where(x => x.InspectionType == "计量").Sum(x => x.UnitsCount ?? 0),
okNum = inspectionMachineList.Where(x => x.InspectionType == "计量" && x.IsCheckOK.HasValue && x.IsCheckOK == true).Sum(x => x.UnitsCount ?? 0),
useNum = cqmsData.UseNum ?? 0,//计量器具
okNum = cqmsData.OKNum ?? 0,//校准合格
},
}
};

6
SUBQHSE/FineUIPro.Web/common/mainProject.aspx.cs
View File

@ -380,10 +380,8 @@ namespace FineUIPro.Web.common
},
measuringInstrumentsData = new
{//计量器具数据
// useNum = cqmsProjectData.UseNum ?? 0,//计量器具
// okNum = cqmsProjectData.OKNum ?? 0,//校准合格
useNum = inspectionMachineList.Where(x => x.InspectionType == "计量").Sum(x => x.UnitsCount ?? 0),
okNum = inspectionMachineList.Where(x => x.InspectionType == "计量" && x.IsCheckOK.HasValue && x.IsCheckOK == true).Sum(x => x.UnitsCount ?? 0),
useNum = cqmsProjectData.UseNum ?? 0,//计量器具
okNum = cqmsProjectData.OKNum ?? 0,//校准合格
},
}
};