diff --git a/SGGL/FineUIPro.Web/HSSE/TowerCrane/TowerCraneRecord.aspx.cs b/SGGL/FineUIPro.Web/HSSE/TowerCrane/TowerCraneRecord.aspx.cs
index 41348d82..a5a4e661 100644
--- a/SGGL/FineUIPro.Web/HSSE/TowerCrane/TowerCraneRecord.aspx.cs
+++ b/SGGL/FineUIPro.Web/HSSE/TowerCrane/TowerCraneRecord.aspx.cs
@@ -105,9 +105,16 @@ namespace FineUIPro.Web.HSSE.TowerCrane
                 listStr.Add(new SqlParameter("@TowerCraneId", TowerCraneId));
                 if (ckIsWarnOnly.Checked)
                 {
-                    strSql += " and AlarmType is not null ";
+                    strSql += "  and AlarmType is not null ";
+                }
+                if (!string.IsNullOrEmpty(txtStartTime.Text))
+                {
+                    strSql += "  and Date >='"+ txtStartTime.Text + "'  ";
+                }
+                if (!string.IsNullOrEmpty(txtEndTime.Text))
+                {
+                    strSql += "  and Date <='" + txtEndTime.Text + "'  ";
                 }
-
                 strSql += " order by Date desc";
                 SqlParameter[] parameter = listStr.ToArray();
                 DataTable tb = SQLHelper.GetDataTableRunText(strSql, parameter);
diff --git a/SGGL/WebAPI/Controllers/HSSE/TowerCraneController.cs b/SGGL/WebAPI/Controllers/HSSE/TowerCraneController.cs
index 52f943c5..dad8940b 100644
--- a/SGGL/WebAPI/Controllers/HSSE/TowerCraneController.cs
+++ b/SGGL/WebAPI/Controllers/HSSE/TowerCraneController.cs
@@ -54,17 +54,17 @@ namespace WebAPI.Controllers
                             {
                                 Dictionary<string, string> alarmMap = new Dictionary<string, string>();
 
-                                alarmMap.Add("111", "重量预警");
+                               // alarmMap.Add("111", "重量预警");
                                 alarmMap.Add("112", "重量报警");
-                                alarmMap.Add("121", "风速预警");
+                               // alarmMap.Add("121", "风速预警");
                                 alarmMap.Add("122", "风速报警");
                                 alarmMap.Add("131", "内限位报警");
-                                alarmMap.Add("132", "内限位预警");
-                                alarmMap.Add("133", "外限位预警");
+                               // alarmMap.Add("132", "内限位预警");
+                               // alarmMap.Add("133", "外限位预警");
                                 alarmMap.Add("134", "外限位报警");
-                                alarmMap.Add("141", "倾角预警");
-                                alarmMap.Add("142", "倾角报警");
-                                alarmMap.Add("151", "上限位预警");
+                              //  alarmMap.Add("141", "倾角预警");
+                             //   alarmMap.Add("142", "倾角报警");
+                              //  alarmMap.Add("151", "上限位预警");
                                 alarmMap.Add("152", "上限位报警");
                                 alarmMap.Add("201", "障碍物碰撞报警");
                                 alarmMap.Add("202", "塔机群碰撞报警");
@@ -82,7 +82,7 @@ namespace WebAPI.Controllers
 
                                 var user = db.Project_ProjectUser.FirstOrDefault(x => x.ProjectId == towerCrane.ProjectId && x.UnitId == Const.UnitId_CWCEC && x.RoleName == "安全总监");
 
-                                APICommonService.SendSubscribeMessage(user.UserId, "塔吊预警", towerCrane.TowerCraneName + ":" + res, string.Format("{0:yyyy-MM-dd HH:mm:ss}", DateTime.Now));
+                                APICommonService.SendSubscribeMessage(user.UserId, "塔吊报警", towerCrane.TowerCraneName + ":" + res, string.Format("{0:yyyy-MM-dd HH:mm:ss}", DateTime.Now));
                             }
                             catch (Exception e)
                             {