diff --git a/DataBase/版本日志/SGGLDB_WH_2024-01-30-phf.sql b/DataBase/版本日志/SGGLDB_WH_2024-01-30-phf.sql new file mode 100644 index 00000000..8e1f450c --- /dev/null +++ b/DataBase/版本日志/SGGLDB_WH_2024-01-30-phf.sql @@ -0,0 +1,76 @@ +CREATE VIEW [dbo].[View_TransferDetail] AS +/*ƽбͼ*/ + +select SystemName,Subsystem,TestPackage,sDate,fDate,Status from ( + +SELECT SYSTEM as SystemName, Subsystem ,TestPackage, +TestPackageSTART as sDate,TestPackageFINISH as fDate,FINALStatus as Status +FROM Transfer_Piping + +UNION ALL + +SELECT SYSTEM as SystemName, Subsystem ,TestPackage,TestPackageSTART as sDate, +TestPackageFINISH as fDate, +MechanicalFINALStatus as Status +FROM Transfer_StaticEquipment + +UNION ALL + +SELECT SYSTEM as SystemName, Subsystem ,TestPackage,TestPackageSTART as sDate, +TestPackageFINISH as fDate, +MechanicalFINALStatus as Status +FROM Transfer_RotatingEquipment + +UNION ALL + +SELECT SystemName, Subsystem ,Test_Package as TestPackage, Test_Package_START as sDate, +Test_Package_FINISH as fDate, +FINAL_Status as Status +FROM Transfer_Instrumentation + +UNION ALL + +SELECT SystemName, Subsystem ,Test_Package as TestPackage, Test_Package_START as sDate, +Test_Package_FINISH as fDate, +FINAL_Status as Status +FROM Transfer_Electrical + +UNION ALL + +SELECT SystemName, Subsystem ,Test_Package as TestPackage, Test_Package_START as sDate, +Test_Package_FINISH as fDate, +FINAL_Status as Status +FROM Transfer_Civil_Structure + +UNION ALL + +SELECT SystemName, Subsystem ,Test_Package as TestPackage, Test_Package_START as sDate, +Test_Package_FINISH as fDate, +FINAL_Status as Status +FROM Transfer_Firefighting + +UNION ALL + +SELECT SystemName, Subsystem ,Test_Package as TestPackage, Test_Package_START as sDate, +Test_Package_FINISH as fDate, +FINAL_Status as Status +FROM Transfer_Telecom + +UNION ALL + +SELECT SystemName, Subsystem ,Test_Package as TestPackage, Test_Package_START as sDate, +Test_Package_FINISH as fDate, +FINAL_Status as Status +FROM Transfer_Plumbing + +UNION ALL + +SELECT SystemName, Subsystem ,Test_Package as TestPackage, Test_Package_START as sDate, +Test_Package_FINISH as fDate, +FINAL_Status as Status +FROM Transfer_HVAC + +)f + + +GO \ No newline at end of file diff --git a/DataBase/菜单初始化脚本/1-14移交管理图表（Menu_Transfer）.sql b/DataBase/菜单初始化脚本/1-14移交管理图表（Menu_Transfer）.sql index 8f602f9b..fe41f3c9 100644 --- a/DataBase/菜单初始化脚本/1-14移交管理图表（Menu_Transfer）.sql +++ b/DataBase/菜单初始化脚本/1-14移交管理图表（Menu_Transfer）.sql @@ -2,49 +2,15 @@ INSERT INTO dbo.Sys_Menu(MenuId,MenuName,Url,SortIndex,SuperMenu,MenuType,IsOffi VALUES('3517DBE2-9728-4BA0-9EA5-AE2147DB883B','ƽͼ','', 130,'0','Menu_Transfer',0,0,1) -INSERT INTO dbo.Sys_Menu(MenuId,MenuName,Url,SortIndex,SuperMenu,MenuType,IsOffice,IsEnd,IsUsed) -VALUES('4B83D8B6-18E8-41E3-A6BF-72432B2B1F56','Piping', -'Transfer/Chart/Piping.aspx',10,'3517DBE2-9728-4BA0-9EA5-AE2147DB883B','Menu_Transfer',0,1,1) INSERT INTO dbo.Sys_Menu(MenuId,MenuName,Url,SortIndex,SuperMenu,MenuType,IsOffice,IsEnd,IsUsed) -VALUES('D8579ED5-77E7-4BB3-8065-FD10F5681255','Static Equipment', -'Transfer/Chart/StaticEquipment.aspx',20,'3517DBE2-9728-4BA0-9EA5-AE2147DB883B','Menu_Transfer',0,1,1) +VALUES('E6F5125D-DD94-4978-B7EB-D9C26694D86D','ȫƽͳƱ', +'Transfer/Chart/Instrumentation.aspx',10,'3517DBE2-9728-4BA0-9EA5-AE2147DB883B','Menu_Transfer',0,1,1) -INSERT INTO dbo.Sys_Menu(MenuId,MenuName,Url,SortIndex,SuperMenu,MenuType,IsOffice,IsEnd,IsUsed) -VALUES('AD1159B3-023F-45AC-A6C2-D5498A8D7D33','Rotating Equipment', -'Transfer/Chart/RotatingEquipment.aspx',30,'3517DBE2-9728-4BA0-9EA5-AE2147DB883B','Menu_Transfer',0,1,1) - -INSERT INTO dbo.Sys_Menu(MenuId,MenuName,Url,SortIndex,SuperMenu,MenuType,IsOffice,IsEnd,IsUsed) -VALUES('E6F5125D-DD94-4978-B7EB-D9C26694D86D','Instrumentation', -'Transfer/Chart/Instrumentation.aspx',40,'3517DBE2-9728-4BA0-9EA5-AE2147DB883B','Menu_Transfer',0,1,1) - -INSERT INTO dbo.Sys_Menu(MenuId,MenuName,Url,SortIndex,SuperMenu,MenuType,IsOffice,IsEnd,IsUsed) -VALUES('713B1FB5-B70D-4C79-9CE4-71CE6B543146','Electrical', -'Transfer/Chart/Electrical.aspx',50,'3517DBE2-9728-4BA0-9EA5-AE2147DB883B','Menu_Transfer',0,1,1) - -INSERT INTO dbo.Sys_Menu(MenuId,MenuName,Url,SortIndex,SuperMenu,MenuType,IsOffice,IsEnd,IsUsed) -VALUES('71FC9E2A-D2AE-43E3-A5E4-BD7C0468C940','Civil Structure', -'Transfer/Chart/CivilStructure.aspx',60,'3517DBE2-9728-4BA0-9EA5-AE2147DB883B','Menu_Transfer',0,1,1) - -INSERT INTO dbo.Sys_Menu(MenuId,MenuName,Url,SortIndex,SuperMenu,MenuType,IsOffice,IsEnd,IsUsed) -VALUES('83CB9222-5E5E-4AAF-BDBC-0EE141262B5D','Firefighting', -'Transfer/Chart/Firefighting.aspx',70,'3517DBE2-9728-4BA0-9EA5-AE2147DB883B','Menu_Transfer',0,1,1) - -INSERT INTO dbo.Sys_Menu(MenuId,MenuName,Url,SortIndex,SuperMenu,MenuType,IsOffice,IsEnd,IsUsed) -VALUES('66E63C90-0F4E-4737-82A2-090EF8ABB3C7','Telecom', -'Transfer/Chart/Telecom.aspx',80,'3517DBE2-9728-4BA0-9EA5-AE2147DB883B','Menu_Transfer',0,1,1) - -INSERT INTO dbo.Sys_Menu(MenuId,MenuName,Url,SortIndex,SuperMenu,MenuType,IsOffice,IsEnd,IsUsed) -VALUES('EC2705EA-629A-4C0F-AC3A-A7BA848A3C34','Plumbing', -'Transfer/Chart/Plumbing.aspx',90,'3517DBE2-9728-4BA0-9EA5-AE2147DB883B','Menu_Transfer',0,1,1) - -INSERT INTO dbo.Sys_Menu(MenuId,MenuName,Url,SortIndex,SuperMenu,MenuType,IsOffice,IsEnd,IsUsed) -VALUES('BF7CD047-466D-4399-BF59-B8ED569F2819','HVAC', -'Transfer/Chart/HVAC.aspx',100,'3517DBE2-9728-4BA0-9EA5-AE2147DB883B','Menu_Transfer',0,1,1) INSERT INTO dbo.Sys_Menu(MenuId,MenuName,Url,SortIndex,SuperMenu,MenuType,IsOffice,IsEnd,IsUsed) VALUES('C2DD3E9E-DB18-466F-8FA0-19AD6E21EEF0','Punchlist from', -'Transfer/Chart/PunchlistFrom.aspx',110,'3517DBE2-9728-4BA0-9EA5-AE2147DB883B','Menu_Transfer',0,1,1) +'Transfer/Chart/PunchlistFrom.aspx',20,'3517DBE2-9728-4BA0-9EA5-AE2147DB883B','Menu_Transfer',0,1,1) diff --git a/SGGL/FineUIPro.Web/FineUIPro.Web.csproj b/SGGL/FineUIPro.Web/FineUIPro.Web.csproj index d265a599..45852f7d 100644 --- a/SGGL/FineUIPro.Web/FineUIPro.Web.csproj +++ b/SGGL/FineUIPro.Web/FineUIPro.Web.csproj @@ -1831,17 +1831,8 @@ - - - - - - - - - @@ -16373,34 +16364,6 @@ TestRunRecordUploadList.aspx - - CivilStructure.aspx - ASPXCodeBehind - - - CivilStructure.aspx - - - Electrical.aspx - ASPXCodeBehind - - - Electrical.aspx - - - Firefighting.aspx - ASPXCodeBehind - - - Firefighting.aspx - - - HVAC.aspx - ASPXCodeBehind - - - HVAC.aspx - Instrumentation.aspx ASPXCodeBehind @@ -16408,20 +16371,6 @@ Instrumentation.aspx - - Piping.aspx - ASPXCodeBehind - - - Piping.aspx - - - Plumbing.aspx - ASPXCodeBehind - - - Plumbing.aspx - PunchlistFrom.aspx ASPXCodeBehind @@ -16429,27 +16378,6 @@ PunchlistFrom.aspx - - RotatingEquipment.aspx - ASPXCodeBehind - - - RotatingEquipment.aspx - - - StaticEquipment.aspx - ASPXCodeBehind - - - StaticEquipment.aspx - - - Telecom.aspx - ASPXCodeBehind - - - Telecom.aspx - CivilStructure.aspx ASPXCodeBehind diff --git a/SGGL/FineUIPro.Web/Transfer/Chart/CivilStructure.aspx b/SGGL/FineUIPro.Web/Transfer/Chart/CivilStructure.aspx deleted file mode 100644 index 104375f0..00000000 --- a/SGGL/FineUIPro.Web/Transfer/Chart/CivilStructure.aspx +++ /dev/null @@ -1,16 +0,0 @@ -<%@ Page Language="C#" AutoEventWireup="true" CodeBehind="CivilStructure.aspx.cs" Inherits="FineUIPro.Web.Transfer.Chart.CivilStructure" %> - - - - - - - - - -
-
-
-
- - diff --git a/SGGL/FineUIPro.Web/Transfer/Chart/CivilStructure.aspx.cs b/SGGL/FineUIPro.Web/Transfer/Chart/CivilStructure.aspx.cs deleted file mode 100644 index 98f1f36d..00000000 --- a/SGGL/FineUIPro.Web/Transfer/Chart/CivilStructure.aspx.cs +++ /dev/null @@ -1,17 +0,0 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Web; -using System.Web.UI; -using System.Web.UI.WebControls; - -namespace FineUIPro.Web.Transfer.Chart -{ - public partial class CivilStructure : System.Web.UI.Page - { - protected void Page_Load(object sender, EventArgs e) - { - - } - } -} \ No newline at end of file diff --git a/SGGL/FineUIPro.Web/Transfer/Chart/CivilStructure.aspx.designer.cs b/SGGL/FineUIPro.Web/Transfer/Chart/CivilStructure.aspx.designer.cs deleted file mode 100644 index 41bc479d..00000000 --- a/SGGL/FineUIPro.Web/Transfer/Chart/CivilStructure.aspx.designer.cs +++ /dev/null @@ -1,25 +0,0 @@ -//------------------------------------------------------------------------------ -// -// 此代码由工具生成。 -// -// 对此文件的更改可能会导致不正确的行为，并且如果 -// 重新生成代码，这些更改将会丢失。 -// -//------------------------------------------------------------------------------ - - -namespace FineUIPro.Web.Transfer.Chart -{ - public partial class CivilStructure - { - - /// - /// form1 控件。 - /// - /// - /// 自动生成的字段。 - /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 - /// - protected global::System.Web.UI.HtmlControls.HtmlForm form1; - } -} diff --git a/SGGL/FineUIPro.Web/Transfer/Chart/Electrical.aspx b/SGGL/FineUIPro.Web/Transfer/Chart/Electrical.aspx deleted file mode 100644 index d525baed..00000000 --- a/SGGL/FineUIPro.Web/Transfer/Chart/Electrical.aspx +++ /dev/null @@ -1,16 +0,0 @@ -<%@ Page Language="C#" AutoEventWireup="true" CodeBehind="Electrical.aspx.cs" Inherits="FineUIPro.Web.Transfer.Chart.Electrical" %> - - - - - - - - - -
-
-
-
- - diff --git a/SGGL/FineUIPro.Web/Transfer/Chart/Electrical.aspx.cs b/SGGL/FineUIPro.Web/Transfer/Chart/Electrical.aspx.cs deleted file mode 100644 index 66b9ce33..00000000 --- a/SGGL/FineUIPro.Web/Transfer/Chart/Electrical.aspx.cs +++ /dev/null @@ -1,17 +0,0 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Web; -using System.Web.UI; -using System.Web.UI.WebControls; - -namespace FineUIPro.Web.Transfer.Chart -{ - public partial class Electrical : System.Web.UI.Page - { - protected void Page_Load(object sender, EventArgs e) - { - - } - } -} \ No newline at end of file diff --git a/SGGL/FineUIPro.Web/Transfer/Chart/Electrical.aspx.designer.cs b/SGGL/FineUIPro.Web/Transfer/Chart/Electrical.aspx.designer.cs deleted file mode 100644 index 309a7743..00000000 --- a/SGGL/FineUIPro.Web/Transfer/Chart/Electrical.aspx.designer.cs +++ /dev/null @@ -1,25 +0,0 @@ -//------------------------------------------------------------------------------ -// -// 此代码由工具生成。 -// -// 对此文件的更改可能会导致不正确的行为，并且如果 -// 重新生成代码，这些更改将会丢失。 -// -//------------------------------------------------------------------------------ - - -namespace FineUIPro.Web.Transfer.Chart -{ - public partial class Electrical - { - - /// - /// form1 控件。 - /// - /// - /// 自动生成的字段。 - /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 - /// - protected global::System.Web.UI.HtmlControls.HtmlForm form1; - } -} diff --git a/SGGL/FineUIPro.Web/Transfer/Chart/Firefighting.aspx b/SGGL/FineUIPro.Web/Transfer/Chart/Firefighting.aspx deleted file mode 100644 index d5d87bc3..00000000 --- a/SGGL/FineUIPro.Web/Transfer/Chart/Firefighting.aspx +++ /dev/null @@ -1,16 +0,0 @@ -<%@ Page Language="C#" AutoEventWireup="true" CodeBehind="Firefighting.aspx.cs" Inherits="FineUIPro.Web.Transfer.Chart.Firefighting" %> - - - - - - - - - -
-
-
-
- - diff --git a/SGGL/FineUIPro.Web/Transfer/Chart/Firefighting.aspx.cs b/SGGL/FineUIPro.Web/Transfer/Chart/Firefighting.aspx.cs deleted file mode 100644 index e08dd12d..00000000 --- a/SGGL/FineUIPro.Web/Transfer/Chart/Firefighting.aspx.cs +++ /dev/null @@ -1,17 +0,0 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Web; -using System.Web.UI; -using System.Web.UI.WebControls; - -namespace FineUIPro.Web.Transfer.Chart -{ - public partial class Firefighting : System.Web.UI.Page - { - protected void Page_Load(object sender, EventArgs e) - { - - } - } -} \ No newline at end of file diff --git a/SGGL/FineUIPro.Web/Transfer/Chart/Firefighting.aspx.designer.cs b/SGGL/FineUIPro.Web/Transfer/Chart/Firefighting.aspx.designer.cs deleted file mode 100644 index 2fea476c..00000000 --- a/SGGL/FineUIPro.Web/Transfer/Chart/Firefighting.aspx.designer.cs +++ /dev/null @@ -1,25 +0,0 @@ -//------------------------------------------------------------------------------ -// -// 此代码由工具生成。 -// -// 对此文件的更改可能会导致不正确的行为，并且如果 -// 重新生成代码，这些更改将会丢失。 -// -//------------------------------------------------------------------------------ - - -namespace FineUIPro.Web.Transfer.Chart -{ - public partial class Firefighting - { - - /// - /// form1 控件。 - /// - /// - /// 自动生成的字段。 - /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 - /// - protected global::System.Web.UI.HtmlControls.HtmlForm form1; - } -} diff --git a/SGGL/FineUIPro.Web/Transfer/Chart/HVAC.aspx b/SGGL/FineUIPro.Web/Transfer/Chart/HVAC.aspx deleted file mode 100644 index a7c813c1..00000000 --- a/SGGL/FineUIPro.Web/Transfer/Chart/HVAC.aspx +++ /dev/null @@ -1,16 +0,0 @@ -<%@ Page Language="C#" AutoEventWireup="true" CodeBehind="HVAC.aspx.cs" Inherits="FineUIPro.Web.Transfer.Chart.HVAC" %> - - - - - - - - - -
-
-
-
- - diff --git a/SGGL/FineUIPro.Web/Transfer/Chart/HVAC.aspx.cs b/SGGL/FineUIPro.Web/Transfer/Chart/HVAC.aspx.cs deleted file mode 100644 index 0d22dd9d..00000000 --- a/SGGL/FineUIPro.Web/Transfer/Chart/HVAC.aspx.cs +++ /dev/null @@ -1,17 +0,0 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Web; -using System.Web.UI; -using System.Web.UI.WebControls; - -namespace FineUIPro.Web.Transfer.Chart -{ - public partial class HVAC : System.Web.UI.Page - { - protected void Page_Load(object sender, EventArgs e) - { - - } - } -} \ No newline at end of file diff --git a/SGGL/FineUIPro.Web/Transfer/Chart/HVAC.aspx.designer.cs b/SGGL/FineUIPro.Web/Transfer/Chart/HVAC.aspx.designer.cs deleted file mode 100644 index 8cae12ea..00000000 --- a/SGGL/FineUIPro.Web/Transfer/Chart/HVAC.aspx.designer.cs +++ /dev/null @@ -1,25 +0,0 @@ -//------------------------------------------------------------------------------ -// -// 此代码由工具生成。 -// -// 对此文件的更改可能会导致不正确的行为，并且如果 -// 重新生成代码，这些更改将会丢失。 -// -//------------------------------------------------------------------------------ - - -namespace FineUIPro.Web.Transfer.Chart -{ - public partial class HVAC - { - - /// - /// form1 控件。 - /// - /// - /// 自动生成的字段。 - /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 - /// - protected global::System.Web.UI.HtmlControls.HtmlForm form1; - } -} diff --git a/SGGL/FineUIPro.Web/Transfer/Chart/Instrumentation.aspx b/SGGL/FineUIPro.Web/Transfer/Chart/Instrumentation.aspx index 9715f314..b8290120 100644 --- a/SGGL/FineUIPro.Web/Transfer/Chart/Instrumentation.aspx +++ b/SGGL/FineUIPro.Web/Transfer/Chart/Instrumentation.aspx @@ -1,5 +1,6 @@ <%@ Page Language="C#" AutoEventWireup="true" CodeBehind="Instrumentation.aspx.cs" Inherits="FineUIPro.Web.Transfer.Chart.Instrumentation" %> +<%@ Register Src="~/Controls/ChartControl.ascx" TagName="ChartControl" TagPrefix="uc1" %> @@ -9,8 +10,70 @@
-
-
+ + + + + + + + + + + + + + + + + + + + <%-- + + + + --%> + + + + + + + + + + + + + + + +
+ +
+ + + + + + + + + + + + + + diff --git a/SGGL/FineUIPro.Web/Transfer/Chart/Instrumentation.aspx.cs b/SGGL/FineUIPro.Web/Transfer/Chart/Instrumentation.aspx.cs index c3ab6622..e6051bf0 100644 --- a/SGGL/FineUIPro.Web/Transfer/Chart/Instrumentation.aspx.cs +++ b/SGGL/FineUIPro.Web/Transfer/Chart/Instrumentation.aspx.cs @@ -1,17 +1,235 @@ using System; using System.Collections.Generic; +using System.Data; using System.Linq; -using System.Web; -using System.Web.UI; -using System.Web.UI.WebControls; +using BLL; namespace FineUIPro.Web.Transfer.Chart { - public partial class Instrumentation : System.Web.UI.Page + public partial class Instrumentation : PageBase { + #region 定义项 + /// + /// 项目主键 + /// + public string ProjectId + { + get + { + return (string)ViewState["ProjectId"]; + } + set + { + ViewState["ProjectId"] = value; + } + } + #endregion + + #region 加载页面 + /// + /// 加载页面 + /// + /// + /// protected void Page_Load(object sender, EventArgs e) { - + if (!IsPostBack) + { + this.ProjectId = this.CurrUser.LoginProjectId; + if (!string.IsNullOrEmpty(Request.Params["projectId"])) + { + this.ProjectId = Request.Params["projectId"]; + } + + this.AnalyseData(); + } } + #endregion + + #region 统计 + /// + /// 统计方法 + /// + private void AnalyseData() + { + var sTime = DateTime.Now.AddDays(-7); + var eTime = DateTime.Now; ; + + //如果没有填写日期，则是七天内的 + if (!string.IsNullOrEmpty(txtStarTime.Text) && !string.IsNullOrEmpty(txtEndTime.Text)) + { + sTime = Convert.ToDateTime(txtStarTime.Text); + eTime = Convert.ToDateTime(txtEndTime.Text); + + } + + //查询当前日期中的system的具体数目，去除重复 + var list = Funs.DB.Transfer_Instrumentation.Where(x => x.ProjectId == ProjectId + && x.Test_Package_FINISH >= sTime && x.Test_Package_FINISH <= eTime).ToList(); + var SystemList = (from x in list select x.SystemName).Distinct(); + + //先加载左侧system 树菜单 + LoadData(SystemList); + + DataTable dtTime = new DataTable(); + dtTime.Columns.Add("日期", typeof(string)); + dtTime.Columns.Add("Finished", typeof(string)); + dtTime.Columns.Add("In Progress", typeof(string)); + dtTime.Columns.Add("Not Start", typeof(string)); + + var systemBol = false; + for (var i = sTime; i <= eTime; i=i.AddDays(1)) + { + var finishedCount = 0; + var inProgress = 0; + var notStart = 0; + DataRow rowTime = dtTime.NewRow(); + Model.SpTDesktopItem newspItem = new Model.SpTDesktopItem(); + rowTime["日期"] = string.Format("{0:yyyy-MM-dd}", i); ; + //根据日期查询当前system的数量 + var systemListbyDate = Funs.DB.Transfer_Instrumentation.Where(x => x.ProjectId == ProjectId + && x.Test_Package_FINISH >= Convert.ToDateTime(rowTime["日期"]) + && x.Test_Package_FINISH < Convert.ToDateTime(rowTime["日期"]).AddDays(1)).ToList(); + + //具体的system 去重 + var systemList = (from x in systemListbyDate select x.SystemName).Distinct(); + if (systemList.ToList().Count>0) + { + systemBol = true; + } + foreach (var item in systemList) + { + //查询当前日期每个system的数量 + var systemSumCount = systemListbyDate.Where(x => x.SystemName == item).ToList().Count; + //子系统中完成的数量 + var subSystemSumCount = systemListbyDate.Where(x => x.SystemName == item && + x.FINAL_Status.ToLower() == "finished").ToList().Count; + + //子系统中没完成的情况 + var subSystemSumNotStartCount = systemListbyDate.Where(x => x.SystemName == item && + x.FINAL_Status.ToLower() == "not start").ToList().Count; + + if (systemSumCount == subSystemSumCount) + { + finishedCount += 1; + } + else if (systemSumCount== subSystemSumNotStartCount) + { + notStart += 1; + } + else { + inProgress += 1; + + } + } + rowTime["Finished"] = finishedCount; + rowTime["In Progress"] = inProgress; + rowTime["Not Start"] = notStart; + dtTime.Rows.Add(rowTime); + + } + if (systemBol) + { + this.ChartUc.CreateChart(BLL.ChartControlService.GetDataSourceChart(dtTime, "Instrumentation PROGRESS", this.drpChartType.SelectedValue, 1100, 600, false)); + } + + + + } + + public class CheckAnalysisModel + { + public string itemType { get; set; } + public int count { get; set; } + } + #endregion + + /// + /// 统计分析 + /// + /// + /// + protected void BtnAnalyse_Click(object sender, EventArgs e) + { + this.AnalyseData(); + } + + protected void drpChartType_SelectedIndexChanged(object sender, EventArgs e) + { + this.AnalyseData(); + } + + private void LoadData(IEnumerable list) + { + Tree1.Nodes.Clear(); + // 模拟从数据库返回数据表 + DataTable table = CreateDataTable(list); + + DataSet ds = new DataSet(); + ds.Tables.Add(table); + ds.Relations.Add("TreeRelation", ds.Tables[0].Columns["Id"], ds.Tables[0].Columns["ParentId"]); + + foreach (DataRow row in ds.Tables[0].Rows) + { + if (row.IsNull("ParentId")) + { + TreeNode node = new TreeNode(); + node.Text = row["Text"].ToString(); + Tree1.Nodes.Add(node); + + ResolveSubTree(row, node); + } + } + } + + private void ResolveSubTree(DataRow dataRow, TreeNode treeNode) + { + DataRow[] rows = dataRow.GetChildRows("TreeRelation"); + if (rows.Length > 0) + { + // 如果是目录，则默认展开 + treeNode.Expanded = true; + foreach (DataRow row in rows) + { + TreeNode node = new TreeNode(); + node.Text = row["Text"].ToString(); + treeNode.Nodes.Add(node); + + ResolveSubTree(row, node); + } + } + } + + #region CreateDataTable + + private DataTable CreateDataTable(IEnumerable list) + { + DataTable table = new DataTable(); + DataColumn column1 = new DataColumn("Id", typeof(string)); + DataColumn column2 = new DataColumn("Text", typeof(String)); + DataColumn column3 = new DataColumn("ParentId", typeof(string)); + table.Columns.Add(column1); + table.Columns.Add(column2); + table.Columns.Add(column3); + + DataRow row = table.NewRow(); + row[0] = "ALL"; + row[1] = "全部"; + row[2] = DBNull.Value; + table.Rows.Add(row); + + foreach (var item in list) + { + row = table.NewRow(); + row[0] = item.ToString(); + row[1] = item.ToString(); + row[2] = "ALL"; + table.Rows.Add(row); + } + return table; + } + + + #endregion } } \ No newline at end of file diff --git a/SGGL/FineUIPro.Web/Transfer/Chart/Instrumentation.aspx.designer.cs b/SGGL/FineUIPro.Web/Transfer/Chart/Instrumentation.aspx.designer.cs index c8e4a650..e9e5e8af 100644 --- a/SGGL/FineUIPro.Web/Transfer/Chart/Instrumentation.aspx.designer.cs +++ b/SGGL/FineUIPro.Web/Transfer/Chart/Instrumentation.aspx.designer.cs @@ -1,15 +1,16 @@ //------------------------------------------------------------------------------ -// +// <自动生成> // 此代码由工具生成。 // -// 对此文件的更改可能会导致不正确的行为，并且如果 -// 重新生成代码，这些更改将会丢失。 -// +// 对此文件的更改可能导致不正确的行为，如果 +// 重新生成代码，则所做更改将丢失。 +// //------------------------------------------------------------------------------ - namespace FineUIPro.Web.Transfer.Chart { + + public partial class Instrumentation { @@ -21,5 +22,131 @@ namespace FineUIPro.Web.Transfer.Chart /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::System.Web.UI.HtmlControls.HtmlForm form1; + + /// + /// PageManager1 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.PageManager PageManager1; + + /// + /// RegionPanel1 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.RegionPanel RegionPanel1; + + /// + /// Region1 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Region Region1; + + /// + /// Form2 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Form Form2; + + /// + /// txtStarTime 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.DatePicker txtStarTime; + + /// + /// txtEndTime 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.DatePicker txtEndTime; + + /// + /// drpChartType 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.DropDownList drpChartType; + + /// + /// BtnAnalyse 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Button BtnAnalyse; + + /// + /// Region2 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Region Region2; + + /// + /// TabStrip1 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.TabStrip TabStrip1; + + /// + /// Tab2 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Tab Tab2; + + /// + /// cpCostTime 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.ContentPanel cpCostTime; + + /// + /// ChartUc 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::Web.Controls.ChartControl ChartUc; + + /// + /// Tree1 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Tree Tree1; } } diff --git a/SGGL/FineUIPro.Web/Transfer/Chart/Piping.aspx b/SGGL/FineUIPro.Web/Transfer/Chart/Piping.aspx deleted file mode 100644 index ec068d15..00000000 --- a/SGGL/FineUIPro.Web/Transfer/Chart/Piping.aspx +++ /dev/null @@ -1,16 +0,0 @@ -<%@ Page Language="C#" AutoEventWireup="true" CodeBehind="Piping.aspx.cs" Inherits="FineUIPro.Web.Transfer.Chart.Piping" %> - - - - - - - - - -
-
-
-
- - diff --git a/SGGL/FineUIPro.Web/Transfer/Chart/Piping.aspx.cs b/SGGL/FineUIPro.Web/Transfer/Chart/Piping.aspx.cs deleted file mode 100644 index 6eae9ebd..00000000 --- a/SGGL/FineUIPro.Web/Transfer/Chart/Piping.aspx.cs +++ /dev/null @@ -1,17 +0,0 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Web; -using System.Web.UI; -using System.Web.UI.WebControls; - -namespace FineUIPro.Web.Transfer.Chart -{ - public partial class Piping : System.Web.UI.Page - { - protected void Page_Load(object sender, EventArgs e) - { - - } - } -} \ No newline at end of file diff --git a/SGGL/FineUIPro.Web/Transfer/Chart/Piping.aspx.designer.cs b/SGGL/FineUIPro.Web/Transfer/Chart/Piping.aspx.designer.cs deleted file mode 100644 index 38219c00..00000000 --- a/SGGL/FineUIPro.Web/Transfer/Chart/Piping.aspx.designer.cs +++ /dev/null @@ -1,25 +0,0 @@ -//------------------------------------------------------------------------------ -// -// 此代码由工具生成。 -// -// 对此文件的更改可能会导致不正确的行为，并且如果 -// 重新生成代码，这些更改将会丢失。 -// -//------------------------------------------------------------------------------ - - -namespace FineUIPro.Web.Transfer.Chart -{ - public partial class Piping - { - - /// - /// form1 控件。 - /// - /// - /// 自动生成的字段。 - /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 - /// - protected global::System.Web.UI.HtmlControls.HtmlForm form1; - } -} diff --git a/SGGL/FineUIPro.Web/Transfer/Chart/Plumbing.aspx b/SGGL/FineUIPro.Web/Transfer/Chart/Plumbing.aspx deleted file mode 100644 index 72a01361..00000000 --- a/SGGL/FineUIPro.Web/Transfer/Chart/Plumbing.aspx +++ /dev/null @@ -1,16 +0,0 @@ -<%@ Page Language="C#" AutoEventWireup="true" CodeBehind="Plumbing.aspx.cs" Inherits="FineUIPro.Web.Transfer.Chart.Plumbing" %> - - - - - - - - - -
-
-
-
- - diff --git a/SGGL/FineUIPro.Web/Transfer/Chart/Plumbing.aspx.cs b/SGGL/FineUIPro.Web/Transfer/Chart/Plumbing.aspx.cs deleted file mode 100644 index 29320d17..00000000 --- a/SGGL/FineUIPro.Web/Transfer/Chart/Plumbing.aspx.cs +++ /dev/null @@ -1,17 +0,0 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Web; -using System.Web.UI; -using System.Web.UI.WebControls; - -namespace FineUIPro.Web.Transfer.Chart -{ - public partial class Plumbing : System.Web.UI.Page - { - protected void Page_Load(object sender, EventArgs e) - { - - } - } -} \ No newline at end of file diff --git a/SGGL/FineUIPro.Web/Transfer/Chart/Plumbing.aspx.designer.cs b/SGGL/FineUIPro.Web/Transfer/Chart/Plumbing.aspx.designer.cs deleted file mode 100644 index a74b7d1f..00000000 --- a/SGGL/FineUIPro.Web/Transfer/Chart/Plumbing.aspx.designer.cs +++ /dev/null @@ -1,25 +0,0 @@ -//------------------------------------------------------------------------------ -// -// 此代码由工具生成。 -// -// 对此文件的更改可能会导致不正确的行为，并且如果 -// 重新生成代码，这些更改将会丢失。 -// -//------------------------------------------------------------------------------ - - -namespace FineUIPro.Web.Transfer.Chart -{ - public partial class Plumbing - { - - /// - /// form1 控件。 - /// - /// - /// 自动生成的字段。 - /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 - /// - protected global::System.Web.UI.HtmlControls.HtmlForm form1; - } -} diff --git a/SGGL/FineUIPro.Web/Transfer/Chart/RotatingEquipment.aspx b/SGGL/FineUIPro.Web/Transfer/Chart/RotatingEquipment.aspx deleted file mode 100644 index f4301891..00000000 --- a/SGGL/FineUIPro.Web/Transfer/Chart/RotatingEquipment.aspx +++ /dev/null @@ -1,16 +0,0 @@ -<%@ Page Language="C#" AutoEventWireup="true" CodeBehind="RotatingEquipment.aspx.cs" Inherits="FineUIPro.Web.Transfer.Chart.RotatingEquipment" %> - - - - - - - - - -
-
-
-
- - diff --git a/SGGL/FineUIPro.Web/Transfer/Chart/RotatingEquipment.aspx.cs b/SGGL/FineUIPro.Web/Transfer/Chart/RotatingEquipment.aspx.cs deleted file mode 100644 index 34f8a11f..00000000 --- a/SGGL/FineUIPro.Web/Transfer/Chart/RotatingEquipment.aspx.cs +++ /dev/null @@ -1,17 +0,0 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Web; -using System.Web.UI; -using System.Web.UI.WebControls; - -namespace FineUIPro.Web.Transfer.Chart -{ - public partial class RotatingEquipment : System.Web.UI.Page - { - protected void Page_Load(object sender, EventArgs e) - { - - } - } -} \ No newline at end of file diff --git a/SGGL/FineUIPro.Web/Transfer/Chart/RotatingEquipment.aspx.designer.cs b/SGGL/FineUIPro.Web/Transfer/Chart/RotatingEquipment.aspx.designer.cs deleted file mode 100644 index 7591da93..00000000 --- a/SGGL/FineUIPro.Web/Transfer/Chart/RotatingEquipment.aspx.designer.cs +++ /dev/null @@ -1,25 +0,0 @@ -//------------------------------------------------------------------------------ -// -// 此代码由工具生成。 -// -// 对此文件的更改可能会导致不正确的行为，并且如果 -// 重新生成代码，这些更改将会丢失。 -// -//------------------------------------------------------------------------------ - - -namespace FineUIPro.Web.Transfer.Chart -{ - public partial class RotatingEquipment - { - - /// - /// form1 控件。 - /// - /// - /// 自动生成的字段。 - /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 - /// - protected global::System.Web.UI.HtmlControls.HtmlForm form1; - } -} diff --git a/SGGL/FineUIPro.Web/Transfer/Chart/StaticEquipment.aspx b/SGGL/FineUIPro.Web/Transfer/Chart/StaticEquipment.aspx deleted file mode 100644 index b8dcff2e..00000000 --- a/SGGL/FineUIPro.Web/Transfer/Chart/StaticEquipment.aspx +++ /dev/null @@ -1,16 +0,0 @@ -<%@ Page Language="C#" AutoEventWireup="true" CodeBehind="StaticEquipment.aspx.cs" Inherits="FineUIPro.Web.Transfer.Chart.StaticEquipment" %> - - - - - - - - - -
-
-
-
- - diff --git a/SGGL/FineUIPro.Web/Transfer/Chart/StaticEquipment.aspx.cs b/SGGL/FineUIPro.Web/Transfer/Chart/StaticEquipment.aspx.cs deleted file mode 100644 index 608e802b..00000000 --- a/SGGL/FineUIPro.Web/Transfer/Chart/StaticEquipment.aspx.cs +++ /dev/null @@ -1,17 +0,0 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Web; -using System.Web.UI; -using System.Web.UI.WebControls; - -namespace FineUIPro.Web.Transfer.Chart -{ - public partial class StaticEquipment : System.Web.UI.Page - { - protected void Page_Load(object sender, EventArgs e) - { - - } - } -} \ No newline at end of file diff --git a/SGGL/FineUIPro.Web/Transfer/Chart/StaticEquipment.aspx.designer.cs b/SGGL/FineUIPro.Web/Transfer/Chart/StaticEquipment.aspx.designer.cs deleted file mode 100644 index 8949e11a..00000000 --- a/SGGL/FineUIPro.Web/Transfer/Chart/StaticEquipment.aspx.designer.cs +++ /dev/null @@ -1,25 +0,0 @@ -//------------------------------------------------------------------------------ -// -// 此代码由工具生成。 -// -// 对此文件的更改可能会导致不正确的行为，并且如果 -// 重新生成代码，这些更改将会丢失。 -// -//------------------------------------------------------------------------------ - - -namespace FineUIPro.Web.Transfer.Chart -{ - public partial class StaticEquipment - { - - /// - /// form1 控件。 - /// - /// - /// 自动生成的字段。 - /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 - /// - protected global::System.Web.UI.HtmlControls.HtmlForm form1; - } -} diff --git a/SGGL/FineUIPro.Web/Transfer/Chart/Telecom.aspx b/SGGL/FineUIPro.Web/Transfer/Chart/Telecom.aspx deleted file mode 100644 index ec0082b6..00000000 --- a/SGGL/FineUIPro.Web/Transfer/Chart/Telecom.aspx +++ /dev/null @@ -1,16 +0,0 @@ -<%@ Page Language="C#" AutoEventWireup="true" CodeBehind="Telecom.aspx.cs" Inherits="FineUIPro.Web.Transfer.Chart.Telecom" %> - - - - - - - - - -
-
-
-
- - diff --git a/SGGL/FineUIPro.Web/Transfer/Chart/Telecom.aspx.cs b/SGGL/FineUIPro.Web/Transfer/Chart/Telecom.aspx.cs deleted file mode 100644 index 338f7427..00000000 --- a/SGGL/FineUIPro.Web/Transfer/Chart/Telecom.aspx.cs +++ /dev/null @@ -1,17 +0,0 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Web; -using System.Web.UI; -using System.Web.UI.WebControls; - -namespace FineUIPro.Web.Transfer.Chart -{ - public partial class Telecom : System.Web.UI.Page - { - protected void Page_Load(object sender, EventArgs e) - { - - } - } -} \ No newline at end of file diff --git a/SGGL/FineUIPro.Web/Transfer/Chart/Telecom.aspx.designer.cs b/SGGL/FineUIPro.Web/Transfer/Chart/Telecom.aspx.designer.cs deleted file mode 100644 index f3a8f109..00000000 --- a/SGGL/FineUIPro.Web/Transfer/Chart/Telecom.aspx.designer.cs +++ /dev/null @@ -1,25 +0,0 @@ -//------------------------------------------------------------------------------ -// -// 此代码由工具生成。 -// -// 对此文件的更改可能会导致不正确的行为，并且如果 -// 重新生成代码，这些更改将会丢失。 -// -//------------------------------------------------------------------------------ - - -namespace FineUIPro.Web.Transfer.Chart -{ - public partial class Telecom - { - - /// - /// form1 控件。 - /// - /// - /// 自动生成的字段。 - /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 - /// - protected global::System.Web.UI.HtmlControls.HtmlForm form1; - } -} diff --git a/SGGL/FineUIPro.Web/Web.config b/SGGL/FineUIPro.Web/Web.config index 59ac7ef4..5dd4914b 100644 --- a/SGGL/FineUIPro.Web/Web.config +++ b/SGGL/FineUIPro.Web/Web.config @@ -11,8 +11,8 @@ - - + + diff --git a/SGGL/FineUIPro.Web/common/Menu_Transfer.xml b/SGGL/FineUIPro.Web/common/Menu_Transfer.xml index 3959574b..0cc40f8e 100644 --- a/SGGL/FineUIPro.Web/common/Menu_Transfer.xml +++ b/SGGL/FineUIPro.Web/common/Menu_Transfer.xml @@ -13,16 +13,7 @@ - - - - - - - - - - + \ No newline at end of file