diff --git a/HT.Cloud.Code/Model/SystemConfig.cs b/HT.Cloud.Code/Model/SystemConfig.cs
index 85ecee5..918703d 100644
--- a/HT.Cloud.Code/Model/SystemConfig.cs
+++ b/HT.Cloud.Code/Model/SystemConfig.cs
@@ -12,7 +12,7 @@ namespace HT.Cloud.Code.Model
 		/// <summary>
 		/// 系统备注
 		/// </summary>
-		public string GroupDescription { get; set; }
+		public string SystemDescription { get; set; }
 
 		/// <summary>
 		/// 是否是调试模式
diff --git a/HT.Cloud.Domain/Entity/SystemSecurity/RealTimeIOGroupEntity.cs b/HT.Cloud.Domain/Entity/SystemSecurity/RealTimeIOGroupEntity.cs
index a543360..7803927 100644
--- a/HT.Cloud.Domain/Entity/SystemSecurity/RealTimeIOGroupEntity.cs
+++ b/HT.Cloud.Domain/Entity/SystemSecurity/RealTimeIOGroupEntity.cs
@@ -42,5 +42,10 @@ namespace HT.Cloud.Domain.SystemSecurity
         /// </summary>
         [SugarColumn(ColumnName="IOBit", ColumnDescription = "IO位数",ColumnDataType = "varchar(255)", IsNullable = true)]
         public string IOBit { get; set; }
-    }
+		/// <summary>
+		/// IO位数
+		/// </summary>
+		[SugarColumn(ColumnName = "IOType", ColumnDescription = "数字量或模拟量", ColumnDataType = "varchar(128)", IsNullable = true)]
+		public string IOType { get; set; }
+	}
 }
diff --git a/HT.Cloud.Service/ReportManage/HistoryReportService.cs b/HT.Cloud.Service/ReportManage/HistoryReportService.cs
index 2d88b24..a1a8b19 100644
--- a/HT.Cloud.Service/ReportManage/HistoryReportService.cs
+++ b/HT.Cloud.Service/ReportManage/HistoryReportService.cs
@@ -224,11 +224,11 @@ namespace HT.Cloud.Service.ReportManage
             //return Report.ToJson();
         }
 
-        public async Task<string> GetReportDownLoad(DateTime startTime, DateTime endTime ,int interval)
+        public async Task<string> GetReportDownLoad(DateTime startTime, DateTime endTime ,int interval, string systemName)
         {
+			var groupName = _context.AsTenant().QueryableWithAttr<MetaGroupEntity>().Where(x => x.GroupDescription == systemName).First().GroupName;
 
-
-            var listSub = TimeInOneDay(startTime, endTime);
+			var listSub = TimeInOneDay(startTime, endTime);
 
             var pathroot = Directory.GetCurrentDirectory();
             string fileurl = "报表 " + startTime.ToString("yyyy年MM月dd日 HH.mm.ss") + "至" + endTime.ToString("yyyy年MM月dd日 HH.mm.ss") + "(" + "时间间隔" + interval.ToString() + "秒" + ")" + "_" + DateTime.Now.ToString("yyyy年MM月dd日 HH.mm.ss") + "导出" + ".xlsx";
@@ -244,17 +244,28 @@ namespace HT.Cloud.Service.ReportManage
                     var item = listSub[i];
                     var fstartTime = item.starttime;
                     var fendTime = item.endtime;
-                    string conn = _context.CurrentConnectionConfig.ConnectionString; //"Data Source=192.168.110.32;Initial Catalog=SCADA;User Id= sa;Password= Sa1qaz;Integrated Security=False;Encrypt=True;TrustServerCertificate=True;";
-                    SqlConnection sqlConnection = new SqlConnection(conn);
-                    SqlCommand command = new SqlCommand("dbo.Query_Report_YL_CHN", sqlConnection);
-                    command.CommandType = CommandType.StoredProcedure;
 
-                    command.Parameters.Add(new SqlParameter("@startdt", fstartTime.ToString("yyyy/MM/dd HH:mm:ss")));
-                    command.Parameters.Add(new SqlParameter("@enddt", fendTime.ToString("yyyy/MM/dd HH:mm:ss")));
-                    command.Parameters.Add(new SqlParameter("@timeinterval", interval));
-                    command.CommandTimeout = 999999;
-                    sqlConnection.Open();
-                    var reader = command.ExecuteReader();
+					SugarParameter[] sqlParameters ={
+				        new SugarParameter("@enddt", fendTime.ToString("yyyy-MM-dd HH:mm:ss")),
+				        new SugarParameter("@groupname", groupName),
+				        new SugarParameter("@startdt", fstartTime.ToString("yyyy-MM-dd HH:mm:ss")),
+						new SugarParameter("@timeinterval",interval)
+					};
+					var reader = _context.AsTenant().GetConnection(dataDBNumber).Ado.UseStoredProcedure().GetDataReader("Query_Report_YL_CHN", sqlParameters);
+
+					//string conn = _context.CurrentConnectionConfig.ConnectionString; //"Data Source=192.168.110.32;Initial Catalog=SCADA;User Id= sa;Password= Sa1qaz;Integrated Security=False;Encrypt=True;TrustServerCertificate=True;";
+     //               SqlConnection sqlConnection = new SqlConnection(conn);
+     //               SqlCommand command = new SqlCommand("dbo.Query_Report_YL_CHN", sqlConnection);
+     //               command.CommandType = CommandType.StoredProcedure;
+
+					//command.Parameters.Add(new SqlParameter("@enddt", fendTime.ToString("yyyy-MM-dd HH:mm:ss")));
+					//command.Parameters.Add(new SqlParameter("@groupname", groupName));
+					//command.Parameters.Add(new SqlParameter("@startdt", fstartTime.ToString("yyyy-MM-dd HH:mm:ss")));
+					//command.Parameters.Add(new SqlParameter("@timeinterval", interval));
+					
+     //               command.CommandTimeout = 999999;
+     //               sqlConnection.Open();
+     //               var reader = command.ExecuteReader();
 
 
 
diff --git a/HT.Cloud.Web/Areas/ChartsManage/Controllers/HistoryChartsController.cs b/HT.Cloud.Web/Areas/ChartsManage/Controllers/HistoryChartsController.cs
index f10f22f..68f599f 100644
--- a/HT.Cloud.Web/Areas/ChartsManage/Controllers/HistoryChartsController.cs
+++ b/HT.Cloud.Web/Areas/ChartsManage/Controllers/HistoryChartsController.cs
@@ -26,7 +26,7 @@ namespace HT.Cloud.Web.Areas.ChartsManage.Controllers
 		/// <summary>
 		/// 绑定数据仓库的数据库ID
 		/// </summary>
-		private string groupDescription = GlobalContext.SystemConfig.GroupDescription;
+		private string systemDescription = GlobalContext.SystemConfig.SystemDescription;
 
 
 		[HttpGet]
@@ -45,18 +45,16 @@ namespace HT.Cloud.Web.Areas.ChartsManage.Controllers
 		[HttpGet]
         public async Task<ActionResult> GetAllSubsystemTag()
         {
-			string systemName = "制粉系统";
 
-			var data = await _historyChartsService.GetAllSubsystemTag(systemName);
+			var data = await _historyChartsService.GetAllSubsystemTag(systemDescription);
             return Content(data);
         }
 
         [HttpPost]
         public async Task<ActionResult> GetSubsystemAllTag(string SubsysytemName)
 		{
-            string systemName = "制粉系统";
 
-			var data = await _historyChartsService.GetSubsystemAllTag(SubsysytemName, systemName);
+			var data = await _historyChartsService.GetSubsystemAllTag(SubsysytemName, systemDescription);
             return Content(data);
         }
 
diff --git a/HT.Cloud.Web/Areas/ChartsManage/Controllers/RtchartsController.cs b/HT.Cloud.Web/Areas/ChartsManage/Controllers/RtchartsController.cs
index e6926f5..5f29572 100644
--- a/HT.Cloud.Web/Areas/ChartsManage/Controllers/RtchartsController.cs
+++ b/HT.Cloud.Web/Areas/ChartsManage/Controllers/RtchartsController.cs
@@ -23,7 +23,7 @@ namespace HT.Cloud.Web.Areas.ChartsManage.Controllers
 		/// <summary>
 		/// 绑定数据仓库的数据库ID
 		/// </summary>
-		private string groupDescription = GlobalContext.SystemConfig.GroupDescription;
+		private string systemDescription = GlobalContext.SystemConfig.SystemDescription;
 		[HttpGet]
         public async Task<ActionResult> GetDriverGroupList()
         {
@@ -34,28 +34,28 @@ namespace HT.Cloud.Web.Areas.ChartsManage.Controllers
         [HttpGet]
 		public async Task<ActionResult> GetAllSubsystemTag()
 		{
-			var data = await _rtchartsService.GetAllSubsystemTag(groupDescription);
+			var data = await _rtchartsService.GetAllSubsystemTag(systemDescription);
 			return Content(data);
 		}
 
 		[HttpPost]
 		public async Task<ActionResult> GetSubsystemAllTag(ChartSubsysytemName chartSubsysytemName)
 		{
-			var data = await _rtchartsService.GetSubsystemAllTag(chartSubsysytemName.SubsysytemName, groupDescription);
+			var data = await _rtchartsService.GetSubsystemAllTag(chartSubsysytemName.SubsysytemName, systemDescription);
 			return Content(data);
 		}
 
 		[HttpPost]
 		public async Task<ActionResult> GetChartsTagValueInit(string[] charts_TagIDs)
 		{
-			var data = await _rtchartsService.GetChartsTagValueInit(charts_TagIDs, groupDescription);
+			var data = await _rtchartsService.GetChartsTagValueInit(charts_TagIDs, systemDescription);
 			return Content(data);
 		}
 
 		[HttpPost]
 		public async Task<ActionResult> GetChartsTagValue(string[] charts_TagIDs)
 		{
-			var data = await _rtchartsService.GetChartsTagValue(charts_TagIDs, groupDescription);
+			var data = await _rtchartsService.GetChartsTagValue(charts_TagIDs, systemDescription);
 			return Content(data);
 		}
 
diff --git a/HT.Cloud.Web/Areas/PenMeiChartsManage/Controllers/PenMeiHistoryChartsController.cs b/HT.Cloud.Web/Areas/PenMeiChartsManage/Controllers/PenMeiHistoryChartsController.cs
index 077e016..09fbf8c 100644
--- a/HT.Cloud.Web/Areas/PenMeiChartsManage/Controllers/PenMeiHistoryChartsController.cs
+++ b/HT.Cloud.Web/Areas/PenMeiChartsManage/Controllers/PenMeiHistoryChartsController.cs
@@ -28,7 +28,7 @@ namespace HT.Cloud.Web.Areas.ChartsManage.Controllers
 		/// <summary>
 		/// 绑定数据仓库的数据库ID
 		/// </summary>
-		private string groupDescription = GlobalContext.SystemConfig.GroupDescription;
+		private string systemDescription = GlobalContext.SystemConfig.SystemDescription;
 
 
 		[HttpGet]
@@ -47,16 +47,14 @@ namespace HT.Cloud.Web.Areas.ChartsManage.Controllers
 		[HttpGet]
         public async Task<ActionResult> GetAllSubsystemTag()
         {
-			string systemName = "喷煤系统";
-			var data = await _historyChartsService.GetAllSubsystemTag(systemName);
+			var data = await _historyChartsService.GetAllSubsystemTag(systemDescription);
             return Content(data);
         }
 
         [HttpPost]
         public async Task<ActionResult> GetSubsystemAllTag(string SubsysytemName)
         {
-			string systemName = "喷煤系统";
-			var data = await _historyChartsService.GetSubsystemAllTag(SubsysytemName, systemName);
+			var data = await _historyChartsService.GetSubsystemAllTag(SubsysytemName, systemDescription);
             return Content(data);
         }
 
diff --git a/HT.Cloud.Web/Areas/PenMeiChartsManage/Controllers/PenMeiHistoryTechChartsController.cs b/HT.Cloud.Web/Areas/PenMeiChartsManage/Controllers/PenMeiHistoryTechChartsController.cs
index b745631..345c9a6 100644
--- a/HT.Cloud.Web/Areas/PenMeiChartsManage/Controllers/PenMeiHistoryTechChartsController.cs
+++ b/HT.Cloud.Web/Areas/PenMeiChartsManage/Controllers/PenMeiHistoryTechChartsController.cs
@@ -28,13 +28,12 @@ namespace HT.Cloud.Web.Areas.ChartsManage.Controllers
 		/// <summary>
 		/// 绑定数据仓库的数据库ID
 		/// </summary>
-		private string groupDescription = GlobalContext.SystemConfig.GroupDescription;
+		private string systemDescription = GlobalContext.SystemConfig.SystemDescription;
 		[HttpPost]
         public async Task<ActionResult> GetAllTagList(ChartTagType chartTagType)
         {
-			var systemName = "喷煤系统";
 
-			var data = await _historyTechChartsService.GetAllTagList(systemName, chartTagType.ChartTagTypeName);
+			var data = await _historyTechChartsService.GetAllTagList(systemDescription, chartTagType.ChartTagTypeName);
             return Content(data);
         }
 
diff --git a/HT.Cloud.Web/Areas/PenMeiChartsManage/Controllers/PenMeiRtTechChartsController.cs b/HT.Cloud.Web/Areas/PenMeiChartsManage/Controllers/PenMeiRtTechChartsController.cs
index 42cf786..75de122 100644
--- a/HT.Cloud.Web/Areas/PenMeiChartsManage/Controllers/PenMeiRtTechChartsController.cs
+++ b/HT.Cloud.Web/Areas/PenMeiChartsManage/Controllers/PenMeiRtTechChartsController.cs
@@ -28,13 +28,12 @@ namespace HT.Cloud.Web.Areas.ChartsManage.Controllers
 		/// <summary>
 		/// 绑定数据仓库的数据库ID
 		/// </summary>
-		private string groupDescription = GlobalContext.SystemConfig.GroupDescription;
+		private string systemDescription = GlobalContext.SystemConfig.SystemDescription;
 		[HttpPost]
         public async Task<ActionResult> GetAllTagList(ChartTagType chartTagType)
         {
-			var systemName = "喷煤系统";
 
-			var data = await _rtTechChartsService.GetAllTagList(systemName, chartTagType.ChartTagTypeName);
+			var data = await _rtTechChartsService.GetAllTagList(systemDescription, chartTagType.ChartTagTypeName);
             return Content(data);
         }
 
@@ -69,16 +68,14 @@ namespace HT.Cloud.Web.Areas.ChartsManage.Controllers
 		[HttpPost]
 		public async Task<ActionResult> GetChartsTagValueInit(string[] charts_TagNames, string[] Tables)
 		{
-            var systemName = "喷煤系统";
-			var data = await _rtTechChartsService.GetChartsTagValueInit(charts_TagNames, Tables, systemName);
+			var data = await _rtTechChartsService.GetChartsTagValueInit(charts_TagNames, Tables, systemDescription);
 			return Content(data);
 		}
 
 		[HttpPost]
         public async Task<ActionResult> GetChartsTagValue(string[] charts_TagNames)
         {
-			var systemName = "喷煤系统";
-            var data = await _rtTechChartsService.GetChartsTagValue(charts_TagNames, systemName);
+            var data = await _rtTechChartsService.GetChartsTagValue(charts_TagNames, systemDescription);
             return Content(data);
         }
 
diff --git a/HT.Cloud.Web/Areas/PenMeiChartsManage/Controllers/PenMeiRtchartsController.cs b/HT.Cloud.Web/Areas/PenMeiChartsManage/Controllers/PenMeiRtchartsController.cs
index 059e17c..32616db 100644
--- a/HT.Cloud.Web/Areas/PenMeiChartsManage/Controllers/PenMeiRtchartsController.cs
+++ b/HT.Cloud.Web/Areas/PenMeiChartsManage/Controllers/PenMeiRtchartsController.cs
@@ -23,7 +23,7 @@ namespace HT.Cloud.Web.Areas.ChartsManage.Controllers
 		/// <summary>
 		/// 绑定数据仓库的数据库ID
 		/// </summary>
-		private string groupDescription = GlobalContext.SystemConfig.GroupDescription;
+		private string systemDescription = GlobalContext.SystemConfig.SystemDescription;
 		[HttpGet]
         public async Task<ActionResult> GetDriverGroupList()
         {
@@ -34,28 +34,28 @@ namespace HT.Cloud.Web.Areas.ChartsManage.Controllers
         [HttpGet]
 		public async Task<ActionResult> GetAllSubsystemTag()
 		{
-			var data = await _rtchartsService.GetAllSubsystemTag(groupDescription);
+			var data = await _rtchartsService.GetAllSubsystemTag(systemDescription);
 			return Content(data);
 		}
 
 		[HttpPost]
 		public async Task<ActionResult> GetSubsystemAllTag(ChartSubsysytemName chartSubsysytemName)
 		{
-			var data = await _rtchartsService.GetSubsystemAllTag(chartSubsysytemName.SubsysytemName, groupDescription);
+			var data = await _rtchartsService.GetSubsystemAllTag(chartSubsysytemName.SubsysytemName, systemDescription);
 			return Content(data);
 		}
 
 		[HttpPost]
 		public async Task<ActionResult> GetChartsTagValueInit(string[] charts_TagIDs)
 		{
-			var data = await _rtchartsService.GetChartsTagValueInit(charts_TagIDs, groupDescription);
+			var data = await _rtchartsService.GetChartsTagValueInit(charts_TagIDs, systemDescription);
 			return Content(data);
 		}
 
 		[HttpPost]
 		public async Task<ActionResult> GetChartsTagValue(string[] charts_TagIDs)
 		{
-			var data = await _rtchartsService.GetChartsTagValue(charts_TagIDs, groupDescription);
+			var data = await _rtchartsService.GetChartsTagValue(charts_TagIDs, systemDescription);
 			return Content(data);
 		}
 
diff --git a/HT.Cloud.Web/Areas/PenMeiReportManage/Controllers/PenMeiHistoryAlarmController.cs b/HT.Cloud.Web/Areas/PenMeiReportManage/Controllers/PenMeiHistoryAlarmController.cs
index e1268b3..a0aebc0 100644
--- a/HT.Cloud.Web/Areas/PenMeiReportManage/Controllers/PenMeiHistoryAlarmController.cs
+++ b/HT.Cloud.Web/Areas/PenMeiReportManage/Controllers/PenMeiHistoryAlarmController.cs
@@ -25,7 +25,7 @@ namespace HT.Cloud.Web.Areas.ReportManage.Controllers
 		/// <summary>
 		/// 绑定数据仓库的数据库ID
 		/// </summary>
-		private string groupDescription = GlobalContext.SystemConfig.GroupDescription;
+		private string systemDescription = GlobalContext.SystemConfig.SystemDescription;
 		[HttpGet]
 		public async Task<ActionResult> GetDriverGroupList()
 		{
@@ -36,62 +36,56 @@ namespace HT.Cloud.Web.Areas.ReportManage.Controllers
 		[HttpGet]
         public async Task<ActionResult> GetAllSubsystemTag()
         {
-            string systemName = "喷煤系统";
 
-			var data = await _historyAlarmService.GetAllSubsystemTag(systemName);
+			var data = await _historyAlarmService.GetAllSubsystemTag(systemDescription);
             return Content(data);
         }
 
         [HttpPost]
         public async Task<ActionResult> GetSubsystemAllTag(ChartSubsysytemName chartSubsysytemName)
         {
-			string systemName = "喷煤系统";
 
-			var data = await _historyAlarmService.GetSubsystemAllTag(chartSubsysytemName.SubsysytemName, systemName);
+			var data = await _historyAlarmService.GetSubsystemAllTag(chartSubsysytemName.SubsysytemName, systemDescription);
             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);
+            var data = await _historyAlarmService.GetAlarmRecord(TagID, StartTime, EndTime, systemDescription);
             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);
+			var data = await _historyAlarmService.GetAlarmRecordQuick(Alarmtype, StartTime, EndTime, systemDescription);
 			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);
+			var data = await _historyAlarmService.GetAlarmRecordQuickDesc(hhour, systemDescription);
 			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);
+			var data = await _historyAlarmService.GetAlarmSubSystem(AlarmName,systemDescription);
 			return Content(data);
 		}
 
@@ -115,36 +109,33 @@ namespace HT.Cloud.Web.Areas.ReportManage.Controllers
 		[HttpPost]
 		public async Task<ActionResult> GetAlarmACC(Alarm_ACC_Params alarm_ACC_Params)
 		{
-			string systemName = "喷煤系统";
 
 			var StartTime = Gettime(alarm_ACC_Params.StartTime);
 			var EndTime = Gettime(alarm_ACC_Params.EndTime);
 
-			var data = await _historyAlarmService.GetAlarm_ACC(StartTime, EndTime, systemName);
+			var data = await _historyAlarmService.GetAlarm_ACC(StartTime, EndTime, systemDescription);
 			return Content(data);
 		}
 
 		[HttpPost]
 		public async Task<ActionResult> GetAlarmHistogram(Alarm_Histogram_Params alarm_Histogram_Params)
 		{
-			string systemName = "喷煤系统";
 
 			var StartTime = Gettime_(alarm_Histogram_Params.StartTime);
 			var EndTime = Gettime_(alarm_Histogram_Params.EndTime);
 
-			var data = await _historyAlarmService.GetAlarm_Histogram(StartTime, EndTime, systemName);
+			var data = await _historyAlarmService.GetAlarm_Histogram(StartTime, EndTime, systemDescription);
 			return Content(data);
 		}
 
 		[HttpPost]
 		public async Task<ActionResult> GetAlarmPie(Alarm_Pie_Params alarm_Pie_Params)
 		{
-			string systemName = "喷煤系统";
 
 			var StartTime = Gettime(alarm_Pie_Params.StartTime);
 			var EndTime = Gettime(alarm_Pie_Params.EndTime);
 
-			var data = await _historyAlarmService.GetAlarm_Pie(StartTime, EndTime, systemName);
+			var data = await _historyAlarmService.GetAlarm_Pie(StartTime, EndTime, systemDescription);
 			return Content(data);
 		}
 
diff --git a/HT.Cloud.Web/Areas/PenMeiReportManage/Controllers/PenMeiHistoryAlarmNewController.cs b/HT.Cloud.Web/Areas/PenMeiReportManage/Controllers/PenMeiHistoryAlarmNewController.cs
index fa0ffa1..097660d 100644
--- a/HT.Cloud.Web/Areas/PenMeiReportManage/Controllers/PenMeiHistoryAlarmNewController.cs
+++ b/HT.Cloud.Web/Areas/PenMeiReportManage/Controllers/PenMeiHistoryAlarmNewController.cs
@@ -25,7 +25,7 @@ namespace HT.Cloud.Web.Areas.ReportManage.Controllers
 		/// <summary>
 		/// 绑定数据仓库的数据库ID
 		/// </summary>
-		private string groupDescription = GlobalContext.SystemConfig.GroupDescription;
+		private string systemDescription = GlobalContext.SystemConfig.SystemDescription;
 		[HttpGet]
 		public async Task<ActionResult> GetDriverGroupList()
 		{
@@ -36,73 +36,65 @@ namespace HT.Cloud.Web.Areas.ReportManage.Controllers
 		[HttpGet]
         public async Task<ActionResult> GetAllSubsystemTag()
         {
-            string systemName = "喷煤系统";
 
-			var data = await _historyAlarmService.GetAllSubsystemTag(systemName);
+			var data = await _historyAlarmService.GetAllSubsystemTag(systemDescription);
             return Content(data);
         }
 
         [HttpPost]
         public async Task<ActionResult> GetSubsystemAllTag(ChartSubsysytemName chartSubsysytemName)
         {
-			string systemName = "喷煤系统";
 
-			var data = await _historyAlarmService.GetSubsystemAllTag(chartSubsysytemName.SubsysytemName, systemName);
+			var data = await _historyAlarmService.GetSubsystemAllTag(chartSubsysytemName.SubsysytemName, systemDescription);
             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);
+            var data = await _historyAlarmService.GetAlarmRecord(TagID, StartTime, EndTime, systemDescription);
             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);
+			var data = await _historyAlarmService.GetAlarmRecordQuick(Alarmtype, StartTime, EndTime, systemDescription);
 			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);
+			var data = await _historyAlarmService.GetAlarmRecordQuickDesc(hhour, systemDescription);
 			return Content(data);
 		}
 		[HttpPost]
 		public async Task<ActionResult> GetAlarmHistory(Alarm_History_Params alarm_History_Params)
 		{
-			string systemName = "喷煤系统";
 
 			var StartTime = Gettime(alarm_History_Params.StartTime);
 			var EndTime = Gettime(alarm_History_Params.EndTime);
 
-			var data = await _historyAlarmService.GetAlarmHistory(StartTime, EndTime, systemName);
+			var data = await _historyAlarmService.GetAlarmHistory(StartTime, EndTime, systemDescription);
 			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);
+			var data = await _historyAlarmService.GetAlarmSubSystem(AlarmName,systemDescription);
 			return Content(data);
 		}
 
@@ -126,36 +118,31 @@ namespace HT.Cloud.Web.Areas.ReportManage.Controllers
 		[HttpPost]
 		public async Task<ActionResult> GetAlarmACC(Alarm_ACC_Params alarm_ACC_Params)
 		{
-			string systemName = "喷煤系统";
-
 			var StartTime = Gettime(alarm_ACC_Params.StartTime);
 			var EndTime = Gettime(alarm_ACC_Params.EndTime);
 
-			var data = await _historyAlarmService.GetAlarm_ACC(StartTime, EndTime, systemName);
+			var data = await _historyAlarmService.GetAlarm_ACC(StartTime, EndTime, systemDescription);
 			return Content(data);
 		}
 
 		[HttpPost]
 		public async Task<ActionResult> GetAlarmHistogram(Alarm_Histogram_Params alarm_Histogram_Params)
 		{
-			string systemName = "喷煤系统";
 
 			var StartTime = Gettime_(alarm_Histogram_Params.StartTime);
 			var EndTime = Gettime_(alarm_Histogram_Params.EndTime);
 
-			var data = await _historyAlarmService.GetAlarm_Histogram(StartTime, EndTime, systemName);
+			var data = await _historyAlarmService.GetAlarm_Histogram(StartTime, EndTime, systemDescription);
 			return Content(data);
 		}
 
 		[HttpPost]
 		public async Task<ActionResult> GetAlarmPie(Alarm_Pie_Params alarm_Pie_Params)
 		{
-			string systemName = "喷煤系统";
-
 			var StartTime = Gettime(alarm_Pie_Params.StartTime);
 			var EndTime = Gettime(alarm_Pie_Params.EndTime);
 
-			var data = await _historyAlarmService.GetAlarm_Pie(StartTime, EndTime, systemName);
+			var data = await _historyAlarmService.GetAlarm_Pie(StartTime, EndTime, systemDescription);
 			return Content(data);
 		}
 
diff --git a/HT.Cloud.Web/Areas/PenMeiReportManage/Controllers/PenMeiHistoryAlarmNewNewController.cs b/HT.Cloud.Web/Areas/PenMeiReportManage/Controllers/PenMeiHistoryAlarmNewNewController.cs
index 1db5016..88d82dd 100644
--- a/HT.Cloud.Web/Areas/PenMeiReportManage/Controllers/PenMeiHistoryAlarmNewNewController.cs
+++ b/HT.Cloud.Web/Areas/PenMeiReportManage/Controllers/PenMeiHistoryAlarmNewNewController.cs
@@ -27,7 +27,7 @@ namespace HT.Cloud.Web.Areas.ReportManage.Controllers
 		/// <summary>
 		/// 绑定数据仓库的数据库ID
 		/// </summary>
-		private string groupDescription = GlobalContext.SystemConfig.GroupDescription;
+		private string systemDescription = GlobalContext.SystemConfig.SystemDescription;
 		[HttpGet]
 		public async Task<ActionResult> GetDriverGroupList()
 		{
@@ -38,73 +38,63 @@ namespace HT.Cloud.Web.Areas.ReportManage.Controllers
 		[HttpGet]
         public async Task<ActionResult> GetAllSubsystemTag()
         {
-            string systemName = "喷煤系统";
-
-			var data = await _historyAlarmService.GetAllSubsystemTag(systemName);
+			var data = await _historyAlarmService.GetAllSubsystemTag(systemDescription);
             return Content(data);
         }
 
         [HttpPost]
         public async Task<ActionResult> GetSubsystemAllTag(ChartSubsysytemName chartSubsysytemName)
         {
-			string systemName = "喷煤系统";
-
-			var data = await _historyAlarmService.GetSubsystemAllTag(chartSubsysytemName.SubsysytemName, systemName);
+			var data = await _historyAlarmService.GetSubsystemAllTag(chartSubsysytemName.SubsysytemName, systemDescription);
             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);
+            var data = await _historyAlarmService.GetAlarmRecord(TagID, StartTime, EndTime, systemDescription);
             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);
+			var data = await _historyAlarmService.GetAlarmRecordQuick(Alarmtype, StartTime, EndTime, systemDescription);
 			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);
+			var data = await _historyAlarmService.GetAlarmRecordQuickDesc(hhour, systemDescription);
 			return Content(data);
 		}
 		[HttpPost]
 		public async Task<ActionResult> GetAlarmHistory(Alarm_History_Params alarm_History_Params)
 		{
-			string systemName = "喷煤系统";
 
 			var StartTime = Gettime(alarm_History_Params.StartTime);
 			var EndTime = Gettime(alarm_History_Params.EndTime);
 
-			var data = await _historyAlarmService.GetAlarmHistory(StartTime, EndTime, systemName);
+			var data = await _historyAlarmService.GetAlarmHistory(StartTime, EndTime, systemDescription);
 			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);
+			var data = await _historyAlarmService.GetAlarmSubSystem(AlarmName,systemDescription);
 			return Content(data);
 		}
 
@@ -128,71 +118,65 @@ namespace HT.Cloud.Web.Areas.ReportManage.Controllers
 		[HttpPost]
 		public async Task<ActionResult> GetAlarmACC(Alarm_ACC_Params alarm_ACC_Params)
 		{
-			string systemName = "喷煤系统";
 
 			var StartTime = Gettime(alarm_ACC_Params.StartTime);
 			var EndTime = Gettime(alarm_ACC_Params.EndTime);
 
-			var data = await _historyAlarmService.GetAlarm_ACC(StartTime, EndTime, systemName);
+			var data = await _historyAlarmService.GetAlarm_ACC(StartTime, EndTime, systemDescription);
 			return Content(data);
 		}
 
 		[HttpPost]
 		public async Task<ActionResult> GetAlarmHistogram(Alarm_Histogram_Params alarm_Histogram_Params)
 		{
-			string systemName = "喷煤系统";
 
 			var StartTime = Gettime_(alarm_Histogram_Params.StartTime);
 			var EndTime = Gettime_(alarm_Histogram_Params.EndTime);
 
-			var data = await _historyAlarmService.GetAlarm_Histogram(StartTime, EndTime, systemName);
+			var data = await _historyAlarmService.GetAlarm_Histogram(StartTime, EndTime, systemDescription);
 			return Content(data);
 		}
 
 		[HttpPost]
 		public async Task<ActionResult> GetAlarmPie(Alarm_Pie_Params alarm_Pie_Params)
 		{
-			string systemName = "喷煤系统";
 
 			var StartTime = Gettime(alarm_Pie_Params.StartTime);
 			var EndTime = Gettime(alarm_Pie_Params.EndTime);
 
-			var data = await _historyAlarmService.GetAlarm_Pie(StartTime, EndTime, systemName);
+			var data = await _historyAlarmService.GetAlarm_Pie(StartTime, EndTime, systemDescription);
 			return Content(data);
 		}
 
 		[HttpPost]
 		public async Task<ActionResult> GetAlarmRecordForTagName(Alarm_ParamsForTagName charts_Params)
 		{
-			string systemName = "喷煤系统";
 
 			string Description = charts_Params.Description;
 			var StartTime = Gettime(charts_Params.StartTime);
 			var EndTime = Gettime(charts_Params.EndTime);
 
-			var data = await _historyAlarmService.GetAlarmRecordForTagName(Description, StartTime, EndTime, systemName);
+			var data = await _historyAlarmService.GetAlarmRecordForTagName(Description, StartTime, EndTime, systemDescription);
 			return Content(data);
 		}
 
 		public async Task<ActionResult> GetAlarm_CS(Alarm_CS alarm_CS)
 		{
-			string systemName = "喷煤系统";
 
 			var StartTime = Gettime_(alarm_CS.StartTime);
 			var EndTime = Gettime_(alarm_CS.EndTime);
 
-			var data = await _historyAlarmService.GetAlarm_CS(StartTime, EndTime, systemName);
+			var data = await _historyAlarmService.GetAlarm_CS(StartTime, EndTime, systemDescription);
 			return Content(data);
 		}
 
 		public async Task<ActionResult> GetAlarm_Ztime(Alarm_Ztime alarm_Ztime)
 		{
-			string systemName = "喷煤系统";
 
 			var StartTime = Gettime_(alarm_Ztime.StartTime);
 			var EndTime = Gettime_(alarm_Ztime.EndTime);
 
-			var data = await _historyAlarmService.GetAlarm_Ztime(StartTime, EndTime, systemName);
+			var data = await _historyAlarmService.GetAlarm_Ztime(StartTime, EndTime, systemDescription);
 			return Content(data);
 		}
 		/*
diff --git a/HT.Cloud.Web/Areas/PenMeiReportManage/Controllers/PenMeiHistoryReportController.cs b/HT.Cloud.Web/Areas/PenMeiReportManage/Controllers/PenMeiHistoryReportController.cs
index 2c0fab5..bbf1a6f 100644
--- a/HT.Cloud.Web/Areas/PenMeiReportManage/Controllers/PenMeiHistoryReportController.cs
+++ b/HT.Cloud.Web/Areas/PenMeiReportManage/Controllers/PenMeiHistoryReportController.cs
@@ -23,7 +23,7 @@ namespace HT.Cloud.Web.Areas.PenMeiReportManage.Controllers
 		/// <summary>
 		/// 绑定数据仓库的数据库ID
 		/// </summary>
-		private string groupDescription = GlobalContext.SystemConfig.GroupDescription;
+		private string systemDescription = GlobalContext.SystemConfig.SystemDescription;
 		[HttpGet]
         public async Task<ActionResult> GetDriverGroupList()
         {
@@ -90,14 +90,13 @@ namespace HT.Cloud.Web.Areas.PenMeiReportManage.Controllers
         [IgnoreAntiforgeryToken]
         public async Task<ActionResult> GetReportNewPage(string page, string limit,string StartTime,string EndTime, string Interval)
         {
-            var systemName = "喷煤系统";
             //string page = Request.Query["page"].ToString();
             //string limit = Request.Query["limit"].ToString();
             //var page = Gettime(asyncparam.page.ToString());
             //var limit = Gettime(asyncparam.limit.ToString());
             var startTime = Gettime(StartTime);
             var endTime = Gettime(EndTime);
-            var data = await _historyReportService.GetReportNewAsync(page, limit, startTime, endTime, Interval, systemName);
+            var data = await _historyReportService.GetReportNewAsync(page, limit, startTime, endTime, Interval, systemDescription);
             //var con = JsonConvert.SerializeObject(data);
             return Content(data);
         }
@@ -106,8 +105,7 @@ namespace HT.Cloud.Web.Areas.PenMeiReportManage.Controllers
         {
             //var StartTime = reportparam.StartTime.ToString("yyyy-MM-dd HH:mm:ss");
             //var EndTime = reportparam.EndTime.ToString("yyyy-MM-dd HH:mm:ss");
-            var systemName = "喷煤系统";
-            var data = await _historyReportService.GetReportFirstHead(systemName);
+            var data = await _historyReportService.GetReportFirstHead(systemDescription);
             return Content(data);
         }
         [HttpGet]
@@ -115,20 +113,19 @@ namespace HT.Cloud.Web.Areas.PenMeiReportManage.Controllers
         {
             //var StartTime = reportparam.StartTime.ToString("yyyy-MM-dd HH:mm:ss");
             //var EndTime = reportparam.EndTime.ToString("yyyy-MM-dd HH:mm:ss");
-            var systemName = "喷煤系统";
-            var data = await _historyReportService.GetReportSecondHead(systemName);
+            var data = await _historyReportService.GetReportSecondHead(systemDescription);
             return Content(data);
         }
         [HttpPost]
         public async Task<ActionResult> GetReportDownLoad(DownLoadparam downLoadparam)
         {
-            //var StartTime = reportparam.StartTime.ToString("yyyy-MM-dd HH:mm:ss");
-            //var EndTime = reportparam.EndTime.ToString("yyyy-MM-dd HH:mm:ss");
-            DateTime start = new DateTime(1970, 1, 1, 0, 0, 0, DateTimeKind.Utc);
+			//var StartTime = reportparam.StartTime.ToString("yyyy-MM-dd HH:mm:ss");
+			//var EndTime = reportparam.EndTime.ToString("yyyy-MM-dd HH:mm:ss");
+			DateTime start = new DateTime(1970, 1, 1, 0, 0, 0, DateTimeKind.Utc);
             DateTime StartTime = start.AddMilliseconds(downLoadparam.StartTime).ToLocalTime();
             DateTime EndTime = start.AddMilliseconds(downLoadparam.EndTime).ToLocalTime();
             int Interval = int.Parse(downLoadparam.Interval.ToString());
-            var data = await _historyReportService.GetReportDownLoad(StartTime, EndTime, Interval);
+            var data = await _historyReportService.GetReportDownLoad(StartTime, EndTime, Interval, systemDescription);
             return Content(data);
         }
         public string Gettime(string longtime)
diff --git a/HT.Cloud.Web/Areas/PenMeiReportManage/Controllers/PenMeiJMReportController.cs b/HT.Cloud.Web/Areas/PenMeiReportManage/Controllers/PenMeiJMReportController.cs
index d9291d5..1a83092 100644
--- a/HT.Cloud.Web/Areas/PenMeiReportManage/Controllers/PenMeiJMReportController.cs
+++ b/HT.Cloud.Web/Areas/PenMeiReportManage/Controllers/PenMeiJMReportController.cs
@@ -21,10 +21,13 @@ namespace HT.Cloud.Web.Areas.SystemSecurity.Controllers
 	{
 		public ServerStateService _serverStateService { get; set; }
 
-		public RealTimeIOStateService _realTimeIOState { get; set; }	
+		public RealTimeIOStateService _realTimeIOState { get; set; }
+        /// <summary>
+        /// 绑定数据仓库的数据库ID
+        /// </summary>
+        private string systemDescription = GlobalContext.SystemConfig.SystemDescription;
 
-
-		[HttpGet]
+        [HttpGet]
 		public async Task<ActionResult> GetServerDataJson()
 		{
 			return await Task.Run(() =>
@@ -68,7 +71,7 @@ namespace HT.Cloud.Web.Areas.SystemSecurity.Controllers
 		[HttpGet]
 		public async Task<ActionResult> GetRealIOGroup()
 		{
-			var listgroup = _realTimeIOState.GetIOGroup("喷煤系统");
+			var listgroup = _realTimeIOState.GetIOGroup(systemDescription);
 			
 			return Content(listgroup.ToJson());
 		}
@@ -76,15 +79,15 @@ namespace HT.Cloud.Web.Areas.SystemSecurity.Controllers
 		public async Task<ActionResult> GetRealIOInfo()
 		{
 			
-			var listinfo = _realTimeIOState.GetIOInfo("喷煤系统");
+			var listinfo = _realTimeIOState.GetIOInfo(systemDescription);
 
 			return Content(listinfo.ToJson());
 		}
 		[HttpGet]
 		public async Task<ActionResult> GetRealIOState()
 		{
-			var listgroup = _realTimeIOState.GetIOGroup("喷煤系统");
-			var listinfo = _realTimeIOState.GetIOInfo("喷煤系统");
+			var listgroup = _realTimeIOState.GetIOGroup(systemDescription);
+			var listinfo = _realTimeIOState.GetIOInfo(systemDescription);
 			var data = _realTimeIOState.GetRtData();
 			return Content(data.Result);
 		}
diff --git a/HT.Cloud.Web/Areas/PenMeiReportManage/Controllers/PenMeiJMReportNewController.cs b/HT.Cloud.Web/Areas/PenMeiReportManage/Controllers/PenMeiJMReportNewController.cs
index 87cb6cb..1481e68 100644
--- a/HT.Cloud.Web/Areas/PenMeiReportManage/Controllers/PenMeiJMReportNewController.cs
+++ b/HT.Cloud.Web/Areas/PenMeiReportManage/Controllers/PenMeiJMReportNewController.cs
@@ -21,10 +21,13 @@ namespace HT.Cloud.Web.Areas.SystemSecurity.Controllers
 	{
 		public ServerStateService _serverStateService { get; set; }
 
-		public RealTimeIOStateService _realTimeIOState { get; set; }	
+		public RealTimeIOStateService _realTimeIOState { get; set; }
 
-
-		[HttpGet]
+        /// <summary>
+        /// 绑定数据仓库的数据库ID
+        /// </summary>
+        private string systemDescription = GlobalContext.SystemConfig.SystemDescription;
+        [HttpGet]
 		public async Task<ActionResult> GetServerDataJson()
 		{
 			return await Task.Run(() =>
@@ -68,7 +71,7 @@ namespace HT.Cloud.Web.Areas.SystemSecurity.Controllers
 		[HttpGet]
 		public async Task<ActionResult> GetRealIOGroup()
 		{
-			var listgroup = _realTimeIOState.GetIOGroup("喷煤系统");
+			var listgroup = _realTimeIOState.GetIOGroup(systemDescription);
 			
 			return Content(listgroup.ToJson());
 		}
@@ -76,15 +79,15 @@ namespace HT.Cloud.Web.Areas.SystemSecurity.Controllers
 		public async Task<ActionResult> GetRealIOInfo()
 		{
 			
-			var listinfo = _realTimeIOState.GetIOInfo("喷煤系统");
+			var listinfo = _realTimeIOState.GetIOInfo(systemDescription);
 
 			return Content(listinfo.ToJson());
 		}
 		[HttpGet]
 		public async Task<ActionResult> GetRealIOState()
 		{
-			var listgroup = _realTimeIOState.GetIOGroup("喷煤系统");
-			var listinfo = _realTimeIOState.GetIOInfo("喷煤系统");
+			var listgroup = _realTimeIOState.GetIOGroup(systemDescription);
+			var listinfo = _realTimeIOState.GetIOInfo(systemDescription);
 			var data = _realTimeIOState.GetRtData();
 			return Content(data.Result);
 		}
diff --git a/HT.Cloud.Web/Areas/PenMeiReportManage/Controllers/PenMeiNetWorkStateController.cs b/HT.Cloud.Web/Areas/PenMeiReportManage/Controllers/PenMeiNetWorkStateController.cs
index 936f3c0..c75729f 100644
--- a/HT.Cloud.Web/Areas/PenMeiReportManage/Controllers/PenMeiNetWorkStateController.cs
+++ b/HT.Cloud.Web/Areas/PenMeiReportManage/Controllers/PenMeiNetWorkStateController.cs
@@ -21,10 +21,13 @@ namespace HT.Cloud.Web.Areas.SystemSecurity.Controllers
 	{
 		public ServerStateService _serverStateService { get; set; }
 
-		public RealTimeIOStateService _realTimeIOState { get; set; }	
+		public RealTimeIOStateService _realTimeIOState { get; set; }
 
-
-		[HttpGet]
+        /// <summary>
+        /// 绑定数据仓库的数据库ID
+        /// </summary>
+        private string systemDescription = GlobalContext.SystemConfig.SystemDescription;
+        [HttpGet]
 		public async Task<ActionResult> GetServerDataJson()
 		{
 			return await Task.Run(() =>
@@ -68,7 +71,7 @@ namespace HT.Cloud.Web.Areas.SystemSecurity.Controllers
 		[HttpGet]
 		public async Task<ActionResult> GetRealIOGroup()
 		{
-			var listgroup = _realTimeIOState.GetIOGroup("喷煤系统");
+			var listgroup = _realTimeIOState.GetIOGroup(systemDescription);
 			
 			return Content(listgroup.ToJson());
 		}
@@ -76,15 +79,15 @@ namespace HT.Cloud.Web.Areas.SystemSecurity.Controllers
 		public async Task<ActionResult> GetRealIOInfo()
 		{
 			
-			var listinfo = _realTimeIOState.GetIOInfo("喷煤系统");
+			var listinfo = _realTimeIOState.GetIOInfo(systemDescription);
 
 			return Content(listinfo.ToJson());
 		}
 		[HttpGet]
 		public async Task<ActionResult> GetRealIOState()
 		{
-			var listgroup = _realTimeIOState.GetIOGroup("喷煤系统");
-			var listinfo = _realTimeIOState.GetIOInfo("喷煤系统");
+			var listgroup = _realTimeIOState.GetIOGroup(systemDescription);
+			var listinfo = _realTimeIOState.GetIOInfo(systemDescription);
 			var data = _realTimeIOState.GetRtData();
 			return Content(data.Result);
 		}
diff --git a/HT.Cloud.Web/Areas/PenMeiReportManage/Controllers/PenMeiNetWorkStateControllerNew.cs b/HT.Cloud.Web/Areas/PenMeiReportManage/Controllers/PenMeiNetWorkStateControllerNew.cs
index 4f6cb03..5b190a6 100644
--- a/HT.Cloud.Web/Areas/PenMeiReportManage/Controllers/PenMeiNetWorkStateControllerNew.cs
+++ b/HT.Cloud.Web/Areas/PenMeiReportManage/Controllers/PenMeiNetWorkStateControllerNew.cs
@@ -21,10 +21,13 @@ namespace HT.Cloud.Web.Areas.SystemSecurity.Controllers
 	{
 		public ServerStateService _serverStateService { get; set; }
 
-		public RealTimeIOStateService _realTimeIOState { get; set; }	
+		public RealTimeIOStateService _realTimeIOState { get; set; }
+        /// <summary>
+        /// 绑定数据仓库的数据库ID
+        /// </summary>
+        private string systemDescription = GlobalContext.SystemConfig.SystemDescription;
 
-
-		[HttpGet]
+        [HttpGet]
 		public async Task<ActionResult> GetServerDataJson()
 		{
 			return await Task.Run(() =>
@@ -68,7 +71,7 @@ namespace HT.Cloud.Web.Areas.SystemSecurity.Controllers
 		[HttpGet]
 		public async Task<ActionResult> GetRealIOGroup()
 		{
-			var listgroup = _realTimeIOState.GetIOGroup("喷煤系统");
+			var listgroup = _realTimeIOState.GetIOGroup(systemDescription);
 			
 			return Content(listgroup.ToJson());
 		}
@@ -76,15 +79,15 @@ namespace HT.Cloud.Web.Areas.SystemSecurity.Controllers
 		public async Task<ActionResult> GetRealIOInfo()
 		{
 			
-			var listinfo = _realTimeIOState.GetIOInfo("喷煤系统");
+			var listinfo = _realTimeIOState.GetIOInfo(systemDescription);
 
 			return Content(listinfo.ToJson());
 		}
 		[HttpGet]
 		public async Task<ActionResult> GetRealIOState()
 		{
-			var listgroup = _realTimeIOState.GetIOGroup("喷煤系统");
-			var listinfo = _realTimeIOState.GetIOInfo("喷煤系统");
+			var listgroup = _realTimeIOState.GetIOGroup(systemDescription);
+			var listinfo = _realTimeIOState.GetIOInfo(systemDescription);
 			var data = _realTimeIOState.GetRtData();
 			return Content(data.Result);
 		}
diff --git a/HT.Cloud.Web/Areas/PenMeiReportManage/Controllers/RtReportController.cs b/HT.Cloud.Web/Areas/PenMeiReportManage/Controllers/RtReportController.cs
index 127f047..017d325 100644
--- a/HT.Cloud.Web/Areas/PenMeiReportManage/Controllers/RtReportController.cs
+++ b/HT.Cloud.Web/Areas/PenMeiReportManage/Controllers/RtReportController.cs
@@ -14,7 +14,7 @@ namespace HT.Cloud.Web.Areas.PenMeiReportManage.Controllers
 		/// <summary>
 		/// 绑定数据仓库的数据库ID
 		/// </summary>
-		private string groupDescription = GlobalContext.SystemConfig.GroupDescription;
+		private string systemDescription = GlobalContext.SystemConfig.SystemDescription;
 		[HttpGet]
         public async Task<ActionResult> GetRtData()
         {
diff --git a/HT.Cloud.Web/Areas/PenMeiReportManage/Views/PenMeiJMReportNew/Index - 副本 (2).cshtml b/HT.Cloud.Web/Areas/PenMeiReportManage/Views/PenMeiJMReportNew/Index - 副本 (2).cshtml
new file mode 100644
index 0000000..4eb7863
--- /dev/null
+++ b/HT.Cloud.Web/Areas/PenMeiReportManage/Views/PenMeiJMReportNew/Index - 副本 (2).cshtml	
@@ -0,0 +1,2412 @@
+@{
+    ViewBag.Title = "Index";
+    Layout = "~/Views/Shared/_Index.cshtml";
+}
+@inject Microsoft.AspNetCore.Hosting.IWebHostEnvironment env
+<meta name="renderer" content="webkit">
+<meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
+<meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1">
+<style>
+	
+
+    .layui-card {
+        border: 1px solid #f2f2f2;
+        border-radius: 5px;
+    }
+
+    .icon {
+        margin-right: 10px;
+        color: #1aa094;
+    }
+
+    .icon-cray {
+        color: #ffb800 !important;
+    }
+
+    .icon-blue {
+        color: #1e9fff !important;
+    }
+
+    .icon-tip {
+        color: #ff5722 !important;
+    }
+
+    .layuimini-qiuck-module {
+        text-align: center;
+        margin-top: 10px
+    }
+
+        .layuimini-qiuck-module a i {
+            display: inline-block;
+            width: 100%;
+            height: 60px;
+            line-height: 60px;
+            text-align: center;
+            border-radius: 2px;
+            font-size: 30px;
+            background-color: #F8F8F8;
+            color: #333;
+            transition: all .3s;
+            -webkit-transition: all .3s;
+        }
+
+        .layuimini-qiuck-module a cite {
+            position: relative;
+            top: 2px;
+            display: block;
+            color: #666;
+            text-overflow: ellipsis;
+            overflow: hidden;
+            white-space: nowrap;
+            font-size: 14px;
+        }
+
+    .welcome-module {
+        width: 100%;
+        height: 210px;
+    }
+
+    .panel {
+        background-color: #fff;
+        border: 1px solid transparent;
+        border-radius: 3px;
+        -webkit-box-shadow: 0 1px 1px rgba(0,0,0,.05);
+        box-shadow: 0 1px 1px rgba(0,0,0,.05)
+    }
+
+    .panel-body {
+        padding: 10px
+    }
+
+    .panel-title {
+        margin-top: 0;
+        margin-bottom: 0;
+        font-size: 12px;
+        color: inherit
+    }
+
+    .label {
+        display: inline;
+        padding: .2em .6em .3em;
+        font-size: 75%;
+        font-weight: 700;
+        line-height: 1;
+        color: #fff;
+        text-align: center;
+        white-space: nowrap;
+        vertical-align: baseline;
+        border-radius: .25em;
+        margin-top: .3em;
+    }
+
+    .label {
+        display: inline;
+        padding: .2em .6em .3em;
+        font-size: 75%;
+        font-weight: 700;
+        line-height: 1;
+        color: #fff;
+        text-align: center;
+        white-space: nowrap;
+        vertical-align: baseline;
+        border-radius: .25em;
+        margin-top: .3em;
+    }
+
+    .layui-red {
+        color: red
+    }
+
+    .main_btn > p {
+        height: 40px;
+    }
+
+    .layui-bg-number {
+        background-color: #F8F8F8;
+    }
+
+    .layuimini-notice:hover {
+        background: #f6f6f6;
+    }
+
+    .layuimini-notice {
+        padding: 7px 16px;
+        clear: both;
+        font-size: 12px !important;
+        cursor: pointer;
+        position: relative;
+        transition: background 0.2s ease-in-out;
+    }
+
+    .layuimini-notice-title, .layuimini-notice-label {
+        padding-right: 70px !important;
+        text-overflow: ellipsis !important;
+        overflow: hidden !important;
+        white-space: nowrap !important;
+    }
+
+    .layuimini-notice-title {
+        line-height: 28px;
+        font-size: 14px;
+    }
+
+    .layuimini-notice-extra {
+        position: absolute;
+        top: 50%;
+        margin-top: -8px;
+        right: 16px;
+        display: inline-block;
+        height: 16px;
+        color: #999;
+    }
+</style>
+<script>
+	layui.use(['layer', 'echarts', 'common'], function () {
+		var $ = layui.jquery,
+			layer = layui.layer,
+			common = layui.common,
+			echarts = layui.echarts;
+		wcLoading.close();
+
+		//基准配置项
+		const width_iobox = 300;
+		const width_iobox_16bit = 200;
+		const width_iobox_8bit = 200;
+		const height_iobox = 810;
+
+		const width_iobox_cpu = 200;
+		const width_iobox_cm = 200;
+
+		//拖拽
+		const draggable_dev = true;
+		
+		// //开发色彩
+		// const fill_backgroud = '#8d98a3';
+		// const fill_iobox = '#8d98a3';
+		// const stroke_iobox = '#494d52';;
+		// const stroke_iobox_line = '#42444a';
+		// const stroke_iobox_spiltline = '#474b58';
+		// const fill_top_name = '#f1f4f6';
+		// const fill_top_name_value = '#f1f4f6';
+		// const fill_rect = '#a4a9ab';
+		// const fill_rect_text_name = '#e5e9ec';
+		// const fill_rect_text_description = '#f3f6f8';
+		// const fill_rect_io_on = '#aaff00';
+		// const fill_rect_io_off = '#a3a6a9';
+
+		//新版色彩
+		const fill_backgroud = '#28333e';
+		//const fill_backgroud = '#2a0056';
+		// const fill_iobox = '#2492e9';//00
+		// const fill_iobox = '#345266';//001
+		const fill_iobox = '#345b87';//002
+		// const fill_iobox = '#50657a';//003
+		// const fill_iobox = '#334b64';//004
+		//const fill_iobox = '#3d5062';//005
+		const stroke_iobox = '#494d52';;
+		const stroke_iobox_line = '#42444a';
+		const stroke_iobox_spiltline = '#474b58';
+		const fill_top_name = '#ffffff';
+		const fill_top_name_value = '#ffffff';
+		const fill_rect = '#cecece';
+		const fill_rect_text_name = '#ffffff';
+		//const fill_rect_text_name = '#02f2e0';
+		const fill_rect_text_description = '#ffffff';
+		//const fill_rect_text_description = '#02f2e0';
+		const fill_rect_io_on = '#00ff55';//'#00ff7f'
+		//const fill_rect_io_on = '#00ff7f'
+		const fill_rect_io_off = '#cecece';
+
+		//32IO配置项
+		const top_row_height_32bit = 25;
+		const separator_32bit = 15;
+		const io_row_height_32bit = 45;
+
+		const io_row_y_offset_32bit = 13;
+		const io_row_left_x_name_32bit = 10;
+		const io_row_left_x_value_32bit = 65;
+		const io_row_right_x_name_32bit = 160;
+		const io_row_left_width_name_32bit = 40;
+		const io_row_left_width_value_32bit = 55;
+		const io_row_right_width_name_32bit = 20;
+		const io_row_right_width_value_32bit = 130;
+
+
+
+		const rect_height_32bit = 10;
+
+		const rect_top_y_offset_32bit = 95;
+		const rect_bottom_y_offset_32bit = 65;
+
+		const io_rect_left_x_32bit = 10;
+		const io_rect_name_left_x_32bit = 35;
+		const io_rect_description_left_x_32bit = 35;
+		const io_rect_right_x_32bit = 270;
+		const io_rect_name_right_x_32bit = 225;
+		const io_rect_description_right_x_32bit = 155;
+
+		const io_rect_left_y_offset_32bit = 0;
+		const io_rect_name_left_y_offset_32bit = -7;
+		const io_rect_description_left_y_offset_32bit = 12;
+		const io_rect_right_y_offset_32bit = 0;
+		const io_rect_name_right_y_offset_32bit = -7;
+		const io_rect_description_right_y_offset_32bit = 12;
+
+		const io_rect_left_width_32bit = 20;
+		const io_rect_name_left_width_32bit = 40;
+		const io_rect_description_left_width_32bit = 110;
+		const io_rect_right_width_32bit = 20;
+		const io_rect_name_right_width_32bit = 40;
+		const io_rect_description_right_width_32bit = 110;
+
+
+		//16IO配置项
+		const top_row_height_16bit = 25;
+		const separator_16bit = 15;
+		const io_row_height_16bit = 45;
+
+		const io_row_y_offset_16bit = 13;
+		const io_row_left_x_name_16bit = 10;
+		const io_row_left_x_value_16bit = 65;
+		const io_row_right_x_name_16bit = 160;
+		const io_row_left_width_name_16bit = 40;
+		const io_row_left_width_value_16bit = 55;
+		const io_row_right_width_name_16bit = 20;
+		const io_row_right_width_value_16bit = 130;
+
+
+
+		const rect_height_16bit = 10;
+
+		const rect_top_y_offset_16bit = 95;
+		const rect_bottom_y_offset_16bit = 65;
+
+		const io_rect_left_x_16bit = 10;
+		const io_rect_name_left_x_16bit = 35;
+		const io_rect_description_left_x_16bit = 80;
+		const io_rect_right_x_16bit = 270;
+		const io_rect_name_right_x_16bit = 225;
+		const io_rect_description_right_x_16bit = 155;
+
+		const io_rect_left_y_offset_16bit = 0;
+		const io_rect_name_left_y_offset_16bit = 5;
+		const io_rect_description_left_y_offset_16bit = -4;
+		const io_rect_right_y_offset_16bit = 0;
+		const io_rect_name_right_y_offset_16bit = 0;
+		const io_rect_description_right_y_offset_16bit = 0;
+
+		const io_rect_left_width_16bit = 20;
+		const io_rect_name_left_width_16bit = 40;
+		const io_rect_description_left_width_16bit = 110;
+		const io_rect_right_width_16bit = 20;
+		const io_rect_name_right_width_16bit = 40;
+		const io_rect_description_right_width_16bit = 110;
+
+		//8IO配置项
+		const top_row_height_8bit = 25;
+		const separator_8bit = 15;
+		const io_row_height_8bit = 45;
+
+		const io_row_y_offset_8bit = 13;
+		const io_row_left_x_name_8bit = 10;
+		const io_row_left_x_value_8bit = 65;
+		const io_row_right_x_name_8bit = 160;
+		const io_row_left_width_name_8bit = 40;
+		const io_row_left_width_value_8bit = 55;
+		const io_row_right_width_name_8bit = 20;
+		const io_row_right_width_value_8bit = 130;
+
+
+
+		const rect_height_8bit = 10;
+
+		const rect_top_y_offset_8bit = 95;
+		const rect_bottom_y_offset_8bit = 65;
+
+		const io_rect_left_x_8bit = 10;
+		const io_rect_name_left_x_8bit = 35;
+		const io_rect_description_left_x_8bit = 80;
+		const io_rect_right_x_8bit = 270;
+		const io_rect_name_right_x_8bit = 225;
+		const io_rect_description_right_x_8bit = 155;
+
+		const io_rect_left_y_offset_8bit = 0;
+		const io_rect_name_left_y_offset_8bit = 5;
+		const io_rect_description_left_y_offset_8bit = -4;
+		const io_rect_right_y_offset_8bit = 0;
+		const io_rect_name_right_y_offset_8bit = 0;
+		const io_rect_description_right_y_offset_8bit = 0;
+
+		const io_rect_left_width_8bit = 20;
+		const io_rect_name_left_width_8bit = 40;
+		const io_rect_description_left_width_8bit = 110;
+		const io_rect_right_width_8bit = 20;
+		const io_rect_name_right_width_8bit = 40;
+		const io_rect_description_right_width_8bit = 110;
+
+		//CPU配置项
+		const top_row_height_cpu = 25;
+		const separator_cpu = 15;
+		const io_row_height_cpu = 45;
+
+		const io_row_y_offset_cpu = 13;
+		const io_row_left_x_name_cpu = 10;
+		const io_row_left_x_value_cpu = 65;
+		const io_row_right_x_name_cpu = 160;
+		const io_row_left_width_name_cpu = 40;
+		const io_row_left_width_value_cpu = 55;
+		const io_row_right_width_name_cpu = 20;
+		const io_row_right_width_value_cpu = 130;
+
+
+
+		const rect_height_cpu = 10;
+
+		const rect_top_y_offset_cpu = 95;
+		const rect_bottom_y_offset_cpu = 65;
+
+		const io_rect_left_x_cpu = 10;
+		const io_rect_name_left_x_cpu = 35;
+		const io_rect_description_left_x_cpu = 80;
+		const io_rect_right_x_cpu = 270;
+		const io_rect_name_right_x_cpu = 225;
+		const io_rect_description_right_x_cpu = 155;
+
+		const io_rect_left_y_offset_cpu = 0;
+		const io_rect_name_left_y_offset_cpu = 5;
+		const io_rect_description_left_y_offset_cpu = -4;
+		const io_rect_right_y_offset_cpu = 0;
+		const io_rect_name_right_y_offset_cpu = 0;
+		const io_rect_description_right_y_offset_cpu = 0;
+
+		const io_rect_left_width_cpu = 20;
+		const io_rect_name_left_width_cpu = 40;
+		const io_rect_description_left_width_cpu = 110;
+		const io_rect_right_width_cpu = 20;
+		const io_rect_name_right_width_cpu = 40;
+		const io_rect_description_right_width_cpu = 110;
+
+		//cm配置项
+		const top_row_height_cm = 25;
+		const separator_cm = 15;
+		const io_row_height_cm = 45;
+
+		const io_row_y_offset_cm = 13;
+		const io_row_left_x_name_cm = 10;
+		const io_row_left_x_value_cm = 65;
+		const io_row_right_x_name_cm = 160;
+		const io_row_left_width_name_cm = 40;
+		const io_row_left_width_value_cm = 55;
+		const io_row_right_width_name_cm = 20;
+		const io_row_right_width_value_cm = 130;
+
+
+
+		const rect_height_cm = 10;
+
+		const rect_top_y_offset_cm = 95;
+		const rect_bottom_y_offset_cm = 65;
+
+		const io_rect_left_x_cm = 10;
+		const io_rect_name_left_x_cm = 35;
+		const io_rect_description_left_x_cm = 80;
+		const io_rect_right_x_cm = 270;
+		const io_rect_name_right_x_cm = 225;
+		const io_rect_description_right_x_cm = 155;
+
+		const io_rect_left_y_offset_cm = 0;
+		const io_rect_name_left_y_offset_cm = 5;
+		const io_rect_description_left_y_offset_cm = -4;
+		const io_rect_right_y_offset_cm = 0;
+		const io_rect_name_right_y_offset_cm = 0;
+		const io_rect_description_right_y_offset_cm = 0;
+
+		const io_rect_left_width_cm = 20;
+		const io_rect_name_left_width_cm = 40;
+		const io_rect_description_left_width_cm = 110;
+		const io_rect_right_width_cm = 20;
+		const io_rect_name_right_width_cm = 40;
+		const io_rect_description_right_width_cm = 110;
+
+		const leafer = new LeaferUI.Leafer({
+			view: 'idmain', // 支持 window 、div、canvas 标签对象， 可使用id字符串(不用加 # 号)
+			width: 3000, // 不能设置为 0， 否则会变成自动布局
+			height: 900,
+			fill: fill_backgroud,
+			move: {
+				drag: true,
+			},
+			wheel: {
+				zoomMode: true,
+				zoomSpeed: 0.01,
+			},
+			zoom:{
+			min: 0.4,
+			max: 1.5,
+			}
+		})
+
+		const group = new LeaferUI.Group({ x: 0, y: 0, scaleX: 1, scaleY: 1 })
+		leafer.add(group)
+		const image_cpu = new LeaferUI.Image({ x: 100, y: 50, url: '/images/S71500.png', draggable: true, height: 800 })
+
+		var iogroup = [];
+		var ioinfo = [];
+
+		groupajax = $.ajax({
+			url: "/PenMeiReportManage/PenMeiJMReport/GetRealIOGroup",
+			type: "Get",
+			dataType: "json",
+			async: false,
+			success: function (redata) {
+				iogroup = redata.Result;
+			}
+		});
+		infoajax = $.ajax({
+			url: "/PenMeiReportManage/PenMeiJMReport/GetRealIOInfo",
+			type: "Get",
+			dataType: "json",
+			async: false,
+			success: function (redata) {
+				ioinfo = redata.Result;
+			}
+		});
+
+		debugger;
+
+		const top_text_value_array_32bitt = ['DQ 32xDC 24V/0.5A HF', 'Slot: 1', '在线'];//右上右下
+		const name_32bitt = ['DQ0.0', 'DQ0.1', 'DQ0.2', 'DQ0.3', 'DQ0.4', 'DQ0.5', 'DQ0.6', 'DQ0.7', 'DQ1.0', 'DQ1.1', 'DQ1.2', 'DQ1.3', 'DQ1.4', 'DQ1.5', 'DQ1.6', 'DQ1.7', 'DQ2.0', 'DQ2.1', 'DQ2.2', 'DQ2.3', 'DQ2.4', 'DQ2.5', 'DQ2.6', 'DQ2.7', 'DQ3.0', 'DQ3.1', 'DQ3.2', 'DQ3.3', 'DQ3.4', 'DQ3.5', 'DQ3.6', 'DQ3.7',];
+
+		const top_text_value_array_cpu_ = ['SIMATIC S7-412-2 PN', 'Slot: 0', '在线'];//右上右下
+		const name_cpu_ = ['RUN', 'STOP', 'ERR'];
+		const descriptions_cpu_ = ['运行状态', '暂停状态', '运行错误'];
+		const name_eth_cpu_ = ['ETH0'];
+		const descriptions_eth_cpu_ = ['10/100 Mbit/s'];
+		
+
+		const top_text_value_array_cm_ = ['通信处理器 CP 443-1', 'Slot: 1', '在线'];//右上右下
+		const name_cm_ = ['RUN', 'STOP', 'ERR'];
+		const descriptions_cm_ = ['运行状态', '暂停状态', '运行错误'];
+		const name_eth_cm_ = ['ETH1','ETH2'];
+		const descriptions_eth_cm_ = ['10/100 Mbit/s', '10/100 Mbit/s'];
+
+		iogroup.sort(function (a, b) {
+			return a.IOSlot - b.IOSlot; // 从小到大排序
+		});
+		debugger;
+		var initx = 452;
+		for (var i = 0; i < iogroup.length; i++) {
+			var iotype = iogroup[i].IOType;
+			var iobit = iogroup[i].IOBit;
+			var ioid = iogroup[i].IOID;
+			var top_text_value_array = [iogroup[i].IOModel, 'Slot: ' + iogroup[i].IOSlot, "在线"]
+			var ioinfofilter = ioinfo.filter(function (item) {
+				return item.IOID === ioid;
+			});
+			var names = [];
+			var descriptions = [];
+			for (var iff = 0; iff<ioinfofilter.length; iff++) {
+				names.push(ioinfofilter[iff].IONAME)
+				descriptions.push(ioinfofilter[iff].IODESCRIPTION)
+			}
+			
+			var ioboxwidth = 0;
+			//debugger;
+			if(iotype == 'Digital')
+			{
+				if (iobit == '32') {
+					ioboxwidth = 300;
+					var offset = 2;
+					initx = initx + offset
+					var box = Draw32bitIOBox(names, top_text_value_array, descriptions, ioboxwidth, initx)
+					initx = initx + ioboxwidth;
+					group.add(box)
+				}
+				else if (iobit == '16') {
+					ioboxwidth = 200;
+					var offset = 2;
+					initx = initx + offset
+					var box = Draw16bitIOBox(names, top_text_value_array, descriptions, ioboxwidth, initx)
+					initx = initx + ioboxwidth;
+					group.add(box)
+				} else if (iobit = '8') {
+					ioboxwidth = 200;
+					var offset = 2;
+					initx = initx + offset
+					var box = Draw8bitIOBox(names, top_text_value_array, descriptions, ioboxwidth, initx)
+					initx = initx + ioboxwidth;
+					group.add(box)
+				}
+			} else if (iotype == 'Analog') {
+				if (iobit == '32') {
+					ioboxwidth = 300;
+					var offset = 2;
+					initx = initx + offset
+					var box = Draw32bitAnalogIOBox(names, top_text_value_array, descriptions, ioboxwidth, initx)
+					initx = initx + ioboxwidth;
+					group.add(box)
+				}
+				else if (iobit == '16') {
+					ioboxwidth = 200;
+					var offset = 2;
+					initx = initx + offset
+					var box = Draw16bitIOBox(names, top_text_value_array, descriptions, ioboxwidth, initx)
+					initx = initx + ioboxwidth;
+					group.add(box)
+				} else if (iobit = '8') {
+					ioboxwidth = 200;
+					var offset = 2;
+					initx = initx + offset
+					var box = Draw8bitIOBox(names, top_text_value_array, descriptions, ioboxwidth, initx)
+					initx = initx + ioboxwidth;
+					group.add(box)
+				}
+			}
+			
+		}
+		var boxcpu = DrawCPUBox(name_cpu_, top_text_value_array_cpu_, descriptions_cpu_, name_eth_cpu_, descriptions_eth_cpu_, 200, 50)
+		var boxcm = DrawCMBox(name_cm_, top_text_value_array_cm_, descriptions_cm_, name_eth_cm_, descriptions_eth_cm_, 200, 252)
+		group.add(boxcpu);
+		group.add(boxcm);
+
+		function Draw32bitIOBox(name_32bit, top_text_value_array_32bit, descriptions_32bit, ioboxwidth, initx) {
+			var box_32bit = new LeaferUI.Box({
+				x: initx,
+				y: 20,
+				width: ioboxwidth,
+				height: height_iobox,
+				fill: fill_iobox,
+				draggable: draggable_dev,
+				strokeWidth: 1,
+				stroke: stroke_iobox,
+			})
+
+			var ylinex_sum_four = 0;
+			var ylinex_array_four = [];
+			for (var linexid = 0; linexid < 19; linexid++) {
+				if (linexid == 0) {
+					ylinex_sum_four = ylinex_sum_four + top_row_height_32bit;
+					ylinex_array_four.push(ylinex_sum_four);
+				}
+				else if (linexid == 1) {
+					ylinex_sum_four = ylinex_sum_four + top_row_height_32bit;
+					ylinex_array_four.push(ylinex_sum_four);
+				}
+				else if (linexid == 2) {
+					ylinex_sum_four = ylinex_sum_four + top_row_height_32bit;
+					ylinex_array_four.push(ylinex_sum_four);
+				}
+				else if (linexid == 11) {
+					ylinex_sum_four = ylinex_sum_four + separator_32bit;
+					ylinex_array_four.push(ylinex_sum_four);
+				}
+				else {
+					ylinex_sum_four = ylinex_sum_four + io_row_height_32bit;
+					ylinex_array_four.push(ylinex_sum_four);
+				}
+			}
+			for (var linexid = 0; linexid < 19; linexid++) {
+				if (linexid == 0) {
+					var line = new LeaferUI.Line({
+						x: 0,
+						y: ylinex_array_four[linexid],// ylinex_sum_four + 35,
+						width: width_iobox,
+						strokeWidth: 1,
+						stroke: stroke_iobox_line,
+						//id: "line" + linexid.toString()
+					});
+					box_32bit.add(line);
+				}
+				else if (linexid == 1) {
+					var line = new LeaferUI.Line({
+						x: 0,
+						y: ylinex_array_four[linexid],// ylinex_sum_four + 35,
+						width: width_iobox,
+						strokeWidth: 1,
+						stroke: stroke_iobox_line,
+						//id: "line" + linexid.toString()
+					});
+					box_32bit.add(line);
+				}
+				else if (linexid == 2) {
+					var line = new LeaferUI.Line({
+						x: 0,
+						y: ylinex_array_four[linexid],// ylinex_sum_four + 35,
+						width: width_iobox,
+						strokeWidth: 1,
+						stroke: stroke_iobox_line,
+						//id: "line" + linexid.toString()
+					});
+					box_32bit.add(line);
+				}
+				else if (linexid == 11) {
+					var line = new LeaferUI.Line({
+						x: 0,
+						y: ylinex_array_four[linexid],// ylinex_sum_four + 20,
+						width: width_iobox,
+						strokeWidth: 1,
+						stroke: stroke_iobox_line,
+						//id: "line" + linexid.toString()
+					});
+					box_32bit.add(line);
+				}
+				else {
+					var line = new LeaferUI.Line({
+						x: 0,
+						y: ylinex_array_four[linexid],// ylinex_sum_four + 45,
+						width: width_iobox,
+						strokeWidth: 1,
+						stroke: stroke_iobox_line,
+						//id: "line" + linexid.toString()
+					});
+					box_32bit.add(line);
+				}
+				//box_32bit.add(line);
+			}
+
+			var spiltline_four = new LeaferUI.Line({
+				x: width_iobox / 2,
+				y: top_row_height_32bit * 3,
+				width: height_iobox - top_row_height_32bit * 3,
+				rotation: 90,
+				stroke: stroke_iobox_spiltline,
+				strokeWidth: 1,
+				dashPattern: [5, 2]
+			})
+			box_32bit.add(spiltline_four);
+
+
+			//box4左侧顶部状态效果
+			for (var tid = 0; tid < 3; tid++) {
+				let y = io_row_y_offset_32bit + tid * top_row_height_32bit;
+				if (tid < 2) {
+					var top_text_value = new LeaferUI.Text({
+						x: io_row_left_x_name_32bit,
+						y: y,//+10
+						//height:10,
+						width: io_row_left_width_name_32bit,
+						fill: fill_top_name,
+						text: top_text_value_array_32bit[tid],
+						textAlign: 'left',
+						verticalAlign: 'middle',
+						textWrap: 'none',
+						padding: 0,
+						fontSize: 12
+					})
+					box_32bit.add(top_text_value)
+				}
+
+				if (tid == 2) {
+					var rect = new LeaferUI.Rect({
+						x: io_row_left_x_name_32bit,
+						y: y - 5,
+						height: rect_height_32bit,
+						width: io_rect_left_width_32bit,
+						fill: fill_rect,
+						draggable: false,
+						id: top_text_value_array_32bit[1].replace(' ', '') + '_OnlineSatate'
+					})
+					debugger;
+					box_32bit.add(rect)
+					var top_text_value = new LeaferUI.Text({
+						x: io_row_left_x_name_32bit + io_rect_left_width_32bit + 15,
+						y: y,//+10
+						//height:10,
+						width: io_row_left_width_name_32bit,
+						fill: fill_top_name,
+						text: top_text_value_array_32bit[tid],
+						textAlign: 'left',
+						verticalAlign: 'middle',
+						textWrap: 'none',
+						padding: 0,
+						fontSize: 12
+					})
+					box_32bit.add(top_text_value)
+				}
+
+				// var left_top_text_name = new LeaferUI.Text({
+				// 	x:io_row_left_x_name_32bit,
+				// 	y:y,//+10
+				// 	//height:10,
+				// 	width:io_row_left_width_name_32bit,
+				// 	fill: fill_top_name,
+				// 	text:left_top_text_name_four_array_32bit[tid],
+				// 	textAlign :'left',
+				// 	verticalAlign:'middle',
+				// 	textWrap:'none',
+				// 	padding:0,
+				// 	fontSize:12
+				// })
+				// var left_top_text_name_value = new LeaferUI.Text({
+				// 	x:io_row_left_x_value_32bit,
+				// 	y:y,//+10
+				// 	//height:10,
+				// 	width:io_row_left_width_value_32bit,
+				// 	fill: fill_top_name_value,
+				// 	text:left_top_text_value_four_array_32bit[tid],
+				// 	textAlign :'left',
+				// 	verticalAlign:'middle',
+				// 	textWrap:'none',
+				// 	padding:0,
+				// 	fontSize:12
+				// })
+				// //建议取消
+				// var right_top_text_name = new LeaferUI.Text({
+				// 	x:io_row_right_x_name_32bit,
+				// 	y:y,//+10
+				// 	//height:10,
+				// 	width:io_row_right_width_name_32bit,
+				// 	fill: fill_top_name,
+				// 	text:right_top_text_name_four_array_32bit[tid],
+				// 	textAlign :'left',
+				// 	verticalAlign:'middle',
+				// 	textWrap:'none',
+				// 	padding:0,
+				// 	fontSize:12
+				// })
+				// var right_top_text_name_value = new LeaferUI.Text({
+				// 	x:io_row_right_x_name_32bit,
+				// 	y:y,//+10
+				// 	//height:10,
+				// 	width:io_row_right_width_value_32bit,
+				// 	fill: fill_top_name_value,
+				// 	text:right_top_text_value_four_array_32bit[tid],
+				// 	textAlign :'left',
+				// 	verticalAlign:'middle',
+				// 	textWrap:'none',
+				// 	padding:0,
+				// 	fontSize:12
+				// })
+				// box_32bit.add(left_top_text_name)
+				// //box_32bit.add(right_top_text_name)
+				// box_32bit.add(left_top_text_name_value)
+				// box_32bit.add(right_top_text_name_value)
+			}
+
+
+			//box4效果
+			for (var sid = 0; sid < 16; sid++) {
+				let y = 0;
+				if (sid < 8) {
+					y = io_row_height_32bit * (sid) + rect_top_y_offset_32bit;
+				}
+				if (sid >= 8) {
+					y = io_row_height_32bit * (sid + 1) + rect_bottom_y_offset_32bit;
+				}
+				var rect_left = new LeaferUI.Rect({
+					x: io_rect_left_x_32bit,
+					y: y + io_rect_left_y_offset_32bit,
+					height: rect_height_32bit,
+					width: io_rect_left_width_32bit,
+					fill: fill_rect,
+					draggable: false,
+					id: name_32bit[sid]
+				})
+				var rect_left_text_name = new LeaferUI.Text({
+					x: io_rect_name_left_x_32bit,
+					y: y + io_rect_name_left_y_offset_32bit,
+					width: io_rect_name_left_width_32bit,
+					fill: fill_rect_text_name,
+					text: name_32bit[sid],
+					textAlign: 'left',
+					verticalAlign: 'middle',
+					textWrap: 'none',
+					padding: 0,
+					fontSize: 12
+				})
+				var rect_left_text_description = new LeaferUI.Text({
+					x: io_rect_description_left_x_32bit,
+					y: y + io_rect_description_left_y_offset_32bit,
+					width: io_rect_description_left_width_32bit,
+					fill: fill_rect_text_description,
+					text: descriptions_32bit[sid],
+					textAlign: 'left',
+					verticalAlign: 'middle',
+					textWrap: 'none',
+					padding: 0,
+					fontSize: 12
+				})
+				//1罐仓流化阀原输出
+				var rect_right = new LeaferUI.Rect({
+					x: io_rect_right_x_32bit,
+					y: y + io_rect_right_y_offset_32bit,
+					height: rect_height_32bit,
+					width: io_rect_right_width_32bit,
+					fill: fill_rect,
+					draggable: false,
+					id: name_32bit[sid + 16]
+				})
+				var rect_right_text_name = new LeaferUI.Text({
+					x: io_rect_name_right_x_32bit,
+					y: y + io_rect_name_right_y_offset_32bit,
+					width: io_rect_name_right_width_32bit,
+					fill: fill_rect_text_name,
+					text: name_32bit[sid + 16],
+					textAlign: 'right',
+					verticalAlign: 'middle',
+					textWrap: 'none',
+					padding: 0,
+					fontSize: 12
+				})
+				var rect_right_text_description = new LeaferUI.Text({
+					x: io_rect_description_right_x_32bit,
+					y: y + io_rect_description_right_y_offset_32bit,
+					width: io_rect_description_right_width_32bit,
+					fill: fill_rect_text_description,
+					text: descriptions_32bit[sid+16],
+					textAlign: 'right',
+					verticalAlign: 'middle',
+					textWrap: 'none',
+					padding: 0,
+					fontSize: 12
+				})
+				//console.log(rect)
+				box_32bit.add(rect_left);
+				box_32bit.add(rect_left_text_name);
+				box_32bit.add(rect_left_text_description);
+				box_32bit.add(rect_right);
+				box_32bit.add(rect_right_text_name);
+				box_32bit.add(rect_right_text_description);
+			}
+
+			return box_32bit;
+		}
+
+		function Draw16bitIOBox(name_16bit, top_text_value_array_16bit, descriptions_16bit, ioboxwidth, initx) {
+			//16IO生成
+			var box_16bit = new LeaferUI.Box({
+				x: initx,
+				y: 20,
+				width: ioboxwidth,
+				height: height_iobox,
+				fill: fill_iobox,
+				draggable: draggable_dev,
+				strokeWidth: 1,
+				stroke: stroke_iobox,
+			})
+
+			var ylinex_sum_four = 0;
+			var ylinex_array_four = [];
+			for (var linexid = 0; linexid < 19; linexid++) {
+				if (linexid == 0) {
+					ylinex_sum_four = ylinex_sum_four + top_row_height_16bit;
+					ylinex_array_four.push(ylinex_sum_four);
+				}
+				else if (linexid == 1) {
+					ylinex_sum_four = ylinex_sum_four + top_row_height_16bit;
+					ylinex_array_four.push(ylinex_sum_four);
+				}
+				else if (linexid == 2) {
+					ylinex_sum_four = ylinex_sum_four + top_row_height_16bit;
+					ylinex_array_four.push(ylinex_sum_four);
+				}
+				else if (linexid == 11) {
+					ylinex_sum_four = ylinex_sum_four + separator_16bit;
+					ylinex_array_four.push(ylinex_sum_four);
+				}
+				else {
+					ylinex_sum_four = ylinex_sum_four + io_row_height_16bit;
+					ylinex_array_four.push(ylinex_sum_four);
+				}
+			}
+			for (var linexid = 0; linexid < 19; linexid++) {
+				if (linexid == 0) {
+					var line = new LeaferUI.Line({
+						x: 0,
+						y: ylinex_array_four[linexid],// ylinex_sum_four + 35,
+						width: width_iobox_16bit,
+						strokeWidth: 1,
+						stroke: stroke_iobox_line,
+						//id: "line" + linexid.toString()
+					});
+					box_16bit.add(line);
+				}
+				else if (linexid == 1) {
+					var line = new LeaferUI.Line({
+						x: 0,
+						y: ylinex_array_four[linexid],// ylinex_sum_four + 35,
+						width: width_iobox_16bit,
+						strokeWidth: 1,
+						stroke: stroke_iobox_line,
+						//id: "line" + linexid.toString()
+					});
+					box_16bit.add(line);
+				}
+				else if (linexid == 2) {
+					var line = new LeaferUI.Line({
+						x: 0,
+						y: ylinex_array_four[linexid],// ylinex_sum_four + 35,
+						width: width_iobox_16bit,
+						strokeWidth: 1,
+						stroke: stroke_iobox_line,
+						//id: "line" + linexid.toString()
+					});
+					box_16bit.add(line);
+				}
+				else if (linexid == 11) {
+					var line = new LeaferUI.Line({
+						x: 0,
+						y: ylinex_array_four[linexid],// ylinex_sum_four + 20,
+						width: width_iobox_16bit,
+						strokeWidth: 1,
+						stroke: stroke_iobox_line,
+						//id: "line" + linexid.toString()
+					});
+					box_16bit.add(line);
+				}
+				else {
+					var line = new LeaferUI.Line({
+						x: 0,
+						y: ylinex_array_four[linexid],// ylinex_sum_four + 45,
+						width: width_iobox_16bit,
+						strokeWidth: 1,
+						stroke: stroke_iobox_line,
+						//id: "line" + linexid.toString()
+					});
+					box_16bit.add(line);
+				}
+			}
+
+			var spiltline_four = new LeaferUI.Line({
+				x: width_iobox_16bit / 2,
+				width: top_row_height_16bit * 2,
+				rotation: 90,
+				stroke: stroke_iobox_spiltline,
+				strokeWidth: 1,
+				dashPattern: [5, 2]
+			})
+			// box_16bit.add(spiltline_four);
+
+
+			//box4左侧顶部状态效果
+			for (var tid = 0; tid < 3; tid++) {
+				let y = io_row_y_offset_16bit + tid * top_row_height_16bit;
+				if (tid < 2) {
+
+					var top_text_value = new LeaferUI.Text({
+						x: io_row_left_x_name_16bit,
+						y: y,//+10
+						//height:10,
+						width: io_row_left_width_name_16bit,
+						fill: fill_top_name,
+						text: top_text_value_array_16bit[tid],
+						textAlign: 'left',
+						verticalAlign: 'middle',
+						textWrap: 'none',
+						padding: 0,
+						fontSize: 12
+					})
+					box_16bit.add(top_text_value)
+				}
+				if (tid == 2) {
+					var rect = new LeaferUI.Rect({
+						x: io_row_left_x_name_16bit,
+						y: y - 5,
+						height: rect_height_16bit,
+						width: io_rect_left_width_16bit,
+						fill: fill_rect,
+						draggable: false,
+						id: top_text_value_array_16bit[1].replace(' ', '') + '_OnlineSatate'
+					})
+					box_16bit.add(rect)
+					var top_text_value = new LeaferUI.Text({
+						x: io_row_left_x_name_16bit + io_rect_left_width_16bit + 15,
+						y: y,//+10
+						//height:10,
+						width: io_row_left_width_name_16bit,
+						fill: fill_top_name,
+						text: top_text_value_array_16bit[tid],
+						textAlign: 'left',
+						verticalAlign: 'middle',
+						textWrap: 'none',
+						padding: 0,
+						fontSize: 12
+					})
+					box_16bit.add(top_text_value)
+				}
+
+
+				// var left_top_text_name_value = new LeaferUI.Text({
+				// 	x:io_row_left_x_value_16bit,
+				// 	y:y,//+10
+				// 	//height:10,
+				// 	width:io_row_left_width_value_16bit,
+				// 	fill: fill_top_name_value,
+				// 	text:left_top_text_value_four_array_16bit[tid],
+				// 	textAlign :'left',
+				// 	verticalAlign:'middle',
+				// 	textWrap:'none',
+				// 	padding:0,
+				// 	fontSize:12
+				// })
+				// //建议取消
+				// var right_top_text_name = new LeaferUI.Text({
+				// 	x:io_row_right_x_name_16bit,
+				// 	y:y,//+10
+				// 	//height:10,
+				// 	width:io_row_right_width_name_16bit,
+				// 	fill: fill_top_name,
+				// 	text:right_top_text_name_four_array_16bit[tid],
+				// 	textAlign :'left',
+				// 	verticalAlign:'middle',
+				// 	textWrap:'none',
+				// 	padding:0,
+				// 	fontSize:12
+				// })
+				// var right_top_text_name_value = new LeaferUI.Text({
+				// 	x:io_row_right_x_name_16bit,
+				// 	y:y,//+10
+				// 	//height:10,
+				// 	width:io_row_right_width_value_16bit,
+				// 	fill: fill_top_name_value,
+				// 	text:right_top_text_value_four_array_16bit[tid],
+				// 	textAlign :'left',
+				// 	verticalAlign:'middle',
+				// 	textWrap:'none',
+				// 	padding:0,
+				// 	fontSize:12
+				// })
+				// box_16bit.add(left_top_text_name)
+				// //box_16bit.add(right_top_text_name)
+				// box_16bit.add(left_top_text_name_value)
+				// box_16bit.add(right_top_text_name_value)
+			}
+
+
+			//box4效果
+			for (var sid = 0; sid < 16; sid++) {
+				let y = 0;
+				if (sid < 8) {
+					y = io_row_height_16bit * (sid) + rect_top_y_offset_16bit;
+				}
+				if (sid >= 8) {
+					y = io_row_height_16bit * (sid + 1) + rect_bottom_y_offset_16bit;
+				}
+				var rect_left = new LeaferUI.Rect({
+					x: io_rect_left_x_16bit,
+					y: y + io_rect_left_y_offset_16bit,
+					height: rect_height_16bit,
+					width: io_rect_left_width_16bit,
+					fill: fill_rect,
+					draggable: false,
+					id: name_16bit[sid]
+				})
+				var rect_left_text_name = new LeaferUI.Text({
+					x: io_rect_name_left_x_16bit,
+					y: y + io_rect_name_left_y_offset_16bit,
+					width: io_rect_name_left_width_16bit,
+					fill: fill_rect_text_name,
+					text: name_16bit[sid],
+					textAlign: 'left',
+					verticalAlign: 'middle',
+					textWrap: 'none',
+					padding: 0,
+					fontSize: 12
+				})
+				var rect_left_text_description = new LeaferUI.Text({
+					x: io_rect_description_left_x_16bit,
+					y: y + io_rect_description_left_y_offset_16bit,
+					width: io_rect_description_left_width_16bit,
+					fill: fill_rect_text_description,
+					text: descriptions_16bit[sid],
+					textAlign: 'left',
+					verticalAlign: 'middle',
+					textWrap: 'none',
+					textOverflow: ' ',
+					padding: 0,
+					fontSize: 12
+				})
+
+				box_16bit.add(rect_left);
+				box_16bit.add(rect_left_text_name);
+				box_16bit.add(rect_left_text_description);
+			}
+			return box_16bit;
+		}
+
+		function Draw8bitIOBox(name_8bit, top_text_value_array_8bit, descriptions_8bit, ioboxwidth, initx) {
+			//8IO生成
+			var box_8bit = new LeaferUI.Box({
+				x: initx,
+				y: 20,
+				width: ioboxwidth,
+				height: height_iobox,
+				fill: fill_iobox,
+				draggable: draggable_dev,
+				strokeWidth: 1,
+				stroke: stroke_iobox,
+			})
+
+			var ylinex_sum_four = 0;
+			var ylinex_array_four = [];
+			for (var linexid = 0; linexid < 19; linexid++) {
+				if (linexid == 0) {
+					ylinex_sum_four = ylinex_sum_four + top_row_height_8bit;
+					ylinex_array_four.push(ylinex_sum_four);
+				}
+				else if (linexid == 1) {
+					ylinex_sum_four = ylinex_sum_four + top_row_height_8bit;
+					ylinex_array_four.push(ylinex_sum_four);
+				}
+				else if (linexid == 2) {
+					ylinex_sum_four = ylinex_sum_four + top_row_height_8bit;
+					ylinex_array_four.push(ylinex_sum_four);
+				}
+				else if (linexid == 11) {
+					ylinex_sum_four = ylinex_sum_four + separator_8bit;
+					ylinex_array_four.push(ylinex_sum_four);
+				}
+				else {
+					ylinex_sum_four = ylinex_sum_four + io_row_height_8bit;
+					ylinex_array_four.push(ylinex_sum_four);
+				}
+			}
+			for (var linexid = 0; linexid < 19; linexid++) {
+				if (linexid == 0) {
+					var line = new LeaferUI.Line({
+						x: 0,
+						y: ylinex_array_four[linexid],// ylinex_sum_four + 35,
+						width: width_iobox_8bit,
+						strokeWidth: 1,
+						stroke: stroke_iobox_line,
+						//id: "line" + linexid.toString()
+					});
+					box_8bit.add(line);
+				}
+				else if (linexid == 1) {
+					var line = new LeaferUI.Line({
+						x: 0,
+						y: ylinex_array_four[linexid],// ylinex_sum_four + 35,
+						width: width_iobox_8bit,
+						strokeWidth: 1,
+						stroke: stroke_iobox_line,
+						//id: "line" + linexid.toString()
+					});
+					box_8bit.add(line);
+				}
+				else if (linexid == 2) {
+					var line = new LeaferUI.Line({
+						x: 0,
+						y: ylinex_array_four[linexid],// ylinex_sum_four + 35,
+						width: width_iobox_8bit,
+						strokeWidth: 1,
+						stroke: stroke_iobox_line,
+						//id: "line" + linexid.toString()
+					});
+					box_8bit.add(line);
+				}
+				else if (linexid == 11) {
+					var line = new LeaferUI.Line({
+						x: 0,
+						y: ylinex_array_four[linexid],// ylinex_sum_four + 20,
+						width: width_iobox_8bit,
+						strokeWidth: 1,
+						stroke: stroke_iobox_line,
+						//id: "line" + linexid.toString()
+					});
+					box_8bit.add(line);
+				}
+				else {
+					var line = new LeaferUI.Line({
+						x: 0,
+						y: ylinex_array_four[linexid],// ylinex_sum_four + 45,
+						width: width_iobox_8bit,
+						strokeWidth: 1,
+						stroke: stroke_iobox_line,
+						//id: "line" + linexid.toString()
+					});
+					box_8bit.add(line);
+				}
+			}
+
+			var spiltline_four = new LeaferUI.Line({
+				x: width_iobox_8bit / 2,
+				width: top_row_height_8bit * 2,
+				rotation: 90,
+				stroke: stroke_iobox_spiltline,
+				strokeWidth: 1,
+				dashPattern: [5, 2]
+			})
+			// box_8bit.add(spiltline_four);
+
+
+			//box4左侧顶部状态效果
+			for (var tid = 0; tid < 3; tid++) {
+				let y = io_row_y_offset_8bit + tid * top_row_height_8bit;
+				if (tid < 2) {
+
+					var top_text_value = new LeaferUI.Text({
+						x: io_row_left_x_name_8bit,
+						y: y,//+10
+						//height:10,
+						width: io_row_left_width_name_8bit,
+						fill: fill_top_name,
+						text: top_text_value_array_8bit[tid],
+						textAlign: 'left',
+						verticalAlign: 'middle',
+						textWrap: 'none',
+						padding: 0,
+						fontSize: 12
+					})
+					box_8bit.add(top_text_value);
+				}
+				if (tid == 2) {
+					var rect = new LeaferUI.Rect({
+						x: io_row_left_x_name_8bit,
+						y: y - 5,
+						height: rect_height_8bit,
+						width: io_rect_left_width_8bit,
+						fill: fill_rect,
+						draggable: false,
+						id: top_text_value_array_8bit[1].replace(' ', '') + '_OnlineSatate'
+					})
+					box_8bit.add(rect)
+					var top_text_value = new LeaferUI.Text({
+						x: io_row_left_x_name_8bit + io_rect_left_width_8bit + 15,
+						y: y,//+10
+						//height:10,
+						width: io_row_left_width_name_8bit,
+						fill: fill_top_name,
+						text: top_text_value_array_8bit[tid],
+						textAlign: 'left',
+						verticalAlign: 'middle',
+						textWrap: 'none',
+						padding: 0,
+						fontSize: 12
+					})
+					box_8bit.add(top_text_value)
+				}
+
+				// var left_top_text_name_value = new LeaferUI.Text({
+				// 	x:io_row_left_x_value_8bit,
+				// 	y:y,//+10
+				// 	//height:10,
+				// 	width:io_row_left_width_value_8bit,
+				// 	fill: fill_top_name_value,
+				// 	text:left_top_text_value_four_array_8bit[tid],
+				// 	textAlign :'left',
+				// 	verticalAlign:'middle',
+				// 	textWrap:'none',
+				// 	padding:0,
+				// 	fontSize:12
+				// })
+				// //建议取消
+				// var right_top_text_name = new LeaferUI.Text({
+				// 	x:io_row_right_x_name_8bit,
+				// 	y:y,//+10
+				// 	//height:10,
+				// 	width:io_row_right_width_name_8bit,
+				// 	fill: fill_top_name,
+				// 	text:right_top_text_name_four_array_8bit[tid],
+				// 	textAlign :'left',
+				// 	verticalAlign:'middle',
+				// 	textWrap:'none',
+				// 	padding:0,
+				// 	fontSize:12
+				// })
+				// var right_top_text_name_value = new LeaferUI.Text({
+				// 	x:io_row_right_x_name_8bit,
+				// 	y:y,//+10
+				// 	//height:10,
+				// 	width:io_row_right_width_value_8bit,
+				// 	fill: fill_top_name_value,
+				// 	text:right_top_text_value_four_array_8bit[tid],
+				// 	textAlign :'left',
+				// 	verticalAlign:'middle',
+				// 	textWrap:'none',
+				// 	padding:0,
+				// 	fontSize:12
+				// })
+				// box_8bit.add(left_top_text_name)
+				// //box_8bit.add(right_top_text_name)
+				// box_8bit.add(left_top_text_name_value)
+				// box_8bit.add(right_top_text_name_value)
+			}
+
+
+			//box4效果
+			for (var sid = 0; sid < 8; sid++) {
+				let y = 0;
+				if (sid < 8) {
+					y = io_row_height_8bit * (sid) + rect_top_y_offset_8bit;
+				}
+				if (sid >= 8) {
+					y = io_row_height_8bit * (sid + 1) + rect_bottom_y_offset_8bit;
+				}
+				var rect_left = new LeaferUI.Rect({
+					x: io_rect_left_x_8bit,
+					y: y + io_rect_left_y_offset_8bit,
+					height: rect_height_8bit,
+					width: io_rect_left_width_8bit,
+					fill: fill_rect,
+					draggable: false,
+					id: name_8bit[sid]
+				})
+				var rect_left_text_name = new LeaferUI.Text({
+					x: io_rect_name_left_x_8bit,
+					y: y + io_rect_name_left_y_offset_8bit,
+					width: io_rect_name_left_width_8bit,
+					fill: fill_rect_text_name,
+					text: name_8bit[sid],
+					textAlign: 'left',
+					verticalAlign: 'middle',
+					textWrap: 'none',
+					padding: 0,
+					fontSize: 12
+				})
+				var rect_left_text_description = new LeaferUI.Text({
+					x: io_rect_description_left_x_8bit,
+					y: y + io_rect_description_left_y_offset_8bit,
+					width: io_rect_description_left_width_8bit / 3,
+					fill: fill_rect_text_description,
+					text: descriptions_8bit[sid],
+					textAlign: 'left',
+					verticalAlign: 'middle',
+					textWrap: 'none',
+					textOverflow: ' ',
+					padding: 0,
+					fontSize: 12
+				})
+
+				box_8bit.add(rect_left);
+				box_8bit.add(rect_left_text_name);
+				box_8bit.add(rect_left_text_description);
+			}
+			return box_8bit;
+		}
+
+		function Draw32bitAnalogIOBox(name_32bit, top_text_value_array_32bit, descriptions_32bit, ioboxwidth, initx) {
+			var box_32bit = new LeaferUI.Box({
+				x: initx,
+				y: 20,
+				width: ioboxwidth,
+				height: height_iobox,
+				fill: fill_iobox,
+				draggable: draggable_dev,
+				strokeWidth: 1,
+				stroke: stroke_iobox,
+			})
+
+			var ylinex_sum_four = 0;
+			var ylinex_array_four = [];
+			for (var linexid = 0; linexid < 19; linexid++) {
+				if (linexid == 0) {
+					ylinex_sum_four = ylinex_sum_four + top_row_height_32bit;
+					ylinex_array_four.push(ylinex_sum_four);
+				}
+				else if (linexid == 1) {
+					ylinex_sum_four = ylinex_sum_four + top_row_height_32bit;
+					ylinex_array_four.push(ylinex_sum_four);
+				}
+				else if (linexid == 2) {
+					ylinex_sum_four = ylinex_sum_four + top_row_height_32bit;
+					ylinex_array_four.push(ylinex_sum_four);
+				}
+				else if (linexid == 11) {
+					ylinex_sum_four = ylinex_sum_four + separator_32bit;
+					ylinex_array_four.push(ylinex_sum_four);
+				}
+				else {
+					ylinex_sum_four = ylinex_sum_four + io_row_height_32bit;
+					ylinex_array_four.push(ylinex_sum_four);
+				}
+			}
+			for (var linexid = 0; linexid < 19; linexid++) {
+				if (linexid == 0) {
+					var line = new LeaferUI.Line({
+						x: 0,
+						y: ylinex_array_four[linexid],// ylinex_sum_four + 35,
+						width: width_iobox,
+						strokeWidth: 1,
+						stroke: stroke_iobox_line,
+						//id: "line" + linexid.toString()
+					});
+					box_32bit.add(line);
+				}
+				else if (linexid == 1) {
+					var line = new LeaferUI.Line({
+						x: 0,
+						y: ylinex_array_four[linexid],// ylinex_sum_four + 35,
+						width: width_iobox,
+						strokeWidth: 1,
+						stroke: stroke_iobox_line,
+						//id: "line" + linexid.toString()
+					});
+					box_32bit.add(line);
+				}
+				else if (linexid == 2) {
+					var line = new LeaferUI.Line({
+						x: 0,
+						y: ylinex_array_four[linexid],// ylinex_sum_four + 35,
+						width: width_iobox,
+						strokeWidth: 1,
+						stroke: stroke_iobox_line,
+						//id: "line" + linexid.toString()
+					});
+					box_32bit.add(line);
+				}
+				else if (linexid == 11) {
+					var line = new LeaferUI.Line({
+						x: 0,
+						y: ylinex_array_four[linexid],// ylinex_sum_four + 20,
+						width: width_iobox,
+						strokeWidth: 1,
+						stroke: stroke_iobox_line,
+						//id: "line" + linexid.toString()
+					});
+					box_32bit.add(line);
+				}
+				else {
+					var line = new LeaferUI.Line({
+						x: 0,
+						y: ylinex_array_four[linexid],// ylinex_sum_four + 45,
+						width: width_iobox,
+						strokeWidth: 1,
+						stroke: stroke_iobox_line,
+						//id: "line" + linexid.toString()
+					});
+					box_32bit.add(line);
+				}
+				//box_32bit.add(line);
+			}
+
+			var spiltline_four = new LeaferUI.Line({
+				x: width_iobox / 2,
+				y: top_row_height_32bit * 3,
+				width: height_iobox - top_row_height_32bit * 3,
+				rotation: 90,
+				stroke: stroke_iobox_spiltline,
+				strokeWidth: 1,
+				dashPattern: [5, 2]
+			})
+			box_32bit.add(spiltline_four);
+
+
+			//box4左侧顶部状态效果
+			for (var tid = 0; tid < 3; tid++) {
+				let y = io_row_y_offset_32bit + tid * top_row_height_32bit;
+				if (tid < 2) {
+					var top_text_value = new LeaferUI.Text({
+						x: io_row_left_x_name_32bit,
+						y: y,//+10
+						//height:10,
+						width: io_row_left_width_name_32bit,
+						fill: fill_top_name,
+						text: top_text_value_array_32bit[tid],
+						textAlign: 'left',
+						verticalAlign: 'middle',
+						textWrap: 'none',
+						padding: 0,
+						fontSize: 12
+					})
+					box_32bit.add(top_text_value)
+				}
+
+				if (tid == 2) {
+					var rect = new LeaferUI.Rect({
+						x: io_row_left_x_name_32bit,
+						y: y - 5,
+						height: rect_height_32bit,
+						width: io_rect_left_width_32bit,
+						fill: fill_rect,
+						draggable: false,
+						id: top_text_value_array_32bit[1].replace(' ', '') + '_OnlineSatate'
+					})
+					debugger;
+					box_32bit.add(rect)
+					var top_text_value = new LeaferUI.Text({
+						x: io_row_left_x_name_32bit + io_rect_left_width_32bit + 15,
+						y: y,//+10
+						//height:10,
+						width: io_row_left_width_name_32bit,
+						fill: fill_top_name,
+						text: top_text_value_array_32bit[tid],
+						textAlign: 'left',
+						verticalAlign: 'middle',
+						textWrap: 'none',
+						padding: 0,
+						fontSize: 12
+					})
+					box_32bit.add(top_text_value)
+				}
+
+			}
+
+
+			//box4效果
+			for (var sid = 0; sid < 16; sid++) {
+				let y = 0;
+				if (sid < 8) {
+					y = io_row_height_32bit * (sid) + rect_top_y_offset_32bit;
+				}
+				if (sid >= 8) {
+					y = io_row_height_32bit * (sid + 1) + rect_bottom_y_offset_32bit;
+				}
+				var rect_left = new LeaferUI.Rect({
+					x: io_rect_left_x_32bit,
+					y: y + io_rect_left_y_offset_32bit,
+					height: rect_height_32bit,
+					width: io_rect_left_width_32bit,
+					fill: fill_rect_io_on,
+					draggable: false,
+					id: name_32bit[sid]
+				})
+				var rect_left_text_name = new LeaferUI.Text({
+					x: io_rect_name_left_x_32bit,
+					y: y + io_rect_name_left_y_offset_32bit,
+					width: io_rect_name_left_width_32bit,
+					fill: fill_rect_text_name,
+					text: name_32bit[sid],
+					textAlign: 'left',
+					verticalAlign: 'middle',
+					textWrap: 'none',
+					padding: 0,
+					fontSize: 12
+				})
+				var rect_left_text_Avalue = new LeaferUI.Text({
+					x: io_rect_name_left_x_32bit + io_rect_name_left_width_32bit,
+					y: y + io_rect_name_left_y_offset_32bit,
+					width: io_rect_description_left_width_32bit,
+					fill: fill_rect_text_name,
+					text: 111111,
+					textAlign: 'left',
+					verticalAlign: 'middle',
+					textWrap: 'none',
+					padding: 0,
+					fontSize: 12
+				})
+				var rect_left_text_description = new LeaferUI.Text({
+					x: io_rect_description_left_x_32bit,
+					y: y + io_rect_description_left_y_offset_32bit,
+					width: io_rect_description_left_width_32bit,
+					fill: fill_rect_text_description,
+					text: descriptions_32bit[sid],
+					textAlign: 'left',
+					verticalAlign: 'middle',
+					textWrap: 'none',
+					padding: 0,
+					fontSize: 12
+				})
+				//1罐仓流化阀原输出
+				var rect_right = new LeaferUI.Rect({
+					x: io_rect_right_x_32bit,
+					y: y + io_rect_right_y_offset_32bit,
+					height: rect_height_32bit,
+					width: io_rect_right_width_32bit,
+					fill: fill_rect_io_on,
+					draggable: false,
+					id: name_32bit[sid + 16]
+				})
+				var rect_right_text_name = new LeaferUI.Text({
+					x: io_rect_name_right_x_32bit,
+					y: y + io_rect_name_right_y_offset_32bit,
+					width: io_rect_name_right_width_32bit,
+					fill: fill_rect_text_name,
+					text: name_32bit[sid + 16],
+					textAlign: 'right',
+					verticalAlign: 'middle',
+					textWrap: 'none',
+					padding: 0,
+					fontSize: 12
+				})
+				var rect_right_text_description = new LeaferUI.Text({
+					x: io_rect_description_right_x_32bit,
+					y: y + io_rect_description_right_y_offset_32bit,
+					width: io_rect_description_right_width_32bit,
+					fill: fill_rect_text_description,
+					text: descriptions_32bit[sid + 16],
+					textAlign: 'right',
+					verticalAlign: 'middle',
+					textWrap: 'none',
+					padding: 0,
+					fontSize: 12
+				})
+				//console.log(rect)
+				box_32bit.add(rect_left);
+				box_32bit.add(rect_left_text_name);
+				box_32bit.add(rect_left_text_Avalue);
+				box_32bit.add(rect_left_text_description);
+				box_32bit.add(rect_right);
+				box_32bit.add(rect_right_text_name);
+				box_32bit.add(rect_right_text_description);
+			}
+
+			return box_32bit;
+		}
+		function Draw16bitAnalogIOBox(name_16bit, top_text_value_array_16bit, descriptions_16bit, ioboxwidth, initx) {
+			//16IO生成
+			var box_16bit = new LeaferUI.Box({
+				x: initx,
+				y: 20,
+				width: ioboxwidth,
+				height: height_iobox,
+				fill: fill_iobox,
+				draggable: draggable_dev,
+				strokeWidth: 1,
+				stroke: stroke_iobox,
+			})
+
+			var ylinex_sum_four = 0;
+			var ylinex_array_four = [];
+			for (var linexid = 0; linexid < 19; linexid++) {
+				if (linexid == 0) {
+					ylinex_sum_four = ylinex_sum_four + top_row_height_16bit;
+					ylinex_array_four.push(ylinex_sum_four);
+				}
+				else if (linexid == 1) {
+					ylinex_sum_four = ylinex_sum_four + top_row_height_16bit;
+					ylinex_array_four.push(ylinex_sum_four);
+				}
+				else if (linexid == 2) {
+					ylinex_sum_four = ylinex_sum_four + top_row_height_16bit;
+					ylinex_array_four.push(ylinex_sum_four);
+				}
+				else if (linexid == 11) {
+					ylinex_sum_four = ylinex_sum_four + separator_16bit;
+					ylinex_array_four.push(ylinex_sum_four);
+				}
+				else {
+					ylinex_sum_four = ylinex_sum_four + io_row_height_16bit;
+					ylinex_array_four.push(ylinex_sum_four);
+				}
+			}
+			for (var linexid = 0; linexid < 19; linexid++) {
+				if (linexid == 0) {
+					var line = new LeaferUI.Line({
+						x: 0,
+						y: ylinex_array_four[linexid],// ylinex_sum_four + 35,
+						width: width_iobox_16bit,
+						strokeWidth: 1,
+						stroke: stroke_iobox_line,
+						//id: "line" + linexid.toString()
+					});
+					box_16bit.add(line);
+				}
+				else if (linexid == 1) {
+					var line = new LeaferUI.Line({
+						x: 0,
+						y: ylinex_array_four[linexid],// ylinex_sum_four + 35,
+						width: width_iobox_16bit,
+						strokeWidth: 1,
+						stroke: stroke_iobox_line,
+						//id: "line" + linexid.toString()
+					});
+					box_16bit.add(line);
+				}
+				else if (linexid == 2) {
+					var line = new LeaferUI.Line({
+						x: 0,
+						y: ylinex_array_four[linexid],// ylinex_sum_four + 35,
+						width: width_iobox_16bit,
+						strokeWidth: 1,
+						stroke: stroke_iobox_line,
+						//id: "line" + linexid.toString()
+					});
+					box_16bit.add(line);
+				}
+				else if (linexid == 11) {
+					var line = new LeaferUI.Line({
+						x: 0,
+						y: ylinex_array_four[linexid],// ylinex_sum_four + 20,
+						width: width_iobox_16bit,
+						strokeWidth: 1,
+						stroke: stroke_iobox_line,
+						//id: "line" + linexid.toString()
+					});
+					box_16bit.add(line);
+				}
+				else {
+					var line = new LeaferUI.Line({
+						x: 0,
+						y: ylinex_array_four[linexid],// ylinex_sum_four + 45,
+						width: width_iobox_16bit,
+						strokeWidth: 1,
+						stroke: stroke_iobox_line,
+						//id: "line" + linexid.toString()
+					});
+					box_16bit.add(line);
+				}
+			}
+
+			var spiltline_four = new LeaferUI.Line({
+				x: width_iobox_16bit / 2,
+				width: top_row_height_16bit * 2,
+				rotation: 90,
+				stroke: stroke_iobox_spiltline,
+				strokeWidth: 1,
+				dashPattern: [5, 2]
+			})
+			// box_16bit.add(spiltline_four);
+
+
+			//box4左侧顶部状态效果
+			for (var tid = 0; tid < 3; tid++) {
+				let y = io_row_y_offset_16bit + tid * top_row_height_16bit;
+				if (tid < 2) {
+
+					var top_text_value = new LeaferUI.Text({
+						x: io_row_left_x_name_16bit,
+						y: y,//+10
+						//height:10,
+						width: io_row_left_width_name_16bit,
+						fill: fill_top_name,
+						text: top_text_value_array_16bit[tid],
+						textAlign: 'left',
+						verticalAlign: 'middle',
+						textWrap: 'none',
+						padding: 0,
+						fontSize: 12
+					})
+					box_16bit.add(top_text_value)
+				}
+				if (tid == 2) {
+					var rect = new LeaferUI.Rect({
+						x: io_row_left_x_name_16bit,
+						y: y - 5,
+						height: rect_height_16bit,
+						width: io_rect_left_width_16bit,
+						fill: fill_rect,
+						draggable: false,
+						id: top_text_value_array_16bit[1].replace(' ', '') + '_OnlineSatate'
+					})
+					box_16bit.add(rect)
+					var top_text_value = new LeaferUI.Text({
+						x: io_row_left_x_name_16bit + io_rect_left_width_16bit + 15,
+						y: y,//+10
+						//height:10,
+						width: io_row_left_width_name_16bit,
+						fill: fill_top_name,
+						text: top_text_value_array_16bit[tid],
+						textAlign: 'left',
+						verticalAlign: 'middle',
+						textWrap: 'none',
+						padding: 0,
+						fontSize: 12
+					})
+					box_16bit.add(top_text_value)
+				}
+
+
+				// var left_top_text_name_value = new LeaferUI.Text({
+				// 	x:io_row_left_x_value_16bit,
+				// 	y:y,//+10
+				// 	//height:10,
+				// 	width:io_row_left_width_value_16bit,
+				// 	fill: fill_top_name_value,
+				// 	text:left_top_text_value_four_array_16bit[tid],
+				// 	textAlign :'left',
+				// 	verticalAlign:'middle',
+				// 	textWrap:'none',
+				// 	padding:0,
+				// 	fontSize:12
+				// })
+				// //建议取消
+				// var right_top_text_name = new LeaferUI.Text({
+				// 	x:io_row_right_x_name_16bit,
+				// 	y:y,//+10
+				// 	//height:10,
+				// 	width:io_row_right_width_name_16bit,
+				// 	fill: fill_top_name,
+				// 	text:right_top_text_name_four_array_16bit[tid],
+				// 	textAlign :'left',
+				// 	verticalAlign:'middle',
+				// 	textWrap:'none',
+				// 	padding:0,
+				// 	fontSize:12
+				// })
+				// var right_top_text_name_value = new LeaferUI.Text({
+				// 	x:io_row_right_x_name_16bit,
+				// 	y:y,//+10
+				// 	//height:10,
+				// 	width:io_row_right_width_value_16bit,
+				// 	fill: fill_top_name_value,
+				// 	text:right_top_text_value_four_array_16bit[tid],
+				// 	textAlign :'left',
+				// 	verticalAlign:'middle',
+				// 	textWrap:'none',
+				// 	padding:0,
+				// 	fontSize:12
+				// })
+				// box_16bit.add(left_top_text_name)
+				// //box_16bit.add(right_top_text_name)
+				// box_16bit.add(left_top_text_name_value)
+				// box_16bit.add(right_top_text_name_value)
+			}
+
+
+			//box4效果
+			for (var sid = 0; sid < 16; sid++) {
+				let y = 0;
+				if (sid < 8) {
+					y = io_row_height_16bit * (sid) + rect_top_y_offset_16bit;
+				}
+				if (sid >= 8) {
+					y = io_row_height_16bit * (sid + 1) + rect_bottom_y_offset_16bit;
+				}
+				var rect_left = new LeaferUI.Rect({
+					x: io_rect_left_x_16bit,
+					y: y + io_rect_left_y_offset_16bit,
+					height: rect_height_16bit,
+					width: io_rect_left_width_16bit,
+					fill: fill_rect,
+					draggable: false,
+					id: name_16bit[sid]
+				})
+				var rect_left_text_name = new LeaferUI.Text({
+					x: io_rect_name_left_x_16bit,
+					y: y + io_rect_name_left_y_offset_16bit,
+					width: io_rect_name_left_width_16bit,
+					fill: fill_rect_text_name,
+					text: name_16bit[sid],
+					textAlign: 'left',
+					verticalAlign: 'middle',
+					textWrap: 'none',
+					padding: 0,
+					fontSize: 12
+				})
+				var rect_left_text_description = new LeaferUI.Text({
+					x: io_rect_description_left_x_16bit,
+					y: y + io_rect_description_left_y_offset_16bit,
+					width: io_rect_description_left_width_16bit,
+					fill: fill_rect_text_description,
+					text: descriptions_16bit[sid],
+					textAlign: 'left',
+					verticalAlign: 'middle',
+					textWrap: 'none',
+					textOverflow: ' ',
+					padding: 0,
+					fontSize: 12
+				})
+
+				box_16bit.add(rect_left);
+				box_16bit.add(rect_left_text_name);
+				box_16bit.add(rect_left_text_description);
+			}
+			return box_16bit;
+		}
+
+		function DrawCPUBox(name_cpu, top_text_value_array_cpu, descriptions_cpu, name_eth_cpu, descriptions_eth_cpu, ioboxwidth, initx) {
+			var box_cpu = new LeaferUI.Box({
+				x: initx,
+				y: 20,
+				width: ioboxwidth,
+				height: height_iobox,
+				fill: fill_iobox,
+				draggable: draggable_dev,
+				strokeWidth: 1,
+				stroke: stroke_iobox,
+			})
+		
+			var ylinex_sum_four = 0;
+			var ylinex_array_four = [];
+			for (var linexid = 0; linexid < 19; linexid++) {
+				if (linexid == 0) {
+					ylinex_sum_four = ylinex_sum_four + top_row_height_cpu;
+					ylinex_array_four.push(ylinex_sum_four);
+				}
+				else if (linexid == 1) {
+					ylinex_sum_four = ylinex_sum_four + top_row_height_cpu;
+					ylinex_array_four.push(ylinex_sum_four);
+				}
+				else if (linexid == 2) {
+					ylinex_sum_four = ylinex_sum_four + top_row_height_cpu;
+					ylinex_array_four.push(ylinex_sum_four);
+				}
+				else if (linexid == 11) {
+					ylinex_sum_four = ylinex_sum_four + separator_cpu;
+					ylinex_array_four.push(ylinex_sum_four);
+				}
+				else {
+					ylinex_sum_four = ylinex_sum_four + io_row_height_cpu;
+					ylinex_array_four.push(ylinex_sum_four);
+				}
+			}
+			for (var linexid = 0; linexid < 19; linexid++) {
+				if (linexid == 0) {
+					var line = new LeaferUI.Line({
+						x: 0,
+						y: ylinex_array_four[linexid],// ylinex_sum_four + 35,
+						width: width_iobox_cpu,
+						strokeWidth: 1,
+						stroke: stroke_iobox_line,
+					});
+					box_cpu.add(line);
+				}
+				else if (linexid == 1) {
+					var line = new LeaferUI.Line({
+						x: 0,
+						y: ylinex_array_four[linexid],// ylinex_sum_four + 35,
+						width: width_iobox_cpu,
+						strokeWidth: 1,
+						stroke: stroke_iobox_line,
+					});
+					box_cpu.add(line);
+				}
+				else if (linexid == 2) {
+					var line = new LeaferUI.Line({
+						x: 0,
+						y: ylinex_array_four[linexid],// ylinex_sum_four + 35,
+						width: width_iobox_cpu,
+						strokeWidth: 1,
+						stroke: stroke_iobox_line,
+					});
+					box_cpu.add(line);
+				}
+				else if (linexid == 11) {
+					var line = new LeaferUI.Line({
+						x: 0,
+						y: ylinex_array_four[linexid],// ylinex_sum_four + 20,
+						width: width_iobox_cpu,
+						strokeWidth: 1,
+						stroke: stroke_iobox_line,
+					});
+					box_cpu.add(line);
+				}
+				else {
+					var line = new LeaferUI.Line({
+						x: 0,
+						y: ylinex_array_four[linexid],// ylinex_sum_four + 45,
+						width: width_iobox_cpu,
+						strokeWidth: 1,
+						stroke: stroke_iobox_line,
+					});
+					box_cpu.add(line);
+				}
+			}
+		
+			var spiltline_four = new LeaferUI.Line({
+				x: width_iobox_cpu / 2,
+				width: top_row_height_cpu * 2,
+				rotation: 90,
+				stroke: stroke_iobox_spiltline,
+				strokeWidth: 1,
+				dashPattern: [5, 2]
+			})
+			//box4左侧顶部状态效果
+			for (var tid = 0; tid < 3; tid++) {
+				let y = io_row_y_offset_cpu + tid * top_row_height_cpu;
+				if (tid < 2) {
+		
+					var top_text_value = new LeaferUI.Text({
+						x: io_row_left_x_name_cpu,
+						y: y,//+10
+						//height:10,
+						width: io_row_left_width_name_cpu,
+						fill: fill_top_name,
+						text: top_text_value_array_cpu[tid],
+						textAlign: 'left',
+						verticalAlign: 'middle',
+						textWrap: 'none',
+						padding: 0,
+						fontSize: 12
+					})
+					box_cpu.add(top_text_value);
+				}
+				if (tid == 2) {
+					var rect = new LeaferUI.Rect({
+						x: io_row_left_x_name_cpu,
+						y: y - 5,
+						height: rect_height_cpu,
+						width: io_rect_left_width_cpu,
+						fill: fill_rect,
+						draggable: false,
+						id:top_text_value_array_cpu[1].replace(' ', '') + '_OnlineSatate'
+					})
+					box_cpu.add(rect)
+					var top_text_value = new LeaferUI.Text({
+						x: io_row_left_x_name_cpu + io_rect_left_width_cpu + 15,
+						y: y,//+10
+						//height:10,
+						width: io_row_left_width_name_cpu,
+						fill: fill_top_name,
+						text: top_text_value_array_cpu[tid],
+						textAlign: 'left',
+						verticalAlign: 'middle',
+						textWrap: 'none',
+						padding: 0,
+						fontSize: 12
+					})
+					box_cpu.add(top_text_value)
+				}
+		
+			}
+			//box4效果
+			for (var sid = 0; sid < 16; sid++) {
+				let y = 0;
+				
+				if (sid < 8) {
+					y = io_row_height_cpu * (sid) + rect_top_y_offset_cpu;
+				}
+				if (sid >= 8) {
+					y = io_row_height_cpu * (sid + 1) + rect_bottom_y_offset_cpu;
+				}
+				if (sid < 3) {
+					var rect_left = new LeaferUI.Rect({
+						x: io_rect_left_x_cpu,
+						y: y + io_rect_left_y_offset_cpu,
+						height: rect_height_cpu,
+						width: io_rect_left_width_cpu,
+						fill: fill_rect,
+						draggable: false,
+						id: name_cpu[sid]+'1'
+					})
+					var rect_left_text_name = new LeaferUI.Text({
+						x: io_rect_name_left_x_cpu,
+						y: y + io_rect_name_left_y_offset_cpu,
+						width: io_rect_name_left_width_cpu,
+						fill: fill_rect_text_name,
+						text: name_cpu[sid],
+						textAlign: 'left',
+						verticalAlign: 'middle',
+						textWrap: 'none',
+						padding: 0,
+						fontSize: 12
+					})
+					var rect_left_text_description = new LeaferUI.Text({
+						x: io_rect_description_left_x_cpu,
+						y: y + io_rect_description_left_y_offset_cpu,
+						width: io_rect_description_left_width_cpu / 3,
+						fill: fill_rect_text_description,
+						text: descriptions_cpu[sid],
+						textAlign: 'left',
+						verticalAlign: 'middle',
+						textWrap: 'none',
+						textOverflow: ' ',
+						padding: 0,
+						fontSize: 12
+					})
+
+					box_cpu.add(rect_left);
+					box_cpu.add(rect_left_text_name);
+					box_cpu.add(rect_left_text_description);
+				}
+				else if (7 < sid && sid < (8 + name_eth_cpu.length)) 
+				{
+					var rect_left = new LeaferUI.Rect({
+						x: io_rect_left_x_cpu,
+						y: y + io_rect_left_y_offset_cpu,
+						height: rect_height_cpu,
+						width: io_rect_left_width_cpu,
+						fill: fill_rect,
+						draggable: false,
+						id: name_eth_cpu[sid-8]
+					})
+					var rect_left_text_name = new LeaferUI.Text({
+						x: io_rect_name_left_x_cpu,
+						y: y + io_rect_name_left_y_offset_cpu,
+						width: io_rect_name_left_width_cpu,
+						fill: fill_rect_text_name,
+						text: name_eth_cpu[sid-8],
+						textAlign: 'left',
+						verticalAlign: 'middle',
+						textWrap: 'none',
+						padding: 0,
+						fontSize: 12
+					})
+					var rect_left_text_description = new LeaferUI.Text({
+						x: io_rect_description_left_x_cpu,
+						y: y + io_rect_description_left_y_offset_cpu,
+						width: io_rect_description_left_width_cpu / 3,
+						fill: fill_rect_text_description,
+						text: descriptions_eth_cpu[sid-8],
+						textAlign: 'left',
+						verticalAlign: 'middle',
+						textWrap: 'none',
+						textOverflow: ' ',
+						padding: 0,
+						fontSize: 12
+					})
+
+					box_cpu.add(rect_left);
+					box_cpu.add(rect_left_text_name);
+					box_cpu.add(rect_left_text_description);
+				}
+			}
+			return box_cpu;
+		}
+
+		function DrawCMBox(name_cm, top_text_value_array_cm, descriptions_cm, name_eth_cm, descriptions_eth_cm, ioboxwidth, initx) {
+			var box_cm = new LeaferUI.Box({
+				x: initx,
+				y: 20,
+				width: ioboxwidth,
+				height: height_iobox,
+				fill: fill_iobox,
+				draggable: draggable_dev,
+				strokeWidth: 1,
+				stroke: stroke_iobox,
+			})
+
+			var ylinex_sum_four = 0;
+			var ylinex_array_four = [];
+			for (var linexid = 0; linexid < 19; linexid++) {
+				if (linexid == 0) {
+					ylinex_sum_four = ylinex_sum_four + top_row_height_cm;
+					ylinex_array_four.push(ylinex_sum_four);
+				}
+				else if (linexid == 1) {
+					ylinex_sum_four = ylinex_sum_four + top_row_height_cm;
+					ylinex_array_four.push(ylinex_sum_four);
+				}
+				else if (linexid == 2) {
+					ylinex_sum_four = ylinex_sum_four + top_row_height_cm;
+					ylinex_array_four.push(ylinex_sum_four);
+				}
+				else if (linexid == 11) {
+					ylinex_sum_four = ylinex_sum_four + separator_cm;
+					ylinex_array_four.push(ylinex_sum_four);
+				}
+				else {
+					ylinex_sum_four = ylinex_sum_four + io_row_height_cm;
+					ylinex_array_four.push(ylinex_sum_four);
+				}
+			}
+			for (var linexid = 0; linexid < 19; linexid++) {
+				if (linexid == 0) {
+					var line = new LeaferUI.Line({
+						x: 0,
+						y: ylinex_array_four[linexid],// ylinex_sum_four + 35,
+						width: width_iobox_cm,
+						strokeWidth: 1,
+						stroke: stroke_iobox_line,
+					});
+					box_cm.add(line);
+				}
+				else if (linexid == 1) {
+					var line = new LeaferUI.Line({
+						x: 0,
+						y: ylinex_array_four[linexid],// ylinex_sum_four + 35,
+						width: width_iobox_cm,
+						strokeWidth: 1,
+						stroke: stroke_iobox_line,
+					});
+					box_cm.add(line);
+				}
+				else if (linexid == 2) {
+					var line = new LeaferUI.Line({
+						x: 0,
+						y: ylinex_array_four[linexid],// ylinex_sum_four + 35,
+						width: width_iobox_cm,
+						strokeWidth: 1,
+						stroke: stroke_iobox_line,
+					});
+					box_cm.add(line);
+				}
+				else if (linexid == 11) {
+					var line = new LeaferUI.Line({
+						x: 0,
+						y: ylinex_array_four[linexid],// ylinex_sum_four + 20,
+						width: width_iobox_cm,
+						strokeWidth: 1,
+						stroke: stroke_iobox_line,
+					});
+					box_cm.add(line);
+				}
+				else {
+					var line = new LeaferUI.Line({
+						x: 0,
+						y: ylinex_array_four[linexid],// ylinex_sum_four + 45,
+						width: width_iobox_cm,
+						strokeWidth: 1,
+						stroke: stroke_iobox_line,
+					});
+					box_cm.add(line);
+				}
+			}
+
+			var spiltline_four = new LeaferUI.Line({
+				x: width_iobox_cm / 2,
+				width: top_row_height_cm * 2,
+				rotation: 90,
+				stroke: stroke_iobox_spiltline,
+				strokeWidth: 1,
+				dashPattern: [5, 2]
+			})
+			//box4左侧顶部状态效果
+			for (var tid = 0; tid < 3; tid++) {
+				let y = io_row_y_offset_cm + tid * top_row_height_cm;
+				if (tid < 2) {
+
+					var top_text_value = new LeaferUI.Text({
+						x: io_row_left_x_name_cm,
+						y: y,//+10
+						//height:10,
+						width: io_row_left_width_name_cm,
+						fill: fill_top_name,
+						text: top_text_value_array_cm[tid],
+						textAlign: 'left',
+						verticalAlign: 'middle',
+						textWrap: 'none',
+						padding: 0,
+						fontSize: 12
+					})
+					box_cm.add(top_text_value);
+				}
+				if (tid == 2) {
+					var rect = new LeaferUI.Rect({
+						x: io_row_left_x_name_cm,
+						y: y - 5,
+						height: rect_height_cm,
+						width: io_rect_left_width_cm,
+						fill: fill_rect,
+						draggable: false,
+						id: top_text_value_array_cm[1].replace(' ', '') + '_OnlineSatate'
+					})
+					box_cm.add(rect)
+					var top_text_value = new LeaferUI.Text({
+						x: io_row_left_x_name_cm + io_rect_left_width_cm + 15,
+						y: y,//+10
+						//height:10,
+						width: io_row_left_width_name_cm,
+						fill: fill_top_name,
+						text: top_text_value_array_cm[tid],
+						textAlign: 'left',
+						verticalAlign: 'middle',
+						textWrap: 'none',
+						padding: 0,
+						fontSize: 12
+					})
+					box_cm.add(top_text_value)
+				}
+
+			}
+			//box4效果
+			for (var sid = 0; sid < 16; sid++) {
+				let y = 0;
+
+				if (sid < 8) {
+					y = io_row_height_cm * (sid) + rect_top_y_offset_cm;
+				}
+				if (sid >= 8) {
+					y = io_row_height_cm * (sid + 1) + rect_bottom_y_offset_cm;
+				}
+				if (sid < 3) {
+					var rect_left = new LeaferUI.Rect({
+						x: io_rect_left_x_cm,
+						y: y + io_rect_left_y_offset_cm,
+						height: rect_height_cm,
+						width: io_rect_left_width_cm,
+						fill: fill_rect,
+						draggable: false,
+						id: name_cm[sid]
+					})
+					var rect_left_text_name = new LeaferUI.Text({
+						x: io_rect_name_left_x_cm,
+						y: y + io_rect_name_left_y_offset_cm,
+						width: io_rect_name_left_width_cm,
+						fill: fill_rect_text_name,
+						text: name_cm[sid],
+						textAlign: 'left',
+						verticalAlign: 'middle',
+						textWrap: 'none',
+						padding: 0,
+						fontSize: 12
+					})
+					var rect_left_text_description = new LeaferUI.Text({
+						x: io_rect_description_left_x_cm,
+						y: y + io_rect_description_left_y_offset_cm,
+						width: io_rect_description_left_width_cm / 3,
+						fill: fill_rect_text_description,
+						text: descriptions_cm[sid],
+						textAlign: 'left',
+						verticalAlign: 'middle',
+						textWrap: 'none',
+						textOverflow: ' ',
+						padding: 0,
+						fontSize: 12
+					})
+
+					box_cm.add(rect_left);
+					box_cm.add(rect_left_text_name);
+					box_cm.add(rect_left_text_description);
+				}
+				else if (7 < sid && sid < (8 + name_eth_cm.length)) {
+					var rect_left = new LeaferUI.Rect({
+						x: io_rect_left_x_cm,
+						y: y + io_rect_left_y_offset_cm,
+						height: rect_height_cm,
+						width: io_rect_left_width_cm,
+						fill: fill_rect,
+						draggable: false,
+						id: name_eth_cm[sid - 8]
+					})
+					var rect_left_text_name = new LeaferUI.Text({
+						x: io_rect_name_left_x_cm,
+						y: y + io_rect_name_left_y_offset_cm,
+						width: io_rect_name_left_width_cm,
+						fill: fill_rect_text_name,
+						text: name_eth_cm[sid - 8],
+						textAlign: 'left',
+						verticalAlign: 'middle',
+						textWrap: 'none',
+						padding: 0,
+						fontSize: 12
+					})
+					var rect_left_text_description = new LeaferUI.Text({
+						x: io_rect_description_left_x_cm,
+						y: y + io_rect_description_left_y_offset_cm,
+						width: io_rect_description_left_width_cm / 3,
+						fill: fill_rect_text_description,
+						text: descriptions_eth_cm[sid - 8],
+						textAlign: 'left',
+						verticalAlign: 'middle',
+						textWrap: 'none',
+						textOverflow: ' ',
+						padding: 0,
+						fontSize: 12
+					})
+
+					box_cm.add(rect_left);
+					box_cm.add(rect_left_text_name);
+					box_cm.add(rect_left_text_description);
+				}
+			}
+			return box_cm;
+		}
+
+        var t = null;
+        function time() {
+            clearTimeout(t); //清除定时器
+            UpdataChart()
+            t = setTimeout(time, 1 * 1000); //设定定时器，循环运行
+
+        }
+        async function UpdataChart() {
+
+            myajax = await $.ajax({
+                url: "/PenMeiReportManage/PenMeiJMReport/GetRealIOState",
+                type: "Get",
+                dataType: "json",
+                success: function (redata) {
+
+                }
+            });
+            $.when(myajax).done(function (redata) {
+				debugger; 
+				leafer.findOne('#' + 'RUN1').fill = fill_rect_io_on;
+				leafer.findOne('#' + 'RUN').fill = fill_rect_io_on;
+				leafer.findOne('#' + 'ETH0').fill = fill_rect_io_on;
+				leafer.findOne('#' + 'ETH1').fill = fill_rect_io_on;
+				leafer.findOne('#' + 'ETH2').fill = fill_rect_io_on;
+                for(var ioName in redata)
+				{
+					leafer.findOne('#'+ioName.replace('_','.')).fill =(redata[ioName] == '1') ? fill_rect_io_on : fill_rect_io_off;
+
+				}
+				for (var ioslot = 0; ioslot < 8; ioslot++) {
+					leafer.findOne('#' + 'Slot:' + ioslot + '_OnlineSatate').fill = fill_rect_io_on;
+				}
+
+            });
+        }
+		t = setTimeout(time, 1 * 1000); //开始运行
+    })
+</script>
+<script type="text/javascript" src="~/lib//leafer-ui@1.0.0-rc.8/web.js"></script>
+<div style ="width:100%;height:100%;">
+	<div class="layuimini-container" style="width:100%;height:100%; ">
+        <div id = "idmain">
+            
+        </div>
+    </div>
+</div>
diff --git a/HT.Cloud.Web/Areas/PenMeiReportManage/Views/PenMeiJMReportNew/Index.cshtml b/HT.Cloud.Web/Areas/PenMeiReportManage/Views/PenMeiJMReportNew/Index.cshtml
index 3b96e0d..de9c474 100644
--- a/HT.Cloud.Web/Areas/PenMeiReportManage/Views/PenMeiJMReportNew/Index.cshtml
+++ b/HT.Cloud.Web/Areas/PenMeiReportManage/Views/PenMeiJMReportNew/Index.cshtml
@@ -472,7 +472,7 @@
 			}
 		});
 
-		debugger;
+		// debugger;
 
 		const top_text_value_array_32bitt = ['DQ 32xDC 24V/0.5A HF', 'Slot: 1', '在线'];//右上右下
 		const name_32bitt = ['DQ0.0', 'DQ0.1', 'DQ0.2', 'DQ0.3', 'DQ0.4', 'DQ0.5', 'DQ0.6', 'DQ0.7', 'DQ1.0', 'DQ1.1', 'DQ1.2', 'DQ1.3', 'DQ1.4', 'DQ1.5', 'DQ1.6', 'DQ1.7', 'DQ2.0', 'DQ2.1', 'DQ2.2', 'DQ2.3', 'DQ2.4', 'DQ2.5', 'DQ2.6', 'DQ2.7', 'DQ3.0', 'DQ3.1', 'DQ3.2', 'DQ3.3', 'DQ3.4', 'DQ3.5', 'DQ3.6', 'DQ3.7',];
@@ -493,9 +493,10 @@
 		iogroup.sort(function (a, b) {
 			return a.IOSlot - b.IOSlot; // 从小到大排序
 		});
-		debugger;
+		// debugger;
 		var initx = 452;
 		for (var i = 0; i < iogroup.length; i++) {
+			var iotype = iogroup[i].IOType;
 			var iobit = iogroup[i].IOBit;
 			var ioid = iogroup[i].IOID;
 			var top_text_value_array = [iogroup[i].IOModel, 'Slot: ' + iogroup[i].IOSlot, "在线"]
@@ -510,29 +511,72 @@
 			}
 			
 			var ioboxwidth = 0;
-			//debugger;
-			if (iobit == '32') {
-				ioboxwidth = 300;
-				var offset = 2;
-				initx = initx + offset
-				var box = Draw32bitIOBox(names, top_text_value_array, descriptions, ioboxwidth, initx)
-				initx = initx + ioboxwidth;
-				group.add(box)
-			}
-			else if (iobit == '16') {
-				ioboxwidth = 200;
-				var offset = 2;
-				initx = initx + offset
-				var box = Draw16bitIOBox(names, top_text_value_array, descriptions, ioboxwidth, initx)
-				initx = initx + ioboxwidth;
-				group.add(box)
-			} else if (iobit = '8') {
-				ioboxwidth = 200;
-				var offset = 2;
-				initx = initx + offset
-				var box = Draw8bitIOBox(names, top_text_value_array, descriptions, ioboxwidth, initx)
-				initx = initx + ioboxwidth;
-				group.add(box)
+			debugger;
+			if(iotype == 'Digital')
+			{
+				if (iobit == '32') {
+					ioboxwidth = 300;
+					var offset = 2;
+					initx = initx + offset
+					var box = Draw32bitIOBox(names, top_text_value_array, descriptions, ioboxwidth, initx)
+					initx = initx + ioboxwidth;
+					group.add(box)
+				}
+				else if (iobit == '16') {
+					ioboxwidth = 200;
+					var offset = 2;
+					initx = initx + offset
+					var box = Draw16bitIOBox(names, top_text_value_array, descriptions, ioboxwidth, initx)
+					initx = initx + ioboxwidth;
+					group.add(box)
+				} else if (iobit = '8') {
+					ioboxwidth = 200;
+					var offset = 2;
+					initx = initx + offset
+					var box = Draw8bitIOBox(names, top_text_value_array, descriptions, ioboxwidth, initx)
+					initx = initx + ioboxwidth;
+					group.add(box)
+				}
+			} else if (iotype == 'Analog') {
+				if (iobit == '32') {
+					ioboxwidth = 300;
+					var offset = 2;
+					initx = initx + offset
+					var box = Draw32bitAnalogIOBox(names, top_text_value_array, descriptions, ioboxwidth, initx)
+					initx = initx + ioboxwidth;
+					group.add(box)
+				}
+				else if (iobit == '16') {
+					ioboxwidth = 200;
+					var offset = 2;
+					initx = initx + offset
+					var box = Draw16bitAnalogIOBox(names, top_text_value_array, descriptions, ioboxwidth, initx)
+					initx = initx + ioboxwidth;
+					group.add(box)
+				} else if (iobit == '8') {
+					ioboxwidth = 200;
+					var offset = 2;
+					initx = initx + offset
+					var box = Draw8bitAnalogIOBox(names, top_text_value_array, descriptions, ioboxwidth, initx)
+					initx = initx + ioboxwidth;
+					group.add(box)
+				} else if (iobit == '4') {
+					debugger;
+					ioboxwidth = 200;
+					var offset = 2;
+					initx = initx + offset
+					var box = Draw4bitAnalogIOBox(names, top_text_value_array, descriptions, ioboxwidth, initx)
+					initx = initx + ioboxwidth;
+					group.add(box)
+				} else if (iobit == '2') {
+					debugger;
+					ioboxwidth = 200;
+					var offset = 2;
+					initx = initx + offset
+					var box = Draw2bitAnalogIOBox(names, top_text_value_array, descriptions, ioboxwidth, initx)
+					initx = initx + ioboxwidth;
+					group.add(box)
+				}
 			}
 			
 		}
@@ -678,7 +722,7 @@
 						draggable: false,
 						id: top_text_value_array_32bit[1].replace(' ', '') + '_OnlineSatate'
 					})
-					debugger;
+					// debugger;
 					box_32bit.add(rect)
 					var top_text_value = new LeaferUI.Text({
 						x: io_row_left_x_name_32bit + io_rect_left_width_32bit + 15,
@@ -1347,6 +1391,1314 @@
 			return box_8bit;
 		}
 
+		function Draw32bitAnalogIOBox(name_32bit, top_text_value_array_32bit, descriptions_32bit, ioboxwidth, initx) {
+			var box_32bit = new LeaferUI.Box({
+				x: initx,
+				y: 20,
+				width: ioboxwidth,
+				height: height_iobox,
+				fill: fill_iobox,
+				draggable: draggable_dev,
+				strokeWidth: 1,
+				stroke: stroke_iobox,
+			})
+
+			var ylinex_sum_four = 0;
+			var ylinex_array_four = [];
+			for (var linexid = 0; linexid < 19; linexid++) {
+				if (linexid == 0) {
+					ylinex_sum_four = ylinex_sum_four + top_row_height_32bit;
+					ylinex_array_four.push(ylinex_sum_four);
+				}
+				else if (linexid == 1) {
+					ylinex_sum_four = ylinex_sum_four + top_row_height_32bit;
+					ylinex_array_four.push(ylinex_sum_four);
+				}
+				else if (linexid == 2) {
+					ylinex_sum_four = ylinex_sum_four + top_row_height_32bit;
+					ylinex_array_four.push(ylinex_sum_four);
+				}
+				else if (linexid == 11) {
+					ylinex_sum_four = ylinex_sum_four + separator_32bit;
+					ylinex_array_four.push(ylinex_sum_four);
+				}
+				else {
+					ylinex_sum_four = ylinex_sum_four + io_row_height_32bit;
+					ylinex_array_four.push(ylinex_sum_four);
+				}
+			}
+			for (var linexid = 0; linexid < 19; linexid++) {
+				if (linexid == 0) {
+					var line = new LeaferUI.Line({
+						x: 0,
+						y: ylinex_array_four[linexid],// ylinex_sum_four + 35,
+						width: width_iobox,
+						strokeWidth: 1,
+						stroke: stroke_iobox_line,
+						//id: "line" + linexid.toString()
+					});
+					box_32bit.add(line);
+				}
+				else if (linexid == 1) {
+					var line = new LeaferUI.Line({
+						x: 0,
+						y: ylinex_array_four[linexid],// ylinex_sum_four + 35,
+						width: width_iobox,
+						strokeWidth: 1,
+						stroke: stroke_iobox_line,
+						//id: "line" + linexid.toString()
+					});
+					box_32bit.add(line);
+				}
+				else if (linexid == 2) {
+					var line = new LeaferUI.Line({
+						x: 0,
+						y: ylinex_array_four[linexid],// ylinex_sum_four + 35,
+						width: width_iobox,
+						strokeWidth: 1,
+						stroke: stroke_iobox_line,
+						//id: "line" + linexid.toString()
+					});
+					box_32bit.add(line);
+				}
+				else if (linexid == 11) {
+					var line = new LeaferUI.Line({
+						x: 0,
+						y: ylinex_array_four[linexid],// ylinex_sum_four + 20,
+						width: width_iobox,
+						strokeWidth: 1,
+						stroke: stroke_iobox_line,
+						//id: "line" + linexid.toString()
+					});
+					box_32bit.add(line);
+				}
+				else {
+					var line = new LeaferUI.Line({
+						x: 0,
+						y: ylinex_array_four[linexid],// ylinex_sum_four + 45,
+						width: width_iobox,
+						strokeWidth: 1,
+						stroke: stroke_iobox_line,
+						//id: "line" + linexid.toString()
+					});
+					box_32bit.add(line);
+				}
+				//box_32bit.add(line);
+			}
+
+			var spiltline_four = new LeaferUI.Line({
+				x: width_iobox / 2,
+				y: top_row_height_32bit * 3,
+				width: height_iobox - top_row_height_32bit * 3,
+				rotation: 90,
+				stroke: stroke_iobox_spiltline,
+				strokeWidth: 1,
+				dashPattern: [5, 2]
+			})
+			box_32bit.add(spiltline_four);
+
+
+			//box4左侧顶部状态效果
+			for (var tid = 0; tid < 3; tid++) {
+				let y = io_row_y_offset_32bit + tid * top_row_height_32bit;
+				if (tid < 2) {
+					var top_text_value = new LeaferUI.Text({
+						x: io_row_left_x_name_32bit,
+						y: y,//+10
+						//height:10,
+						width: io_row_left_width_name_32bit,
+						fill: fill_top_name,
+						text: top_text_value_array_32bit[tid],
+						textAlign: 'left',
+						verticalAlign: 'middle',
+						textWrap: 'none',
+						padding: 0,
+						fontSize: 12
+					})
+					box_32bit.add(top_text_value)
+				}
+
+				if (tid == 2) {
+					var rect = new LeaferUI.Rect({
+						x: io_row_left_x_name_32bit,
+						y: y - 5,
+						height: rect_height_32bit,
+						width: io_rect_left_width_32bit,
+						fill: fill_rect,
+						draggable: false,
+						id: top_text_value_array_32bit[1].replace(' ', '') + '_OnlineSatate'
+					})
+					//debugger;
+					box_32bit.add(rect)
+					var top_text_value = new LeaferUI.Text({
+						x: io_row_left_x_name_32bit + io_rect_left_width_32bit + 15,
+						y: y,//+10
+						//height:10,
+						width: io_row_left_width_name_32bit,
+						fill: fill_top_name,
+						text: top_text_value_array_32bit[tid],
+						textAlign: 'left',
+						verticalAlign: 'middle',
+						textWrap: 'none',
+						padding: 0,
+						fontSize: 12
+					})
+					box_32bit.add(top_text_value)
+				}
+
+			}
+
+
+			//box4效果
+			for (var sid = 0; sid < 16; sid++) {
+				let y = 0;
+				if (sid < 8) {
+					y = io_row_height_32bit * (sid) + rect_top_y_offset_32bit;
+				}
+				if (sid >= 8) {
+					y = io_row_height_32bit * (sid + 1) + rect_bottom_y_offset_32bit;
+				}
+				var rect_left = new LeaferUI.Rect({
+					x: io_rect_left_x_32bit,
+					y: y + io_rect_left_y_offset_32bit,
+					height: rect_height_32bit,
+					width: io_rect_left_width_32bit,
+					fill: fill_rect_io_on,
+					draggable: false,
+					id: name_32bit[sid]
+				})
+				var rect_left_text_name = new LeaferUI.Text({
+					x: io_rect_name_left_x_32bit,
+					y: y + io_rect_name_left_y_offset_32bit,
+					width: io_rect_name_left_width_32bit,
+					fill: fill_rect_text_name,
+					text: name_32bit[sid],
+					textAlign: 'left',
+					verticalAlign: 'middle',
+					textWrap: 'none',
+					padding: 0,
+					fontSize: 12
+				})
+				var rect_left_text_Avalue = new LeaferUI.Text({
+					x: io_rect_name_left_x_32bit + io_rect_name_left_width_32bit,
+					y: y + io_rect_name_left_y_offset_32bit,
+					width: io_rect_description_left_width_32bit,
+					fill: fill_rect_text_name,
+					text: 111111,
+					textAlign: 'left',
+					verticalAlign: 'middle',
+					textWrap: 'none',
+					padding: 0,
+					fontSize: 12
+				})
+				var rect_left_text_description = new LeaferUI.Text({
+					x: io_rect_description_left_x_32bit,
+					y: y + io_rect_description_left_y_offset_32bit,
+					width: io_rect_description_left_width_32bit,
+					fill: fill_rect_text_description,
+					text: descriptions_32bit[sid],
+					textAlign: 'left',
+					verticalAlign: 'middle',
+					textWrap: 'none',
+					padding: 0,
+					fontSize: 12
+				})
+				//1罐仓流化阀原输出
+				var rect_right = new LeaferUI.Rect({
+					x: io_rect_right_x_32bit,
+					y: y + io_rect_right_y_offset_32bit,
+					height: rect_height_32bit,
+					width: io_rect_right_width_32bit,
+					fill: fill_rect_io_on,
+					draggable: false,
+					id: name_32bit[sid + 16]
+				})
+				var rect_right_text_name = new LeaferUI.Text({
+					x: io_rect_name_right_x_32bit,
+					y: y + io_rect_name_right_y_offset_32bit,
+					width: io_rect_name_right_width_32bit,
+					fill: fill_rect_text_name,
+					text: name_32bit[sid + 16],
+					textAlign: 'right',
+					verticalAlign: 'middle',
+					textWrap: 'none',
+					padding: 0,
+					fontSize: 12
+				})
+				var rect_right_text_description = new LeaferUI.Text({
+					x: io_rect_description_right_x_32bit,
+					y: y + io_rect_description_right_y_offset_32bit,
+					width: io_rect_description_right_width_32bit,
+					fill: fill_rect_text_description,
+					text: descriptions_32bit[sid + 16],
+					textAlign: 'right',
+					verticalAlign: 'middle',
+					textWrap: 'none',
+					padding: 0,
+					fontSize: 12
+				})
+				//console.log(rect)
+				box_32bit.add(rect_left);
+				box_32bit.add(rect_left_text_name);
+				box_32bit.add(rect_left_text_Avalue);
+				box_32bit.add(rect_left_text_description);
+				box_32bit.add(rect_right);
+				box_32bit.add(rect_right_text_name);
+				box_32bit.add(rect_right_text_description);
+			}
+
+			return box_32bit;
+		}
+		function Draw16bitAnalogIOBox(name_16bit, top_text_value_array_16bit, descriptions_16bit, ioboxwidth, initx) {
+			//16IO生成
+			var box_16bit = new LeaferUI.Box({
+				x: initx,
+				y: 20,
+				width: ioboxwidth,
+				height: height_iobox,
+				fill: fill_iobox,
+				draggable: draggable_dev,
+				strokeWidth: 1,
+				stroke: stroke_iobox,
+			})
+
+			var ylinex_sum_four = 0;
+			var ylinex_array_four = [];
+			for (var linexid = 0; linexid < 19; linexid++) {
+				if (linexid == 0) {
+					ylinex_sum_four = ylinex_sum_four + top_row_height_16bit;
+					ylinex_array_four.push(ylinex_sum_four);
+				}
+				else if (linexid == 1) {
+					ylinex_sum_four = ylinex_sum_four + top_row_height_16bit;
+					ylinex_array_four.push(ylinex_sum_four);
+				}
+				else if (linexid == 2) {
+					ylinex_sum_four = ylinex_sum_four + top_row_height_16bit;
+					ylinex_array_four.push(ylinex_sum_four);
+				}
+				else if (linexid == 11) {
+					ylinex_sum_four = ylinex_sum_four + separator_16bit;
+					ylinex_array_four.push(ylinex_sum_four);
+				}
+				else {
+					ylinex_sum_four = ylinex_sum_four + io_row_height_16bit;
+					ylinex_array_four.push(ylinex_sum_four);
+				}
+			}
+			for (var linexid = 0; linexid < 19; linexid++) {
+				if (linexid == 0) {
+					var line = new LeaferUI.Line({
+						x: 0,
+						y: ylinex_array_four[linexid],// ylinex_sum_four + 35,
+						width: width_iobox_16bit,
+						strokeWidth: 1,
+						stroke: stroke_iobox_line,
+						//id: "line" + linexid.toString()
+					});
+					box_16bit.add(line);
+				}
+				else if (linexid == 1) {
+					var line = new LeaferUI.Line({
+						x: 0,
+						y: ylinex_array_four[linexid],// ylinex_sum_four + 35,
+						width: width_iobox_16bit,
+						strokeWidth: 1,
+						stroke: stroke_iobox_line,
+						//id: "line" + linexid.toString()
+					});
+					box_16bit.add(line);
+				}
+				else if (linexid == 2) {
+					var line = new LeaferUI.Line({
+						x: 0,
+						y: ylinex_array_four[linexid],// ylinex_sum_four + 35,
+						width: width_iobox_16bit,
+						strokeWidth: 1,
+						stroke: stroke_iobox_line,
+						//id: "line" + linexid.toString()
+					});
+					box_16bit.add(line);
+				}
+				else if (linexid == 11) {
+					var line = new LeaferUI.Line({
+						x: 0,
+						y: ylinex_array_four[linexid],// ylinex_sum_four + 20,
+						width: width_iobox_16bit,
+						strokeWidth: 1,
+						stroke: stroke_iobox_line,
+						//id: "line" + linexid.toString()
+					});
+					box_16bit.add(line);
+				}
+				else {
+					var line = new LeaferUI.Line({
+						x: 0,
+						y: ylinex_array_four[linexid],// ylinex_sum_four + 45,
+						width: width_iobox_16bit,
+						strokeWidth: 1,
+						stroke: stroke_iobox_line,
+						//id: "line" + linexid.toString()
+					});
+					box_16bit.add(line);
+				}
+			}
+
+			var spiltline_four = new LeaferUI.Line({
+				x: width_iobox_16bit / 2,
+				width: top_row_height_16bit * 2,
+				rotation: 90,
+				stroke: stroke_iobox_spiltline,
+				strokeWidth: 1,
+				dashPattern: [5, 2]
+			})
+			// box_16bit.add(spiltline_four);
+
+
+			//box4左侧顶部状态效果
+			for (var tid = 0; tid < 3; tid++) {
+				let y = io_row_y_offset_16bit + tid * top_row_height_16bit;
+				if (tid < 2) {
+
+					var top_text_value = new LeaferUI.Text({
+						x: io_row_left_x_name_16bit,
+						y: y,//+10
+						//height:10,
+						width: io_row_left_width_name_16bit,
+						fill: fill_top_name,
+						text: top_text_value_array_16bit[tid],
+						textAlign: 'left',
+						verticalAlign: 'middle',
+						textWrap: 'none',
+						padding: 0,
+						fontSize: 12
+					})
+					box_16bit.add(top_text_value)
+				}
+				if (tid == 2) {
+					var rect = new LeaferUI.Rect({
+						x: io_row_left_x_name_16bit,
+						y: y - 5,
+						height: rect_height_16bit,
+						width: io_rect_left_width_16bit,
+						fill: fill_rect,
+						draggable: false,
+						id: top_text_value_array_16bit[1].replace(' ', '') + '_OnlineSatate'
+					})
+					box_16bit.add(rect)
+					var top_text_value = new LeaferUI.Text({
+						x: io_row_left_x_name_16bit + io_rect_left_width_16bit + 15,
+						y: y,//+10
+						//height:10,
+						width: io_row_left_width_name_16bit,
+						fill: fill_top_name,
+						text: top_text_value_array_16bit[tid],
+						textAlign: 'left',
+						verticalAlign: 'middle',
+						textWrap: 'none',
+						padding: 0,
+						fontSize: 12
+					})
+					box_16bit.add(top_text_value)
+				}
+
+
+				// var left_top_text_name_value = new LeaferUI.Text({
+				// 	x:io_row_left_x_value_16bit,
+				// 	y:y,//+10
+				// 	//height:10,
+				// 	width:io_row_left_width_value_16bit,
+				// 	fill: fill_top_name_value,
+				// 	text:left_top_text_value_four_array_16bit[tid],
+				// 	textAlign :'left',
+				// 	verticalAlign:'middle',
+				// 	textWrap:'none',
+				// 	padding:0,
+				// 	fontSize:12
+				// })
+				// //建议取消
+				// var right_top_text_name = new LeaferUI.Text({
+				// 	x:io_row_right_x_name_16bit,
+				// 	y:y,//+10
+				// 	//height:10,
+				// 	width:io_row_right_width_name_16bit,
+				// 	fill: fill_top_name,
+				// 	text:right_top_text_name_four_array_16bit[tid],
+				// 	textAlign :'left',
+				// 	verticalAlign:'middle',
+				// 	textWrap:'none',
+				// 	padding:0,
+				// 	fontSize:12
+				// })
+				// var right_top_text_name_value = new LeaferUI.Text({
+				// 	x:io_row_right_x_name_16bit,
+				// 	y:y,//+10
+				// 	//height:10,
+				// 	width:io_row_right_width_value_16bit,
+				// 	fill: fill_top_name_value,
+				// 	text:right_top_text_value_four_array_16bit[tid],
+				// 	textAlign :'left',
+				// 	verticalAlign:'middle',
+				// 	textWrap:'none',
+				// 	padding:0,
+				// 	fontSize:12
+				// })
+				// box_16bit.add(left_top_text_name)
+				// //box_16bit.add(right_top_text_name)
+				// box_16bit.add(left_top_text_name_value)
+				// box_16bit.add(right_top_text_name_value)
+			}
+
+
+			//box4效果
+			for (var sid = 0; sid < 16; sid++) {
+				let y = 0;
+				if (sid < 8) {
+					y = io_row_height_32bit * (sid) + rect_top_y_offset_32bit;
+				}
+				if (sid >= 8) {
+					y = io_row_height_32bit * (sid + 1) + rect_bottom_y_offset_32bit;
+				}
+				var rect_left = new LeaferUI.Rect({
+					x: io_rect_left_x_32bit,
+					y: y + io_rect_left_y_offset_32bit,
+					height: rect_height_32bit,
+					width: io_rect_left_width_32bit,
+					fill: fill_rect_io_on,
+					draggable: false,
+					id: name_16bit[sid]
+				})
+				var rect_left_text_name = new LeaferUI.Text({
+					x: io_rect_name_left_x_32bit,
+					y: y + io_rect_name_left_y_offset_32bit,
+					width: io_rect_name_left_width_32bit,
+					fill: fill_rect_text_name,
+					text: name_16bit[sid],
+					textAlign: 'left',
+					verticalAlign: 'middle',
+					textWrap: 'none',
+					padding: 0,
+					fontSize: 12
+				})
+				var rect_left_text_Avalue = new LeaferUI.Text({
+					x: io_rect_name_left_x_32bit + io_rect_name_left_width_32bit,
+					y: y + io_rect_name_left_y_offset_32bit,
+					width: io_rect_description_left_width_32bit,
+					fill: fill_rect_text_name,
+					text: 32767,
+					textAlign: 'left',
+					verticalAlign: 'middle',
+					textWrap: 'none',
+					padding: 0,
+					fontSize: 12
+				})
+				var rect_left_text_description = new LeaferUI.Text({
+					x: io_rect_description_left_x_32bit,
+					y: y + io_rect_description_left_y_offset_32bit,
+					width: io_rect_description_left_width_32bit,
+					fill: fill_rect_text_description,
+					text: descriptions_16bit[sid],
+					textAlign: 'left',
+					verticalAlign: 'middle',
+					textWrap: 'none',
+					// textOverflow: ' ',
+					padding: 0,
+					fontSize: 12
+				})
+
+				box_16bit.add(rect_left);
+				box_16bit.add(rect_left_text_name);
+				box_16bit.add(rect_left_text_Avalue);
+				box_16bit.add(rect_left_text_description);
+			}
+			return box_16bit;
+		}
+		function Draw8bitAnalogIOBox(name_8bit, top_text_value_array_8bit, descriptions_8bit, ioboxwidth, initx) {
+			//8IO生成
+			var box_8bit = new LeaferUI.Box({
+				x: initx,
+				y: 20,
+				width: ioboxwidth,
+				height: height_iobox,
+				fill: fill_iobox,
+				draggable: draggable_dev,
+				strokeWidth: 1,
+				stroke: stroke_iobox,
+			})
+
+			var ylinex_sum_four = 0;
+			var ylinex_array_four = [];
+			for (var linexid = 0; linexid < 19; linexid++) {
+				if (linexid == 0) {
+					ylinex_sum_four = ylinex_sum_four + top_row_height_8bit;
+					ylinex_array_four.push(ylinex_sum_four);
+				}
+				else if (linexid == 1) {
+					ylinex_sum_four = ylinex_sum_four + top_row_height_8bit;
+					ylinex_array_four.push(ylinex_sum_four);
+				}
+				else if (linexid == 2) {
+					ylinex_sum_four = ylinex_sum_four + top_row_height_8bit;
+					ylinex_array_four.push(ylinex_sum_four);
+				}
+				else if (linexid == 11) {
+					ylinex_sum_four = ylinex_sum_four + separator_8bit;
+					ylinex_array_four.push(ylinex_sum_four);
+				}
+				else {
+					ylinex_sum_four = ylinex_sum_four + io_row_height_8bit;
+					ylinex_array_four.push(ylinex_sum_four);
+				}
+			}
+			for (var linexid = 0; linexid < 19; linexid++) {
+				if (linexid == 0) {
+					var line = new LeaferUI.Line({
+						x: 0,
+						y: ylinex_array_four[linexid],// ylinex_sum_four + 35,
+						width: width_iobox_8bit,
+						strokeWidth: 1,
+						stroke: stroke_iobox_line,
+						//id: "line" + linexid.toString()
+					});
+					box_8bit.add(line);
+				}
+				else if (linexid == 1) {
+					var line = new LeaferUI.Line({
+						x: 0,
+						y: ylinex_array_four[linexid],// ylinex_sum_four + 35,
+						width: width_iobox_8bit,
+						strokeWidth: 1,
+						stroke: stroke_iobox_line,
+						//id: "line" + linexid.toString()
+					});
+					box_8bit.add(line);
+				}
+				else if (linexid == 2) {
+					var line = new LeaferUI.Line({
+						x: 0,
+						y: ylinex_array_four[linexid],// ylinex_sum_four + 35,
+						width: width_iobox_8bit,
+						strokeWidth: 1,
+						stroke: stroke_iobox_line,
+						//id: "line" + linexid.toString()
+					});
+					box_8bit.add(line);
+				}
+				else if (linexid == 11) {
+					var line = new LeaferUI.Line({
+						x: 0,
+						y: ylinex_array_four[linexid],// ylinex_sum_four + 20,
+						width: width_iobox_8bit,
+						strokeWidth: 1,
+						stroke: stroke_iobox_line,
+						//id: "line" + linexid.toString()
+					});
+					box_8bit.add(line);
+				}
+				else {
+					var line = new LeaferUI.Line({
+						x: 0,
+						y: ylinex_array_four[linexid],// ylinex_sum_four + 45,
+						width: width_iobox_8bit,
+						strokeWidth: 1,
+						stroke: stroke_iobox_line,
+						//id: "line" + linexid.toString()
+					});
+					box_8bit.add(line);
+				}
+			}
+
+			var spiltline_four = new LeaferUI.Line({
+				x: width_iobox_8bit / 2,
+				width: top_row_height_8bit * 2,
+				rotation: 90,
+				stroke: stroke_iobox_spiltline,
+				strokeWidth: 1,
+				dashPattern: [5, 2]
+			})
+			// box_8bit.add(spiltline_four);
+
+
+			//box4左侧顶部状态效果
+			for (var tid = 0; tid < 3; tid++) {
+				let y = io_row_y_offset_8bit + tid * top_row_height_8bit;
+				if (tid < 2) {
+
+					var top_text_value = new LeaferUI.Text({
+						x: io_row_left_x_name_8bit,
+						y: y,//+10
+						//height:10,
+						width: io_row_left_width_name_8bit,
+						fill: fill_top_name,
+						text: top_text_value_array_8bit[tid],
+						textAlign: 'left',
+						verticalAlign: 'middle',
+						textWrap: 'none',
+						padding: 0,
+						fontSize: 12
+					})
+					box_8bit.add(top_text_value);
+				}
+				if (tid == 2) {
+					var rect = new LeaferUI.Rect({
+						x: io_row_left_x_name_8bit,
+						y: y - 5,
+						height: rect_height_8bit,
+						width: io_rect_left_width_8bit,
+						fill: fill_rect,
+						draggable: false,
+						id: top_text_value_array_8bit[1].replace(' ', '') + '_OnlineSatate'
+					})
+					box_8bit.add(rect)
+					var top_text_value = new LeaferUI.Text({
+						x: io_row_left_x_name_8bit + io_rect_left_width_8bit + 15,
+						y: y,//+10
+						//height:10,
+						width: io_row_left_width_name_8bit,
+						fill: fill_top_name,
+						text: top_text_value_array_8bit[tid],
+						textAlign: 'left',
+						verticalAlign: 'middle',
+						textWrap: 'none',
+						padding: 0,
+						fontSize: 12
+					})
+					box_8bit.add(top_text_value)
+				}
+
+				// var left_top_text_name_value = new LeaferUI.Text({
+				// 	x:io_row_left_x_value_8bit,
+				// 	y:y,//+10
+				// 	//height:10,
+				// 	width:io_row_left_width_value_8bit,
+				// 	fill: fill_top_name_value,
+				// 	text:left_top_text_value_four_array_8bit[tid],
+				// 	textAlign :'left',
+				// 	verticalAlign:'middle',
+				// 	textWrap:'none',
+				// 	padding:0,
+				// 	fontSize:12
+				// })
+				// //建议取消
+				// var right_top_text_name = new LeaferUI.Text({
+				// 	x:io_row_right_x_name_8bit,
+				// 	y:y,//+10
+				// 	//height:10,
+				// 	width:io_row_right_width_name_8bit,
+				// 	fill: fill_top_name,
+				// 	text:right_top_text_name_four_array_8bit[tid],
+				// 	textAlign :'left',
+				// 	verticalAlign:'middle',
+				// 	textWrap:'none',
+				// 	padding:0,
+				// 	fontSize:12
+				// })
+				// var right_top_text_name_value = new LeaferUI.Text({
+				// 	x:io_row_right_x_name_8bit,
+				// 	y:y,//+10
+				// 	//height:10,
+				// 	width:io_row_right_width_value_8bit,
+				// 	fill: fill_top_name_value,
+				// 	text:right_top_text_value_four_array_8bit[tid],
+				// 	textAlign :'left',
+				// 	verticalAlign:'middle',
+				// 	textWrap:'none',
+				// 	padding:0,
+				// 	fontSize:12
+				// })
+				// box_8bit.add(left_top_text_name)
+				// //box_8bit.add(right_top_text_name)
+				// box_8bit.add(left_top_text_name_value)
+				// box_8bit.add(right_top_text_name_value)
+			}
+
+
+			//box4效果
+			for (var sid = 0; sid < 8; sid++) {
+				let y = 0;
+				if (sid < 8) {
+					y = io_row_height_32bit * (sid) + rect_top_y_offset_32bit;
+				}
+				if (sid >= 8) {
+					y = io_row_height_32bit * (sid + 1) + rect_bottom_y_offset_32bit;
+				}
+				var rect_left = new LeaferUI.Rect({
+					x: io_rect_left_x_32bit,
+					y: y + io_rect_left_y_offset_32bit,
+					height: rect_height_32bit,
+					width: io_rect_left_width_32bit,
+					fill: fill_rect_io_on,
+					draggable: false,
+					id: name_8bit[sid]
+				})
+				var rect_left_text_name = new LeaferUI.Text({
+					x: io_rect_name_left_x_32bit,
+					y: y + io_rect_name_left_y_offset_32bit,
+					width: io_rect_name_left_width_32bit,
+					fill: fill_rect_text_name,
+					text: name_8bit[sid],
+					textAlign: 'left',
+					verticalAlign: 'middle',
+					textWrap: 'none',
+					padding: 0,
+					fontSize: 12
+				})
+				var rect_left_text_Avalue = new LeaferUI.Text({
+					x: io_rect_name_left_x_32bit + io_rect_name_left_width_32bit + 10,
+					y: y + io_rect_name_left_y_offset_32bit,
+					width: io_rect_description_left_width_32bit,
+					fill: fill_rect_text_name,
+					text: 32767,
+					textAlign: 'left',
+					verticalAlign: 'middle',
+					textWrap: 'none',
+					padding: 0,
+					fontSize: 12
+				})
+				var rect_left_text_description = new LeaferUI.Text({
+					x: io_rect_description_left_x_32bit,
+					y: y + io_rect_description_left_y_offset_32bit,
+					width: io_rect_description_left_width_32bit / 3,
+					fill: fill_rect_text_description,
+					text: descriptions_8bit[sid],
+					textAlign: 'left',
+					verticalAlign: 'middle',
+					textWrap: 'none',
+					padding: 0,
+					fontSize: 12
+				})
+
+				box_8bit.add(rect_left);
+				box_8bit.add(rect_left_text_name);
+				box_8bit.add(rect_left_text_Avalue);
+				box_8bit.add(rect_left_text_description);
+			}
+			return box_8bit;
+		}
+		function Draw4bitAnalogIOBox(name_8bit, top_text_value_array_8bit, descriptions_8bit, ioboxwidth, initx) {
+			//8IO生成
+			var box_8bit = new LeaferUI.Box({
+				x: initx,
+				y: 20,
+				width: ioboxwidth,
+				height: height_iobox,
+				fill: fill_iobox,
+				draggable: draggable_dev,
+				strokeWidth: 1,
+				stroke: stroke_iobox,
+			})
+
+			var ylinex_sum_four = 0;
+			var ylinex_array_four = [];
+			for (var linexid = 0; linexid < 19; linexid++) {
+				if (linexid == 0) {
+					ylinex_sum_four = ylinex_sum_four + top_row_height_8bit;
+					ylinex_array_four.push(ylinex_sum_four);
+				}
+				else if (linexid == 1) {
+					ylinex_sum_four = ylinex_sum_four + top_row_height_8bit;
+					ylinex_array_four.push(ylinex_sum_four);
+				}
+				else if (linexid == 2) {
+					ylinex_sum_four = ylinex_sum_four + top_row_height_8bit;
+					ylinex_array_four.push(ylinex_sum_four);
+				}
+				else if (linexid == 11) {
+					ylinex_sum_four = ylinex_sum_four + separator_8bit;
+					ylinex_array_four.push(ylinex_sum_four);
+				}
+				else {
+					ylinex_sum_four = ylinex_sum_four + io_row_height_8bit;
+					ylinex_array_four.push(ylinex_sum_four);
+				}
+			}
+			for (var linexid = 0; linexid < 19; linexid++) {
+				if (linexid == 0) {
+					var line = new LeaferUI.Line({
+						x: 0,
+						y: ylinex_array_four[linexid],// ylinex_sum_four + 35,
+						width: width_iobox_8bit,
+						strokeWidth: 1,
+						stroke: stroke_iobox_line,
+						//id: "line" + linexid.toString()
+					});
+					box_8bit.add(line);
+				}
+				else if (linexid == 1) {
+					var line = new LeaferUI.Line({
+						x: 0,
+						y: ylinex_array_four[linexid],// ylinex_sum_four + 35,
+						width: width_iobox_8bit,
+						strokeWidth: 1,
+						stroke: stroke_iobox_line,
+						//id: "line" + linexid.toString()
+					});
+					box_8bit.add(line);
+				}
+				else if (linexid == 2) {
+					var line = new LeaferUI.Line({
+						x: 0,
+						y: ylinex_array_four[linexid],// ylinex_sum_four + 35,
+						width: width_iobox_8bit,
+						strokeWidth: 1,
+						stroke: stroke_iobox_line,
+						//id: "line" + linexid.toString()
+					});
+					box_8bit.add(line);
+				}
+				else if (linexid == 11) {
+					var line = new LeaferUI.Line({
+						x: 0,
+						y: ylinex_array_four[linexid],// ylinex_sum_four + 20,
+						width: width_iobox_8bit,
+						strokeWidth: 1,
+						stroke: stroke_iobox_line,
+						//id: "line" + linexid.toString()
+					});
+					box_8bit.add(line);
+				}
+				else {
+					var line = new LeaferUI.Line({
+						x: 0,
+						y: ylinex_array_four[linexid],// ylinex_sum_four + 45,
+						width: width_iobox_8bit,
+						strokeWidth: 1,
+						stroke: stroke_iobox_line,
+						//id: "line" + linexid.toString()
+					});
+					box_8bit.add(line);
+				}
+			}
+
+			var spiltline_four = new LeaferUI.Line({
+				x: width_iobox_8bit / 2,
+				width: top_row_height_8bit * 2,
+				rotation: 90,
+				stroke: stroke_iobox_spiltline,
+				strokeWidth: 1,
+				dashPattern: [5, 2]
+			})
+			// box_8bit.add(spiltline_four);
+
+
+			//box4左侧顶部状态效果
+			for (var tid = 0; tid < 3; tid++) {
+				let y = io_row_y_offset_8bit + tid * top_row_height_8bit;
+				if (tid < 2) {
+
+					var top_text_value = new LeaferUI.Text({
+						x: io_row_left_x_name_8bit,
+						y: y,//+10
+						//height:10,
+						width: io_row_left_width_name_8bit,
+						fill: fill_top_name,
+						text: top_text_value_array_8bit[tid],
+						textAlign: 'left',
+						verticalAlign: 'middle',
+						textWrap: 'none',
+						padding: 0,
+						fontSize: 12
+					})
+					box_8bit.add(top_text_value);
+				}
+				if (tid == 2) {
+					var rect = new LeaferUI.Rect({
+						x: io_row_left_x_name_8bit,
+						y: y - 5,
+						height: rect_height_8bit,
+						width: io_rect_left_width_8bit,
+						fill: fill_rect,
+						draggable: false,
+						id: top_text_value_array_8bit[1].replace(' ', '') + '_OnlineSatate'
+					})
+					box_8bit.add(rect)
+					var top_text_value = new LeaferUI.Text({
+						x: io_row_left_x_name_8bit + io_rect_left_width_8bit + 15,
+						y: y,//+10
+						//height:10,
+						width: io_row_left_width_name_8bit,
+						fill: fill_top_name,
+						text: top_text_value_array_8bit[tid],
+						textAlign: 'left',
+						verticalAlign: 'middle',
+						textWrap: 'none',
+						padding: 0,
+						fontSize: 12
+					})
+					box_8bit.add(top_text_value)
+				}
+
+				// var left_top_text_name_value = new LeaferUI.Text({
+				// 	x:io_row_left_x_value_8bit,
+				// 	y:y,//+10
+				// 	//height:10,
+				// 	width:io_row_left_width_value_8bit,
+				// 	fill: fill_top_name_value,
+				// 	text:left_top_text_value_four_array_8bit[tid],
+				// 	textAlign :'left',
+				// 	verticalAlign:'middle',
+				// 	textWrap:'none',
+				// 	padding:0,
+				// 	fontSize:12
+				// })
+				// //建议取消
+				// var right_top_text_name = new LeaferUI.Text({
+				// 	x:io_row_right_x_name_8bit,
+				// 	y:y,//+10
+				// 	//height:10,
+				// 	width:io_row_right_width_name_8bit,
+				// 	fill: fill_top_name,
+				// 	text:right_top_text_name_four_array_8bit[tid],
+				// 	textAlign :'left',
+				// 	verticalAlign:'middle',
+				// 	textWrap:'none',
+				// 	padding:0,
+				// 	fontSize:12
+				// })
+				// var right_top_text_name_value = new LeaferUI.Text({
+				// 	x:io_row_right_x_name_8bit,
+				// 	y:y,//+10
+				// 	//height:10,
+				// 	width:io_row_right_width_value_8bit,
+				// 	fill: fill_top_name_value,
+				// 	text:right_top_text_value_four_array_8bit[tid],
+				// 	textAlign :'left',
+				// 	verticalAlign:'middle',
+				// 	textWrap:'none',
+				// 	padding:0,
+				// 	fontSize:12
+				// })
+				// box_8bit.add(left_top_text_name)
+				// //box_8bit.add(right_top_text_name)
+				// box_8bit.add(left_top_text_name_value)
+				// box_8bit.add(right_top_text_name_value)
+			}
+
+			debugger;
+			//box4效果
+			for (var sid = 0; sid < 4; sid++) {
+				let y = 0;
+				if (sid < 4) {
+					y = io_row_height_32bit * (sid) + rect_top_y_offset_32bit;
+				}
+				if (sid >= 4) {
+					y = io_row_height_32bit * (sid + 1) + rect_bottom_y_offset_32bit;
+				}
+				var rect_left = new LeaferUI.Rect({
+					x: io_rect_left_x_32bit,
+					y: y + io_rect_left_y_offset_32bit,
+					height: rect_height_32bit,
+					width: io_rect_left_width_32bit,
+					fill: fill_rect_io_on,
+					draggable: false,
+					id: name_8bit[sid]
+				})
+				var rect_left_text_name = new LeaferUI.Text({
+					x: io_rect_name_left_x_32bit,
+					y: y + io_rect_name_left_y_offset_32bit,
+					width: io_rect_name_left_width_32bit,
+					fill: fill_rect_text_name,
+					text: name_8bit[sid],
+					textAlign: 'left',
+					verticalAlign: 'middle',
+					textWrap: 'none',
+					padding: 0,
+					fontSize: 12
+				})
+				var rect_left_text_Avalue = new LeaferUI.Text({
+					x: io_rect_name_left_x_32bit + io_rect_name_left_width_32bit + 10,
+					y: y + io_rect_name_left_y_offset_32bit,
+					width: io_rect_description_left_width_32bit,
+					fill: fill_rect_text_name,
+					text: 32767,
+					textAlign: 'left',
+					verticalAlign: 'middle',
+					textWrap: 'none',
+					padding: 0,
+					fontSize: 12
+				})
+				var rect_left_text_description = new LeaferUI.Text({
+					x: io_rect_description_left_x_32bit,
+					y: y + io_rect_description_left_y_offset_32bit,
+					width: io_rect_description_left_width_32bit,
+					fill: fill_rect_text_description,
+					text: descriptions_8bit[sid],
+					textAlign: 'left',
+					verticalAlign: 'middle',
+					textWrap: 'none',
+					padding: 0,
+					fontSize: 12
+				})
+
+				box_8bit.add(rect_left);
+				box_8bit.add(rect_left_text_name);
+				box_8bit.add(rect_left_text_Avalue);
+				box_8bit.add(rect_left_text_description);
+			}
+			return box_8bit;
+		}
+		function Draw2bitAnalogIOBox(name_8bit, top_text_value_array_8bit, descriptions_8bit, ioboxwidth, initx) {
+			//8IO生成
+			var box_8bit = new LeaferUI.Box({
+				x: initx,
+				y: 20,
+				width: ioboxwidth,
+				height: height_iobox,
+				fill: fill_iobox,
+				draggable: draggable_dev,
+				strokeWidth: 1,
+				stroke: stroke_iobox,
+			})
+
+			var ylinex_sum_four = 0;
+			var ylinex_array_four = [];
+			for (var linexid = 0; linexid < 19; linexid++) {
+				if (linexid == 0) {
+					ylinex_sum_four = ylinex_sum_four + top_row_height_8bit;
+					ylinex_array_four.push(ylinex_sum_four);
+				}
+				else if (linexid == 1) {
+					ylinex_sum_four = ylinex_sum_four + top_row_height_8bit;
+					ylinex_array_four.push(ylinex_sum_four);
+				}
+				else if (linexid == 2) {
+					ylinex_sum_four = ylinex_sum_four + top_row_height_8bit;
+					ylinex_array_four.push(ylinex_sum_four);
+				}
+				else if (linexid == 11) {
+					ylinex_sum_four = ylinex_sum_four + separator_8bit;
+					ylinex_array_four.push(ylinex_sum_four);
+				}
+				else {
+					ylinex_sum_four = ylinex_sum_four + io_row_height_8bit;
+					ylinex_array_four.push(ylinex_sum_four);
+				}
+			}
+			for (var linexid = 0; linexid < 19; linexid++) {
+				if (linexid == 0) {
+					var line = new LeaferUI.Line({
+						x: 0,
+						y: ylinex_array_four[linexid],// ylinex_sum_four + 35,
+						width: width_iobox_8bit,
+						strokeWidth: 1,
+						stroke: stroke_iobox_line,
+						//id: "line" + linexid.toString()
+					});
+					box_8bit.add(line);
+				}
+				else if (linexid == 1) {
+					var line = new LeaferUI.Line({
+						x: 0,
+						y: ylinex_array_four[linexid],// ylinex_sum_four + 35,
+						width: width_iobox_8bit,
+						strokeWidth: 1,
+						stroke: stroke_iobox_line,
+						//id: "line" + linexid.toString()
+					});
+					box_8bit.add(line);
+				}
+				else if (linexid == 2) {
+					var line = new LeaferUI.Line({
+						x: 0,
+						y: ylinex_array_four[linexid],// ylinex_sum_four + 35,
+						width: width_iobox_8bit,
+						strokeWidth: 1,
+						stroke: stroke_iobox_line,
+						//id: "line" + linexid.toString()
+					});
+					box_8bit.add(line);
+				}
+				else if (linexid == 11) {
+					var line = new LeaferUI.Line({
+						x: 0,
+						y: ylinex_array_four[linexid],// ylinex_sum_four + 20,
+						width: width_iobox_8bit,
+						strokeWidth: 1,
+						stroke: stroke_iobox_line,
+						//id: "line" + linexid.toString()
+					});
+					box_8bit.add(line);
+				}
+				else {
+					var line = new LeaferUI.Line({
+						x: 0,
+						y: ylinex_array_four[linexid],// ylinex_sum_four + 45,
+						width: width_iobox_8bit,
+						strokeWidth: 1,
+						stroke: stroke_iobox_line,
+						//id: "line" + linexid.toString()
+					});
+					box_8bit.add(line);
+				}
+			}
+
+			var spiltline_four = new LeaferUI.Line({
+				x: width_iobox_8bit / 2,
+				width: top_row_height_8bit * 2,
+				rotation: 90,
+				stroke: stroke_iobox_spiltline,
+				strokeWidth: 1,
+				dashPattern: [5, 2]
+			})
+			// box_8bit.add(spiltline_four);
+
+
+			//box4左侧顶部状态效果
+			for (var tid = 0; tid < 3; tid++) {
+				let y = io_row_y_offset_8bit + tid * top_row_height_8bit;
+				if (tid < 2) {
+
+					var top_text_value = new LeaferUI.Text({
+						x: io_row_left_x_name_8bit,
+						y: y,//+10
+						//height:10,
+						width: io_row_left_width_name_8bit,
+						fill: fill_top_name,
+						text: top_text_value_array_8bit[tid],
+						textAlign: 'left',
+						verticalAlign: 'middle',
+						textWrap: 'none',
+						padding: 0,
+						fontSize: 12
+					})
+					box_8bit.add(top_text_value);
+				}
+				if (tid == 2) {
+					var rect = new LeaferUI.Rect({
+						x: io_row_left_x_name_8bit,
+						y: y - 5,
+						height: rect_height_8bit,
+						width: io_rect_left_width_8bit,
+						fill: fill_rect,
+						draggable: false,
+						id: top_text_value_array_8bit[1].replace(' ', '') + '_OnlineSatate'
+					})
+					box_8bit.add(rect)
+					var top_text_value = new LeaferUI.Text({
+						x: io_row_left_x_name_8bit + io_rect_left_width_8bit + 15,
+						y: y,//+10
+						//height:10,
+						width: io_row_left_width_name_8bit,
+						fill: fill_top_name,
+						text: top_text_value_array_8bit[tid],
+						textAlign: 'left',
+						verticalAlign: 'middle',
+						textWrap: 'none',
+						padding: 0,
+						fontSize: 12
+					})
+					box_8bit.add(top_text_value)
+				}
+
+				// var left_top_text_name_value = new LeaferUI.Text({
+				// 	x:io_row_left_x_value_8bit,
+				// 	y:y,//+10
+				// 	//height:10,
+				// 	width:io_row_left_width_value_8bit,
+				// 	fill: fill_top_name_value,
+				// 	text:left_top_text_value_four_array_8bit[tid],
+				// 	textAlign :'left',
+				// 	verticalAlign:'middle',
+				// 	textWrap:'none',
+				// 	padding:0,
+				// 	fontSize:12
+				// })
+				// //建议取消
+				// var right_top_text_name = new LeaferUI.Text({
+				// 	x:io_row_right_x_name_8bit,
+				// 	y:y,//+10
+				// 	//height:10,
+				// 	width:io_row_right_width_name_8bit,
+				// 	fill: fill_top_name,
+				// 	text:right_top_text_name_four_array_8bit[tid],
+				// 	textAlign :'left',
+				// 	verticalAlign:'middle',
+				// 	textWrap:'none',
+				// 	padding:0,
+				// 	fontSize:12
+				// })
+				// var right_top_text_name_value = new LeaferUI.Text({
+				// 	x:io_row_right_x_name_8bit,
+				// 	y:y,//+10
+				// 	//height:10,
+				// 	width:io_row_right_width_value_8bit,
+				// 	fill: fill_top_name_value,
+				// 	text:right_top_text_value_four_array_8bit[tid],
+				// 	textAlign :'left',
+				// 	verticalAlign:'middle',
+				// 	textWrap:'none',
+				// 	padding:0,
+				// 	fontSize:12
+				// })
+				// box_8bit.add(left_top_text_name)
+				// //box_8bit.add(right_top_text_name)
+				// box_8bit.add(left_top_text_name_value)
+				// box_8bit.add(right_top_text_name_value)
+			}
+
+			debugger;
+			//box4效果
+			for (var sid = 0; sid < 2; sid++) {
+				let y = 0;
+				if (sid < 2) {
+					y = io_row_height_32bit * (sid) + rect_top_y_offset_32bit;
+				}
+				if (sid >= 2) {
+					y = io_row_height_32bit * (sid + 1) + rect_bottom_y_offset_32bit;
+				}
+				var rect_left = new LeaferUI.Rect({
+					x: io_rect_left_x_32bit,
+					y: y + io_rect_left_y_offset_32bit,
+					height: rect_height_32bit,
+					width: io_rect_left_width_32bit,
+					fill: fill_rect_io_on,
+					draggable: false,
+					id: name_8bit[sid]
+				})
+				var rect_left_text_name = new LeaferUI.Text({
+					x: io_rect_name_left_x_32bit,
+					y: y + io_rect_name_left_y_offset_32bit,
+					width: io_rect_name_left_width_32bit,
+					fill: fill_rect_text_name,
+					text: name_8bit[sid],
+					textAlign: 'left',
+					verticalAlign: 'middle',
+					textWrap: 'none',
+					padding: 0,
+					fontSize: 12
+				})
+				var rect_left_text_Avalue = new LeaferUI.Text({
+					x: io_rect_name_left_x_32bit + io_rect_name_left_width_32bit + 10,
+					y: y + io_rect_name_left_y_offset_32bit,
+					width: io_rect_description_left_width_32bit,
+					fill: fill_rect_text_name,
+					text: 32767,
+					textAlign: 'left',
+					verticalAlign: 'middle',
+					textWrap: 'none',
+					padding: 0,
+					fontSize: 12
+				})
+				var rect_left_text_description = new LeaferUI.Text({
+					x: io_rect_description_left_x_32bit,
+					y: y + io_rect_description_left_y_offset_32bit,
+					width: io_rect_description_left_width_32bit,
+					fill: fill_rect_text_description,
+					text: descriptions_8bit[sid],
+					textAlign: 'left',
+					verticalAlign: 'middle',
+					textWrap: 'none',
+					padding: 0,
+					fontSize: 12
+				})
+
+				box_8bit.add(rect_left);
+				box_8bit.add(rect_left_text_name);
+				box_8bit.add(rect_left_text_Avalue);
+				box_8bit.add(rect_left_text_description);
+			}
+			return box_8bit;
+		}
 		function DrawCPUBox(name_cpu, top_text_value_array_cpu, descriptions_cpu, name_eth_cpu, descriptions_eth_cpu, ioboxwidth, initx) {
 			var box_cpu = new LeaferUI.Box({
 				x: initx,
@@ -1844,7 +3196,7 @@
                 }
             });
             $.when(myajax).done(function (redata) {
-				debugger; 
+				//debugger; 
 				leafer.findOne('#' + 'RUN1').fill = fill_rect_io_on;
 				leafer.findOne('#' + 'RUN').fill = fill_rect_io_on;
 				leafer.findOne('#' + 'ETH0').fill = fill_rect_io_on;
diff --git a/HT.Cloud.Web/Areas/ReportManage/Controllers/HistoryReportController.cs b/HT.Cloud.Web/Areas/ReportManage/Controllers/HistoryReportController.cs
index 4bc15f9..e47425e 100644
--- a/HT.Cloud.Web/Areas/ReportManage/Controllers/HistoryReportController.cs
+++ b/HT.Cloud.Web/Areas/ReportManage/Controllers/HistoryReportController.cs
@@ -22,7 +22,7 @@ namespace HT.Cloud.Web.Areas.ReportManage.Controllers
 		/// <summary>
 		/// 绑定数据仓库的数据库ID
 		/// </summary>
-		private string groupDescription = GlobalContext.SystemConfig.GroupDescription;
+		private string systemDescription = GlobalContext.SystemConfig.SystemDescription;
 		[HttpGet]
         public async Task<ActionResult> GetDriverGroupList()
         {
@@ -93,10 +93,9 @@ namespace HT.Cloud.Web.Areas.ReportManage.Controllers
             //string limit = Request.Query["limit"].ToString();
             //var page = Gettime(asyncparam.page.ToString());
             //var limit = Gettime(asyncparam.limit.ToString());
-            var systemName = "制粉系统";
             var startTime = Gettime(StartTime);
             var endTime = Gettime(EndTime);
-            var data = await _historyReportService.GetReportNewAsync(page, limit, startTime, endTime, Interval, systemName);
+            var data = await _historyReportService.GetReportNewAsync(page, limit, startTime, endTime, Interval, systemDescription);
             //var con = JsonConvert.SerializeObject(data);
             return Content(data);
         }
@@ -105,8 +104,7 @@ namespace HT.Cloud.Web.Areas.ReportManage.Controllers
         {
             //var StartTime = reportparam.StartTime.ToString("yyyy-MM-dd HH:mm:ss");
             //var EndTime = reportparam.EndTime.ToString("yyyy-MM-dd HH:mm:ss");
-            var systemName = "制粉系统";
-            var data = await _historyReportService.GetReportFirstHead(systemName);
+            var data = await _historyReportService.GetReportFirstHead(systemDescription);
             return Content(data);
         }
         [HttpGet]
@@ -114,20 +112,19 @@ namespace HT.Cloud.Web.Areas.ReportManage.Controllers
         {
             //var StartTime = reportparam.StartTime.ToString("yyyy-MM-dd HH:mm:ss");
             //var EndTime = reportparam.EndTime.ToString("yyyy-MM-dd HH:mm:ss");
-            var systemName = "制粉系统";
-            var data = await _historyReportService.GetReportSecondHead(systemName);
+            var data = await _historyReportService.GetReportSecondHead(systemDescription);
             return Content(data);
         }
         [HttpPost]
         public async Task<ActionResult> GetReportDownLoad(DownLoadparam downLoadparam)
         {
-            //var StartTime = reportparam.StartTime.ToString("yyyy-MM-dd HH:mm:ss");
-            //var EndTime = reportparam.EndTime.ToString("yyyy-MM-dd HH:mm:ss");
-            DateTime start = new DateTime(1970, 1, 1, 0, 0, 0, DateTimeKind.Utc);
+			//var StartTime = reportparam.StartTime.ToString("yyyy-MM-dd HH:mm:ss");
+			//var EndTime = reportparam.EndTime.ToString("yyyy-MM-dd HH:mm:ss");
+			DateTime start = new DateTime(1970, 1, 1, 0, 0, 0, DateTimeKind.Utc);
             DateTime StartTime = start.AddMilliseconds(downLoadparam.StartTime).ToLocalTime();
             DateTime EndTime = start.AddMilliseconds(downLoadparam.EndTime).ToLocalTime();
             int Interval = int.Parse(downLoadparam.Interval.ToString());
-            var data = await _historyReportService.GetReportDownLoad(StartTime, EndTime, Interval);
+            var data = await _historyReportService.GetReportDownLoad(StartTime, EndTime, Interval, systemDescription);
             return Content(data);
         }
         public string Gettime(string longtime)
diff --git a/HT.Cloud.Web/Areas/ReportManage/Controllers/MainPageControl.cs b/HT.Cloud.Web/Areas/ReportManage/Controllers/MainPageControl.cs
index fe29832..abea843 100644
--- a/HT.Cloud.Web/Areas/ReportManage/Controllers/MainPageControl.cs
+++ b/HT.Cloud.Web/Areas/ReportManage/Controllers/MainPageControl.cs
@@ -16,33 +16,33 @@ namespace HT.Cloud.Web.Areas.ReportManage.Controllers
 		/// <summary>
 		/// 绑定数据仓库的数据库ID
 		/// </summary>
-		private string groupDescription = GlobalContext.SystemConfig.GroupDescription;
+		private string systemDescription = GlobalContext.SystemConfig.SystemDescription;
 
 		[HttpGet]
         public async Task<ActionResult> GetMainPageInit()
         {
-            var data = await _mainPageService.GetMainPageInit(groupDescription);
+            var data = await _mainPageService.GetMainPageInit(systemDescription);
             return Content(data);
         }
 
 		[HttpGet]
 		public async Task<ActionResult> GetMainPageChartInit()
 		{
-			var data = await _mainPageService.GetMainPageChartInit(groupDescription);
+			var data = await _mainPageService.GetMainPageChartInit(systemDescription);
 			return Content(data);
 		}
 
 		[HttpGet]
 		public async Task<ActionResult> GetRtData()
 		{
-			var data = await _mainPageService.GetRtData(groupDescription);
+			var data = await _mainPageService.GetRtData(systemDescription);
 			return Content(data);
 		}
 
 		[HttpGet]
 		public async Task<ActionResult> GetRtChartData()
 		{
-			var data = await _mainPageService.GetRtChartData(groupDescription);
+			var data = await _mainPageService.GetRtChartData(systemDescription);
 			return Content(data);
 		}
 
diff --git a/HT.Cloud.Web/Areas/ReportManage/Controllers/MetaTagAlarmController.cs b/HT.Cloud.Web/Areas/ReportManage/Controllers/MetaTagAlarmController.cs
index 3d76c7b..c5c983a 100644
--- a/HT.Cloud.Web/Areas/ReportManage/Controllers/MetaTagAlarmController.cs
+++ b/HT.Cloud.Web/Areas/ReportManage/Controllers/MetaTagAlarmController.cs
@@ -25,7 +25,7 @@ namespace HT.Cloud.Web.Areas.ReportManage.Controllers
 		/// <summary>
 		/// 绑定数据仓库的数据库ID
 		/// </summary>
-		private string groupDescription = GlobalContext.SystemConfig.GroupDescription;
+		private string systemDescription = GlobalContext.SystemConfig.SystemDescription;
 		[HttpGet]
 		public async Task<ActionResult> GetDriverGroupList()
 		{
diff --git a/HT.Cloud.Web/Areas/ReportManage/Controllers/RtReportController.cs b/HT.Cloud.Web/Areas/ReportManage/Controllers/RtReportController.cs
index 33a4ef5..2712561 100644
--- a/HT.Cloud.Web/Areas/ReportManage/Controllers/RtReportController.cs
+++ b/HT.Cloud.Web/Areas/ReportManage/Controllers/RtReportController.cs
@@ -14,7 +14,7 @@ namespace HT.Cloud.Web.Areas.ReportManage.Controllers
 		/// <summary>
 		/// 绑定数据仓库的数据库ID
 		/// </summary>
-		private string groupDescription = GlobalContext.SystemConfig.GroupDescription;
+		private string systemDescription = GlobalContext.SystemConfig.SystemDescription;
 		[HttpGet]
         public async Task<ActionResult> GetRtData()
         {
diff --git a/HT.Cloud.Web/Controllers/ClientsDataController.cs b/HT.Cloud.Web/Controllers/ClientsDataController.cs
index 1e566dc..8ad3ced 100644
--- a/HT.Cloud.Web/Controllers/ClientsDataController.cs
+++ b/HT.Cloud.Web/Controllers/ClientsDataController.cs
@@ -64,7 +64,7 @@ namespace HT.Cloud.Web.Controllers
 		/// 清空缓存请求方法
 		/// </summary>
 		/// <returns></returns>
-		[HttpGet]
+		[HttpGet]         
 		public async Task<ActionResult> ClearCache()
 		{
 			try
diff --git a/HT.Cloud.Web/HT.Cloud.Web.csproj b/HT.Cloud.Web/HT.Cloud.Web.csproj
index 734cd2b..043536b 100644
--- a/HT.Cloud.Web/HT.Cloud.Web.csproj
+++ b/HT.Cloud.Web/HT.Cloud.Web.csproj
@@ -81,7 +81,7 @@
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </None>
     <None Update="watercloudnetdb.db">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+      <CopyToOutputDirectory>Never</CopyToOutputDirectory>
     </None>
   </ItemGroup>
 
diff --git a/HT.Cloud.Web/appsettings.json b/HT.Cloud.Web/appsettings.json
index ac529ae..4035e00 100644
--- a/HT.Cloud.Web/appsettings.json
+++ b/HT.Cloud.Web/appsettings.json
@@ -8,7 +8,7 @@
     }
   },
   "SystemConfig": {
-    "GroupDescription": "喷煤系统", //系统备注
+    "SystemDescription": "喷煤系统", //系统备注
     "Demo": false, // 是否是演示模式 账号admin 密码0000
     "LoginMultiple": false, // 是否允许一个账户在多处登录
     "AllowCorsSite": "http://localhost:8058", // 允许的其他站点访问Api