From ca59e12f6db0f8785b689294985982bdee1bb157 Mon Sep 17 00:00:00 2001
From: gaofei1985 <181547018@qq.com>
Date: Sun, 4 Feb 2024 14:26:05 +0800
Subject: [PATCH] =?UTF-8?q?=E6=8F=90=E4=BA=A4=E4=BB=A3=E7=A0=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.gitignore | 3 +-
.../版本日志/SGGLDB_WH_2024-02-02-01-phf.sql | 8 +-
.../版本日志/SGGLDB_WH_2024-02-04-gaofei.sql | 5 +
.../1-14移交管理图表(Menu_Transfer).sql | 4 +-
.../Controls/ChartControl.ascx.cs | 142 +++++++++++
SGGL/FineUIPro.Web/ErrLog.txt | 224 ++++++++++++++++++
SGGL/FineUIPro.Web/FineUIPro.Web.csproj | 8 +
SGGL/FineUIPro.Web/FineUIPro.Web.csproj.user | 2 +-
.../Transfer/Chart/PunchlistFromChart.aspx | 61 +++++
.../Transfer/Chart/PunchlistFromChart.aspx.cs | 137 +++++++++++
.../Chart/PunchlistFromChart.aspx.designer.cs | 114 +++++++++
.../FineUIPro.Web/Transfer/PunchlistFrom.aspx | 6 +
.../Transfer/PunchlistFrom.aspx.cs | 21 ++
.../Transfer/PunchlistFrom.aspx.designer.cs | 20 +-
SGGL/FineUIPro.Web/Web.config | 2 +-
SGGL/FineUIPro.Web/common/Menu_HSSE.xml | 4 +-
SGGL/FineUIPro.Web/common/Menu_SysSet.xml | 1 +
SGGL/FineUIPro.Web/common/Menu_TestRun.xml | 4 +-
SGGL/FineUIPro.Web/common/Menu_Transfer.xml | 1 +
SGGL/WebAPI/WebAPI.csproj.user | 2 +-
20 files changed, 759 insertions(+), 10 deletions(-)
create mode 100644 DataBase/版本日志/SGGLDB_WH_2024-02-04-gaofei.sql
create mode 100644 SGGL/FineUIPro.Web/Transfer/Chart/PunchlistFromChart.aspx
create mode 100644 SGGL/FineUIPro.Web/Transfer/Chart/PunchlistFromChart.aspx.cs
create mode 100644 SGGL/FineUIPro.Web/Transfer/Chart/PunchlistFromChart.aspx.designer.cs
diff --git a/.gitignore b/.gitignore
index 27a0fc70..28c51f3c 100644
--- a/.gitignore
+++ b/.gitignore
@@ -32,4 +32,5 @@
/SGGL/FineUIPro.Web/obj
/SGGL/Model/obj
/SGGL/FineUIPro.Web/web.config
-/SGGL/FineUIPro.Web/ErrLog.txt
\ No newline at end of file
+/SGGL/FineUIPro.Web/ErrLog.txt
+/SGGL/FineUIPro.Web/FileUpload/Transfer/PunchlistFrom/2024-02
diff --git a/DataBase/版本日志/SGGLDB_WH_2024-02-02-01-phf.sql b/DataBase/版本日志/SGGLDB_WH_2024-02-02-01-phf.sql
index 5ab3c142..048e3bb2 100644
--- a/DataBase/版本日志/SGGLDB_WH_2024-02-02-01-phf.sql
+++ b/DataBase/版本日志/SGGLDB_WH_2024-02-02-01-phf.sql
@@ -83,4 +83,10 @@ FROM Transfer_HVAC
)f
-GO
\ No newline at end of file
+GO
+
+
+INSERT INTO dbo.Sys_Menu(MenuId,MenuName,Url,SortIndex,SuperMenu,MenuType,IsOffice,IsEnd,IsUsed)
+VALUES('F97BCF55-E450-4007-AD84-AB64B3496204','ȫƽͳƵ',
+'Transfer/Chart/TransferChart.aspx',15,'3517DBE2-9728-4BA0-9EA5-AE2147DB883B','Menu_Transfer',0,1,1)
+GO
diff --git a/DataBase/版本日志/SGGLDB_WH_2024-02-04-gaofei.sql b/DataBase/版本日志/SGGLDB_WH_2024-02-04-gaofei.sql
new file mode 100644
index 00000000..4a42aa37
--- /dev/null
+++ b/DataBase/版本日志/SGGLDB_WH_2024-02-04-gaofei.sql
@@ -0,0 +1,5 @@
+
+INSERT INTO dbo.Sys_Menu(MenuId,MenuName,Url,SortIndex,SuperMenu,MenuType,IsOffice,IsEnd,IsUsed)
+VALUES('BB5EC5E1-A23D-4A3F-8772-CD40757974EC','Punchlist fromͳƵ',
+'Transfer/Chart/PunchlistFromChart.aspx',25,'3517DBE2-9728-4BA0-9EA5-AE2147DB883B','Menu_Transfer',0,1,1)
+GO
\ No newline at end of file
diff --git a/DataBase/菜单初始化脚本/1-14移交管理图表(Menu_Transfer).sql b/DataBase/菜单初始化脚本/1-14移交管理图表(Menu_Transfer).sql
index 7f28b592..ecde5036 100644
--- a/DataBase/菜单初始化脚本/1-14移交管理图表(Menu_Transfer).sql
+++ b/DataBase/菜单初始化脚本/1-14移交管理图表(Menu_Transfer).sql
@@ -17,4 +17,6 @@ VALUES('F97BCF55-E450-4007-AD84-AB64B3496204','ȫ
'Transfer/Chart/TransferChart.aspx',15,'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('BB5EC5E1-A23D-4A3F-8772-CD40757974EC','Punchlist fromͳƵ',
+'Transfer/Chart/PunchlistFromChart.aspx',25,'3517DBE2-9728-4BA0-9EA5-AE2147DB883B','Menu_Transfer',0,1,1)
diff --git a/SGGL/FineUIPro.Web/Controls/ChartControl.ascx.cs b/SGGL/FineUIPro.Web/Controls/ChartControl.ascx.cs
index e0fc300b..7e797229 100644
--- a/SGGL/FineUIPro.Web/Controls/ChartControl.ascx.cs
+++ b/SGGL/FineUIPro.Web/Controls/ChartControl.ascx.cs
@@ -349,6 +349,148 @@ namespace Web.Controls
chartArea.AxisY.LabelStyle.Format = " 0% "; // 格式化,为了显示百分号
+ chart1.ChartAreas.Add(chartArea);
+
+ if (dataSourceChart.ChartType == SeriesChartType.Pie)
+ {
+ foreach (Model.DataSourceTeam dataSourceTeam in dataSourceChart.DataSourceTeams)
+ {
+ this.lblTotal.Text = "累计值为:";
+ if (dataSourceTeam.DataPointName == "累计")
+ {
+ foreach (Model.DataSourcePoint dataSourcePoint in dataSourceTeam.DataSourcePoints)
+ {
+ this.lblTotal.Text += (dataSourcePoint.PointText + ":" + dataSourcePoint.PointValue + ",");
+ }
+ if (this.lblTotal.Text != "累计值为:")
+ {
+ this.lblTotal.Text = this.lblTotal.Text.Substring(0, this.lblTotal.Text.LastIndexOf(","));
+ }
+ }
+ else
+ {
+ this.lblTotal.Visible = false;
+ chart1.Series.Add(dataSourceTeam.DataPointName);
+ chart1.Series[dataSourceTeam.DataPointName].ChartType = dataSourceChart.ChartType;
+ chart1.Series[dataSourceTeam.DataPointName].Name = dataSourceTeam.DataPointName;
+ chart1.Series[dataSourceTeam.DataPointName].IsValueShownAsLabel = true;
+ chart1.Series[dataSourceTeam.DataPointName].BorderWidth = 2;
+ chart1.Series[dataSourceTeam.DataPointName].Label = "#PERCENT{P1}";
+ chart1.Series[dataSourceTeam.DataPointName]["DrawingStyle"] = "Cylinder";
+ int m = 0;
+ foreach (Model.DataSourcePoint dataSourcePoint in dataSourceTeam.DataSourcePoints)
+ {
+ chart1.Series[dataSourceTeam.DataPointName].Points.AddXY(dataSourcePoint.PointText, dataSourcePoint.PointValue);
+ chart1.Series[dataSourceTeam.DataPointName].Points[m].LegendText = dataSourcePoint.PointText + "#PERCENT{P1}";
+ m++;
+ }
+ }
+ }
+ }
+ else
+ {
+ foreach (Model.DataSourceTeam dataSourceTeam in dataSourceChart.DataSourceTeams)
+ {
+ this.lblTotal.Text = "累计值为:";
+ if (dataSourceTeam.DataPointName == "累计")
+ {
+ foreach (Model.DataSourcePoint dataSourcePoint in dataSourceTeam.DataSourcePoints)
+ {
+ this.lblTotal.Text += (dataSourcePoint.PointText + ":" + dataSourcePoint.PointValue + ",");
+ }
+ if (this.lblTotal.Text != "累计值为:")
+ {
+ this.lblTotal.Text = this.lblTotal.Text.Substring(0, this.lblTotal.Text.LastIndexOf(","));
+ }
+ }
+ else
+ {
+ this.lblTotal.Visible = false;
+ chart1.Series.Add(dataSourceTeam.DataPointName);
+ chart1.Series[dataSourceTeam.DataPointName].ChartType = dataSourceChart.ChartType;
+ chart1.Series[dataSourceTeam.DataPointName].Name = dataSourceTeam.DataPointName;
+ chart1.Series[dataSourceTeam.DataPointName].IsValueShownAsLabel = true;
+ chart1.Series[dataSourceTeam.DataPointName].BorderWidth = 2;
+ chart1.Series[dataSourceTeam.DataPointName]["DrawingStyle"] = "Cylinder";
+
+ chart1.Series[dataSourceTeam.DataPointName].Label = "#VAL{P}";//设置标签文本 (在设计期通过属性窗口编辑更直观)
+ chart1.Series[dataSourceTeam.DataPointName].IsValueShownAsLabel = true;//显示标签
+ foreach (Model.DataSourcePoint dataSourcePoint in dataSourceTeam.DataSourcePoints)
+ {
+ chart1.Series[dataSourceTeam.DataPointName].Points.AddXY(dataSourcePoint.PointText, dataSourcePoint.PointValue);
+ }
+ }
+ }
+ }
+ Controls.Add(chart1);
+ }
+
+ ///
+ /// 创建Chart图形百分比
+ ///
+ /// Chart类
+ public void CreateChartPunchlistFrom(Model.DataSourceChart dataSourceChart)
+ {
+ Chart chart1 = new Chart
+ {
+ ID = "chart1",
+ BackColor = Color.WhiteSmoke,
+ ImageLocation = "~/Images/ChartPic_#SEQ(300,3)",
+ BorderlineDashStyle = ChartDashStyle.Solid,
+ Palette = ChartColorPalette.BrightPastel,
+ BackSecondaryColor = Color.White,
+ BackGradientStyle = GradientStyle.TopBottom,
+ BorderWidth = 2,
+ BorderColor = Color.FromArgb(26, 59, 105),
+ ImageType = ChartImageType.Png,
+
+ Width = dataSourceChart.Width,
+ Height = dataSourceChart.Height
+ };
+
+ Title title = new Title
+ {
+ Text = dataSourceChart.Title,
+ ShadowColor = Color.FromArgb(32, 0, 0, 0),
+ Font = new Font("Trebuchet MS", 10F, FontStyle.Bold),
+ ShadowOffset = 3,
+ ForeColor = Color.FromArgb(26, 59, 105)
+ };
+ chart1.Titles.Add(title);
+
+ Legend legend = new Legend
+ {
+ Name = dataSourceChart.Title,
+ TextWrapThreshold = 1,
+ Docking = Docking.Top,
+ Alignment = StringAlignment.Center,
+ BackColor = Color.Transparent,
+ Font = new Font(new FontFamily("Trebuchet MS"), 8),
+ LegendStyle = LegendStyle.Row,
+ IsEquallySpacedItems = true,
+ IsTextAutoFit = false
+ };
+ chart1.Legends.Add(legend);
+
+ ChartArea chartArea = new ChartArea
+ {
+ Name = dataSourceChart.Title,
+ BackColor = Color.Transparent
+ };
+ chartArea.AxisX.IsLabelAutoFit = false;
+ chartArea.AxisY.IsLabelAutoFit = false;
+ chartArea.AxisX.LabelStyle.Font = new Font("Verdana,Arial,Helvetica,sans-serif", 8F, FontStyle.Regular);
+ chartArea.AxisY.LabelStyle.Font = new Font("Verdana,Arial,Helvetica,sans-serif", 8F, FontStyle.Regular);
+ chartArea.AxisY.LineColor = Color.FromArgb(64, 64, 64, 64);
+ chartArea.AxisX.LineColor = Color.FromArgb(64, 64, 64, 64);
+ chartArea.AxisY.MajorGrid.LineColor = Color.FromArgb(64, 64, 64, 64);
+ chartArea.AxisX.MajorGrid.LineColor = Color.FromArgb(64, 64, 64, 64);
+ chartArea.AxisX.Interval = 1;
+ chartArea.Area3DStyle.Enable3D = dataSourceChart.IsNotEnable3D;
+
+ chartArea.AxisY.LabelStyle.Format = " 0% "; // 格式化,为了显示百分号
+
+
chart1.ChartAreas.Add(chartArea);
if (dataSourceChart.ChartType == SeriesChartType.Pie)
diff --git a/SGGL/FineUIPro.Web/ErrLog.txt b/SGGL/FineUIPro.Web/ErrLog.txt
index 4d24ae20..501ec4bc 100644
--- a/SGGL/FineUIPro.Web/ErrLog.txt
+++ b/SGGL/FineUIPro.Web/ErrLog.txt
@@ -38,3 +38,227 @@ IP地址:::1
出错时间:02/02/2024 11:24:12
+
+错误信息开始=====>
+错误类型:HttpException
+错误信息:无法使用前导 .. 在顶级目录上退出。
+错误堆栈:
+ 在 System.Web.Util.UrlPath.ReduceVirtualPath(String path)
+ 在 System.Web.Util.UrlPath.ReduceVirtualPath(String path)
+ 在 System.Web.Util.UrlPath.Reduce(String path)
+ 在 System.Web.Util.UrlPath.Combine(String appPath, String basepath, String relative)
+ 在 System.Web.UI.Control.ResolveUrl(String relativeUrl)
+ 在 (Control , String )
+ 在 FineUIPro.PageContext.ResolveUrl(Control control, String url)
+ 在 FineUIPro.PanelBase.OuDDulWcfFlgpCeErJpdHtJrWfGE(String )
+ 在 (PanelBase , String )
+ 在 FineUIPro.Window.GetShowReference(String iframeUrl, String windowTitle, Unit width, Unit height)
+ 在 (Window , String , String , Unit , Unit )
+ 在 FineUIPro.Window.GetShowReference(String iframeUrl, String windowTitle)
+ 在 (Window , String , String )
+ 在 FineUIPro.Window.GetShowReference(String iframeUrl)
+ 在 FineUIPro.Web.Transfer.PunchlistFrom.btnAttach_Click(Object sender, EventArgs e) 位置 E:\工作\五环施工平台\CNCEC_SUBQHSE_WUHUAN\SGGL\FineUIPro.Web\Transfer\PunchlistFrom.aspx.cs:行号 241
+ 在 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)
+出错时间:02/04/2024 10:05:40
+出错文件:http://localhost:8579/Transfer/PunchlistFrom.aspx
+IP地址:::1
+操作人员:JT
+
+出错时间:02/04/2024 10:05:40
+
+
+错误信息开始=====>
+错误类型:HttpException
+错误信息:无法使用前导 .. 在顶级目录上退出。
+错误堆栈:
+ 在 System.Web.Util.UrlPath.ReduceVirtualPath(String path)
+ 在 System.Web.Util.UrlPath.ReduceVirtualPath(String path)
+ 在 System.Web.Util.UrlPath.Reduce(String path)
+ 在 System.Web.Util.UrlPath.Combine(String appPath, String basepath, String relative)
+ 在 System.Web.UI.Control.ResolveUrl(String relativeUrl)
+ 在 (Control , String )
+ 在 FineUIPro.PageContext.ResolveUrl(Control control, String url)
+ 在 FineUIPro.PanelBase.OuDDulWcfFlgpCeErJpdHtJrWfGE(String )
+ 在 (PanelBase , String )
+ 在 FineUIPro.Window.GetShowReference(String iframeUrl, String windowTitle, Unit width, Unit height)
+ 在 (Window , String , String , Unit , Unit )
+ 在 FineUIPro.Window.GetShowReference(String iframeUrl, String windowTitle)
+ 在 (Window , String , String )
+ 在 FineUIPro.Window.GetShowReference(String iframeUrl)
+ 在 FineUIPro.Web.Transfer.PunchlistFrom.btnAttach_Click(Object sender, EventArgs e) 位置 E:\工作\五环施工平台\CNCEC_SUBQHSE_WUHUAN\SGGL\FineUIPro.Web\Transfer\PunchlistFrom.aspx.cs:行号 241
+ 在 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)
+出错时间:02/04/2024 10:05:42
+出错文件:http://localhost:8579/Transfer/PunchlistFrom.aspx
+IP地址:::1
+操作人员:JT
+
+出错时间:02/04/2024 10:05:42
+
+
+错误信息开始=====>
+错误类型:NotSupportedException
+错误信息:不支持查询运算符“Last”。
+错误堆栈:
+ 在 System.Data.Linq.SqlClient.QueryConverter.VisitSequenceOperatorCall(MethodCallExpression mc)
+ 在 System.Data.Linq.SqlClient.QueryConverter.VisitMethodCall(MethodCallExpression mc)
+ 在 System.Data.Linq.SqlClient.QueryConverter.VisitInner(Expression node)
+ 在 System.Data.Linq.SqlClient.QueryConverter.ConvertOuter(Expression node)
+ 在 System.Data.Linq.SqlClient.SqlProvider.BuildQuery(Expression query, SqlNodeAnnotations annotations)
+ 在 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.Last[TSource](IQueryable`1 source)
+ 在 FineUIPro.Web.Transfer.Chart.PunchlistFromChart.AnalyseData() 位置 E:\工作\五环施工平台\CNCEC_SUBQHSE_WUHUAN\SGGL\FineUIPro.Web\Transfer\Chart\PunchlistFromChart.aspx.cs:行号 76
+ 在 FineUIPro.Web.Transfer.Chart.PunchlistFromChart.Page_Load(Object sender, EventArgs e) 位置 E:\工作\五环施工平台\CNCEC_SUBQHSE_WUHUAN\SGGL\FineUIPro.Web\Transfer\Chart\PunchlistFromChart.aspx.cs:行号 44
+ 在 System.Web.Util.CalliEventHandlerDelegateProxy.Callback(Object sender, EventArgs e)
+ 在 System.EventHandler.Invoke(Object sender, EventArgs e)
+ 在 System.Web.UI.Control.OnLoad(EventArgs e)
+ 在 System.Web.UI.Control.LoadRecursive()
+ 在 System.Web.UI.Page.ProcessRequestMain(Boolean includeStagesBeforeAsyncPoint, Boolean includeStagesAfterAsyncPoint)
+出错时间:02/04/2024 10:55:41
+出错文件:http://localhost:8579/Transfer/Chart/PunchlistFromChart.aspx
+IP地址:::1
+操作人员:JT
+
+出错时间:02/04/2024 10:55:41
+
+
+错误信息开始=====>
+错误类型:NotSupportedException
+错误信息:不支持查询运算符“Last”。
+错误堆栈:
+ 在 System.Data.Linq.SqlClient.QueryConverter.VisitSequenceOperatorCall(MethodCallExpression mc)
+ 在 System.Data.Linq.SqlClient.QueryConverter.VisitMethodCall(MethodCallExpression mc)
+ 在 System.Data.Linq.SqlClient.QueryConverter.VisitInner(Expression node)
+ 在 System.Data.Linq.SqlClient.QueryConverter.ConvertOuter(Expression node)
+ 在 System.Data.Linq.SqlClient.SqlProvider.BuildQuery(Expression query, SqlNodeAnnotations annotations)
+ 在 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.Last[TSource](IQueryable`1 source)
+ 在 FineUIPro.Web.Transfer.Chart.PunchlistFromChart.AnalyseData() 位置 E:\工作\五环施工平台\CNCEC_SUBQHSE_WUHUAN\SGGL\FineUIPro.Web\Transfer\Chart\PunchlistFromChart.aspx.cs:行号 76
+ 在 FineUIPro.Web.Transfer.Chart.PunchlistFromChart.Page_Load(Object sender, EventArgs e) 位置 E:\工作\五环施工平台\CNCEC_SUBQHSE_WUHUAN\SGGL\FineUIPro.Web\Transfer\Chart\PunchlistFromChart.aspx.cs:行号 44
+ 在 System.Web.Util.CalliEventHandlerDelegateProxy.Callback(Object sender, EventArgs e)
+ 在 System.EventHandler.Invoke(Object sender, EventArgs e)
+ 在 System.Web.UI.Control.OnLoad(EventArgs e)
+ 在 System.Web.UI.Control.LoadRecursive()
+ 在 System.Web.UI.Page.ProcessRequestMain(Boolean includeStagesBeforeAsyncPoint, Boolean includeStagesAfterAsyncPoint)
+出错时间:02/04/2024 10:57:35
+出错文件:http://localhost:8579/Transfer/Chart/PunchlistFromChart.aspx
+IP地址:::1
+操作人员:JT
+
+出错时间:02/04/2024 10:57:35
+
+
+错误信息开始=====>
+错误类型:ArgumentException
+错误信息:提供的 URI 方案“http”无效,应为“https”。
+参数名: via
+错误堆栈:
+ 在 System.ServiceModel.Channels.TransportChannelFactory`1.ValidateScheme(Uri via)
+ 在 System.ServiceModel.Channels.HttpChannelFactory`1.ValidateCreateChannelParameters(EndpointAddress remoteAddress, Uri via)
+ 在 System.ServiceModel.Channels.HttpsChannelFactory`1.ValidateCreateChannelParameters(EndpointAddress remoteAddress, Uri via)
+ 在 System.ServiceModel.Channels.HttpsChannelFactory`1.OnCreateChannelCore(EndpointAddress address, Uri via)
+ 在 System.ServiceModel.Channels.HttpChannelFactory`1.OnCreateChannel(EndpointAddress remoteAddress, Uri via)
+ 在 System.ServiceModel.Channels.ChannelFactoryBase`1.InternalCreateChannel(EndpointAddress address, Uri via)
+ 在 System.ServiceModel.Channels.ChannelFactoryBase`1.CreateChannel(EndpointAddress address, Uri via)
+ 在 System.ServiceModel.Channels.ServiceChannelFactory.ServiceChannelFactoryOverRequest.CreateInnerChannelBinder(EndpointAddress to, Uri via)
+ 在 System.ServiceModel.Channels.ServiceChannelFactory.CreateServiceChannel(EndpointAddress address, Uri via)
+ 在 System.ServiceModel.Channels.ServiceChannelFactory.CreateChannel(Type channelType, EndpointAddress address, Uri via)
+ 在 System.ServiceModel.ChannelFactory`1.CreateChannel(EndpointAddress address, Uri via)
+ 在 System.ServiceModel.ChannelFactory`1.CreateChannel()
+ 在 System.ServiceModel.ClientBase`1.CreateChannel()
+ 在 System.ServiceModel.ClientBase`1.CreateChannelInternal()
+ 在 System.ServiceModel.ClientBase`1.get_Channel()
+ 在 BLL.CNCECHSSEService.HSSEServiceClient.GetSupervise_SubUnitReportListToSUB() 位置 E:\工作\五环施工平台\CNCEC_SUBQHSE_WUHUAN\SGGL\BLL\Service References\CNCECHSSEService\Reference.cs:行号 14204
+ 在 BLL.CNCECHSSEWebService.getSupervise_SubUnitReport() 位置 E:\工作\五环施工平台\CNCEC_SUBQHSE_WUHUAN\SGGL\BLL\WebService\CNCECHSSEWebService.cs:行号 2181
+出错时间:02/04/2024 13:14:09
+出错时间:02/04/2024 13:14:09
+
+
+错误信息开始=====>
+错误类型:ArgumentException
+错误信息:提供的 URI 方案“http”无效,应为“https”。
+参数名: via
+错误堆栈:
+ 在 System.ServiceModel.Channels.TransportChannelFactory`1.ValidateScheme(Uri via)
+ 在 System.ServiceModel.Channels.HttpChannelFactory`1.ValidateCreateChannelParameters(EndpointAddress remoteAddress, Uri via)
+ 在 System.ServiceModel.Channels.HttpsChannelFactory`1.ValidateCreateChannelParameters(EndpointAddress remoteAddress, Uri via)
+ 在 System.ServiceModel.Channels.HttpsChannelFactory`1.OnCreateChannelCore(EndpointAddress address, Uri via)
+ 在 System.ServiceModel.Channels.HttpChannelFactory`1.OnCreateChannel(EndpointAddress remoteAddress, Uri via)
+ 在 System.ServiceModel.Channels.ChannelFactoryBase`1.InternalCreateChannel(EndpointAddress address, Uri via)
+ 在 System.ServiceModel.Channels.ChannelFactoryBase`1.CreateChannel(EndpointAddress address, Uri via)
+ 在 System.ServiceModel.Channels.ServiceChannelFactory.ServiceChannelFactoryOverRequest.CreateInnerChannelBinder(EndpointAddress to, Uri via)
+ 在 System.ServiceModel.Channels.ServiceChannelFactory.CreateServiceChannel(EndpointAddress address, Uri via)
+ 在 System.ServiceModel.Channels.ServiceChannelFactory.CreateChannel(Type channelType, EndpointAddress address, Uri via)
+ 在 System.ServiceModel.ChannelFactory`1.CreateChannel(EndpointAddress address, Uri via)
+ 在 System.ServiceModel.ChannelFactory`1.CreateChannel()
+ 在 System.ServiceModel.ClientBase`1.CreateChannel()
+ 在 System.ServiceModel.ClientBase`1.CreateChannelInternal()
+ 在 System.ServiceModel.ClientBase`1.get_Channel()
+ 在 BLL.CNCECHSSEService.HSSEServiceClient.GetCheck_CheckInfo_Table8ItemListToSUB(String unitId) 位置 E:\工作\五环施工平台\CNCEC_SUBQHSE_WUHUAN\SGGL\BLL\Service References\CNCECHSSEService\Reference.cs:行号 14228
+ 在 BLL.CNCECHSSEWebService.getCheck_CheckInfo_Table8Item() 位置 E:\工作\五环施工平台\CNCEC_SUBQHSE_WUHUAN\SGGL\BLL\WebService\CNCECHSSEWebService.cs:行号 2046
+出错时间:02/04/2024 13:14:09
+出错时间:02/04/2024 13:14:09
+
+
+错误信息开始=====>
+错误类型:ArgumentException
+错误信息:提供的 URI 方案“http”无效,应为“https”。
+参数名: via
+错误堆栈:
+ 在 System.ServiceModel.Channels.TransportChannelFactory`1.ValidateScheme(Uri via)
+ 在 System.ServiceModel.Channels.HttpChannelFactory`1.ValidateCreateChannelParameters(EndpointAddress remoteAddress, Uri via)
+ 在 System.ServiceModel.Channels.HttpsChannelFactory`1.ValidateCreateChannelParameters(EndpointAddress remoteAddress, Uri via)
+ 在 System.ServiceModel.Channels.HttpsChannelFactory`1.OnCreateChannelCore(EndpointAddress address, Uri via)
+ 在 System.ServiceModel.Channels.HttpChannelFactory`1.OnCreateChannel(EndpointAddress remoteAddress, Uri via)
+ 在 System.ServiceModel.Channels.ChannelFactoryBase`1.InternalCreateChannel(EndpointAddress address, Uri via)
+ 在 System.ServiceModel.Channels.ChannelFactoryBase`1.CreateChannel(EndpointAddress address, Uri via)
+ 在 System.ServiceModel.Channels.ServiceChannelFactory.ServiceChannelFactoryOverRequest.CreateInnerChannelBinder(EndpointAddress to, Uri via)
+ 在 System.ServiceModel.Channels.ServiceChannelFactory.CreateServiceChannel(EndpointAddress address, Uri via)
+ 在 System.ServiceModel.Channels.ServiceChannelFactory.CreateChannel(Type channelType, EndpointAddress address, Uri via)
+ 在 System.ServiceModel.ChannelFactory`1.CreateChannel(EndpointAddress address, Uri via)
+ 在 System.ServiceModel.ChannelFactory`1.CreateChannel()
+ 在 System.ServiceModel.ClientBase`1.CreateChannel()
+ 在 System.ServiceModel.ClientBase`1.CreateChannelInternal()
+ 在 System.ServiceModel.ClientBase`1.get_Channel()
+ 在 BLL.CNCECHSSEService.HSSEServiceClient.GetCheck_CheckRectifyListToSUB(String unitId) 位置 E:\工作\五环施工平台\CNCEC_SUBQHSE_WUHUAN\SGGL\BLL\Service References\CNCECHSSEService\Reference.cs:行号 14220
+ 在 BLL.CNCECHSSEWebService.getCheck_CheckRectify() 位置 E:\工作\五环施工平台\CNCEC_SUBQHSE_WUHUAN\SGGL\BLL\WebService\CNCECHSSEWebService.cs:行号 1942
+出错时间:02/04/2024 13:14:09
+出错时间:02/04/2024 13:14:09
+
+
+错误信息开始=====>
+错误类型:ArgumentException
+错误信息:提供的 URI 方案“http”无效,应为“https”。
+参数名: via
+错误堆栈:
+ 在 System.ServiceModel.Channels.TransportChannelFactory`1.ValidateScheme(Uri via)
+ 在 System.ServiceModel.Channels.HttpChannelFactory`1.ValidateCreateChannelParameters(EndpointAddress remoteAddress, Uri via)
+ 在 System.ServiceModel.Channels.HttpsChannelFactory`1.ValidateCreateChannelParameters(EndpointAddress remoteAddress, Uri via)
+ 在 System.ServiceModel.Channels.HttpsChannelFactory`1.OnCreateChannelCore(EndpointAddress address, Uri via)
+ 在 System.ServiceModel.Channels.HttpChannelFactory`1.OnCreateChannel(EndpointAddress remoteAddress, Uri via)
+ 在 System.ServiceModel.Channels.ChannelFactoryBase`1.InternalCreateChannel(EndpointAddress address, Uri via)
+ 在 System.ServiceModel.Channels.ChannelFactoryBase`1.CreateChannel(EndpointAddress address, Uri via)
+ 在 System.ServiceModel.Channels.ServiceChannelFactory.ServiceChannelFactoryOverRequest.CreateInnerChannelBinder(EndpointAddress to, Uri via)
+ 在 System.ServiceModel.Channels.ServiceChannelFactory.CreateServiceChannel(EndpointAddress address, Uri via)
+ 在 System.ServiceModel.Channels.ServiceChannelFactory.CreateChannel(Type channelType, EndpointAddress address, Uri via)
+ 在 System.ServiceModel.ChannelFactory`1.CreateChannel(EndpointAddress address, Uri via)
+ 在 System.ServiceModel.ChannelFactory`1.CreateChannel()
+ 在 System.ServiceModel.ClientBase`1.CreateChannel()
+ 在 System.ServiceModel.ClientBase`1.CreateChannelInternal()
+ 在 System.ServiceModel.ClientBase`1.get_Channel()
+ 在 BLL.CNCECHSSEService.HSSEServiceClient.GetInformation_UrgeReportToSUB(String unitId) 位置 E:\工作\五环施工平台\CNCEC_SUBQHSE_WUHUAN\SGGL\BLL\Service References\CNCECHSSEService\Reference.cs:行号 14020
+ 在 BLL.CNCECHSSEWebService.getInformation_UrgeReport() 位置 E:\工作\五环施工平台\CNCEC_SUBQHSE_WUHUAN\SGGL\BLL\WebService\CNCECHSSEWebService.cs:行号 1884
+出错时间:02/04/2024 13:14:09
+出错时间:02/04/2024 13:14:09
+
diff --git a/SGGL/FineUIPro.Web/FineUIPro.Web.csproj b/SGGL/FineUIPro.Web/FineUIPro.Web.csproj
index e18797de..7ed3c1b1 100644
--- a/SGGL/FineUIPro.Web/FineUIPro.Web.csproj
+++ b/SGGL/FineUIPro.Web/FineUIPro.Web.csproj
@@ -1833,6 +1833,7 @@
+
@@ -16379,6 +16380,13 @@
PunchlistFrom.aspx
+
+ PunchlistFromChart.aspx
+ ASPXCodeBehind
+
+
+ PunchlistFromChart.aspx
+
TransferChart.aspx
ASPXCodeBehind
diff --git a/SGGL/FineUIPro.Web/FineUIPro.Web.csproj.user b/SGGL/FineUIPro.Web/FineUIPro.Web.csproj.user
index f8ca7c7a..c4484e3e 100644
--- a/SGGL/FineUIPro.Web/FineUIPro.Web.csproj.user
+++ b/SGGL/FineUIPro.Web/FineUIPro.Web.csproj.user
@@ -1,7 +1,7 @@
- Release|Any CPU
+ Debug|Any CPU
true
false
diff --git a/SGGL/FineUIPro.Web/Transfer/Chart/PunchlistFromChart.aspx b/SGGL/FineUIPro.Web/Transfer/Chart/PunchlistFromChart.aspx
new file mode 100644
index 00000000..cdcc6683
--- /dev/null
+++ b/SGGL/FineUIPro.Web/Transfer/Chart/PunchlistFromChart.aspx
@@ -0,0 +1,61 @@
+<%@ Page Language="C#" AutoEventWireup="true" CodeBehind="PunchlistFromChart.aspx.cs" Inherits="FineUIPro.Web.Transfer.Chart.PunchlistFromChart" %>
+<%@ Register Src="~/Controls/ChartControl.ascx" TagName="ChartControl" TagPrefix="uc1" %>
+
+
+
+
+
+
+
+
+
+
+
diff --git a/SGGL/FineUIPro.Web/Transfer/Chart/PunchlistFromChart.aspx.cs b/SGGL/FineUIPro.Web/Transfer/Chart/PunchlistFromChart.aspx.cs
new file mode 100644
index 00000000..65d92b8d
--- /dev/null
+++ b/SGGL/FineUIPro.Web/Transfer/Chart/PunchlistFromChart.aspx.cs
@@ -0,0 +1,137 @@
+using System;
+using System.Collections.Generic;
+using System.Data;
+using System.Linq;
+using BLL;
+
+namespace FineUIPro.Web.Transfer.Chart
+{
+ public partial class PunchlistFromChart : 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
+
+ ///
+ /// 统计分析
+ ///
+ ///
+ ///
+ protected void BtnAnalyse_Click(object sender, EventArgs e)
+ {
+ this.AnalyseData();
+ }
+
+ #region 统计
+ private void AnalyseData()
+ {
+ if (string.IsNullOrEmpty(ProjectId))
+ {
+ Alert.ShowInTop("项目未获取到,请刷新页面。", MessageBoxIcon.Warning);
+ return;
+ }
+ var forms = from x in Funs.DB.Transfer_PunchlistFrom
+ where x.ProjectId == this.CurrUser.LoginProjectId
+ select x;
+ var dates = (from x in forms where x.PUNCH_ITEM_FINISH_DATE != null orderby x.PUNCH_ITEM_FINISH_DATE select x.PUNCH_ITEM_FINISH_DATE).Distinct().ToList();
+ DataTable dtTime = new DataTable();
+ if (rblType.SelectedValue == "1")
+ {
+ dtTime.Columns.Add("日期", typeof(string));
+ dtTime.Columns.Add("Finished(%)", typeof(string));
+ if (dates.Count() > 0)
+ {
+ List months = new List();
+ DateTime startDate = Convert.ToDateTime(dates.First());
+ DateTime endDate = Convert.ToDateTime(dates.Last());
+ do
+ {
+ months.Add(startDate);
+ startDate = startDate.AddDays(15);
+ } while (startDate <= endDate);
+ var nums = forms.Count();
+ foreach (var item in months)
+ {
+ DataRow rowTime = dtTime.NewRow();
+ Model.SpTDesktopItem newspItem = new Model.SpTDesktopItem();
+ rowTime["日期"] = string.Format("{0:yyyy-MM-dd}", item);
+ var finishedNums = forms.Count(x => x.PUNCH_ITEM_FINISH_DATE <= item && x.PUNCH_ITEM_STATUS == "Finished");
+ if (nums > 0)
+ {
+ rowTime["Finished(%)"] = 1.0 * finishedNums / nums;
+ }
+ dtTime.Rows.Add(rowTime);
+ }
+ this.ChartUc.CreateChartPunchlistFrom(BLL.ChartControlService.GetDataSourceChartByYijiao(dtTime, "PROGRESS REPORT", "Line", 1100, 600, false));
+ }
+ }
+ else
+ {
+ dtTime.Columns.Add("日期", typeof(string));
+ dtTime.Columns.Add("Finished", typeof(string));
+ if (dates.Count() > 0)
+ {
+ List months = new List();
+ DateTime startDate = Convert.ToDateTime(dates.First());
+ DateTime endDate = Convert.ToDateTime(dates.Last());
+ do
+ {
+ months.Add(startDate);
+ startDate = startDate.AddDays(15);
+ } while (startDate <= endDate);
+ var nums = forms.Count();
+ foreach (var item in months)
+ {
+ DataRow rowTime = dtTime.NewRow();
+ Model.SpTDesktopItem newspItem = new Model.SpTDesktopItem();
+ rowTime["日期"] = string.Format("{0:yyyy-MM-dd}", item);
+ var finishedNums = forms.Count(x => x.PUNCH_ITEM_FINISH_DATE <= item && x.PUNCH_ITEM_STATUS == "Finished");
+ rowTime["Finished"] = finishedNums;
+ dtTime.Rows.Add(rowTime);
+ }
+ this.ChartUc.CreateChart(BLL.ChartControlService.GetDataSourceChartByYijiao(dtTime, "PROGRESS REPORT", "Line", 1100, 600, false));
+ }
+ }
+ }
+ #endregion
+
+ protected void rblType_SelectedIndexChanged(object sender, EventArgs e)
+ {
+ this.AnalyseData();
+ }
+ }
+}
\ No newline at end of file
diff --git a/SGGL/FineUIPro.Web/Transfer/Chart/PunchlistFromChart.aspx.designer.cs b/SGGL/FineUIPro.Web/Transfer/Chart/PunchlistFromChart.aspx.designer.cs
new file mode 100644
index 00000000..0bfb1e6b
--- /dev/null
+++ b/SGGL/FineUIPro.Web/Transfer/Chart/PunchlistFromChart.aspx.designer.cs
@@ -0,0 +1,114 @@
+//------------------------------------------------------------------------------
+// <自动生成>
+// 此代码由工具生成。
+//
+// 对此文件的更改可能导致不正确的行为,如果
+// 重新生成代码,则所做更改将丢失。
+// 自动生成>
+//------------------------------------------------------------------------------
+
+namespace FineUIPro.Web.Transfer.Chart {
+
+
+ public partial class PunchlistFromChart {
+
+ ///
+ /// form1 控件。
+ ///
+ ///
+ /// 自动生成的字段。
+ /// 若要进行修改,请将字段声明从设计器文件移到代码隐藏文件。
+ ///
+ 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;
+
+ ///
+ /// rblType 控件。
+ ///
+ ///
+ /// 自动生成的字段。
+ /// 若要进行修改,请将字段声明从设计器文件移到代码隐藏文件。
+ ///
+ protected global::FineUIPro.RadioButtonList rblType;
+
+ ///
+ /// 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;
+ }
+}
diff --git a/SGGL/FineUIPro.Web/Transfer/PunchlistFrom.aspx b/SGGL/FineUIPro.Web/Transfer/PunchlistFrom.aspx
index 43d86694..e534c8cc 100644
--- a/SGGL/FineUIPro.Web/Transfer/PunchlistFrom.aspx
+++ b/SGGL/FineUIPro.Web/Transfer/PunchlistFrom.aspx
@@ -40,6 +40,8 @@
<%--
--%>
+
+
@@ -126,6 +128,10 @@
+
+
diff --git a/SGGL/FineUIPro.Web/Transfer/PunchlistFrom.aspx.cs b/SGGL/FineUIPro.Web/Transfer/PunchlistFrom.aspx.cs
index 111e8a0c..131484b2 100644
--- a/SGGL/FineUIPro.Web/Transfer/PunchlistFrom.aspx.cs
+++ b/SGGL/FineUIPro.Web/Transfer/PunchlistFrom.aspx.cs
@@ -226,5 +226,26 @@ namespace FineUIPro.Web.Transfer
}
}
#endregion
+
+ #region 附件上传
+ ///
+ /// 附件上传
+ ///
+ ///
+ ///
+ protected void btnAttach_Click(object sender, EventArgs e)
+ {
+ var buttonList = BLL.CommonService.GetAllButtonList(this.CurrUser.LoginProjectId, this.CurrUser.UserId, BLL.Const.PunchlistFromMenuId);
+ if (buttonList.Contains(BLL.Const.BtnAdd))
+ {
+ PageContext.RegisterStartupScript(WindowAtt.GetShowReference(String.Format("../AttachFile/webuploader.aspx?type=0&toKeyId={0}&path=FileUpload/Transfer/PunchlistFrom&menuId={1}", this.CurrUser.LoginProjectId+ "PunchlistFrom", BLL.Const.PunchlistFromMenuId)));
+ }
+ else
+ {
+ PageContext.RegisterStartupScript(WindowAtt.GetShowReference(String.Format("../AttachFile/webuploader.aspx?type=-1&toKeyId={0}&path=FileUpload/Transfer/PunchlistFrom&menuId={1}", this.CurrUser.LoginProjectId + "PunchlistFrom", BLL.Const.PunchlistFromMenuId)));
+
+ }
+ }
+ #endregion
}
}
\ No newline at end of file
diff --git a/SGGL/FineUIPro.Web/Transfer/PunchlistFrom.aspx.designer.cs b/SGGL/FineUIPro.Web/Transfer/PunchlistFrom.aspx.designer.cs
index 80f55cb7..f91c4f96 100644
--- a/SGGL/FineUIPro.Web/Transfer/PunchlistFrom.aspx.designer.cs
+++ b/SGGL/FineUIPro.Web/Transfer/PunchlistFrom.aspx.designer.cs
@@ -120,6 +120,15 @@ namespace FineUIPro.Web.Transfer {
///
protected global::FineUIPro.Button btnSearch;
+ ///
+ /// btnAttach 控件。
+ ///
+ ///
+ /// 自动生成的字段。
+ /// 若要进行修改,请将字段声明从设计器文件移到代码隐藏文件。
+ ///
+ protected global::FineUIPro.Button btnAttach;
+
///
/// btnImport 控件。
///
@@ -139,7 +148,7 @@ namespace FineUIPro.Web.Transfer {
protected global::FineUIPro.Toolbar Toolbar1;
///
- /// txtTest Package 控件。
+ /// txtTestPackage 控件。
///
///
/// 自动生成的字段。
@@ -192,6 +201,15 @@ namespace FineUIPro.Web.Transfer {
///
protected global::FineUIPro.DropDownList ddlPageSize;
+ ///
+ /// WindowAtt 控件。
+ ///
+ ///
+ /// 自动生成的字段。
+ /// 若要进行修改,请将字段声明从设计器文件移到代码隐藏文件。
+ ///
+ protected global::FineUIPro.Window WindowAtt;
+
///
/// Window2 控件。
///
diff --git a/SGGL/FineUIPro.Web/Web.config b/SGGL/FineUIPro.Web/Web.config
index 6f9fe9f9..362a2c4d 100644
--- a/SGGL/FineUIPro.Web/Web.config
+++ b/SGGL/FineUIPro.Web/Web.config
@@ -12,7 +12,7 @@
-
+
diff --git a/SGGL/FineUIPro.Web/common/Menu_HSSE.xml b/SGGL/FineUIPro.Web/common/Menu_HSSE.xml
index f3c15865..1544f676 100644
--- a/SGGL/FineUIPro.Web/common/Menu_HSSE.xml
+++ b/SGGL/FineUIPro.Web/common/Menu_HSSE.xml
@@ -20,7 +20,7 @@
-
+
@@ -153,7 +153,7 @@
-
+
diff --git a/SGGL/FineUIPro.Web/common/Menu_SysSet.xml b/SGGL/FineUIPro.Web/common/Menu_SysSet.xml
index 753efb73..51a57bc0 100644
--- a/SGGL/FineUIPro.Web/common/Menu_SysSet.xml
+++ b/SGGL/FineUIPro.Web/common/Menu_SysSet.xml
@@ -24,6 +24,7 @@
+
diff --git a/SGGL/FineUIPro.Web/common/Menu_TestRun.xml b/SGGL/FineUIPro.Web/common/Menu_TestRun.xml
index a8df02b8..08203a41 100644
--- a/SGGL/FineUIPro.Web/common/Menu_TestRun.xml
+++ b/SGGL/FineUIPro.Web/common/Menu_TestRun.xml
@@ -44,7 +44,6 @@
-
@@ -61,13 +60,16 @@
+
+
+
diff --git a/SGGL/FineUIPro.Web/common/Menu_Transfer.xml b/SGGL/FineUIPro.Web/common/Menu_Transfer.xml
index 5180b459..4d3b9e97 100644
--- a/SGGL/FineUIPro.Web/common/Menu_Transfer.xml
+++ b/SGGL/FineUIPro.Web/common/Menu_Transfer.xml
@@ -16,5 +16,6 @@
+
\ No newline at end of file
diff --git a/SGGL/WebAPI/WebAPI.csproj.user b/SGGL/WebAPI/WebAPI.csproj.user
index 4edb5e0f..6bc24ada 100644
--- a/SGGL/WebAPI/WebAPI.csproj.user
+++ b/SGGL/WebAPI/WebAPI.csproj.user
@@ -1,7 +1,7 @@
- Release|Any CPU
+ Debug|Any CPU
true