From 3a17c000be3c8abc35e177743ea83c9cf3183bc0 Mon Sep 17 00:00:00 2001 From: 10191 <506754232@qq.com> Date: Wed, 23 Jul 2025 10:45:23 +0800 Subject: [PATCH 1/3] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E6=97=B6=E9=97=B4?= =?UTF-8?q?=E9=99=90=E5=88=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../HSSE/TowerCrane/TowerCraneRecord.aspx.cs | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) 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); From f85f6350fad4f8c8b9b3978f11814a1815b492b6 Mon Sep 17 00:00:00 2001 From: 10191 <506754232@qq.com> Date: Wed, 23 Jul 2025 10:57:24 +0800 Subject: [PATCH 2/3] =?UTF-8?q?=E6=8A=A5=E8=AD=A6=E6=8E=A8=E9=80=81?= =?UTF-8?q?=E9=A1=B9=E7=9B=AE=E5=AE=89=E5=85=A8=E6=80=BB=E7=9B=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Controllers/HSSE/TowerCraneController.cs | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/SGGL/WebAPI/Controllers/HSSE/TowerCraneController.cs b/SGGL/WebAPI/Controllers/HSSE/TowerCraneController.cs index 52f943c5..2fbf8896 100644 --- a/SGGL/WebAPI/Controllers/HSSE/TowerCraneController.cs +++ b/SGGL/WebAPI/Controllers/HSSE/TowerCraneController.cs @@ -54,17 +54,17 @@ namespace WebAPI.Controllers { Dictionary alarmMap = new Dictionary(); - 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", "塔机群碰撞报警"); From a52ecd996dda41743d037a7898321558dc209ecd Mon Sep 17 00:00:00 2001 From: 10191 <506754232@qq.com> Date: Wed, 23 Jul 2025 11:07:28 +0800 Subject: [PATCH 3/3] =?UTF-8?q?=E5=A1=94=E5=90=8A=E6=8A=A5=E8=AD=A6?= =?UTF-8?q?=E6=8E=A8=E9=80=81=E5=AE=89=E5=85=A8=E6=80=BB=E7=9B=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- SGGL/WebAPI/Controllers/HSSE/TowerCraneController.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/SGGL/WebAPI/Controllers/HSSE/TowerCraneController.cs b/SGGL/WebAPI/Controllers/HSSE/TowerCraneController.cs index 2fbf8896..dad8940b 100644 --- a/SGGL/WebAPI/Controllers/HSSE/TowerCraneController.cs +++ b/SGGL/WebAPI/Controllers/HSSE/TowerCraneController.cs @@ -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) {