zhanghj/ChengDa_English
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

成达修改20230724

Browse Source
This commit is contained in:
李超
2023-07-24 16:47:13 +08:00
parent dc33ea0366
commit f0b0eca670
28 changed files with 794 additions and 699 deletions
Download Patch File Download Diff File Expand all files Collapse all files
SGGL/FineUIPro.Web/HSSE/HiddenInspection/HiddenRectificationList.aspx.cs
+4 -6
View File
@@ -174,12 +174,12 @@ namespace FineUIPro.Web.HSSE.HiddenInspection
}
if (this.drpStates.SelectedValueArray.Contains("2"))
{
strSqlTemp += " ( States in( '2','3') and datediff(DAY,RectificationPeriod,RectificationTime)>0 ) OR";
strSqlTemp += " ( States in( '2','3') and datediff(DAY,RectificationPeriod,RectificationTime)<=0 ) OR";
}
if (this.drpStates.SelectedValueArray.Contains("3"))
{
strSqlTemp += " (States in( '2','3') and datediff(DAY,RectificationPeriod,RectificationTime)<=0 ) OR";
strSqlTemp += " (States in( '2','3') and datediff(DAY,RectificationPeriod,RectificationTime)>0 ) OR";
}
if (this.drpStates.SelectedValueArray.Contains("4"))
@@ -705,15 +705,13 @@ namespace FineUIPro.Web.HSSE.HiddenInspection
Response.Write(GetGridTableHtml(Grid1));
Response.End();
}
#pragma warning disable CS0108 // “HiddenRectificationList.GetGridTableHtml(Grid)”隐藏继承的成员“PageBase.GetGridTableHtml(Grid)”。如果是有意隐藏，请使用关键字 new。
/// <summary>
/// 导出方法
/// </summary>
/// <param name="grid"></param>
/// <returns></returns>
private string GetGridTableHtml(Grid grid)
#pragma warning restore CS0108 // “HiddenRectificationList.GetGridTableHtml(Grid)”隐藏继承的成员“PageBase.GetGridTableHtml(Grid)”。如果是有意隐藏，请使用关键字 new。
private string GetGridTableHtml(Grid grid)
{
StringBuilder sb = new StringBuilder();
sb.Append("<meta http-equiv=\"content-type\" content=\"application/excel; charset=UTF-8\"/>");
SGGL/FineUIPro.Web/HSSE/HiddenInspection/RiskAnalysisChart.aspx
+2 -2
View File
@@ -49,7 +49,7 @@
<f:Panel ID="Panel4" CssClass="blockpanel" runat="server" EnableCollapse="false" MarginTop="10px"
BodyPadding="10px" ShowBorder="true" ShowHeader="false">
<Items>
<f:TabStrip ID="TabStrip1" CssClass="f-tabstrip-theme-simple" Height="400px" ShowBorder="true"
<f:TabStrip ID="TabStrip1" CssClass="f-tabstrip-theme-simple" Height="700px" ShowBorder="true"
TabPosition="Top" MarginBottom="5px" EnableTabCloseMenu="false" runat="server">
<Tabs>
<f:Tab ID="Tab2" Title="按类别" BodyPadding="5px" Layout="Fit" IconFont="Bookmark" runat="server"
@@ -57,7 +57,7 @@
<Items>
<f:ContentPanel ShowHeader="false" runat="server" ID="cpAccidentTime" Margin="0 0 0 0" >
<div id="divAccidentTime" style=" height: 300px;">
<div id="divAccidentTime" style=" height: 700px;">
</div>