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

修改进度计划编制

This commit is contained in:
高飞 2023-09-01 15:13:28 +08:00
parent 06e3944166 0f0da8e8bf
commit d53cc3beb0
46 changed files with 1383 additions and 330 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

68
DataBase/版本日志/SGGLDB_V2023-09-01.sql
View File

@ -1,24 +1,52 @@
ALTER VIEW [dbo].[View_WBS]
AS
select '1' as Id,'0' as SupId ,'JZ' as Code, '½¨Öþ¹¤³Ì' as Name,'ProjectType' as WBSType,null as PlanStartDate,null as PlanEndDate,null as RealEndDate,null as WBSCode,
ProjectId from dbo.WBS_UnitWork
Union
select '2' as Id,'0' as SupId ,'AZ' as Code, '°²×°¹¤³Ì' as Name,'ProjectType' as WBSType,null as PlanStartDate,null as PlanEndDate,null as RealEndDate,null as WBSCode,
ProjectId from dbo.WBS_UnitWork
Union
select UnitWorkId as Id,ProjectType as SupId ,UnitWorkCode as Code, UnitWorkCode+'-'+UnitWorkName as Name,'UnitWork' as WBSType,PlanStartDate, PlanEndDate,RealEndDate,WBSCode,
ProjectId from dbo.WBS_UnitWork
Union all
select WorkPackageId as id,UnitWorkId as SupId,WorkPackageCode as Code,WorkPackageCode+'-'+PackageContent as Name,'WorkPackage' as WBSType,PlanStartDate, PlanEndDate,RealEndDate,WBSCode,
ProjectId from dbo.WBS_WorkPackage w where IsApprove=1 and SuperWorkPackageId is null
Union all
select WorkPackageId as id,SuperWorkPackageId as SupId,WorkPackageCode as Code, WorkPackageCode+'-'+PackageContent as Name,'WorkPackage' as WBSType,PlanStartDate, PlanEndDate,RealEndDate,WBSCode,
ProjectId from dbo.WBS_WorkPackage w where IsApprove=1 and SuperWorkPackageId is not null
ALTER VIEW [dbo].[View_Solution_LargerHazardListItem]
AS
/*危大工程清单明细列表视图*/
SELECT Project.ProjectCode
,ISNULL(Project.ShortName,Project.ProjectName) AS ProjectName
,Project.ProjectId
,list.HazardCode
,list.RecordTime
,list.RecardManId
,list.Remark
,list.States
,list.VersionNo
,Item.LargerHazardListItemId
,Item.SortIndex
,Item.LargerHazardListId
,Item.UnitWorkId
,(UnitWork.UnitWorkName+'('+(CASE WHEN UnitWork.ProjectType='1' THEN '建筑' ELSE '安装' END)+')') AS UnitWorkName
,Item.WorkPackageId
,WorkPackageName AS PackageContent
,Item.WorkPackageSize
,Item.ExpectedStartTime
,Item.ExpectedEndTime
,Item.IsArgument
,(CASE WHEN Item.IsArgument=1 THEN '是' ELSE '否' END) AS IsArgumentName
,Item.WorkStates
,constw.ConstText AS WorkStatesName
,Item.UnitId
,Unit.UnitName
,((CASE WHEN Item.ExpectedStartTime IS NULL THEN '' ELSE CONVERT(varchar(100), Item.ExpectedStartTime,23) END)
+ '至'+ (CASE WHEN Item.ExpectedEndTime IS NULL THEN '' ELSE CONVERT(varchar(100), Item.ExpectedEndTime,23) END)) AS ExpectedTime
FROM dbo.Solution_LargerHazardListItem AS Item
LEFT JOIN Solution_LargerHazardList AS list ON Item.LargerHazardListId=list.LargerHazardListId
LEFT JOIN Base_Project AS Project ON Project.ProjectId=list.ProjectId
LEFT JOIN WBS_UnitWork AS UnitWork ON Item.UnitWorkId=UnitWork.UnitWorkId
--LEFT JOIN WBS_WorkPackage AS Package ON Item.WorkPackageId=Package.WorkPackageId
LEFT JOIN Base_Unit AS Unit ON Item.UnitId=Unit.UnitId
LEFT JOIN Sys_Const AS constw ON Item.WorkStates=constw.ConstValue AND constw.GroupId='WorkStates'
GO
ALTER TABLE Solution_LargerHazardListItem ALTER COLUMN WorkPackageId NVARCHAR(2000) NULL
GO
ALTER TABLE Solution_LargerHazardListItem ADD WorkPackageName NVARCHAR(2000) NULL
GO
ALTER TABLE Check_SpotCheckDetail ADD WorkPackageId NVARCHAR(2000) NULL
GO
GO
ALTER TABLE Accident_AccidentPersonRecord ADD WorkPackageId NVARCHAR(2000) NULL
GO
ALTER TABLE Accident_AccidentPersonRecord ADD WorkPackageName NVARCHAR(2000) NULL
GO

0
DataBase/版本日志/SGGLDB_V2023-07-11.sql → DataBase/版本日志/已更新脚本/SGGLDB_V2023-07-11.sql
View File

0
DataBase/版本日志/SGGLDB_V2023-07-12.sql → DataBase/版本日志/已更新脚本/SGGLDB_V2023-07-12.sql
View File

0
DataBase/版本日志/SGGLDB_V2023-07-20.sql → DataBase/版本日志/已更新脚本/SGGLDB_V2023-07-20.sql
View File

0
DataBase/版本日志/SGGLDB_V2023-07-21.sql → DataBase/版本日志/已更新脚本/SGGLDB_V2023-07-21.sql
View File

0
DataBase/版本日志/SGGLDB_V2023-07-23.sql → DataBase/版本日志/已更新脚本/SGGLDB_V2023-07-23.sql
View File

0
DataBase/版本日志/SGGLDB_V2023-07-25.sql → DataBase/版本日志/已更新脚本/SGGLDB_V2023-07-25.sql
View File

0
DataBase/版本日志/SGGLDB_V2023-08-01.sql → DataBase/版本日志/已更新脚本/SGGLDB_V2023-08-01.sql
View File

0
DataBase/版本日志/SGGLDB_V2023-08-04.sql → DataBase/版本日志/已更新脚本/SGGLDB_V2023-08-04.sql
View File

0
DataBase/版本日志/SGGLDB_V2023-08-22(大数据中心菜单修改).sql → DataBase/版本日志/已更新脚本/SGGLDB_V2023-08-22(大数据中心菜单修改).sql
View File

0
DataBase/版本日志/SGGLDB_V2023-08-22.sql → DataBase/版本日志/已更新脚本/SGGLDB_V2023-08-22.sql
View File

0
DataBase/版本日志/SGGLDB_V2023-08-23.sql → DataBase/版本日志/已更新脚本/SGGLDB_V2023-08-23.sql
View File

0
DataBase/版本日志/SGGLDB_V2023-08-25.sql → DataBase/版本日志/已更新脚本/SGGLDB_V2023-08-25.sql
View File

0
DataBase/版本日志/SGGLDB_V2023-08-26.sql → DataBase/版本日志/已更新脚本/SGGLDB_V2023-08-26.sql
View File

4
SGGL/BLL/CQMS/Check/SpotCheckDetailService.cs
View File

@ -41,6 +41,7 @@ namespace BLL
newSpotCheckDetail.SpotCheckDetailId = SpotCheckDetail.SpotCheckDetailId;
newSpotCheckDetail.SpotCheckCode = SpotCheckDetail.SpotCheckCode;
newSpotCheckDetail.ControlItemAndCycleId = SpotCheckDetail.ControlItemAndCycleId;
newSpotCheckDetail.WorkPackageId = WorkPackageService.getWorkPageIdsByControlItemAndCycle(SpotCheckDetail.ControlItemAndCycleId);
newSpotCheckDetail.IsOnesOK = SpotCheckDetail.IsOnesOK;
newSpotCheckDetail.IsOK = SpotCheckDetail.IsOK;
newSpotCheckDetail.ConfirmDate = SpotCheckDetail.ConfirmDate;
@ -58,6 +59,7 @@ namespace BLL
newSpotCheckDetail.SpotCheckDetailId = SpotCheckDetail.SpotCheckDetailId;
newSpotCheckDetail.SpotCheckCode = SpotCheckDetail.SpotCheckCode;
newSpotCheckDetail.ControlItemAndCycleId = SpotCheckDetail.ControlItemAndCycleId;
newSpotCheckDetail.WorkPackageId = WorkPackageService.getWorkPageIdsByControlItemAndCycle(SpotCheckDetail.ControlItemAndCycleId);
newSpotCheckDetail.IsOnesOK = SpotCheckDetail.IsOnesOK;
newSpotCheckDetail.IsOK = SpotCheckDetail.IsOK;
newSpotCheckDetail.ConfirmDate = SpotCheckDetail.ConfirmDate;
@ -80,6 +82,7 @@ namespace BLL
{
newSpotCheckDetail.SpotCheckCode = SpotCheckDetail.SpotCheckCode;
newSpotCheckDetail.ControlItemAndCycleId = SpotCheckDetail.ControlItemAndCycleId;
newSpotCheckDetail.WorkPackageId = WorkPackageService.getWorkPageIdsByControlItemAndCycle(SpotCheckDetail.ControlItemAndCycleId);
newSpotCheckDetail.IsOnesOK = SpotCheckDetail.IsOnesOK;
newSpotCheckDetail.IsOK = SpotCheckDetail.IsOK;
newSpotCheckDetail.ConfirmDate = SpotCheckDetail.ConfirmDate;
@ -334,6 +337,7 @@ namespace BLL
newSpotCheckDetail.SpotCheckCode = SpotCheckDetail.SpotCheckCode;
if (!string.IsNullOrEmpty(SpotCheckDetail.ControlItemAndCycleId))
newSpotCheckDetail.ControlItemAndCycleId = SpotCheckDetail.ControlItemAndCycleId;
newSpotCheckDetail.WorkPackageId = WorkPackageService.getWorkPageIdsByControlItemAndCycle(SpotCheckDetail.ControlItemAndCycleId);
if (SpotCheckDetail.IsOnesOK.HasValue)
newSpotCheckDetail.IsOnesOK = SpotCheckDetail.IsOnesOK;
if (SpotCheckDetail.IsOK.HasValue)

57
SGGL/BLL/CQMS/WBS/WorkPackageService.cs
View File

@ -682,5 +682,62 @@ namespace BLL
}
}
}
#region 根据工作包ID获取wbs节点及父节点字符串
/// <summary>
/// 根据工作包ID获取wbs节点及父节点字符串
/// </summary>
/// <param name="controlItemAndCycleId"></param>
/// <returns></returns>
public static string getWorkPageIdsByControlItemAndCycle(string controlItemAndCycleId)
{
string returnValues = string.Empty;
var getControlItemAndCycle = Funs.DB.WBS_ControlItemAndCycle.FirstOrDefault(x => x.ControlItemAndCycleId == controlItemAndCycleId);
if (getControlItemAndCycle != null)
{
var getWorkPackage = Funs.DB.WBS_WorkPackage.FirstOrDefault(x => x.WorkPackageId == getControlItemAndCycle.WorkPackageId);
if (getWorkPackage != null)
{
returnValues = getSelectIds(getWorkPackage.WorkPackageId, getWorkPackage.WorkPackageId + "[" + getWorkPackage.InitWorkPackageCode + "]$" + controlItemAndCycleId);
}
}
return returnValues;
}
/// <summary>
/// id
/// </summary>
/// <param name="node"></param>
/// <param name="id"></param>
/// <returns></returns>
public static string getSelectIds(string workPageId, string returnValues)
{
var getWorkPackage = Funs.DB.WBS_WorkPackage.FirstOrDefault(x => x.WorkPackageId == workPageId);
if (getWorkPackage != null)
{
if (!string.IsNullOrEmpty(getWorkPackage.SuperWorkPackageId))
{
var getSupWorkPackage = Funs.DB.WBS_WorkPackage.FirstOrDefault(x => x.WorkPackageId == getWorkPackage.SuperWorkPackageId);
if (getSupWorkPackage != null)
{
returnValues = getWorkPackage.SuperWorkPackageId + "[" + getWorkPackage.InitWorkPackageCode + "]" + "|" + returnValues;
returnValues = getSelectIds(getWorkPackage.SuperWorkPackageId, returnValues);
}
}
else
{
var getUnitWork = Funs.DB.WBS_UnitWork.FirstOrDefault(x => x.UnitWorkId == getWorkPackage.UnitWorkId);
if (getUnitWork != null)
{
returnValues = ("Type" + getUnitWork.ProjectType ?? "1") + "|" + getUnitWork.UnitWorkId + "|" + returnValues;
}
}
}
return returnValues;
}
#endregion
}
}

2
SGGL/BLL/HSSE/Solution/ExpertArgumentService.cs
View File

@ -191,6 +191,7 @@ namespace BLL
LargerHazardListId = LargerHazardListItem.LargerHazardListId,
UnitWorkId = LargerHazardListItem.UnitWorkId,
WorkPackageId = LargerHazardListItem.WorkPackageId,
WorkPackageName = LargerHazardListItem.WorkPackageName,
WorkPackageSize = LargerHazardListItem.WorkPackageSize,
ExpectedStartTime = LargerHazardListItem.ExpectedStartTime,
ExpectedEndTime = LargerHazardListItem.ExpectedEndTime,
@ -215,6 +216,7 @@ namespace BLL
newLargerHazardListItem.SortIndex = LargerHazardListItem.SortIndex;
newLargerHazardListItem.UnitWorkId = LargerHazardListItem.UnitWorkId;
newLargerHazardListItem.WorkPackageId = LargerHazardListItem.WorkPackageId;
newLargerHazardListItem.WorkPackageName = LargerHazardListItem.WorkPackageName;
newLargerHazardListItem.WorkPackageSize = LargerHazardListItem.WorkPackageSize;
newLargerHazardListItem.ExpectedStartTime = LargerHazardListItem.ExpectedStartTime;
newLargerHazardListItem.ExpectedEndTime = LargerHazardListItem.ExpectedEndTime;

2
SGGL/BLL/ProjectData/ProjectService.cs
View File

@ -338,7 +338,7 @@
}
var pcount = (from x in db.Sys_Log
where x.ProjectId != null && x.OperationTime > DateTime.Now.AddDays(-2)
where x.ProjectId != null && x.OperationTime > DateTime.Now.AddDays(-1)
group x by x.ProjectId into g
select new { g.First().ProjectId, count = g.Count() }).Distinct();

34
SGGL/FineUIPro.Web/DigData/ProjectWBSDW.aspx
View File

@ -37,6 +37,7 @@
<f:CheckItem Value="HTGL" Text="合同数据" />
<f:CheckItem Value="LW" Text="劳务数据" />
</f:CheckBoxList>
<f:TextBox runat="server" ID="hdWorkPackageId" Hidden="true"></f:TextBox>
<f:Button ID="btnNew" Text="新增" Icon="Add" EnablePostBack="false" runat="server">
</f:Button>
</Items>
@ -45,19 +46,46 @@
<Items>
<f:GroupPanel runat="server" ID="Panel_CurrentApproval" Title="工作包" Layout="VBox" Height="200px" AutoScroll="true">
<Items>
<f:CheckBoxList runat="server" ID="cblControlItem" Readonly="true"
<f:RadioButtonList runat="server" ID="cblControlItem"
AutoPostBack="true" OnSelectedIndexChanged="cblControlItem_SelectedIndexChanged"
AutoColumnWidth="true" ColumnNumber="5">
</f:CheckBoxList>
</f:RadioButtonList>
</Items>
</f:GroupPanel>
<f:GroupPanel runat="server" ID="gpHSSE" Title="安全数据" Layout="VBox" Hidden="true"
Height="300px" AutoScroll="true">
<Items>
<f:Form ID="SimpleForm1" ShowBorder="false" ShowHeader="false" AutoScroll="true" EnableTableStyle="true"
BodyPadding="10px" runat="server" RedStarPosition="BeforeText" LabelAlign="Right" LabelWidth="120px">
<Rows>
<f:FormRow>
<Items>
<f:Label ID="lbExpertArgument" runat="server" Label="危大工程数量">
</f:Label>
</Items>
</f:FormRow>
</Rows>
</f:Form>
</Items>
</f:GroupPanel>
<f:GroupPanel runat="server" ID="gpCQMS" Title="质量数据" Layout="VBox" Hidden="true"
Height="300px" AutoScroll="true">
<Items>
<f:Form ID="Form2" ShowBorder="false" ShowHeader="false" AutoScroll="true" EnableTableStyle="true"
BodyPadding="10px" runat="server" RedStarPosition="BeforeText" LabelAlign="Right" LabelWidth="180px">
<Rows>
<f:FormRow>
<Items>
<f:Label ID="lbSpotCheck1" runat="server" Label="实体验收共检项数">
</f:Label>
<f:Label ID="lbSpotCheck2" runat="server" Label="实体验收共检一次合格数">
</f:Label>
<f:Label ID="lbSpotCheck" runat="server" Label="实体验收一次合格率">
</f:Label>
</Items>
</f:FormRow>
</Rows>
</f:Form>
</Items>
</f:GroupPanel>
<f:GroupPanel runat="server" ID="gpJDGL" Title="进度数据" Layout="VBox" Hidden="true"
@ -81,7 +109,7 @@
</f:Panel>
<f:Window ID="Window1" Title="WBS" Hidden="true" EnableIFrame="true" EnableMaximize="true"
Target="Self" EnableResize="false" runat="server" IsModal="true"
Width="800px" Height="650px">
Width="1200px" Height="650px">
</f:Window>
</form>
<script type="text/javascript">

130
SGGL/FineUIPro.Web/DigData/ProjectWBSDW.aspx.cs
View File

@ -7,21 +7,6 @@ namespace FineUIPro.Web.DigData
{
public partial class ProjectWBSDW : PageBase
{
/// <summary>
/// 主键
/// </summary>
public string WorkPackageId
{
get
{
return (string)ViewState["WorkPackageId"];
}
set
{
ViewState["WorkPackageId"] = value;
}
}
/// <summary>
/// 项目ID
/// </summary>
@ -50,23 +35,21 @@ namespace FineUIPro.Web.DigData
////权限按钮方法
// this.ucTree.WorkPackageCode = this.WorkPackageCode;
this.ucTree.ProjectId = this.ProjectId;
this.btnNew.OnClientClick = Window1.GetShowReference("ShowProjectWBS.aspx") + "return false;";
this.btnNew.OnClientClick = Window1.GetShowReference("ShowProjectWBSPackage.aspx") + "return false;";
}
}
protected void changeTree(object sender, EventArgs e)
{
this.WorkPackageId = this.ucTree.WorkPackageId;
this.hdWorkPackageId.Text = this.ucTree.WorkPackageId;
initControlItem();
}
protected void changeTree2(object sender, EventArgs e)
{
string a = this.ucTree.WorkPackageId;
}
/// <summary>
///
/// </summary>
/// <param name="sender"></param>
/// <param name="e"></param>
protected void ckType_SelectedIndexChanged(object sender, EventArgs e)
{
this.gpHSSE.Hidden = true;
@ -74,29 +57,7 @@ namespace FineUIPro.Web.DigData
this.gpJDGL.Hidden = true;
this.gpHTGL.Hidden = true;
this.gpLW.Hidden = true;
foreach (var item in this.ckType.SelectedValueArray)
{
if (item == "HSSE")
{
this.gpHSSE.Hidden = false;
}
if (item == "CQMS")
{
this.gpCQMS.Hidden = false;
}
if (item == "JDGL")
{
this.gpJDGL.Hidden = false;
}
if (item == "HTGL")
{
this.gpHTGL.Hidden = false;
}
if (item == "LW")
{
this.gpLW.Hidden = false;
}
}
SetData();
}
/// <summary>
@ -104,11 +65,80 @@ namespace FineUIPro.Web.DigData
/// </summary>
protected void initControlItem()
{
var getControlItem = from x in Funs.DB.WBS_ControlItemAndCycle where x.WorkPackageId == this.WorkPackageId select x;
cblControlItem.DataValueField = "ControlItemCode";
var getControlItem = from x in Funs.DB.WBS_ControlItemAndCycle
where x.WorkPackageId == this.hdWorkPackageId.Text
select x;
cblControlItem.DataValueField = "ControlItemAndCycleId";
cblControlItem.DataTextField = "ControlItemContent";
cblControlItem.DataSource = getControlItem;
cblControlItem.DataBind();
cblControlItem.DataBind();
SetData();
}
/// <summary>
///
/// </summary>
/// <param name="sender"></param>
/// <param name="e"></param>
protected void cblControlItem_SelectedIndexChanged(object sender, EventArgs e)
{
SetData();
}
/// <summary>
/// 数据展示
/// </summary>
private void SetData()
{
string workPackageId = this.hdWorkPackageId.Text;
string controlItemAndCycleId = this.cblControlItem.SelectedValue;
if (workPackageId == "1" || workPackageId == "2")
{
workPackageId = "Type" + workPackageId;
}
if (!string.IsNullOrEmpty(workPackageId))
{
foreach (var item in this.ckType.SelectedValueArray)
{
if (item == "HSSE")
{
this.gpHSSE.Hidden = false;
this.lbExpertArgument.Text = (from x in Funs.DB.Solution_LargerHazardListItem
join y in Funs.DB.Solution_LargerHazardList on x.LargerHazardListId equals y.LargerHazardListId
where y.ProjectId == this.ProjectId && x.WorkPackageId.Contains(workPackageId) && y.States == Const.State_1
&& (controlItemAndCycleId == null || x.WorkPackageId.Contains(controlItemAndCycleId))
select x).Count().ToString();
}
if (item == "CQMS")
{
this.gpCQMS.Hidden = false;
var getDetail = from x in Funs.DB.Check_SpotCheckDetail
join y in Funs.DB.Check_SpotCheck on x.SpotCheckCode equals y.SpotCheckCode
where y.ProjectId == this.ProjectId && x.WorkPackageId.Contains(workPackageId) //&& y.States == Const.State_1
&& (controlItemAndCycleId == null || x.WorkPackageId.Contains(controlItemAndCycleId))
select x;
int all = getDetail.Count();
this.lbSpotCheck1.Text = all.ToString();
int okCount = getDetail.Where(x => x.IsOK == true).Count();
this.lbSpotCheck2.Text= okCount.ToString();
this.lbSpotCheck.Text= all > 0 ? Math.Round(okCount * 1.0 / (all * 1.0)).ToString() : "0";
}
if (item == "JDGL")
{
this.gpJDGL.Hidden = false;
}
if (item == "HTGL")
{
this.gpHTGL.Hidden = false;
}
if (item == "LW")
{
this.gpLW.Hidden = false;
}
}
}
}
}
}

65
SGGL/FineUIPro.Web/DigData/ProjectWBSDW.aspx.designer.cs generated
View File

@ -95,6 +95,15 @@ namespace FineUIPro.Web.DigData
/// </remarks>
protected global::FineUIPro.CheckBoxList ckType;
/// <summary>
/// hdWorkPackageId 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.TextBox hdWorkPackageId;
/// <summary>
/// btnNew 控件。
/// </summary>
@ -120,7 +129,7 @@ namespace FineUIPro.Web.DigData
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.CheckBoxList cblControlItem;
protected global::FineUIPro.RadioButtonList cblControlItem;
/// <summary>
/// gpHSSE 控件。
@ -131,6 +140,24 @@ namespace FineUIPro.Web.DigData
/// </remarks>
protected global::FineUIPro.GroupPanel gpHSSE;
/// <summary>
/// SimpleForm1 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Form SimpleForm1;
/// <summary>
/// lbExpertArgument 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Label lbExpertArgument;
/// <summary>
/// gpCQMS 控件。
/// </summary>
@ -140,6 +167,42 @@ namespace FineUIPro.Web.DigData
/// </remarks>
protected global::FineUIPro.GroupPanel gpCQMS;
/// <summary>
/// Form2 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Form Form2;
/// <summary>
/// lbSpotCheck1 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Label lbSpotCheck1;
/// <summary>
/// lbSpotCheck2 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Label lbSpotCheck2;
/// <summary>
/// lbSpotCheck 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Label lbSpotCheck;
/// <summary>
/// gpJDGL 控件。
/// </summary>

6
SGGL/FineUIPro.Web/DigData/ShowProjectWBS.aspx
View File

@ -14,8 +14,8 @@
<Toolbars>
<f:Toolbar ID="Toolbar1" Position="Top" runat="server">
<Items>
<f:RadioButtonList runat="server" ID="ckState" Width="350px" AutoColumnWidth="true"
AutoPostBack="true" OnSelectedIndexChanged="ckState_SelectedIndexChanged">
<f:RadioButtonList runat="server" ID="ckLevel" Width="350px" AutoColumnWidth="true"
AutoPostBack="true" OnSelectedIndexChanged="ckLevel_SelectedIndexChanged">
<f:RadioItem Text="全部" Value="-1" Selected="true" />
<f:RadioItem Text="0级" Value="0" />
<f:RadioItem Text="1级" Value="1" />
@ -29,7 +29,7 @@
</f:Toolbar>
</Toolbars>
<Items>
<f:Tree ID="trWBS" EnableCollapse="true" ShowHeader="false" Title="WBS" EnableCheckBox="true"
<f:Tree ID="trWBS" EnableCollapse="true" ShowHeader="false" Title="WBS"
OnNodeExpand="trWBS_NodeExpand" AutoLeafIdentification="true"
runat="server" ShowBorder="false" EnableTextSelection="True">
</f:Tree>

87
SGGL/FineUIPro.Web/DigData/ShowProjectWBS.aspx.cs
View File

@ -2,6 +2,7 @@
using System;
using System.Data;
using System.Linq;
using System.Text;
namespace FineUIPro.Web.DigData
{
@ -30,17 +31,25 @@ namespace FineUIPro.Web.DigData
protected void Page_Load(object sender, EventArgs e)
{
if (!IsPostBack)
{ ////加载树
{
string level = Request.Params["level"];
if (!string.IsNullOrEmpty(level))
{
this.ckLevel.SelectedValue = level;
this.ckLevel.Readonly = true;
}
////加载树
SetSubUnitProjectTree(this.trWBS);
}
}
#region 绑定分公司 单位-项目树
#region 绑定WBS
/// <summary>
/// 绑定分公司 单位-项目树
/// 绑定WBS
/// </summary>
/// <param name="trWBS"></param>
/// <param name="CurrUser"></param>
/// <param name="trWBS"></param>
public void SetSubUnitProjectTree(FineUIPro.Tree trWBS)
{
this.trWBS.Nodes.Clear();
@ -81,8 +90,7 @@ namespace FineUIPro.Web.DigData
/// <param name="sender"></param>
/// <param name="e"></param>
protected void trWBS_NodeExpand(object sender, TreeNodeEventArgs e)
{
{
e.Node.Nodes.Clear();
if (e.Node.CommandName == "ProjectType") //展开工程类型
{
@ -98,9 +106,11 @@ namespace FineUIPro.Web.DigData
newNode.Text = trUnitWorkItem.UnitWorkCode + "-" + trUnitWorkItem.UnitWorkName;
newNode.NodeID = trUnitWorkItem.UnitWorkId;
newNode.CommandName = "UnitWork";
newNode.EnableExpandEvent = true;
newNode.EnableClickEvent = true;
e.Node.Nodes.Add(newNode);
if (BLL.WorkPackageService.GetWorkPackages1ByUnitWorkId(trUnitWorkItem.UnitWorkId.ToString()) != null)
{
TreeNode temp = new TreeNode();
@ -119,6 +129,7 @@ namespace FineUIPro.Web.DigData
TreeNode newNode = new TreeNode();
newNode.Text = workPackage.PackageContent;
newNode.NodeID = workPackage.WorkPackageId;
newNode.ToolTip = "[" + workPackage.InitWorkPackageCode + "]";
newNode.CommandName = "WorkPackage";
newNode.EnableExpandEvent = true;
newNode.EnableClickEvent = true;
@ -144,6 +155,7 @@ namespace FineUIPro.Web.DigData
newNode.Text = workPackage.PackageContent;
newNode.NodeID = workPackage.WorkPackageId;
newNode.CommandName = "WorkPackage";
newNode.ToolTip="["+ workPackage.InitWorkPackageCode+"]";
newNode.EnableExpandEvent = true;
newNode.EnableClickEvent = true;
e.Node.Nodes.Add(newNode);
@ -161,7 +173,7 @@ namespace FineUIPro.Web.DigData
}
#endregion
protected void ckState_SelectedIndexChanged(object sender, EventArgs e)
protected void ckLevel_SelectedIndexChanged(object sender, EventArgs e)
{
////加载树
SetSubUnitProjectTree(this.trWBS);
@ -169,7 +181,66 @@ namespace FineUIPro.Web.DigData
protected void btnSure_Click(object sender, EventArgs e)
{
if (this.trWBS.SelectedNode != null)
{
///Type1|0a1e39d1-693d-4b5f-a2f5-870dda8b9ff2|c0f20302-88e6-4415-9a86-06be5730c420[67]|c76e251e-d690-4d0e-959b-3b618701f6ff[6701]&建筑工程|083-全场管廊|框架/管廊|地基与基础
///返回 树 父节点ID+[初始WBS主键]+"|" +节点ID+[初始WBS主键]+"&"+树父节点名称+"|"+ 节点名称
string selectValues = getSelectIds(this.trWBS.SelectedNode, this.trWBS.SelectedNodeID+this.trWBS.SelectedNode.ToolTip) + "&" + getSelectNames(this.trWBS.SelectedNode, this.trWBS.SelectedNode.Text);
if (!string.IsNullOrEmpty(selectValues))
{
PageContext.RegisterStartupScript(ActiveWindow.GetWriteBackValueReference(selectValues) + ActiveWindow.GetHidePostBackReference());
}
}
else
{
Alert.ShowInParent("请选择节点！", MessageBoxIcon.Warning);
}
}
/// <summary>
/// id
/// </summary>
/// <param name="node"></param>
/// <param name="id"></param>
/// <returns></returns>
private string getSelectIds(TreeNode node,string id)
{
if (node.ParentNode != null)
{
if (node.ParentNode.NodeID == "1" || node.ParentNode.NodeID == "2")
{
id = "Type" + node.ParentNode.NodeID + "|" + id;
}
else
{
id = getSelectIds(node.ParentNode, node.ParentNode.NodeID + node.ParentNode.ToolTip + "|" + id);
}
}
return id;
}
/// <summary>
/// 名称
/// </summary>
/// <param name="node"></param>
/// <param name="name"></param>
/// <returns></returns>
private string getSelectNames(TreeNode node, string name)
{
if (node.ParentNode != null)
{
if (node.ParentNode.NodeID == "1" || node.ParentNode.NodeID == "2")
{
name = node.ParentNode.Text + "|" + name;
}
else
{
name = getSelectNames(node.ParentNode, node.ParentNode.Text + "|" + name);
}
}
return name;
}
}
}

4
SGGL/FineUIPro.Web/DigData/ShowProjectWBS.aspx.designer.cs generated
View File

@ -51,13 +51,13 @@ namespace FineUIPro.Web.DigData
protected global::FineUIPro.Toolbar Toolbar1;
/// <summary>
/// ckState 控件。
/// ckLevel 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.RadioButtonList ckState;
protected global::FineUIPro.RadioButtonList ckLevel;
/// <summary>
/// btnSure 控件。

130
SGGL/FineUIPro.Web/DigData/ShowProjectWBSPackage.aspx Normal file
View File

@ -0,0 +1,130 @@
<%@ Page Language="C#" AutoEventWireup="true" CodeBehind="ShowProjectWBSPackage.aspx.cs" Inherits="FineUIPro.Web.DigData.ShowProjectWBSPackage" %>
<!DOCTYPE html>
<html xmlns="http://www.w3.org/1999/xhtml">
<head runat="server">
<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
<title>项目施工WBS</title>
<link href="../res/css/common.css" rel="stylesheet" type="text/css" />
<style>
.f-grid-row .f-grid-cell-inner {
white-space: normal;
word-break: break-all;
}
.Yellow {
background-color: #FFFF93;
}
.f-grid-colheader-text {
white-space: normal;
word-break: break-all;
}
</style>
</head>
<body>
<form id="form1" runat="server">
<f:PageManager ID="PageManager1" AutoSizePanelID="Panel1" runat="server" />
<f:Panel ID="Panel1" CssClass="blockpanel" Margin="5px" runat="server" ShowBorder="false" ShowHeader="false" Layout="Region">
<Items>
<f:Panel runat="server" ID="panelLeftRegion" RegionPosition="Left" RegionSplit="true" EnableCollapse="true" Layout="Fit"
RegionPercent="30%" Title="项目WBS基础数据库" TitleToolTip="项目WBS基础数据库" ShowBorder="true" ShowHeader="true"
BodyPadding="10px">
<Items>
<f:Tree ID="trWBS" EnableCollapse="true" ShowHeader="true"
OnNodeCommand="trWBS_NodeCommand" OnNodeExpand="trWBS_NodeExpand" AutoLeafIdentification="true"
runat="server">
<Listeners>
<f:Listener Event="beforenodecontextmenu" Handler="onTreeNodeContextMenu" />
</Listeners>
</f:Tree>
<f:HiddenField runat="server" ID="hdSelectId">
</f:HiddenField>
</Items>
</f:Panel>
<f:Panel runat="server" ID="panelCenterRegion" RegionPosition="Center" Layout="Fit"
Title="中间面板" ShowBorder="true" ShowHeader="false" BodyPadding="10px">
<Items>
<f:Grid ID="Grid1" Width="870px" ShowBorder="true" ShowHeader="false" EnableCollapse="true"
runat="server" BoxFlex="1" DataKeyNames="ControlItemAndCycleId,InitControlItemCode" AllowSorting="true" EnableColumnLines="true"
SortField="ControlItemAndCycleCode" SortDirection="ASC" AllowCellEditing="true" ClicksToEdit="1" ForceFit="true"
ShowSelectedCell="true" DataIDField="ControlItemAndCycleId" AllowPaging="true" IsDatabasePaging="true"
PageSize="100" OnPageIndexChange="Grid1_PageIndexChange" EnableMultiSelect="false">
<Toolbars>
<f:Toolbar ID="Toolbar1" Position="Top" runat="server" ToolbarAlign="Right">
<Items>
<f:ToolbarFill runat="server"></f:ToolbarFill>
<f:Button ID="btnSave" ToolTip="确认" Icon="Accept" runat="server" Text="确认"
OnClick="btnSave_Click">
</f:Button>
</Items>
</f:Toolbar>
</Toolbars>
<Columns>
<f:RowNumberField EnablePagingNumber="true" HeaderText="序号" Width="50px" HeaderTextAlign="Center"
TextAlign="Center" />
<f:RenderField Width="150px" ColumnID="ControlItemContent" DataField="ControlItemContent" FieldType="String"
HeaderText="工作包" HeaderTextAlign="Center" TextAlign="Center">
</f:RenderField>
<f:RenderField Width="90px" ColumnID="ControlPoint" DataField="ControlPoint" FieldType="String"
HeaderText="控制点等级" HeaderTextAlign="Center" TextAlign="Center">
</f:RenderField>
<f:RenderField Width="65px" ColumnID="Weights" DataField="Weights" FieldType="String"
HeaderText="权重%" HeaderTextAlign="Center" TextAlign="Center">
</f:RenderField>
<f:RenderField Width="20px" ColumnID="ControlItemAndCycleId" DataField="ControlItemAndCycleId" FieldType="String"
HeaderText="工作包Id" HeaderTextAlign="Center" TextAlign="Center" Hidden="true">
</f:RenderField>
</Columns>
<PageItems>
<f:ToolbarSeparator ID="ToolbarSeparator1" runat="server">
</f:ToolbarSeparator>
<f:ToolbarText ID="ToolbarText1" runat="server" Text="每页记录数：">
</f:ToolbarText>
<f:DropDownList runat="server" ID="ddlPageSize" Width="80px" AutoPostBack="true"
OnSelectedIndexChanged="ddlPageSize_SelectedIndexChanged">
<f:ListItem Text="100" Value="100" />
<f:ListItem Text="500" Value="500" />
</f:DropDownList>
</PageItems>
</f:Grid>
</Items>
</f:Panel>
</Items>
</f:Panel>
</form>
<script type="text/javascript">
// 保存当前菜单对应的树节点ID
// var currentNodeId;
// 返回false，来阻止浏览器右键菜单
function onTreeNodeContextMenu(event, nodeId) {
// currentNodeId = nodeId;
// F(menuID).show();
return false;
}
//// 设置所有菜单项的禁用状态
//function setMenuItemsDisabled(disabled) {
// var menu = F(menuID);
// $.each(menu.items, function (index, item) {
// item.setDisabled(disabled);
// });
//}
//// 显示菜单后，检查是否禁用菜单项
//function onMenuShow() {
// if (currentNodeId) {
// var tree = F(treeID);
// var nodeData = tree.getNodeData(currentNodeId);
// if (nodeData.leaf) {
// setMenuItemsDisabled(true);
// } else {
// setMenuItemsDisabled(false);
// }
// }
//}
</script>
</body>
</html>

319
SGGL/FineUIPro.Web/DigData/ShowProjectWBSPackage.aspx.cs Normal file
View File

@ -0,0 +1,319 @@
using BLL;
using Newtonsoft.Json.Linq;
using System;
using System.Collections.Generic;
using System.Data;
using System.Data.SqlClient;
using System.Linq;
using AspNet = System.Web.UI.WebControls;
namespace FineUIPro.Web.DigData
{
public partial class ShowProjectWBSPackage : PageBase
{
/// <summary>
///
/// </summary>
public string ProjectId
{
get
{
return (string)ViewState["ProjectId"];
}
set
{
ViewState["ProjectId"] = value;
}
}
#region 页面加载
/// <summary>
/// 页面加载
/// </summary>
/// <param name="sender"></param>
/// <param name="e"></param>
protected void Page_Load(object sender, EventArgs e)
{
if (!IsPostBack)
{
this.ProjectId = this.CurrUser.LoginProjectId;
InitTreeMenu();
}
}
#endregion
#region 加载树
/// <summary>
/// 加载树
/// </summary>
private void InitTreeMenu()
{
this.trWBS.Nodes.Clear();
this.trWBS.ShowBorder = false;
this.trWBS.ShowHeader = false;
this.trWBS.EnableIcons = true;
this.trWBS.AutoScroll = true;
this.trWBS.EnableSingleClickExpand = true;
TreeNode rootNode1 = new TreeNode();
rootNode1.Text = "建筑工程";
rootNode1.NodeID = "1";
rootNode1.CommandName = "ProjectType";
rootNode1.EnableExpandEvent = true;
rootNode1.EnableClickEvent = true;
this.trWBS.Nodes.Add(rootNode1);
TreeNode emptyNode = new TreeNode();
emptyNode.Text = "";
emptyNode.NodeID = "";
rootNode1.Nodes.Add(emptyNode);
TreeNode rootNode2 = new TreeNode();
rootNode2.Text = "安装工程";
rootNode2.NodeID = "2";
rootNode2.CommandName = "ProjectType";
rootNode2.EnableExpandEvent = true;
rootNode2.EnableClickEvent = true;
this.trWBS.Nodes.Add(rootNode2);
rootNode2.Nodes.Add(emptyNode);
}
#endregion
#region 展开树
/// <summary>
/// 展开树
/// </summary>
/// <param name="sender"></param>
/// <param name="e"></param>
protected void trWBS_NodeExpand(object sender, TreeNodeEventArgs e)
{
e.Node.Nodes.Clear();
if (e.Node.CommandName == "ProjectType") //展开工程类型
{
var trUnitWork = from x in Funs.DB.WBS_UnitWork
where x.ProjectId == this.ProjectId && x.SuperUnitWork == null && x.ProjectType == e.Node.NodeID
select x;
trUnitWork = trUnitWork.OrderBy(x => x.UnitWorkCode);
if (trUnitWork.Count() > 0)
{
foreach (var trUnitWorkItem in trUnitWork)
{
TreeNode newNode = new TreeNode();
string uweights = string.Empty;
if (trUnitWorkItem.Weights != null)
{
uweights = "(" + Convert.ToDouble(trUnitWorkItem.Weights).ToString() + "%)";
}
newNode.Text = trUnitWorkItem.UnitWorkCode + "-" + trUnitWorkItem.UnitWorkName + uweights;
newNode.NodeID = trUnitWorkItem.UnitWorkId;
newNode.CommandName = "UnitWork";
newNode.EnableExpandEvent = true;
newNode.EnableClickEvent = true;
e.Node.Nodes.Add(newNode);
if (BLL.WorkPackageService.GetWorkPackages1ByUnitWorkId(trUnitWorkItem.UnitWorkId.ToString()) != null)
{
TreeNode temp = new TreeNode();
temp.Text = "temp";
temp.NodeID = "temp";
newNode.Nodes.Add(temp);
}
}
}
}
else if (e.Node.CommandName == "UnitWork") //展开单位工程节点
{
var workPackages = from x in Funs.DB.WBS_WorkPackage where x.UnitWorkId == e.NodeID && x.SuperWorkPack == null && x.IsApprove == true orderby x.WorkPackageCode select x;
foreach (var workPackage in workPackages)
{
TreeNode newNode = new TreeNode();
string weights = string.Empty;
if (workPackage.Weights != null)
{
weights = "(" + Convert.ToDouble(workPackage.Weights).ToString() + "%)";
}
newNode.Text = workPackage.PackageContent + weights;
newNode.NodeID = workPackage.WorkPackageId;
newNode.ToolTip = "[" + workPackage.InitWorkPackageCode + "]";
newNode.CommandName = "WorkPackage";
newNode.EnableExpandEvent = true;
newNode.EnableClickEvent = true;
e.Node.Nodes.Add(newNode);
var childWorkPackages = from x in Funs.DB.WBS_WorkPackage where x.SuperWorkPackageId == workPackage.WorkPackageId && x.IsApprove == true select x;
if (childWorkPackages.Count() > 0)
{
TreeNode emptyNode = new TreeNode();
emptyNode.Text = "";
emptyNode.NodeID = "";
newNode.Nodes.Add(emptyNode);
}
}
}
else if (e.Node.CommandName == "WorkPackage") //展开工作包节点
{
var workPackages = from x in Funs.DB.WBS_WorkPackage where x.SuperWorkPackageId == e.Node.NodeID && x.IsApprove == true orderby x.WorkPackageCode select x;
if (workPackages.Count() > 0) //存在子单位工程
{
foreach (var workPackage in workPackages)
{
TreeNode newNode = new TreeNode();
string weights = string.Empty;
if (workPackage.Weights != null)
{
weights = "(" + Convert.ToDouble(workPackage.Weights).ToString() + "%)";
}
newNode.Text = workPackage.PackageContent + weights;
newNode.NodeID = workPackage.WorkPackageId;
newNode.ToolTip = "[" + workPackage.InitWorkPackageCode + "]";
newNode.CommandName = "WorkPackage";
newNode.EnableExpandEvent = true;
newNode.EnableClickEvent = true;
e.Node.Nodes.Add(newNode);
var childWorkPackages = from x in Funs.DB.WBS_WorkPackage where x.SuperWorkPackageId == workPackage.WorkPackageId && x.IsApprove == true select x;
if (childWorkPackages.Count() > 0)
{
TreeNode emptyNode = new TreeNode();
emptyNode.Text = "";
emptyNode.NodeID = "";
newNode.Nodes.Add(emptyNode);
}
}
}
}
}
#endregion
#region Tree点击事件
/// <summary>
/// Tree点击事件
/// </summary>
/// <param name="sender"></param>
/// <param name="e"></param>
protected void trWBS_NodeCommand(object sender, TreeCommandEventArgs e)
{
BindGrid();
}
#endregion
#region 绑定数据
protected void Grid1_PageIndexChange(object sender, GridPageEventArgs e)
{
Grid1.PageIndex = e.NewPageIndex;
BindGrid();
}
/// <summary>
/// Grid1排序
/// </summary>
/// <param name="sender"></param>
/// <param name="e"></param>
protected void Grid1_Sort(object sender, GridSortEventArgs e)
{
BindGrid();
}
/// <summary>
/// 分页下拉选择事件
/// </summary>
/// <param name="sender"></param>
/// <param name="e"></param>
protected void ddlPageSize_SelectedIndexChanged(object sender, EventArgs e)
{
Grid1.PageSize = Convert.ToInt32(ddlPageSize.SelectedValue);
BindGrid();
}
/// <summary>
/// 加载Grid
/// </summary>
private void BindGrid()
{
string strSql = @"SELECT ControlItemAndCycleId,ControlItemAndCycleCode,InitControlItemCode,PlanCompleteDate,ControlItemContent,ControlPoint,ControlItemDef,Weights,HGForms,SHForms,Standard,ClauseNo,CheckNum"
+ @" FROM WBS_ControlItemAndCycle ";
List<SqlParameter> listStr = new List<SqlParameter>();
strSql += " where WorkPackageId = @WorkPackageId and IsApprove=1 ";
listStr.Add(new SqlParameter("@WorkPackageId", this.trWBS.SelectedNodeID));
SqlParameter[] parameter = listStr.ToArray();
DataTable tb = SQLHelper.GetDataTableRunText(strSql, parameter);
Grid1.RecordCount = tb.Rows.Count;
var table = this.GetPagedDataTable(Grid1, tb);
Grid1.DataSource = table;
Grid1.DataBind();
}
#endregion
#region 保存事件
/// <summary>
/// 保存
/// </summary>
/// <param name="sender"></param>
/// <param name="e"></param>
protected void btnSave_Click(object sender, EventArgs e)
{
///Type1|fda5ce7d-1d97-469c-9f43-9f7b2ec35ba8|000441b4-a471-4d1e-b851-19c950a5b61a[68]|ae650220-309f-42d4-acdc-6de91c9ec758[6801]&建筑工程|082-全场道路|道路|路基工程定位测量放线$24f40e7c-0b86-44b1-a498-08174113c36a
///返回 树 父节点ID+[初始WBS主键]+"|" +节点ID+[初始WBS主键]+"&"+树父节点名称+"|"+ 节点名称+"|"+ 工作包名称+"$"+工作包ID
string selectValues = string.Empty;
if (!string.IsNullOrEmpty(this.Grid1.SelectedRowID) && this.trWBS.SelectedNode != null)
{
var getC = Funs.DB.WBS_ControlItemAndCycle.FirstOrDefault(x => x.ControlItemAndCycleId == this.Grid1.SelectedRowID);
if (getC != null)
{
selectValues = getSelectIds(this.trWBS.SelectedNode, this.trWBS.SelectedNodeID + this.trWBS.SelectedNode.ToolTip) + "&" + getSelectNames(this.trWBS.SelectedNode, this.trWBS.SelectedNode.Text) + getC .ControlItemContent+ "$" + this.Grid1.SelectedRowID;
}
PageContext.RegisterStartupScript(ActiveWindow.GetWriteBackValueReference(selectValues) + ActiveWindow.GetHidePostBackReference());
}
else
{
Alert.ShowInParent("请选择工作包！", MessageBoxIcon.Warning);
}
}
#endregion
/// <summary>
/// id
/// </summary>
/// <param name="node"></param>
/// <param name="id"></param>
/// <returns></returns>
private string getSelectIds(TreeNode node, string id)
{
if (node.ParentNode != null)
{
if (node.ParentNode.NodeID == "1" || node.ParentNode.NodeID == "2")
{
id = "Type" + node.ParentNode.NodeID + "|" + id;
}
else
{
id = getSelectIds(node.ParentNode, node.ParentNode.NodeID + node.ParentNode.ToolTip + "|" + id);
}
}
return id;
}
/// <summary>
/// 名称
/// </summary>
/// <param name="node"></param>
/// <param name="name"></param>
/// <returns></returns>
private string getSelectNames(TreeNode node, string name)
{
if (node.ParentNode != null)
{
if (node.ParentNode.NodeID == "1" || node.ParentNode.NodeID == "2")
{
name = node.ParentNode.Text + "|" + name;
}
else
{
name = getSelectNames(node.ParentNode, node.ParentNode.Text + "|" + name);
}
}
return name;
}
}
}

134
SGGL/FineUIPro.Web/DigData/ShowProjectWBSPackage.aspx.designer.cs generated Normal file
View File

@ -0,0 +1,134 @@
//------------------------------------------------------------------------------
// <自动生成>
// 此代码由工具生成。
//
// 对此文件的更改可能导致不正确的行为，如果
// 重新生成代码，则所做更改将丢失。
// </自动生成>
//------------------------------------------------------------------------------
namespace FineUIPro.Web.DigData
{
public partial class ShowProjectWBSPackage
{
/// <summary>
/// form1 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::System.Web.UI.HtmlControls.HtmlForm form1;
/// <summary>
/// PageManager1 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.PageManager PageManager1;
/// <summary>
/// Panel1 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Panel Panel1;
/// <summary>
/// panelLeftRegion 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Panel panelLeftRegion;
/// <summary>
/// trWBS 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Tree trWBS;
/// <summary>
/// hdSelectId 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.HiddenField hdSelectId;
/// <summary>
/// panelCenterRegion 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Panel panelCenterRegion;
/// <summary>
/// Grid1 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Grid Grid1;
/// <summary>
/// Toolbar1 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Toolbar Toolbar1;
/// <summary>
/// btnSave 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Button btnSave;
/// <summary>
/// ToolbarSeparator1 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.ToolbarSeparator ToolbarSeparator1;
/// <summary>
/// ToolbarText1 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.ToolbarText ToolbarText1;
/// <summary>
/// ddlPageSize 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.DropDownList ddlPageSize;
}
}

72
SGGL/FineUIPro.Web/DigData/WBSDW.aspx
View File

@ -25,52 +25,80 @@
</f:Panel>
<f:Panel runat="server" ID="panelCenterRegion" RegionPosition="Center" ShowBorder="true"
Layout="VBox" ShowHeader="false" BodyPadding="5px" IconFont="PlusCircle" Title="WBS数据仓库"
TitleToolTip="WBS数据仓库" AutoScroll="true">
TitleToolTip="WBS数据仓库" AutoScroll="true">
<Toolbars>
<f:Toolbar ID="Toolbar2" Position="Top" runat="server" ToolbarAlign="Left">
<Items>
<f:CheckBoxList runat="server" ID="ckType" AutoColumnWidth="true"
<f:CheckBoxList runat="server" ID="ckType" AutoColumnWidth="true"
AutoPostBack="true" OnSelectedIndexChanged="ckType_SelectedIndexChanged">
<f:CheckItem Value="HSSE" Text="安全数据" />
<f:CheckItem Value="CQMS" Text="质量数据" />
<f:CheckItem Value="JDGL" Text="进度数据" />
<f:CheckItem Value="HTGL" Text="合同数据" />
<f:CheckItem Value="LW" Text="劳务数据" />
<f:CheckItem Value="LW" Text="劳务数据" />
</f:CheckBoxList>
<f:TextBox runat="server" ID="hdWorkPackageCode" Hidden="true"></f:TextBox>
</Items>
</f:Toolbar>
</Toolbars>
<Items>
<f:GroupPanel runat="server" ID="Panel_CurrentApproval" Title="工作包" Layout="VBox" Height="200px" AutoScroll="true">
<f:GroupPanel runat="server" ID="Panel_CurrentApproval" Title="工作包" Layout="VBox" Height="200px" AutoScroll="true">
<Items>
<f:CheckBoxList runat="server" ID="cblControlItem" Readonly="true"
AutoColumnWidth="true" ColumnNumber="5" >
</f:CheckBoxList>
<f:RadioButtonList runat="server" ID="cblControlItem"
AutoPostBack="true" OnSelectedIndexChanged="cblControlItem_SelectedIndexChanged"
AutoColumnWidth="true" ColumnNumber="5">
</f:RadioButtonList>
</Items>
</f:GroupPanel>
<f:GroupPanel runat="server" ID="gpHSSE" Title="安全数据" Layout="VBox" Hidden="true"
Height="300px" AutoScroll="true">
<Items>
<f:GroupPanel runat="server" ID="gpHSSE" Title="安全数据" Layout="VBox" Hidden="true"
Height="300px" AutoScroll="true">
<Items>
<f:Form ID="SimpleForm1" ShowBorder="false" ShowHeader="false" AutoScroll="true" EnableTableStyle="true"
BodyPadding="10px" runat="server" RedStarPosition="BeforeText" LabelAlign="Right" LabelWidth="120px">
<Rows>
<f:FormRow>
<Items>
<f:Label ID="lbExpertArgument" runat="server" Label="危大工程数量">
</f:Label>
</Items>
</f:FormRow>
</Rows>
</f:Form>
</Items>
</f:GroupPanel>
<f:GroupPanel runat="server" ID="gpCQMS" Title="质量数据" Layout="VBox" Hidden="true"
Height="300px" AutoScroll="true">
<Items>
<f:GroupPanel runat="server" ID="gpCQMS" Title="质量数据" Layout="VBox" Hidden="true"
Height="300px" AutoScroll="true">
<Items>
<f:Form ID="Form2" ShowBorder="false" ShowHeader="false" AutoScroll="true" EnableTableStyle="true"
BodyPadding="10px" runat="server" RedStarPosition="BeforeText" LabelAlign="Right" LabelWidth="120px">
<Rows>
<f:FormRow>
<Items>
<f:Label ID="lbSpotCheck1" runat="server" Label="实体验收共检项数">
</f:Label>
<f:Label ID="lbSpotCheck2" runat="server" Label="实体验收共检一次合格数">
</f:Label>
<f:Label ID="lbSpotCheck" runat="server" Label="实体验收一次合格率">
</f:Label>
</Items>
</f:FormRow>
</Rows>
</f:Form>
</Items>
</f:GroupPanel>
<f:GroupPanel runat="server" ID="gpJDGL" Title="进度数据" Layout="VBox" Hidden="true"
Height="300px" AutoScroll="true">
<Items>
<f:GroupPanel runat="server" ID="gpJDGL" Title="进度数据" Layout="VBox" Hidden="true"
Height="300px" AutoScroll="true">
<Items>
</Items>
</f:GroupPanel>
<f:GroupPanel runat="server" ID="gpHTGL" Title="合同数据" Layout="VBox" Hidden="true"
Height="300px" AutoScroll="true">
<Items>
<f:GroupPanel runat="server" ID="gpHTGL" Title="合同数据" Layout="VBox" Hidden="true"
Height="300px" AutoScroll="true">
<Items>
</Items>
</f:GroupPanel>
<f:GroupPanel runat="server" ID="gpLW" Title="劳务数据" Layout="VBox" Hidden="true"
Height="300px" AutoScroll="true">
<Items>
<f:GroupPanel runat="server" ID="gpLW" Title="劳务数据" Layout="VBox" Hidden="true"
Height="300px" AutoScroll="true">
<Items>
</Items>
</f:GroupPanel>
</Items>

133
SGGL/FineUIPro.Web/DigData/WBSDW.aspx.cs
View File

@ -1,4 +1,5 @@
using BLL;
using FineUIPro.Web.CQMS.WBS;
using System;
using System.Data;
using System.Linq;
@ -6,22 +7,7 @@ using System.Linq;
namespace FineUIPro.Web.DigData
{
public partial class WBSDW : PageBase
{
/// <summary>
/// 主键
/// </summary>
public string WorkPackageCode
{
get
{
return (string)ViewState["WorkPackageCode"];
}
set
{
ViewState["WorkPackageCode"] = value;
}
}
{
/// <summary>
/// 加载页面
/// </summary>
@ -30,23 +16,13 @@ namespace FineUIPro.Web.DigData
protected void Page_Load(object sender, EventArgs e)
{
if (!IsPostBack)
{
////权限按钮方法
this.ucTree.WorkPackageCode = this.WorkPackageCode;
{
}
}
protected void changeTree(object sender, EventArgs e)
{
this.WorkPackageCode = this.ucTree.WorkPackageCode;
//新增UnitId
//this.UnitId = this.ucTree.UnitId;
////判断 当有WorkPackageCode的时候单位id为空
//if (!string.IsNullOrEmpty(this.WorkPackageCode))
//{
// this.UnitId = "";
//}
// this.BindGrid();
this.hdWorkPackageCode.Text = this.ucTree.WorkPackageCode;
initControlItem();
}
@ -58,29 +34,7 @@ namespace FineUIPro.Web.DigData
this.gpJDGL.Hidden = true;
this.gpHTGL.Hidden = true;
this.gpLW.Hidden = true;
foreach (var item in this.ckType.SelectedValueArray)
{
if (item == "HSSE")
{
this.gpHSSE.Hidden = false;
}
if (item == "CQMS")
{
this.gpCQMS.Hidden = false;
}
if (item == "JDGL")
{
this.gpJDGL.Hidden = false;
}
if (item == "HTGL")
{
this.gpHTGL.Hidden = false;
}
if (item == "LW")
{
this.gpLW.Hidden = false;
}
}
SetData();
}
/// <summary>
@ -88,11 +42,84 @@ namespace FineUIPro.Web.DigData
/// </summary>
protected void initControlItem()
{
var getControlItem = from x in Funs.DB.WBS_ControlItemInit where x.WorkPackageCode == this.WorkPackageCode select x;
var getControlItem = from x in Funs.DB.WBS_ControlItemInit
where x.WorkPackageCode == this.hdWorkPackageCode.Text
select x;
cblControlItem.DataValueField = "ControlItemCode";
cblControlItem.DataTextField = "ControlItemContent";
cblControlItem.DataSource = getControlItem;
cblControlItem.DataBind();
cblControlItem.DataBind();
SetData();
}
/// <summary>
///
/// </summary>
/// <param name="sender"></param>
/// <param name="e"></param>
protected void cblControlItem_SelectedIndexChanged(object sender, EventArgs e)
{
SetData();
}
/// <summary>
/// 数据展示
/// </summary>
private void SetData()
{
string workPackageId = this.hdWorkPackageCode.Text;
string controlItemAndCycleId = this.cblControlItem.SelectedValue;
if (workPackageId == "1" || workPackageId == "2")
{
workPackageId = "Type" + workPackageId;
}
else
{
workPackageId="["+ workPackageId + "]";
}
if (!string.IsNullOrEmpty(workPackageId))
{
foreach (var item in this.ckType.SelectedValueArray)
{
if (item == "HSSE")
{
this.gpHSSE.Hidden = false;
this.lbExpertArgument.Text = (from x in Funs.DB.Solution_LargerHazardListItem
join y in Funs.DB.Solution_LargerHazardList on x.LargerHazardListId equals y.LargerHazardListId
where x.WorkPackageId.Contains(workPackageId) && y.States == Const.State_1
&& (controlItemAndCycleId == null || x.WorkPackageId.Contains(controlItemAndCycleId))
select x).Count().ToString();
}
if (item == "CQMS")
{
this.gpCQMS.Hidden = false;
var getDetail = from x in Funs.DB.Check_SpotCheckDetail
join y in Funs.DB.Check_SpotCheck on x.SpotCheckCode equals y.SpotCheckCode
where x.WorkPackageId.Contains(workPackageId) //&& y.States == Const.State_1
&& (controlItemAndCycleId == null || x.WorkPackageId.Contains(controlItemAndCycleId))
select x;
int all = getDetail.Count();
this.lbSpotCheck1.Text = all.ToString();
int okCount = getDetail.Where(x => x.IsOK == true).Count();
this.lbSpotCheck2.Text = okCount.ToString();
this.lbSpotCheck.Text = all > 0 ? Math.Round(okCount * 1.0 / (all * 1.0)).ToString() : "0";
}
if (item == "JDGL")
{
this.gpJDGL.Hidden = false;
}
if (item == "HTGL")
{
this.gpHTGL.Hidden = false;
}
if (item == "LW")
{
this.gpLW.Hidden = false;
}
}
}
}
}
}

65
SGGL/FineUIPro.Web/DigData/WBSDW.aspx.designer.cs generated
View File

@ -95,6 +95,15 @@ namespace FineUIPro.Web.DigData
/// </remarks>
protected global::FineUIPro.CheckBoxList ckType;
/// <summary>
/// hdWorkPackageCode 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.TextBox hdWorkPackageCode;
/// <summary>
/// Panel_CurrentApproval 控件。
/// </summary>
@ -111,7 +120,7 @@ namespace FineUIPro.Web.DigData
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.CheckBoxList cblControlItem;
protected global::FineUIPro.RadioButtonList cblControlItem;
/// <summary>
/// gpHSSE 控件。
@ -122,6 +131,24 @@ namespace FineUIPro.Web.DigData
/// </remarks>
protected global::FineUIPro.GroupPanel gpHSSE;
/// <summary>
/// SimpleForm1 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Form SimpleForm1;
/// <summary>
/// lbExpertArgument 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Label lbExpertArgument;
/// <summary>
/// gpCQMS 控件。
/// </summary>
@ -131,6 +158,42 @@ namespace FineUIPro.Web.DigData
/// </remarks>
protected global::FineUIPro.GroupPanel gpCQMS;
/// <summary>
/// Form2 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Form Form2;
/// <summary>
/// lbSpotCheck1 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Label lbSpotCheck1;
/// <summary>
/// lbSpotCheck2 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Label lbSpotCheck2;
/// <summary>
/// lbSpotCheck 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Label lbSpotCheck;
/// <summary>
/// gpJDGL 控件。
/// </summary>

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

@ -1,51 +0,0 @@
错误信息开始=====>
错误类型:ThreadAbortException
错误信息:正在中止线程。
错误堆栈:
在 SNIReadSyncOverAsync(SNI_ConnWrapper* , SNI_Packet** , Int32 )
在 SNINativeMethodWrapper.SNIReadSyncOverAsync(SafeHandle pConn, IntPtr& packet, Int32 timeout)
在 System.Data.SqlClient.TdsParserStateObject.ReadSniSyncOverAsync()
在 System.Data.SqlClient.TdsParserStateObject.TryReadNetworkPacket()
在 System.Data.SqlClient.TdsParserStateObject.TryPrepareBuffer()
在 System.Data.SqlClient.TdsParserStateObject.TryReadByte(Byte& value)
在 System.Data.SqlClient.TdsParser.TryRun(RunBehavior runBehavior, SqlCommand cmdHandler, SqlDataReader dataStream, BulkCopySimpleResultSet bulkCopyHandler, TdsParserStateObject stateObj, Boolean& dataReady)
在 System.Data.SqlClient.SqlDataReader.TryConsumeMetaData()
在 System.Data.SqlClient.SqlDataReader.get_MetaData()
在 System.Data.SqlClient.SqlCommand.FinishExecuteReader(SqlDataReader ds, RunBehavior runBehavior, String resetOptionsString, Boolean isInternal, Boolean forDescribeParameterEncryption, Boolean shouldCacheForAlwaysEncrypted)
在 System.Data.SqlClient.SqlCommand.RunExecuteReaderTds(CommandBehavior cmdBehavior, RunBehavior runBehavior, Boolean returnStream, Boolean async, Int32 timeout, Task& task, Boolean asyncWrite, Boolean inRetry, SqlDataReader ds, Boolean describeParameterEncryptionRequest)
在 System.Data.SqlClient.SqlCommand.RunExecuteReader(CommandBehavior cmdBehavior, RunBehavior runBehavior, Boolean returnStream, String method, TaskCompletionSource`1 completion, Int32 timeout, Task& task, Boolean& usedCache, Boolean asyncWrite, Boolean inRetry)
在 System.Data.SqlClient.SqlCommand.RunExecuteReader(CommandBehavior cmdBehavior, RunBehavior runBehavior, Boolean returnStream, String method)
在 System.Data.SqlClient.SqlCommand.ExecuteReader(CommandBehavior behavior, String method)
在 System.Data.SqlClient.SqlCommand.ExecuteDbDataReader(CommandBehavior behavior)
在 System.Data.Common.DbCommand.ExecuteReader()
在 System.Data.Linq.SqlClient.SqlProvider.Execute(Expression query, QueryInfo queryInfo, IObjectReaderFactory factory, Object[] parentArgs, Object[] userArgs, ICompiledSubQuery[] subQueries, Object lastResult)
在 System.Data.Linq.SqlClient.SqlProvider.ExecuteAll(Expression query, QueryInfo[] queryInfos, IObjectReaderFactory factory, Object[] userArguments, ICompiledSubQuery[] subQueries)
在 System.Data.Linq.SqlClient.SqlProvider.System.Data.Linq.Provider.IProvider.Execute(Expression query)
在 System.Data.Linq.DataQuery`1.System.Linq.IQueryProvider.Execute[S](Expression expression)
在 System.Linq.Queryable.Count[TSource](IQueryable`1 source)
在 BLL.GetDataService.CorrectingPersonInOutNumber(String projectId) 位置 E:\工作\赛鼎施工平台\SGGL_SeDin(New)\SGGL_SeDin_New\SGGL\BLL\OpenService\GetDataService.cs:行号 148
在 BLL.MonitorService.DoSynchData() 位置 E:\工作\赛鼎施工平台\SGGL_SeDin(New)\SGGL_SeDin_New\SGGL\BLL\OpenService\MonitorService.cs:行号 2129
在 BLL.MonitorService.ColligateFormConfirmProcessEve(Object sender, ElapsedEventArgs e) 位置 E:\工作\赛鼎施工平台\SGGL_SeDin(New)\SGGL_SeDin_New\SGGL\BLL\OpenService\MonitorService.cs:行号 110
出错时间:08/30/2023 11:27:45
出错时间:08/30/2023 11:27:45
错误信息开始=====>
错误类型:NullReferenceException
错误信息:未将对象引用设置到对象的实例。
错误堆栈:
在 FineUIPro.Web.indexProject.MenuSwitchMethod(String type) 位置 E:\工作\赛鼎施工平台\SGGL_SeDin(New)\SGGL_SeDin_New\SGGL\FineUIPro.Web\indexProject.aspx.cs:行号 581
在 FineUIPro.Web.indexProject.btnJDGL_Click(Object sender, EventArgs e) 位置 E:\工作\赛鼎施工平台\SGGL_SeDin(New)\SGGL_SeDin_New\SGGL\FineUIPro.Web\indexProject.aspx.cs:行号 711
在 FineUIPro.Button.OnClick(EventArgs e)
在 (Button , EventArgs )
在 FineUIPro.Button.RaisePostBackEvent(String eventArgument)
在 System.Web.UI.Page.RaisePostBackEvent(IPostBackEventHandler sourceControl, String eventArgument)
在 System.Web.UI.Page.RaisePostBackEvent(NameValueCollection postData)
在 System.Web.UI.Page.ProcessRequestMain(Boolean includeStagesBeforeAsyncPoint, Boolean includeStagesAfterAsyncPoint)
出错时间:08/30/2023 14:19:32
出错文件:http://localhost:8797/indexProject.aspx?projectId=d93b0835-ffbd-4039-bed3-2df806adae56
IP地址:::1
出错时间:08/30/2023 14:19:32

8
SGGL/FineUIPro.Web/FineUIPro.Web.csproj
View File

@ -525,6 +525,7 @@
<Content Include="DataShow\WorkingHoursItem.aspx" />
<Content Include="DigData\ShowProjectWBS.aspx" />
<Content Include="DigData\ProjectWBSDW.aspx" />
<Content Include="DigData\ShowProjectWBSPackage.aspx" />
<Content Include="DigData\TrainRecordAnalysis.aspx" />
<Content Include="DigData\RectifyProblemAnalysis.aspx" />
<Content Include="DigData\DailyProblemAnalysis.aspx" />
@ -7613,6 +7614,13 @@
<Compile Include="DigData\ProjectWBSDW.aspx.designer.cs">
<DependentUpon>ProjectWBSDW.aspx</DependentUpon>
</Compile>
<Compile Include="DigData\ShowProjectWBSPackage.aspx.cs">
<DependentUpon>ShowProjectWBSPackage.aspx</DependentUpon>
<SubType>ASPXCodeBehind</SubType>
</Compile>
<Compile Include="DigData\ShowProjectWBSPackage.aspx.designer.cs">
<DependentUpon>ShowProjectWBSPackage.aspx</DependentUpon>
</Compile>
<Compile Include="DigData\TrainRecordAnalysis.aspx.cs">
<DependentUpon>TrainRecordAnalysis.aspx</DependentUpon>
<SubType>ASPXCodeBehind</SubType>

2
SGGL/FineUIPro.Web/HSSE/Solution/ExpertArgumentList.aspx
View File

@ -85,7 +85,7 @@
</f:Panel>
<f:Window ID="Window1" Title="危大工程清单" Hidden="true" EnableIFrame="true" EnableMaximize="true"
Target="Parent" EnableResize="true" runat="server" IsModal="true" OnClose="Window1_Close"
Width="1200px" Height="560px">
Width="1200px" Height="650px">
</f:Window>
<f:Menu ID="Menu1" runat="server">
<Items>

6
SGGL/FineUIPro.Web/HSSE/Solution/ExpertArgumentListEdit.aspx
View File

@ -64,7 +64,7 @@
<f:RenderField Width="80px" ColumnID="WorkStatesName" DataField="WorkStatesName"
FieldType="String" HeaderText="作业状态" TextAlign="Left" HeaderTextAlign="Center">
</f:RenderField>
<f:RenderField Width="220px" ColumnID="UnitName" DataField="UnitName"
<f:RenderField Width="230px" ColumnID="UnitName" DataField="UnitName"
FieldType="String" HeaderText="施工单位" TextAlign="Left" HeaderTextAlign="Center">
</f:RenderField>
</Columns>
@ -96,8 +96,8 @@
</Toolbars>
</f:Form>
<f:Window ID="Window1" Title="弹出窗体" Hidden="true" EnableIFrame="true" EnableMaximize="true"
Target="Parent" EnableResize="true" runat="server" IsModal="true" Width="900px" OnClose="Window1_Close"
Height="400px">
Target="Parent" EnableResize="true" runat="server" IsModal="true" Width="1024px" OnClose="Window1_Close"
Height="600px">
</f:Window>
<f:Menu ID="Menu1" runat="server">
<f:MenuButton ID="btnMenuModify" EnablePostBack="true" runat="server"

32
SGGL/FineUIPro.Web/HSSE/Solution/ExpertArgumentListEditItem.aspx
View File

@ -8,8 +8,8 @@
<body>
<form id="form1" runat="server">
<f:PageManager ID="PageManager1" AutoSizePanelID="SimpleForm1" runat="server" />
<f:Form ID="SimpleForm1" ShowBorder="false" ShowHeader="false" AutoScroll="true"
BodyPadding="10px" runat="server" RedStarPosition="BeforeText" LabelAlign="Right">
<f:Form ID="SimpleForm1" ShowBorder="false" ShowHeader="false" AutoScroll="true" EnableTableStyle="true"
BodyPadding="10px" runat="server" RedStarPosition="BeforeText" LabelAlign="Right" LabelWidth="180px">
<Rows>
<f:FormRow>
<Items>
@ -21,22 +21,30 @@
</f:DropDownList>
</Items>
</f:FormRow>
<f:FormRow>
<f:FormRow ColumnWidths="90% 10%">
<Items>
<f:DropDownList ID="drpWorkPackageId" runat="server" Label="分部分项</br>工程名称" EnableEdit="true"
Required="true" ShowRedStar="true">
</f:DropDownList>
<f:TextBox ID="txtWorkPackageSize" runat="server" Label="分部分项</br>工程规模" MaxLength="500">
</f:TextBox>
<f:Label runat="server" ID="txtWorkPackageId" Label="分部分项工程名称" ShowRedStar="true"></f:Label>
<f:TextBox runat="server" ID="hdWorkPackageId" Hidden="true"></f:TextBox>
<f:Button ID="btSearch" ToolTip="选择" Icon="SystemSearch" runat="server" OnClick="btSearch_Click">
</f:Button>
</Items>
</f:FormRow>
<f:FormRow>
<Items>
<%-- <f:DropDownList ID="drpWorkPackageId" runat="server" Label="分部分项</br>工程名称" EnableEdit="true"
Required="true" ShowRedStar="true">
</f:DropDownList>--%>
<f:TextBox ID="txtWorkPackageSize" runat="server" Label="分部分项工程规模" MaxLength="500">
</f:TextBox>
</Items>
</f:FormRow>
<f:FormRow>
<Items>
<f:DatePicker ID="txtExpectedStartTime" ShowRedStar="true" DateFormatString="yyyy-MM-dd" runat="server"
Label="预计施工</br>开始时间" Required="true" LabelAlign="Right" >
Label="预计施工开始时间" Required="true" LabelAlign="Right" EnableEdit="false">
</f:DatePicker>
<f:DatePicker ID="txtExpectedEndTime" ShowRedStar="true" DateFormatString="yyyy-MM-dd" runat="server"
Label="预计施工</br>结束时间" Required="true" LabelAlign="Right" >
Label="预计施工结束时间" Required="true" LabelAlign="Right" EnableEdit="false">
</f:DatePicker>
</Items>
</f:FormRow>
@ -72,6 +80,10 @@
</f:Toolbar>
</Toolbars>
</f:Form>
<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>

44
SGGL/FineUIPro.Web/HSSE/Solution/ExpertArgumentListEditItem.aspx.cs
View File

@ -51,7 +51,7 @@ namespace FineUIPro.Web.HSSE.Solution
//单位工程
BLL.UnitWorkService.InitUnitWorkDropDownList(this.drpUnitWorkId, this.CurrUser.LoginProjectId, true);
//分部分项
BLL.SpecialSchemeTypeService.InitSpecialSchemeTypeDropDownList(this.drpWorkPackageId, true);
// BLL.SpecialSchemeTypeService.InitSpecialSchemeTypeDropDownList(this.drpWorkPackageId, true);
//是否需要专家论证
BLL.ConstValue.InitConstValueRadioButtonList(this.rblIsArgument, ConstValue.Group_0001, "False");
//作业状态
@ -70,11 +70,15 @@ namespace FineUIPro.Web.HSSE.Solution
{
this.drpUnitWorkId.SelectedValue = getItem.UnitWorkId;
}
if (!string.IsNullOrEmpty(getItem.WorkPackageId))
{
this.drpWorkPackageId.SelectedValue = getItem.WorkPackageId;
}
//if (!string.IsNullOrEmpty(getItem.WorkPackageId))
//{
// this.drpWorkPackageId.SelectedValue = getItem.WorkPackageId;
//}
this.txtWorkPackageSize.Text = getItem.WorkPackageSize;
this.hdWorkPackageId.Text = getItem.WorkPackageId;
this.txtWorkPackageId.Text = getItem.PackageContent;
this.txtExpectedStartTime.Text = string.Format("{0:yyyy-MM-dd}", getItem.ExpectedStartTime);
this.txtExpectedEndTime.Text = string.Format("{0:yyyy-MM-dd}", getItem.ExpectedEndTime);
if (getItem.IsArgument == true)
@ -87,9 +91,9 @@ namespace FineUIPro.Web.HSSE.Solution
}
if (!string.IsNullOrEmpty(getItem.WorkStates))
{
this.rblIsArgument.SelectedValue = getItem.WorkStates;
this.rbWorkStates.SelectedValue = getItem.WorkStates;
}
this.drpUnitId.SelectedValue = getItem.UnitId;
this.drpUnitId.SelectedValue = getItem.UnitId;
}
else
{
@ -121,11 +125,13 @@ namespace FineUIPro.Web.HSSE.Solution
ExpectedEndTime = Funs.GetNewDateTime(this.txtExpectedEndTime.Text),
IsArgument = Convert.ToBoolean(this.rblIsArgument.SelectedValue),
WorkStates = this.rbWorkStates.SelectedValue ?? "1",
WorkPackageId = this.hdWorkPackageId.Text,
WorkPackageName = this.txtWorkPackageId.Text,
};
if (this.drpWorkPackageId.SelectedValue != Const._Null && !string.IsNullOrEmpty(this.drpWorkPackageId.SelectedValue))
{
newItem.WorkPackageId = this.drpWorkPackageId.SelectedValue;
}
//if (this.drpWorkPackageId.SelectedValue != Const._Null && !string.IsNullOrEmpty(this.drpWorkPackageId.SelectedValue))
//{
// newItem.WorkPackageId = this.drpWorkPackageId.SelectedValue;
//}
if (this.drpUnitWorkId.SelectedValue != Const._Null && !string.IsNullOrEmpty(this.drpUnitWorkId.SelectedValue))
{
newItem.UnitWorkId = this.drpUnitWorkId.SelectedValue;
@ -150,5 +156,21 @@ namespace FineUIPro.Web.HSSE.Solution
}
}
#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.txtWorkPackageId.Text = getReturnValues[1].ToString();
}
}
}
}

75
SGGL/FineUIPro.Web/HSSE/Solution/ExpertArgumentListEditItem.aspx.designer.cs generated
View File

@ -7,11 +7,13 @@
// </自动生成>
//------------------------------------------------------------------------------
namespace FineUIPro.Web.HSSE.Solution {
public partial class ExpertArgumentListEditItem {
namespace FineUIPro.Web.HSSE.Solution
{
public partial class ExpertArgumentListEditItem
{
/// <summary>
/// form1 控件。
/// </summary>
@ -20,7 +22,7 @@ namespace FineUIPro.Web.HSSE.Solution {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::System.Web.UI.HtmlControls.HtmlForm form1;
/// <summary>
/// PageManager1 控件。
/// </summary>
@ -29,7 +31,7 @@ namespace FineUIPro.Web.HSSE.Solution {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.PageManager PageManager1;
/// <summary>
/// SimpleForm1 控件。
/// </summary>
@ -38,7 +40,7 @@ namespace FineUIPro.Web.HSSE.Solution {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Form SimpleForm1;
/// <summary>
/// txtSortIndex 控件。
/// </summary>
@ -47,7 +49,7 @@ namespace FineUIPro.Web.HSSE.Solution {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.NumberBox txtSortIndex;
/// <summary>
/// drpUnitWorkId 控件。
/// </summary>
@ -56,16 +58,34 @@ namespace FineUIPro.Web.HSSE.Solution {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.DropDownList drpUnitWorkId;
/// <summary>
/// drpWorkPackageId 控件。
/// txtWorkPackageId 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.DropDownList drpWorkPackageId;
protected global::FineUIPro.Label txtWorkPackageId;
/// <summary>
/// hdWorkPackageId 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.TextBox hdWorkPackageId;
/// <summary>
/// btSearch 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Button btSearch;
/// <summary>
/// txtWorkPackageSize 控件。
/// </summary>
@ -74,7 +94,7 @@ namespace FineUIPro.Web.HSSE.Solution {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.TextBox txtWorkPackageSize;
/// <summary>
/// txtExpectedStartTime 控件。
/// </summary>
@ -83,7 +103,7 @@ namespace FineUIPro.Web.HSSE.Solution {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.DatePicker txtExpectedStartTime;
/// <summary>
/// txtExpectedEndTime 控件。
/// </summary>
@ -92,7 +112,7 @@ namespace FineUIPro.Web.HSSE.Solution {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.DatePicker txtExpectedEndTime;
/// <summary>
/// rbWorkStates 控件。
/// </summary>
@ -101,7 +121,7 @@ namespace FineUIPro.Web.HSSE.Solution {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.RadioButtonList rbWorkStates;
/// <summary>
/// rblIsArgument 控件。
/// </summary>
@ -110,7 +130,7 @@ namespace FineUIPro.Web.HSSE.Solution {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.RadioButtonList rblIsArgument;
/// <summary>
/// drpUnitId 控件。
/// </summary>
@ -119,7 +139,7 @@ namespace FineUIPro.Web.HSSE.Solution {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.DropDownList drpUnitId;
/// <summary>
/// Toolbar1 控件。
/// </summary>
@ -128,7 +148,7 @@ namespace FineUIPro.Web.HSSE.Solution {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Toolbar Toolbar1;
/// <summary>
/// lbTemp 控件。
/// </summary>
@ -137,7 +157,7 @@ namespace FineUIPro.Web.HSSE.Solution {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Label lbTemp;
/// <summary>
/// ToolbarFill1 控件。
/// </summary>
@ -146,7 +166,7 @@ namespace FineUIPro.Web.HSSE.Solution {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.ToolbarFill ToolbarFill1;
/// <summary>
/// btnSave 控件。
/// </summary>
@ -155,7 +175,7 @@ namespace FineUIPro.Web.HSSE.Solution {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Button btnSave;
/// <summary>
/// btnClose 控件。
/// </summary>
@ -164,5 +184,14 @@ namespace FineUIPro.Web.HSSE.Solution {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Button btnClose;
/// <summary>
/// Window1 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Window Window1;
}
}

2
SGGL/FineUIPro.Web/HSSE/Solution/LargerHazardView.aspx
View File

@ -25,7 +25,7 @@
</f:FormRow>
<f:FormRow>
<Items>
<f:TextBox ID="txtIsArgument" runat="server" Label="专家论证" LabelWidth="100px" Readonly="true" >
<f:TextBox ID="txtIsArgument" runat="server" Label="专家论证" LabelWidth="100px" Readonly="true" >
</f:TextBox>
<f:TextBox ID="txtRecordTime" runat="server" Label="编制时间" LabelWidth="100px" Readonly="true" >
</f:TextBox>

2
SGGL/FineUIPro.Web/Login.aspx.cs
View File

@ -110,7 +110,7 @@
string url = "";
string PHTUrl = new Login().PHTUrl;
string ProjectId = new Login().ProjectId;
if (LoginService.UserLogOn(user, pwd, true, this.Page))
if (LoginService.UserLogOn(user.Trim(), pwd.Trim(), true, this.Page))
{
//PageContext.RegisterStartupScript(Window1.GetShowReference(String.Format("../SysManage/UpdatePasswordEdit.aspx?userId={0}", this.CurrUser.PersonId, "编辑 - ")));
if (!this.CurrUser.LastIsOffice.HasValue)

6
SGGL/FineUIPro.Web/PHTGL/ContractCompile/ContractTrackList.aspx.cs
View File

@ -58,6 +58,12 @@ namespace FineUIPro.Web.PHTGL.ContractCompile
{
Grid1.DataSource = null;
Grid1.DataBind();
Grid2.DataSource = null;
Grid2.DataBind();
Grid3.DataSource = null;
Grid3.DataBind();
}
}

61
SGGL/FineUIPro.Web/common/Menu_DigData.xml
View File

@ -1,66 +1,19 @@
<?xml version="1.0" encoding="utf-8"?>
<Tree>
<TreeNode id="6A992AB8-A32D-448F-B06F-8DD4C112CC91" Text="法律法规制度标准库" NavigateUrl="">
<TreeNode id="CF1F59BB-215A-4E9D-9F19-DE188D322477" Text="标准分类" NavigateUrl="">
<TreeNode id="8B550B58-C681-4F34-83F0-F1E99CE04A47" Text="国内标准" NavigateUrl="">
</TreeNode>
<TreeNode id="97D1E401-EA0F-4C90-B7DC-61D568BAE617" Text="国外标准" NavigateUrl=""></TreeNode>
</TreeNode>
<TreeNode id="DC3C36E0-4CD4-43E1-9CF8-D98D053E31FB" Text="法律法规" NavigateUrl=""><TreeNode id="2C7F78D3-DA7B-4193-A37F-CC479E4B9583" Text="法律法规" NavigateUrl=""></TreeNode>
</TreeNode>
<TreeNode id="97D20BA1-9378-4268-901B-3747EDFB15F4" Text="赛鼎体系" NavigateUrl=""><TreeNode id="406EBAAB-05B2-4249-BAC2-5589F50AE365" Text="企业标准" NavigateUrl=""></TreeNode>
<TreeNode id="59F3FA81-7D08-4611-A3FF-22BFA656A940" Text="企业制度" NavigateUrl=""></TreeNode>
</TreeNode>
<TreeNode id="35092B0F-1B7B-4014-A41D-41354FD87374" Text="遵照执行的集团制度" NavigateUrl=""></TreeNode>
</TreeNode>
<TreeNode id="BAEBE57F-2858-49E0-BEFE-4D2FDF2FA4FE" Text="公共资源库" NavigateUrl=""><TreeNode id="664094A9-3DEF-4674-8FE2-ACF30B71B8DB" Text="安全公共资源库" NavigateUrl=""><TreeNode id="FDVXFGDS-5THM-CCDE-DCS2-TGHNO48F7UKM" Text="安全合规" NavigateUrl=""><TreeNode id="F4B02718-0616-4623-ABCE-885698DDBEB1" Text="安全法律法规" NavigateUrl="HSSE/Law/LawRegulationList.aspx"></TreeNode>
<TreeNode id="499E23C1-057C-4B04-B92A-973B1DACD546" Text="赛鼎制度" NavigateUrl="HSSE/HSSESystem/SafetyInstitution.aspx"></TreeNode>
<TreeNode id="EFDSFVDE-RTHN-7UMG-4THA-5TGED48F8IOL" Text="安全标准规范" NavigateUrl="HSSE/Law/HSSEStandardList.aspx"></TreeNode>
<TreeNode id="DF1413F3-4CE5-40B3-A574-E01CE64FEA25" Text="安全规章制度" NavigateUrl="HSSE/Law/RulesRegulations.aspx"></TreeNode>
<TreeNode id="56960940-81A8-43D1-9565-C306EC7AFD12" Text="集团制度" NavigateUrl="HSSE/Law/ManageRule.aspx"></TreeNode>
</TreeNode>
<TreeNode id="2B49BFE2-734F-489E-91B9-D05F02E1976D" Text="安全生产责任制" NavigateUrl=""><TreeNode id="1DB91420-47D3-4219-AAB4-7E613FCBCC90" Text="安全主体责任" NavigateUrl="HSSE/HSSESystem/HSSEMainDuty.aspx"></TreeNode>
</TreeNode>
<TreeNode id="E26D223B-4CA2-4A6D-82D0-224CC9C8676D" Text="安全教育" NavigateUrl=""><TreeNode id="9D99A981-7380-4085-84FA-8C3B1AFA6202" Text="培训教材库" NavigateUrl="HSSE/EduTrain/TrainDB.aspx"></TreeNode>
<TreeNode id="9D4F76A1-CD2E-4E66-B833-49425CD879EB" Text="公司教材库" NavigateUrl="HSSE/EduTrain/CompanyTraining.aspx"></TreeNode>
<TreeNode id="4D6BD686-DA06-45CC-9DB8-54B342651724" Text="考试试题库" NavigateUrl="HSSE/EduTrain/TestTraining.aspx"></TreeNode>
<TreeNode id="F58EE8ED-9EB5-47C7-9D7F-D751EFEA44CA" Text="安全试题库" NavigateUrl="HSSE/EduTrain/TrainTestDB.aspx"></TreeNode>
<TreeNode id="D86917DB-D00A-4E18-9793-C290B5BBA84C" Text="事故案例库" NavigateUrl="HSSE/EduTrain/AccidentCase.aspx"></TreeNode>
</TreeNode>
<TreeNode id="D70D9BF5-C72E-414D-941B-CF9B4065F6BA" Text="安全技术" NavigateUrl=""><TreeNode id="8333727B-A2CE-4CE2-A019-21AC9EE61A4C" Text="危险源清单" NavigateUrl="HSSE/Technique/HazardList.aspx"></TreeNode>
<TreeNode id="C0018E8C-C88B-4E25-BCFC-F0BF3CACC63A" Text="公司危险源清单" NavigateUrl="HSSE/Technique/CompanyHazardList.aspx"></TreeNode>
<TreeNode id="773B59F9-61F9-4F5E-9D68-A1BF9322AFFA" Text="环境因素危险源" NavigateUrl="HSSE/Technique/Environmental.aspx"></TreeNode>
<TreeNode id="DC2AA8C2-82A8-4F7A-832D-9889C65AA228" Text="公司环境因素危险源" NavigateUrl="HSSE/Technique/CompanyEnvironmental.aspx"></TreeNode>
<TreeNode id="2D86AD87-4108-428C-BA3D-F81FB85511FE" Text="安全隐患" NavigateUrl="HSSE/Technique/Rectify.aspx"></TreeNode>
<TreeNode id="9C26BF2A-091D-4AC3-8678-334DE4E1CED7" Text="项目安全检查项" NavigateUrl="HSSE/Technique/CheckItemSet.aspx"></TreeNode>
<TreeNode id="D11BFC83-BE64-457D-B8FA-11C37D35CD72" Text="应急预案" NavigateUrl="HSSE/Technique/Emergency.aspx"></TreeNode>
<TreeNode id="3E2F2FFD-ED2E-4914-8370-D97A68398814" Text="施工方案" NavigateUrl="HSSE/Technique/SpecialScheme.aspx"></TreeNode>
</TreeNode>
<TreeNode id="1B688B07-AEF4-43D8-BF31-1907522967ED" Text="标牌管理" NavigateUrl=""><TreeNode id="022CA9C1-70F0-4C07-996C-0736D32B442A" Text="标牌管理" NavigateUrl="HSSE/Resources/SignManage.aspx"></TreeNode>
</TreeNode>
</TreeNode>
<TreeNode id="34705FFF-0BA5-4C4F-BD70-721AA0EF874F" Text="质量公共资源库" NavigateUrl=""></TreeNode>
<TreeNode id="AB48BB81-A0F1-4E90-9E01-3F203E5ACFDE" Text="施工公共资源库" NavigateUrl=""></TreeNode>
<TreeNode id="EDDED4C1-B01E-4831-8552-38CB30CE8817" Text="开车公共资源库" NavigateUrl=""></TreeNode>
</TreeNode>
<TreeNode id="DCVVBDE3-1B48-4615-FCD0-VDBCDS3ET4D9" Text="施工WBS基础数据库" NavigateUrl="CQMS/WBS/ControlItemInitSet.aspx"></TreeNode>
<TreeNode id="FF0D9166-4509-4411-8039-F035BC251114" Text="数据仓库" NavigateUrl=""><TreeNode id="AA670914-6EAA-4CFA-8BD6-E0648F8FD21C" Text="安全数据库" NavigateUrl=""><TreeNode id="427AB060-2510-4568-B85B-AD6796EBE569" Text="项目HSE数据汇总" NavigateUrl="DigData/HSEDataCollect.aspx"></TreeNode>
<TreeNode id="04B182E4-D31E-449F-9803-322F3F380D89" Text="HSE日常检查问题分析" NavigateUrl="DigData/DailyProblemAnalysis.aspx"></TreeNode>
<TreeNode id="FF0D9166-4509-4411-8039-F035BC251114" Text="数据仓库" NavigateUrl="">
<TreeNode id="0E9C6A47-E410-43C4-95D1-1EC1C01E9967" Text="WBS数据仓库" NavigateUrl="DigData/WBSDW.aspx">
</TreeNode>
<TreeNode id="92B50285-30BD-4B62-9E23-A0D6B4BA1577" Text="项目数据仓库" NavigateUrl=""><TreeNode id="AA670914-6EAA-4CFA-8BD6-E0648F8FD21C" Text="安全数据库" NavigateUrl=""><TreeNode id="04B182E4-D31E-449F-9803-322F3F380D89" Text="HSE日常检查问题分析" NavigateUrl="DigData/DailyProblemAnalysis.aspx"></TreeNode>
<TreeNode id="24939ABD-E174-4C3D-8B04-494917B7BE40" Text="HSE隐患整改问题分析" NavigateUrl="DigData/RectifyProblemAnalysis.aspx"></TreeNode>
<TreeNode id="4B2E7EE5-AC7C-4143-B5BC-60080C763A24" Text="HSE教育培训统计" NavigateUrl="DigData/TrainRecordAnalysis.aspx"></TreeNode>
</TreeNode>
<TreeNode id="7EC74F30-B2F7-454E-B0AE-8E993211F763" Text="质量数据库" NavigateUrl=""></TreeNode>
<TreeNode id="E7F7BC38-7357-49C0-9242-68289031F618" Text="进度数据库" NavigateUrl=""></TreeNode>
<TreeNode id="381A4608-2CDE-42AF-BC4D-FF554785B9F8" Text="合同数据库" NavigateUrl=""></TreeNode>
<TreeNode id="5BE7F83B-C02D-4481-815F-153279B44C39" Text="劳务数据库" NavigateUrl=""></TreeNode>
</TreeNode>
<TreeNode id="B87413D8-4EFB-42F3-A4F6-9D21C0CD3DFE" Text="数据分析室" NavigateUrl=""><TreeNode id="AF5C32FD-F0CB-404E-B56D-C4AE79A8A050" Text="人员功效分析" NavigateUrl=""></TreeNode>
<TreeNode id="0DB6BB5F-B17A-4A38-AABB-278300EA9E39" Text="员工产值分析" NavigateUrl=""></TreeNode>
</TreeNode>
<TreeNode id="6136C2AE-2AF8-498D-BC19-7D693841239C" Text="文件柜" NavigateUrl=""><TreeNode id="506F42F3-F4CF-46A7-AC90-787117B4F1DC" Text="安全文件柜" NavigateUrl=""></TreeNode>
<TreeNode id="A90460D0-2658-43F7-9558-A72E91E54ABD" Text="质量文件柜" NavigateUrl=""></TreeNode>
<TreeNode id="2539A5CE-E209-4A16-A9B7-4C43E4E3CBEC" Text="进度文件柜" NavigateUrl=""></TreeNode>
<TreeNode id="8FB0A651-485F-4413-BCD6-22BF82438125" Text="焊接文件柜" NavigateUrl=""></TreeNode>
<TreeNode id="F596EC1A-71A3-4B34-B36C-68628F2F42FE" Text="合同文件柜" NavigateUrl=""></TreeNode>
<TreeNode id="B87413D8-4EFB-42F3-A4F6-9D21C0CD3DFE" Text="数据分析室" NavigateUrl=""><TreeNode id="CFEF47C0-8EFA-46FF-8648-5B1922519DCC" Text="WBS数据分析" NavigateUrl=""></TreeNode>
<TreeNode id="B146FC96-B199-426B-8504-4BE093C0DCB1" Text="项目数据汇总分析" NavigateUrl=""><TreeNode id="427AB060-2510-4568-B85B-AD6796EBE569" Text="项目HSE数据汇总" NavigateUrl="DigData/HSEDataCollect.aspx"></TreeNode>
</TreeNode>
</TreeNode>
</Tree>

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

@ -14,6 +14,7 @@
<TreeNode id="0E04FA16-FFA6-4987-A0A5-A4658F0099F2" Text="工艺管道安装工程" NavigateUrl="PHTGL/BillOfQuantities/TemQuantityList.aspx?Type=2"></TreeNode>
<TreeNode id="FAC4F0F7-A7C0-4F66-8BCB-846C082BCA40" Text="工艺设备安装工程" NavigateUrl="PHTGL/BillOfQuantities/TemQuantityList.aspx?Type=3"></TreeNode>
<TreeNode id="10586190-0FDD-4DA8-A877-CE4599D6F0DF" Text="非标设备现场制作安装工程" NavigateUrl="PHTGL/BillOfQuantities/TemQuantityList.aspx?Type=4"></TreeNode>
<TreeNode id="1C770E20-7912-484C-9739-499B1B2F8DEB" Text="电仪安装工程" NavigateUrl="PHTGL/BillOfQuantities/TemQuantityList.aspx?Type=5"></TreeNode>
<TreeNode id="92101A90-9C22-4B43-B012-9AFF8402F85D" Text="水暖安装工程" NavigateUrl="PHTGL/BillOfQuantities/TemQuantityList.aspx?Type=6"></TreeNode>
<TreeNode id="33A03E2C-4E00-4722-AA14-F50419468154" Text="防腐绝热工程" NavigateUrl="PHTGL/BillOfQuantities/TemQuantityList.aspx?Type=7"></TreeNode>
<TreeNode id="A5A31FE8-0643-4396-99E3-A4A31A947789" Text="无损检测工程" NavigateUrl="PHTGL/BillOfQuantities/TemQuantityList.aspx?Type=8"></TreeNode>

6
SGGL/FineUIPro.Web/common/Menu_JDGL.xml
View File

@ -1,11 +1,7 @@
<?xml version="1.0" encoding="utf-8"?>
<Tree>
<TreeNode id="BAC3D994-03A8-466C-8975-A31039998BCC" Text="施工进度统计" NavigateUrl="JDGL/Check/ProgressShow.aspx">
<TreeNode id="E23F0879-3E9F-4E7B-9A2D-EFF34798D629" Text="进度计划编制" NavigateUrl="JDGL/Check/PlanSet.aspx">
</TreeNode>
<TreeNode id="1172B112-2A12-4410-AD66-E5BA6B461475" Text="施工进度赢得值曲线" NavigateUrl="JDGL/Check/ProgressStatistics.aspx"></TreeNode>
<TreeNode id="B479EC55-E12A-4F91-AF3F-864DAAA136FB" Text="进度完成情况录入" NavigateUrl="JDGL/Check/CompleteInput.aspx"></TreeNode>
<TreeNode id="4288426D-E49B-4E5D-A495-7E6A76F269B5" Text="周计划" NavigateUrl=""></TreeNode>
<TreeNode id="F0E296C3-6499-43E5-88CD-E00C5180D3BC" Text="赢得值曲线" NavigateUrl="JDGL/Check/EarnedValueCurve.aspx"></TreeNode>
<TreeNode id="C75F0853-8A2B-4B32-83B7-509278D11957" Text="项目里程碑节点" NavigateUrl=""></TreeNode>
<TreeNode id="3550F422-E520-4962-9816-B691B0EE2865" Text="形象进度照片" NavigateUrl=""></TreeNode>
</Tree>

42
SGGL/FineUIPro.Web/common/Menu_ZHGL.xml
View File

@ -48,6 +48,48 @@
<TreeNode id="3BBFCD70-D7A3-435C-9571-DD499D5ED7B8" Text="应急信息" NavigateUrl=""><TreeNode id="D12C2412-E12A-4F78-9AEF-1EE8AC84A561" Text="应急预案管理清单" NavigateUrl="ZHGL/Emergency/EmergencyList.aspx"></TreeNode>
<TreeNode id="172F25E0-F5E2-42E3-AD67-AC824D4E0FBB" Text="应急演练开展情况" NavigateUrl="ZHGL/Emergency/DrillRecordList.aspx"></TreeNode>
</TreeNode>
<TreeNode id="6A992AB8-A32D-448F-B06F-8DD4C112CC91" Text="法律法规制度标准库" NavigateUrl=""><TreeNode id="CF1F59BB-215A-4E9D-9F19-DE188D322477" Text="标准分类" NavigateUrl=""><TreeNode id="8B550B58-C681-4F34-83F0-F1E99CE04A47" Text="国内标准" NavigateUrl=""></TreeNode>
<TreeNode id="97D1E401-EA0F-4C90-B7DC-61D568BAE617" Text="国外标准" NavigateUrl=""></TreeNode>
</TreeNode>
<TreeNode id="DC3C36E0-4CD4-43E1-9CF8-D98D053E31FB" Text="法律法规" NavigateUrl=""><TreeNode id="2C7F78D3-DA7B-4193-A37F-CC479E4B9583" Text="法律法规" NavigateUrl=""></TreeNode>
</TreeNode>
<TreeNode id="97D20BA1-9378-4268-901B-3747EDFB15F4" Text="赛鼎体系" NavigateUrl=""><TreeNode id="406EBAAB-05B2-4249-BAC2-5589F50AE365" Text="企业标准" NavigateUrl=""></TreeNode>
<TreeNode id="59F3FA81-7D08-4611-A3FF-22BFA656A940" Text="企业制度" NavigateUrl=""></TreeNode>
</TreeNode>
<TreeNode id="35092B0F-1B7B-4014-A41D-41354FD87374" Text="遵照执行的集团制度" NavigateUrl=""></TreeNode>
</TreeNode>
<TreeNode id="BAEBE57F-2858-49E0-BEFE-4D2FDF2FA4FE" Text="公共资源库" NavigateUrl=""><TreeNode id="664094A9-3DEF-4674-8FE2-ACF30B71B8DB" Text="安全公共资源库" NavigateUrl=""><TreeNode id="FDVXFGDS-5THM-CCDE-DCS2-TGHNO48F7UKM" Text="安全合规" NavigateUrl=""><TreeNode id="F4B02718-0616-4623-ABCE-885698DDBEB1" Text="安全法律法规" NavigateUrl="HSSE/Law/LawRegulationList.aspx"></TreeNode>
<TreeNode id="499E23C1-057C-4B04-B92A-973B1DACD546" Text="赛鼎制度" NavigateUrl="HSSE/HSSESystem/SafetyInstitution.aspx"></TreeNode>
<TreeNode id="EFDSFVDE-RTHN-7UMG-4THA-5TGED48F8IOL" Text="安全标准规范" NavigateUrl="HSSE/Law/HSSEStandardList.aspx"></TreeNode>
<TreeNode id="DF1413F3-4CE5-40B3-A574-E01CE64FEA25" Text="安全规章制度" NavigateUrl="HSSE/Law/RulesRegulations.aspx"></TreeNode>
<TreeNode id="56960940-81A8-43D1-9565-C306EC7AFD12" Text="集团制度" NavigateUrl="HSSE/Law/ManageRule.aspx"></TreeNode>
</TreeNode>
<TreeNode id="2B49BFE2-734F-489E-91B9-D05F02E1976D" Text="安全生产责任制" NavigateUrl=""><TreeNode id="1DB91420-47D3-4219-AAB4-7E613FCBCC90" Text="安全主体责任" NavigateUrl="HSSE/HSSESystem/HSSEMainDuty.aspx"></TreeNode>
</TreeNode>
<TreeNode id="E26D223B-4CA2-4A6D-82D0-224CC9C8676D" Text="安全教育" NavigateUrl=""><TreeNode id="9D99A981-7380-4085-84FA-8C3B1AFA6202" Text="培训教材库" NavigateUrl="HSSE/EduTrain/TrainDB.aspx"></TreeNode>
<TreeNode id="9D4F76A1-CD2E-4E66-B833-49425CD879EB" Text="公司教材库" NavigateUrl="HSSE/EduTrain/CompanyTraining.aspx"></TreeNode>
<TreeNode id="4D6BD686-DA06-45CC-9DB8-54B342651724" Text="考试试题库" NavigateUrl="HSSE/EduTrain/TestTraining.aspx"></TreeNode>
<TreeNode id="F58EE8ED-9EB5-47C7-9D7F-D751EFEA44CA" Text="安全试题库" NavigateUrl="HSSE/EduTrain/TrainTestDB.aspx"></TreeNode>
<TreeNode id="D86917DB-D00A-4E18-9793-C290B5BBA84C" Text="事故案例库" NavigateUrl="HSSE/EduTrain/AccidentCase.aspx"></TreeNode>
</TreeNode>
<TreeNode id="D70D9BF5-C72E-414D-941B-CF9B4065F6BA" Text="安全技术" NavigateUrl=""><TreeNode id="8333727B-A2CE-4CE2-A019-21AC9EE61A4C" Text="危险源清单" NavigateUrl="HSSE/Technique/HazardList.aspx"></TreeNode>
<TreeNode id="C0018E8C-C88B-4E25-BCFC-F0BF3CACC63A" Text="公司危险源清单" NavigateUrl="HSSE/Technique/CompanyHazardList.aspx"></TreeNode>
<TreeNode id="773B59F9-61F9-4F5E-9D68-A1BF9322AFFA" Text="环境因素危险源" NavigateUrl="HSSE/Technique/Environmental.aspx"></TreeNode>
<TreeNode id="DC2AA8C2-82A8-4F7A-832D-9889C65AA228" Text="公司环境因素危险源" NavigateUrl="HSSE/Technique/CompanyEnvironmental.aspx"></TreeNode>
<TreeNode id="2D86AD87-4108-428C-BA3D-F81FB85511FE" Text="安全隐患" NavigateUrl="HSSE/Technique/Rectify.aspx"></TreeNode>
<TreeNode id="9C26BF2A-091D-4AC3-8678-334DE4E1CED7" Text="项目安全检查项" NavigateUrl="HSSE/Technique/CheckItemSet.aspx"></TreeNode>
<TreeNode id="D11BFC83-BE64-457D-B8FA-11C37D35CD72" Text="应急预案" NavigateUrl="HSSE/Technique/Emergency.aspx"></TreeNode>
<TreeNode id="3E2F2FFD-ED2E-4914-8370-D97A68398814" Text="施工方案" NavigateUrl="HSSE/Technique/SpecialScheme.aspx"></TreeNode>
</TreeNode>
<TreeNode id="1B688B07-AEF4-43D8-BF31-1907522967ED" Text="标牌管理" NavigateUrl=""><TreeNode id="022CA9C1-70F0-4C07-996C-0736D32B442A" Text="标牌管理" NavigateUrl="HSSE/Resources/SignManage.aspx"></TreeNode>
</TreeNode>
</TreeNode>
<TreeNode id="34705FFF-0BA5-4C4F-BD70-721AA0EF874F" Text="质量公共资源库" NavigateUrl=""></TreeNode>
<TreeNode id="AB48BB81-A0F1-4E90-9E01-3F203E5ACFDE" Text="施工公共资源库" NavigateUrl=""></TreeNode>
<TreeNode id="EDDED4C1-B01E-4831-8552-38CB30CE8817" Text="开车公共资源库" NavigateUrl=""></TreeNode>
</TreeNode>
<TreeNode id="DCVVBDE3-1B48-4615-FCD0-VDBCDS3ET4D9" Text="施工WBS基础数据库" NavigateUrl="CQMS/WBS/ControlItemInitSet.aspx"></TreeNode>
<TreeNode id="6136C2AE-2AF8-498D-BC19-7D693841239C" Text="文件柜" NavigateUrl=""></TreeNode>
<TreeNode id="1E216BE3-DB22-4649-BD9A-0777B0DC03E6" Text="QHSE上报" NavigateUrl=""><TreeNode id="94F94EC1-54B3-4BEB-A019-0A755A66D8FD" Text="安全数据" NavigateUrl="ZHGL/DataSync/HSSEData_HSSE.aspx"></TreeNode>
<TreeNode id="4C9920AE-F335-48B1-BDB0-276173305952" Text="质量数据" NavigateUrl="ZHGL/DataSync/CQMSData_CQMS.aspx"></TreeNode>
<TreeNode id="2110702F-4E12-479A-8EA1-E5A8EEF77276" Text="焊接数据" NavigateUrl="ZHGL/DataSync/HJGLData_HJGL.aspx"></TreeNode>

9
SGGL/FineUIPro.Web/indexProject.aspx.cs
View File

@ -296,7 +296,6 @@ namespace FineUIPro.Web
if (!string.IsNullOrEmpty(Request.Params["PHTUrl"]))
{
this.drpProject.SelectedValue = Request.Params["projectId"];
mainTabStrip.ShowTabHeader = true;
PageContext.RegisterStartupScript("parent.removeActiveTab();");
//btnPHTGL_Click(null, null);
@ -349,10 +348,14 @@ namespace FineUIPro.Web
this.drpProject.SelectedValue = getproject.ProjectId;
}
}
if (!string.IsNullOrEmpty(this.CurrUser.LoginProjectId))
if (!string.IsNullOrEmpty(this.CurrUser.LoginProjectId) && this.drpProject.Items.Select(x => x.Value == this.CurrUser.LoginProjectId) != null)
{
this.drpProject.SelectedValue = this.CurrUser.LoginProjectId;
}
else
{
this.CurrUser.LoginProjectId = this.drpProject.SelectedValue;
}
this.InitMenuStyleButton();
@ -578,7 +581,7 @@ namespace FineUIPro.Web
/// <param name="type"></param>
protected void MenuSwitchMethod(string type)
{
this.CurrUser.LoginProjectId = this.drpProject.SelectedValue;
// this.CurrUser.LoginProjectId = this.drpProject.SelectedValue;
this.XmlDataSource1.DataFile = "common/Menu_Personal.xml";
this.leftPanel.Hidden = true;
this.Tab1.IFrameUrl = "~/common/mainProject.aspx";

54
SGGL/Model/Model.cs
View File

@ -56325,6 +56325,8 @@ namespace Model
private System.Nullable<bool> _IsShow;
private string _WorkPackageId;
#region 可扩展性方法定义
partial void OnLoaded();
partial void OnValidate(System.Data.Linq.ChangeAction action);
@ -56355,6 +56357,8 @@ namespace Model
partial void OnHandleManChanged();
partial void OnIsShowChanging(System.Nullable<bool> value);
partial void OnIsShowChanged();
partial void OnWorkPackageIdChanging(string value);
partial void OnWorkPackageIdChanged();
#endregion
public Check_SpotCheckDetail()
@ -56622,6 +56626,26 @@ namespace Model
}
}
[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_WorkPackageId", DbType="NVarChar(2000)")]
public string WorkPackageId
{
get
{
return this._WorkPackageId;
}
set
{
if ((this._WorkPackageId != value))
{
this.OnWorkPackageIdChanging(value);
this.SendPropertyChanging();
this._WorkPackageId = value;
this.SendPropertyChanged("WorkPackageId");
this.OnWorkPackageIdChanged();
}
}
}
public event PropertyChangingEventHandler PropertyChanging;
public event PropertyChangedEventHandler PropertyChanged;
@ -230087,6 +230111,8 @@ namespace Model
private string _WorkStates;
private string _WorkPackageName;
private EntityRef<Base_Unit> _Base_Unit;
private EntityRef<Solution_LargerHazardList> _Solution_LargerHazardList;
@ -230119,6 +230145,8 @@ namespace Model
partial void OnUnitIdChanged();
partial void OnWorkStatesChanging(string value);
partial void OnWorkStatesChanged();
partial void OnWorkPackageNameChanging(string value);
partial void OnWorkPackageNameChanged();
#endregion
public Solution_LargerHazardListItem()
@ -230217,7 +230245,7 @@ namespace Model
}
}
[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_WorkPackageId", DbType="NVarChar(50)")]
[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_WorkPackageId", DbType="NVarChar(2000)")]
public string WorkPackageId
{
get
@ -230361,6 +230389,26 @@ namespace Model
}
}
[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_WorkPackageName", DbType="NVarChar(2000)")]
public string WorkPackageName
{
get
{
return this._WorkPackageName;
}
set
{
if ((this._WorkPackageName != value))
{
this.OnWorkPackageNameChanging(value);
this.SendPropertyChanging();
this._WorkPackageName = value;
this.SendPropertyChanged("WorkPackageName");
this.OnWorkPackageNameChanged();
}
}
}
[global::System.Data.Linq.Mapping.AssociationAttribute(Name="FK_Solution_LargerHazardListItem_Base_Unit", Storage="_Base_Unit", ThisKey="UnitId", OtherKey="UnitId", IsForeignKey=true)]
public Base_Unit Base_Unit
{
@ -287668,7 +287716,7 @@ namespace Model
}
}
[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_WorkPackageId", DbType="NVarChar(50)")]
[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_WorkPackageId", DbType="NVarChar(2000)")]
public string WorkPackageId
{
get
@ -287684,7 +287732,7 @@ namespace Model
}
}
[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_PackageContent", DbType="NVarChar(500)")]
[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_PackageContent", DbType="NVarChar(2000)")]
public string PackageContent
{
get