diff --git a/guidescreen/GuideScreen/.vs/GuideScreen/FileContentIndex/22daf9db-edb3-4117-a943-581861241475.vsidx b/guidescreen/GuideScreen/.vs/GuideScreen/FileContentIndex/22daf9db-edb3-4117-a943-581861241475.vsidx
deleted file mode 100644
index f3ad0ec..0000000
Binary files a/guidescreen/GuideScreen/.vs/GuideScreen/FileContentIndex/22daf9db-edb3-4117-a943-581861241475.vsidx and /dev/null differ
diff --git a/guidescreen/GuideScreen/.vs/GuideScreen/FileContentIndex/5d73aabd-aa1c-40ee-af08-51d34a99df88.vsidx b/guidescreen/GuideScreen/.vs/GuideScreen/FileContentIndex/5d73aabd-aa1c-40ee-af08-51d34a99df88.vsidx
deleted file mode 100644
index 8515e7f..0000000
Binary files a/guidescreen/GuideScreen/.vs/GuideScreen/FileContentIndex/5d73aabd-aa1c-40ee-af08-51d34a99df88.vsidx and /dev/null differ
diff --git a/guidescreen/GuideScreen/.vs/GuideScreen/FileContentIndex/621dff52-583c-4bba-9906-f8bc024323a0.vsidx b/guidescreen/GuideScreen/.vs/GuideScreen/FileContentIndex/621dff52-583c-4bba-9906-f8bc024323a0.vsidx
deleted file mode 100644
index 6500050..0000000
Binary files a/guidescreen/GuideScreen/.vs/GuideScreen/FileContentIndex/621dff52-583c-4bba-9906-f8bc024323a0.vsidx and /dev/null differ
diff --git a/guidescreen/GuideScreen/.vs/GuideScreen/FileContentIndex/c6690781-82b1-488f-a00c-dee1706dbd4b.vsidx b/guidescreen/GuideScreen/.vs/GuideScreen/FileContentIndex/c6690781-82b1-488f-a00c-dee1706dbd4b.vsidx
new file mode 100644
index 0000000..41d827e
Binary files /dev/null and b/guidescreen/GuideScreen/.vs/GuideScreen/FileContentIndex/c6690781-82b1-488f-a00c-dee1706dbd4b.vsidx differ
diff --git a/guidescreen/GuideScreen/.vs/GuideScreen/FileContentIndex/cd9fa381-29fc-46ba-924f-3e33401c3d50.vsidx b/guidescreen/GuideScreen/.vs/GuideScreen/FileContentIndex/cd9fa381-29fc-46ba-924f-3e33401c3d50.vsidx
new file mode 100644
index 0000000..64f8ed3
Binary files /dev/null and b/guidescreen/GuideScreen/.vs/GuideScreen/FileContentIndex/cd9fa381-29fc-46ba-924f-3e33401c3d50.vsidx differ
diff --git a/guidescreen/GuideScreen/.vs/GuideScreen/FileContentIndex/d660ac2f-a104-4d48-9d82-634363015f6c.vsidx b/guidescreen/GuideScreen/.vs/GuideScreen/FileContentIndex/d660ac2f-a104-4d48-9d82-634363015f6c.vsidx
new file mode 100644
index 0000000..1482f17
Binary files /dev/null and b/guidescreen/GuideScreen/.vs/GuideScreen/FileContentIndex/d660ac2f-a104-4d48-9d82-634363015f6c.vsidx differ
diff --git a/guidescreen/GuideScreen/.vs/GuideScreen/FileContentIndex/f23b374e-2dd8-4579-a4b6-687189b2aa8d.vsidx b/guidescreen/GuideScreen/.vs/GuideScreen/FileContentIndex/f23b374e-2dd8-4579-a4b6-687189b2aa8d.vsidx
new file mode 100644
index 0000000..6bc0003
Binary files /dev/null and b/guidescreen/GuideScreen/.vs/GuideScreen/FileContentIndex/f23b374e-2dd8-4579-a4b6-687189b2aa8d.vsidx differ
diff --git a/guidescreen/GuideScreen/.vs/GuideScreen/FileContentIndex/f7a92372-1896-46ed-bcc3-fee438861336.vsidx b/guidescreen/GuideScreen/.vs/GuideScreen/FileContentIndex/f7a92372-1896-46ed-bcc3-fee438861336.vsidx
deleted file mode 100644
index 2c675b2..0000000
Binary files a/guidescreen/GuideScreen/.vs/GuideScreen/FileContentIndex/f7a92372-1896-46ed-bcc3-fee438861336.vsidx and /dev/null differ
diff --git a/guidescreen/GuideScreen/.vs/GuideScreen/v17/.suo b/guidescreen/GuideScreen/.vs/GuideScreen/v17/.suo
index 9425966..816d945 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/Constants/PLCPointName.cs b/guidescreen/GuideScreen/GuideScreen.Common/Constants/PLCPointName.cs
index 44151a8..a7d14b6 100644
--- a/guidescreen/GuideScreen/GuideScreen.Common/Constants/PLCPointName.cs
+++ b/guidescreen/GuideScreen/GuideScreen.Common/Constants/PLCPointName.cs
@@ -118,14 +118,24 @@ namespace GuideScreen.Common.Constants
public const string RealTimeVacuum = nameof(RealTimeVacuum);
///
- /// 运行频率
+ /// 1#运行频率
///
- public const string RunningFrequency = nameof(RunningFrequency);
+ public const string RunningFrequency1 = nameof(RunningFrequency1);
///
- /// 运行电流
+ /// 1#运行电流
///
- public const string RunningCurrent = nameof(RunningCurrent);
+ public const string RunningCurrent1 = nameof(RunningCurrent1);
+
+ ///
+ /// 2#运行频率
+ ///
+ public const string RunningFrequency2 = nameof(RunningFrequency2);
+
+ ///
+ /// 2#运行电流
+ ///
+ public const string RunningCurrent2= nameof(RunningCurrent2);
///
/// 1#泵启动次数
diff --git a/guidescreen/GuideScreen/GuideScreen.Common/GuideScreen.Common.csproj b/guidescreen/GuideScreen/GuideScreen.Common/GuideScreen.Common.csproj
index 16103d4..0bab70f 100644
--- a/guidescreen/GuideScreen/GuideScreen.Common/GuideScreen.Common.csproj
+++ b/guidescreen/GuideScreen/GuideScreen.Common/GuideScreen.Common.csproj
@@ -48,7 +48,7 @@
False
- SDK\HslCommunication.dll
+ E:\软件\组件\HslCommunication\HslCommunication（已破解）\HslCommunication.dll
..\packages\Masuit.Tools.Net.2.5.7.5\lib\net461\Masuit.Tools.dll
@@ -144,7 +144,7 @@
-
+
diff --git a/guidescreen/GuideScreen/GuideScreen.Common/Repositories/Entities/GSDBContext.cs b/guidescreen/GuideScreen/GuideScreen.Common/Repositories/Entities/GSDBContext.cs
index d477fa3..0f6d555 100644
--- a/guidescreen/GuideScreen/GuideScreen.Common/Repositories/Entities/GSDBContext.cs
+++ b/guidescreen/GuideScreen/GuideScreen.Common/Repositories/Entities/GSDBContext.cs
@@ -112,8 +112,8 @@ namespace GuideScreen.Common.Repositories
//初始化系統参数
var screenTitle = new SystemConfigEntity { ConfigName = "引导屏标题", ConfigKey = SystemConfigKeys.ScreenTitle.ToString(), ConfigValue = "智慧真空公厕引导系统", Enabled = true };
- var plcIPAddress = new SystemConfigEntity { ConfigName = "PLC通信IP地址", ConfigKey = SystemConfigKeys.PLCAddress.ToString(), ConfigValue = "192.168.1.3", Enabled = true };
- var plcPort = new SystemConfigEntity { ConfigName = "PLC通信端口", ConfigKey = SystemConfigKeys.PLCPort.ToString(), ConfigValue = "502", 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 };
var adminPassword = new SystemConfigEntity { ConfigName = "管理员密码", ConfigKey = SystemConfigKeys.AdminPwd.ToString(), ConfigValue = "6543210", Enabled = true };
@@ -152,17 +152,19 @@ namespace GuideScreen.Common.Repositories
//plc点位数据
//真空泵站
- var vacuumPumpingStationRealTimeVacuum = new PLCPointEntity { DeviceName = PLCDeviceNames.VacuumPumpingStation, PointName = PLCPointNameByVacuumPumpingStation.RealTimeVacuum, PointNote = "实时真空度", PointDataType = PLCPointDataType.Float, PointAddress = "VW100", Unit = "Kpa" };
- var vacuumPumpingStationRunningFrequency = new PLCPointEntity { DeviceName = PLCDeviceNames.VacuumPumpingStation, PointName = PLCPointNameByVacuumPumpingStation.RunningFrequency, PointNote = "运行频率", PointDataType = PLCPointDataType.Float, PointAddress = "VW104", Unit = "HZ" };
- var vacuumPumpingStationRunningCurrent = new PLCPointEntity { DeviceName = PLCDeviceNames.VacuumPumpingStation, PointName = PLCPointNameByVacuumPumpingStation.RunningFrequency, PointNote = "运行电流", PointDataType = PLCPointDataType.Float, PointAddress = "VW108", Unit = "A" };
- var vacuumPumpingStationPumpStartTimes1 = new PLCPointEntity { DeviceName = PLCDeviceNames.VacuumPumpingStation, PointName = PLCPointNameByVacuumPumpingStation.PumpStartTimes1, PointNote = "1#泵启动次数", PointDataType = PLCPointDataType.Int32, PointAddress = "VW120", Unit = "次" };
- var vacuumPumpingStationPumpStartTimes2 = new PLCPointEntity { DeviceName = PLCDeviceNames.VacuumPumpingStation, PointName = PLCPointNameByVacuumPumpingStation.PumpStartTimes2, PointNote = "2#泵启动次数", PointDataType = PLCPointDataType.Int32, PointAddress = "VW122", Unit = "次" };
- var vacuumPumpingStationPumpAccumulatedStartTime1 = new PLCPointEntity { DeviceName = PLCDeviceNames.VacuumPumpingStation, PointName = PLCPointNameByVacuumPumpingStation.PumpAccumulatedStartTime1, PointNote = "1#泵累计启动时间", PointDataType = PLCPointDataType.Int32, PointAddress = "VW124", Unit = "次" };
- var vacuumPumpingStationPumpAccumulatedStartTime2 = new PLCPointEntity { DeviceName = PLCDeviceNames.VacuumPumpingStation, PointName = PLCPointNameByVacuumPumpingStation.PumpAccumulatedStartTime2, PointNote = "2#泵累计启动时间", PointDataType = PLCPointDataType.Int32, PointAddress = "VW126", Unit = "次" };
+ var vacuumPumpingStationRealTimeVacuum = new PLCPointEntity { DeviceName = PLCDeviceNames.VacuumPumpingStation, PointName = PLCPointNameByVacuumPumpingStation.RealTimeVacuum, PointNote = "实时真空度", PointDataType = PLCPointDataType.Int16, PointAddress = "VD100", Unit = "Kpa" };
+ var vacuumPumpingStationRunningFrequency1 = new PLCPointEntity { DeviceName = PLCDeviceNames.VacuumPumpingStation, PointName = PLCPointNameByVacuumPumpingStation.RunningFrequency1, PointNote = "1#运行频率", PointDataType = PLCPointDataType.Int16, PointAddress = "VD104", Unit = "HZ" };
+ var vacuumPumpingStationRunningCurrent1 = new PLCPointEntity { DeviceName = PLCDeviceNames.VacuumPumpingStation, PointName = PLCPointNameByVacuumPumpingStation.RunningCurrent1, PointNote = "1#运行电流", PointDataType = PLCPointDataType.Int16, PointAddress = "VD108", Unit = "A" };
+ var vacuumPumpingStationRunningFrequency2 = new PLCPointEntity { DeviceName = PLCDeviceNames.VacuumPumpingStation, PointName = PLCPointNameByVacuumPumpingStation.RunningFrequency2, PointNote = "2#运行频率", PointDataType = PLCPointDataType.Int16, PointAddress = "VD112", Unit = "HZ" };
+ var vacuumPumpingStationRunningCurrent2 = new PLCPointEntity { DeviceName = PLCDeviceNames.VacuumPumpingStation, PointName = PLCPointNameByVacuumPumpingStation.RunningCurrent2, PointNote = "2#运行电流", PointDataType = PLCPointDataType.Int16, PointAddress = "VD116", Unit = "A" };
+ var vacuumPumpingStationPumpStartTimes1 = new PLCPointEntity { DeviceName = PLCDeviceNames.VacuumPumpingStation, PointName = PLCPointNameByVacuumPumpingStation.PumpStartTimes1, PointNote = "1#泵启动次数", PointDataType = PLCPointDataType.Int16, PointAddress = "VW120", Unit = "次" };
+ var vacuumPumpingStationPumpStartTimes2 = new PLCPointEntity { DeviceName = PLCDeviceNames.VacuumPumpingStation, PointName = PLCPointNameByVacuumPumpingStation.PumpStartTimes2, PointNote = "2#泵启动次数", PointDataType = PLCPointDataType.Int16, PointAddress = "VW124", Unit = "次" };
+ var vacuumPumpingStationPumpAccumulatedStartTime1 = new PLCPointEntity { DeviceName = PLCDeviceNames.VacuumPumpingStation, PointName = PLCPointNameByVacuumPumpingStation.PumpAccumulatedStartTime1, PointNote = "1#泵累计启动时间", PointDataType = PLCPointDataType.Int16, PointAddress = "VW128", Unit = "次" };
+ var vacuumPumpingStationPumpAccumulatedStartTime2 = new PLCPointEntity { DeviceName = PLCDeviceNames.VacuumPumpingStation, PointName = PLCPointNameByVacuumPumpingStation.PumpAccumulatedStartTime2, PointNote = "2#泵累计启动时间", PointDataType = PLCPointDataType.Int16, PointAddress = "VW132", Unit = "次" };
var vacuumPumpingStationPumpingStation1 = new PLCPointEntity { DeviceName = PLCDeviceNames.VacuumPumpingStation, PointName = PLCPointNameByVacuumPumpingStation.PumpingStation1, PointNote = "1#泵站状态", PointDataType = PLCPointDataType.Bool, PointAddress = "V138.0", Unit = "RUN/STOP" };
var vacuumPumpingStationPumpingStation2 = new PLCPointEntity { DeviceName = PLCDeviceNames.VacuumPumpingStation, PointName = PLCPointNameByVacuumPumpingStation.PumpingStation2, PointNote = "2#泵站状态", PointDataType = PLCPointDataType.Bool, PointAddress = "V138.1", Unit = "RUN/STOP" };
- var vacuumPumpingStationFault1 = new PLCPointEntity { DeviceName = PLCDeviceNames.VacuumPumpingStation, PointName = PLCPointNameByVacuumPumpingStation.Fault1, PointNote = "故障1", PointDataType = PLCPointDataType.Bool, PointAddress = "V138.2", Unit = "" };
- var vacuumPumpingStationFault2 = new PLCPointEntity { DeviceName = PLCDeviceNames.VacuumPumpingStation, PointName = PLCPointNameByVacuumPumpingStation.Fault2, PointNote = "故障2", PointDataType = PLCPointDataType.Bool, PointAddress = "V138.3", Unit = "" };
+ var vacuumPumpingStationFault1 = new PLCPointEntity { DeviceName = PLCDeviceNames.VacuumPumpingStation, PointName = PLCPointNameByVacuumPumpingStation.Fault1, PointNote = "1#变频器故障", PointDataType = PLCPointDataType.Bool, PointAddress = "V138.2", Unit = "" };
+ var vacuumPumpingStationFault2 = new PLCPointEntity { DeviceName = PLCDeviceNames.VacuumPumpingStation, PointName = PLCPointNameByVacuumPumpingStation.Fault2, PointNote = "2#变频器故障", PointDataType = PLCPointDataType.Bool, PointAddress = "V138.3", Unit = "" };
var vacuumPumpingStationFault3 = new PLCPointEntity { DeviceName = PLCDeviceNames.VacuumPumpingStation, PointName = PLCPointNameByVacuumPumpingStation.Fault3, PointNote = "故障3", PointDataType = PLCPointDataType.Bool, PointAddress = "V138.4", Unit = "" };
var vacuumPumpingStationFault4 = new PLCPointEntity { DeviceName = PLCDeviceNames.VacuumPumpingStation, PointName = PLCPointNameByVacuumPumpingStation.Fault4, PointNote = "故障4", PointDataType = PLCPointDataType.Bool, PointAddress = "V138.5", Unit = "" };
//厕位监控
@@ -183,13 +185,15 @@ namespace GuideScreen.Common.Repositories
var environmentalMonitoringHumidity = new PLCPointEntity { DeviceName = PLCDeviceNames.EnvironmentalMonitoring, PointName = PLCPointNameByEnvironmentalMonitoring.Humidity, PointNote = "湿度", PointDataType = PLCPointDataType.Float, PointAddress = "VW152", Unit = "℃" };
//能耗监控
var energyMonitoringElectricityConsumption = new PLCPointEntity { DeviceName = PLCDeviceNames.EnergyMonitoring, PointName = PLCPointNameByEnergyMonitoring.ElectricityConsumption, PointNote = "用电量", PointDataType = PLCPointDataType.Float, PointAddress = "VW164", Unit = "KWh" };
- 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 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" };
context.PLCPointEntites.AddRange(new PLCPointEntity[]
{
vacuumPumpingStationRealTimeVacuum,
- vacuumPumpingStationRunningFrequency,
- vacuumPumpingStationRunningCurrent,
+ vacuumPumpingStationRunningFrequency1,
+ vacuumPumpingStationRunningCurrent1,
+ vacuumPumpingStationRunningFrequency2,
+ vacuumPumpingStationRunningCurrent2,
vacuumPumpingStationPumpStartTimes1,
vacuumPumpingStationPumpStartTimes2,
vacuumPumpingStationPumpAccumulatedStartTime1,
@@ -217,8 +221,8 @@ namespace GuideScreen.Common.Repositories
environmentalMonitoringTemperature,
environmentalMonitoringHumidity,
energyMonitoringElectricityConsumption,
- energyMonitoringVoltage,
- energyMonitoringElectricity
+ //energyMonitoringVoltage,
+ //energyMonitoringElectricity
});
context.SaveChanges();
diff --git a/guidescreen/GuideScreen/GuideScreen.Common/Repositories/Impl/PLCDeviceRecordRepository.cs b/guidescreen/GuideScreen/GuideScreen.Common/Repositories/Impl/PLCDeviceRecordRepository.cs
index 1317df9..ab12213 100644
--- a/guidescreen/GuideScreen/GuideScreen.Common/Repositories/Impl/PLCDeviceRecordRepository.cs
+++ b/guidescreen/GuideScreen/GuideScreen.Common/Repositories/Impl/PLCDeviceRecordRepository.cs
@@ -25,6 +25,8 @@ namespace GuideScreen.Common.Repositories.Impl
///
public PageModel> GetPLCDeviceRecordDayList(string deviceName, string note, DateTime begDate, DateTime endDate, int pageSize, int pageIndex)
{
+ begDate = DateTime.Parse(begDate.ToString("yyyy-MM-dd"));
+ endDate = DateTime.Parse(endDate.ToString("yyyy-MM-dd")).AddDays(1).AddSeconds(-1);
using (var context = GSDBContext.GetDbContext())
{
var query = context.PLCDeviceRecordDayEntities.Where(f => f.CreateDateTime >= begDate && f.CreateDateTime <= endDate);
@@ -99,7 +101,7 @@ namespace GuideScreen.Common.Repositories.Impl
using (var context = GSDBContext.GetDbContext())
{
var query = context.PLCDeviceRecordDayEntities.AsQueryable();
- if (!param.ID.IsDefaultValue())
+ if (param.ID != 0)
{
query = query.Where(f => f.ID == param.ID);
}
diff --git a/guidescreen/GuideScreen/GuideScreen.Common/Services/IPLCDeviceRecordService.cs b/guidescreen/GuideScreen/GuideScreen.Common/Services/IPLCDeviceRecordService.cs
index abb0455..7f40a96 100644
--- a/guidescreen/GuideScreen/GuideScreen.Common/Services/IPLCDeviceRecordService.cs
+++ b/guidescreen/GuideScreen/GuideScreen.Common/Services/IPLCDeviceRecordService.cs
@@ -44,9 +44,21 @@ namespace GuideScreen.Common.Services
List GetToiletPositionRecordTotalByToday();
///
- /// 更新 设备记录信息
+ /// 更新 厕位当日记录信息
///
///
- void UpdateToiletPositionRecordTotalByToday(string toiletPosition);
+ void UpdateToiletPositionRecordTotalByToday(string toiletPosition, string note);
+
+ ///
+ /// 更新 当日能耗记录信息
+ ///
+ ///
+ ///
+ void UpdateEnergyMonitoringByToday(string name, string note, float value);
+
+ ///
+ /// 根据日期获取能耗信息
+ ///
+ decimal GetEnergyMonitoringByDay(string name, DateTime dt);
}
}
diff --git a/guidescreen/GuideScreen/GuideScreen.Common/Services/Impl/PLCDeviceRecordService.cs b/guidescreen/GuideScreen/GuideScreen.Common/Services/Impl/PLCDeviceRecordService.cs
index 74a8847..4327bce 100644
--- a/guidescreen/GuideScreen/GuideScreen.Common/Services/Impl/PLCDeviceRecordService.cs
+++ b/guidescreen/GuideScreen/GuideScreen.Common/Services/Impl/PLCDeviceRecordService.cs
@@ -4,6 +4,8 @@ using GuideScreen.Common.Repositories;
using GuideScreen.Common.Repositories.Entities;
using GuideScreen.Common.Services.Models;
+using Masuit.Tools.Reflection;
+
using System;
using System.Collections.Generic;
using System.Linq;
@@ -81,12 +83,13 @@ namespace GuideScreen.Common.Services.Impl
/// 更新 设备记录信息
///
///
- public void UpdateToiletPositionRecordTotalByToday(string toiletPosition)
+ public void UpdateToiletPositionRecordTotalByToday(string toiletPosition,string note)
{
var entity = new PLCDeviceRecordDayEntity
{
DeviceName = PLCDeviceNames.ToiletPosition,
PointName = toiletPosition,
+ PointNote = note,
Day = DateTime.Now.ToString("yyyy-MM-dd")
};
var detail = this.deviceRecordRepository.GetPLCDeviceRecordDayDetail(entity);
@@ -95,7 +98,49 @@ namespace GuideScreen.Common.Services.Impl
detail = entity;
}
detail.RecordValue++;
- this.deviceRecordRepository.UpdatePLCDeviceRecordDay(entity);
+ this.deviceRecordRepository.UpdatePLCDeviceRecordDay(detail);
+ }
+
+ ///
+ /// 更新 当日能耗记录信息
+ ///
+ ///
+ ///
+ public void UpdateEnergyMonitoringByToday(string name, string note, float value)
+ {
+ var entity = new PLCDeviceRecordDayEntity
+ {
+ DeviceName = PLCDeviceNames.EnergyMonitoring,
+ PointName = name,
+ PointNote = note,
+ Day = DateTime.Now.ToString("yyyy-MM-dd")
+ };
+ var detail = this.deviceRecordRepository.GetPLCDeviceRecordDayDetail(entity);
+ if (detail == null)
+ {
+ detail = entity;
+ }
+ detail.RecordValue= Convert.ToDecimal(value);
+ this.deviceRecordRepository.UpdatePLCDeviceRecordDay(detail);
+ }
+
+ ///
+ /// 根据日期获取能耗信息
+ ///
+ public decimal GetEnergyMonitoringByDay(string name,DateTime dt)
+ {
+ var entity = new PLCDeviceRecordDayEntity
+ {
+ DeviceName = PLCDeviceNames.EnergyMonitoring,
+ PointName = name,
+ Day = dt.ToString("yyyy-MM-dd")
+ };
+ var detail = this.deviceRecordRepository.GetPLCDeviceRecordDayDetail(entity);
+ if (detail != null)
+ {
+ return detail.RecordValue;
+ }
+ return 0;
}
}
diff --git a/guidescreen/GuideScreen/GuideScreen.Common/Repositories/Impl/PLCMonitorService.cs b/guidescreen/GuideScreen/GuideScreen.Common/Services/Impl/PLCMonitorService.cs
similarity index 95%
rename from guidescreen/GuideScreen/GuideScreen.Common/Repositories/Impl/PLCMonitorService.cs
rename to guidescreen/GuideScreen/GuideScreen.Common/Services/Impl/PLCMonitorService.cs
index 6395cc6..9a30768 100644
--- a/guidescreen/GuideScreen/GuideScreen.Common/Repositories/Impl/PLCMonitorService.cs
+++ b/guidescreen/GuideScreen/GuideScreen.Common/Services/Impl/PLCMonitorService.cs
@@ -6,13 +6,14 @@ using System;
using System.CodeDom;
using System.Collections.Generic;
using System.Collections.ObjectModel;
+using System.Drawing.Drawing2D;
using System.Linq;
using System.Net;
using System.Text;
using System.Threading;
using System.Threading.Tasks;
-namespace GuideScreen.Common.Repositories.Impl
+namespace GuideScreen.Common.Services.Impl
{
///
/// PLC监控服务 实现
@@ -28,6 +29,7 @@ namespace GuideScreen.Common.Repositories.Impl
public PLCMonitorService()
{
plcPoints = new List();
+ PointMonitor();
}
///
@@ -133,7 +135,6 @@ namespace GuideScreen.Common.Repositories.Impl
return await Task.FromResult(false);
}
isRun = true;
- return await Task.FromResult(true);
}
return await Task.FromResult(true);
}
@@ -250,7 +251,11 @@ namespace GuideScreen.Common.Repositories.Impl
{
if (result.IsSuccess)
{
- point.ObjectValue = result.Content;
+ if (point.ObjectValue==null || !point.ObjectValue.Equals(result.Content))
+ {
+ point.ObjectValue = result.Content;
+ PointChnage?.Invoke(this, point);
+ }
}
else
{
diff --git a/guidescreen/GuideScreen/GuideScreen.Common/Services/Models/WeatherAirModel.cs b/guidescreen/GuideScreen/GuideScreen.Common/Services/Models/WeatherAirModel.cs
index 006158c..04f9531 100644
--- a/guidescreen/GuideScreen/GuideScreen.Common/Services/Models/WeatherAirModel.cs
+++ b/guidescreen/GuideScreen/GuideScreen.Common/Services/Models/WeatherAirModel.cs
@@ -25,6 +25,19 @@ namespace GuideScreen.Common.Models
[JsonProperty("station")]
public AirNow[] Station { get; set; }
+
+ public bool IsSuccee
+ {
+ get
+ {
+ if (Code == 200 || Code == 204)
+ {
+ return true;
+ }
+ return false;
+
+ }
+ }
}
public partial class AirNow
diff --git a/guidescreen/GuideScreen/GuideScreen.Common/Services/Models/WeatherLevelModel.cs b/guidescreen/GuideScreen/GuideScreen.Common/Services/Models/WeatherLevelModel.cs
index 49a3eb6..4e38e66 100644
--- a/guidescreen/GuideScreen/GuideScreen.Common/Services/Models/WeatherLevelModel.cs
+++ b/guidescreen/GuideScreen/GuideScreen.Common/Services/Models/WeatherLevelModel.cs
@@ -9,39 +9,51 @@ using Newtonsoft.Json.Converters;
namespace GuideScreen.Common.Models
{
- public partial class WeatherLevelModel
- {
- [JsonProperty("code")]
- public long Code { get; set; }
+ public partial class WeatherLevelModel
+ {
+ [JsonProperty("code")]
+ public long Code { get; set; }
- [JsonProperty("updateTime")]
- public string UpdateTime { get; set; }
+ [JsonProperty("updateTime")]
+ public string UpdateTime { get; set; }
- [JsonProperty("fxLink")]
- public Uri FxLink { get; set; }
+ [JsonProperty("fxLink")]
+ public Uri FxLink { get; set; }
- [JsonProperty("daily")]
- public Daily[] Daily { get; set; }
+ [JsonProperty("daily")]
+ public Daily[] Daily { get; set; }
+ public bool IsSuccee
+ {
+ get
+ {
+ if (Code == 200 || Code == 204)
+ {
+ return true;
+ }
+ return false;
+
+ }
}
+ }
- public partial class Daily
- {
- [JsonProperty("date")]
- public DateTimeOffset Date { get; set; }
+ public partial class Daily
+ {
+ [JsonProperty("date")]
+ public DateTimeOffset Date { get; set; }
- [JsonProperty("type")]
- public long Type { get; set; }
+ [JsonProperty("type")]
+ public long Type { get; set; }
- [JsonProperty("name")]
- public string Name { get; set; }
+ [JsonProperty("name")]
+ public string Name { get; set; }
- [JsonProperty("level")]
- public long Level { get; set; }
+ [JsonProperty("level")]
+ public long Level { get; set; }
- [JsonProperty("category")]
- public string Category { get; set; }
+ [JsonProperty("category")]
+ public string Category { get; set; }
- [JsonProperty("text")]
- public string Text { get; set; }
- }
+ [JsonProperty("text")]
+ public string Text { get; set; }
+ }
}
diff --git a/guidescreen/GuideScreen/GuideScreen.Common/Services/Models/WeatherModel.cs b/guidescreen/GuideScreen/GuideScreen.Common/Services/Models/WeatherModel.cs
index d72766d..646a5f1 100644
--- a/guidescreen/GuideScreen/GuideScreen.Common/Services/Models/WeatherModel.cs
+++ b/guidescreen/GuideScreen/GuideScreen.Common/Services/Models/WeatherModel.cs
@@ -23,6 +23,18 @@ namespace GuideScreen.Common.Models
[JsonProperty("now")]
public Now Now { get; set; }
+ public bool IsSuccee
+ {
+ get
+ {
+ if (Code == 200 || Code == 204)
+ {
+ return true;
+ }
+ return false;
+
+ }
+ }
}
public partial class Now
@@ -71,6 +83,7 @@ namespace GuideScreen.Common.Models
[JsonProperty("dew")]
public long Dew { get; set; }
+
}
}
diff --git a/guidescreen/GuideScreen/GuideScreen.Control/DeviceToiletPositionRecordDay.cs b/guidescreen/GuideScreen/GuideScreen.Control/DeviceToiletPositionRecordDay.cs
index d7d93f1..32dfda0 100644
--- a/guidescreen/GuideScreen/GuideScreen.Control/DeviceToiletPositionRecordDay.cs
+++ b/guidescreen/GuideScreen/GuideScreen.Control/DeviceToiletPositionRecordDay.cs
@@ -31,6 +31,8 @@ namespace GuideScreen.Control
private void DeviceRecordDay_Load(object sender, EventArgs e)
{
+ begDate.Value= DateTime.Now.AddDays(-7);
+ endDate.Value= DateTime.Now;
Query();
}
diff --git a/guidescreen/GuideScreen/GuideScreen.Control/PassengerFlowStatistics.cs b/guidescreen/GuideScreen/GuideScreen.Control/PassengerFlowStatistics.cs
index 27ebbb6..ebbae41 100644
--- a/guidescreen/GuideScreen/GuideScreen.Control/PassengerFlowStatistics.cs
+++ b/guidescreen/GuideScreen/GuideScreen.Control/PassengerFlowStatistics.cs
@@ -28,6 +28,8 @@ namespace GuideScreen.Control
private void PassengerFlowStatistics_Load(object sender, EventArgs e)
{
+ begDateTime.Value=DateTime.Now.AddDays(-7);
+ endDateTime.Value=DateTime.Now;
Query();
}
diff --git a/guidescreen/GuideScreen/GuideScreen.Control/PassengerFlowStatisticsDay.cs b/guidescreen/GuideScreen/GuideScreen.Control/PassengerFlowStatisticsDay.cs
index 8b92802..31b5846 100644
--- a/guidescreen/GuideScreen/GuideScreen.Control/PassengerFlowStatisticsDay.cs
+++ b/guidescreen/GuideScreen/GuideScreen.Control/PassengerFlowStatisticsDay.cs
@@ -44,6 +44,8 @@ namespace GuideScreen.Control
private void PassengerFlowStatisticsDay_Load(object sender, EventArgs e)
{
+ begDate.Value = DateTime.Now.AddDays(-7);
+ endDate.Value = DateTime.Now;
Query();
}
diff --git a/guidescreen/GuideScreen/GuideScreen.UI/App.config b/guidescreen/GuideScreen/GuideScreen.UI/App.config
index 26cfbcb..842678e 100644
--- a/guidescreen/GuideScreen/GuideScreen.UI/App.config
+++ b/guidescreen/GuideScreen/GuideScreen.UI/App.config
@@ -1,11 +1,11 @@
-
-
-
-
-
-
+
+
+
+
+
+
@@ -13,34 +13,34 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/guidescreen/GuideScreen/GuideScreen.UI/Controller/PLCController.cs b/guidescreen/GuideScreen/GuideScreen.UI/Controller/PLCController.cs
index a1e058d..53ccfed 100644
--- a/guidescreen/GuideScreen/GuideScreen.UI/Controller/PLCController.cs
+++ b/guidescreen/GuideScreen/GuideScreen.UI/Controller/PLCController.cs
@@ -9,6 +9,7 @@ using System.Collections.Generic;
using System.Dynamic;
using System.Linq;
using System.Net;
+using System.Runtime.Remoting.Metadata.W3cXsd2001;
using System.Text;
using System.Threading;
using System.Threading.Tasks;
@@ -83,12 +84,12 @@ namespace GuideScreen.Common.Services.Impl
{
while (true)
{
- var value = await this.plcMonitorService.StartAsync();
+ bool value = await this.plcMonitorService.StartAsync();
if (value)
{
return;
}
- Thread.Sleep(1000);
+ Thread.Sleep(3000);
}
});
}
@@ -153,7 +154,7 @@ namespace GuideScreen.Common.Services.Impl
case PLCDeviceNames.ToiletPosition:
if (e.GetValue())
{
- deviceRecordService.UpdateToiletPositionRecordTotalByToday(e.Name);
+ deviceRecordService.UpdateToiletPositionRecordTotalByToday(e.Name,e.Note);
}
break;
//记录环境信息
@@ -161,6 +162,7 @@ namespace GuideScreen.Common.Services.Impl
break;
//记录能耗信息
case PLCDeviceNames.EnergyMonitoring:
+ deviceRecordService.UpdateEnergyMonitoringByToday(e.Name, e.Note, e.GetValue());
break;
//记录正空泵信息
case PLCDeviceNames.VacuumPumpingStation:
@@ -170,6 +172,27 @@ namespace GuideScreen.Common.Services.Impl
}
}
+ ///
+ /// 获取今日用电量
+ ///
+ public float GetTodayElectricityConsumption(float total)
+ {
+ //获取昨天用电总量
+ decimal yesterday = deviceRecordService.GetEnergyMonitoringByDay(PLCPointNameByEnergyMonitoring.ElectricityConsumption,DateTime.Now.AddDays(-1));
+ //如果昨日没有记录或为0,就将当前用电量添加当昨日，防止今日用电量为0
+ if (yesterday == 0)
+ {
+ deviceRecordService.UpdateEnergyMonitoringByToday(PLCPointNameByEnergyMonitoring.ElectricityConsumption, "用电量", total);
+ return 0;
+ }
+ if (yesterday>0)
+ {
+ return total - float.Parse(yesterday.ToString());
+ }
+
+ return 0;
+ }
+
}
}
diff --git a/guidescreen/GuideScreen/GuideScreen.UI/FormScreen.Designer.cs b/guidescreen/GuideScreen/GuideScreen.UI/FormScreen.Designer.cs
index ac46b5a..75471f7 100644
--- a/guidescreen/GuideScreen/GuideScreen.UI/FormScreen.Designer.cs
+++ b/guidescreen/GuideScreen/GuideScreen.UI/FormScreen.Designer.cs
@@ -59,7 +59,7 @@ namespace GuideScreen.UI
this.pictureBox9 = new System.Windows.Forms.PictureBox();
this.pictureBox8 = new System.Windows.Forms.PictureBox();
this.pictureBox6 = new System.Windows.Forms.PictureBox();
- this.uiLabel6 = new Sunny.UI.UILabel();
+ this.lblDayWarter = new Sunny.UI.UILabel();
this.lblElectricQuantity = new Sunny.UI.UILabel();
this.uiLabel4 = new Sunny.UI.UILabel();
this.lblTime = new Sunny.UI.UILabel();
@@ -87,28 +87,32 @@ namespace GuideScreen.UI
this.uiLabel8 = new Sunny.UI.UILabel();
this.uiPanel2 = new Sunny.UI.UIPanel();
this.uiPanel6 = new Sunny.UI.UIPanel();
- this.analogMeterFrequency = new Sunny.UI.UIAnalogMeter();
- this.analogMeterElectricity = new Sunny.UI.UIAnalogMeter();
+ 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();
+ this.analogMeterElectricity1 = new Sunny.UI.UIAnalogMeter();
+ this.lblFrequency2 = new Sunny.UI.UILabel();
this.LedBulbTwoRun = new Sunny.UI.UILedBulb();
this.LedDisplayTwoTime = new Sunny.UI.UILedDisplay();
+ this.uiLabel20 = new Sunny.UI.UILabel();
this.LedDisplayTwoCount = new Sunny.UI.UILedDisplay();
this.uiLabel5 = new Sunny.UI.UILabel();
+ this.lblElectricity2 = new Sunny.UI.UILabel();
this.uiLabel7 = new Sunny.UI.UILabel();
- this.uiLabel11 = new Sunny.UI.UILabel();
+ this.uiLabel25 = new Sunny.UI.UILabel();
this.uiLabel15 = new Sunny.UI.UILabel();
this.LedBulbOneRun = new Sunny.UI.UILedBulb();
this.LedDisplayOneTime = new Sunny.UI.UILedDisplay();
+ this.uiLabel23 = new Sunny.UI.UILabel();
this.LedDisplayOneCount = new Sunny.UI.UILedDisplay();
- this.AnalogMeter = new Sunny.UI.UIAnalogMeter();
- this.lblRealTimeVacuum = new Sunny.UI.UILabel();
this.uiLabel12 = new Sunny.UI.UILabel();
this.uiLabel14 = new Sunny.UI.UILabel();
- this.uiLabel22 = new Sunny.UI.UILabel();
- this.uiLabel23 = new Sunny.UI.UILabel();
this.uiLabel1 = new Sunny.UI.UILabel();
- this.lblFrequency = new Sunny.UI.UILabel();
+ this.lblFrequency1 = new Sunny.UI.UILabel();
this.uiLabel16 = new Sunny.UI.UILabel();
- this.lblElectricity = new Sunny.UI.UILabel();
+ this.lblElectricity1 = new Sunny.UI.UILabel();
this.uiLabel10 = new Sunny.UI.UILabel();
this.uiLabel3 = new Sunny.UI.UILabel();
this.uiPanel7 = new Sunny.UI.UIPanel();
@@ -142,6 +146,7 @@ namespace GuideScreen.UI
this.timer2 = new System.Windows.Forms.Timer(this.components);
this.contextMenuStrip = new System.Windows.Forms.ContextMenuStrip(this.components);
this.toolStripMenuIClose = new System.Windows.Forms.ToolStripMenuItem();
+ this.lblweek = new Sunny.UI.UILabel();
this.uiPanel1.SuspendLayout();
((System.ComponentModel.ISupportInitialize)(this.pBoxWeatherIcon)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.pictureBox10)).BeginInit();
@@ -519,19 +524,19 @@ namespace GuideScreen.UI
this.pictureBox6.TabIndex = 10;
this.pictureBox6.TabStop = false;
//
- // uiLabel6
+ // lblDayWarter
//
- this.uiLabel6.Font = new System.Drawing.Font("微软雅黑", 14.25F, System.Drawing.FontStyle.Bold);
- this.uiLabel6.ForeColor = System.Drawing.Color.DodgerBlue;
- this.uiLabel6.Location = new System.Drawing.Point(67, 103);
- this.uiLabel6.Name = "uiLabel6";
- this.uiLabel6.Size = new System.Drawing.Size(292, 41);
- this.uiLabel6.Style = Sunny.UI.UIStyle.Custom;
- this.uiLabel6.StyleCustomMode = true;
- this.uiLabel6.TabIndex = 12;
- this.uiLabel6.Text = "今日用水量 0 0 0 2 1 吨";
- this.uiLabel6.TextAlign = System.Drawing.ContentAlignment.MiddleLeft;
- this.uiLabel6.ZoomScaleRect = new System.Drawing.Rectangle(0, 0, 0, 0);
+ this.lblDayWarter.Font = new System.Drawing.Font("微软雅黑", 14.25F, System.Drawing.FontStyle.Bold);
+ this.lblDayWarter.ForeColor = System.Drawing.Color.DodgerBlue;
+ this.lblDayWarter.Location = new System.Drawing.Point(67, 103);
+ this.lblDayWarter.Name = "lblDayWarter";
+ this.lblDayWarter.Size = new System.Drawing.Size(292, 41);
+ this.lblDayWarter.Style = Sunny.UI.UIStyle.Custom;
+ this.lblDayWarter.StyleCustomMode = true;
+ this.lblDayWarter.TabIndex = 12;
+ this.lblDayWarter.Text = "今日用水量 0 . 0 0 1 吨 ";
+ this.lblDayWarter.TextAlign = System.Drawing.ContentAlignment.MiddleLeft;
+ this.lblDayWarter.ZoomScaleRect = new System.Drawing.Rectangle(0, 0, 0, 0);
//
// lblElectricQuantity
//
@@ -544,7 +549,7 @@ namespace GuideScreen.UI
this.lblElectricQuantity.Style = Sunny.UI.UIStyle.Custom;
this.lblElectricQuantity.StyleCustomMode = true;
this.lblElectricQuantity.TabIndex = 10;
- this.lblElectricQuantity.Text = "今日耗电量 0 0 0 3 8 千瓦时";
+ this.lblElectricQuantity.Text = "今日耗电量 0 0 0 0 8 千瓦时";
this.lblElectricQuantity.TextAlign = System.Drawing.ContentAlignment.MiddleLeft;
this.lblElectricQuantity.ZoomScaleRect = new System.Drawing.Rectangle(0, 0, 0, 0);
//
@@ -568,7 +573,7 @@ namespace GuideScreen.UI
this.lblTime.BackColor = System.Drawing.Color.Transparent;
this.lblTime.Font = new System.Drawing.Font("楷体", 18F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.lblTime.ForeColor = System.Drawing.Color.White;
- this.lblTime.Location = new System.Drawing.Point(1593, 35);
+ this.lblTime.Location = new System.Drawing.Point(1593, 11);
this.lblTime.Name = "lblTime";
this.lblTime.Size = new System.Drawing.Size(276, 38);
this.lblTime.Style = Sunny.UI.UIStyle.Custom;
@@ -589,6 +594,7 @@ namespace GuideScreen.UI
this.uiPanel3.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left)
| System.Windows.Forms.AnchorStyles.Right)));
this.uiPanel3.BackgroundImage = ((System.Drawing.Image)(resources.GetObject("uiPanel3.BackgroundImage")));
+ this.uiPanel3.Controls.Add(this.lblweek);
this.uiPanel3.Controls.Add(this.uiLabel9);
this.uiPanel3.Controls.Add(this.pictureBox17);
this.uiPanel3.Controls.Add(this.lblTitle);
@@ -910,7 +916,7 @@ namespace GuideScreen.UI
this.uiPanel2.Controls.Add(this.uiLabel21);
this.uiPanel2.Controls.Add(this.uiLabel4);
this.uiPanel2.Controls.Add(this.lblElectricityMeter);
- this.uiPanel2.Controls.Add(this.uiLabel6);
+ this.uiPanel2.Controls.Add(this.lblDayWarter);
this.uiPanel2.Controls.Add(this.uiLabel18);
this.uiPanel2.Controls.Add(this.pictureBox6);
this.uiPanel2.Controls.Add(this.pictureBox10);
@@ -936,28 +942,32 @@ 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.analogMeterFrequency);
- this.uiPanel6.Controls.Add(this.analogMeterElectricity);
+ 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);
+ this.uiPanel6.Controls.Add(this.analogMeterElectricity1);
+ this.uiPanel6.Controls.Add(this.lblFrequency2);
this.uiPanel6.Controls.Add(this.LedBulbTwoRun);
this.uiPanel6.Controls.Add(this.LedDisplayTwoTime);
+ this.uiPanel6.Controls.Add(this.uiLabel20);
this.uiPanel6.Controls.Add(this.LedDisplayTwoCount);
this.uiPanel6.Controls.Add(this.uiLabel5);
+ this.uiPanel6.Controls.Add(this.lblElectricity2);
this.uiPanel6.Controls.Add(this.uiLabel7);
- this.uiPanel6.Controls.Add(this.uiLabel11);
+ this.uiPanel6.Controls.Add(this.uiLabel25);
this.uiPanel6.Controls.Add(this.uiLabel15);
this.uiPanel6.Controls.Add(this.LedBulbOneRun);
this.uiPanel6.Controls.Add(this.LedDisplayOneTime);
+ this.uiPanel6.Controls.Add(this.uiLabel23);
this.uiPanel6.Controls.Add(this.LedDisplayOneCount);
- this.uiPanel6.Controls.Add(this.AnalogMeter);
- this.uiPanel6.Controls.Add(this.lblRealTimeVacuum);
this.uiPanel6.Controls.Add(this.uiLabel12);
this.uiPanel6.Controls.Add(this.uiLabel14);
- this.uiPanel6.Controls.Add(this.uiLabel22);
- this.uiPanel6.Controls.Add(this.uiLabel23);
this.uiPanel6.Controls.Add(this.uiLabel1);
- this.uiPanel6.Controls.Add(this.lblFrequency);
+ this.uiPanel6.Controls.Add(this.lblFrequency1);
this.uiPanel6.Controls.Add(this.uiLabel16);
- this.uiPanel6.Controls.Add(this.lblElectricity);
+ this.uiPanel6.Controls.Add(this.lblElectricity1);
this.uiPanel6.Controls.Add(this.uiLabel10);
this.uiPanel6.Controls.Add(this.uiLabel3);
this.uiPanel6.FillColor = System.Drawing.Color.Empty;
@@ -975,54 +985,153 @@ namespace GuideScreen.UI
this.uiPanel6.TextAlignment = System.Drawing.ContentAlignment.MiddleCenter;
this.uiPanel6.ZoomScaleRect = new System.Drawing.Rectangle(0, 0, 0, 0);
//
- // analogMeterFrequency
- //
- this.analogMeterFrequency.BackColor = System.Drawing.Color.Transparent;
- this.analogMeterFrequency.Font = new System.Drawing.Font("微软雅黑", 14.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
- this.analogMeterFrequency.Location = new System.Drawing.Point(252, 129);
- this.analogMeterFrequency.MaxValue = 100D;
- this.analogMeterFrequency.MinimumSize = new System.Drawing.Size(1, 1);
- this.analogMeterFrequency.MinValue = 0D;
- this.analogMeterFrequency.Name = "analogMeterFrequency";
- this.analogMeterFrequency.NeedleColor = System.Drawing.Color.DodgerBlue;
- this.analogMeterFrequency.RectSize = 2;
- this.analogMeterFrequency.Renderer = null;
- this.analogMeterFrequency.ScaleDivisions = 10;
- this.analogMeterFrequency.ScaleSubDivisions = 5;
- this.analogMeterFrequency.Size = new System.Drawing.Size(98, 92);
- this.analogMeterFrequency.Style = Sunny.UI.UIStyle.Custom;
- this.analogMeterFrequency.TabIndex = 123;
- this.analogMeterFrequency.Text = "uiAnalogMeter2";
- this.analogMeterFrequency.Value = 40D;
- this.analogMeterFrequency.ZoomScaleRect = new System.Drawing.Rectangle(0, 0, 0, 0);
- //
- // analogMeterElectricity
- //
- this.analogMeterElectricity.BackColor = System.Drawing.Color.Transparent;
- this.analogMeterElectricity.Font = new System.Drawing.Font("微软雅黑", 14.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
- this.analogMeterElectricity.Location = new System.Drawing.Point(140, 129);
- this.analogMeterElectricity.MaxValue = 10D;
- this.analogMeterElectricity.MinimumSize = new System.Drawing.Size(1, 1);
- this.analogMeterElectricity.MinValue = 0D;
- this.analogMeterElectricity.Name = "analogMeterElectricity";
- this.analogMeterElectricity.NeedleColor = System.Drawing.Color.LightGreen;
- this.analogMeterElectricity.RectSize = 2;
- this.analogMeterElectricity.Renderer = null;
- this.analogMeterElectricity.ScaleDivisions = 10;
- this.analogMeterElectricity.ScaleSubDivisions = 5;
- this.analogMeterElectricity.Size = new System.Drawing.Size(98, 92);
- this.analogMeterElectricity.Style = Sunny.UI.UIStyle.Custom;
- this.analogMeterElectricity.TabIndex = 122;
- this.analogMeterElectricity.Text = "uiAnalogMeter1";
- this.analogMeterElectricity.Value = 10D;
- this.analogMeterElectricity.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.Name = "uiLabel11";
+ this.uiLabel11.Size = new System.Drawing.Size(18, 37);
+ this.uiLabel11.Style = Sunny.UI.UIStyle.Custom;
+ this.uiLabel11.StyleCustomMode = true;
+ this.uiLabel11.TabIndex = 108;
+ this.uiLabel11.Text = "-";
+ 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;
+ this.analogMeterFrequency2.Font = new System.Drawing.Font("微软雅黑", 14.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+ this.analogMeterFrequency2.Location = new System.Drawing.Point(248, 438);
+ this.analogMeterFrequency2.MaxValue = 100D;
+ this.analogMeterFrequency2.MinimumSize = new System.Drawing.Size(1, 1);
+ this.analogMeterFrequency2.MinValue = 0D;
+ this.analogMeterFrequency2.Name = "analogMeterFrequency2";
+ this.analogMeterFrequency2.NeedleColor = System.Drawing.Color.DodgerBlue;
+ this.analogMeterFrequency2.RectSize = 2;
+ this.analogMeterFrequency2.Renderer = null;
+ this.analogMeterFrequency2.ScaleDivisions = 10;
+ this.analogMeterFrequency2.ScaleSubDivisions = 5;
+ this.analogMeterFrequency2.Size = new System.Drawing.Size(98, 92);
+ this.analogMeterFrequency2.Style = Sunny.UI.UIStyle.Custom;
+ this.analogMeterFrequency2.TabIndex = 129;
+ this.analogMeterFrequency2.Text = "uiAnalogMeter2";
+ this.analogMeterFrequency2.Value = 40D;
+ this.analogMeterFrequency2.ZoomScaleRect = new System.Drawing.Rectangle(0, 0, 0, 0);
+ //
+ // analogMeterElectricity2
+ //
+ 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.MaxValue = 10D;
+ this.analogMeterElectricity2.MinimumSize = new System.Drawing.Size(1, 1);
+ this.analogMeterElectricity2.MinValue = 0D;
+ this.analogMeterElectricity2.Name = "analogMeterElectricity2";
+ this.analogMeterElectricity2.NeedleColor = System.Drawing.Color.LightGreen;
+ this.analogMeterElectricity2.RectSize = 2;
+ this.analogMeterElectricity2.Renderer = null;
+ this.analogMeterElectricity2.ScaleDivisions = 10;
+ this.analogMeterElectricity2.ScaleSubDivisions = 5;
+ this.analogMeterElectricity2.Size = new System.Drawing.Size(98, 92);
+ this.analogMeterElectricity2.Style = Sunny.UI.UIStyle.Custom;
+ this.analogMeterElectricity2.TabIndex = 128;
+ this.analogMeterElectricity2.Text = "uiAnalogMeter1";
+ this.analogMeterElectricity2.Value = 10D;
+ this.analogMeterElectricity2.ZoomScaleRect = new System.Drawing.Rectangle(0, 0, 0, 0);
+ //
+ // analogMeterFrequency1
+ //
+ this.analogMeterFrequency1.BackColor = System.Drawing.Color.Transparent;
+ this.analogMeterFrequency1.Font = new System.Drawing.Font("微软雅黑", 14.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+ this.analogMeterFrequency1.Location = new System.Drawing.Point(248, 126);
+ this.analogMeterFrequency1.MaxValue = 100D;
+ this.analogMeterFrequency1.MinimumSize = new System.Drawing.Size(1, 1);
+ this.analogMeterFrequency1.MinValue = 0D;
+ this.analogMeterFrequency1.Name = "analogMeterFrequency1";
+ this.analogMeterFrequency1.NeedleColor = System.Drawing.Color.DodgerBlue;
+ this.analogMeterFrequency1.RectSize = 2;
+ this.analogMeterFrequency1.Renderer = null;
+ this.analogMeterFrequency1.ScaleDivisions = 10;
+ this.analogMeterFrequency1.ScaleSubDivisions = 5;
+ this.analogMeterFrequency1.Size = new System.Drawing.Size(98, 92);
+ this.analogMeterFrequency1.Style = Sunny.UI.UIStyle.Custom;
+ this.analogMeterFrequency1.TabIndex = 123;
+ this.analogMeterFrequency1.Text = "uiAnalogMeter2";
+ this.analogMeterFrequency1.Value = 40D;
+ this.analogMeterFrequency1.ZoomScaleRect = new System.Drawing.Rectangle(0, 0, 0, 0);
+ //
+ // analogMeterElectricity1
+ //
+ 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.MaxValue = 10D;
+ this.analogMeterElectricity1.MinimumSize = new System.Drawing.Size(1, 1);
+ this.analogMeterElectricity1.MinValue = 0D;
+ this.analogMeterElectricity1.Name = "analogMeterElectricity1";
+ this.analogMeterElectricity1.NeedleColor = System.Drawing.Color.LightGreen;
+ this.analogMeterElectricity1.RectSize = 2;
+ this.analogMeterElectricity1.Renderer = null;
+ this.analogMeterElectricity1.ScaleDivisions = 10;
+ this.analogMeterElectricity1.ScaleSubDivisions = 5;
+ this.analogMeterElectricity1.Size = new System.Drawing.Size(98, 92);
+ this.analogMeterElectricity1.Style = Sunny.UI.UIStyle.Custom;
+ this.analogMeterElectricity1.TabIndex = 122;
+ this.analogMeterElectricity1.Text = "uiAnalogMeter1";
+ this.analogMeterElectricity1.Value = 10D;
+ this.analogMeterElectricity1.ZoomScaleRect = new System.Drawing.Rectangle(0, 0, 0, 0);
+ //
+ // lblFrequency2
+ //
+ this.lblFrequency2.Font = new System.Drawing.Font("微软雅黑", 15F, System.Drawing.FontStyle.Bold);
+ this.lblFrequency2.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(18)))), ((int)(((byte)(150)))), ((int)(((byte)(219)))));
+ this.lblFrequency2.Location = new System.Drawing.Point(260, 531);
+ this.lblFrequency2.Name = "lblFrequency2";
+ this.lblFrequency2.Size = new System.Drawing.Size(75, 26);
+ this.lblFrequency2.Style = Sunny.UI.UIStyle.Custom;
+ this.lblFrequency2.StyleCustomMode = true;
+ this.lblFrequency2.TabIndex = 127;
+ this.lblFrequency2.Text = "41 HZ";
+ this.lblFrequency2.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
+ this.lblFrequency2.ZoomScaleRect = new System.Drawing.Rectangle(0, 0, 0, 0);
//
// LedBulbTwoRun
//
- this.LedBulbTwoRun.Color = System.Drawing.Color.Red;
- this.LedBulbTwoRun.Location = new System.Drawing.Point(42, 572);
+ this.LedBulbTwoRun.Color = System.Drawing.Color.Gray;
+ this.LedBulbTwoRun.Location = new System.Drawing.Point(305, 356);
this.LedBulbTwoRun.Name = "LedBulbTwoRun";
- this.LedBulbTwoRun.Size = new System.Drawing.Size(41, 34);
+ this.LedBulbTwoRun.Size = new System.Drawing.Size(39, 34);
this.LedBulbTwoRun.TabIndex = 115;
this.LedBulbTwoRun.Text = "uiLedBulb";
this.LedBulbTwoRun.ZoomScaleRect = new System.Drawing.Rectangle(0, 0, 0, 0);
@@ -1034,12 +1143,26 @@ 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(110, 572);
+ this.LedDisplayTwoTime.Location = new System.Drawing.Point(125, 605);
this.LedDisplayTwoTime.Name = "LedDisplayTwoTime";
this.LedDisplayTwoTime.Size = new System.Drawing.Size(118, 34);
this.LedDisplayTwoTime.TabIndex = 121;
this.LedDisplayTwoTime.Text = "00001H";
//
+ // uiLabel20
+ //
+ 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.Name = "uiLabel20";
+ this.uiLabel20.Size = new System.Drawing.Size(84, 26);
+ this.uiLabel20.Style = Sunny.UI.UIStyle.Custom;
+ this.uiLabel20.StyleCustomMode = true;
+ this.uiLabel20.TabIndex = 126;
+ this.uiLabel20.Text = "频率";
+ this.uiLabel20.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
+ this.uiLabel20.ZoomScaleRect = new System.Drawing.Rectangle(0, 0, 0, 0);
+ //
// LedDisplayTwoCount
//
this.LedDisplayTwoCount.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(21)))), ((int)(((byte)(36)))), ((int)(((byte)(59)))));
@@ -1047,7 +1170,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(241, 572);
+ this.LedDisplayTwoCount.Location = new System.Drawing.Point(238, 605);
this.LedDisplayTwoCount.Name = "LedDisplayTwoCount";
this.LedDisplayTwoCount.Size = new System.Drawing.Size(118, 34);
this.LedDisplayTwoCount.TabIndex = 118;
@@ -1057,7 +1180,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(120, 528);
+ this.uiLabel5.Location = new System.Drawing.Point(136, 561);
this.uiLabel5.Name = "uiLabel5";
this.uiLabel5.Size = new System.Drawing.Size(96, 35);
this.uiLabel5.Style = Sunny.UI.UIStyle.Custom;
@@ -1067,11 +1190,25 @@ namespace GuideScreen.UI
this.uiLabel5.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
this.uiLabel5.ZoomScaleRect = new System.Drawing.Rectangle(0, 0, 0, 0);
//
+ // lblElectricity2
+ //
+ 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.Name = "lblElectricity2";
+ this.lblElectricity2.Size = new System.Drawing.Size(75, 26);
+ this.lblElectricity2.Style = Sunny.UI.UIStyle.Custom;
+ this.lblElectricity2.StyleCustomMode = true;
+ this.lblElectricity2.TabIndex = 125;
+ this.lblElectricity2.Text = "2 A";
+ this.lblElectricity2.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
+ this.lblElectricity2.ZoomScaleRect = new System.Drawing.Rectangle(0, 0, 0, 0);
+ //
// uiLabel7
//
this.uiLabel7.Font = new System.Drawing.Font("微软雅黑", 15F, System.Drawing.FontStyle.Bold);
this.uiLabel7.ForeColor = System.Drawing.Color.White;
- this.uiLabel7.Location = new System.Drawing.Point(247, 528);
+ this.uiLabel7.Location = new System.Drawing.Point(250, 561);
this.uiLabel7.Name = "uiLabel7";
this.uiLabel7.Size = new System.Drawing.Size(94, 35);
this.uiLabel7.Style = Sunny.UI.UIStyle.Custom;
@@ -1081,27 +1218,27 @@ namespace GuideScreen.UI
this.uiLabel7.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
this.uiLabel7.ZoomScaleRect = new System.Drawing.Rectangle(0, 0, 0, 0);
//
- // uiLabel11
+ // uiLabel25
//
- this.uiLabel11.Font = new System.Drawing.Font("微软雅黑", 15F, System.Drawing.FontStyle.Bold);
- this.uiLabel11.ForeColor = System.Drawing.Color.White;
- this.uiLabel11.Location = new System.Drawing.Point(17, 532);
- this.uiLabel11.Name = "uiLabel11";
- this.uiLabel11.Size = new System.Drawing.Size(84, 26);
- this.uiLabel11.Style = Sunny.UI.UIStyle.Custom;
- this.uiLabel11.StyleCustomMode = true;
- this.uiLabel11.TabIndex = 117;
- this.uiLabel11.Text = "状态";
- this.uiLabel11.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
- this.uiLabel11.ZoomScaleRect = new System.Drawing.Rectangle(0, 0, 0, 0);
+ 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.Name = "uiLabel25";
+ this.uiLabel25.Size = new System.Drawing.Size(84, 26);
+ this.uiLabel25.Style = Sunny.UI.UIStyle.Custom;
+ this.uiLabel25.StyleCustomMode = true;
+ this.uiLabel25.TabIndex = 124;
+ this.uiLabel25.Text = "电流";
+ this.uiLabel25.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
+ this.uiLabel25.ZoomScaleRect = new System.Drawing.Rectangle(0, 0, 0, 0);
//
// uiLabel15
//
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(12, 475);
+ this.uiLabel15.Location = new System.Drawing.Point(127, 352);
this.uiLabel15.Name = "uiLabel15";
- this.uiLabel15.Size = new System.Drawing.Size(357, 40);
+ this.uiLabel15.Size = new System.Drawing.Size(206, 40);
this.uiLabel15.Style = Sunny.UI.UIStyle.Custom;
this.uiLabel15.StyleCustomMode = true;
this.uiLabel15.TabIndex = 116;
@@ -1111,8 +1248,8 @@ namespace GuideScreen.UI
//
// LedBulbOneRun
//
- this.LedBulbOneRun.Color = System.Drawing.Color.Red;
- this.LedBulbOneRun.Location = new System.Drawing.Point(36, 400);
+ this.LedBulbOneRun.Color = System.Drawing.Color.Gray;
+ this.LedBulbOneRun.Location = new System.Drawing.Point(299, 47);
this.LedBulbOneRun.Name = "LedBulbOneRun";
this.LedBulbOneRun.Size = new System.Drawing.Size(41, 34);
this.LedBulbOneRun.TabIndex = 62;
@@ -1126,12 +1263,26 @@ 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(104, 400);
+ this.LedDisplayOneTime.Location = new System.Drawing.Point(125, 315);
this.LedDisplayOneTime.Name = "LedDisplayOneTime";
this.LedDisplayOneTime.Size = new System.Drawing.Size(118, 34);
this.LedDisplayOneTime.TabIndex = 114;
this.LedDisplayOneTime.Text = "00001H";
//
+ // uiLabel23
+ //
+ 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.Name = "uiLabel23";
+ this.uiLabel23.Size = new System.Drawing.Size(114, 37);
+ this.uiLabel23.Style = Sunny.UI.UIStyle.Custom;
+ this.uiLabel23.StyleCustomMode = true;
+ this.uiLabel23.TabIndex = 22;
+ this.uiLabel23.Text = "实时真空度";
+ this.uiLabel23.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
+ this.uiLabel23.ZoomScaleRect = new System.Drawing.Rectangle(0, 0, 0, 0);
+ //
// LedDisplayOneCount
//
this.LedDisplayOneCount.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(21)))), ((int)(((byte)(36)))), ((int)(((byte)(59)))));
@@ -1139,51 +1290,17 @@ namespace GuideScreen.UI
this.LedDisplayOneCount.BorderInColor = System.Drawing.Color.FromArgb(((int)(((byte)(21)))), ((int)(((byte)(36)))), ((int)(((byte)(59)))));
this.LedDisplayOneCount.CharCount = 6;
this.LedDisplayOneCount.ForeColor = System.Drawing.Color.Lime;
- this.LedDisplayOneCount.Location = new System.Drawing.Point(235, 400);
+ this.LedDisplayOneCount.Location = new System.Drawing.Point(240, 315);
this.LedDisplayOneCount.Name = "LedDisplayOneCount";
this.LedDisplayOneCount.Size = new System.Drawing.Size(118, 34);
this.LedDisplayOneCount.TabIndex = 111;
this.LedDisplayOneCount.Text = "000001";
//
- // AnalogMeter
- //
- this.AnalogMeter.BackColor = System.Drawing.Color.Transparent;
- this.AnalogMeter.Font = new System.Drawing.Font("微软雅黑", 14.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
- this.AnalogMeter.Location = new System.Drawing.Point(26, 129);
- this.AnalogMeter.MaxValue = 100D;
- this.AnalogMeter.MinimumSize = new System.Drawing.Size(1, 1);
- this.AnalogMeter.MinValue = 0D;
- this.AnalogMeter.Name = "AnalogMeter";
- this.AnalogMeter.RectSize = 2;
- this.AnalogMeter.Renderer = null;
- this.AnalogMeter.ScaleDivisions = 10;
- this.AnalogMeter.ScaleSubDivisions = 5;
- this.AnalogMeter.Size = new System.Drawing.Size(98, 92);
- this.AnalogMeter.Style = Sunny.UI.UIStyle.Custom;
- this.AnalogMeter.TabIndex = 107;
- this.AnalogMeter.Text = "uiAnalogMeter1";
- this.AnalogMeter.Value = 40D;
- this.AnalogMeter.ZoomScaleRect = new System.Drawing.Rectangle(0, 0, 0, 0);
- //
- // lblRealTimeVacuum
- //
- this.lblRealTimeVacuum.Font = new System.Drawing.Font("微软雅黑", 15F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
- this.lblRealTimeVacuum.ForeColor = System.Drawing.Color.Yellow;
- this.lblRealTimeVacuum.Location = new System.Drawing.Point(17, 232);
- this.lblRealTimeVacuum.Name = "lblRealTimeVacuum";
- this.lblRealTimeVacuum.Size = new System.Drawing.Size(116, 33);
- this.lblRealTimeVacuum.Style = Sunny.UI.UIStyle.Custom;
- this.lblRealTimeVacuum.StyleCustomMode = true;
- this.lblRealTimeVacuum.TabIndex = 22;
- this.lblRealTimeVacuum.Text = "-40 KPa";
- this.lblRealTimeVacuum.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
- this.lblRealTimeVacuum.ZoomScaleRect = new System.Drawing.Rectangle(0, 0, 0, 0);
- //
// uiLabel12
//
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(114, 356);
+ this.uiLabel12.Location = new System.Drawing.Point(136, 272);
this.uiLabel12.Name = "uiLabel12";
this.uiLabel12.Size = new System.Drawing.Size(96, 35);
this.uiLabel12.Style = Sunny.UI.UIStyle.Custom;
@@ -1197,7 +1314,7 @@ namespace GuideScreen.UI
//
this.uiLabel14.Font = new System.Drawing.Font("微软雅黑", 15F, System.Drawing.FontStyle.Bold);
this.uiLabel14.ForeColor = System.Drawing.Color.White;
- this.uiLabel14.Location = new System.Drawing.Point(241, 356);
+ this.uiLabel14.Location = new System.Drawing.Point(250, 266);
this.uiLabel14.Name = "uiLabel14";
this.uiLabel14.Size = new System.Drawing.Size(94, 35);
this.uiLabel14.Style = Sunny.UI.UIStyle.Custom;
@@ -1207,41 +1324,13 @@ namespace GuideScreen.UI
this.uiLabel14.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
this.uiLabel14.ZoomScaleRect = new System.Drawing.Rectangle(0, 0, 0, 0);
//
- // uiLabel22
- //
- this.uiLabel22.Font = new System.Drawing.Font("微软雅黑", 15F, System.Drawing.FontStyle.Bold);
- this.uiLabel22.ForeColor = System.Drawing.Color.White;
- this.uiLabel22.Location = new System.Drawing.Point(11, 360);
- this.uiLabel22.Name = "uiLabel22";
- this.uiLabel22.Size = new System.Drawing.Size(84, 26);
- this.uiLabel22.Style = Sunny.UI.UIStyle.Custom;
- this.uiLabel22.StyleCustomMode = true;
- this.uiLabel22.TabIndex = 93;
- this.uiLabel22.Text = "状态";
- this.uiLabel22.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
- this.uiLabel22.ZoomScaleRect = new System.Drawing.Rectangle(0, 0, 0, 0);
- //
- // uiLabel23
- //
- 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(18, 79);
- this.uiLabel23.Name = "uiLabel23";
- this.uiLabel23.Size = new System.Drawing.Size(114, 37);
- this.uiLabel23.Style = Sunny.UI.UIStyle.Custom;
- this.uiLabel23.StyleCustomMode = true;
- this.uiLabel23.TabIndex = 22;
- this.uiLabel23.Text = "实时真空度";
- this.uiLabel23.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
- this.uiLabel23.ZoomScaleRect = new System.Drawing.Rectangle(0, 0, 0, 0);
- //
// uiLabel1
//
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(6, 306);
+ this.uiLabel1.Location = new System.Drawing.Point(116, 44);
this.uiLabel1.Name = "uiLabel1";
- this.uiLabel1.Size = new System.Drawing.Size(357, 40);
+ this.uiLabel1.Size = new System.Drawing.Size(211, 40);
this.uiLabel1.Style = Sunny.UI.UIStyle.Custom;
this.uiLabel1.StyleCustomMode = true;
this.uiLabel1.TabIndex = 91;
@@ -1249,25 +1338,25 @@ namespace GuideScreen.UI
this.uiLabel1.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
this.uiLabel1.ZoomScaleRect = new System.Drawing.Rectangle(0, 0, 0, 0);
//
- // lblFrequency
+ // lblFrequency1
//
- this.lblFrequency.Font = new System.Drawing.Font("微软雅黑", 15F, System.Drawing.FontStyle.Bold);
- this.lblFrequency.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(18)))), ((int)(((byte)(150)))), ((int)(((byte)(219)))));
- this.lblFrequency.Location = new System.Drawing.Point(264, 232);
- this.lblFrequency.Name = "lblFrequency";
- this.lblFrequency.Size = new System.Drawing.Size(75, 26);
- this.lblFrequency.Style = Sunny.UI.UIStyle.Custom;
- this.lblFrequency.StyleCustomMode = true;
- this.lblFrequency.TabIndex = 90;
- this.lblFrequency.Text = "41 HZ";
- this.lblFrequency.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
- this.lblFrequency.ZoomScaleRect = new System.Drawing.Rectangle(0, 0, 0, 0);
+ this.lblFrequency1.Font = new System.Drawing.Font("微软雅黑", 15F, System.Drawing.FontStyle.Bold);
+ this.lblFrequency1.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(18)))), ((int)(((byte)(150)))), ((int)(((byte)(219)))));
+ this.lblFrequency1.Location = new System.Drawing.Point(260, 228);
+ this.lblFrequency1.Name = "lblFrequency1";
+ this.lblFrequency1.Size = new System.Drawing.Size(75, 26);
+ this.lblFrequency1.Style = Sunny.UI.UIStyle.Custom;
+ this.lblFrequency1.StyleCustomMode = true;
+ this.lblFrequency1.TabIndex = 90;
+ this.lblFrequency1.Text = "41 HZ";
+ this.lblFrequency1.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
+ this.lblFrequency1.ZoomScaleRect = new System.Drawing.Rectangle(0, 0, 0, 0);
//
// uiLabel16
//
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(259, 84);
+ this.uiLabel16.Location = new System.Drawing.Point(255, 94);
this.uiLabel16.Name = "uiLabel16";
this.uiLabel16.Size = new System.Drawing.Size(84, 26);
this.uiLabel16.Style = Sunny.UI.UIStyle.Custom;
@@ -1277,25 +1366,25 @@ namespace GuideScreen.UI
this.uiLabel16.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
this.uiLabel16.ZoomScaleRect = new System.Drawing.Rectangle(0, 0, 0, 0);
//
- // lblElectricity
+ // lblElectricity1
//
- this.lblElectricity.Font = new System.Drawing.Font("微软雅黑", 15F, System.Drawing.FontStyle.Bold);
- this.lblElectricity.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(109)))), ((int)(((byte)(212)))), ((int)(((byte)(0)))));
- this.lblElectricity.Location = new System.Drawing.Point(152, 235);
- this.lblElectricity.Name = "lblElectricity";
- this.lblElectricity.Size = new System.Drawing.Size(75, 26);
- this.lblElectricity.Style = Sunny.UI.UIStyle.Custom;
- this.lblElectricity.StyleCustomMode = true;
- this.lblElectricity.TabIndex = 88;
- this.lblElectricity.Text = "2 A";
- this.lblElectricity.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
- this.lblElectricity.ZoomScaleRect = new System.Drawing.Rectangle(0, 0, 0, 0);
+ 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.Name = "lblElectricity1";
+ this.lblElectricity1.Size = new System.Drawing.Size(75, 26);
+ this.lblElectricity1.Style = Sunny.UI.UIStyle.Custom;
+ this.lblElectricity1.StyleCustomMode = true;
+ this.lblElectricity1.TabIndex = 88;
+ this.lblElectricity1.Text = "2 A";
+ this.lblElectricity1.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
+ this.lblElectricity1.ZoomScaleRect = new System.Drawing.Rectangle(0, 0, 0, 0);
//
// uiLabel10
//
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(147, 84);
+ this.uiLabel10.Location = new System.Drawing.Point(142, 94);
this.uiLabel10.Name = "uiLabel10";
this.uiLabel10.Size = new System.Drawing.Size(84, 26);
this.uiLabel10.Style = Sunny.UI.UIStyle.Custom;
@@ -1372,7 +1461,7 @@ namespace GuideScreen.UI
this.uiSmoothLabel8.Font = new System.Drawing.Font("微软雅黑", 24F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.uiSmoothLabel8.Location = new System.Drawing.Point(719, 371);
this.uiSmoothLabel8.Name = "uiSmoothLabel8";
- this.uiSmoothLabel8.RectColor = System.Drawing.Color.Red;
+ this.uiSmoothLabel8.RectColor = System.Drawing.Color.FromArgb(((int)(((byte)(255)))), ((int)(((byte)(255)))), ((int)(((byte)(192)))));
this.uiSmoothLabel8.Size = new System.Drawing.Size(21, 39);
this.uiSmoothLabel8.Style = Sunny.UI.UIStyle.Custom;
this.uiSmoothLabel8.StyleCustomMode = true;
@@ -1386,7 +1475,7 @@ namespace GuideScreen.UI
this.uiSmoothLabel7.Font = new System.Drawing.Font("微软雅黑", 24F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.uiSmoothLabel7.Location = new System.Drawing.Point(718, 248);
this.uiSmoothLabel7.Name = "uiSmoothLabel7";
- this.uiSmoothLabel7.RectColor = System.Drawing.Color.Red;
+ this.uiSmoothLabel7.RectColor = System.Drawing.Color.FromArgb(((int)(((byte)(255)))), ((int)(((byte)(255)))), ((int)(((byte)(192)))));
this.uiSmoothLabel7.Size = new System.Drawing.Size(21, 42);
this.uiSmoothLabel7.Style = Sunny.UI.UIStyle.Custom;
this.uiSmoothLabel7.StyleCustomMode = true;
@@ -1400,7 +1489,7 @@ namespace GuideScreen.UI
this.uiSmoothLabel6.Font = new System.Drawing.Font("微软雅黑", 24F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.uiSmoothLabel6.Location = new System.Drawing.Point(717, 136);
this.uiSmoothLabel6.Name = "uiSmoothLabel6";
- this.uiSmoothLabel6.RectColor = System.Drawing.Color.Red;
+ this.uiSmoothLabel6.RectColor = System.Drawing.Color.FromArgb(((int)(((byte)(255)))), ((int)(((byte)(255)))), ((int)(((byte)(192)))));
this.uiSmoothLabel6.Size = new System.Drawing.Size(21, 42);
this.uiSmoothLabel6.Style = Sunny.UI.UIStyle.Custom;
this.uiSmoothLabel6.StyleCustomMode = true;
@@ -1690,7 +1779,7 @@ namespace GuideScreen.UI
// timer2
//
this.timer2.Enabled = true;
- this.timer2.Interval = 300000;
+ this.timer2.Interval = 1800000;
this.timer2.Tick += new System.EventHandler(this.timer2_Tick);
//
// contextMenuStrip
@@ -1707,6 +1796,21 @@ namespace GuideScreen.UI
this.toolStripMenuIClose.Size = new System.Drawing.Size(100, 22);
this.toolStripMenuIClose.Text = "关闭";
//
+ // lblweek
+ //
+ this.lblweek.BackColor = System.Drawing.Color.Transparent;
+ this.lblweek.Font = new System.Drawing.Font("楷体", 18F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+ this.lblweek.ForeColor = System.Drawing.Color.White;
+ this.lblweek.Location = new System.Drawing.Point(1673, 49);
+ this.lblweek.Name = "lblweek";
+ this.lblweek.Size = new System.Drawing.Size(97, 38);
+ this.lblweek.Style = Sunny.UI.UIStyle.Custom;
+ this.lblweek.StyleCustomMode = true;
+ this.lblweek.TabIndex = 24;
+ this.lblweek.Text = "星期五";
+ this.lblweek.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
+ this.lblweek.ZoomScaleRect = new System.Drawing.Rectangle(0, 0, 0, 0);
+ //
// FormScreen
//
this.AllowShowTitle = false;
@@ -1781,7 +1885,7 @@ namespace GuideScreen.UI
private Sunny.UI.UILabel uiLabel3;
private Sunny.UI.UIPanel uiPanel7;
private Sunny.UI.UILabel lblElectricQuantity;
- private Sunny.UI.UILabel uiLabel6;
+ private Sunny.UI.UILabel lblDayWarter;
private PictureBox pictureBox2;
private PictureBox pictureBox3;
private PictureBox pBoxManPit1;
@@ -1839,15 +1943,12 @@ namespace GuideScreen.UI
private PictureBox pictureBox17;
private ContextMenuStrip contextMenuStrip;
private ToolStripMenuItem toolStripMenuIClose;
- private Sunny.UI.UILabel lblFrequency;
+ private Sunny.UI.UILabel lblFrequency1;
private Sunny.UI.UILabel uiLabel16;
- private Sunny.UI.UILabel lblElectricity;
+ private Sunny.UI.UILabel lblElectricity1;
private Sunny.UI.UILabel uiLabel10;
private Sunny.UI.UILabel uiLabel23;
private Sunny.UI.UILabel uiLabel1;
- private Sunny.UI.UILabel uiLabel22;
- private Sunny.UI.UILabel lblRealTimeVacuum;
- private Sunny.UI.UIAnalogMeter AnalogMeter;
private HZH_Controls.Controls.UCProcessLine processEnviAmmoniaGas;
private HZH_Controls.Controls.UCProcessLine processEnviHydrogenSulfide;
private HZH_Controls.Controls.UCProcessLine processLineEnvirHumidity;
@@ -1860,19 +1961,27 @@ namespace GuideScreen.UI
private Sunny.UI.UISmoothLabel uiSmoothLabel3;
private Sunny.UI.UISmoothLabel uiSmoothLabel2;
private Sunny.UI.UISmoothLabel uiSmoothLabel1;
- private Sunny.UI.UIAnalogMeter analogMeterFrequency;
- private Sunny.UI.UIAnalogMeter analogMeterElectricity;
+ private Sunny.UI.UIAnalogMeter analogMeterFrequency1;
+ private Sunny.UI.UIAnalogMeter analogMeterElectricity1;
private Sunny.UI.UILedBulb LedBulbTwoRun;
private Sunny.UI.UILedDisplay LedDisplayTwoTime;
private Sunny.UI.UILedDisplay LedDisplayTwoCount;
private Sunny.UI.UILabel uiLabel5;
private Sunny.UI.UILabel uiLabel7;
- private Sunny.UI.UILabel uiLabel11;
private Sunny.UI.UILabel uiLabel15;
private Sunny.UI.UILedBulb LedBulbOneRun;
private Sunny.UI.UILedDisplay LedDisplayOneTime;
private Sunny.UI.UILedDisplay LedDisplayOneCount;
private Sunny.UI.UILabel uiLabel12;
private Sunny.UI.UILabel uiLabel14;
+ private HZH_Controls.Controls.UCThermometer thermometer;
+ private Sunny.UI.UIAnalogMeter analogMeterFrequency2;
+ private Sunny.UI.UIAnalogMeter analogMeterElectricity2;
+ private Sunny.UI.UILabel lblFrequency2;
+ private Sunny.UI.UILabel uiLabel20;
+ private Sunny.UI.UILabel lblElectricity2;
+ private Sunny.UI.UILabel uiLabel25;
+ private Sunny.UI.UILabel uiLabel11;
+ private Sunny.UI.UILabel lblweek;
}
}
\ No newline at end of file
diff --git a/guidescreen/GuideScreen/GuideScreen.UI/FormScreen.cs b/guidescreen/GuideScreen/GuideScreen.UI/FormScreen.cs
index 0ae84c1..034b56f 100644
--- a/guidescreen/GuideScreen/GuideScreen.UI/FormScreen.cs
+++ b/guidescreen/GuideScreen/GuideScreen.UI/FormScreen.cs
@@ -24,6 +24,8 @@ using GuideScreen.Common.Services.Models;
using GuideScreen.Common.Services.Impl;
using GuideScreen.Common.Constants;
using System.Windows.Documents;
+using System.Diagnostics;
+
namespace GuideScreen.UI
{
@@ -45,7 +47,8 @@ namespace GuideScreen.UI
private const string currentWomanNumStrFormat = "3/{0}";
//λʹͳ
private IDictionary toilets;
-
+ //
+ private const string zeroTime = "00:00:00";
public FormScreen()
{
InitializeComponent();
@@ -69,11 +72,14 @@ namespace GuideScreen.UI
{
try
{
+ //
+ plcController.Load();
+
//ȡ
lblTitle.Text = commonController.Title;
//
- passengerFlowStatisticsController.StartMonitoring();
+ //passengerFlowStatisticsController.StartMonitoring();
//ȡտ
passengerFlowDayCount = passengerFlowStatisticsController.GetDayCount(DateTime.Now);
@@ -102,7 +108,16 @@ namespace GuideScreen.UI
{
this.Invoke(new Action(() =>
{
- PointChange(e);
+ try
+ {
+ PointChange(e);
+ }
+ catch (Exception ex)
+ {
+ ErrorDialog("ȡλ"+ ex.Message);
+ ex.WriteErrorLog();
+ }
+
}));
@@ -147,34 +162,34 @@ namespace GuideScreen.UI
case 3:
if (use)
{
- pBoxUrinateMan1.Image = Resources.pitFull;
+ pBoxUrinateMan1.Image = Resources.urinateFull;
toilets["в3"]++;
}
else
{
- pBoxUrinateMan1.Image = Resources.pitEmpty;
+ pBoxUrinateMan1.Image = Resources.urinateEmpty;
}
break;
case 4:
if (use)
{
- pBoxUrinateMan2.Image = Resources.pitFull;
+ pBoxUrinateMan2.Image = Resources.urinateFull;
toilets["в4"]++;
}
else
{
- pBoxUrinateMan2.Image = Resources.pitEmpty;
+ pBoxUrinateMan2.Image = Resources.urinateEmpty;
}
break;
case 5:
if (use)
{
- pBoxUrinateMan3.Image = Resources.pitFull;
+ pBoxUrinateMan3.Image = Resources.urinateFull;
toilets["в5"]++;
}
else
{
- pBoxUrinateMan3.Image = Resources.pitEmpty;
+ pBoxUrinateMan3.Image = Resources.urinateEmpty;
}
break;
default:
@@ -228,17 +243,13 @@ namespace GuideScreen.UI
ToileUseChartByDay();
+ SetDayWarter();
+
}
#endregion
#region
- //ʱ
- private async void timer2_Tick(object sender, EventArgs e)
- {
- await GetWeather();
- }
-
///
/// ȡϢ
///
@@ -257,7 +268,7 @@ namespace GuideScreen.UI
this.Invoke(new Action(() =>
{
//óʵʱ
- if (weatherModel != null)
+ if (weatherModel != null && weatherModel.IsSuccee)
{
DateTime.TryParse(weatherModel.UpdateTime, out DateTime dt);
//lblWeatherUpdateTime.Text = dt.ToString("yyyy-MM-dd HH:mm:ss");
@@ -275,12 +286,12 @@ namespace GuideScreen.UI
pBoxWeatherIcon.Image = (Image)(Resources.ResourceManager.GetObject($"_{icon}"));
}
//ó
- if (airModel != null)
+ if (airModel != null && airModel.IsSuccee)
{
WeatherAir(airModel);
}
//óָ
- if (levelModel != null && levelModel.Daily.Length == 2)
+ if (levelModel != null && levelModel.IsSuccee && levelModel.Daily.Length == 2)
{
lblWeatherUltravioletRay.Text = levelModel.Daily[0].Category;
lblLevelText.Text = levelModel.Daily[1].Text;
@@ -403,6 +414,7 @@ namespace GuideScreen.UI
#region PLCȡλ
private void PointChange(PLCPoint e)
{
+ Debug.WriteLine(Masuit.Tools.ObjectExtensions.ToJsonString(e));
switch (e.Name)
{
#region λ״̬
@@ -444,7 +456,12 @@ namespace GuideScreen.UI
#region ܺļ
//õ
case PLCPointNameByEnergyMonitoring.ElectricityConsumption:
+ //ܵ
lblElectricityMeter.Text = Convert.ToInt32(e.GetValue()).ToString();
+ //յ
+ var str = Convert.ToInt32(plcController.GetTodayElectricityConsumption(e.GetValue())).ToString();
+ str= str.Aggregate(string.Empty, (c, i) => c + i + " ");
+ lblElectricQuantity.Text = $"պĵ {str} ǧʱ";
break;
//ˮ
@@ -454,43 +471,55 @@ namespace GuideScreen.UI
case PLCPointNameByEnvironmentalMonitoring.Temperature:
var temperature = e.GetValue();
lblEnvirTempl.Text = Math.Round(temperature, 1).ToString() + " C";
- //processEnvirTempl.Value=Convert.ToInt32(temperature);
+ processEnvirTempl.Value=Convert.ToInt32(temperature);
break;
case PLCPointNameByEnvironmentalMonitoring.Humidity:
var envirHumidity = e.GetValue();
lblEnvirHumidity.Text = Math.Round(envirHumidity, 1).ToString() + " %";
- //processLineEnvirHumidity.Value= Convert.ToInt32(envirHumidity);
+ processLineEnvirHumidity.Value= Convert.ToInt32(envirHumidity);
break;
case PLCPointNameByEnvironmentalMonitoring.NH3:
var enviHydrogenSulfide = e.GetValue();
lblEnviHydrogenSulfide.Text = Math.Round(enviHydrogenSulfide, 2).ToString() + " PPM";
- //processEnviHydrogenSulfide.Value=Convert.ToInt32(enviHydrogenSulfide);
+ processEnviHydrogenSulfide.Value=Convert.ToInt32(enviHydrogenSulfide);
break;
case PLCPointNameByEnvironmentalMonitoring.H2S:
var ammoniaGas = e.GetValue();
lblAmmoniaGas.Text = Math.Round(ammoniaGas, 1).ToString() + " PPM";
- //processEnviAmmoniaGas.Value= Convert.ToInt32(ammoniaGas);
+ processEnviAmmoniaGas.Value= Convert.ToInt32(ammoniaGas);
break;
#endregion
#region ձվ
//ʵʱն
case PLCPointNameByVacuumPumpingStation.RealTimeVacuum:
- var realTimeVacuum = Convert.ToInt32(e.GetValue());
- AnalogMeter.Value = realTimeVacuum;
- lblRealTimeVacuum.Text = $"-{realTimeVacuum}";
- break;
- //е
- case PLCPointNameByVacuumPumpingStation.RunningCurrent:
- var runningCurrent = Convert.ToInt32(e.GetValue());
- analogMeterElectricity.Value= runningCurrent;
- lblElectricity.Text = $"{runningCurrent} A";
- break;
- //Ƶ
- case PLCPointNameByVacuumPumpingStation.RunningFrequency:
- var runningFrequency= Convert.ToInt32(e.GetValue());
- analogMeterFrequency.Value = runningFrequency;
- lblFrequency.Text = $"{runningFrequency} HZ";
+ var realTimeVacuum = e.GetValue();
+ thermometer.Value = Math.Abs(realTimeVacuum);
+ //lblRealTimeVacuum.Text = realTimeVacuum.ToString();
+ break;
+ //е1
+ case PLCPointNameByVacuumPumpingStation.RunningCurrent1:
+ var runningCurrent = e.GetValue();
+ analogMeterElectricity1.Value= runningCurrent;
+ lblElectricity1.Text = $"{runningCurrent} A";
+ break;
+ //Ƶ1
+ case PLCPointNameByVacuumPumpingStation.RunningFrequency1:
+ var runningFrequency= e.GetValue();
+ analogMeterFrequency1.Value = runningFrequency;
+ lblFrequency1.Text = $"{runningFrequency} HZ";
+ break;
+ //е2
+ case PLCPointNameByVacuumPumpingStation.RunningCurrent2:
+ var runningCurrent2 = e.GetValue();
+ analogMeterElectricity2.Value = runningCurrent2;
+ lblElectricity2.Text = $"{runningCurrent2} A";
+ break;
+ //Ƶ2
+ case PLCPointNameByVacuumPumpingStation.RunningFrequency2:
+ var runningFrequency2 = e.GetValue();
+ analogMeterFrequency2.Value = runningFrequency2;
+ lblFrequency2.Text = $"{runningFrequency2} HZ";
break;
//1ű״̬
case PLCPointNameByVacuumPumpingStation.PumpingStation1:
@@ -500,7 +529,7 @@ namespace GuideScreen.UI
}
else
{
- LedBulbOneRun.ForeColor = Color.Red;
+ LedBulbOneRun.ForeColor = Color.Gray;
}
break;
//2ű״̬
@@ -511,28 +540,28 @@ namespace GuideScreen.UI
}
else
{
- LedBulbTwoRun.ForeColor = Color.Red;
+ LedBulbTwoRun.ForeColor = Color.Gray;
}
break;
//1űд
case PLCPointNameByVacuumPumpingStation.PumpStartTimes1:
- var pumpStartTimes1 = e.GetValue();
- LedDisplayOneCount.Text = pumpStartTimes1.ToString("D6");
+ var pumpStartCount1 = e.GetValue();
+ LedDisplayOneCount.Text = pumpStartCount1.ToString("D6");
break;
//2űд
case PLCPointNameByVacuumPumpingStation.PumpStartTimes2:
- var pumpStartTimes2 = e.GetValue();
- LedDisplayTwoCount.Text = pumpStartTimes2.ToString("D6");
+ var pumpStartCount2 = e.GetValue();
+ LedDisplayTwoCount.Text = pumpStartCount2.ToString("D6");
break;
//1űʱ
case PLCPointNameByVacuumPumpingStation.PumpAccumulatedStartTime1:
- var pumpAccumulatedStartTime1 = e.GetValue();
- LedDisplayOneCount.Text = pumpAccumulatedStartTime1.ToString("D5")+"H";
+ var pumpAccumulatedStartTime1 = e.GetValue();
+ LedDisplayOneTime.Text = pumpAccumulatedStartTime1.ToString("D5")+"H";
break;
//2űʱ
case PLCPointNameByVacuumPumpingStation.PumpAccumulatedStartTime2:
- var pumpAccumulatedStartTime2 = e.GetValue();
- LedDisplayTwoCount.Text = pumpAccumulatedStartTime2.ToString("D5") + "H";
+ var pumpAccumulatedStartTime2 = e.GetValue();
+ LedDisplayTwoTime.Text = pumpAccumulatedStartTime2.ToString("D5") + "H";
break;
#endregion
@@ -619,17 +648,20 @@ namespace GuideScreen.UI
#endregion
///
- /// Ϣ
+ /// ģˮ
///
- ///
- ///
- private void Controller_ErrorMessage(object sender, string e)
+ private void SetDayWarter()
{
- ErrorDialog(e);
-
- e.WriteErrorLog();
+ var values = toilets.Values.Sum();
+ if (values == 0)
+ {
+ values = 1;
+ }
+ var dayStr = (values * 0.001).ToString().Aggregate(string.Empty, (c, i) => c + i + " ");
+ lblDayWarter.Text = $"ˮ {dayStr} ";
}
+ #region Timer
///
/// ʱ
///
@@ -637,21 +669,38 @@ namespace GuideScreen.UI
///
private void timer1_Tick(object sender, EventArgs e)
{
- lblTime.Text = DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss");
+ var dateTime = DateTime.Now;
+ //ʱ
+ lblTime.Text = dateTime.ToString("yyyy-MM-dd HH:mm:ss");
+ //
+ lblweek.Text = DateTime.Today.ToString("dddd", new System.Globalization.CultureInfo("zh-CN"));
+ //Ժµ
+ if (dateTime.ToString("HH:mm:ss") == zeroTime) {
+
+ //²λʹ
+ toilets = plcController.ToiletPositionRecordTotalByToday();
+ ToileUseChartByDay();
+ }
}
- private void contextMenuStrip1_ItemClicked(object sender, ToolStripItemClickedEventArgs e)
+ //ʱ
+ private async void timer2_Tick(object sender, EventArgs e)
{
- if (e.ClickedItem.Text == "ر")
- {
- Close();
- }
+ await GetWeather();
}
- private void FormScreen_FormClosing(object sender, FormClosingEventArgs e)
+ #endregion
+
+ ///
+ /// Ϣ
+ ///
+ ///
+ ///
+ private void Controller_ErrorMessage(object sender, string e)
{
- passengerFlowStatisticsController.StopMonitoring();
- plcController.Stop();
+ ErrorDialog(e);
+
+ e.WriteErrorLog();
}
///
@@ -668,5 +717,20 @@ namespace GuideScreen.UI
}));
}
+ private void contextMenuStrip1_ItemClicked(object sender, ToolStripItemClickedEventArgs e)
+ {
+ if (e.ClickedItem.Text == "ر")
+ {
+ Close();
+ }
+ }
+
+ private void FormScreen_FormClosing(object sender, FormClosingEventArgs e)
+ {
+ //passengerFlowStatisticsController.StopMonitoring();
+ plcController.Stop();
+ }
+
+
}
}
\ No newline at end of file
diff --git a/guidescreen/GuideScreen/GuideScreen.UI/FormScreen.resx b/guidescreen/GuideScreen/GuideScreen.UI/FormScreen.resx
index fe3cc2e..dfebdf9 100644
--- a/guidescreen/GuideScreen/GuideScreen.UI/FormScreen.resx
+++ b/guidescreen/GuideScreen/GuideScreen.UI/FormScreen.resx
@@ -8638,6 +8638,6 @@
342, 17
- 25
+ 97
\ No newline at end of file
diff --git a/guidescreen/GuideScreen/GuideScreen.UI/Properties/Resources.resx b/guidescreen/GuideScreen/GuideScreen.UI/Properties/Resources.resx
index dac69d9..0f69dee 100644
--- a/guidescreen/GuideScreen/GuideScreen.UI/Properties/Resources.resx
+++ b/guidescreen/GuideScreen/GuideScreen.UI/Properties/Resources.resx
@@ -125,7 +125,7 @@
..\Sources\pitFull.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a
- ..\Sources\urinateEmpty.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a
+ ..\sources\urinateempty.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a
..\Sources\urinateFull.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a
diff --git a/guidescreen/GuideScreen/GuideScreen.UI/bin.zip b/guidescreen/GuideScreen/GuideScreen.UI/bin.zip
new file mode 100644
index 0000000..75e1816
Binary files /dev/null and b/guidescreen/GuideScreen/GuideScreen.UI/bin.zip differ