lpf
/
CNCEC_SUBQHSE_WUHUAN
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'master' of http://47.104.102.122:3000/lpf/CNCEC_SUBQHSE_WUHUAN

This commit is contained in:
夏菊 2025-07-23 11:10:33 +08:00
parent a6413b7b7c a52ecd996d
commit 730edc20c5
2 changed files with 17 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
SGGL/FineUIPro.Web/HSSE/TowerCrane/TowerCraneRecord.aspx.cs
View File

@ -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);

16
SGGL/WebAPI/Controllers/HSSE/TowerCraneController.cs
View File

@ -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)
{