diff --git a/bigscreen1/1920X1080/css/.DS_Store b/bigscreen/1920X1080/css/.DS_Store similarity index 100% rename from bigscreen1/1920X1080/css/.DS_Store rename to bigscreen/1920X1080/css/.DS_Store diff --git a/bigscreen1/1920X1080/css/style.css b/bigscreen/1920X1080/css/style.css similarity index 100% rename from bigscreen1/1920X1080/css/style.css rename to bigscreen/1920X1080/css/style.css diff --git a/bigscreen1/1920X1080/images/.DS_Store b/bigscreen/1920X1080/images/.DS_Store similarity index 100% rename from bigscreen1/1920X1080/images/.DS_Store rename to bigscreen/1920X1080/images/.DS_Store diff --git a/bigscreen1/1920X1080/images/Home.png b/bigscreen/1920X1080/images/Home.png similarity index 100% rename from bigscreen1/1920X1080/images/Home.png rename to bigscreen/1920X1080/images/Home.png diff --git a/bigscreen1/1920X1080/images/bg1.png b/bigscreen/1920X1080/images/bg1.png similarity index 100% rename from bigscreen1/1920X1080/images/bg1.png rename to bigscreen/1920X1080/images/bg1.png diff --git a/bigscreen1/1920X1080/images/bg3.png b/bigscreen/1920X1080/images/bg3.png similarity index 100% rename from bigscreen1/1920X1080/images/bg3.png rename to bigscreen/1920X1080/images/bg3.png diff --git a/bigscreen1/1920X1080/images/head.jpg b/bigscreen/1920X1080/images/head.jpg similarity index 100% rename from bigscreen1/1920X1080/images/head.jpg rename to bigscreen/1920X1080/images/head.jpg diff --git a/bigscreen1/1920X1080/images/icon.png b/bigscreen/1920X1080/images/icon.png similarity index 100% rename from bigscreen1/1920X1080/images/icon.png rename to bigscreen/1920X1080/images/icon.png diff --git a/bigscreen1/1920X1080/images/loading.gif b/bigscreen/1920X1080/images/loading.gif similarity index 100% rename from bigscreen1/1920X1080/images/loading.gif rename to bigscreen/1920X1080/images/loading.gif diff --git a/bigscreen1/1920X1080/images/map.png b/bigscreen/1920X1080/images/map.png similarity index 100% rename from bigscreen1/1920X1080/images/map.png rename to bigscreen/1920X1080/images/map.png diff --git a/bigscreen1/1920X1080/index.html b/bigscreen/1920X1080/index.html similarity index 100% rename from bigscreen1/1920X1080/index.html rename to bigscreen/1920X1080/index.html diff --git a/bigscreen1/1920X1080/js/.DS_Store b/bigscreen/1920X1080/js/.DS_Store similarity index 100% rename from bigscreen1/1920X1080/js/.DS_Store rename to bigscreen/1920X1080/js/.DS_Store diff --git a/bigscreen1/1920X1080/js/Bubble.js b/bigscreen/1920X1080/js/Bubble.js similarity index 100% rename from bigscreen1/1920X1080/js/Bubble.js rename to bigscreen/1920X1080/js/Bubble.js diff --git a/bigscreen1/1920X1080/js/china.js b/bigscreen/1920X1080/js/china.js similarity index 100% rename from bigscreen1/1920X1080/js/china.js rename to bigscreen/1920X1080/js/china.js diff --git a/bigscreen1/1920X1080/js/echarts.min.js b/bigscreen/1920X1080/js/echarts.min.js similarity index 100% rename from bigscreen1/1920X1080/js/echarts.min.js rename to bigscreen/1920X1080/js/echarts.min.js diff --git a/bigscreen1/1920X1080/js/jquery.js b/bigscreen/1920X1080/js/jquery.js similarity index 100% rename from bigscreen1/1920X1080/js/jquery.js rename to bigscreen/1920X1080/js/jquery.js diff --git a/bigscreen1/1920X1080/js/jquery.liMarquee.js b/bigscreen/1920X1080/js/jquery.liMarquee.js similarity index 100% rename from bigscreen1/1920X1080/js/jquery.liMarquee.js rename to bigscreen/1920X1080/js/jquery.liMarquee.js diff --git a/bigscreen1/1920X1080/js/js.js b/bigscreen/1920X1080/js/js.js similarity index 100% rename from bigscreen1/1920X1080/js/js.js rename to bigscreen/1920X1080/js/js.js diff --git a/bigscreen1/1920X1080/js/map.js b/bigscreen/1920X1080/js/map.js similarity index 100% rename from bigscreen1/1920X1080/js/map.js rename to bigscreen/1920X1080/js/map.js diff --git a/bigscreen1/css/.DS_Store b/bigscreen/css/.DS_Store similarity index 100% rename from bigscreen1/css/.DS_Store rename to bigscreen/css/.DS_Store diff --git a/bigscreen1/css/style.css b/bigscreen/css/style.css similarity index 100% rename from bigscreen1/css/style.css rename to bigscreen/css/style.css diff --git a/bigscreen1/images/.DS_Store b/bigscreen/images/.DS_Store similarity index 100% rename from bigscreen1/images/.DS_Store rename to bigscreen/images/.DS_Store diff --git a/bigscreen1/images/Home.png b/bigscreen/images/Home.png similarity index 100% rename from bigscreen1/images/Home.png rename to bigscreen/images/Home.png diff --git a/bigscreen1/images/bg1.png b/bigscreen/images/bg1.png similarity index 100% rename from bigscreen1/images/bg1.png rename to bigscreen/images/bg1.png diff --git a/bigscreen1/images/bg3.png b/bigscreen/images/bg3.png similarity index 100% rename from bigscreen1/images/bg3.png rename to bigscreen/images/bg3.png diff --git a/bigscreen1/images/head.jpg b/bigscreen/images/head.jpg similarity index 100% rename from bigscreen1/images/head.jpg rename to bigscreen/images/head.jpg diff --git a/bigscreen1/images/icon.png b/bigscreen/images/icon.png similarity index 100% rename from bigscreen1/images/icon.png rename to bigscreen/images/icon.png diff --git a/bigscreen1/images/loading.gif b/bigscreen/images/loading.gif similarity index 100% rename from bigscreen1/images/loading.gif rename to bigscreen/images/loading.gif diff --git a/bigscreen1/images/map.png b/bigscreen/images/map.png similarity index 100% rename from bigscreen1/images/map.png rename to bigscreen/images/map.png diff --git a/bigscreen1/js/.DS_Store b/bigscreen/js/.DS_Store similarity index 100% rename from bigscreen1/js/.DS_Store rename to bigscreen/js/.DS_Store diff --git a/bigscreen1/js/Bubble.js b/bigscreen/js/Bubble.js similarity index 100% rename from bigscreen1/js/Bubble.js rename to bigscreen/js/Bubble.js diff --git a/bigscreen1/js/china.js b/bigscreen/js/china.js similarity index 100% rename from bigscreen1/js/china.js rename to bigscreen/js/china.js diff --git a/bigscreen1/js/echarts.min.js b/bigscreen/js/echarts.min.js similarity index 100% rename from bigscreen1/js/echarts.min.js rename to bigscreen/js/echarts.min.js diff --git a/bigscreen1/js/jquery.js b/bigscreen/js/jquery.js similarity index 100% rename from bigscreen1/js/jquery.js rename to bigscreen/js/jquery.js diff --git a/bigscreen1/js/jquery.liMarquee.js b/bigscreen/js/jquery.liMarquee.js similarity index 100% rename from bigscreen1/js/jquery.liMarquee.js rename to bigscreen/js/jquery.liMarquee.js diff --git a/bigscreen1/js/js.js b/bigscreen/js/js.js similarity index 100% rename from bigscreen1/js/js.js rename to bigscreen/js/js.js diff --git a/bigscreen1/js/map.js b/bigscreen/js/map.js similarity index 100% rename from bigscreen1/js/map.js rename to bigscreen/js/map.js diff --git a/bigscreen1/index.html b/bigscreen1/index.html deleted file mode 100644 index ee86bed..0000000 --- a/bigscreen1/index.html +++ /dev/null @@ -1,195 +0,0 @@ - - - - - index - - - - - - - - - - - -
-

5G智慧驿站数据监控平台

-
2018/6/12 17:00:12
-
-
- -
- -
-
- - - \ No newline at end of file diff --git a/guidescreen/GuideScreen/.vs/GuideScreen/FileContentIndex/616adefc-f422-45e7-9fae-4a6df23e2c67.vsidx b/guidescreen/GuideScreen/.vs/GuideScreen/FileContentIndex/616adefc-f422-45e7-9fae-4a6df23e2c67.vsidx new file mode 100644 index 0000000..f0167e3 Binary files /dev/null and b/guidescreen/GuideScreen/.vs/GuideScreen/FileContentIndex/616adefc-f422-45e7-9fae-4a6df23e2c67.vsidx differ diff --git a/guidescreen/GuideScreen/.vs/GuideScreen/FileContentIndex/696c988c-f14b-4b85-badf-134b28c312bf.vsidx b/guidescreen/GuideScreen/.vs/GuideScreen/FileContentIndex/696c988c-f14b-4b85-badf-134b28c312bf.vsidx new file mode 100644 index 0000000..8ccc668 Binary files /dev/null and b/guidescreen/GuideScreen/.vs/GuideScreen/FileContentIndex/696c988c-f14b-4b85-badf-134b28c312bf.vsidx differ diff --git a/guidescreen/GuideScreen/.vs/GuideScreen/FileContentIndex/d5c87b7f-5c09-4bc2-a172-3d6308d00cd3.vsidx b/guidescreen/GuideScreen/.vs/GuideScreen/FileContentIndex/7fad9406-beaa-4b58-b8ba-6e87d2a51975.vsidx similarity index 76% rename from guidescreen/GuideScreen/.vs/GuideScreen/FileContentIndex/d5c87b7f-5c09-4bc2-a172-3d6308d00cd3.vsidx rename to guidescreen/GuideScreen/.vs/GuideScreen/FileContentIndex/7fad9406-beaa-4b58-b8ba-6e87d2a51975.vsidx index e387e67..6f57594 100644 Binary files a/guidescreen/GuideScreen/.vs/GuideScreen/FileContentIndex/d5c87b7f-5c09-4bc2-a172-3d6308d00cd3.vsidx and b/guidescreen/GuideScreen/.vs/GuideScreen/FileContentIndex/7fad9406-beaa-4b58-b8ba-6e87d2a51975.vsidx differ diff --git a/guidescreen/GuideScreen/.vs/GuideScreen/FileContentIndex/99e746fd-896c-4eff-a188-a8bdb7d57d5d.vsidx b/guidescreen/GuideScreen/.vs/GuideScreen/FileContentIndex/99e746fd-896c-4eff-a188-a8bdb7d57d5d.vsidx deleted file mode 100644 index 1961717..0000000 Binary files a/guidescreen/GuideScreen/.vs/GuideScreen/FileContentIndex/99e746fd-896c-4eff-a188-a8bdb7d57d5d.vsidx and /dev/null differ diff --git a/guidescreen/GuideScreen/.vs/GuideScreen/FileContentIndex/a7a42233-aa94-4ee1-b444-d7a57d87046f.vsidx b/guidescreen/GuideScreen/.vs/GuideScreen/FileContentIndex/a7a42233-aa94-4ee1-b444-d7a57d87046f.vsidx deleted file mode 100644 index 40d3056..0000000 Binary files a/guidescreen/GuideScreen/.vs/GuideScreen/FileContentIndex/a7a42233-aa94-4ee1-b444-d7a57d87046f.vsidx and /dev/null differ diff --git a/guidescreen/GuideScreen/.vs/GuideScreen/FileContentIndex/dd5e86d6-f331-457c-ad2a-78e509f4892b.vsidx b/guidescreen/GuideScreen/.vs/GuideScreen/FileContentIndex/ab85d9b8-82da-472a-a732-0b034fdc2f4e.vsidx similarity index 100% rename from guidescreen/GuideScreen/.vs/GuideScreen/FileContentIndex/dd5e86d6-f331-457c-ad2a-78e509f4892b.vsidx rename to guidescreen/GuideScreen/.vs/GuideScreen/FileContentIndex/ab85d9b8-82da-472a-a732-0b034fdc2f4e.vsidx diff --git a/guidescreen/GuideScreen/.vs/GuideScreen/v17/.suo b/guidescreen/GuideScreen/.vs/GuideScreen/v17/.suo index b29ae04..2002e2e 100644 Binary files a/guidescreen/GuideScreen/.vs/GuideScreen/v17/.suo and b/guidescreen/GuideScreen/.vs/GuideScreen/v17/.suo differ diff --git a/guidescreen/GuideScreen/GuideScreen.Common/Common/LogExtensions.cs b/guidescreen/GuideScreen/GuideScreen.Common/Common/LogExtensions.cs index 23e4e78..4ae3867 100644 --- a/guidescreen/GuideScreen/GuideScreen.Common/Common/LogExtensions.cs +++ b/guidescreen/GuideScreen/GuideScreen.Common/Common/LogExtensions.cs @@ -45,10 +45,14 @@ namespace GuideScreen.Common /// 异常对象 public static void WriteErrorLog(this Exception ex) { - //var error = new StringBuilder(ex.Message); - //error.AppendLine(); - //error.AppendLine(ex.StackTrace); - LogService.Error(ex.Message,ex); + var error = new StringBuilder(); + while (ex != null) + { + error.AppendLine($"{ex.Message}:{Environment.NewLine}"); + error.AppendLine($"{ex.StackTrace};"); + ex = ex.InnerException; + } + LogService.Error(error.ToString()); } /// @@ -57,9 +61,13 @@ namespace GuideScreen.Common /// 异常对象 public static void WriteFatalLog(this Exception ex) { - var error = new StringBuilder(ex.Message); - error.AppendLine(); - error.AppendLine(ex.StackTrace); + var error = new StringBuilder(); + while (ex != null) + { + error.AppendLine($"{ex.Message}:{Environment.NewLine}"); + error.AppendLine($"{ ex.StackTrace};"); + ex = ex.InnerException; + } LogService.Fatal(error.ToString()); } diff --git a/guidescreen/GuideScreen/GuideScreen.Common/Common/ModelTools.cs b/guidescreen/GuideScreen/GuideScreen.Common/Common/ModelTools.cs index 89c2a2a..b7a73e2 100644 --- a/guidescreen/GuideScreen/GuideScreen.Common/Common/ModelTools.cs +++ b/guidescreen/GuideScreen/GuideScreen.Common/Common/ModelTools.cs @@ -15,7 +15,7 @@ namespace GuideScreen.Common.Common private static Func GetFunc() { - ParameterExpression parameterExpression = Expression.Parameter(typeof(TEntity), "p"); + var parameterExpression = Expression.Parameter(typeof(TEntity), "p"); List memberBindingList = new List(); foreach (var item in typeof(TResult).GetProperties()) diff --git a/guidescreen/GuideScreen/GuideScreen.Common/Constants/PLCPointName.cs b/guidescreen/GuideScreen/GuideScreen.Common/Constants/PLCPointName.cs index 9b1092c..3fbf645 100644 --- a/guidescreen/GuideScreen/GuideScreen.Common/Constants/PLCPointName.cs +++ b/guidescreen/GuideScreen/GuideScreen.Common/Constants/PLCPointName.cs @@ -17,7 +17,7 @@ namespace GuideScreen.Common.Constants public const string EnvironmentalMonitoring = "环境监测"; /// - /// 环境监测 + /// 厕位监控 /// public const string ToiletPosition = "厕位监控"; diff --git a/guidescreen/GuideScreen/GuideScreen.Common/Repositories/IPLCDeviceRecordRepository.cs b/guidescreen/GuideScreen/GuideScreen.Common/Repositories/IPLCDeviceRecordRepository.cs index b2e8861..d68b69c 100644 --- a/guidescreen/GuideScreen/GuideScreen.Common/Repositories/IPLCDeviceRecordRepository.cs +++ b/guidescreen/GuideScreen/GuideScreen.Common/Repositories/IPLCDeviceRecordRepository.cs @@ -25,6 +25,13 @@ namespace GuideScreen.Common.Repositories /// PageModel> GetPLCDeviceRecordDayList(string deviceName, string note, DateTime begDate, DateTime endDate, int pageSize, int pageIndex); + /// + /// 获取 plc 数据统计 + /// + /// + /// + decimal GetPLCDeviceRecordTotal(string deviceName); + /// /// 获取PLC点位明细 /// diff --git a/guidescreen/GuideScreen/GuideScreen.Common/Repositories/Impl/PLCDeviceRecordRepository.cs b/guidescreen/GuideScreen/GuideScreen.Common/Repositories/Impl/PLCDeviceRecordRepository.cs index ab12213..a805c43 100644 --- a/guidescreen/GuideScreen/GuideScreen.Common/Repositories/Impl/PLCDeviceRecordRepository.cs +++ b/guidescreen/GuideScreen/GuideScreen.Common/Repositories/Impl/PLCDeviceRecordRepository.cs @@ -75,6 +75,20 @@ namespace GuideScreen.Common.Repositories.Impl } } + /// + /// 获取 plc 数据统计 + /// + /// + /// + public decimal GetPLCDeviceRecordTotal(string deviceName) + { + using (var context= GSDBContext.GetDbContext()) + { + var total = context.PLCDeviceRecordDayEntities.Where(f => f.DeviceName == deviceName).Select(f => f.RecordValue).Sum(); + return total; + } + } + /// /// 获取PLC点位明细 /// diff --git a/guidescreen/GuideScreen/GuideScreen.Common/Services/IPLCDeviceRecordService.cs b/guidescreen/GuideScreen/GuideScreen.Common/Services/IPLCDeviceRecordService.cs index 273c9da..156c2e7 100644 --- a/guidescreen/GuideScreen/GuideScreen.Common/Services/IPLCDeviceRecordService.cs +++ b/guidescreen/GuideScreen/GuideScreen.Common/Services/IPLCDeviceRecordService.cs @@ -24,6 +24,13 @@ namespace GuideScreen.Common.Services /// PageModel> GetPLCDeviceRecordDayList(string deviceName, string note, DateTime begDate, DateTime endDate, int pageSize, int pageIndex); + /// + /// 获取 plc 数据统计 + /// + /// + /// + decimal GetPLCDeviceRecordTotal(string deviceName); + /// /// 获取PLC点位明细 /// @@ -43,11 +50,18 @@ namespace GuideScreen.Common.Services /// List GetToiletPositionRecordTotalByToday(); + // + /// 获取厕位历史使用记录 + /// + /// + int GetToiletPositionRecordTotal(); + /// /// 更新 厕位当日记录信息 /// /// void UpdateToiletPositionRecordTotalByToday(string toiletPosition, string note); + /// 更新 当日能耗记录信息 /// /// 设备对应的点位名称 diff --git a/guidescreen/GuideScreen/GuideScreen.Common/Services/Impl/PLCDeviceRecordService.cs b/guidescreen/GuideScreen/GuideScreen.Common/Services/Impl/PLCDeviceRecordService.cs index ffa5e6c..35cd4aa 100644 --- a/guidescreen/GuideScreen/GuideScreen.Common/Services/Impl/PLCDeviceRecordService.cs +++ b/guidescreen/GuideScreen/GuideScreen.Common/Services/Impl/PLCDeviceRecordService.cs @@ -4,6 +4,7 @@ using GuideScreen.Common.Repositories; using GuideScreen.Common.Repositories.Entities; using GuideScreen.Common.Services.Models; +using Masuit.Tools; using Masuit.Tools.Reflection; using System; @@ -39,6 +40,17 @@ namespace GuideScreen.Common.Services.Impl return page; } + /// + /// 获取 plc 数据统计 + /// + /// + /// + public decimal GetPLCDeviceRecordTotal(string deviceName) + { + var total = this.deviceRecordRepository.GetPLCDeviceRecordTotal(deviceName); + return total; + } + /// /// 获取PLC点位明细 /// @@ -75,8 +87,16 @@ namespace GuideScreen.Common.Services.Impl var page = GetPLCDeviceRecordDayList(PLCDeviceNames.ToiletPosition, string.Empty, begDateTime, endDateTime, 0, 0); var list = page.Content; return list; + } - + /// + /// 获取厕位历史使用记录 + /// + /// + public int GetToiletPositionRecordTotal() + { + var total = GetPLCDeviceRecordTotal(PLCDeviceNames.ToiletPosition); + return total.ToInt32(); } /// diff --git a/guidescreen/GuideScreen/GuideScreen.UI/Controller/PLCController.cs b/guidescreen/GuideScreen/GuideScreen.UI/Controller/PLCController.cs index ed41dd1..cf413f6 100644 --- a/guidescreen/GuideScreen/GuideScreen.UI/Controller/PLCController.cs +++ b/guidescreen/GuideScreen/GuideScreen.UI/Controller/PLCController.cs @@ -127,6 +127,16 @@ namespace GuideScreen.Common.Services.Impl } + /// + /// 获取厕位历史使用记录 + /// + /// + public int GetToiletPositionRecordTotal() + { + var total = deviceRecordService.GetToiletPositionRecordTotal(); + return total; + } + /// /// 单侧位使用记录 /// diff --git a/guidescreen/GuideScreen/GuideScreen.UI/FormScreen.Designer.cs b/guidescreen/GuideScreen/GuideScreen.UI/FormScreen.Designer.cs index 7598dee..487bce4 100644 --- a/guidescreen/GuideScreen/GuideScreen.UI/FormScreen.Designer.cs +++ b/guidescreen/GuideScreen/GuideScreen.UI/FormScreen.Designer.cs @@ -82,8 +82,8 @@ namespace GuideScreen.UI this.pictureBox8 = new System.Windows.Forms.PictureBox(); this.pictureBox9 = new System.Windows.Forms.PictureBox(); this.uiPanel6 = new Sunny.UI.UIPanel(); + this.uiLabel6 = new Sunny.UI.UILabel(); this.uiLabel11 = new Sunny.UI.UILabel(); - this.thermometer = new HZH_Controls.Controls.UCThermometer(); this.analogMeterFrequency2 = new Sunny.UI.UIAnalogMeter(); this.analogMeterElectricity2 = new Sunny.UI.UIAnalogMeter(); this.analogMeterFrequency1 = new Sunny.UI.UIAnalogMeter(); @@ -110,7 +110,10 @@ namespace GuideScreen.UI this.lblElectricity1 = new Sunny.UI.UILabel(); this.uiLabel10 = new Sunny.UI.UILabel(); this.uiLabel3 = new Sunny.UI.UILabel(); + this.uiLabel19 = new Sunny.UI.UILabel(); + this.thermometer = new HZH_Controls.Controls.UCThermometer(); this.uiPanel7 = new Sunny.UI.UIPanel(); + this.uiLabel22 = new Sunny.UI.UILabel(); this.pictureBox5 = new System.Windows.Forms.PictureBox(); this.pictureBox4 = new System.Windows.Forms.PictureBox(); this.pBoxPitWomanThree = new System.Windows.Forms.PictureBox(); @@ -154,6 +157,7 @@ namespace GuideScreen.UI this.lblTitle = new Sunny.UI.UILabel(); this.lblTime = new Sunny.UI.UILabel(); this.bindingSource1 = new System.Windows.Forms.BindingSource(this.components); + this.uiLabel24 = new Sunny.UI.UILabel(); this.uiPanel1.SuspendLayout(); ((System.ComponentModel.ISupportInitialize)(this.pBoxWeatherIcon)).BeginInit(); this.uiPanel5.SuspendLayout(); @@ -443,13 +447,13 @@ namespace GuideScreen.UI // this.uiLabel21.Font = new System.Drawing.Font("微软雅黑", 14.25F, System.Drawing.FontStyle.Bold); this.uiLabel21.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(65)))), ((int)(((byte)(128)))), ((int)(((byte)(195))))); - this.uiLabel21.Location = new System.Drawing.Point(220, 210); + this.uiLabel21.Location = new System.Drawing.Point(203, 210); this.uiLabel21.Name = "uiLabel21"; - this.uiLabel21.Size = new System.Drawing.Size(61, 38); + this.uiLabel21.Size = new System.Drawing.Size(93, 38); this.uiLabel21.Style = Sunny.UI.UIStyle.Custom; this.uiLabel21.StyleCustomMode = true; this.uiLabel21.TabIndex = 18; - this.uiLabel21.Text = "水表"; + this.uiLabel21.Text = "总耗水量"; this.uiLabel21.TextAlign = System.Drawing.ContentAlignment.MiddleCenter; this.uiLabel21.ZoomScaleRect = new System.Drawing.Rectangle(0, 0, 0, 0); // @@ -471,13 +475,13 @@ namespace GuideScreen.UI // this.uiLabel18.Font = new System.Drawing.Font("微软雅黑", 14.25F, System.Drawing.FontStyle.Bold); this.uiLabel18.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(65)))), ((int)(((byte)(128)))), ((int)(((byte)(195))))); - this.uiLabel18.Location = new System.Drawing.Point(79, 210); + this.uiLabel18.Location = new System.Drawing.Point(56, 211); this.uiLabel18.Name = "uiLabel18"; - this.uiLabel18.Size = new System.Drawing.Size(61, 38); + this.uiLabel18.Size = new System.Drawing.Size(105, 38); this.uiLabel18.Style = Sunny.UI.UIStyle.Custom; this.uiLabel18.StyleCustomMode = true; this.uiLabel18.TabIndex = 4; - this.uiLabel18.Text = "电表"; + this.uiLabel18.Text = "总耗电量"; this.uiLabel18.TextAlign = System.Drawing.ContentAlignment.MiddleCenter; this.uiLabel18.ZoomScaleRect = new System.Drawing.Rectangle(0, 0, 0, 0); // @@ -860,7 +864,7 @@ namespace GuideScreen.UI // pictureBox9 // this.pictureBox9.Image = ((System.Drawing.Image)(resources.GetObject("pictureBox9.Image"))); - this.pictureBox9.Location = new System.Drawing.Point(79, 155); + this.pictureBox9.Location = new System.Drawing.Point(78, 155); this.pictureBox9.Name = "pictureBox9"; this.pictureBox9.Size = new System.Drawing.Size(61, 52); this.pictureBox9.SizeMode = System.Windows.Forms.PictureBoxSizeMode.StretchImage; @@ -872,8 +876,9 @@ namespace GuideScreen.UI this.uiPanel6.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom) | System.Windows.Forms.AnchorStyles.Right))); this.uiPanel6.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(21)))), ((int)(((byte)(36)))), ((int)(((byte)(59))))); + this.uiPanel6.Controls.Add(this.uiLabel24); + this.uiPanel6.Controls.Add(this.uiLabel6); this.uiPanel6.Controls.Add(this.uiLabel11); - this.uiPanel6.Controls.Add(this.thermometer); this.uiPanel6.Controls.Add(this.analogMeterFrequency2); this.uiPanel6.Controls.Add(this.analogMeterElectricity2); this.uiPanel6.Controls.Add(this.analogMeterFrequency1); @@ -900,6 +905,8 @@ namespace GuideScreen.UI this.uiPanel6.Controls.Add(this.lblElectricity1); this.uiPanel6.Controls.Add(this.uiLabel10); this.uiPanel6.Controls.Add(this.uiLabel3); + this.uiPanel6.Controls.Add(this.uiLabel19); + this.uiPanel6.Controls.Add(this.thermometer); this.uiPanel6.FillColor = System.Drawing.Color.Empty; this.uiPanel6.Font = new System.Drawing.Font("微软雅黑", 12F); this.uiPanel6.Location = new System.Drawing.Point(1551, 397); @@ -915,12 +922,23 @@ namespace GuideScreen.UI this.uiPanel6.TextAlignment = System.Drawing.ContentAlignment.MiddleCenter; this.uiPanel6.ZoomScaleRect = new System.Drawing.Rectangle(0, 0, 0, 0); // + // uiLabel6 + // + this.uiLabel6.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); + this.uiLabel6.Location = new System.Drawing.Point(-9, 86); + this.uiLabel6.Name = "uiLabel6"; + this.uiLabel6.Size = new System.Drawing.Size(58, 471); + this.uiLabel6.Style = Sunny.UI.UIStyle.Custom; + this.uiLabel6.TabIndex = 69; + this.uiLabel6.TextAlign = System.Drawing.ContentAlignment.MiddleLeft; + this.uiLabel6.ZoomScaleRect = new System.Drawing.Rectangle(0, 0, 0, 0); + // // uiLabel11 // this.uiLabel11.BackColor = System.Drawing.Color.Transparent; this.uiLabel11.Font = new System.Drawing.Font("微软雅黑", 21.75F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.uiLabel11.ForeColor = System.Drawing.Color.White; - this.uiLabel11.Location = new System.Drawing.Point(30, 583); + this.uiLabel11.Location = new System.Drawing.Point(21, 571); this.uiLabel11.Name = "uiLabel11"; this.uiLabel11.Size = new System.Drawing.Size(18, 37); this.uiLabel11.Style = Sunny.UI.UIStyle.Custom; @@ -930,34 +948,6 @@ namespace GuideScreen.UI this.uiLabel11.TextAlign = System.Drawing.ContentAlignment.MiddleCenter; this.uiLabel11.ZoomScaleRect = new System.Drawing.Rectangle(0, 0, 0, 0); // - // thermometer - // - this.thermometer.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(30)))), ((int)(((byte)(159)))), ((int)(((byte)(255))))); - this.thermometer.GlassTubeColor = System.Drawing.Color.FromArgb(((int)(((byte)(47)))), ((int)(((byte)(64)))), ((int)(((byte)(86))))); - this.thermometer.LeftTemperatureUnit = HZH_Controls.Controls.TemperatureUnit.Re; - this.thermometer.Location = new System.Drawing.Point(24, 97); - this.thermometer.MaxValue = new decimal(new int[] { - 0, - 0, - 0, - 0}); - this.thermometer.MercuryColor = System.Drawing.Color.FromArgb(((int)(((byte)(0)))), ((int)(((byte)(150)))), ((int)(((byte)(136))))); - this.thermometer.MinValue = new decimal(new int[] { - 100, - 0, - 0, - -2147483648}); - this.thermometer.Name = "thermometer"; - this.thermometer.RightTemperatureUnit = HZH_Controls.Controls.TemperatureUnit.Re; - this.thermometer.Size = new System.Drawing.Size(94, 534); - this.thermometer.SplitCount = 10; - this.thermometer.TabIndex = 130; - this.thermometer.Value = new decimal(new int[] { - 55, - 0, - 0, - 0}); - // // analogMeterFrequency2 // this.analogMeterFrequency2.BackColor = System.Drawing.Color.Transparent; @@ -983,7 +973,7 @@ namespace GuideScreen.UI // this.analogMeterElectricity2.BackColor = System.Drawing.Color.Transparent; this.analogMeterElectricity2.Font = new System.Drawing.Font("微软雅黑", 14.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.analogMeterElectricity2.Location = new System.Drawing.Point(135, 438); + this.analogMeterElectricity2.Location = new System.Drawing.Point(116, 438); this.analogMeterElectricity2.MaxValue = 10D; this.analogMeterElectricity2.MinimumSize = new System.Drawing.Size(1, 1); this.analogMeterElectricity2.MinValue = 0D; @@ -1025,7 +1015,7 @@ namespace GuideScreen.UI // this.analogMeterElectricity1.BackColor = System.Drawing.Color.Transparent; this.analogMeterElectricity1.Font = new System.Drawing.Font("微软雅黑", 14.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.analogMeterElectricity1.Location = new System.Drawing.Point(135, 126); + this.analogMeterElectricity1.Location = new System.Drawing.Point(118, 126); this.analogMeterElectricity1.MaxValue = 10D; this.analogMeterElectricity1.MinimumSize = new System.Drawing.Size(1, 1); this.analogMeterElectricity1.MinValue = 0D; @@ -1059,7 +1049,7 @@ namespace GuideScreen.UI // LedBulbTwoRun // this.LedBulbTwoRun.Color = System.Drawing.Color.Gray; - this.LedBulbTwoRun.Location = new System.Drawing.Point(305, 356); + this.LedBulbTwoRun.Location = new System.Drawing.Point(288, 355); this.LedBulbTwoRun.Name = "LedBulbTwoRun"; this.LedBulbTwoRun.Size = new System.Drawing.Size(39, 34); this.LedBulbTwoRun.TabIndex = 115; @@ -1073,7 +1063,7 @@ namespace GuideScreen.UI this.LedDisplayTwoTime.BorderInColor = System.Drawing.Color.FromArgb(((int)(((byte)(21)))), ((int)(((byte)(36)))), ((int)(((byte)(59))))); this.LedDisplayTwoTime.CharCount = 6; this.LedDisplayTwoTime.ForeColor = System.Drawing.Color.Lime; - this.LedDisplayTwoTime.Location = new System.Drawing.Point(125, 605); + this.LedDisplayTwoTime.Location = new System.Drawing.Point(99, 605); this.LedDisplayTwoTime.Name = "LedDisplayTwoTime"; this.LedDisplayTwoTime.Size = new System.Drawing.Size(118, 34); this.LedDisplayTwoTime.TabIndex = 121; @@ -1083,7 +1073,7 @@ namespace GuideScreen.UI // this.uiLabel20.Font = new System.Drawing.Font("微软雅黑", 15F, System.Drawing.FontStyle.Bold); this.uiLabel20.ForeColor = System.Drawing.Color.White; - this.uiLabel20.Location = new System.Drawing.Point(255, 405); + this.uiLabel20.Location = new System.Drawing.Point(250, 405); this.uiLabel20.Name = "uiLabel20"; this.uiLabel20.Size = new System.Drawing.Size(84, 26); this.uiLabel20.Style = Sunny.UI.UIStyle.Custom; @@ -1100,7 +1090,7 @@ namespace GuideScreen.UI this.LedDisplayTwoCount.BorderInColor = System.Drawing.Color.FromArgb(((int)(((byte)(21)))), ((int)(((byte)(36)))), ((int)(((byte)(59))))); this.LedDisplayTwoCount.CharCount = 6; this.LedDisplayTwoCount.ForeColor = System.Drawing.Color.Lime; - this.LedDisplayTwoCount.Location = new System.Drawing.Point(238, 605); + this.LedDisplayTwoCount.Location = new System.Drawing.Point(240, 605); this.LedDisplayTwoCount.Name = "LedDisplayTwoCount"; this.LedDisplayTwoCount.Size = new System.Drawing.Size(118, 34); this.LedDisplayTwoCount.TabIndex = 118; @@ -1110,7 +1100,7 @@ namespace GuideScreen.UI // this.uiLabel5.Font = new System.Drawing.Font("微软雅黑", 15F, System.Drawing.FontStyle.Bold); this.uiLabel5.ForeColor = System.Drawing.Color.White; - this.uiLabel5.Location = new System.Drawing.Point(136, 561); + this.uiLabel5.Location = new System.Drawing.Point(118, 561); this.uiLabel5.Name = "uiLabel5"; this.uiLabel5.Size = new System.Drawing.Size(96, 35); this.uiLabel5.Style = Sunny.UI.UIStyle.Custom; @@ -1124,7 +1114,7 @@ namespace GuideScreen.UI // this.lblElectricity2.Font = new System.Drawing.Font("微软雅黑", 15F, System.Drawing.FontStyle.Bold); this.lblElectricity2.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(109)))), ((int)(((byte)(212)))), ((int)(((byte)(0))))); - this.lblElectricity2.Location = new System.Drawing.Point(147, 534); + this.lblElectricity2.Location = new System.Drawing.Point(129, 534); this.lblElectricity2.Name = "lblElectricity2"; this.lblElectricity2.Size = new System.Drawing.Size(75, 26); this.lblElectricity2.Style = Sunny.UI.UIStyle.Custom; @@ -1152,7 +1142,7 @@ namespace GuideScreen.UI // this.uiLabel25.Font = new System.Drawing.Font("微软雅黑", 15F, System.Drawing.FontStyle.Bold); this.uiLabel25.ForeColor = System.Drawing.Color.White; - this.uiLabel25.Location = new System.Drawing.Point(142, 405); + this.uiLabel25.Location = new System.Drawing.Point(119, 405); this.uiLabel25.Name = "uiLabel25"; this.uiLabel25.Size = new System.Drawing.Size(84, 26); this.uiLabel25.Style = Sunny.UI.UIStyle.Custom; @@ -1166,7 +1156,7 @@ namespace GuideScreen.UI // this.uiLabel15.Font = new System.Drawing.Font("微软雅黑", 14.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.uiLabel15.ForeColor = System.Drawing.Color.White; - this.uiLabel15.Location = new System.Drawing.Point(127, 352); + this.uiLabel15.Location = new System.Drawing.Point(110, 352); this.uiLabel15.Name = "uiLabel15"; this.uiLabel15.Size = new System.Drawing.Size(206, 40); this.uiLabel15.Style = Sunny.UI.UIStyle.Custom; @@ -1179,7 +1169,7 @@ namespace GuideScreen.UI // LedBulbOneRun // this.LedBulbOneRun.Color = System.Drawing.Color.Gray; - this.LedBulbOneRun.Location = new System.Drawing.Point(299, 47); + this.LedBulbOneRun.Location = new System.Drawing.Point(285, 47); this.LedBulbOneRun.Name = "LedBulbOneRun"; this.LedBulbOneRun.Size = new System.Drawing.Size(41, 34); this.LedBulbOneRun.TabIndex = 62; @@ -1193,7 +1183,7 @@ namespace GuideScreen.UI this.LedDisplayOneTime.BorderInColor = System.Drawing.Color.FromArgb(((int)(((byte)(21)))), ((int)(((byte)(36)))), ((int)(((byte)(59))))); this.LedDisplayOneTime.CharCount = 6; this.LedDisplayOneTime.ForeColor = System.Drawing.Color.Lime; - this.LedDisplayOneTime.Location = new System.Drawing.Point(125, 315); + this.LedDisplayOneTime.Location = new System.Drawing.Point(108, 315); this.LedDisplayOneTime.Name = "LedDisplayOneTime"; this.LedDisplayOneTime.Size = new System.Drawing.Size(118, 34); this.LedDisplayOneTime.TabIndex = 114; @@ -1203,7 +1193,7 @@ namespace GuideScreen.UI // this.uiLabel23.Font = new System.Drawing.Font("微软雅黑", 15F, System.Drawing.FontStyle.Bold); this.uiLabel23.ForeColor = System.Drawing.Color.White; - this.uiLabel23.Location = new System.Drawing.Point(19, 47); + this.uiLabel23.Location = new System.Drawing.Point(10, 47); this.uiLabel23.Name = "uiLabel23"; this.uiLabel23.Size = new System.Drawing.Size(114, 37); this.uiLabel23.Style = Sunny.UI.UIStyle.Custom; @@ -1230,7 +1220,7 @@ namespace GuideScreen.UI // this.uiLabel12.Font = new System.Drawing.Font("微软雅黑", 15F, System.Drawing.FontStyle.Bold); this.uiLabel12.ForeColor = System.Drawing.Color.White; - this.uiLabel12.Location = new System.Drawing.Point(136, 270); + this.uiLabel12.Location = new System.Drawing.Point(119, 270); this.uiLabel12.Name = "uiLabel12"; this.uiLabel12.Size = new System.Drawing.Size(96, 35); this.uiLabel12.Style = Sunny.UI.UIStyle.Custom; @@ -1258,9 +1248,9 @@ namespace GuideScreen.UI // this.uiLabel1.Font = new System.Drawing.Font("微软雅黑", 14.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.uiLabel1.ForeColor = System.Drawing.Color.White; - this.uiLabel1.Location = new System.Drawing.Point(116, 44); + this.uiLabel1.Location = new System.Drawing.Point(115, 44); this.uiLabel1.Name = "uiLabel1"; - this.uiLabel1.Size = new System.Drawing.Size(211, 40); + this.uiLabel1.Size = new System.Drawing.Size(195, 40); this.uiLabel1.Style = Sunny.UI.UIStyle.Custom; this.uiLabel1.StyleCustomMode = true; this.uiLabel1.TabIndex = 91; @@ -1286,7 +1276,7 @@ namespace GuideScreen.UI // this.uiLabel16.Font = new System.Drawing.Font("微软雅黑", 15F, System.Drawing.FontStyle.Bold); this.uiLabel16.ForeColor = System.Drawing.Color.White; - this.uiLabel16.Location = new System.Drawing.Point(255, 94); + this.uiLabel16.Location = new System.Drawing.Point(250, 94); this.uiLabel16.Name = "uiLabel16"; this.uiLabel16.Size = new System.Drawing.Size(84, 26); this.uiLabel16.Style = Sunny.UI.UIStyle.Custom; @@ -1300,7 +1290,7 @@ namespace GuideScreen.UI // this.lblElectricity1.Font = new System.Drawing.Font("微软雅黑", 15F, System.Drawing.FontStyle.Bold); this.lblElectricity1.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(109)))), ((int)(((byte)(212)))), ((int)(((byte)(0))))); - this.lblElectricity1.Location = new System.Drawing.Point(147, 228); + this.lblElectricity1.Location = new System.Drawing.Point(130, 228); this.lblElectricity1.Name = "lblElectricity1"; this.lblElectricity1.Size = new System.Drawing.Size(75, 26); this.lblElectricity1.Style = Sunny.UI.UIStyle.Custom; @@ -1314,7 +1304,7 @@ namespace GuideScreen.UI // this.uiLabel10.Font = new System.Drawing.Font("微软雅黑", 15F, System.Drawing.FontStyle.Bold); this.uiLabel10.ForeColor = System.Drawing.Color.White; - this.uiLabel10.Location = new System.Drawing.Point(142, 94); + this.uiLabel10.Location = new System.Drawing.Point(119, 97); this.uiLabel10.Name = "uiLabel10"; this.uiLabel10.Size = new System.Drawing.Size(84, 26); this.uiLabel10.Style = Sunny.UI.UIStyle.Custom; @@ -1339,11 +1329,51 @@ namespace GuideScreen.UI this.uiLabel3.TextAlign = System.Drawing.ContentAlignment.MiddleLeft; this.uiLabel3.ZoomScaleRect = new System.Drawing.Rectangle(0, 0, 0, 0); // + // uiLabel19 + // + this.uiLabel19.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); + this.uiLabel19.Location = new System.Drawing.Point(80, 84); + this.uiLabel19.Name = "uiLabel19"; + this.uiLabel19.Size = new System.Drawing.Size(39, 476); + this.uiLabel19.Style = Sunny.UI.UIStyle.Custom; + this.uiLabel19.TabIndex = 131; + this.uiLabel19.TextAlign = System.Drawing.ContentAlignment.MiddleLeft; + this.uiLabel19.ZoomScaleRect = new System.Drawing.Rectangle(0, 0, 0, 0); + // + // thermometer + // + this.thermometer.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(30)))), ((int)(((byte)(159)))), ((int)(((byte)(255))))); + this.thermometer.GlassTubeColor = System.Drawing.Color.FromArgb(((int)(((byte)(47)))), ((int)(((byte)(64)))), ((int)(((byte)(86))))); + this.thermometer.LeftTemperatureUnit = HZH_Controls.Controls.TemperatureUnit.Re; + this.thermometer.Location = new System.Drawing.Point(9, 97); + this.thermometer.MaxValue = new decimal(new int[] { + 0, + 0, + 0, + 0}); + this.thermometer.MercuryColor = System.Drawing.Color.FromArgb(((int)(((byte)(0)))), ((int)(((byte)(150)))), ((int)(((byte)(136))))); + this.thermometer.MinValue = new decimal(new int[] { + 100, + 0, + 0, + -2147483648}); + this.thermometer.Name = "thermometer"; + this.thermometer.RightTemperatureUnit = HZH_Controls.Controls.TemperatureUnit.Re; + this.thermometer.Size = new System.Drawing.Size(110, 523); + this.thermometer.SplitCount = 10; + this.thermometer.TabIndex = 130; + this.thermometer.Value = new decimal(new int[] { + 55, + 0, + 0, + 0}); + // // uiPanel7 // this.uiPanel7.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom) | System.Windows.Forms.AnchorStyles.Left) | System.Windows.Forms.AnchorStyles.Right))); + this.uiPanel7.Controls.Add(this.uiLabel22); this.uiPanel7.Controls.Add(this.pictureBox5); this.uiPanel7.Controls.Add(this.pictureBox4); this.uiPanel7.Controls.Add(this.pBoxPitWomanThree); @@ -1392,6 +1422,20 @@ namespace GuideScreen.UI this.uiPanel7.TextAlignment = System.Drawing.ContentAlignment.MiddleCenter; this.uiPanel7.ZoomScaleRect = new System.Drawing.Rectangle(0, 0, 0, 0); // + // uiLabel22 + // + this.uiLabel22.Font = new System.Drawing.Font("微软雅黑", 15F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134))); + this.uiLabel22.ForeColor = System.Drawing.Color.White; + this.uiLabel22.Location = new System.Drawing.Point(732, 3); + this.uiLabel22.Name = "uiLabel22"; + this.uiLabel22.Size = new System.Drawing.Size(115, 46); + this.uiLabel22.Style = Sunny.UI.UIStyle.Custom; + this.uiLabel22.StyleCustomMode = true; + this.uiLabel22.TabIndex = 69; + this.uiLabel22.Text = "累计客流"; + this.uiLabel22.TextAlign = System.Drawing.ContentAlignment.MiddleLeft; + this.uiLabel22.ZoomScaleRect = new System.Drawing.Rectangle(0, 0, 0, 0); + // // pictureBox5 // this.pictureBox5.Image = ((System.Drawing.Image)(resources.GetObject("pictureBox5.Image"))); @@ -1585,9 +1629,9 @@ namespace GuideScreen.UI // // lblPassengerFlowHistoryCount // - this.lblPassengerFlowHistoryCount.Font = new System.Drawing.Font("微软雅黑", 18F, System.Drawing.FontStyle.Bold); + this.lblPassengerFlowHistoryCount.Font = new System.Drawing.Font("微软雅黑", 15F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.lblPassengerFlowHistoryCount.ForeColor = System.Drawing.Color.Yellow; - this.lblPassengerFlowHistoryCount.Location = new System.Drawing.Point(972, 916); + this.lblPassengerFlowHistoryCount.Location = new System.Drawing.Point(847, 5); this.lblPassengerFlowHistoryCount.Name = "lblPassengerFlowHistoryCount"; this.lblPassengerFlowHistoryCount.Size = new System.Drawing.Size(221, 45); this.lblPassengerFlowHistoryCount.Style = Sunny.UI.UIStyle.Custom; @@ -1907,6 +1951,20 @@ namespace GuideScreen.UI this.lblTime.TextAlign = System.Drawing.ContentAlignment.MiddleCenter; this.lblTime.ZoomScaleRect = new System.Drawing.Rectangle(0, 0, 0, 0); // + // uiLabel24 + // + this.uiLabel24.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134))); + this.uiLabel24.ForeColor = System.Drawing.Color.White; + this.uiLabel24.Location = new System.Drawing.Point(40, 87); + this.uiLabel24.Name = "uiLabel24"; + this.uiLabel24.Size = new System.Drawing.Size(52, 37); + this.uiLabel24.Style = Sunny.UI.UIStyle.Custom; + this.uiLabel24.StyleCustomMode = true; + this.uiLabel24.TabIndex = 132; + this.uiLabel24.Text = "KPa"; + this.uiLabel24.TextAlign = System.Drawing.ContentAlignment.MiddleCenter; + this.uiLabel24.ZoomScaleRect = new System.Drawing.Rectangle(0, 0, 0, 0); + // // FormScreen // this.AllowShowTitle = false; @@ -2093,5 +2151,9 @@ namespace GuideScreen.UI private PictureBox pBoxManPitOne; private PictureBox pictureBox5; private PictureBox pictureBox4; + private Sunny.UI.UILabel uiLabel6; + private Sunny.UI.UILabel uiLabel19; + private Sunny.UI.UILabel uiLabel22; + private Sunny.UI.UILabel uiLabel24; } } \ No newline at end of file diff --git a/guidescreen/GuideScreen/GuideScreen.UI/FormScreen.cs b/guidescreen/GuideScreen/GuideScreen.UI/FormScreen.cs index 095a0f0..e906556 100644 --- a/guidescreen/GuideScreen/GuideScreen.UI/FormScreen.cs +++ b/guidescreen/GuideScreen/GuideScreen.UI/FormScreen.cs @@ -39,8 +39,10 @@ namespace GuideScreen.UI private CommonController commonController; //PLC private PLCController plcController; - // - private int passengerFlowDayCount = 0; + //տ + private int passengerFlowDayTotal = 0; + // + private int passengerFlowTotal = 0; //вʹ private const string currentManNumStrFormat = "5/{0}"; //Ůʹ @@ -78,21 +80,16 @@ namespace GuideScreen.UI //ȡ lblTitle.Text = commonController.Title; - // - //passengerFlowStatisticsController.StartMonitoring(); - - //ȡտ - passengerFlowDayCount = passengerFlowStatisticsController.GetDayCount(DateTime.Now); - - //¿ - PassengerFlowUpdate(); - //PLCͨ plcController.Start(); //ղλʹ toilets = plcController.ToiletPositionRecordTotalByToday(); - ToileUseChartByDay(); + + //ͳ + passengerFlowTotal = plcController.GetToiletPositionRecordTotal(); + + PassengerFlowUpdate(); //ȡϢ await GetWeather(); @@ -241,6 +238,14 @@ namespace GuideScreen.UI } } + if (use) + { + passengerFlowTotal++; + } + + //¿Ϣ + PassengerFlowUpdate(); + ToileUseChartByDay(); SetDayWarterAndelEctricity(); @@ -345,23 +350,27 @@ namespace GuideScreen.UI /// private void PassengerFlowStatisticsController_Action(object sender, Common.Services.Models.PassengerFlowStatisticsModel e) { - passengerFlowDayCount++; - PassengerFlowUpdate(); } + /// + /// + /// private void PassengerFlowUpdate() { - //ͳ - var dayStr = passengerFlowDayCount.ToString("D6"); - lblPassengerFlow.Text = dayStr.Aggregate(string.Empty, (c, i) => c + i + " "); - - //ͳ - //var weekModel = passengerFlowStatisticsController.GetWeekCount(DateTime.Now); - //PassengerFlowChart(weekModel); + passengerFlowDayTotal = toilets.Values.Sum(); + if (passengerFlowDayTotal == 0) + { + passengerFlowDayTotal = 1; + } + lblPassengerFlow.Text = passengerFlowDayTotal.ToString("D5").Aggregate(string.Empty, (c, i) => c + i + " "); - //ʷͳ - var totalStr = passengerFlowStatisticsController.GetTotalCount().ToString("D8"); - lblPassengerFlowHistoryCount.Text = totalStr.Aggregate(string.Empty, (c, i) => c + i + " "); + if (passengerFlowTotal == 0) + { + passengerFlowTotal = 1; + } + lblPassengerFlowHistoryCount.Text = passengerFlowTotal.ToString("D8").Aggregate(string.Empty, (c, i) => c + i + " "); + //λͼ + ToileUseChartByDay(); } #endregion @@ -623,13 +632,12 @@ namespace GuideScreen.UI { value1 = 1; } + //ģ var dayStr = Math.Round(value1 * 0.0085,2).ToString().Aggregate(string.Empty, (c, i) => c + i + " "); lblDayWarter.Text = $"ˮ {dayStr} "; var dayStr1 = Math.Round(value1 * 0.0038,2).ToString().Aggregate(string.Empty, (c, i) => c + i + " "); lblElectricQuantity.Text = $"պĵ {dayStr1} ǧʱ "; - //տ - lblPassengerFlow.Text= count.ToString("D5").Aggregate(string.Empty, (c, i) => c + i + " "); - + } #region Timer @@ -652,17 +660,16 @@ namespace GuideScreen.UI var enviHydrogenSulfide = 0.09 + (rd.Next(6,8)/100f); //e.GetValue(); lblEnviHydrogenSulfide.Text = Math.Round(enviHydrogenSulfide, 2).ToString() + " PPM"; - processEnviHydrogenSulfide.Value = Convert.ToInt32(enviHydrogenSulfide); + processEnviHydrogenSulfide.Value = Convert.ToInt32(enviHydrogenSulfide * 100); var ammoniaGas = 0.01 + (rd.Next(1, 3) / 100f);//e.GetValue(); lblEnviAmmoniaGas.Text = Math.Round(ammoniaGas, 2).ToString() + " PPM"; - processEnviAmmoniaGas.Value = Convert.ToInt32(ammoniaGas); + processEnviAmmoniaGas.Value = Convert.ToInt32(ammoniaGas * 100) ; } //Ժµ if (dateTime.ToString("HH:mm:ss") == zeroTime) { - //²λʹ toilets = plcController.ToiletPositionRecordTotalByToday(); ToileUseChartByDay(); diff --git a/guidescreen/GuideScreen/GuideScreen.UI/FormScreen.resx b/guidescreen/GuideScreen/GuideScreen.UI/FormScreen.resx index daced48..4ef3115 100644 --- a/guidescreen/GuideScreen/GuideScreen.UI/FormScreen.resx +++ b/guidescreen/GuideScreen/GuideScreen.UI/FormScreen.resx @@ -8846,6 +8846,6 @@ 107, 17 - 25 + 91 \ No newline at end of file diff --git a/guidescreen/GuideScreen/GuideScreen.UI/Program.cs b/guidescreen/GuideScreen/GuideScreen.UI/Program.cs index 55d2a8b..76d9831 100644 --- a/guidescreen/GuideScreen/GuideScreen.UI/Program.cs +++ b/guidescreen/GuideScreen/GuideScreen.UI/Program.cs @@ -1,9 +1,11 @@  using GuideScreen.Common; using GuideScreen.Common.Constants; + using System; using System.Collections.Generic; using System.Linq; +using System.Threading; using System.Windows.Forms; namespace GuideScreen.UI @@ -16,12 +18,26 @@ namespace GuideScreen.UI [STAThread] static void Main() { - Application.EnableVisualStyles(); - Application.SetCompatibleTextRenderingDefault(false); - Application.ThreadException += Application_ThreadException; - Application.ApplicationExit += Application_ApplicationExit; - AppDomain.CurrentDomain.UnhandledException += CurrentDomain_UnhandledException; - Application.Run(new FormScreen()); + //--------------------------只运行一个-------------------------------------------------- + //第一个参数:true--给调用线程赋予互斥体的初始所属权 + //第一个参数:互斥体的名称 + //第三个参数:返回值,如果调用线程已被授予互斥体的初始所属权,则返回true + bool flag = false; + using (Mutex mutex = new Mutex(true, "GuideScreen.UI 3811C0BC-C49B-4181-B67F-124DFE8D4D5C", out flag)) + { + if (!flag) + { + MessageBox.Show("【智慧真空公厕引导系统】已经运行！", "请确定", MessageBoxButtons.OK, MessageBoxIcon.Exclamation); + Environment.Exit(0); + } + + Application.EnableVisualStyles(); + Application.SetCompatibleTextRenderingDefault(false); + Application.ThreadException += Application_ThreadException; + Application.ApplicationExit += Application_ApplicationExit; + AppDomain.CurrentDomain.UnhandledException += CurrentDomain_UnhandledException; + Application.Run(new FormScreen()); + } } static void Application_ApplicationExit(object sender, EventArgs e) @@ -32,14 +48,14 @@ namespace GuideScreen.UI static void Application_ThreadException(object sender, System.Threading.ThreadExceptionEventArgs e) { e.Exception.WriteFatalLog(); - MessageBox.Show(e.Exception.Message); + //MessageBox.Show(e.Exception.Message); } static void CurrentDomain_UnhandledException(object sender, UnhandledExceptionEventArgs e) { var message = ((Exception)e.ExceptionObject).Message; message.WriteFatalLog(); - MessageBox.Show(message); + //MessageBox.Show(message); } }