diff --git a/HT.Cloud.Domain/Entity/ReportManage/HistoryAlarmEntity.cs b/HT.Cloud.Domain/Entity/ReportManage/HistoryAlarmEntity.cs
new file mode 100644
index 0000000..32b8603
--- /dev/null
+++ b/HT.Cloud.Domain/Entity/ReportManage/HistoryAlarmEntity.cs
@@ -0,0 +1,86 @@
+using System;
+using System.ComponentModel.DataAnnotations;
+using SqlSugar;
+
+namespace HT.Cloud.Domain.ReportManage
+{
+    /// <summary>
+    /// 创 建：cdl
+    /// 日 期：2023-08-16 15:58
+    /// 描 述：报警信息变量表实体类
+    /// </summary>
+    [SugarTable("HT_HISTORY_ALARM")]
+    public class HistoryAlarmEntity
+	{
+        /// <summary>
+        /// 
+        /// </summary>
+        [SugarColumn(ColumnName="TagID", ColumnDescription = "",ColumnDataType = "smallint(5)",IsIdentity = true)]
+        public int TagID { get; set; }
+        /// <summary>
+        /// 
+        /// </summary>
+        [SugarColumn(ColumnName="TagName", ColumnDescription = "",ColumnDataType = "nvarchar(512)")]
+        public string TagName { get; set; }
+        /// <summary>
+        /// 
+        /// </summary>
+        [SugarColumn(ColumnName="DataType", ColumnDescription = "",ColumnDataType = "tinyint(3)")]
+        public bool DataType { get; set; }
+        /// <summary>
+        /// 
+        /// </summary>
+        [SugarColumn(ColumnName="DataSize", ColumnDescription = "",ColumnDataType = "smallint(5)")]
+        public int DataSize { get; set; }
+        /// <summary>
+        /// 
+        /// </summary>
+        [SugarColumn(ColumnName="Address", ColumnDescription = "",ColumnDataType = "nvarchar(64)")]
+        public string Address { get; set; }
+        /// <summary>
+        /// 
+        /// </summary>
+        [SugarColumn(ColumnName="GroupID", ColumnDescription = "",ColumnDataType = "smallint(5)")]
+        public int GroupID { get; set; }
+        /// <summary>
+        /// 
+        /// </summary>
+        [SugarColumn(ColumnName="IsActive", ColumnDescription = "",ColumnDataType = "bit(1)")]
+        public bool IsActive { get; set; }
+        /// <summary>
+        /// 
+        /// </summary>
+        [SugarColumn(ColumnName="Description", ColumnDescription = "",ColumnDataType = "nvarchar(128)")]
+        public string Description { get; set; }
+        /// <summary>
+        /// 
+        /// </summary>
+        [SugarColumn(ColumnName="Subsystem", ColumnDescription = "",ColumnDataType = "nvarchar(64)", IsNullable = true)]
+        public string Subsystem { get; set; }
+        /// <summary>
+        /// 
+        /// </summary>
+        [SugarColumn(ColumnName="Units", ColumnDescription = "",ColumnDataType = "nvarchar(20)", IsNullable = true)]
+        public string Units { get; set; }
+        /// <summary>
+        /// 
+        /// </summary>
+        [SugarColumn(ColumnName="WriteAddress", ColumnDescription = "",ColumnDataType = "nvarchar(64)", IsNullable = true)]
+        public string WriteAddress { get; set; }
+        /// <summary>
+        /// 报警类型
+        /// </summary>
+        [SugarColumn(ColumnName="Alarmtype", ColumnDescription = "报警类型",ColumnDataType = "nvarchar(8)", IsNullable = true)]
+        public string Alarmtype { get; set; }
+        /// <summary>
+        /// 
+        /// </summary>
+        [SugarColumn(ColumnName="SysType", ColumnDescription = "",ColumnDataType = "nvarchar(8)", IsNullable = true)]
+        public string SysType { get; set; }
+        /// <summary>
+        /// 
+        /// </summary>
+        [SugarColumn(ColumnName="SysAddress", ColumnDescription = "",ColumnDataType = "nvarchar(64)", IsNullable = true)]
+        public string SysAddress { get; set; }
+    }
+}
diff --git a/HT.Cloud.Service/ChartsManage/HistoryChartsService.cs b/HT.Cloud.Service/ChartsManage/HistoryChartsService.cs
index 71485dc..5a163ef 100644
--- a/HT.Cloud.Service/ChartsManage/HistoryChartsService.cs
+++ b/HT.Cloud.Service/ChartsManage/HistoryChartsService.cs
@@ -52,19 +52,20 @@ namespace HT.Cloud.Service.ChartsManage
 			return subsystems.ToJson();
 		}
 
-		public async Task<string> GetAllSubsystemTag()
+		public async Task<string> GetAllSubsystemTag(string groupDescription)
         {
-            List<SubsysytemNameList> subsystems = new List<SubsysytemNameList>();
-            var grouped = _context.Queryable<MetaTagEntity>().ToList();
-            List<string> list_name_two = grouped.Select(t => t.Subsystem).GroupBy(c => c).Select(c => c.First()).ToList();
-            int i = 0;
-            foreach (var Meta_Tag in list_name_two)
-            {
-                subsystems.Add(new SubsysytemNameList() { Lable = "a" + i, Value = Meta_Tag });
-                i++;
-            }
-            return subsystems.ToJson();
-        }
+			List<SubsysytemNameList> subsystems = new List<SubsysytemNameList>();
+			var groupId = _context.Queryable<MetaGroupEntity>().Where(x => x.GroupDescription == groupDescription).First().GroupID;
+			var grouped = _context.Queryable<MetaTagEntity>().ToList().Where(x => x.GroupID == groupId);
+			List<string> list_name_two = grouped.Select(t => t.Subsystem).GroupBy(c => c).Select(c => c.First()).ToList();
+			int i = 0;
+			foreach (var Meta_Tag in list_name_two)
+			{
+				subsystems.Add(new SubsysytemNameList() { Lable = "a" + i, Value = Meta_Tag });
+				i++;
+			}
+			return subsystems.ToJson();
+		}
 
         public async Task<string> GetSubsystemAllTag(string subsysytemName,string groupDescription)
         {
diff --git a/HT.Cloud.Service/ReportManage/HistoryAlarmService.cs b/HT.Cloud.Service/ReportManage/HistoryAlarmService.cs
new file mode 100644
index 0000000..60350fb
--- /dev/null
+++ b/HT.Cloud.Service/ReportManage/HistoryAlarmService.cs
@@ -0,0 +1,215 @@
+using HT.Cloud.Code;
+using HT.Cloud.Domain.DevicesManage;
+using HT.Cloud.Domain.ReportManage;
+using Quartz;
+using SqlSugar;
+using System;
+using System.Collections.Generic;
+using System.Data;
+using System.Linq;
+using System.Reflection.PortableExecutable;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace HT.Cloud.Service.ReportManage
+{
+    public class HistoryAlarmService : BaseService<HistoryAlarmEntity>, IDenpendency
+    {
+        public HistoryAlarmService(ISqlSugarClient context) : base(context)
+        {
+        }
+		public async Task<string> GetDriverGroupList()
+		{
+
+			//var groupName = _context.Queryable<MetaGroupEntity>().Where(x => x.GroupDescription == systemName).First().GroupName;
+			//var driverId = _context.Queryable<MetaGroupEntity>().Where(x => x.GroupDescription == systemName).First().DriverID;
+			//var driverName = _context.Queryable<MetaDriverEntity>().Where(x => x.DriverID == driverId).First().DriverName;
+            //var list = _context.Ado.SqlQuery<Ht_History_ReportEntity>($"SELECT * FROM HT_{driverName}_{groupName}_ALARM");
+
+            List<GroupNameList> subsystems = new List<GroupNameList>();
+			var list_group = _context.Queryable<MetaGroupEntity>().ToList();
+            int i = 0;
+			foreach (var group in list_group)
+			{
+				subsystems.Add(new GroupNameList() { Lable = "a" + i, Value = group.GroupDescription});
+				i++;
+			}
+			return subsystems.ToJson();
+		}
+		public async Task<string> GetAllSubsystemTag(string systemName)
+        {
+            var groupName = _context.Queryable<MetaGroupEntity>().Where(x => x.GroupDescription == systemName).First().GroupName;
+            var driverId = _context.Queryable<MetaGroupEntity>().Where(x => x.GroupDescription == systemName).First().DriverID;
+            var driverName = _context.Queryable<MetaDriverEntity>().Where(x => x.DriverID == driverId).First().DriverName;
+            var list = _context.Ado.SqlQuery<HistoryAlarmEntity>($"SELECT * FROM HT_{driverName}_{groupName}_ALARM");
+            List<SubsysytemNameList> subsystems = new List<SubsysytemNameList>();
+            //var grouped = repository.IQueryable().ToList();
+            List<string> list_name_two = list.Select(t => t.Subsystem).GroupBy(c => c).Select(c => c.First()).ToList();
+            int i = 0;
+            foreach (var Meta_Tag in list_name_two)
+            {
+                subsystems.Add(new SubsysytemNameList() { Lable = "a" + i, Value = Meta_Tag });
+                i++;
+            }
+            return subsystems.ToJson();
+        }
+        public async Task<string> GetSubsystemAllTag(string subsysytemName, string systemName)
+        {
+			var groupName = _context.Queryable<MetaGroupEntity>().Where(x => x.GroupDescription == systemName).First().GroupName;
+			var driverId = _context.Queryable<MetaGroupEntity>().Where(x => x.GroupDescription == systemName).First().DriverID;
+			var driverName = _context.Queryable<MetaDriverEntity>().Where(x => x.DriverID == driverId).First().DriverName;
+			var list = _context.Ado.SqlQuery<HistoryAlarmEntity>($"SELECT * FROM HT_{driverName}_{groupName}_ALARM");
+
+			var subsysname = subsysytemName;
+            var response = list.Where(x => x.Subsystem == subsysname).Select(x => new { x.TagID, x.Description, x.Units }).ToList();
+            var reList = new List<SubAllTagReturn>();
+            foreach (var subsystem in response)
+            {
+                reList.Add(
+                    new SubAllTagReturn()
+                    {
+                        TagID = (short)subsystem.TagID,
+                        Description = subsystem.Description,
+                        Units = subsystem.Units
+                    }
+                );
+            }
+            return reList.ToJson();
+        }
+
+        public async Task<string> GetAlarmRecord(short tagid, string startdt, string enddt, string systemName)
+        {
+
+            SugarParameter[] sqlParameters =
+            {
+                new SugarParameter("@Henddt",enddt),
+                new SugarParameter("@Hstartdt",startdt),
+                new SugarParameter("@Htagid",tagid)
+
+            };
+            var dt = _context.Ado.UseStoredProcedure().GetDataTable("Query_Tag_Alarm", sqlParameters);
+            var valuelist = DataTableConvertModel<AlarmValue>.ConvertDataTableToList(dt);
+            return valuelist.ToJson();
+
+
+            //         var testdata = new List<AlarmValue>
+            //         {
+            //             new AlarmValue() {
+            //                 Description= "测试标题",
+            //                 StartTime = "08点37分",
+            //                 EndTime = "08点38分"
+            //             },
+            //	new AlarmValue() {
+            //		Description= "测试标题",
+            //		StartTime = "08点37分",
+            //		EndTime = "08点38分"
+            //	},
+            //	new AlarmValue() {
+            //		Description= "测试标题",
+            //		StartTime = "08点37分",
+            //		EndTime = "08点38分"
+            //	},
+            //	new AlarmValue() {
+            //		Description= "测试标题",
+            //		StartTime = "08点37分",
+            //		EndTime = "08点38分"
+            //	}
+            //};
+            //         return testdata.ToJson();
+
+
+
+            //var resultlist = new List<ChartData>();
+            //foreach (var value in valuelist)
+            //{
+            //    resultlist.Add(new ChartData()
+            //    {
+            //        name = value.HDATETIME,
+            //        value = value.VALUE
+            //    });
+            //}
+            //return resultlist.ToJson();
+        }
+
+		public async Task<string> GetAlarmRecordQuick(string HATYPE, string startdt, string enddt, string systemName)
+		{
+
+			SugarParameter[] sqlParameters =
+			{
+				new SugarParameter("@HATYPE",HATYPE),
+				new SugarParameter("@Hstartdt",startdt),
+				new SugarParameter("@Henddt",enddt)
+
+
+			};
+			var dt = _context.Ado.UseStoredProcedure().GetDataTable("Query_Tag_Alarm_Count", sqlParameters);
+			var valuelist = DataTableConvertModel<AlarmValueCount>.ConvertDataTableToList(dt);
+			return valuelist.ToJson();
+
+		}
+		//GetAlarmRecordQuickDesc
+		public async Task<string> GetAlarmRecordQuickDesc(string hhour, string systemName)
+		{
+            int Hhour = int.Parse(hhour);
+			SugarParameter[] sqlParameters =
+			{
+				new SugarParameter("@Hhour",Hhour)
+			};
+			var dt = _context.Ado.UseStoredProcedure().GetDataTable("Query_Tag_Alarm_History", sqlParameters);
+			var valuelist = DataTableConvertModel<AlarmValueCountDesc>.ConvertDataTableToList(dt);
+			return valuelist.ToJson();
+
+		}
+		public async Task<string> GetAlarmSubSystem(string alarmName, string systemName)
+		{
+			var groupName = _context.Queryable<MetaGroupEntity>().Where(x => x.GroupDescription == systemName).First().GroupName;
+			var driverId = _context.Queryable<MetaGroupEntity>().Where(x => x.GroupDescription == systemName).First().DriverID;
+			var driverName = _context.Queryable<MetaDriverEntity>().Where(x => x.DriverID == driverId).First().DriverName;
+			var list = _context.Ado.SqlQuery<HistoryAlarmEntity>($"SELECT * FROM HT_{driverName}_{groupName}_ALARM");
+
+			var subSystem = list.Where(x => x.Description == alarmName).First().Subsystem;
+            return subSystem.ToJson();
+		}
+		private class AlarmValueCount
+		{
+            public string Alarmtype { get; set; }
+			public string Description { get; set; }
+			public int hcount { get; set; }
+			public int hztime { get; set; }
+		}
+		private class AlarmValueCountDesc
+		{
+			public string Tagname { get; set; }
+			public string Description { get; set; }
+			public string Alarmtype { get; set; }
+			public string Typename { get; set; }
+			public string Startdt { get; set; }
+			public string Enddt { get; set; }
+			public int Hztime { get; set; }
+		}
+		private class AlarmValue
+        {
+            public string Description { get; set; }
+            public string startdt { get; set; }
+            public string enddt { get; set; }
+            public int Hztime { get; set; }
+		}
+        private class SubsysytemNameList
+        {
+            public string Lable { get; set; }
+            public string Value { get; set; }
+        }
+		private class GroupNameList
+		{
+			public string Lable { get; set; }
+			public string Value { get; set; }
+		}
+		private class SubAllTagReturn
+        {
+            //x.TagID, x.Description, x.Units
+            public short TagID { get; set; }
+            public string Description { get; set; }
+            public string Units { get; set; }
+        }
+    }
+}
diff --git a/HT.Cloud.Web/Areas/ChartsManage/Controllers/HistoryChartsController.cs b/HT.Cloud.Web/Areas/ChartsManage/Controllers/HistoryChartsController.cs
index 30df69b..228b092 100644
--- a/HT.Cloud.Web/Areas/ChartsManage/Controllers/HistoryChartsController.cs
+++ b/HT.Cloud.Web/Areas/ChartsManage/Controllers/HistoryChartsController.cs
@@ -33,24 +33,27 @@ namespace HT.Cloud.Web.Areas.ChartsManage.Controllers
 			return Content(data);
 		}
 		[HttpPost] 
-		public async Task<ActionResult> GetGroupSubsystemTag(ChartGroupDescription chartGroupDescription)
+		public async Task<ActionResult> GetGroupSubsystemTag(string systemName)
 		{
 
-			var data = await _historyChartsService.GetGroupSubsystemTag(chartGroupDescription.GroupDescription);
+			var data = await _historyChartsService.GetGroupSubsystemTag(systemName);
 			return Content(data);
 		}
 		[HttpGet]
         public async Task<ActionResult> GetAllSubsystemTag()
         {
-            
-            var data = await _historyChartsService.GetAllSubsystemTag();
+			string systemName = "制粉系统";
+
+			var data = await _historyChartsService.GetAllSubsystemTag(systemName);
             return Content(data);
         }
 
         [HttpPost]
-        public async Task<ActionResult> GetSubsystemAllTag(ChartSubsysytemName chartSubsysytemName)
-        {
-            var data = await _historyChartsService.GetSubsystemAllTag(chartSubsysytemName.SubsysytemName, chartSubsysytemName.GroupDescription);
+        public async Task<ActionResult> GetSubsystemAllTag(string SubsysytemName)
+		{
+            string systemName = "制粉系统";
+
+			var data = await _historyChartsService.GetSubsystemAllTag(SubsysytemName, systemName);
             return Content(data);
         }
 
diff --git a/HT.Cloud.Web/Areas/ChartsManage/Views/HistoryCharts/Index.cshtml b/HT.Cloud.Web/Areas/ChartsManage/Views/HistoryCharts/Index.cshtml
index 99a18e9..8bfab0a 100644
--- a/HT.Cloud.Web/Areas/ChartsManage/Views/HistoryCharts/Index.cshtml
+++ b/HT.Cloud.Web/Areas/ChartsManage/Views/HistoryCharts/Index.cshtml
@@ -312,9 +312,9 @@
 			} else { }
 		});
 
-		GetDriverGroupList();
+		//GetDriverGroupList();
 
-		//GetAllSubsystemTag();
+		GetAllSubsystemTag();
 
         var starttime = new Date(new Date().setHours(0, 0, 0, 0));
         var starttimeString = starttime.getFullYear() + "-" + parseInt(starttime.getMonth() + 1) + "-" + starttime.getDate() + " " + (starttime.getHours()) + ":" + starttime.getMinutes() + ":" + starttime.getSeconds();
@@ -388,55 +388,55 @@
 
 		var StaticSelectTagList = new Array();
 		//获取所有变量组
-		async function GetDriverGroupList() {
-			debugger;
-			$.ajax({
-				url: "/ChartsManage/HistoryCharts/GetDriverGroupList",
-				type: "Get",
-				success: function (redata) {
-					debugger;
-					var listsubsysname = JSON.parse(redata);
-					$('#groupselect').combobox({
-						data: listsubsysname,
-						valueField: 'Lable',
-						textField: 'Value',
-						value :'请选择系统',
-						checkOnSelect: true,
-						selectOnCheck: true
-					});
-					$('#subsystemselect').combobox({
+		//async function GetDriverGroupList() {
+		//	debugger;
+		//	$.ajax({
+		//		url: "/ChartsManage/HistoryCharts/GetDriverGroupList",
+		//		type: "Get",
+		//		success: function (redata) {
+		//			debugger;
+		//			var listsubsysname = JSON.parse(redata);
+		//			$('#groupselect').combobox({
+		//				data: listsubsysname,
+		//				valueField: 'Lable',
+		//				textField: 'Value',
+		//				value :'请选择系统',
+		//				checkOnSelect: true,
+		//				selectOnCheck: true
+		//			});
+		//			$('#subsystemselect').combobox({
 						
-						value: '请先选择系统',
-					});
-				}
-			});
-		}
-		var StaticGroupDescription = "";
-		updateGroupSelect = async function (data) {
-			StaticGroupDescription = data.Value;
-			var para = { "GroupDescription": data.Value }
-			//var subsystemAllTag = await Call(api.DataHistoryCharts.GetSubsystemAllTag, para);
-			debugger;
-			$.ajax({
-				url: "/ChartsManage/HistoryCharts/GetGroupSubsystemTag",
-				type: "Post",
-				//dataType: "json",
-				data: para,
-				success: function (redata) { 
-					var listsubsysname = JSON.parse(redata);
-					$('#subsystemselect').combobox({
-						data: listsubsysname,
-						valueField: 'Lable',
-						textField: 'Value',
-						value: '请选择子系统',
-						checkOnSelect: true,
-						selectOnCheck: true
-					});
-				}
-			});
+		//				value: '请先选择系统',
+		//			});
+		//		}
+		//	});
+		//}
+		//var StaticGroupDescription = "";
+		//updateGroupSelect = async function (data) {
+		//	StaticGroupDescription = data.Value;
+		//	var para = { "GroupDescription": data.Value }
+		//	//var subsystemAllTag = await Call(api.DataHistoryCharts.GetSubsystemAllTag, para);
+		//	debugger;
+		//	$.ajax({
+		//		url: "/ChartsManage/HistoryCharts/GetGroupSubsystemTag",
+		//		type: "Post",
+		//		//dataType: "json",
+		//		data: para,
+		//		success: function (redata) { 
+		//			var listsubsysname = JSON.parse(redata);
+		//			$('#subsystemselect').combobox({
+		//				data: listsubsysname,
+		//				valueField: 'Lable',
+		//				textField: 'Value',
+		//				value: '请选择子系统',
+		//				checkOnSelect: true,
+		//				selectOnCheck: true
+		//			});
+		//		}
+		//	});
 			
 
-		}
+		//}
 		//获取所有子系统列表ok 废弃
 		async function GetAllSubsystemTag() {
 			debugger;
@@ -463,7 +463,7 @@
 		//获取选中子系统tag
 		updateSelect = async function (data) {
 			//var groupDescription = ('#groupselect').combobox().getValue();
-			var para = { "GroupDescription": StaticGroupDescription, "SubsysytemName": data.Value }
+			var para = { /*"GroupDescription": StaticGroupDescription,*/ "SubsysytemName": data.Value }
 			//var subsystemAllTag = await Call(api.DataHistoryCharts.GetSubsystemAllTag, para);
 			debugger;
 			myajax = $.ajax({
@@ -825,8 +825,8 @@
 					@*<ul id="dataTree" class="dtree" data-id="0"></ul>*@
 					<div id="aleft" style="float:left;width:100%;height:100%">
 						<div class="easyui-panel" title="选择设备信息" style="width:100%;height:100%">
-							<div class="easyui-combobox" id="groupselect" name="group" data-options="onSelect:function(rec){updateGroupSelect(rec)}" style="width:100%;height:40px">
-							</div>
+							@*<div class="easyui-combobox" id="groupselect" name="group" data-options="onSelect:function(rec){updateGroupSelect(rec)}" style="width:100%;height:40px">
+							</div>*@
 							<div class="easyui-combobox" id="subsystemselect" name="state" data-options="onSelect:function(rec){updateSelect(rec)}" style="width:100%;height:40px">
 							</div>
 							<div class="easyui-datalist" id="subsystemTagList" title="变量列表" style="position: relative;width:100%;height:auto;overflow:auto;" data-options="
diff --git a/HT.Cloud.Web/Areas/PenMeiChartsManage/Controllers/PenMeiHistoryChartsController.cs b/HT.Cloud.Web/Areas/PenMeiChartsManage/Controllers/PenMeiHistoryChartsController.cs
index ada36c2..dc1934c 100644
--- a/HT.Cloud.Web/Areas/PenMeiChartsManage/Controllers/PenMeiHistoryChartsController.cs
+++ b/HT.Cloud.Web/Areas/PenMeiChartsManage/Controllers/PenMeiHistoryChartsController.cs
@@ -42,15 +42,16 @@ namespace HT.Cloud.Web.Areas.ChartsManage.Controllers
 		[HttpGet]
         public async Task<ActionResult> GetAllSubsystemTag()
         {
-            
-            var data = await _historyChartsService.GetAllSubsystemTag();
+			string systemName = "喷煤系统";
+			var data = await _historyChartsService.GetAllSubsystemTag(systemName);
             return Content(data);
         }
 
         [HttpPost]
-        public async Task<ActionResult> GetSubsystemAllTag(ChartSubsysytemName chartSubsysytemName)
+        public async Task<ActionResult> GetSubsystemAllTag(string SubsysytemName)
         {
-            var data = await _historyChartsService.GetSubsystemAllTag(chartSubsysytemName.SubsysytemName, chartSubsysytemName.GroupDescription);
+			string systemName = "喷煤系统";
+			var data = await _historyChartsService.GetSubsystemAllTag(SubsysytemName, systemName);
             return Content(data);
         }
 
diff --git a/HT.Cloud.Web/Areas/PenMeiChartsManage/Views/PenMeiHistoryCharts/Index.cshtml b/HT.Cloud.Web/Areas/PenMeiChartsManage/Views/PenMeiHistoryCharts/Index.cshtml
index 99a18e9..866536e 100644
--- a/HT.Cloud.Web/Areas/PenMeiChartsManage/Views/PenMeiHistoryCharts/Index.cshtml
+++ b/HT.Cloud.Web/Areas/PenMeiChartsManage/Views/PenMeiHistoryCharts/Index.cshtml
@@ -625,10 +625,10 @@
 						// min: 0,
 						// 让表格的刻度向靠里侧显示
 						axisTick: {
-							inside: true
+							inside: false
 						},
 						axisLabel: {
-							inside: true,
+							inside: false,
 							align: 'left',
 							verticalAlign: 'bottom',
 						},
diff --git a/HT.Cloud.Web/Areas/PenMeiChartsManage/Views/PenMeiHistoryTechCharts/Index.cshtml b/HT.Cloud.Web/Areas/PenMeiChartsManage/Views/PenMeiHistoryTechCharts/Index.cshtml
index eefdbf5..1bfcbeb 100644
--- a/HT.Cloud.Web/Areas/PenMeiChartsManage/Views/PenMeiHistoryTechCharts/Index.cshtml
+++ b/HT.Cloud.Web/Areas/PenMeiChartsManage/Views/PenMeiHistoryTechCharts/Index.cshtml
@@ -532,7 +532,12 @@
 			return chardatalist;
 		}
 
-		
+		//true
+		//false
+		//第一条Y轴是否显示轴线
+		const oneAxisLineShow = true;
+		//其他Y轴是否显示轴线
+		const otherAxisLineShow = false;
 
 		showchart = async function () {
 			//(document.getElementById('echarts-records'), 'walden');
@@ -562,9 +567,21 @@
 
 			var xDataArr = new Array();
 			var yDataArr = new Array();
+			var maxArr = new Array();
+			var minArr = new Array();
+			var intervalArr = new Array();
 			for (var listindex = 0; listindex < chardatalist.length; listindex++) {
 				let ydata = chardatalist[listindex].map(x => { return x.value });
 				let xdata = chardatalist[listindex].map(x => { return x.name });
+				debugger;
+				let maxSrc = Math.max.apply(null, ydata); 
+				let newMax = Math.ceil(maxSrc / 5) * 5;
+				maxArr.push(newMax);
+				let minSrc = Math.min.apply(null, ydata);
+				let newMin = Math.floor(minSrc / 5) * 5
+				minArr.push(newMin);
+				let interval = (newMax - newMin) / 5
+				intervalArr.push(interval);
 				xDataArr.push(xdata);
 				yDataArr.push(ydata);
 			}
@@ -591,32 +608,37 @@
 					let yAxisdata = {
 						name: JSON.parse(JSON.stringify(unitnames[ci])),
 						nameLocation: 'center',
+						nameGap:5,
+						nameRotate:270,
+						max: maxArr[ci],
+						min: minArr[ci],
+						interval: intervalArr[ci],
+						//splitNumber:21,
 						type: 'value',
 						//position:'left',
 						//坐标轴两边留白策略，设置max、min后失效
 						boundaryGap: ['5%', '2%'],
-						// max: 700,
-						// min: 0,
 						// 让表格的刻度向靠里侧显示
 						axisTick: {
 							show: true,
-							inside: true
+							inside: false,
+							length: 9,
 						},
 						minorTick:{
 							show:true,
-							length: 7,
+							length: 5,
 						},
 						minorSplitLine: {
 							show: true,
 						},
 						axisLabel: {
-							inside: true,
-							align: 'left',
+							inside: false,
+							align: 'right',
 							verticalAlign: 'bottom',
 						},
 						// 设置刻度线的颜色等样式
 						axisLine: {
-							show: true,
+							show: oneAxisLineShow,
 							onZero: true,
 							onZeroAxisIndex:0,
 							lineStyle: {
@@ -641,8 +663,12 @@
 					let yAxisdata = {
 						name: JSON.parse(JSON.stringify(unitnames[ci])),
 						nameLocation: 'center',
-						// max: 800,
-						// min: 0,
+						nameGap: 5,
+						nameRotate: 270,
+						max: maxArr[ci],
+						min: minArr[ci],
+						interval: intervalArr[ci],
+						//splitNumber: 21,
 						type: 'value',
 						position: 'left',
 						//坐标轴两边留白策略，设置max、min后失效
@@ -650,22 +676,23 @@
 						//alignTicks:true,
 						axisTick: {
 							show:true,
-							inside: true
-						},
-						minorTick: {
-							show: true,
-							length: 7,
+							inside: false,
+							length: 9,
 						},
+						//minorTick: {
+						//	show: true,
+						//	length: 5,
+						//},
 						minorSplitLine:{
 							show:true,
 						},
 						axisLabel: {
-							inside: true,
-							align: 'left',
+							inside: false,
+							align: 'right',
 							verticalAlign: 'bottom',
 						},
 						axisLine: {
-							show: true,
+							show: otherAxisLineShow,
 							onZero: false,
 							lineStyle: {
 								//color: color[ci],
@@ -674,7 +701,7 @@
 							}
 						},
 						splitLine: {
-							show: false //想要不显示网格线，改为false
+							show: true //想要不显示网格线，改为false
 						},
 						// 设置坐标轴偏移位置
 						offset: (ci) * 40
@@ -919,6 +946,7 @@
 <body style="height:100%">
 
 	<script type="text/javascript" src="~/lib/echarts-5.3.0/dist/echarts.js"></script>
+	
 	<div class="layui-fluid" style="padding:0 0px;height:100%">
 		<div class="layui-row layui-col-space5" style="height:100%">
 			<div class="layui-col-md2 layui-col-xs3" style="height:100%;padding-right:12px;">
diff --git a/HT.Cloud.Web/Areas/PenMeiChartsManage/Views/PenMeiRtTechCharts/Index.cshtml b/HT.Cloud.Web/Areas/PenMeiChartsManage/Views/PenMeiRtTechCharts/Index.cshtml
index b0b04b9..8587ddf 100644
--- a/HT.Cloud.Web/Areas/PenMeiChartsManage/Views/PenMeiRtTechCharts/Index.cshtml
+++ b/HT.Cloud.Web/Areas/PenMeiChartsManage/Views/PenMeiRtTechCharts/Index.cshtml
@@ -969,7 +969,30 @@
 					yAxis.push(yAxisdata);
 				}
 			}
-
+			/*
+			*一
+			1、复用制粉趋势界面源码建立喷煤趋势界面。
+			2、改进趋势图的曲线颜色设定，按照单位分类，相同单位变量绑定同一色系。
+			3、曲线对应Y轴数量合并，根据单词选择变量中单位类型数量，生成对应单位的轴。
+			4、修改补充冀南钢铁喷煤制粉技术方案。
+			*二
+			1、增加顶部趋势图列显示，对应变量和曲线颜色，点击可显示和隐藏曲线。
+			2、增加趋势鼠标滚轮放大功能，在趋势上滚动滚轮对应缩短和增加时间跨度。
+			3、增加拖拽功能，在缩小时间跨度后，左键拖拽左右平移时间轴。
+			4、喷煤趋势后台控制器和数据服务重新构建，按照多系统方式，可查配置变量模板和多系统部署时不同数据。
+			5、协助水分仪上位机微波趋势显示修改，加大Y轴水分值量程，增加X轴时间跨度。
+			*三
+			1、根据曲工的喷煤趋势模板表，自动生成历史趋势界面变量选择项，拆分速率相关变量和重要参数变量。
+			2、调用曲工查询过程，构建选择变量列表依次查询数据，绑定至对应曲线和对应坐标轴。
+			3、构建趋势chart的容器、X轴、Y轴、变量曲线实例、图例、颜色数组、鼠标提示框，组合生成趋势。
+			*四
+			1、套用实时趋势的界面、前端JS、后端控制器、服务等实现代码，复用至喷煤实时趋势并制作该界面。
+			2、接入采集服务的实时数据库，设置实时趋势初始化时记录三秒钟实时数据来进行实时趋势初始化。
+			*五
+			1、生成喷煤趋势变量随机数通过采集服务Api写入300cpu中，用来模拟实时趋势。
+			2、添加趋势刷新方法，按周期刷新趋势数据。
+			3、构建实时趋势，设置曲线数据从采集服务中的实时数据中每秒增加数据，最大数据量50个。
+			*/
 
 			//for (var ci = 0; ci < StaticSelectTagList.length; ci++) {
 			//	if (ci == 0) {
diff --git a/HT.Cloud.Web/Areas/PenMeiReportManage/Controllers/PenMeiHistoryAlarmController.cs b/HT.Cloud.Web/Areas/PenMeiReportManage/Controllers/PenMeiHistoryAlarmController.cs
new file mode 100644
index 0000000..ca8ebd8
--- /dev/null
+++ b/HT.Cloud.Web/Areas/PenMeiReportManage/Controllers/PenMeiHistoryAlarmController.cs
@@ -0,0 +1,154 @@
+using System;
+using System.Linq;
+using System.Threading.Tasks;
+using System.Collections.Generic;
+using Microsoft.AspNetCore.Mvc;
+using HT.Cloud.Code;
+using HT.Cloud.Domain.ChartsManage;
+using HT.Cloud.Service;
+using Microsoft.AspNetCore.Authorization;
+using HT.Cloud.Service.ChartsManage;
+using HT.Cloud.Service.ReportManage;
+using Serenity.Services;
+
+namespace HT.Cloud.Web.Areas.ReportManage.Controllers
+{
+    /// <summary>
+    /// 创 建：cdl
+    /// 日 期：2023-02-23 11:10
+    /// 描 述：历史趋势控制器类
+    /// </summary>
+    [Area("PenMeiReportManage")]
+    public class PenMeiHistoryAlarmController :  BaseController
+    {
+        public HistoryAlarmService _historyAlarmService { get;set;}
+
+		[HttpGet]
+		public async Task<ActionResult> GetDriverGroupList()
+		{
+			var data = await _historyAlarmService.GetDriverGroupList();
+			return Content(data);
+		}
+
+		[HttpGet]
+        public async Task<ActionResult> GetAllSubsystemTag()
+        {
+            string systemName = "喷煤系统";
+
+			var data = await _historyAlarmService.GetAllSubsystemTag(systemName);
+            return Content(data);
+        }
+
+        [HttpPost]
+        public async Task<ActionResult> GetSubsystemAllTag(ChartSubsysytemName chartSubsysytemName)
+        {
+			string systemName = "喷煤系统";
+
+			var data = await _historyAlarmService.GetSubsystemAllTag(chartSubsysytemName.SubsysytemName, systemName);
+            return Content(data);
+        }
+
+        [HttpPost]
+        public async Task<ActionResult> GetAlarmRecord(Alarm_Params charts_Params)
+        {
+			string systemName = "喷煤系统";
+
+			short TagID = short.Parse(charts_Params.TagID);
+            var StartTime = Gettime(charts_Params.StartTime);
+            var EndTime = Gettime(charts_Params.EndTime);
+
+            var data = await _historyAlarmService.GetAlarmRecord(TagID, StartTime, EndTime, systemName);
+            return Content(data);
+        }
+		[HttpPost]
+		public async Task<ActionResult> GetAlarmRecordQuick(Alarm_Quick_Params alarm_Quick_Params)
+		{
+			string systemName = "喷煤系统";
+
+			var Alarmtype = alarm_Quick_Params.Alarmtype;
+			var StartTime = Gettime(alarm_Quick_Params.StartTime);
+			var EndTime = Gettime(alarm_Quick_Params.EndTime);
+
+			var data = await _historyAlarmService.GetAlarmRecordQuick(Alarmtype, StartTime, EndTime, systemName);
+			return Content(data);
+		}
+		[HttpPost]
+		public async Task<ActionResult> GetAlarmRecordQuickDesc(Alarm_Quick_Desc_Params alarm_Quick_Desc_Params)
+		{
+			string systemName = "喷煤系统";
+
+			var hhour = alarm_Quick_Desc_Params.Hhour;
+
+			var data = await _historyAlarmService.GetAlarmRecordQuickDesc(hhour, systemName);
+			return Content(data);
+		}
+		[HttpPost]
+        public async Task<ActionResult> GetAlarmSubSystem(SubSystem_Params subSystem_Params)
+        {
+			string systemName = "喷煤系统";
+
+			var AlarmName = subSystem_Params.AlarmName;
+			var data = await _historyAlarmService.GetAlarmSubSystem(AlarmName,systemName);
+			return Content(data);
+		}
+
+		public string Gettime(string longtime)
+        {
+            long jsTimeStamp = long.Parse(longtime);
+            System.DateTime startTime = TimeZone.CurrentTimeZone.ToLocalTime(new System.DateTime(1970, 1, 1)); // 当地时区
+            DateTime dt = startTime.AddMilliseconds(jsTimeStamp);
+            return (dt.ToString("yyyy/MM/dd HH:mm:ss"));
+        }
+
+        //public class SubAllTagReturn
+        //{
+        //    //x.TagID, x.Description, x.Units
+        //    public short TagID { get; set; }
+        //    public string Description { get; set; }
+        //    public string Units { get; set; }
+        //}
+
+        //public class SubsysytemNameList
+        //{
+        //    public string Lable { get; set; }
+        //    public string Value { get; set; }
+        //}
+
+        public class ChartSubsysytemName
+        {
+            public string SubsysytemName { get; set; }
+        }
+
+		//public class HDATETIMEVALUE
+		//{
+		//    public String HDATETIME { get; set; }
+		//    public decimal VALUE { get; set; }
+		//}
+		//public class ChartData
+		//{
+		//    public decimal value { get; set; }
+		//    public String name { get; set; }
+		//}
+		public class SubSystem_Params
+		{
+			public string AlarmName { get; set; }
+		}
+		public class Alarm_Params
+        {
+            public string TagID { get; set; }
+            public string StartTime { get; set; }
+            public string EndTime { get; set; }
+        }
+		public class Alarm_Quick_Params
+		{
+			public string Alarmtype { get; set; }
+			public string StartTime { get; set; }
+			public string EndTime { get; set; }
+		}
+		public class Alarm_Quick_Desc_Params
+		{
+			public string Hhour { get; set; }
+		}
+
+	}
+}
diff --git a/HT.Cloud.Web/Areas/PenMeiReportManage/Views/PenMeiHistoryAlarm/Index.cshtml b/HT.Cloud.Web/Areas/PenMeiReportManage/Views/PenMeiHistoryAlarm/Index.cshtml
new file mode 100644
index 0000000..9ab7298
--- /dev/null
+++ b/HT.Cloud.Web/Areas/PenMeiReportManage/Views/PenMeiHistoryAlarm/Index.cshtml
@@ -0,0 +1,1505 @@
+@{
+    ViewBag.Title = "Index";
+    Layout = "~/Views/Shared/_Index.cshtml";
+}
+<style>
+
+    .layui-table-tool > .layui-table-tool-temp {
+        padding-right: 0px;
+    }
+</style>
+<script>
+	debugger;
+	var firstInit = true;
+    layui.use(['jquery', 'form', 'table', 'element', 'common', 'dtree', 'commonTable', 'optimizeSelectOption'], function () {
+        var $ = layui.jquery,
+            form = layui.form,
+			element = layui.element,
+            commonTable = layui.commonTable,
+            table = layui.table,
+            dtree = layui.dtree,
+			//echarts = layui.echarts,
+            common = layui.common;
+        //加载数据
+        wcLoading.close();
+		
+        //权限控制(js是值传递)
+        //toolbarDemo.innerHTML = common.authorizeButtonNew(toolbarDemo.innerHTML);
+
+
+
+		element.render();
+		element.on('tab(Chang)',function(data){
+			if(firstInit){
+				debugger;
+				$.parser.parse('#toolbarDiv');
+				firstInit = false;
+			}
+			//debugger;
+			//console.log(data);
+			//$.parser.parse('#toolbarDiv');
+			//$('#subsystemselect').combobox('resize');
+			//$('#subsystemTagList').datalist('resize', {
+			//	height: ($('#aright').height() - 75)
+			//});
+		});
+		
+		//var argumentFormSiemens = document.getElementById('recentMd');
+		//argumentFormSiemens.style.display = 'block';
+		//var argumentFormSiemens = document.getElementById('classifyMd');
+		//argumentFormSiemens.style.display = 'none';
+
+		form.on('select(quickTime)', function (data) {
+			var selectValue = data.value;
+
+			function getFormatDate(date) {
+				let year = date.getFullYear();
+				let month = date.getMonth() + 1;
+				let day = date.getDate();
+				let hour = date.getHours();
+				let minutes = date.getMinutes();
+				let seconds = date.getSeconds();
+				month = (month < 10) ? '0' + month : month;
+				day = (day < 10) ? '0' + day : day;
+				hour = (hour < 10) ? '0' + hour : hour;
+				minutes = (minutes < 10) ? '0' + minutes : minutes;
+				seconds = (seconds < 10) ? '0' + seconds : seconds;
+				let currentDate = year + "-" + month + "-" + day
+					+ " " + hour + ":" + minutes + ":" + seconds;
+				return currentDate;
+			}
+			/**
+			* 获取今日零点时间戳
+			* returns {number}
+			*/
+			function todayStartTimestamp() {
+				const timestamp = Math.floor(new Date(new Date().setHours(0, 0, 0, 0)).getTime() / 1000)
+				return timestamp
+			}
+			/**
+			* 获取昨日开始、结束时间戳
+			* param num
+			* returns {number[昨日开始时间戳, 昨日结束时间戳]}
+			*/
+			function yesterdayTimestamp(num = 1) {
+				const MillisecondsADay = 24 * 60 * 60 * num
+				//  今日零点时间戳
+				const timestamp = Math.floor(new Date(new Date().setHours(0, 0, 0, 0)).getTime() / 1000)
+				// 昨日开始时间戳
+				const yesterdayStartTime = timestamp - MillisecondsADay
+				// 昨日结束时间戳
+				const yesterdayEndTime = timestamp - 1
+				return [yesterdayStartTime, yesterdayEndTime]
+			}
+			/**
+			* 本周开始时间戳
+			* returns {number}
+			*/
+			function weekStartTimestamp() {
+				//  一天的秒数
+				const MillisecondsADay = 24 * 60 * 60
+				//  今日零点时间戳
+				const timestamp = Math.floor(new Date(new Date().setHours(0, 0, 0, 0)).getTime() / 1000)
+				const weekDay = new Date().getDay() === 0 ? (7 - 1) : (new Date().getDay() - 1)
+				const weekTimeStamp = timestamp - MillisecondsADay * weekDay
+				return weekTimeStamp
+			}
+			/**
+			* 上周开始、结束时间戳
+			* returns {number[上周开始时间戳, 上周结束时间戳]}
+			*/
+			function lastWeekTimetamp() {
+				//  一天的秒数
+				const MillisecondsADay = 24 * 60 * 60
+				//  今日零点时间戳
+				const timestamp = Math.floor(new Date(new Date().setHours(0, 0, 0, 0)).getTime() / 1000)
+				const weekDay = new Date().getDay() === 0 ? (7 - 1) : (new Date().getDay() - 1)
+				//  本周开始时间戳
+				const weekTimeStamp = timestamp - MillisecondsADay * weekDay
+				//  上周开始时间戳
+				const lastWeekStart = weekTimeStamp - MillisecondsADay * 7
+				//  上周结束时间戳
+				const lastWeekEnd = weekTimeStamp - 1
+				return [lastWeekStart, lastWeekEnd]
+			}
+
+			/**
+			* 当月开始时间戳
+			* returns {number}
+			*/
+			function monthStartTimestamp() {
+				const date = new Date()
+				date.setDate(1)
+				date.setHours(0, 0, 0, 0)
+				const timeStamp = date.getTime() / 1000
+				return timeStamp
+			}
+			/**
+			* 获取上月开始、结束时间戳
+			* returns {number[上月开始时间戳，上月结束时间戳]}
+			*/
+			function lastMonthTimetamp() {
+				//  一天的秒数
+				const MillisecondsADay = 24 * 60 * 60
+
+				const date = new Date()
+				date.setDate(1)
+				date.setHours(0, 0, 0, 0)
+				//  当月开始时间戳
+				const timeStamp = date.getTime() / 1000
+				//  上个月的天数
+				const days = lastMonthDats()
+				//  上月开始时间戳
+				const lastMonthStart = timeStamp - (MillisecondsADay * days)
+				//  上月结束时间戳
+				const lastMonthEnd = timeStamp - 1
+				return [lastMonthStart, lastMonthEnd]
+			}
+			/**
+			 * 上月天数
+			 * returns {number}
+			 */
+			function lastMonthDats() {
+				const date = new Date()
+				const year = date.getFullYear()
+				//  上个月月份
+				let month = (date.getMonth() + 1) - 1 //  0-11 表示 1月-12月
+				//  0 表示12月
+				month = month || 12
+				//  30天的月份
+				const arr30 = [4, 6, 9, 11]
+				//  31天的月份
+				const arr31 = [1, 3, 5, 7, 8, 10, 12]
+				if (arr30.indexOf(month) !== -1) {
+					//  上个月是 30 天
+					return 30
+				} else if (arr31.indexOf(month) !== -1) {
+					//  上个月是 31 天
+					return 31
+				} else {
+					//  2月
+					if (isRunYear(year)) {
+						return 29
+					} else {
+						return 28
+					}
+				}
+			}
+			/**
+			 * 是否为闰年
+			 * param year
+			 * returns {boolean}
+			 */
+			function isRunYear(year) {
+				//  条件:能被4整除并且不能被100整除，或者被400整除的
+				let flag = false
+				if (year % 4 === 0 && year % 100 !== 0 || year % 400 === 0) {
+					flag = true
+				}
+				return flag
+			}
+
+			var laydate = layui.laydate;
+			if (selectValue == "toDay") {
+				var toDayStartDate = todayStartTimestamp();
+				var timef1 = getFormatDate(new Date(toDayStartDate * 1000));
+				lay('#dateReStartTime').each(function () {
+					laydate.render({
+						elem: this,
+						trigger: 'click',
+						format: "yyyy-MM-dd HH:mm:ss",
+						//value: "2023-02-23 13:56:25",
+						value: timef1,
+					});
+				});
+				var timef2 = getFormatDate(new Date(Date.now()));
+				lay('#dateReEndTime').each(function () {
+					laydate.render({
+						elem: this,
+						trigger: 'click',
+						format: "yyyy-MM-dd HH:mm:ss",
+						//value: "2023-02-23 13:56:25",
+						value: timef2,
+					});
+				});
+			} else if (selectValue == "yesterDay") {
+				var yesterDayDate = yesterdayTimestamp(1);
+				var timef1 = getFormatDate(new Date(yesterDayDate[0] * 1000));
+				lay('#dateReStartTime').each(function () {
+					laydate.render({
+						elem: this,
+						trigger: 'click',
+						format: "yyyy-MM-dd HH:mm:ss",
+						//value: "2023-02-23 13:56:25",
+						value: timef1,
+					});
+				});
+				var timef2 = getFormatDate(new Date(yesterDayDate[1] * 1000));
+				lay('#dateReEndTime').each(function () {
+					laydate.render({
+						elem: this,
+						trigger: 'click',
+						format: "yyyy-MM-dd HH:mm:ss",
+						//value: "2023-02-23 13:56:25",
+						value: timef2,
+					});
+				});
+			} else if (selectValue == "thisWeek") {
+				var weekStartDate = weekStartTimestamp();
+				var timef1 = getFormatDate(new Date(weekStartDate * 1000));
+				lay('#dateReStartTime').each(function () {
+					laydate.render({
+						elem: this,
+						trigger: 'click',
+						format: "yyyy-MM-dd HH:mm:ss",
+						//value: "2023-02-23 13:56:25",
+						value: timef1,
+					});
+				});
+				var timef2 = getFormatDate(new Date(Date.now()));
+				lay('#dateReEndTime').each(function () {
+					laydate.render({
+						elem: this,
+						trigger: 'click',
+						format: "yyyy-MM-dd HH:mm:ss",
+						//value: "2023-02-23 13:56:25",
+						value: timef2,
+					});
+				});
+
+			} else if (selectValue == "lastWeek") {
+				var lastWeekDate = lastWeekTimetamp();
+				var timef1 = getFormatDate(new Date(lastWeekDate[0] * 1000));
+				lay('#dateReStartTime').each(function () {
+					laydate.render({
+						elem: this,
+						trigger: 'click',
+						format: "yyyy-MM-dd HH:mm:ss",
+						//value: "2023-02-23 13:56:25",
+						value: timef1,
+					});
+				});
+				var timef2 = getFormatDate(new Date(lastWeekDate[1] * 1000));
+				lay('#dateReEndTime').each(function () {
+					laydate.render({
+						elem: this,
+						trigger: 'click',
+						format: "yyyy-MM-dd HH:mm:ss",
+						//value: "2023-02-23 13:56:25",
+						value: timef2,
+					});
+				});
+			} else if (selectValue == "thisMonth") {
+				var monthStartDate = monthStartTimestamp();
+				var timef = getFormatDate(new Date(monthStartDate * 1000));
+				lay('#dateReStartTime').each(function () {
+					laydate.render({
+						elem: this,
+						trigger: 'click',
+						format: "yyyy-MM-dd HH:mm:ss",
+						//value: "2023-02-23 13:56:25",
+						value: timef,
+					});
+				});
+				var timef2 = getFormatDate(new Date(Date.now()));
+				lay('#dateReEndTime').each(function () {
+					laydate.render({
+						elem: this,
+						trigger: 'click',
+						format: "yyyy-MM-dd HH:mm:ss",
+						//value: "2023-02-23 13:56:25",
+						value: timef2,
+					});
+				});
+
+			} else if (selectValue == "lastMonth") {
+				//lastMonthTimetamp()
+				var lastMonthDate = lastMonthTimetamp();
+				var timef1 = getFormatDate(new Date(lastMonthDate[0] * 1000));
+				lay('#dateReStartTime').each(function () {
+					laydate.render({
+						elem: this,
+						trigger: 'click',
+						format: "yyyy-MM-dd HH:mm:ss",
+						//value: "2023-02-23 13:56:25",
+						value: timef1,
+					});
+				});
+				var timef2 = getFormatDate(new Date(lastMonthDate[1] * 1000));
+				lay('#dateReEndTime').each(function () {
+					laydate.render({
+						elem: this,
+						trigger: 'click',
+						format: "yyyy-MM-dd HH:mm:ss",
+						//value: "2023-02-23 13:56:25",
+						value: timef2,
+					});
+				});
+			} else { }
+		});
+		//form.on('select(quickType)', function (data) {
+		//	var selectValue = data.value;
+
+		//	if (selectValue == 'recent'){
+		//		var argumentFormSiemens = document.getElementById('recentMd');
+		//		argumentFormSiemens.style.display = 'block';
+		//		var argumentFormSiemens = document.getElementById('classifyMd');
+		//		argumentFormSiemens.style.display = 'none';
+		//	}else{
+		//		var argumentFormSiemens = document.getElementById('recentMd');
+		//		argumentFormSiemens.style.display = 'none';
+		//		var argumentFormSiemens = document.getElementById('classifyMd');
+		//		argumentFormSiemens.style.display = 'block';
+		//	}
+
+		//	function getFormatDate(date) {
+		//		let year = date.getFullYear();
+		//		let month = date.getMonth() + 1;
+		//		let day = date.getDate();
+		//		let hour = date.getHours();
+		//		let minutes = date.getMinutes();
+		//		let seconds = date.getSeconds();
+		//		month = (month < 10) ? '0' + month : month;
+		//		day = (day < 10) ? '0' + day : day;
+		//		hour = (hour < 10) ? '0' + hour : hour;
+		//		minutes = (minutes < 10) ? '0' + minutes : minutes;
+		//		seconds = (seconds < 10) ? '0' + seconds : seconds;
+		//		let currentDate = year + "-" + month + "-" + day
+		//			+ " " + hour + ":" + minutes + ":" + seconds;
+		//		return currentDate;
+		//	}
+		//	/**
+		//	* 获取今日零点时间戳
+		//	* returns {number}
+		//	*/
+		//	function todayStartTimestamp() {
+		//		const timestamp = Math.floor(new Date(new Date().setHours(0, 0, 0, 0)).getTime() / 1000)
+		//		return timestamp
+		//	}
+		//	/**
+		//	* 获取昨日开始、结束时间戳
+		//	* param num
+		//	* returns {number[昨日开始时间戳, 昨日结束时间戳]}
+		//	*/
+		//	function yesterdayTimestamp(num = 1) {
+		//		const MillisecondsADay = 24 * 60 * 60 * num
+		//		//  今日零点时间戳
+		//		const timestamp = Math.floor(new Date(new Date().setHours(0, 0, 0, 0)).getTime() / 1000)
+		//		// 昨日开始时间戳
+		//		const yesterdayStartTime = timestamp - MillisecondsADay
+		//		// 昨日结束时间戳
+		//		const yesterdayEndTime = timestamp - 1
+		//		return [yesterdayStartTime, yesterdayEndTime]
+		//	}
+		//	/**
+		//	* 本周开始时间戳
+		//	* returns {number}
+		//	*/
+		//	function weekStartTimestamp() {
+		//		//  一天的秒数
+		//		const MillisecondsADay = 24 * 60 * 60
+		//		//  今日零点时间戳
+		//		const timestamp = Math.floor(new Date(new Date().setHours(0, 0, 0, 0)).getTime() / 1000)
+		//		const weekDay = new Date().getDay() === 0 ? (7 - 1) : (new Date().getDay() - 1)
+		//		const weekTimeStamp = timestamp - MillisecondsADay * weekDay
+		//		return weekTimeStamp
+		//	}
+		//	/**
+		//	* 上周开始、结束时间戳
+		//	* returns {number[上周开始时间戳, 上周结束时间戳]}
+		//	*/
+		//	function lastWeekTimetamp() {
+		//		//  一天的秒数
+		//		const MillisecondsADay = 24 * 60 * 60
+		//		//  今日零点时间戳
+		//		const timestamp = Math.floor(new Date(new Date().setHours(0, 0, 0, 0)).getTime() / 1000)
+		//		const weekDay = new Date().getDay() === 0 ? (7 - 1) : (new Date().getDay() - 1)
+		//		//  本周开始时间戳
+		//		const weekTimeStamp = timestamp - MillisecondsADay * weekDay
+		//		//  上周开始时间戳
+		//		const lastWeekStart = weekTimeStamp - MillisecondsADay * 7
+		//		//  上周结束时间戳
+		//		const lastWeekEnd = weekTimeStamp - 1
+		//		return [lastWeekStart, lastWeekEnd]
+		//	}
+
+		//	/**
+		//	* 当月开始时间戳
+		//	* returns {number}
+		//	*/
+		//	function monthStartTimestamp() {
+		//		const date = new Date()
+		//		date.setDate(1)
+		//		date.setHours(0, 0, 0, 0)
+		//		const timeStamp = date.getTime() / 1000
+		//		return timeStamp
+		//	}
+		//	/**
+		//	* 获取上月开始、结束时间戳
+		//	* returns {number[上月开始时间戳，上月结束时间戳]}
+		//	*/
+		//	function lastMonthTimetamp() {
+		//		//  一天的秒数
+		//		const MillisecondsADay = 24 * 60 * 60
+
+		//		const date = new Date()
+		//		date.setDate(1)
+		//		date.setHours(0, 0, 0, 0)
+		//		//  当月开始时间戳
+		//		const timeStamp = date.getTime() / 1000
+		//		//  上个月的天数
+		//		const days = lastMonthDats()
+		//		//  上月开始时间戳
+		//		const lastMonthStart = timeStamp - (MillisecondsADay * days)
+		//		//  上月结束时间戳
+		//		const lastMonthEnd = timeStamp - 1
+		//		return [lastMonthStart, lastMonthEnd]
+		//	}
+		//	/**
+		//	 * 上月天数
+		//	 * returns {number}
+		//	 */
+		//	function lastMonthDats() {
+		//		const date = new Date()
+		//		const year = date.getFullYear()
+		//		//  上个月月份
+		//		let month = (date.getMonth() + 1) - 1 //  0-11 表示 1月-12月
+		//		//  0 表示12月
+		//		month = month || 12
+		//		//  30天的月份
+		//		const arr30 = [4, 6, 9, 11]
+		//		//  31天的月份
+		//		const arr31 = [1, 3, 5, 7, 8, 10, 12]
+		//		if (arr30.indexOf(month) !== -1) {
+		//			//  上个月是 30 天
+		//			return 30
+		//		} else if (arr31.indexOf(month) !== -1) {
+		//			//  上个月是 31 天
+		//			return 31
+		//		} else {
+		//			//  2月
+		//			if (isRunYear(year)) {
+		//				return 29
+		//			} else {
+		//				return 28
+		//			}
+		//		}
+		//	}
+		//	/**
+		//	 * 是否为闰年
+		//	 * param year
+		//	 * returns {boolean}
+		//	 */
+		//	function isRunYear(year) {
+		//		//  条件:能被4整除并且不能被100整除，或者被400整除的
+		//		let flag = false
+		//		if (year % 4 === 0 && year % 100 !== 0 || year % 400 === 0) {
+		//			flag = true
+		//		}
+		//		return flag
+		//	}
+
+		//	var laydate = layui.laydate;
+		//	if (selectValue == "toDay") {
+		//		var toDayStartDate = todayStartTimestamp();
+		//		var timef1 = getFormatDate(new Date(toDayStartDate * 1000));
+		//		lay('#dateReStartTime1').each(function () {
+		//			laydate.render({
+		//				elem: this,
+		//				trigger: 'click',
+		//				format: "yyyy-MM-dd HH:mm:ss",
+		//				//value: "2023-02-23 13:56:25",
+		//				value: timef1,
+		//			});
+		//		});
+		//		var timef2 = getFormatDate(new Date(Date.now()));
+		//		lay('#dateReEndTime1').each(function () {
+		//			laydate.render({
+		//				elem: this,
+		//				trigger: 'click',
+		//				format: "yyyy-MM-dd HH:mm:ss",
+		//				//value: "2023-02-23 13:56:25",
+		//				value: timef2,
+		//			});
+		//		});
+		//	} else if (selectValue == "yesterDay") {
+		//		var yesterDayDate = yesterdayTimestamp(1);
+		//		var timef1 = getFormatDate(new Date(yesterDayDate[0] * 1000));
+		//		lay('#dateReStartTime1').each(function () {
+		//			laydate.render({
+		//				elem: this,
+		//				trigger: 'click',
+		//				format: "yyyy-MM-dd HH:mm:ss",
+		//				//value: "2023-02-23 13:56:25",
+		//				value: timef1,
+		//			});
+		//		});
+		//		var timef2 = getFormatDate(new Date(yesterDayDate[1] * 1000));
+		//		lay('#dateReEndTime1').each(function () {
+		//			laydate.render({
+		//				elem: this,
+		//				trigger: 'click',
+		//				format: "yyyy-MM-dd HH:mm:ss",
+		//				//value: "2023-02-23 13:56:25",
+		//				value: timef2,
+		//			});
+		//		});
+		//	} else if (selectValue == "thisWeek") {
+		//		var weekStartDate = weekStartTimestamp();
+		//		var timef1 = getFormatDate(new Date(weekStartDate * 1000));
+		//		lay('#dateReStartTime1').each(function () {
+		//			laydate.render({
+		//				elem: this,
+		//				trigger: 'click',
+		//				format: "yyyy-MM-dd HH:mm:ss",
+		//				//value: "2023-02-23 13:56:25",
+		//				value: timef1,
+		//			});
+		//		});
+		//		var timef2 = getFormatDate(new Date(Date.now()));
+		//		lay('#dateReEndTime1').each(function () {
+		//			laydate.render({
+		//				elem: this,
+		//				trigger: 'click',
+		//				format: "yyyy-MM-dd HH:mm:ss",
+		//				//value: "2023-02-23 13:56:25",
+		//				value: timef2,
+		//			});
+		//		});
+
+		//	} else if (selectValue == "lastWeek") {
+		//		var lastWeekDate = lastWeekTimetamp();
+		//		var timef1 = getFormatDate(new Date(lastWeekDate[0] * 1000));
+		//		lay('#dateReStartTime1').each(function () {
+		//			laydate.render({
+		//				elem: this,
+		//				trigger: 'click',
+		//				format: "yyyy-MM-dd HH:mm:ss",
+		//				//value: "2023-02-23 13:56:25",
+		//				value: timef1,
+		//			});
+		//		});
+		//		var timef2 = getFormatDate(new Date(lastWeekDate[1] * 1000));
+		//		lay('#dateReEndTime1').each(function () {
+		//			laydate.render({
+		//				elem: this,
+		//				trigger: 'click',
+		//				format: "yyyy-MM-dd HH:mm:ss",
+		//				//value: "2023-02-23 13:56:25",
+		//				value: timef2,
+		//			});
+		//		});
+		//	} else if (selectValue == "thisMonth") {
+		//		var monthStartDate = monthStartTimestamp();
+		//		var timef = getFormatDate(new Date(monthStartDate * 1000));
+		//		lay('#dateReStartTime1').each(function () {
+		//			laydate.render({
+		//				elem: this,
+		//				trigger: 'click',
+		//				format: "yyyy-MM-dd HH:mm:ss",
+		//				//value: "2023-02-23 13:56:25",
+		//				value: timef,
+		//			});
+		//		});
+		//		var timef2 = getFormatDate(new Date(Date.now()));
+		//		lay('#dateReEndTime1').each(function () {
+		//			laydate.render({
+		//				elem: this,
+		//				trigger: 'click',
+		//				format: "yyyy-MM-dd HH:mm:ss",
+		//				//value: "2023-02-23 13:56:25",
+		//				value: timef2,
+		//			});
+		//		});
+
+		//	} else if (selectValue == "lastMonth") {
+		//		//lastMonthTimetamp()
+		//		var lastMonthDate = lastMonthTimetamp();
+		//		var timef1 = getFormatDate(new Date(lastMonthDate[0] * 1000));
+		//		lay('#dateReStartTime1').each(function () {
+		//			laydate.render({
+		//				elem: this,
+		//				trigger: 'click',
+		//				format: "yyyy-MM-dd HH:mm:ss",
+		//				//value: "2023-02-23 13:56:25",
+		//				value: timef1,
+		//			});
+		//		});
+		//		var timef2 = getFormatDate(new Date(lastMonthDate[1] * 1000));
+		//		lay('#dateReEndTime1').each(function () {
+		//			laydate.render({
+		//				elem: this,
+		//				trigger: 'click',
+		//				format: "yyyy-MM-dd HH:mm:ss",
+		//				//value: "2023-02-23 13:56:25",
+		//				value: timef2,
+		//			});
+		//		});
+		//	} else { }
+		//});
+
+
+
+		GetAllSubsystemTag();
+		
+        var starttime = new Date(new Date().setHours(0, 0, 0, 0));
+        var starttimeString = starttime.getFullYear() + "-" + parseInt(starttime.getMonth() + 1) + "-" + starttime.getDate() + " " + (starttime.getHours()) + ":" + starttime.getMinutes() + ":" + starttime.getSeconds();
+        var endtime = new Date();
+        endtime.setDate(endtime.getDate())
+        var endtimeString = endtime.getFullYear() + "-" + parseInt(endtime.getMonth() + 1) + "-" + endtime.getDate() + " " + (endtime.getHours()) + ":" + endtime.getMinutes() + ":" + endtime.getSeconds();
+		function getFormatDateone(date) {
+			let year = date.getFullYear();
+			let month = date.getMonth() + 1;
+			let day = date.getDate();
+			let hour = date.getHours();
+			let minutes = date.getMinutes();
+			let seconds = date.getSeconds();
+			month = (month < 10) ? '0' + month : month;
+			day = (day < 10) ? '0' + day : day;
+			hour = (hour < 10) ? '0' + hour : hour;
+			minutes = (minutes < 10) ? '0' + minutes : minutes;
+			seconds = (seconds < 10) ? '0' + seconds : seconds;
+			let currentDate = year + "-" + month + "-" + day
+				+ " " + hour + ":" + minutes + ":" + seconds;
+			return currentDate;
+		}
+		layui.use('laydate', function () {
+            var laydate = layui.laydate;
+            lay('#dateReStartTime').each(function () {
+                laydate.render({
+                    elem: this,
+                    trigger: 'click',
+                    format: "yyyy-MM-dd HH:mm:ss",
+                    //value: "2023-02-23 13:56:25",
+					value: getFormatDateone(starttime),
+                });
+            });
+            lay('#dateReEndTime').each(function () {
+                laydate.render({
+                    elem: this,
+                    trigger: 'click',
+                    format: "yyyy-MM-dd HH:mm:ss",
+                    //value: "2023-02-23 13:56:25",
+					value: getFormatDateone(endtime),
+                });
+            });
+			lay('#dateReStartTime1').each(function () {
+                laydate.render({
+                    elem: this,
+                    trigger: 'click',
+                    format: "yyyy-MM-dd HH:mm:ss",
+                    //value: "2023-02-23 13:56:25",
+					value: getFormatDateone(starttime),
+                });
+            });
+            lay('#dateReEndTime1').each(function () {
+                laydate.render({
+                    elem: this,
+                    trigger: 'click',
+                    format: "yyyy-MM-dd HH:mm:ss",
+                    //value: "2023-02-23 13:56:25",
+					value: getFormatDateone(endtime),
+                });
+            });
+        });
+        function getFormatDate(date) {
+            let year = date.getFullYear();
+            let month = date.getMonth() + 1;
+            let day = date.getDate();
+            let hour = date.getHours();
+            let minutes = date.getMinutes();
+            let seconds = date.getSeconds();
+            month = (month < 10) ? '0' + month : month;
+            day = (day < 10) ? '0' + day : day;
+            hour = (hour < 10) ? '0' + hour : hour;
+            minutes = (minutes < 10) ? '0' + minutes : minutes;
+            seconds = (seconds < 10) ? '0' + seconds : seconds;
+            let currentDate = year + "-" + month + "-" + day
+                + " " + hour + ":" + minutes + ":" + seconds;
+            return currentDate;
+        }
+
+		//right_content
+		var rootpath = window.location.host;
+		//在页面未加载完毕之前显示的loading Html自定义内容
+		var _LoadingHtml = '<div id="loadingDiv" style="display: none; "><div id="over" style=" position: absolute;top: 0;left: 0; width: 100%;height: 100%; background-color: #f5f5f5;opacity:0.5;z-index: 1000;"></div><div id="layout" style="position: absolute;top: 40%; left: 40%;width: 20%; height: 20%;  z-index: 1001;text-align:center;"><img src="//' + rootpath + '/images/loading.gif" /></div></div>';
+		//呈现loading效果
+		document.getElementById("gridpanel").innerHTML += _LoadingHtml;
+		//移除loading效果
+		function completeLoading() {
+			document.getElementById("loadingDiv").style.display = "none";
+		}
+		//展示loading效果
+		function showLoading() {
+			document.getElementById("loadingDiv").style.display = "block";
+		}
+
+		//在页面未加载完毕之前显示的loading Html自定义内容
+		var _LoadingHtml1 = '<div id="loadingDiv1" style="display: none; "><div id="over" style=" position: absolute;top: 0;left: 0; width: 100%;height: 100%; background-color: #f5f5f5;opacity:0.5;z-index: 1000;"></div><div id="layout" style="position: absolute;top: 40%; left: 40%;width: 20%; height: 20%;  z-index: 1001;text-align:center;"><img src="//' + rootpath + '/images/loading.gif" /></div></div>';
+		//呈现loading效果
+		document.getElementById("gridpanel1").innerHTML += _LoadingHtml1;
+		//移除loading效果
+		function completeLoading1() {
+			document.getElementById("loadingDiv1").style.display = "none";
+		}
+		//展示loading效果
+		function showLoading1() {
+			document.getElementById("loadingDiv1").style.display = "block";
+		}
+
+		function json_array(data) {
+			var len = eval(data).length;
+			var arr = [];
+			for (var i = 0; i < len; i++) {
+				arr[i] = []; //js中二维数组必须进行重复的声明，否则会undefind
+				arr[i]['url'] = data[i].url;
+				arr[i]['oldname'] = data[i].oldname;
+			}
+			return arr;
+		}
+
+		//var StaticSelectTagList = new Array();
+		//获取所有子系统列表ok
+		async function GetAllSubsystemTag() {
+			
+			debugger;
+			$.ajax({
+				url: "/PenMeiReportManage/PenMeiHistoryAlarm/GetAllSubsystemTag",
+				type: "Get",
+				//dataType: "json",
+				//async: false,
+				//data: datapa,
+				success: function (redata) {
+					debugger; 
+					var listsubsysname = JSON.parse(redata);
+					$('#subsystemselect').combobox({
+						data: listsubsysname,
+						valueField: 'Lable',
+						textField: 'Value',
+
+						checkOnSelect: true,
+						selectOnCheck: true
+					});
+				}
+			});
+		}
+		//获取选中子系统tag
+		updateSelect = async function (data) {
+			var para = { "SubsysytemName": data.Value }
+			//var subsystemAllTag = await Call(api.DataHistoryCharts.GetSubsystemAllTag, para);
+			debugger;
+			myajax = $.ajax({
+				url: "/PenMeiReportManage/PenMeiHistoryAlarm/GetSubsystemAllTag",
+				type: "Post",
+				//dataType: "json",
+				data: para,
+				success: function (redata){}
+			});
+			debugger;
+			$.when(myajax).done(function (redata){
+				var subsystemAllTag = JSON.parse(redata);
+				$('#subsystemTagList').datalist({
+					data: subsystemAllTag,
+					valueField: 'TagID',
+					textField: 'Description',
+					idField: 'TagID',
+				});
+				//var datalistArr = $('#subsystemTagList').datalist("getData").rows;
+				//if (datalistArr.length > 0 && StaticSelectTagList.length > 0) {
+				//	for (var ni = 0; ni < datalistArr.length; ni++) {
+				//		if (StaticSelectTagList.indexOf(datalistArr[i]) != -1) {
+				//			$('#subsystemTagList').datalist("selectRecord", datalistArr[i].TagID);
+				//		}
+				//	}
+				//}
+
+				$('#subsystemTagList').datalist('resize', {
+					height: ($('#aright').height() - 75)
+				});
+			});
+			
+		}
+		updateSelect_Value = async function (value, description) {
+			var para = { "SubsysytemName": value }
+			//var subsystemAllTag = await Call(api.DataHistoryCharts.GetSubsystemAllTag, para);
+			debugger;
+			myajax = $.ajax({
+				url: "/PenMeiReportManage/PenMeiHistoryAlarm/GetSubsystemAllTag",
+				type: "Post",
+				//dataType: "json",
+				data: para,
+				success: function (redata) { }
+			});
+			debugger;
+			$.when(myajax).done(function (redata) {
+				var subsystemAllTag = JSON.parse(redata);
+				$('#subsystemTagList').datalist({
+					data: subsystemAllTag,
+					valueField: 'TagID',
+					textField: 'Description',
+					idField: 'TagID',
+				});
+
+				//var datalistArr = $('#subsystemTagList').datalist("getData").rows;
+				//if (datalistArr.length > 0 && StaticSelectTagList.length > 0) {
+				//	for (var ni = 0; ni < datalistArr.length; ni++) {
+				//		if (StaticSelectTagList.indexOf(datalistArr[i]) != -1) {
+				//			$('#subsystemTagList').datalist("selectRecord", datalistArr[i].TagID);
+				//		}
+				//	}
+				//}
+				for (var i = 0; i < subsystemAllTag.length; i++) {
+					var tag = subsystemAllTag[i];
+					var id = tag.TagID;
+					if (tag.Description == description) {
+						$('#subsystemTagList').datalist("selectRecord",id);
+						break;
+					}
+				}
+
+				showTable();
+
+				$('#subsystemTagList').datalist('resize', {
+					height: ($('#aright').height() - 75)
+				});
+			});
+
+		}
+		//checkTagAdd = function (rowIndex, rowData) {
+		//	checkAddTaglist(rowData);
+		//}
+
+		//function checkAddTaglist(rowData) {
+		//	if (StaticSelectTagList.indexOf(rowData) == -1) {
+		//		StaticSelectTagList.push(rowData);
+		//	}
+		//}
+
+		//checkTagDec = function (rowIndex, rowData) {
+		//	checkDecTaglist(rowData);
+
+		//}
+
+		//function checkDecTaglist(rowData) {
+		//	if (StaticSelectTagList.indexOf(rowData) != -1) {
+		//		StaticSelectTagList.splice(StaticSelectTagList.indexOf(rowData), 1);
+		//	}
+		//}
+
+		showTableQuick = async function () {
+			debugger;
+			//if (selectType.value == "recent") {
+				showLoading1();
+				var showdata = await GetAlarmRecordQuickDesc();
+				table.render({
+					elem: '#result1',
+					height: 'full-150',
+					data: showdata,
+					//editTrigger:'dblclick',
+					cols: [[
+						//{ type: 'checkbox' },
+						//{ field: 'Subsystem', title: '子系统', edit: 'text'},
+
+						{ field: 'Description', title: '报警名称' },
+						//{ field: 'TagName' , title:'变量编码' , edit:'text'},
+						//{ field: 'Address', title: '起始地址', edit: 'text' },
+						//{ field: 'DataType' , title:'数值类型' , edit:'text'},
+						{ field: 'Typename', title: '报警类型' },
+						{ field: 'Startdt', title: '开始时间' },
+						{ field: 'Enddt', title: '结束时间' },
+						//{ field: 'RtValue' , title:'当前值' , edit:'text'},
+						//{ field: 'hcount', title: '报警次数' },
+						{ field: 'Hztime', title: '报警总时长(秒)' },
+						//{ title: '操作', width: 120, toolbar: '#currentTableBar', align: "center", fixed: 'right' },
+
+					]],
+					page: true,
+					limit: 16,
+				});
+				completeLoading1();
+			//}
+			//else{
+			//	showLoading1();
+			//	var showdata = await GetAlarmRecordQuick();
+			//	table.render({
+			//		elem: '#result1',
+			//		height: 'full-150',
+			//		data: showdata,
+			//		//editTrigger:'dblclick',
+			//		cols: [[
+			//			//{ type: 'checkbox' },
+			//			//{ field: 'Subsystem', title: '子系统', edit: 'text'},
+
+			//			{ field: 'Description', title: '报警名称' },
+			//			//{ field: 'TagName' , title:'变量编码' , edit:'text'},
+			//			//{ field: 'Address', title: '起始地址', edit: 'text' },
+			//			//{ field: 'DataType' , title:'数值类型' , edit:'text'},
+
+			//			//{ field: 'RtValue' , title:'当前值' , edit:'text'},
+			//			{ field: 'hcount', title: '报警次数' },
+			//			{ field: 'hztime', title: '报警总时长(秒)' },
+			//			{ title: '操作', width: 120, toolbar: '#currentTableBar', align: "center", fixed: 'right' },
+
+			//		]],
+			//		page: true,
+			//		limit: 16,
+			//	});
+			//	completeLoading1();
+			//}
+		}
+
+		table.on('tool(currentTableFilter)', async function (obj) {
+			debugger;
+			if (obj.event === 'download') {
+				//window.open('/FileManage/Uploadfile/Download?keyValue=' + obj.data.F_Id);
+			}
+			else if (obj.event === 'details') {
+				debugger;
+				let description = obj.data.Description;
+				let datetimestart = $('#dateReStartTime1')[0].value;
+				let datetimeend = $('#dateReEndTime1')[0].value;
+				var laydate = layui.laydate;
+				lay('#dateReStartTime').each(function () {
+					laydate.render({
+						elem: this,
+						trigger: 'click',
+						format: "yyyy-MM-dd HH:mm:ss",
+						//value: "2023-02-23 13:56:25",
+						value: datetimestart,
+					});
+				});
+				lay('#dateReEndTime').each(function () {
+					laydate.render({
+						elem: this,
+						trigger: 'click',
+						format: "yyyy-MM-dd HH:mm:ss",
+						//value: "2023-02-23 13:56:25",
+						value: datetimeend,
+					});
+				});
+
+				let alarmSub = "";
+
+				element.tabChange('Chang', "22");
+
+				let datapa = { "AlarmName": description };
+				myajax = await $.ajax({
+					url: "/PenMeiReportManage/PenMeiHistoryAlarm/GetAlarmSubSystem",
+					type: "Post",
+					//dataType: "json",
+					data: datapa,
+					success: function (redata) {
+						alarmSub = JSON.parse(redata);
+					}
+				});
+
+				var comdatas = $('#subsystemselect').combobox('getData');
+				for(var i = 0; i < comdatas.length; i++){
+					var comdata = comdatas[i];
+					
+					if (comdata.Value == alarmSub) {
+						$('#subsystemselect').combobox("select", comdata.Value);
+						updateSelect_Value(comdata.Value, description);
+						break;
+					}
+				}
+
+
+				//updateSelect(alarmSub);
+				
+
+
+
+				//var rows = $('#subsystemTagList').datalist('getRows');
+
+				//for (var i = 0; i < rows.length; i++) {
+				//	var row = rows[i];
+				//	var id = row.id;
+				//	if (row.text == description){
+				//		$('#subsystemTagList').datalist("selectRecord",id);
+				//	}
+				//}
+			}
+			//return false;
+		});
+
+		//获取tagvalue
+		async function GetAlarmRecordQuick() {
+			var alarmlist = new Array();
+			debugger;
+			let alarmtype = $('#selectType')[0].value;
+			let datetimestart = $('#dateReStartTime1')[0].value;
+			let datetimeend = $('#dateReEndTime1')[0].value;
+
+			//getChecked
+			//var checkRow = $('#subsystemTagList').datalist("getChecked");
+			let datapa = { "Alarmtype": alarmtype, "StartTime": Date.parse(new Date(datetimestart)), "EndTime": Date.parse(new Date(datetimeend)) };
+			let result;
+			debugger;
+
+			myajax = await $.ajax({
+				url: "/PenMeiReportManage/PenMeiHistoryAlarm/GetAlarmRecordQuick",
+				type: "Post",
+				//dataType: "json",
+				data: datapa,
+				success: function (redata) { }
+			});
+
+			debugger;
+
+			$.when(myajax).done(function (redata) {
+				result = JSON.parse(redata);
+			});
+			return result;
+		}
+
+		//获取tagvalue
+		async function GetAlarmRecordQuickDesc() {
+			debugger;
+			let alarmTimeHorizon = $('#selectRecentQuick')[0].value;
+			let Hhour = 1;
+			if (alarmTimeHorizon == "onlyOneHour") {
+				Hhour = 1;
+			} else if (alarmTimeHorizon == "onlyThreeHour") {
+				Hhour = 3;
+			}else if (alarmTimeHorizon == "onlyEightHour") {
+				Hhour = 8;
+			} else if (alarmTimeHorizon == "onlyTwelveHour") {
+				Hhour = 12;
+			} else if (alarmTimeHorizon == "onlyOneDay") {
+				Hhour = 24;
+			} else {
+				Hhour = 1;
+			}
+			//getChecked
+			//var checkRow = $('#subsystemTagList').datalist("getChecked");
+			let datapa = { "Hhour": Hhour };
+			let result;
+			debugger;
+
+			myajax = await $.ajax({
+				url: "/PenMeiReportManage/PenMeiHistoryAlarm/GetAlarmRecordQuickDesc",
+				type: "Post",
+				//dataType: "json",
+				data: datapa,
+				success: function (redata) { }
+			});
+
+			debugger;
+
+			$.when(myajax).done(function (redata) {
+				result = JSON.parse(redata);
+			});
+			return result;
+		}
+
+
+		showTable = async function(){
+			showLoading();
+			var showdata = await GetAlarmRecordValue();
+			table.render({
+				elem: '#result',
+			    height:'full-150',
+				data: showdata,
+			    //editTrigger:'dblclick',
+			    cols:[[
+			        //{ type: 'checkbox' },
+			        //{ field: 'Subsystem', title: '子系统', edit: 'text'},
+
+			        { field: 'Description' , title:'报警名称' },
+			        //{ field: 'TagName' , title:'变量编码' , edit:'text'},
+			        //{ field: 'Address', title: '起始地址', edit: 'text' },
+			        //{ field: 'DataType' , title:'数值类型' , edit:'text'},
+
+			        //{ field: 'RtValue' , title:'当前值' , edit:'text'},
+					{ field: 'startdt', title: '开始时间'},
+			        { field: 'enddt', title: '结束时间' },
+					{ field: 'Hztime', title: '持续时间' },
+
+			    ]],
+			    page:true,
+			    limit:16,
+			});
+			completeLoading();
+		}
+
+
+
+		//获取tagvalue
+		async function GetAlarmRecordValue() {
+			var alarmlist = new Array();
+
+			let datetimestart = $('#dateReStartTime')[0].value;
+			let datetimeend = $('#dateReEndTime')[0].value;
+
+			//getChecked
+			var checkRow = $('#subsystemTagList').datalist("getChecked");
+			let datapa = { "TagID": checkRow[0].TagID, "StartTime": Date.parse(new Date(datetimestart)), "EndTime": Date.parse(new Date(datetimeend)) };
+			let result;
+			debugger;
+
+			myajax = await  $.ajax({
+				url: "/PenMeiReportManage/PenMeiHistoryAlarm/GetAlarmRecord",
+				type: "Post",
+				//dataType: "json",
+				data: datapa,
+				success: function (redata) { }
+			});
+
+			debugger;
+
+			$.when(myajax).done(function (redata){
+				result = JSON.parse(redata);
+			});
+
+			
+
+			return result;
+		}
+
+
+		
+
+    });
+
+
+</script>
+<html style="height:100%">
+<body style="height:100%">
+	
+	<div class="layui-tab layui-tab-card" lay-filter="Chang" style="height:100%" id="tab1">
+	@*<script type="text/javascript" src="~/lib/echarts-5.3.0/dist/echarts.js"></script>*@
+		<ul class="layui-tab-title">
+			<li class="layui-this" lay-id ="11">报警汇总</li>
+			<li lay-id ="22">报警查询</li>
+		</ul>
+		<div class="layui-tab-content" style="height:90%">
+			<div class="layui-tab-item layui-show" style="height:100%">
+				<div class="layui-fluid" style="padding:0 0px;height:100%">
+					<div class="layui-row layui-col-space5" style="height:100%">
+						@*<div class="layui-col-md2 layui-col-xs3" style="height:100%;padding-right:12px;">
+							<div class="layui-card" style="text-align:left;overflow: auto;height:100%" id="toolbarDiv">
+								<div id="aleft" style="float:left;width:100%;height:100%">
+									<div class="easyui-panel" title="选择设备信息" style="width:100%;height:100%">
+										<div class="easyui-combobox" id="subsystemselect" name="state" data-options="onSelect:function(rec){updateSelect(rec)}" style="width:100%;height:40px">
+										</div>
+										<div class="easyui-datalist" id="subsystemTagList" title="变量列表" style="position: relative;width:100%;height:auto;overflow:auto;" data-options="
+											checkbox: true,
+											selectOnCheck:true,
+											checkOnSelect:true,
+											sigleselect:true,
+											">
+										</div>
+
+									</div>
+
+								</div>
+							</div>
+						</div>*@
+						<div class="layui-col-md12 layui-col-xs12" style="height:100%">
+							@*<div class="layui-card" style="padding: 5px;">
+								<div id="echartdiv" style="width:100%;height: 100%;margin-bottom: 10px;">
+									<div id="result" class="echart" style="width: 100%; height: 100% "></div>
+								</div>
+							</div>*@
+
+							<form class="layui-form" style="height:auto;" id="formPreviewForm1">
+								
+								<div id="grid_21" class="layui-form-item layui-row grid active" data-id="grid_21"
+										data-tag="grid" data-index="0">
+									@*<div class="layui-col-md2 widget-col-list column0" data-index="0" data-parentindex="0">
+										<div id="select_1011" class="layui-form-item active" data-id="select_411" data-tag="select"
+											 data-index="0">
+											<label class="layui-form-label layui-form-required" style="width: 60px;">
+												报警类型:
+											</label>
+											<div class="layui-input-block layui-form" lay-filter="select_4" style="margin-left: 90px;">
+
+												<select name="selectType" lay-filter="quickType" lay-verify="required" id="selectType">
+													
+													<option value="recent" selected="">
+														近期报警速查
+													</option>
+													<option value="A1">
+														一级报警
+													</option>
+													<option value="A2">
+														二级报警
+													</option>
+													<option value="A3">
+														三级报警
+													</option>
+													<option value="F1">
+														一级故障
+													</option>
+													<option value="F2">
+														二级故障
+													</option>
+													<option value="F3">
+														三级故障
+													</option>
+													<option value="H1">
+														高一级报警
+													</option>
+													<option value="H2">
+														高二级报警
+													</option>
+													<option value="H3">
+														高三级报警
+													</option>
+													<option value="L1">
+														低一级报警
+													</option>
+													<option value="L2">
+														低二级报警
+													</option>
+													<option value="L3">
+														低三级报警
+													</option>
+												</select>
+
+											</div>
+										</div>
+									</div>*@
+									<div class="layui-col-md3 widget-col-list column1" data-index="1" data-parentindex="0">
+										<div id="ReStartTime1" class="layui-form-item active" data-id="ReStartTime1"
+												data-tag="date" data-index="0">
+											<label class="layui-form-label layui-form-required" style="width: 80px;">
+												开始时间:
+											</label>
+											<div class="layui-input-block" style="width:calc(100% - 110px);margin-left: 110px;">
+												<input id="dateReStartTime1" name="ndateReStartTime" lay-verify="required"
+														class="layui-input icon-date widget-date " style="line-height: 40px;">
+											</div>
+										</div>
+									</div>
+									<div class="layui-col-md3 widget-col-list column2" data-index="2" data-parentindex="0">
+										<div id="ReEndTime1" class="layui-form-item active" data-id="ReEndTime1"
+												data-tag="date" data-index="0">
+											<label class="layui-form-label layui-form-required" style="width: 80px;">
+												结束世间:
+											</label>
+											<div class="layui-input-block" style="width:calc(100% - 110px);margin-left: 110px;">
+												<input id="dateReEndTime1" name="ndateReEndTime" lay-verify="required" class="layui-input icon-date widget-date "
+														style="line-height: 40px;">
+											</div>
+										</div>
+									</div>
+									@*<div class="layui-col-md2 widget-col-list column3" data-index="3" data-parentindex="0" id="classifyMd">
+										<div id="select_101" class="layui-form-item active" data-id="select_41" data-tag="select"
+											 data-index="0">
+											<label class="layui-form-label layui-form-required" style="width: 110px;">
+												快捷节点:
+											</label>
+											<div class="layui-input-block layui-form" lay-filter="select_4" style="margin-left: 140px;">
+
+												<select name="selectquick" lay-filter="quickTime1" lay-verify="required" id="selectQuick1">
+													<option value="def" selected="">
+														快速选择周期
+													</option>
+													<option value="toDay">
+														今日
+													</option>
+													<option value="yesterDay">
+														昨日
+													</option>
+													<option value="thisWeek">
+														本周
+													</option>
+													<option value="lastWeek">
+														上周
+													</option>
+													<option value="thisMonth">
+														本月
+													</option>
+													<option value="lastMonth">
+														上月
+													</option>
+												</select>
+
+											</div>
+										</div>
+									</div>*@
+									<div class="layui-col-md2 widget-col-list column4" data-index="2" data-parentindex="0" id="recentMd">
+										<div id="select_11" class="layui-form-item active" data-id="select_5" data-tag="select"
+											 data-index="0">
+											<label class="layui-form-label layui-form-required" style="width: 110px;">
+												速查范围:
+											</label>
+											<div class="layui-input-block layui-form" lay-filter="select_4" style="margin-left: 140px;">
+
+												<select name="selectquick" lay-filter="quickTime" lay-verify="required" id="selectRecentQuick">
+													<option value="onlyOneHour" selected="">
+														一小时内
+													</option>
+													<option value="onlyThreeHour">
+														三小时内
+													</option>
+													<option value="onlyEightHour">
+														八小时内
+													</option>
+													<option value="onlyTwelveHour">
+														十二小时内
+													</option>
+													<option value="onlyOneDay">
+														一天内
+													</option>
+												</select>
+
+											</div>
+										</div>
+									</div>
+									<div class="layui-col-md2 widget-col-list column4" data-index="4" data-parentindex="0">
+										<div id="bottom_51" class="layui-form-item active" data-id="bottom_51" data-tag="bottom"
+												data-index="0">
+											<div class="layui-input-block" style="margin-left: 30px;">
+												<button id="btn_search1" type="button" class="layui-btn   custom-zc" ; onclick="showTableQuick()">
+													<i class="layui-icon ">
+													</i>
+													确定
+												</button>
+											</div>
+
+										</div>
+									</div>
+
+								</div>
+
+							</form>
+							<form class="layui-form" style="height:calc(100% - 55px);width:100%" id="tablepanel1">
+								<div class="layui-panel" id="gridpanel1" style="width:100%;height: 100%;margin-bottom: 10px; ">
+									<table id="result1" lay-filter="currentTableFilter"></table> @*style="width: 100%; height: 100% "*@
+									<script type="text/html" id="currentTableBar">
+										<a id="NF-details" authorize class="layui-btn layui-btn-xs layui-btn-normal" lay-event="details">查看</a>
+									</script>
+								</div>
+							</form>
+						</div>
+					</div>
+				</div>
+			</div>
+			<div class="layui-tab-item" style="height:100%">
+				<div class="layui-fluid" style="padding:0 0px;height:100%">
+					<div class="layui-row layui-col-space5" style="height:100%">
+						<div class="layui-col-md2 layui-col-xs3" style="height:100%;padding-right:12px;">
+							<div class="layui-card" style="text-align:left;overflow: auto;height:100%" id="toolbarDiv">
+								@*<ul id="dataTree" class="dtree" data-id="0"></ul>*@
+								<div id="aleft" style="float:left;width:100%;height:100%">
+									<div class="easyui-panel" title="选择设备信息" style="width:100%;height:100%">
+										<div class="easyui-combobox" id="subsystemselect" name="state" data-options="onSelect:function(rec){updateSelect(rec)}" style="width:100%;height:40px">
+										</div>
+										<div class="easyui-datalist" id="subsystemTagList" title="变量列表" style="position: relative;width:100%;height:auto;overflow:auto;" data-options="
+											checkbox: true,
+											selectOnCheck:true,
+											checkOnSelect:true,
+											sigleselect:true,
+										@*onCheck:function(rowIndex,rowData){checkTagAdd(rowIndex,rowData)},
+											onUncheck:function(rowIndex,rowData){checkTagDec(rowIndex,rowData)}*@
+											">
+										</div>
+
+									</div>
+
+								</div>
+							</div>
+						</div>
+						<div class="layui-col-md10 layui-col-xs9" style="height:100%">
+							@*<div class="layui-card" style="padding: 5px;">
+							<div id="echartdiv" style="width:100%;height: 100%;margin-bottom: 10px;">
+							<div id="result" class="echart" style="width: 100%; height: 100% "></div>
+							</div>
+							</div>*@
+
+							<form class="layui-form" style="height:auto;" id="formPreviewForm">
+								<div id="grid_2" class="layui-form-item layui-row grid active" data-id="grid_2"
+									 data-tag="grid" data-index="0">
+									<div class="layui-col-md3 widget-col-list column0" data-index="0" data-parentindex="0">
+										<div id="ReStartTime" class="layui-form-item active" data-id="ReStartTime"
+											 data-tag="date" data-index="0">
+											<label class="layui-form-label layui-form-required" style="width: 80px;">
+												开始时间:
+											</label>
+											<div class="layui-input-block" style="width:calc(100% - 110px);margin-left: 110px;">
+												<input id="dateReStartTime" name="ndateReStartTime" lay-verify="required"
+													   class="layui-input icon-date widget-date " style="line-height: 40px;">
+											</div>
+										</div>
+									</div>
+									<div class="layui-col-md3 widget-col-list column1" data-index="1" data-parentindex="0">
+										<div id="ReEndTime" class="layui-form-item active" data-id="ReEndTime"
+											 data-tag="date" data-index="0">
+											<label class="layui-form-label layui-form-required" style="width: 80px;">
+												结束世间:
+											</label>
+											<div class="layui-input-block" style="width:calc(100% - 110px);margin-left: 110px;">
+												<input id="dateReEndTime" name="ndateReEndTime" lay-verify="required" class="layui-input icon-date widget-date "
+													   style="line-height: 40px;">
+											</div>
+										</div>
+									</div>
+									<div class="layui-col-md3 widget-col-list column2" data-index="2" data-parentindex="0">
+										<div id="select_10" class="layui-form-item active" data-id="select_4" data-tag="select"
+											 data-index="0">
+											<label class="layui-form-label layui-form-required" style="width: 110px;">
+												快捷节点:
+											</label>
+											<div class="layui-input-block layui-form" lay-filter="select_4" style="margin-left: 140px;">
+
+												<select name="selectquick" lay-filter="quickTime" lay-verify="required" id="selectQuick">
+													<option value="def" selected="">
+														快速选择周期
+													</option>
+													<option value="toDay">
+														今日
+													</option>
+													<option value="yesterDay">
+														昨日
+													</option>
+													<option value="thisWeek">
+														本周
+													</option>
+													<option value="lastWeek">
+														上周
+													</option>
+													<option value="thisMonth">
+														本月
+													</option>
+													<option value="lastMonth">
+														上月
+													</option>
+												</select>
+
+											</div>
+										</div>
+									</div>
+									
+									<div class="layui-col-md3 widget-col-list column3" data-index="3" data-parentindex="0">
+										<div id="bottom_5" class="layui-form-item active" data-id="bottom_5" data-tag="bottom"
+											 data-index="0">
+											<div class="layui-input-block" style="margin-left: 30px;">
+												<button id="btn_search" type="button" class="layui-btn   custom-zc" ; onclick="showTable()">
+													<i class="layui-icon ">
+													</i>
+													确定
+												</button>
+											</div>
+
+										</div>
+									</div>
+
+								</div>
+
+							</form>
+							<form class="layui-form" style="height:calc(100% - 55px);width:100%" id="tablepanel">
+								<div class="layui-panel" id="gridpanel" style="width:100%;height: 100%;margin-bottom: 10px; ">
+									<table id="result" lay-filter="metafilter"></table> @*style="width: 100%; height: 100% "*@
+								</div>
+							</form>
+						</div>
+					</div>
+				</div>
+			</div>
+		</div>
+	</div>
+</body>
+</html>
diff --git a/HT.Cloud.Web/WaterCloud.Web.xml b/HT.Cloud.Web/WaterCloud.Web.xml
index 73b99ad..92aaa6c 100644
--- a/HT.Cloud.Web/WaterCloud.Web.xml
+++ b/HT.Cloud.Web/WaterCloud.Web.xml
@@ -123,6 +123,13 @@
             描 述：订单管理控制器类
             </summary>
         </member>
+        <member name="T:HT.Cloud.Web.Areas.ReportManage.Controllers.PenMeiHistoryAlarmController">
+            <summary>
+            创 建：cdl
+            日 期：2023-02-23 11:10
+            描 述：历史趋势控制器类
+            </summary>
+        </member>
         <member name="T:HT.Cloud.Web.Areas.ReportManage.Controllers.MetaTagAlarmController">
             <summary>
             创 建：cdl
diff --git a/HT.Cloud.Web/appsettings.json b/HT.Cloud.Web/appsettings.json
index 0ea9f8a..a464a9b 100644
--- a/HT.Cloud.Web/appsettings.json
+++ b/HT.Cloud.Web/appsettings.json
@@ -25,7 +25,7 @@
     "SqlMode": "TenantSql", //数据库模式多租户或者多库  "MoreSql"
     "ProjectPrefix": "watercloud", //项目中的前缀
     "ReviseSystem": false, //是否重置密码
-    "LoginErrorCount": 4, //登录错误次数
+    "LoginErrorCount": 18, //登录错误次数
     "IsCluster": false, //集群参数 开启时需要去quartz下载响应数据库
     "NeedClear": false, //是否删除定时调度任务
     "SqlConfig": [