lpf
/
CNCEC_SUBQHSE_WUHUAN
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'master' of https://gitee.com/frane-yang/SGGL_CWCEC

This commit is contained in:
高飞 2023-07-24 19:52:48 +08:00
parent 359e8058fe a2e258e885
commit 75398c0dc4
7 changed files with 106 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
DataBase/版本日志/SGGLDB_WH_2023-07-24.sql
View File

@ -94,6 +94,32 @@ LEFT JOIN dbo.Sys_User AS User4 ON User4.UserId = Registration.ResponsibleMan2
GO
delete from Sys_Menu where MenuId='2FC8AA2A-F421-4174-A05E-2711167AF141'
delete from Sys_ButtonToMenu where MenuId='2FC8AA2A-F421-4174-A05E-2711167AF141'
go
INSERT INTO dbo.Sys_Menu(MenuId,MenuName,Url,SortIndex,SuperMenu,MenuType,IsOffice,IsEnd,IsUsed)
VALUES('2FC8AA2A-F421-4174-A05E-2711167AF141','HSEѲ¼ì','HSSE/HiddenInspection/HiddenRectificationList.aspx?Type=0',10,'467A0CB9-737D-4451-965E-869EBC3A4BD6','Menu_HSSE',0,1,1)
GO
INSERT INTO dbo.Sys_ButtonToMenu(ButtonToMenuId,MenuId,ButtonName,SortIndex)
VALUES('E831F780-BDC2-4644-B132-40E27518805E','2FC8AA2A-F421-4174-A05E-2711167AF141','Ôö¼Ó',1)
INSERT INTO dbo.Sys_ButtonToMenu(ButtonToMenuId,MenuId,ButtonName,SortIndex)
VALUES('9112B8B8-50A0-4592-AE06-2AC24E07E20B','2FC8AA2A-F421-4174-A05E-2711167AF141','ÐÞ¸Ä',2)
INSERT INTO dbo.Sys_ButtonToMenu(ButtonToMenuId,MenuId,ButtonName,SortIndex)
VALUES('3FF03C33-A07D-48CF-A0E2-D7A7542FBD69','2FC8AA2A-F421-4174-A05E-2711167AF141','ɾ³ý',3)
INSERT INTO dbo.Sys_ButtonToMenu(ButtonToMenuId,MenuId,ButtonName,SortIndex)
VALUES('55598440-05EF-4E70-86E6-81317BF19D94','2FC8AA2A-F421-4174-A05E-2711167AF141','±£´æ',4)
GO
INSERT INTO dbo.Sys_Menu(MenuId,MenuName,Url,SortIndex,SuperMenu,MenuType,IsOffice,IsEnd,IsUsed)
VALUES('379555F6-BECF-4E87-8F1C-73F529D260FF','³£¹æѲ¼ì','HSSE/HiddenInspection/HiddenRectificationList.aspx?Type=1',15,'467A0CB9-737D-4451-965E-869EBC3A4BD6','Menu_HSSE',0,1,1)
GO
INSERT INTO dbo.Sys_ButtonToMenu(ButtonToMenuId,MenuId,ButtonName,SortIndex)
VALUES('1B39CEAF-EA02-4053-A767-A8F1CFE75CED','379555F6-BECF-4E87-8F1C-73F529D260FF','Ôö¼Ó',1)
INSERT INTO dbo.Sys_ButtonToMenu(ButtonToMenuId,MenuId,ButtonName,SortIndex)
VALUES('3C6AAA2F-30A5-4785-A7B3-0E4CE3E7FB30','379555F6-BECF-4E87-8F1C-73F529D260FF','ÐÞ¸Ä',2)
INSERT INTO dbo.Sys_ButtonToMenu(ButtonToMenuId,MenuId,ButtonName,SortIndex)
VALUES('2227CD60-EAD8-4B7B-9FFE-B6B7A1B8DC82','379555F6-BECF-4E87-8F1C-73F529D260FF','ɾ³ý',3)
INSERT INTO dbo.Sys_ButtonToMenu(ButtonToMenuId,MenuId,ButtonName,SortIndex)
VALUES('681D60A9-8D04-4EA9-B899-42C925A29134','379555F6-BECF-4E87-8F1C-73F529D260FF','±£´æ',4)
GO

14
DataBase/菜单初始化脚本/1-3安全管理（Menu_HSSE）.sql
View File

@ -563,7 +563,7 @@ INSERT INTO dbo.Sys_Menu(MenuId,MenuName,Url,SortIndex,SuperMenu,MenuType,IsOffi
VALUES('467A0CB9-737D-4451-965E-869EBC3A4BD6','HSE¼ì²é','',100,'0','Menu_HSSE',0,0,1)
GO
INSERT INTO dbo.Sys_Menu(MenuId,MenuName,Url,SortIndex,SuperMenu,MenuType,IsOffice,IsEnd,IsUsed)
VALUES('2FC8AA2A-F421-4174-A05E-2711167AF141','HSEѲ¼ì','HSSE/HiddenInspection/HiddenRectificationList.aspx',10,'467A0CB9-737D-4451-965E-869EBC3A4BD6','Menu_HSSE',0,1,1)
VALUES('2FC8AA2A-F421-4174-A05E-2711167AF141','HSEѲ¼ì','HSSE/HiddenInspection/HiddenRectificationList.aspx?Type=0',10,'467A0CB9-737D-4451-965E-869EBC3A4BD6','Menu_HSSE',0,1,1)
GO
INSERT INTO dbo.Sys_ButtonToMenu(ButtonToMenuId,MenuId,ButtonName,SortIndex)
VALUES('E831F780-BDC2-4644-B132-40E27518805E','2FC8AA2A-F421-4174-A05E-2711167AF141','Ôö¼Ó',1)
@ -574,6 +574,18 @@ GO
INSERT INTO dbo.Sys_ButtonToMenu(ButtonToMenuId,MenuId,ButtonName,SortIndex)
VALUES('55598440-05EF-4E70-86E6-81317BF19D94','2FC8AA2A-F421-4174-A05E-2711167AF141','±£´æ',4)
GO
INSERT INTO dbo.Sys_Menu(MenuId,MenuName,Url,SortIndex,SuperMenu,MenuType,IsOffice,IsEnd,IsUsed)
VALUES('379555F6-BECF-4E87-8F1C-73F529D260FF','³£¹æѲ¼ì','HSSE/HiddenInspection/HiddenRectificationList.aspx?Type=1',15,'467A0CB9-737D-4451-965E-869EBC3A4BD6','Menu_HSSE',0,1,1)
GO
INSERT INTO dbo.Sys_ButtonToMenu(ButtonToMenuId,MenuId,ButtonName,SortIndex)
VALUES('1B39CEAF-EA02-4053-A767-A8F1CFE75CED','379555F6-BECF-4E87-8F1C-73F529D260FF','Ôö¼Ó',1)
INSERT INTO dbo.Sys_ButtonToMenu(ButtonToMenuId,MenuId,ButtonName,SortIndex)
VALUES('3C6AAA2F-30A5-4785-A7B3-0E4CE3E7FB30','379555F6-BECF-4E87-8F1C-73F529D260FF','ÐÞ¸Ä',2)
INSERT INTO dbo.Sys_ButtonToMenu(ButtonToMenuId,MenuId,ButtonName,SortIndex)
VALUES('2227CD60-EAD8-4B7B-9FFE-B6B7A1B8DC82','379555F6-BECF-4E87-8F1C-73F529D260FF','ɾ³ý',3)
INSERT INTO dbo.Sys_ButtonToMenu(ButtonToMenuId,MenuId,ButtonName,SortIndex)
VALUES('681D60A9-8D04-4EA9-B899-42C925A29134','379555F6-BECF-4E87-8F1C-73F529D260FF','±£´æ',4)
GO
INSERT INTO dbo.Sys_Menu(MenuId,MenuName,Url,SortIndex,SuperMenu,MenuType,IsOffice,IsEnd,IsUsed)
VALUES('0E30F917-0C51-4C45-BD19-981039CA44F5','ÈÕ³£Ñ²¼ì','HSSE/Check/CheckDayWH.aspx',15,'467A0CB9-737D-4451-965E-869EBC3A4BD6','Menu_HSSE',0,1,1)

3
SGGL/BLL/HSSE/HiddenInspection/HSSE_Hazard_HazardRegisterService.cs
View File

@ -69,6 +69,7 @@ namespace BLL
newHazardRegister.ProblemTypes = hazardRegister.ProblemTypes;
newHazardRegister.DIC_ID = hazardRegister.DIC_ID;
newHazardRegister.Risk_Level = hazardRegister.Risk_Level;
newHazardRegister.Type=hazardRegister.Type;
db.HSSE_Hazard_HazardRegister.InsertOnSubmit(newHazardRegister);
db.SubmitChanges();
}
@ -109,6 +110,8 @@ namespace BLL
newHazardRegister.CutPayment = hazardRegister.CutPayment;
newHazardRegister.ProblemTypes = hazardRegister.ProblemTypes;
newHazardRegister.DIC_ID = hazardRegister.DIC_ID;
newHazardRegister.Type = hazardRegister.Type;
//把附件表的路径复制过来
Model.AttachFile file = BLL.AttachFileService.GetAttachFile(hazardRegister.HazardRegisterId, Const.HSSE_HiddenRectificationListMenuId);
if (file != null)

38
SGGL/FineUIPro.Web/HSSE/HiddenInspection/HiddenRectificationAdd.aspx.cs
View File

@ -51,6 +51,21 @@ namespace FineUIPro.Web.HSSE.HiddenInspection
ViewState["RectificationImageUrl"] = value;
}
}
/// <summary>
/// 巡检类型 0 日常 1 常规
/// </summary>
public string Type
{
get
{
return (string)ViewState["Type"];
}
set
{
ViewState["Type"] = value;
}
}
#endregion
#region 加载
@ -65,6 +80,8 @@ namespace FineUIPro.Web.HSSE.HiddenInspection
{
if (!IsPostBack)
{
Type = Request.Params["Type"];
this.btnClose.OnClientClick = ActiveWindow.GetHideReference();
UnitService.InitUnitByProjectIdUnitTypeDropDownList(this.drpUnit, this.CurrUser.LoginProjectId, Const.ProjectUnitType_2, true);
@ -73,7 +90,16 @@ namespace FineUIPro.Web.HSSE.HiddenInspection
this.drpRegisterTypes.DataTextField = "RegisterTypesName";
this.drpRegisterTypes.DataValueField = "RegisterTypesId";
this.drpRegisterTypes.DataSource = BLL.HSSE_Hazard_HazardRegisterTypesService.GetHazardRegisterTypesList("1"); //安全巡检类型
if (Type=="1")
{
this.drpRegisterTypes.DataSource = BLL.HSSE_Hazard_HazardRegisterTypesService.GetHazardRegisterTypesList("4"); //安全巡检类型
}
else
{
this.drpRegisterTypes.DataSource = BLL.HSSE_Hazard_HazardRegisterTypesService.GetHazardRegisterTypesList("1"); //安全巡检类型
}
this.drpRegisterTypes.DataBind();
this.HazardRegisterId = Request.Params["HazardRegisterId"];
//新增初始化
@ -220,6 +246,16 @@ namespace FineUIPro.Web.HSSE.HiddenInspection
register.CheckCycle = this.ckType.SelectedValue;
register.Risk_Level = this.dpRiskLevel.SelectedText;
register.IsEffective = "1";
var RegisterTypesDt =BLL.HSSE_Hazard_HazardRegisterTypesService.GetTitleByRegisterTypesId(register.RegisterTypesId);
if (RegisterTypesDt != null && RegisterTypesDt .HazardRegisterType=="4")
{
register.Type = 1; //常规巡检
}
else
{
register.Type = 0; //日常巡检
}
if (this.drpUnit.SelectedValue != BLL.Const._Null)
{
register.ResponsibleUnit = this.drpUnit.SelectedValue;

25
SGGL/FineUIPro.Web/HSSE/HiddenInspection/HiddenRectificationList.aspx.cs
View File

@ -26,6 +26,21 @@ namespace FineUIPro.Web.HSSE.HiddenInspection
ViewState["ItemSelectedList"] = value;
}
}
/// <summary>
/// 巡检类型 0 日常 1 常规
/// </summary>
public string Type
{
get
{
return (string )ViewState["Type"];
}
set
{
ViewState["Type"] = value;
}
}
#endregion
#region 加载页面
@ -38,6 +53,7 @@ namespace FineUIPro.Web.HSSE.HiddenInspection
{
if (!IsPostBack)
{
Type = Request.Params["Type"];
Funs.DropDownPageSize(this.ddlPageSize);
GetButtonPower();
this.ItemSelectedList = new List<string>();
@ -64,6 +80,11 @@ namespace FineUIPro.Web.HSSE.HiddenInspection
strSql += " AND ProjectId = @ProjectId";
listStr.Add(new SqlParameter("@ProjectId", this.CurrUser.LoginProjectId));
}
if (!string.IsNullOrEmpty(Type))
{
strSql += " AND Type = @Type";
listStr.Add(new SqlParameter("@Type", Type));
}
if (!string.IsNullOrEmpty(this.txtCheckMan.Text.Trim()))
{
strSql += " AND CheckManName LIKE @CheckMan";
@ -235,7 +256,7 @@ namespace FineUIPro.Web.HSSE.HiddenInspection
{
if (registration.CheckManId == this.CurrUser.UserId) //当前人是检查人，可以在整改前继续编辑
{
PageContext.RegisterStartupScript(Window1.GetShowReference(String.Format("HiddenRectificationAdd.aspx?HazardRegisterId={0}", RegistrationId, "编辑 - ")));
PageContext.RegisterStartupScript(Window1.GetShowReference(String.Format("HiddenRectificationAdd.aspx?HazardRegisterId={0}&&Type={1}", RegistrationId,Type, "编辑 - ")));
}
else
{
@ -350,7 +371,7 @@ namespace FineUIPro.Web.HSSE.HiddenInspection
{
if (BLL.CommonService.GetAllButtonPowerList(this.CurrUser.LoginProjectId, this.CurrUser.UserId, BLL.Const.HSSE_HiddenRectificationListMenuId, BLL.Const.BtnAdd))
{
PageContext.RegisterStartupScript(Window1.GetShowReference(String.Format("HiddenRectificationAdd.aspx", "登记 - ")));
PageContext.RegisterStartupScript(Window1.GetShowReference(String.Format("HiddenRectificationAdd.aspx?Type={0}",Type, "登记 - ")));
}
else
{

3
SGGL/FineUIPro.Web/common/Menu_HSSE.xml
View File

@ -51,7 +51,8 @@
<TreeNode id="909BBC10-68D4-4C97-9FC3-9C1168D5FBC5" Text="培训试卷" NavigateUrl="BoSheng/BoExam.aspx"></TreeNode>
<TreeNode id="C5DF2DE4-EB56-45F9-9881-6CD0B7A8E72F" Text="人员培训记录" NavigateUrl="BoSheng/BoPersonTrainRecord.aspx"></TreeNode>
</TreeNode>
<TreeNode id="467A0CB9-737D-4451-965E-869EBC3A4BD6" Text="HSE检查" NavigateUrl=""><TreeNode id="2FC8AA2A-F421-4174-A05E-2711167AF141" Text="HSE巡检" NavigateUrl="HSSE/HiddenInspection/HiddenRectificationList.aspx"></TreeNode>
<TreeNode id="467A0CB9-737D-4451-965E-869EBC3A4BD6" Text="HSE检查" NavigateUrl=""><TreeNode id="2FC8AA2A-F421-4174-A05E-2711167AF141" Text="HSE巡检" NavigateUrl="HSSE/HiddenInspection/HiddenRectificationList.aspx?Type=0"></TreeNode>
<TreeNode id="379555F6-BECF-4E87-8F1C-73F529D260FF" Text="常规巡检" NavigateUrl="HSSE/HiddenInspection/HiddenRectificationList.aspx?Type=1"></TreeNode>
<TreeNode id="1B08048F-93ED-4E84-AE65-DB7917EA2DFB" Text="专项检查" NavigateUrl="HSSE/Check/CheckSpecial.aspx"></TreeNode>
<TreeNode id="C198EBA8-9E23-4654-92E1-09C61105C522" Text="综合检查" NavigateUrl="HSSE/Check/CheckColligation.aspx"></TreeNode>
<TreeNode id="355265DE-901A-4110-B934-B4DA067C4334" Text="领导带班检查" NavigateUrl="HSSE/Check/ProjectLeaderCheck.aspx"></TreeNode>

1
SGGL/FineUIPro.Web/common/Menu_TestRun.xml
View File

@ -37,6 +37,7 @@
<TreeNode id="AD6E08B6-5571-4FFB-BDBE-9E6811770BD6" Text="预试车管理" NavigateUrl=""><TreeNode id="5C07E135-C3AB-4CE4-97A2-C79970640272" Text="系统划分" NavigateUrl="TestRun/BeforeTestRun/DeviceRun.aspx"></TreeNode>
<TreeNode id="B4702BFB-8CEB-46AD-BDC0-751D146FE228" Text="工作包设置" NavigateUrl="TestRun/BeforeTestRun/SetWorkPackage.aspx"></TreeNode>
<TreeNode id="34719347-E5EE-4491-9E92-B1270C187C7F" Text="工作包裁剪" NavigateUrl="TestRun/BeforeTestRun/SubSysWorkPackage.aspx"></TreeNode>
<TreeNode id="F0E06491-B1DA-4510-ABCA-D09F4B24EE50" Text="子系统资产导入" NavigateUrl="TestRun/BeforeTestRun/SysPipingDeviceImport.aspx"></TreeNode>
<TreeNode id="A5D6EBB7-E7C8-48EE-8DBD-735117D3C62D" Text="单机试车" NavigateUrl="TestRun/BeforeTestRun/BeforeTestRun.aspx?type=1"></TreeNode>
<TreeNode id="EC5E63A4-8398-406C-AC79-34851AD49DF2" Text="冲洗吹扫" NavigateUrl="TestRun/BeforeTestRun/BeforeTestRun.aspx?type=2"></TreeNode>
<TreeNode id="C8A9A464-D6F4-4140-82DB-4AFCA26EF2A1" Text="化学清洗" NavigateUrl="TestRun/BeforeTestRun/BeforeTestRun.aspx?type=3"></TreeNode>