From bfdd5b1b3b71eb343cf6017a206c05a5b4bcd9d9 Mon Sep 17 00:00:00 2001 From: panhf <754998852@qq.com> Date: Sun, 4 Feb 2024 10:35:09 +0800 Subject: [PATCH] =?UTF-8?q?=E7=A7=BB=E4=BA=A4=E6=8A=A5=E8=A1=A8=E5=A4=84?= =?UTF-8?q?=E7=90=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- DataBase/版本日志/SGGLDB_WH_2024-02-04-phf.sql | 13 +++++++++++++ SGGL/FineUIPro.Web/Controls/ChartControl.ascx.cs | 7 +++++++ SGGL/FineUIPro.Web/FineUIPro.Web.csproj.user | 2 +- .../Transfer/Chart/TransferChart.aspx.cs | 2 +- SGGL/FineUIPro.Web/Transfer/Piping.aspx | 2 +- SGGL/FineUIPro.Web/Transfer/RotatingEquipment.aspx | 2 +- SGGL/FineUIPro.Web/Transfer/StaticEquipment.aspx | 2 +- SGGL/WebAPI/WebAPI.csproj.user | 2 +- 8 files changed, 26 insertions(+), 6 deletions(-) create mode 100644 DataBase/版本日志/SGGLDB_WH_2024-02-04-phf.sql diff --git a/DataBase/版本日志/SGGLDB_WH_2024-02-04-phf.sql b/DataBase/版本日志/SGGLDB_WH_2024-02-04-phf.sql new file mode 100644 index 00000000..61d069b0 --- /dev/null +++ b/DataBase/版本日志/SGGLDB_WH_2024-02-04-phf.sql @@ -0,0 +1,13 @@ +--µ +delete from Transfer_Piping; +delete from Transfer_StaticEquipment; +delete from Transfer_RotatingEquipment; + +--޸ʱʱ +update Transfer_Instrumentation set CompleteTime=getdate(); +update Transfer_Electrical set CompleteTime=getdate(); +update Transfer_Civil_Structure set CompleteTime=getdate(); +update Transfer_Firefighting set CompleteTime=getdate(); +update Transfer_Telecom set CompleteTime=getdate(); +update Transfer_Plumbing set CompleteTime=getdate(); +update Transfer_HVAC set CompleteTime=getdate(); \ No newline at end of file diff --git a/SGGL/FineUIPro.Web/Controls/ChartControl.ascx.cs b/SGGL/FineUIPro.Web/Controls/ChartControl.ascx.cs index e0fc300b..b7c547ac 100644 --- a/SGGL/FineUIPro.Web/Controls/ChartControl.ascx.cs +++ b/SGGL/FineUIPro.Web/Controls/ChartControl.ascx.cs @@ -415,6 +415,13 @@ namespace Web.Controls chart1.Series[dataSourceTeam.DataPointName].Label = "#VAL{P}";//设置标签文本 (在设计期通过属性窗口编辑更直观) chart1.Series[dataSourceTeam.DataPointName].IsValueShownAsLabel = true;//显示标签 + if (dataSourceTeam.DataPointName == "Actual Finished(%)") + { + chart1.Series[dataSourceTeam.DataPointName].Color = Color.Red; + } + else { + chart1.Series[dataSourceTeam.DataPointName].Color = Color.Blue; + } foreach (Model.DataSourcePoint dataSourcePoint in dataSourceTeam.DataSourcePoints) { chart1.Series[dataSourceTeam.DataPointName].Points.AddXY(dataSourcePoint.PointText, dataSourcePoint.PointValue); 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/TransferChart.aspx.cs b/SGGL/FineUIPro.Web/Transfer/Chart/TransferChart.aspx.cs index 0e62c056..198d4252 100644 --- a/SGGL/FineUIPro.Web/Transfer/Chart/TransferChart.aspx.cs +++ b/SGGL/FineUIPro.Web/Transfer/Chart/TransferChart.aspx.cs @@ -1784,7 +1784,7 @@ namespace FineUIPro.Web.Transfer.Chart } - this.ChartUc.CreateChartBaifenbi(BLL.ChartControlService.GetDataSourceChartByYijiao(dtTime, "PROGRESS REPORT", "Line", 1100, 600, false)); + this.ChartUc.CreateChartBaifenbi(BLL.ChartControlService.GetDataSourceChartByYijiao(dtTime, "PROGRESS REPORT", "Line", 1300, 600, false)); } #endregion } diff --git a/SGGL/FineUIPro.Web/Transfer/Piping.aspx b/SGGL/FineUIPro.Web/Transfer/Piping.aspx index e0049131..bc004f71 100644 --- a/SGGL/FineUIPro.Web/Transfer/Piping.aspx +++ b/SGGL/FineUIPro.Web/Transfer/Piping.aspx @@ -63,7 +63,7 @@ HeaderTextAlign="Center" Width="120px"> + HeaderTextAlign="Center" Width="200px"> diff --git a/SGGL/FineUIPro.Web/Transfer/RotatingEquipment.aspx b/SGGL/FineUIPro.Web/Transfer/RotatingEquipment.aspx index e37b9a0e..28a6a36f 100644 --- a/SGGL/FineUIPro.Web/Transfer/RotatingEquipment.aspx +++ b/SGGL/FineUIPro.Web/Transfer/RotatingEquipment.aspx @@ -63,7 +63,7 @@ HeaderTextAlign="Center" Width="120px"> + HeaderTextAlign="Center" Width="200px"> diff --git a/SGGL/FineUIPro.Web/Transfer/StaticEquipment.aspx b/SGGL/FineUIPro.Web/Transfer/StaticEquipment.aspx index 3c49f100..32e177f0 100644 --- a/SGGL/FineUIPro.Web/Transfer/StaticEquipment.aspx +++ b/SGGL/FineUIPro.Web/Transfer/StaticEquipment.aspx @@ -63,7 +63,7 @@ HeaderTextAlign="Center" Width="120px"> + HeaderTextAlign="Center" Width="200px"> 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