Compare commits

..

No commits in common. "4ee55f93adc4ab274d1e193e63dbf4b67d727eef" and "3e28b8025d0324fbd972c6eca8710b6e6d71135c" have entirely different histories.

3 changed files with 2 additions and 16 deletions

View File

@ -22,7 +22,6 @@
<f:TextBox ID="txtIsono" runat="server" Label="塔吊" EmptyText="输入查询条件" AutoPostBack="true"
OnTextChanged="Tree_TextChanged" Width="250px" LabelWidth="70px" LabelAlign="Right">
</f:TextBox>
<f:HiddenField ID="hfTowerCraneId" ClientIDMode="Static" runat="server"></f:HiddenField>
</Items>
</f:Toolbar>
@ -47,8 +46,7 @@
<Toolbars>
<f:Toolbar ID="Toolbar2" Position="Top" runat="server" ToolbarAlign="Left">
<Items>
<f:CheckBox ID="ckIsWarnOnly" MarginLeft="40px" runat="server" Text="仅显示预警报警" LabelWidth="200px" Checked="true">
</f:CheckBox>
<f:DatePicker runat="server" DateFormatString="yyyy-MM-dd" Label="开始日期" ID="txtStartTime"
LabelAlign="right" >
</f:DatePicker>

View File

@ -103,10 +103,7 @@ namespace FineUIPro.Web.HSSE.TowerCrane
List<SqlParameter> listStr = new List<SqlParameter>();
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();

View File

@ -113,15 +113,6 @@ namespace FineUIPro.Web.HSSE.TowerCrane
/// </remarks>
protected global::FineUIPro.Toolbar Toolbar2;
/// <summary>
/// ckIsWarnOnly 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改,请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.CheckBox ckIsWarnOnly;
/// <summary>
/// txtStartTime 控件。
/// </summary>