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

Compare commits

base: lpf:505680af711645fbac9999084214d4a97a4d9734
Branches Tags
lpf:master
lpf:panhf_20240125
..
compare: lpf:08df59d881a0163d13993be9df3c77774af5e4e1
Branches Tags
lpf:master
lpf:panhf_20240125

No commits in common. "505680af711645fbac9999084214d4a97a4d9734" and "08df59d881a0163d13993be9df3c77774af5e4e1" have entirely different histories.
505680af71 ... 08df59d881

2 changed files with 9 additions and 16 deletions
Show Stats Expand all files Collapse all files

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

@ -105,16 +105,9 @@ namespace FineUIPro.Web.HSSE.TowerCrane
listStr.Add(new SqlParameter("@TowerCraneId", TowerCraneId)); listStr.Add(new SqlParameter("@TowerCraneId", TowerCraneId));
if (ckIsWarnOnly.Checked) 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"; strSql += " order by Date desc";
SqlParameter[] parameter = listStr.ToArray(); SqlParameter[] parameter = listStr.ToArray();
DataTable tb = SQLHelper.GetDataTableRunText(strSql, parameter); DataTable tb = SQLHelper.GetDataTableRunText(strSql, parameter);

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

@ -54,17 +54,17 @@ namespace WebAPI.Controllers
{ {
Dictionary<string, string> alarmMap = new Dictionary<string, string>(); Dictionary<string, string> alarmMap = new Dictionary<string, string>();
// alarmMap.Add("111", "重量预警"); alarmMap.Add("111", "重量预警");
alarmMap.Add("112", "重量报警"); alarmMap.Add("112", "重量报警");
// alarmMap.Add("121", "风速预警"); alarmMap.Add("121", "风速预警");
alarmMap.Add("122", "风速报警"); alarmMap.Add("122", "风速报警");
alarmMap.Add("131", "内限位报警"); alarmMap.Add("131", "内限位报警");
// alarmMap.Add("132", "内限位预警"); alarmMap.Add("132", "内限位预警");
// alarmMap.Add("133", "外限位预警"); alarmMap.Add("133", "外限位预警");
alarmMap.Add("134", "外限位报警"); alarmMap.Add("134", "外限位报警");
// alarmMap.Add("141", "倾角预警"); alarmMap.Add("141", "倾角预警");
// alarmMap.Add("142", "倾角报警"); alarmMap.Add("142", "倾角报警");
// alarmMap.Add("151", "上限位预警"); alarmMap.Add("151", "上限位预警");
alarmMap.Add("152", "上限位报警"); alarmMap.Add("152", "上限位报警");
alarmMap.Add("201", "障碍物碰撞报警"); alarmMap.Add("201", "障碍物碰撞报警");
alarmMap.Add("202", "塔机群碰撞报警"); alarmMap.Add("202", "塔机群碰撞报警");