diff --git a/SGGL/FineUIPro.Web/HSSE/TowerCrane/TowerCraneRecord.aspx b/SGGL/FineUIPro.Web/HSSE/TowerCrane/TowerCraneRecord.aspx index 31d19120..9def8d24 100644 --- a/SGGL/FineUIPro.Web/HSSE/TowerCrane/TowerCraneRecord.aspx +++ b/SGGL/FineUIPro.Web/HSSE/TowerCrane/TowerCraneRecord.aspx @@ -22,6 +22,7 @@ + @@ -46,7 +47,8 @@ - + + diff --git a/SGGL/FineUIPro.Web/HSSE/TowerCrane/TowerCraneRecord.aspx.cs b/SGGL/FineUIPro.Web/HSSE/TowerCrane/TowerCraneRecord.aspx.cs index 42701c40..41348d82 100644 --- a/SGGL/FineUIPro.Web/HSSE/TowerCrane/TowerCraneRecord.aspx.cs +++ b/SGGL/FineUIPro.Web/HSSE/TowerCrane/TowerCraneRecord.aspx.cs @@ -103,7 +103,10 @@ namespace FineUIPro.Web.HSSE.TowerCrane List listStr = new List(); strSql += " TowerCraneId = @TowerCraneId"; listStr.Add(new SqlParameter("@TowerCraneId", TowerCraneId)); - + if (ckIsWarnOnly.Checked) + { + strSql += " and AlarmType is not null "; + } strSql += " order by Date desc"; SqlParameter[] parameter = listStr.ToArray(); diff --git a/SGGL/FineUIPro.Web/HSSE/TowerCrane/TowerCraneRecord.aspx.designer.cs b/SGGL/FineUIPro.Web/HSSE/TowerCrane/TowerCraneRecord.aspx.designer.cs index d75f087c..854721c0 100644 --- a/SGGL/FineUIPro.Web/HSSE/TowerCrane/TowerCraneRecord.aspx.designer.cs +++ b/SGGL/FineUIPro.Web/HSSE/TowerCrane/TowerCraneRecord.aspx.designer.cs @@ -113,6 +113,15 @@ namespace FineUIPro.Web.HSSE.TowerCrane /// protected global::FineUIPro.Toolbar Toolbar2; + /// + /// ckIsWarnOnly 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改,请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.CheckBox ckIsWarnOnly; + /// /// txtStartTime 控件。 ///