cdl/HTCloud
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

1、陕西建龙打包版本

Browse Source 
2、drawio导入SFC
3、多系统并存修改
This commit is contained in:
dell
2025-02-19 16:06:08 +08:00
parent 4071d8f337
commit fbc097d131
73 changed files with 3874 additions and 13074 deletions
Download Patch File Download Diff File Expand all files Collapse all files

54
HT.Cloud.Web/Areas/PenMeiReportManage/Controllers/PenMeiHistoryAlarmNewNewController.cs
View File

@ -12,6 +12,7 @@ using HT.Cloud.Service.ReportManage;
using Serenity.Services;
using HT.Cloud.Domain.DevicesManage;
using SqlSugar;
using static HT.Cloud.Web.Areas.ReportManage.Controllers.PenMeiHistoryAlarmNewNewController;
namespace HT.Cloud.Web.Areas.ReportManage.Controllers
{
@ -30,6 +31,11 @@ namespace HT.Cloud.Web.Areas.ReportManage.Controllers
/// 绑定数据仓库的数据库ID
/// </summary>
private string systemDescription = GlobalContext.SystemConfig.SystemDescription;
public override ActionResult Index()
{
ViewData["SystemName"] = Request.Query["SystemName"];
return View();
}
[HttpGet]
public async Task<ActionResult> GetDriverGroupList()
{
@ -37,10 +43,10 @@ namespace HT.Cloud.Web.Areas.ReportManage.Controllers
return Content(data);
}
[HttpGet]
public async Task<ActionResult> GetAllSubsystemTag()
[HttpPost]
public async Task<ActionResult> GetAllSubsystemTag(string[] SystemName)
{
var data = await _historyAlarmService.GetAllSubsystemTag(systemDescription);
var data = await _historyAlarmService.GetAllSubsystemTag(SystemName[0]);
return Content(data);
}
@ -87,8 +93,9 @@ namespace HT.Cloud.Web.Areas.ReportManage.Controllers
var StartTime = Gettime(alarm_History_Params.StartTime);
var EndTime = Gettime(alarm_History_Params.EndTime);
var SystemName = alarm_History_Params.SystemName;
var data = await _historyAlarmService.GetAlarmHistory(StartTime, EndTime, systemDescription);
var data = await _historyAlarmService.GetAlarmHistory(StartTime, EndTime, SystemName);
return Content(data);
}
[HttpPost]
@ -157,18 +164,20 @@ namespace HT.Cloud.Web.Areas.ReportManage.Controllers
string Description = charts_Params.Description;
var StartTime = Gettime(charts_Params.StartTime);
var EndTime = Gettime(charts_Params.EndTime);
var SystemName = charts_Params.SystemName;
var data = await _historyAlarmService.GetAlarmRecordForTagName(Description, StartTime, EndTime, systemDescription);
var data = await _historyAlarmService.GetAlarmRecordForTagName(Description, StartTime, EndTime, SystemName);
return Content(data);
}
public async Task<ActionResult> GetAlarm_CS(Alarm_CS alarm_CS)
{
var StartTime = Gettime_(alarm_CS.StartTime);
var StartTime = Gettime_(alarm_CS.StartTime);
var EndTime = Gettime_(alarm_CS.EndTime);
var SystemName = alarm_CS.SystemName;
var data = await _historyAlarmService.GetAlarm_CS(StartTime, EndTime, systemDescription);
var data = await _historyAlarmService.GetAlarm_CS(StartTime, EndTime, SystemName);
return Content(data);
}
@ -177,27 +186,12 @@ namespace HT.Cloud.Web.Areas.ReportManage.Controllers
var StartTime = Gettime_(alarm_Ztime.StartTime);
var EndTime = Gettime_(alarm_Ztime.EndTime);
var SystemName = alarm_Ztime.SystemName;
var data = await _historyAlarmService.GetAlarm_Ztime(StartTime, EndTime, systemDescription);
var data = await _historyAlarmService.GetAlarm_Ztime(StartTime, EndTime, SystemName);
return Content(data);
}
/*
* 一
* 1、重绘管理系统所有趋势曲线，曲线的数据点上不在绘制图形圆点。
* 2、实时趋势开放拖动和JS代码添加可向前加载数据集的动态方法。
* 二
* 1、后台服务在获取实时趋势初始化数据时进行向前的数据获取，为初始数据集添加一段历史数据。
* 2、参加公司组织的拍摄技术培训。
* 三
* 1、使用异步和函数回调来执行历史数据查询，在实时数据获取后进行时间戳对其，避免出现重复时间和漏掉时间。
* 2、报警分析柱图优化，单日柱状图从堆叠图修改为平铺柱状图。
* 四
* 1、柱状图添加工具条，可支持堆叠图、平铺图、折线图切换显示，并支持下载功能。
* 2、添加图表联动功能，增加柱状图和饼图的点击事件，在柱状区域或饼状区域内点击可跳转至该报警信息的详细查询。
* 五
* 1、
* 2、整理管理系统以前相关的设计、宣传素材，编写管理系统演示用ppt。
*/
//public class SubAllTagReturn
//{
// //x.TagID, x.Description, x.Units
@ -243,7 +237,8 @@ namespace HT.Cloud.Web.Areas.ReportManage.Controllers
public string Description { get; set; }
public string StartTime { get; set; }
public string EndTime { get; set; }
}
public string SystemName { get; set; }
}
public class Alarm_Quick_Params
{
@ -259,6 +254,7 @@ namespace HT.Cloud.Web.Areas.ReportManage.Controllers
{
public string StartTime { get; set; }
public string EndTime { get; set; }
public string SystemName { get; set; }
}
@ -282,12 +278,14 @@ namespace HT.Cloud.Web.Areas.ReportManage.Controllers
{
public string StartTime { get; set; }
public string EndTime { get; set; }
}
public string SystemName { get; set; }
}
public class Alarm_Ztime
{
public string StartTime { get; set; }
public string EndTime { get; set; }
public string SystemName { get; set; }
}
}
}