20240327临时更新

guidescreen/GuideScreen/.idea/.idea.GuideScreen/.idea/.gitignore

@@ -1,13 +0,0 @@
-# Default ignored files
-/shelf/
-/workspace.xml
-# Rider ignored files
-/contentModel.xml
-/modules.xml
-/projectSettingsUpdater.xml
-/.idea.GuideScreen.iml
-# Editor-based HTTP Client requests
-/httpRequests/
-# Datasource local storage ignored files
-/dataSources/
-/dataSources.local.xml

guidescreen/GuideScreen/.idea/.idea.GuideScreen/.idea/encodings.xml

@@ -1,4 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="Encoding" addBOMForNewFiles="with BOM under Windows, with no BOM otherwise" />
-</project>

guidescreen/GuideScreen/.idea/.idea.GuideScreen/.idea/indexLayout.xml

@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="UserContentModel">
-    <attachedFolders />
-    <explicitIncludes />
-    <explicitExcludes />
-  </component>
-</project>

guidescreen/GuideScreen/.idea/.idea.GuideScreen/.idea/vcs.xml

@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="VcsDirectoryMappings">
-    <mapping directory="$PROJECT_DIR$/../.." vcs="Git" />
-  </component>
-</project>

guidescreen/GuideScreen/.vs/GuideScreen/v17/DocumentLayout.json

@@ -1,23 +0,0 @@
-{
-  "Version": 1,
-  "WorkspaceRootPath": "D:\\serverRep\\GuideScreen\\guidescreen\\GuideScreen\\",
-  "Documents": [],
-  "DocumentGroupContainers": [
-    {
-      "Orientation": 1,
-      "VerticalTabListWidth": 256,
-      "DocumentGroups": [
-        {
-          "DockedHeight": 200,
-          "SelectedChildIndex": -1,
-          "Children": [
-            {
-              "$type": "Bookmark",
-              "Name": "ST:128:0:{116d2292-e37d-41cd-a077-ebacac4c8cc4}"
-            }
-          ]
-        }
-      ]
-    }
-  ]
-}

guidescreen/GuideScreen/GuideScreen.Common/Constants/PLCPointName.cs

@@ -3,6 +3,7 @@ using System.Collections.Generic;
 using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
+using static System.Windows.Forms.VisualStyles.VisualStyleElement.TaskbarClock;
 
 namespace GuideScreen.Common.Constants
 {
@@ -31,6 +32,18 @@ namespace GuideScreen.Common.Constants
         /// </summary>
         public const string EnergyMonitoring = "能耗监控";
 
+
+        /// <summary>
+        /// 冲洗统计
+        /// </summary>
+        public const string WashCount = "冲洗统计";
+
+        /// <summary>
+        /// 控制器时间参数显示及设置
+        /// </summary>
+        public const string SetControllerTimeParameters = "控制器时间参数显示及设置";
+
+
     }
 
     /// <summary>
@@ -62,7 +75,7 @@ namespace GuideScreen.Common.Constants
     /// <summary>
     /// PLC 点位名称 厕位状态
     /// </summary>
-    public class PLCPointNameByToiletPosition
+    public sealed class PLCPointNameByToiletPosition
     {
 
         /// <summary>
@@ -191,7 +204,7 @@ namespace GuideScreen.Common.Constants
     /// <summary>
     /// PLC 点位名称 能耗监控
     /// </summary>
-    public class PLCPointNameByEnergyMonitoring
+    public sealed class PLCPointNameByEnergyMonitoring
     {
         /// <summary>
         /// 用电量
@@ -212,4 +225,179 @@ namespace GuideScreen.Common.Constants
         /// </summary>
         public const string Electricity = nameof(Electricity);
     }
+
+    /// <summary>
+    /// 冲洗统计
+    /// </summary>
+    public sealed class PLCPointNameByWashCount
+    {
+        /// <summary>
+        /// 男1冲洗次数
+        /// </summary>
+        public const string ToiletManCount1 = nameof(ToiletManCount1);
+        /// <summary>
+        /// 男2冲洗次数
+        /// </summary>
+        public const string ToiletManCount2 = nameof(ToiletManCount2);
+        /// <summary>
+        /// 男3冲洗次数
+        /// </summary>
+        public const string ToiletManCount3 = nameof(ToiletManCount3);
+        /// <summary>
+        /// 男4冲洗次数
+        /// </summary>
+        public const string ToiletManCount4 = nameof(ToiletManCount4);
+        /// <summary>
+        /// 男5冲洗次数
+        /// </summary>
+        public const string ToiletManCount5= nameof(ToiletManCount5);
+        /// <summary>
+        /// 女1冲洗次数
+        /// </summary>
+        public const string ToiletWomanCount1 = nameof(ToiletWomanCount1);
+        /// <summary>
+        /// 女2冲洗次数
+        /// </summary>
+        public const string ToiletWomanCount2 = nameof(ToiletWomanCount2);
+        /// <summary>
+        /// 女3冲洗次数
+        /// </summary>
+        public const string ToiletWomanCount3 = nameof(ToiletWomanCount3);
+       
+    }
+
+    /// <summary>
+    /// 控制器时间参数显示及设置
+    /// </summary>
+    public sealed class PLCPointNameBySetControllerTimeParameters 
+    {
+        /// <summary>
+        /// 男1控制器T2
+        /// </summary>
+        public const string ToiletManController1T2 = nameof(ToiletManController1T2);
+        /// <summary>
+        /// 男1控制器T3
+        /// </summary>
+        public const string ToiletManController1T3 = nameof(ToiletManController1T3);
+        /// <summary>
+        /// 男1控制器T4
+        /// </summary>
+        public const string ToiletManController1T4 = nameof(ToiletManController1T4);
+        /// <summary>
+        /// 男1控制器T5
+        /// </summary>
+        public const string ToiletManController1T5 = nameof(ToiletManController1T5);
+        /// <summary>
+        /// 男2控制器T2
+        /// </summary>
+        public const string ToiletManController2T2 = nameof(ToiletManController2T2);
+        /// <summary>
+        /// 男2控制器T3
+        /// </summary>
+        public const string ToiletManController2T3 = nameof(ToiletManController2T3);
+        /// <summary>
+        /// 男2控制器T4
+        /// </summary>
+        public const string ToiletManController2T4 = nameof(ToiletManController2T4);
+        /// <summary>
+        /// 男2控制器T5
+        /// </summary>
+        public const string ToiletManController2T5 = nameof(ToiletManController2T5);
+        /// <summary>
+        /// 男3控制器T2
+        /// </summary>
+        public const string ToiletManController3T2 = nameof(ToiletManController3T2);
+        /// <summary>
+        /// 男3控制器T3
+        /// </summary>
+        public const string ToiletManController3T3 = nameof(ToiletManController3T3);
+        /// <summary>
+        /// 男3控制器T4
+        /// </summary>
+        public const string ToiletManController3T4 = nameof(ToiletManController3T4);
+        /// <summary>
+        /// 男3控制器T5
+        /// </summary>
+        public const string ToiletManController3T5 = nameof(ToiletManController3T5);
+        /// <summary>
+        /// 男4控制器T2
+        /// </summary>
+        public const string ToiletManController4T2 = nameof(ToiletManController4T2);
+        /// <summary>
+        /// 男4控制器T3
+        /// </summary>
+        public const string ToiletManController4T3 = nameof(ToiletManController4T3);
+        /// <summary>
+        /// 男4控制器T4
+        /// </summary>
+        public const string ToiletManController4T4 = nameof(ToiletManController4T4);
+        /// <summary>
+        /// 男4控制器T5
+        /// </summary>
+        public const string ToiletManController4T5 = nameof(ToiletManController4T5);
+        /// <summary>
+        /// 男5控制器T2
+        /// </summary>
+        public const string ToiletManController5T2 = nameof(ToiletManController5T2);
+        /// <summary>
+        /// 男5控制器T3
+        /// </summary>
+        public const string ToiletManController5T3 = nameof(ToiletManController5T3);
+        /// <summary>
+        /// 男5控制器T4
+        /// </summary>
+        public const string ToiletManController5T4 = nameof(ToiletManController5T4);
+        /// <summary>
+        /// 男5控制器T5
+        /// </summary>
+        public const string ToiletManController5T5 = nameof(ToiletManController5T5);
+        /// <summary>
+        /// 女1控制器T2
+        /// </summary>
+        public const string ToiletWomanController1T2 = nameof(ToiletWomanController1T2);
+        /// <summary>
+        /// 女1控制器T3
+        /// </summary>
+        public const string ToiletWomanController1T3 = nameof(ToiletWomanController1T3);
+        /// <summary>
+        /// 女1控制器T4
+        /// </summary>
+        public const string ToiletWomanController1T4 = nameof(ToiletWomanController1T4);
+        /// <summary>
+        /// 女1控制器T5
+        /// </summary>
+        public const string ToiletWomanController1T5 = nameof(ToiletWomanController1T5);
+        /// <summary>
+        /// 女2控制器T2
+        /// </summary>
+        public const string ToiletWomanController2T2 = nameof(ToiletWomanController2T2);
+        /// <summary>
+        /// 女2控制器T3
+        /// </summary>
+        public const string ToiletWomanController2T3 = nameof(ToiletWomanController2T3);
+        /// <summary>
+        /// 女2控制器T4
+        /// </summary>
+        public const string ToiletWomanController2T4 = nameof(ToiletWomanController2T4);
+        /// <summary>
+        /// 女2控制器T5
+        /// </summary>
+        public const string ToiletWomanController2T5 = nameof(ToiletWomanController2T5);
+        /// <summary>
+        /// 女3控制器T2
+        /// </summary>
+        public const string ToiletWomanController3T2 = nameof(ToiletWomanController3T2);
+        /// <summary>
+        /// 女3控制器T3
+        /// </summary>
+        public const string ToiletWomanController3T3 = nameof(ToiletWomanController3T3);
+        /// <summary>
+        /// 女3控制器T4
+        /// </summary>
+        public const string ToiletWomanController3T4 = nameof(ToiletWomanController3T4);
+        /// <summary>
+        /// 女3控制器T5
+        /// </summary>
+        public const string ToiletWomanController3T5 = nameof(ToiletWomanController3T5);
+    }
 }

guidescreen/GuideScreen/GuideScreen.Common/Constants/SystemConfigKey.cs

@@ -16,6 +16,10 @@ namespace GuideScreen.Common.Common
         /// </summary>
         ScreenTitle,
         /// <summary>
+        /// 报警信息
+        /// </summary>
+        AlarmText,
+        /// <summary>
         /// 主题样式
         /// </summary>
         Style,

guidescreen/GuideScreen/GuideScreen.Common/Repositories/Entities/GSDBContext.cs

@@ -55,7 +55,7 @@ namespace GuideScreen.Common.Repositories
         public DbSet<PassengerFlowStatisticsEntity> PassengerFlowStatisticsEntites { get; set; }
         public DbSet<PassengerFlowStatisticsDayEntity> PassengerFlowStatisticsDayEntites { get; set; }
         public DbSet<PLCPointEntity> PLCPointEntites { get; set; }
-        public DbSet<PLCDeviceRecordDayEntity> PLCDeviceRecordDayEntities { get; set; }    
+        public DbSet<PLCDeviceRecordDayEntity> PLCDeviceRecordDayEntities { get; set; }
     }
 
 
@@ -69,7 +69,7 @@ namespace GuideScreen.Common.Repositories
         protected override void Seed(GSDBContext context)
         {
             //初始化菜单
-           
+
             //客流管理
             var passengerFlowStatisticsManageMenu = new MenuEntity();
             passengerFlowStatisticsManageMenu.ID = 20;
@@ -112,6 +112,8 @@ namespace GuideScreen.Common.Repositories
             //初始化系統参数 
             var screenTitle = new SystemConfigEntity { ConfigName = "引导屏标题", ConfigKey = SystemConfigKeys.ScreenTitle.ToString(), ConfigValue = "智慧真空公厕引导系统", Enabled = true };
 
+            var alarmText = new SystemConfigEntity { ConfigName = "报警信息", ConfigKey = SystemConfigKeys.AlarmText.ToString(), ConfigValue = "", Enabled = true };
+
             var plcIPAddress = new SystemConfigEntity { ConfigName = "PLC通信IP地址", ConfigKey = SystemConfigKeys.PLCAddress.ToString(), ConfigValue = "192.168.1.253", Enabled = true };
             var plcPort = new SystemConfigEntity { ConfigName = "PLC通信端口", ConfigKey = SystemConfigKeys.PLCPort.ToString(), ConfigValue = "102", Enabled = true };
 
@@ -126,12 +128,14 @@ namespace GuideScreen.Common.Repositories
             var passengerFlowDevicePort = new SystemConfigEntity { ConfigName = "客流统计设备端口", ConfigKey = SystemConfigKeys.PassengerFlowDevicePort.ToString(), ConfigValue = "8000", Enabled = true };
             var passengerFlowDeviceLoginUser = new SystemConfigEntity { ConfigName = "客流统计设备登录用户名", ConfigKey = SystemConfigKeys.PassengerFlowDeviceLoginUser.ToString(), ConfigValue = "admin", Enabled = true };
             var passengerFlowDeviceLoginPassword = new SystemConfigEntity { ConfigName = "客流统计设备登录用户密码", ConfigKey = SystemConfigKeys.PassengerFlowDeviceLoginPassword.ToString(), ConfigValue = "1q@w3e$r", Enabled = true };
-            var passengerFlowListenIP = new SystemConfigEntity { ConfigName = "客流统计监控IP地址", ConfigKey = SystemConfigKeys.PassengerFlowListenIP.ToString(), ConfigValue = "192.168.1.100", Remarks="本地IP地址（与摄像头所在网络）", Enabled = true };
+            var passengerFlowListenIP = new SystemConfigEntity { ConfigName = "客流统计监控IP地址", ConfigKey = SystemConfigKeys.PassengerFlowListenIP.ToString(), ConfigValue = "192.168.1.100", Remarks = "本地IP地址（与摄像头所在网络）", Enabled = true };
             var passengerFlowListenPort = new SystemConfigEntity { ConfigName = "客流统计监控端口号", ConfigKey = SystemConfigKeys.PassengerFlowListenPort.ToString(), ConfigValue = "7200", Enabled = true };
             context.SystemConfigEntities.AddRange(new SystemConfigEntity[]
             {
                 screenTitle,
 
+                alarmText,
+
                 plcIPAddress,
                 plcPort,
 
@@ -179,15 +183,25 @@ namespace GuideScreen.Common.Repositories
             //var toiletWomanStatus4 = new PLCPointEntity { DeviceName = "厕位监控", PointName = PLCPointNameByToiletPosition.ToiletWomanStatus4, PointNote = "女4状态", PointDataType = PLCPointDataType.Bool, PointAddress = "V162.0", Unit = "有/无" };
             //var toiletWomanStatus5 = new PLCPointEntity { DeviceName = "厕位监控", PointName = PLCPointNameByToiletPosition.ToiletWomanStatus5, PointNote = "女5状态", PointDataType = PLCPointDataType.Bool, PointAddress = "V163.1", Unit = "有/无" };
             //环境监测
-            var environmentalMonitoringH2S = new PLCPointEntity { DeviceName = PLCDeviceNames.EnvironmentalMonitoring, PointName = PLCPointNameByEnvironmentalMonitoring.H2S, PointNote= "硫化氢", PointDataType = PLCPointDataType.Float, PointAddress = "VW140", Unit = "ppm" };
-            var environmentalMonitoringNH3 = new PLCPointEntity { DeviceName = PLCDeviceNames.EnvironmentalMonitoring, PointName = PLCPointNameByEnvironmentalMonitoring.NH3, PointNote= "氨气", PointDataType = PLCPointDataType.Float, PointAddress = "VW144", Unit = "ppm" };
+            var environmentalMonitoringH2S = new PLCPointEntity { DeviceName = PLCDeviceNames.EnvironmentalMonitoring, PointName = PLCPointNameByEnvironmentalMonitoring.H2S, PointNote = "硫化氢", PointDataType = PLCPointDataType.Float, PointAddress = "VW140", Unit = "ppm" };
+            var environmentalMonitoringNH3 = new PLCPointEntity { DeviceName = PLCDeviceNames.EnvironmentalMonitoring, PointName = PLCPointNameByEnvironmentalMonitoring.NH3, PointNote = "氨气", PointDataType = PLCPointDataType.Float, PointAddress = "VW144", Unit = "ppm" };
             var environmentalMonitoringTemperature = new PLCPointEntity { DeviceName = PLCDeviceNames.EnvironmentalMonitoring, PointName = PLCPointNameByEnvironmentalMonitoring.Temperature, PointNote = "温度", PointDataType = PLCPointDataType.Int16, PointAddress = "VW150", Unit = "RH" };
             var environmentalMonitoringHumidity = new PLCPointEntity { DeviceName = PLCDeviceNames.EnvironmentalMonitoring, PointName = PLCPointNameByEnvironmentalMonitoring.Humidity, PointNote = "湿度", PointDataType = PLCPointDataType.Int16, PointAddress = "VW152", Unit = "℃" };
             //能耗监控
-            var energyMonitoringElectricityConsumption = new PLCPointEntity { DeviceName = PLCDeviceNames.EnergyMonitoring, PointName = PLCPointNameByEnergyMonitoring.ElectricityConsumption, PointNote = "用电量", PointDataType = PLCPointDataType.Float, PointAddress = "VD164", Unit = "KWh" };
+            var energyMonitoringElectricityConsumption = new PLCPointEntity { DeviceName = PLCDeviceNames.EnergyMonitoring, PointName = PLCPointNameByEnergyMonitoring.ElectricityConsumption, PointNote = "用电量", PointDataType = PLCPointDataType.Float, PointAddress = "VW164", Unit = "KWh" };
             var energyMonitoringWater = new PLCPointEntity { DeviceName = PLCDeviceNames.EnergyMonitoring, PointName = PLCPointNameByEnergyMonitoring.WaterConsumption, PointNote = "用水量", PointDataType = PLCPointDataType.Float, PointAddress = "VD168", Unit = "" };
             //var energyMonitoringVoltage = new PLCPointEntity { DeviceName = PLCDeviceNames.EnergyMonitoring, PointName = PLCPointNameByEnergyMonitoring.Voltage, PointNote = "电压", PointDataType = PLCPointDataType.Float, PointAddress = "VW168", Unit = "V" };
             //var energyMonitoringElectricity = new PLCPointEntity { DeviceName = PLCDeviceNames.EnergyMonitoring, PointName = PLCPointNameByEnergyMonitoring.Electricity, PointNote = "电流", PointDataType = PLCPointDataType.Float, PointAddress = "VW172", Unit = "A" };
+
+            var washCountToiletManCount1 = new PLCPointEntity { DeviceName = PLCDeviceNames.WashCount, PointName = PLCPointNameByWashCount.ToiletManCount1, PointNote = "男1冲洗次数", PointDataType = PLCPointDataType.Int16, PointAddress = "VW174", Unit = "次", IsReadonly = true };
+            var washCountToiletManCount2 = new PLCPointEntity { DeviceName = PLCDeviceNames.WashCount, PointName = PLCPointNameByWashCount.ToiletManCount2, PointNote = "男2冲洗次数", PointDataType = PLCPointDataType.Int16, PointAddress = "VW176", Unit = "次", IsReadonly = true };
+            var washCountToiletManCount3 = new PLCPointEntity { DeviceName = PLCDeviceNames.WashCount, PointName = PLCPointNameByWashCount.ToiletManCount3, PointNote = "男3冲洗次数", PointDataType = PLCPointDataType.Int16, PointAddress = "VW178", Unit = "次", IsReadonly = true };
+            var washCountToiletManCount4 = new PLCPointEntity { DeviceName = PLCDeviceNames.WashCount, PointName = PLCPointNameByWashCount.ToiletManCount4, PointNote = "男4冲洗次数", PointDataType = PLCPointDataType.Int16, PointAddress = "VW180", Unit = "次", IsReadonly = true };
+            var washCountToiletManCount5 = new PLCPointEntity { DeviceName = PLCDeviceNames.WashCount, PointName = PLCPointNameByWashCount.ToiletManCount5, PointNote = "男5冲洗次数", PointDataType = PLCPointDataType.Int16, PointAddress = "VW182", Unit = "次", IsReadonly = true };
+            var washCountToiletWomanCount1 = new PLCPointEntity { DeviceName = PLCDeviceNames.WashCount, PointName = PLCPointNameByWashCount.ToiletWomanCount1, PointNote = "女1冲洗次数", PointDataType = PLCPointDataType.Int16, PointAddress = "VW184", Unit = "次", IsReadonly = true };
+            var washCountToiletWomanCount2 = new PLCPointEntity { DeviceName = PLCDeviceNames.WashCount, PointName = PLCPointNameByWashCount.ToiletWomanCount2, PointNote = "女2冲洗次数", PointDataType = PLCPointDataType.Int16, PointAddress = "VW186", Unit = "次", IsReadonly = true };
+            var washCountToiletWomanCount3 = new PLCPointEntity { DeviceName = PLCDeviceNames.WashCount, PointName = PLCPointNameByWashCount.ToiletWomanCount3, PointNote = "女3冲洗次数", PointDataType = PLCPointDataType.Int16, PointAddress = "VW188", Unit = "次", IsReadonly = true };
+
             context.PLCPointEntites.AddRange(new PLCPointEntity[]
             {
                 vacuumPumpingStationRealTimeVacuum,
@@ -222,9 +236,18 @@ namespace GuideScreen.Common.Repositories
                 environmentalMonitoringTemperature,
                 environmentalMonitoringHumidity,
                 energyMonitoringElectricityConsumption,
-                energyMonitoringWater
+                energyMonitoringWater,
                 //energyMonitoringVoltage,
                 //energyMonitoringElectricity
+
+                washCountToiletManCount1,
+                washCountToiletManCount2,
+                washCountToiletManCount3,
+                washCountToiletManCount4,
+                washCountToiletManCount5,
+                washCountToiletWomanCount1,
+                washCountToiletWomanCount2,
+                washCountToiletWomanCount3,
             });
 
             context.SaveChanges();

guidescreen/GuideScreen/GuideScreen.Common/Repositories/Entities/PLCPointEntity.cs

@@ -45,16 +45,24 @@ namespace GuideScreen.Common.Repositories.Entities
         /// </summary>
         [Column("pointDataType")]
         public string PointDataType { get; set; }
+
         /// <summary>
         /// 点位地址
         /// </summary>
         [Column("pointAddress")]
         public string PointAddress { get; set; }
+
         /// <summary>
         /// 单位
         /// </summary>
         [Column("unit")]
         public string Unit { get; set; }
+
+        /// <summary>
+        /// 是否为只读
+        /// </summary>
+        [Column("isReadonly")]
+        public bool IsReadonly { get; set; }
         /// <summary>
         /// 备注
         /// </summary>

guidescreen/GuideScreen/GuideScreen.UI/FormScreen.Designer.cs

@@ -82,6 +82,7 @@ namespace GuideScreen.UI
             this.pictureBox8 = new System.Windows.Forms.PictureBox();
             this.pictureBox9 = new System.Windows.Forms.PictureBox();
             this.uiPanel6 = new Sunny.UI.UIPanel();
+            this.uiLabel24 = new Sunny.UI.UILabel();
             this.uiLabel6 = new Sunny.UI.UILabel();
             this.uiLabel11 = new Sunny.UI.UILabel();
             this.analogMeterFrequency2 = new Sunny.UI.UIAnalogMeter();
@@ -113,7 +114,6 @@ namespace GuideScreen.UI
             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();
@@ -130,9 +130,6 @@ namespace GuideScreen.UI
             this.uiSmoothLabel2 = new Sunny.UI.UISmoothLabel();
             this.uiSmoothLabel1 = new Sunny.UI.UISmoothLabel();
             this.uiLabel17 = new Sunny.UI.UILabel();
-            this.lblPassengerFlowHistoryCount = new Sunny.UI.UILabel();
-            this.lblPassengerFlow = new Sunny.UI.UILabel();
-            this.uiLabel13 = new Sunny.UI.UILabel();
             this.lblCurrentManNum = new Sunny.UI.UILabel();
             this.lblCurrentWomanNum = new Sunny.UI.UILabel();
             this.pBoxUrinateMan3 = new System.Windows.Forms.PictureBox();
@@ -157,7 +154,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.txtAlarm = new Sunny.UI.UIScrollingText();
             this.uiPanel1.SuspendLayout();
             ((System.ComponentModel.ISupportInitialize)(this.pBoxWeatherIcon)).BeginInit();
             this.uiPanel5.SuspendLayout();
@@ -922,6 +919,20 @@ namespace GuideScreen.UI
             this.uiPanel6.TextAlignment = System.Drawing.ContentAlignment.MiddleCenter;
             this.uiPanel6.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);
+            // 
             // uiLabel6
             // 
             this.uiLabel6.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
@@ -1373,7 +1384,7 @@ namespace GuideScreen.UI
             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.txtAlarm);
             this.uiPanel7.Controls.Add(this.pictureBox5);
             this.uiPanel7.Controls.Add(this.pictureBox4);
             this.uiPanel7.Controls.Add(this.pBoxPitWomanThree);
@@ -1390,9 +1401,6 @@ namespace GuideScreen.UI
             this.uiPanel7.Controls.Add(this.uiSmoothLabel2);
             this.uiPanel7.Controls.Add(this.uiSmoothLabel1);
             this.uiPanel7.Controls.Add(this.uiLabel17);
-            this.uiPanel7.Controls.Add(this.lblPassengerFlowHistoryCount);
-            this.uiPanel7.Controls.Add(this.lblPassengerFlow);
-            this.uiPanel7.Controls.Add(this.uiLabel13);
             this.uiPanel7.Controls.Add(this.lblCurrentManNum);
             this.uiPanel7.Controls.Add(this.lblCurrentWomanNum);
             this.uiPanel7.Controls.Add(this.pBoxUrinateMan3);
@@ -1422,20 +1430,6 @@ 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")));
@@ -1627,54 +1621,12 @@ namespace GuideScreen.UI
             this.uiLabel17.TextAlign = System.Drawing.ContentAlignment.MiddleLeft;
             this.uiLabel17.ZoomScaleRect = new System.Drawing.Rectangle(0, 0, 0, 0);
             // 
-            // lblPassengerFlowHistoryCount
-            // 
-            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(847, 5);
-            this.lblPassengerFlowHistoryCount.Name = "lblPassengerFlowHistoryCount";
-            this.lblPassengerFlowHistoryCount.Size = new System.Drawing.Size(221, 45);
-            this.lblPassengerFlowHistoryCount.Style = Sunny.UI.UIStyle.Custom;
-            this.lblPassengerFlowHistoryCount.StyleCustomMode = true;
-            this.lblPassengerFlowHistoryCount.TabIndex = 18;
-            this.lblPassengerFlowHistoryCount.Text = "0 0 0 1 2 1  0  0";
-            this.lblPassengerFlowHistoryCount.TextAlign = System.Drawing.ContentAlignment.MiddleLeft;
-            this.lblPassengerFlowHistoryCount.ZoomScaleRect = new System.Drawing.Rectangle(0, 0, 0, 0);
-            // 
-            // lblPassengerFlow
-            // 
-            this.lblPassengerFlow.Font = new System.Drawing.Font("微软雅黑", 15F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.lblPassengerFlow.ForeColor = System.Drawing.Color.PaleGreen;
-            this.lblPassengerFlow.Location = new System.Drawing.Point(229, 3);
-            this.lblPassengerFlow.Name = "lblPassengerFlow";
-            this.lblPassengerFlow.Size = new System.Drawing.Size(137, 41);
-            this.lblPassengerFlow.Style = Sunny.UI.UIStyle.Custom;
-            this.lblPassengerFlow.StyleCustomMode = true;
-            this.lblPassengerFlow.TabIndex = 13;
-            this.lblPassengerFlow.Text = " 0 0 0 1 3 2 ";
-            this.lblPassengerFlow.TextAlign = System.Drawing.ContentAlignment.MiddleLeft;
-            this.lblPassengerFlow.ZoomScaleRect = new System.Drawing.Rectangle(0, 0, 0, 0);
-            // 
-            // uiLabel13
-            // 
-            this.uiLabel13.Font = new System.Drawing.Font("微软雅黑", 15F, System.Drawing.FontStyle.Bold);
-            this.uiLabel13.ForeColor = System.Drawing.Color.White;
-            this.uiLabel13.Location = new System.Drawing.Point(122, -2);
-            this.uiLabel13.Name = "uiLabel13";
-            this.uiLabel13.Size = new System.Drawing.Size(101, 46);
-            this.uiLabel13.Style = Sunny.UI.UIStyle.Custom;
-            this.uiLabel13.StyleCustomMode = true;
-            this.uiLabel13.TabIndex = 14;
-            this.uiLabel13.Text = "今日客流";
-            this.uiLabel13.TextAlign = System.Drawing.ContentAlignment.MiddleLeft;
-            this.uiLabel13.ZoomScaleRect = new System.Drawing.Rectangle(0, 0, 0, 0);
-            // 
             // lblCurrentManNum
             // 
             this.lblCurrentManNum.BackColor = System.Drawing.Color.Transparent;
             this.lblCurrentManNum.Font = new System.Drawing.Font("微软雅黑", 14.25F, System.Drawing.FontStyle.Bold);
             this.lblCurrentManNum.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(65)))), ((int)(((byte)(128)))), ((int)(((byte)(195)))));
-            this.lblCurrentManNum.Location = new System.Drawing.Point(53, 371);
+            this.lblCurrentManNum.Location = new System.Drawing.Point(270, 380);
             this.lblCurrentManNum.Name = "lblCurrentManNum";
             this.lblCurrentManNum.Size = new System.Drawing.Size(59, 46);
             this.lblCurrentManNum.Style = Sunny.UI.UIStyle.Custom;
@@ -1689,7 +1641,7 @@ namespace GuideScreen.UI
             this.lblCurrentWomanNum.BackColor = System.Drawing.Color.Transparent;
             this.lblCurrentWomanNum.Font = new System.Drawing.Font("微软雅黑", 14.25F, System.Drawing.FontStyle.Bold);
             this.lblCurrentWomanNum.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(65)))), ((int)(((byte)(128)))), ((int)(((byte)(195)))));
-            this.lblCurrentWomanNum.Location = new System.Drawing.Point(1052, 371);
+            this.lblCurrentWomanNum.Location = new System.Drawing.Point(834, 378);
             this.lblCurrentWomanNum.Name = "lblCurrentWomanNum";
             this.lblCurrentWomanNum.Size = new System.Drawing.Size(59, 46);
             this.lblCurrentWomanNum.Style = Sunny.UI.UIStyle.Custom;
@@ -1743,7 +1695,7 @@ namespace GuideScreen.UI
             // 
             this.pictureBox2.BackColor = System.Drawing.Color.Transparent;
             this.pictureBox2.Image = ((System.Drawing.Image)(resources.GetObject("pictureBox2.Image")));
-            this.pictureBox2.Location = new System.Drawing.Point(44, 231);
+            this.pictureBox2.Location = new System.Drawing.Point(261, 240);
             this.pictureBox2.Name = "pictureBox2";
             this.pictureBox2.Size = new System.Drawing.Size(68, 124);
             this.pictureBox2.SizeMode = System.Windows.Forms.PictureBoxSizeMode.AutoSize;
@@ -1794,7 +1746,7 @@ namespace GuideScreen.UI
             // 
             this.pictureBox3.BackColor = System.Drawing.Color.Transparent;
             this.pictureBox3.Image = ((System.Drawing.Image)(resources.GetObject("pictureBox3.Image")));
-            this.pictureBox3.Location = new System.Drawing.Point(1043, 233);
+            this.pictureBox3.Location = new System.Drawing.Point(825, 240);
             this.pictureBox3.Name = "pictureBox3";
             this.pictureBox3.Size = new System.Drawing.Size(80, 125);
             this.pictureBox3.SizeMode = System.Windows.Forms.PictureBoxSizeMode.AutoSize;
@@ -1951,26 +1903,26 @@ namespace GuideScreen.UI
             this.lblTime.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
             this.lblTime.ZoomScaleRect = new System.Drawing.Rectangle(0, 0, 0, 0);
             // 
-            // uiLabel24
+            // txtAlarm
             // 
-            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);
+            this.txtAlarm.FillColor = System.Drawing.Color.Empty;
+            this.txtAlarm.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+            this.txtAlarm.Location = new System.Drawing.Point(160, 3);
+            this.txtAlarm.MinimumSize = new System.Drawing.Size(1, 1);
+            this.txtAlarm.Name = "txtAlarm";
+            this.txtAlarm.RectColor = System.Drawing.Color.Empty;
+            this.txtAlarm.Size = new System.Drawing.Size(835, 35);
+            this.txtAlarm.Style = Sunny.UI.UIStyle.Custom;
+            this.txtAlarm.TabIndex = 69;
+            this.txtAlarm.Text = "uiScrollingText1";
+            this.txtAlarm.ZoomScaleRect = new System.Drawing.Rectangle(0, 0, 0, 0);
             // 
             // FormScreen
             // 
             this.AllowShowTitle = false;
             this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.None;
             this.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(7)))), ((int)(((byte)(43)))), ((int)(((byte)(82)))));
-            this.ClientSize = new System.Drawing.Size(1920, 1040);
+            this.ClientSize = new System.Drawing.Size(1920, 1032);
             this.ContextMenuStrip = this.contextMenuStrip;
             this.Controls.Add(this.uiPanel7);
             this.Controls.Add(this.uiPanel6);
@@ -2058,10 +2010,7 @@ namespace GuideScreen.UI
         private PictureBox pBoxUrinateMan1;
         private Sunny.UI.UILabel lblCurrentManNum;
         private Sunny.UI.UILabel lblCurrentWomanNum;
-        private Sunny.UI.UILabel uiLabel13;
-        private Sunny.UI.UILabel lblPassengerFlow;
         private Sunny.UI.UILabel uiLabel17;
-        private Sunny.UI.UILabel lblPassengerFlowHistoryCount;
         private Sunny.UI.UIBarChart ChartPassengerFlow;
         private PictureBox pictureBox8;
         private PictureBox pictureBox6;
@@ -2153,7 +2102,7 @@ namespace GuideScreen.UI
         private PictureBox pictureBox4;
         private Sunny.UI.UILabel uiLabel6;
         private Sunny.UI.UILabel uiLabel19;
-        private Sunny.UI.UILabel uiLabel22;
         private Sunny.UI.UILabel uiLabel24;
+        private Sunny.UI.UIScrollingText txtAlarm;
     }
 }

guidescreen/GuideScreen/GuideScreen.UI/FormScreen.cs

@@ -353,7 +353,7 @@ namespace GuideScreen.UI
 
         }
         /// <summary>
-        /// 客流量更新
+        /// 客流量更新 
         /// </summary>
         private void PassengerFlowUpdate()
         {
@@ -362,13 +362,12 @@ namespace GuideScreen.UI
             {
                 passengerFlowDayTotal = 1;
             }
-            lblPassengerFlow.Text = passengerFlowDayTotal.ToString("D5").Aggregate(string.Empty, (c, i) => c + i + " ");
-
+            //   lblPassengerFlow.Text = passengerFlowDayTotal.ToString("D5").Aggregate(string.Empty, (c, i) => c + i + " ");
             if (passengerFlowTotal == 0)
             {
                 passengerFlowTotal = 1;
             }
-            lblPassengerFlowHistoryCount.Text = passengerFlowTotal.ToString("D8").Aggregate(string.Empty, (c, i) => c + i + " ");
+            // lblPassengerFlowHistoryCount.Text = passengerFlowTotal.ToString("D8").Aggregate(string.Empty, (c, i) => c + i + " ");
             //²àλͼ±í
             ToileUseChartByDay();
         }