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

0929-gaofei

This commit is contained in:
gaofei 2021-09-29 16:07:32 +08:00
parent 82af498870
commit 38b94ff3b2
8 changed files with 187 additions and 217 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
DataBase/进度数据初始化脚本/清空进度数据脚本.sql
View File

@ -15,5 +15,6 @@ delete from [dbo].[WBS_CostControl]
delete from [dbo].[Wbs_WbsSet]
delete from [dbo].[Wbs_UnitProject]
delete from WBS_CnProfession
delete from [dbo].[Project_Installation] where InstallationName!='×Üͼ'
delete from [dbo].[Project_Installation] where projectid='' and InstallationName!='总图'
and InstallationName!='全厂地下主管网' and InstallationName!='临时设施' and InstallationName!='地勘' and InstallationName!='防腐绝热'
GO

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

@ -1 +1,19 @@

错误信息开始=====>
错误类型:Exception
错误信息:Region control must be included in RegionPanel control.
错误堆栈:
在 FineUIPro.Region.OnInit(EventArgs e)
在 System.Web.UI.Control.InitRecursive(Control namingContainer)
在 System.Web.UI.Control.InitRecursive(Control namingContainer)
在 System.Web.UI.Control.InitRecursive(Control namingContainer)
在 System.Web.UI.Control.InitRecursive(Control namingContainer)
在 System.Web.UI.Control.InitRecursive(Control namingContainer)
在 System.Web.UI.Page.ProcessRequestMain(Boolean includeStagesBeforeAsyncPoint, Boolean includeStagesAfterAsyncPoint)
出错时间:09/29/2021 15:32:37
出错文件:http://localhost:8118/JDGL/WBS/WBSSetAudit.aspx
IP地址:::1
操作人员:JT
出错时间:09/29/2021 15:32:37

53
SGGL/FineUIPro.Web/JDGL/WBS/WBSSetAudit.aspx
View File

@ -4,36 +4,31 @@
<html xmlns="http://www.w3.org/1999/xhtml">
<head runat="server">
<meta http-equiv="Content-Type" content="text/html; charset=utf-8"/>
<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
<title>分部、工作项及费用清单设置</title>
<link href="../../res/css/common.css" rel="stylesheet" type="text/css" />
<style type="text/css">
.f-grid-row .f-grid-cell-inner
{
.f-grid-row .f-grid-cell-inner {
white-space: normal;
word-break: break-all;
}
.row-grid-disabled .f-grid-cell-inner
{
.row-grid-disabled .f-grid-cell-inner {
opacity: .5;
filter: alpha(opacity=50);
}
.f-grid-row.orange, .f-grid-row.orange .ui-icon, .f-grid-row.orange a
{
.f-grid-row.orange, .f-grid-row.orange .ui-icon, .f-grid-row.orange a {
background-color: Orange;
color: #fff;
}
.f-grid-row.red, .f-grid-row.red .ui-icon, .f-grid-row.red a
{
.f-grid-row.red, .f-grid-row.red .ui-icon, .f-grid-row.red a {
background-color: Red;
color: #fff;
}
.customlabel span
{
.customlabel span {
color: red;
font-weight: bold;
}
@ -46,16 +41,11 @@
</head>
<body>
<form id="form1" runat="server">
<f:PageManager ID="PageManager1" AutoSizePanelID="RegionPanel1" runat="server" />
<f:RegionPanel ID="RegionPanel1" ShowBorder="false" runat="server" Margin="5px">
<Regions>
<f:Region ID="Region1" ShowBorder="false" ShowHeader="false" RegionPosition="Left"
Title="分部、工作项及费用清单设置" BodyPadding="0 5 0 0" Width="300px" Layout="Fit" runat="server"
EnableCollapse="true">
<f:PageManager ID="PageManager1" AutoSizePanelID="Panel1" runat="server" />
<f:Panel ID="Panel1" CssClass="blockpanel" Margin="20px" runat="server" ShowBorder="false" ShowHeader="false" Layout="Region">
<Items>
<f:Panel runat="server" ID="panel2" RegionPosition="Left" RegionSplit="true" EnableCollapse="true"
Width="400" Title="分部、工作项及费用清单设置" TitleToolTip="分部、工作项及费用清单设置" ShowBorder="true"
ShowHeader="true" BodyPadding="5px" IconFont="ArrowCircleLeft" Layout="Region">
<f:Panel runat="server" ID="panelLeftRegion" RegionPosition="Left" RegionSplit="true" RegionSplitWidth="3px" EnableCollapse="true"
Width="300px" Title="分部、工作项及费用清单设置" ShowBorder="true" ShowHeader="true" BodyPadding="10px" Layout="Fit">
<Items>
<f:Tree ID="trWBS" Width="290" EnableCollapse="true" ShowHeader="true" OnNodeCommand="trWBS_NodeCommand"
OnNodeExpand="trWBS_NodeExpand" OnNodeCheck="trWBS_NodeCheck" EnableCheckBox="true"
@ -68,10 +58,8 @@
</f:HiddenField>
</Items>
</f:Panel>
</Items>
</f:Region>
<f:Region ID="Region2" ShowBorder="false" ShowHeader="false" Position="Center" Layout="VBox"
BoxConfigAlign="Stretch" BoxConfigPosition="Left" runat="server">
<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" ForceFit="true"
runat="server" BoxFlex="1" DataKeyNames="CostControlId" AllowSorting="true" EnableColumnLines="true"
@ -84,18 +72,9 @@
<f:Button ID="btnAdd" Icon="Add" runat="server" ToolTip="增加" Hidden="true"
OnClick="btnAdd_Click">
</f:Button>
<f:Button ID="btnSave" Icon="SystemSave" runat="server" ToolTip ="保存" Hidden="true" OnClick="btnSave_Click">
<f:Button ID="btnSave" Icon="SystemSave" runat="server" ToolTip="保存" Hidden="true" OnClick="btnSave_Click">
</f:Button>
<%--<f:Button ID="btnOut" runat="server" ToolTip="导出WBS" Icon="FolderUp" OnClick="btnOut_Click">
</f:Button>
<f:Button ID="btnImport" ToolTip="导入" Icon="ApplicationGet" runat="server"
OnClick="btnImport_Click">
</f:Button>--%>
</Items>
<%--<Items>
<f:Label ID="red" runat="server" CssClass="customlabel" Text="桔黄色：开始和结束日期不在上一级的开始和结束日期之间或者开始日期大于结束日期 红色:未审批">
</f:Label>
</Items>--%>
</f:Toolbar>
</Toolbars>
<Columns>
@ -154,9 +133,9 @@
</PageItems>
</f:Grid>
</Items>
</f:Region>
</Regions>
</f:RegionPanel>
</f:Panel>
</Items>
</f:Panel>
<f:Window ID="Window1" Title="编辑" Hidden="true" EnableIFrame="true" EnableMaximize="true"
Target="Self" EnableResize="true" runat="server" OnClose="Window1_Close" IsModal="true"
Width="800px" Height="350px">

21
SGGL/FineUIPro.Web/JDGL/WBS/WBSSetAudit.aspx.designer.cs generated
View File

@ -31,31 +31,22 @@ namespace FineUIPro.Web.JDGL.WBS {
protected global::FineUIPro.PageManager PageManager1;
/// <summary>
/// RegionPanel1 控件。
/// Panel1 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.RegionPanel RegionPanel1;
protected global::FineUIPro.Panel Panel1;
/// <summary>
/// Region1 控件。
/// panelLeftRegion 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Region Region1;
/// <summary>
/// panel2 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Panel panel2;
protected global::FineUIPro.Panel panelLeftRegion;
/// <summary>
/// trWBS 控件。
@ -76,13 +67,13 @@ namespace FineUIPro.Web.JDGL.WBS {
protected global::FineUIPro.HiddenField hdSelectId;
/// <summary>
/// Region2 控件。
/// panelCenterRegion 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Region Region2;
protected global::FineUIPro.Panel panelCenterRegion;
/// <summary>
/// Grid1 控件。

25
SGGL/FineUIPro.Web/JDGL/WBS/WorkloadInput.aspx
View File

@ -41,16 +41,11 @@
</head>
<body>
<form id="form1" runat="server">
<f:PageManager ID="PageManager1" AutoSizePanelID="RegionPanel1" runat="server" />
<f:RegionPanel ID="RegionPanel1" ShowBorder="false" runat="server" Margin="5px">
<Regions>
<f:Region ID="Region1" ShowBorder="false" ShowHeader="false" RegionPosition="Left"
Title="工作量录入" BodyPadding="0 5 0 0" Width="300px" Layout="Fit" runat="server"
EnableCollapse="true">
<f:PageManager ID="PageManager1" AutoSizePanelID="Panel1" runat="server" />
<f:Panel ID="Panel1" CssClass="blockpanel" Margin="20px" runat="server" ShowBorder="false" ShowHeader="false" Layout="Region">
<Items>
<f:Panel runat="server" ID="panel2" RegionPosition="Left" RegionSplit="true" EnableCollapse="true"
Width="400" Title="工作量录入" TitleToolTip="工作量录入" ShowBorder="true"
ShowHeader="true" BodyPadding="5px" IconFont="ArrowCircleLeft" Layout="Region">
<f:Panel runat="server" ID="panelLeftRegion" RegionPosition="Left" RegionSplit="true" RegionSplitWidth="3px" EnableCollapse="true"
Width="300px" Title="工作量录入" ShowBorder="true" ShowHeader="true" BodyPadding="10px" Layout="Fit">
<Items>
<f:Tree ID="trWBS" Width="290" EnableCollapse="true" ShowHeader="true" OnNodeCommand="trWBS_NodeCommand"
OnNodeExpand="trWBS_NodeExpand"
@ -60,10 +55,8 @@
</f:HiddenField>
</Items>
</f:Panel>
</Items>
</f:Region>
<f:Region ID="Region2" ShowBorder="false" ShowHeader="false" Position="Center" Layout="VBox"
BoxConfigAlign="Stretch" BoxConfigPosition="Left" runat="server">
<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" ForceFit="true"
runat="server" BoxFlex="1" DataKeyNames="CostControlDetailId,CostControlId" AllowSorting="true" EnableColumnLines="true"
@ -135,9 +128,9 @@
</PageItems>
</f:Grid>
</Items>
</f:Region>
</Regions>
</f:RegionPanel>
</f:Panel>
</Items>
</f:Panel>
</form>
<script type="text/javascript">
function onGridAfterEdit(event, value, params) {

21
SGGL/FineUIPro.Web/JDGL/WBS/WorkloadInput.aspx.designer.cs generated
View File

@ -31,31 +31,22 @@ namespace FineUIPro.Web.JDGL.WBS {
protected global::FineUIPro.PageManager PageManager1;
/// <summary>
/// RegionPanel1 控件。
/// Panel1 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.RegionPanel RegionPanel1;
protected global::FineUIPro.Panel Panel1;
/// <summary>
/// Region1 控件。
/// panelLeftRegion 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Region Region1;
/// <summary>
/// panel2 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Panel panel2;
protected global::FineUIPro.Panel panelLeftRegion;
/// <summary>
/// trWBS 控件。
@ -76,13 +67,13 @@ namespace FineUIPro.Web.JDGL.WBS {
protected global::FineUIPro.HiddenField hdSelectId;
/// <summary>
/// Region2 控件。
/// panelCenterRegion 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Region Region2;
protected global::FineUIPro.Panel panelCenterRegion;
/// <summary>
/// Grid1 控件。

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

@ -1,13 +1,10 @@
<?xml version="1.0" encoding="utf-8"?>
<Tree>
<TreeNode id="F3AA42B3-5776-4992-A625-1216C579FEDE" Text="项目进度情况" NavigateUrl="JDGL/Check/ProgressCompletion.aspx">
<TreeNode id="858E83E9-ADE5-452E-BD65-82D8DFF872C0" Text="分部、工作项及费用清单设置" NavigateUrl="JDGL/WBS/WBSSetAudit.aspx">
</TreeNode>
<TreeNode id="2AE9D982-A499-497F-8F54-ADDA5856887E" Text="工程量完成情况" NavigateUrl="JDGL/Check/QuantityCompletion.aspx"></TreeNode>
<TreeNode id="82E513B9-1A6F-495A-A633-EBC89CE5273A" Text="低温储罐完成情况" NavigateUrl="JDGL/Check/LowTankCompletion.aspx"></TreeNode>
<TreeNode id="4ACA0647-4D44-462E-8277-1EF9F100566A" Text="钢结构完成情况" NavigateUrl="JDGL/Check/SteelStructureCompletion.aspx"></TreeNode>
<TreeNode id="92FD1845-F56C-4111-8BA0-91838A18B750" Text="设备完成情况" NavigateUrl="JDGL/Check/EquipmentCompletion.aspx"></TreeNode>
<TreeNode id="9AE07A76-3A54-4414-BC8C-C86A18C737BA" Text="管道完成情况" NavigateUrl="JDGL/Check/PipelineCompletion.aspx"></TreeNode>
<TreeNode id="8A8A1050-F227-42ED-9456-8CB5ECA36512" Text="电气完成情况" NavigateUrl="JDGL/Check/ElectricalCompletion.aspx"></TreeNode>
<TreeNode id="7EC1FBAF-BEC9-46CD-9E3B-0D0093B4E1C2" Text="仪表完成情况" NavigateUrl="JDGL/Check/MeterCompletion.aspx"></TreeNode>
<TreeNode id="C7037A5D-D8A6-4C1C-A5B8-2083C31C0A7B" Text="全厂地下管网完成情况" NavigateUrl="JDGL/Check/UndergroundPipeCompletion.aspx"></TreeNode>
<TreeNode id="E3905BF1-289B-4500-BD34-36F97D649AFC" Text="工作量录入" NavigateUrl="JDGL/WBS/WorkloadInput.aspx"></TreeNode>
<TreeNode id="2A3F8526-95C7-4D30-B2DD-DD26696BE150" Text="工作量统计" NavigateUrl="JDGL/WBS/WorkloadStatistics.aspx"></TreeNode>
<TreeNode id="59AAE0F0-2DB6-4065-B304-7E2C56EC3E5D" Text="赢得值曲线" NavigateUrl="JDGL/CostAnalysis/EarnedValueCurve.aspx"></TreeNode>
<TreeNode id="9CAF311E-C234-4DA4-B235-D4E478FBD80E" Text="里程碑" NavigateUrl="JDGL/WBS/MilePost.aspx"></TreeNode>
<TreeNode id="92CBD072-20F8-45B1-9D17-6F7494DD2020" Text="数据导入" NavigateUrl=""></TreeNode>
</Tree>

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

@ -52,6 +52,6 @@
<TreeNode id="C0B52610-ED93-4881-AC61-1764C243F84A" Text="基础数据" NavigateUrl="ZHGL/RealName/BasicData.aspx"></TreeNode>
<TreeNode id="F36E6C54-E39F-4032-874D-548EE090A35B" Text="同步记录" NavigateUrl="ZHGL/RealName/SynchroRecord.aspx"></TreeNode>
<TreeNode id="4882C5F0-9D49-4B2E-BA30-E806D3CDF6FA" Text="实名制人员" NavigateUrl="ZHGL/RealName/LeavePost.aspx"></TreeNode>
<TreeNode id="214A1AE1-816E-4DDA-8E6E-04EB35F02A12" Text="在岗人员" NavigateUrl="ZHGL/RealName/OnPost.aspx"></TreeNode>
<TreeNode id="214A1AE1-816E-4DDA-8E6E-04EB35F02A12" Text="现场人员" NavigateUrl="ZHGL/RealName/OnPost.aspx"></TreeNode>
</TreeNode>
</Tree>