1.解决异常出现弹框问题

2.部分样式显示调整
3.添加客流累计
old
xiaoguo 2 years ago
parent a53099706a
commit 1b47cf889c

Before

Width:  |  Height:  |  Size: 794 B

After

Width:  |  Height:  |  Size: 794 B

Before

Width:  |  Height:  |  Size: 3.5 KiB

After

Width:  |  Height:  |  Size: 3.5 KiB

Before

Width:  |  Height:  |  Size: 366 KiB

After

Width:  |  Height:  |  Size: 366 KiB

Before

Width:  |  Height:  |  Size: 2.9 KiB

After

Width:  |  Height:  |  Size: 2.9 KiB

Before

Width:  |  Height:  |  Size: 3.8 KiB

After

Width:  |  Height:  |  Size: 3.8 KiB

Before

Width:  |  Height:  |  Size: 701 B

After

Width:  |  Height:  |  Size: 701 B

Before

Width:  |  Height:  |  Size: 200 KiB

After

Width:  |  Height:  |  Size: 200 KiB

Before

Width:  |  Height:  |  Size: 794 B

After

Width:  |  Height:  |  Size: 794 B

Before

Width:  |  Height:  |  Size: 3.5 KiB

After

Width:  |  Height:  |  Size: 3.5 KiB

Before

Width:  |  Height:  |  Size: 366 KiB

After

Width:  |  Height:  |  Size: 366 KiB

Before

Width:  |  Height:  |  Size: 2.9 KiB

After

Width:  |  Height:  |  Size: 2.9 KiB

Before

Width:  |  Height:  |  Size: 3.8 KiB

After

Width:  |  Height:  |  Size: 3.8 KiB

Before

Width:  |  Height:  |  Size: 701 B

After

Width:  |  Height:  |  Size: 701 B

Before

Width:  |  Height:  |  Size: 200 KiB

After

Width:  |  Height:  |  Size: 200 KiB

@ -1,195 +0,0 @@
<!doctype html>
<html>
<head>
<meta charset="utf-8">
<title>index</title>
<script type="text/javascript" src="js/jquery.js"></script>
<script type="text/javascript" src="js/echarts.min.js"></script>
<script type="text/javascript" src="js/china.js"></script>
<script type="text/javascript" src="js/map.js"></script>
<script type="text/javascript" src="js/js.js"></script>
<script type="text/javascript" src="js/Bubble.js"></script>
<script type="text/javascript" src="js/jquery.liMarquee.js"></script>
<link rel="stylesheet" href="css/style.css">
</head>
<body>
<div class="head clearfix">
<h1 class="pulll_left">5G智慧驿站数据监控平台</h1>
<div class="time" id="showTime">2018/6/12 17:00:12</div>
</div>
<div class="mainbox">
<ul class="clearfix nav1">
<li style="width: 26%;">
<div class="box">
<div class="tit">厕所总览</div>
<div class="boxnav" style="height: 500px;">
<div class="name">厕所总数量</div>
<div class="numtxt">560</div>
<div class="ceisuozonglan">
<ul>
<li><span>男厕所</span>
<p>240</p>
</li>
<li><span>女厕所</span>
<p>240</p>
</li>
<li><span>儿童厕所</span>
<p>40</p>
</li>
<li><span>残疾厕所</span>
<p>40</p>
</li>
</ul>
</div>
<div class="leidanav" style="margin-top: 80px;">
<ul class="jindu clearfix">
<li id="zb1"></li>
<li id="zb2"></li>
<li id="zb3"></li>
<li id="zb4"></li>
</ul>
</div>
</div>
</div>
</li>
<li style="width: 48%">
<div class="box">
<div class="boxnav mapc" style="height: 540px; position: relative">
<div class="mapnav">
<ul>
<li>
<div><span>当前人流量</span>
<p>245670</p>
</div>
</li>
</ul>
</div>
<div class="map" id="map"></div>
</div>
</div>
</li>
<li style="width: 26%">
<div class="box">
<div class="tit">能耗总览</div>
<div class="boxnav" style="height: 500px;">
<div style=" border-bottom: 1px solid rgba(255, 255, 255, .1);">今日能耗</div>
<div class="nenghaozonglan">
<ul>
<li><span>总用电量(kW·h)</span>
<p>210</p>
</li>
<li><span>总用水量(m3)</span>
<p>120</p>
</li>
</ul>
</div>
<div class="nenghaozonglan">
<ul>
<li><span>平均用电量(kW·h)</span>
<p>3</p>
</li>
<li><span>平均用水量(m3)</span>
<p>2</p>
</li>
</ul>
</div>
<div style=" border-bottom: 1px solid rgba(255, 255, 255, .1);">本周电量统计</div>
<div class="ftechart" id="echarts_2"></div>
<div style=" border-bottom: 1px solid rgba(255, 255, 255, .1);">本周水量统计</div>
<div class="ftechart" id="echarts_3"></div>
</div>
</div>
</li>
</ul>
<div class="box" style="padding: 10px 0;">
<ul class="clearfix nav2 ">
<li style="width:25%;">
<div class="tit01">坑位状态</div>
<div class="ftechart" id="echarts_1" style="margin-top: 20px;"></div>
</li>
<li style="width:50%">
<div class="tit01">驿站流量</div>
<p class="pth"><span>序号</span> <span>驿站名称</span> <span>厕所数量</span><span>当前流量</span></p>
<div class="marquee">
<ul>
<li>
<p> <span><i>1</i></span> <span>北海驿站</span> <span>8</span><span>1500</span></p>
</li>
<li>
<p> <span><i>2</i></span> <span>西安驿站</span> <span>10</span> <span>3000</span></p>
</li>
<li>
<p> <span><i>3</i></span> <span>金坛驿站</span> <span>6</span> <span>1200</span></p>
</li>
<li>
<p> <span><i>4</i></span> <span>牡丹江驿站</span> <span>8</span> <span>800</span></p>
</li>
<li>
<p> <span><i>5</i></span> <span>遵义驿站</span> <span>7</span> <span>1700</span></p>
</li>
<li>
<p> <span><i>6</i></span> <span>绍兴驿站</span> <span>5</span> <span>1350</span></p>
</li>
<li>
<p> <span><i>7</i></span> <span>扬州驿站</span> <span>12</span> <span>1800</span></p>
</li>
<li>
<p> <span><i>8</i></span> <span>常州驿站</span> <span>9</span> <span>1600</span></p>
</li>
<li>
<p> <span><i>9</i></span> <span>潍坊驿站</span> <span>10</span> <span>1100</span></p>
</li>
<li>
<p> <span><i>10</i></span> <span>重庆驿站</span> <span>9</span> <span>1400</span> </p>
</li>
</ul>
</div>
</li>
<li style="width:25%">
<div class="tit01">环境总览</div>
<div class="boxnav" >
<div>
<!-- <div class="tit02 text-b">热门话题榜</div> -->
<div class="hangjingzonglan">
<ul>
<li>平均温度(°C) <span class="text-s"> 26</span></li>
<li>平均湿度(%)<span class="text-s"> 51</span></li>
<li>氨气含量(g/L)<span class="text-d"> 0.771</span></li>
<li>硫化氢含量(ppm)<span class="text-d"> 0.00031</span></li>
</ul>
</div>
</div>
<div class="hangjingzonglantagcloud">
<div class="tagcloud">
<!-- bo大小 co颜色 -->
<a class="b02 co01" href="#">平均温度 26 (°C)</a>
<a class="b02 co02" href="#">平均湿度 51 (%)</a>
<a class="b02 co05" href="#">氨气含量 0.771 (g/L)</a>
<a class="b02 co02" href="#">硫化氢含量 0.00031 (ppm)</a>
</div>
</div>
</div>
</li>
</ul>
</div>
</div>
</body>
<script>
var t = null;
t = setTimeout(time, 1000);//開始运行
function time() {
clearTimeout(t);//清除定时器
dt = new Date();
var y = dt.getFullYear();
var mt = dt.getMonth() + 1;
var day = dt.getDate();
var h = dt.getHours();//获取时
var m = dt.getMinutes();//获取分
var s = dt.getSeconds();//获取秒
document.getElementById("showTime").innerHTML = y + "/" + mt + "/" + day + " " + h + ":" + m + ":" + s + "";
t = setTimeout(time, 1000); //设定定时器,循环运行
}
</script>
</html>

@ -45,10 +45,14 @@ namespace GuideScreen.Common
/// <param name="ex">异常对象</param> /// <param name="ex">异常对象</param>
public static void WriteErrorLog(this Exception ex) public static void WriteErrorLog(this Exception ex)
{ {
//var error = new StringBuilder(ex.Message); var error = new StringBuilder();
//error.AppendLine(); while (ex != null)
//error.AppendLine(ex.StackTrace); {
LogService.Error(ex.Message,ex); error.AppendLine($"{ex.Message}:{Environment.NewLine}");
error.AppendLine($"{ex.StackTrace};");
ex = ex.InnerException;
}
LogService.Error(error.ToString());
} }
/// <summary> /// <summary>
@ -57,9 +61,13 @@ namespace GuideScreen.Common
/// <param name="ex">异常对象</param> /// <param name="ex">异常对象</param>
public static void WriteFatalLog(this Exception ex) public static void WriteFatalLog(this Exception ex)
{ {
var error = new StringBuilder(ex.Message); var error = new StringBuilder();
error.AppendLine(); while (ex != null)
error.AppendLine(ex.StackTrace); {
error.AppendLine($"{ex.Message}:{Environment.NewLine}");
error.AppendLine($"{ ex.StackTrace};");
ex = ex.InnerException;
}
LogService.Fatal(error.ToString()); LogService.Fatal(error.ToString());
} }

@ -15,7 +15,7 @@ namespace GuideScreen.Common.Common
private static Func<TEntity, TResult> GetFunc() private static Func<TEntity, TResult> GetFunc()
{ {
ParameterExpression parameterExpression = Expression.Parameter(typeof(TEntity), "p"); var parameterExpression = Expression.Parameter(typeof(TEntity), "p");
List<MemberBinding> memberBindingList = new List<MemberBinding>(); List<MemberBinding> memberBindingList = new List<MemberBinding>();
foreach (var item in typeof(TResult).GetProperties()) foreach (var item in typeof(TResult).GetProperties())

@ -17,7 +17,7 @@ namespace GuideScreen.Common.Constants
public const string EnvironmentalMonitoring = "环境监测"; public const string EnvironmentalMonitoring = "环境监测";
/// <summary> /// <summary>
/// 环境监测 /// 厕位监控
/// </summary> /// </summary>
public const string ToiletPosition = "厕位监控"; public const string ToiletPosition = "厕位监控";

@ -25,6 +25,13 @@ namespace GuideScreen.Common.Repositories
/// <returns></returns> /// <returns></returns>
PageModel<List<PLCDeviceRecordDayModel>> GetPLCDeviceRecordDayList(string deviceName, string note, DateTime begDate, DateTime endDate, int pageSize, int pageIndex); PageModel<List<PLCDeviceRecordDayModel>> GetPLCDeviceRecordDayList(string deviceName, string note, DateTime begDate, DateTime endDate, int pageSize, int pageIndex);
/// <summary>
/// 获取 plc 数据统计
/// </summary>
/// <param name="deviceName"></param>
/// <returns></returns>
decimal GetPLCDeviceRecordTotal(string deviceName);
/// <summary> /// <summary>
/// 获取PLC点位明细 /// 获取PLC点位明细
/// </summary> /// </summary>

@ -75,6 +75,20 @@ namespace GuideScreen.Common.Repositories.Impl
} }
} }
/// <summary>
/// 获取 plc 数据统计
/// </summary>
/// <param name="deviceName"></param>
/// <returns></returns>
public decimal GetPLCDeviceRecordTotal(string deviceName)
{
using (var context= GSDBContext.GetDbContext())
{
var total = context.PLCDeviceRecordDayEntities.Where(f => f.DeviceName == deviceName).Select(f => f.RecordValue).Sum();
return total;
}
}
/// <summary> /// <summary>
/// 获取PLC点位明细 /// 获取PLC点位明细
/// </summary> /// </summary>

@ -24,6 +24,13 @@ namespace GuideScreen.Common.Services
/// <returns></returns> /// <returns></returns>
PageModel<List<PLCDeviceRecordDayModel>> GetPLCDeviceRecordDayList(string deviceName, string note, DateTime begDate, DateTime endDate, int pageSize, int pageIndex); PageModel<List<PLCDeviceRecordDayModel>> GetPLCDeviceRecordDayList(string deviceName, string note, DateTime begDate, DateTime endDate, int pageSize, int pageIndex);
/// <summary>
/// 获取 plc 数据统计
/// </summary>
/// <param name="deviceName"></param>
/// <returns></returns>
decimal GetPLCDeviceRecordTotal(string deviceName);
/// <summary> /// <summary>
/// 获取PLC点位明细 /// 获取PLC点位明细
/// </summary> /// </summary>
@ -43,11 +50,18 @@ namespace GuideScreen.Common.Services
/// <returns></returns> /// <returns></returns>
List<PLCDeviceRecordDayModel> GetToiletPositionRecordTotalByToday(); List<PLCDeviceRecordDayModel> GetToiletPositionRecordTotalByToday();
// <summary>
/// 获取厕位历史使用记录
/// </summary>
/// <returns></returns>
int GetToiletPositionRecordTotal();
/// <summary> /// <summary>
/// 更新 厕位当日记录信息 /// 更新 厕位当日记录信息
/// </summary> /// </summary>
/// <param name="entity"></param> /// <param name="entity"></param>
void UpdateToiletPositionRecordTotalByToday(string toiletPosition, string note); void UpdateToiletPositionRecordTotalByToday(string toiletPosition, string note);
/// 更新 当日能耗记录信息 /// 更新 当日能耗记录信息
/// </summary> /// </summary>
/// <param name="name">设备对应的点位名称</param> /// <param name="name">设备对应的点位名称</param>

@ -4,6 +4,7 @@ using GuideScreen.Common.Repositories;
using GuideScreen.Common.Repositories.Entities; using GuideScreen.Common.Repositories.Entities;
using GuideScreen.Common.Services.Models; using GuideScreen.Common.Services.Models;
using Masuit.Tools;
using Masuit.Tools.Reflection; using Masuit.Tools.Reflection;
using System; using System;
@ -39,6 +40,17 @@ namespace GuideScreen.Common.Services.Impl
return page; return page;
} }
/// <summary>
/// 获取 plc 数据统计
/// </summary>
/// <param name="deviceName"></param>
/// <returns></returns>
public decimal GetPLCDeviceRecordTotal(string deviceName)
{
var total = this.deviceRecordRepository.GetPLCDeviceRecordTotal(deviceName);
return total;
}
/// <summary> /// <summary>
/// 获取PLC点位明细 /// 获取PLC点位明细
/// </summary> /// </summary>
@ -75,8 +87,16 @@ namespace GuideScreen.Common.Services.Impl
var page = GetPLCDeviceRecordDayList(PLCDeviceNames.ToiletPosition, string.Empty, begDateTime, endDateTime, 0, 0); var page = GetPLCDeviceRecordDayList(PLCDeviceNames.ToiletPosition, string.Empty, begDateTime, endDateTime, 0, 0);
var list = page.Content; var list = page.Content;
return list; return list;
}
/// <summary>
/// 获取厕位历史使用记录
/// </summary>
/// <returns></returns>
public int GetToiletPositionRecordTotal()
{
var total = GetPLCDeviceRecordTotal(PLCDeviceNames.ToiletPosition);
return total.ToInt32();
} }
/// <summary> /// <summary>

@ -127,6 +127,16 @@ namespace GuideScreen.Common.Services.Impl
} }
/// <summary>
/// 获取厕位历史使用记录
/// </summary>
/// <returns></returns>
public int GetToiletPositionRecordTotal()
{
var total = deviceRecordService.GetToiletPositionRecordTotal();
return total;
}
/// <summary> /// <summary>
/// 单侧位使用记录 /// 单侧位使用记录
/// </summary> /// </summary>

@ -82,8 +82,8 @@ namespace GuideScreen.UI
this.pictureBox8 = new System.Windows.Forms.PictureBox(); this.pictureBox8 = new System.Windows.Forms.PictureBox();
this.pictureBox9 = new System.Windows.Forms.PictureBox(); this.pictureBox9 = new System.Windows.Forms.PictureBox();
this.uiPanel6 = new Sunny.UI.UIPanel(); this.uiPanel6 = new Sunny.UI.UIPanel();
this.uiLabel6 = new Sunny.UI.UILabel();
this.uiLabel11 = new Sunny.UI.UILabel(); this.uiLabel11 = new Sunny.UI.UILabel();
this.thermometer = new HZH_Controls.Controls.UCThermometer();
this.analogMeterFrequency2 = new Sunny.UI.UIAnalogMeter(); this.analogMeterFrequency2 = new Sunny.UI.UIAnalogMeter();
this.analogMeterElectricity2 = new Sunny.UI.UIAnalogMeter(); this.analogMeterElectricity2 = new Sunny.UI.UIAnalogMeter();
this.analogMeterFrequency1 = new Sunny.UI.UIAnalogMeter(); this.analogMeterFrequency1 = new Sunny.UI.UIAnalogMeter();
@ -110,7 +110,10 @@ namespace GuideScreen.UI
this.lblElectricity1 = new Sunny.UI.UILabel(); this.lblElectricity1 = new Sunny.UI.UILabel();
this.uiLabel10 = new Sunny.UI.UILabel(); this.uiLabel10 = new Sunny.UI.UILabel();
this.uiLabel3 = new Sunny.UI.UILabel(); this.uiLabel3 = new Sunny.UI.UILabel();
this.uiLabel19 = new Sunny.UI.UILabel();
this.thermometer = new HZH_Controls.Controls.UCThermometer();
this.uiPanel7 = new Sunny.UI.UIPanel(); this.uiPanel7 = new Sunny.UI.UIPanel();
this.uiLabel22 = new Sunny.UI.UILabel();
this.pictureBox5 = new System.Windows.Forms.PictureBox(); this.pictureBox5 = new System.Windows.Forms.PictureBox();
this.pictureBox4 = new System.Windows.Forms.PictureBox(); this.pictureBox4 = new System.Windows.Forms.PictureBox();
this.pBoxPitWomanThree = new System.Windows.Forms.PictureBox(); this.pBoxPitWomanThree = new System.Windows.Forms.PictureBox();
@ -154,6 +157,7 @@ namespace GuideScreen.UI
this.lblTitle = new Sunny.UI.UILabel(); this.lblTitle = new Sunny.UI.UILabel();
this.lblTime = new Sunny.UI.UILabel(); this.lblTime = new Sunny.UI.UILabel();
this.bindingSource1 = new System.Windows.Forms.BindingSource(this.components); this.bindingSource1 = new System.Windows.Forms.BindingSource(this.components);
this.uiLabel24 = new Sunny.UI.UILabel();
this.uiPanel1.SuspendLayout(); this.uiPanel1.SuspendLayout();
((System.ComponentModel.ISupportInitialize)(this.pBoxWeatherIcon)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.pBoxWeatherIcon)).BeginInit();
this.uiPanel5.SuspendLayout(); this.uiPanel5.SuspendLayout();
@ -443,13 +447,13 @@ namespace GuideScreen.UI
// //
this.uiLabel21.Font = new System.Drawing.Font("微软雅黑", 14.25F, System.Drawing.FontStyle.Bold); this.uiLabel21.Font = new System.Drawing.Font("微软雅黑", 14.25F, System.Drawing.FontStyle.Bold);
this.uiLabel21.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(65)))), ((int)(((byte)(128)))), ((int)(((byte)(195))))); this.uiLabel21.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(65)))), ((int)(((byte)(128)))), ((int)(((byte)(195)))));
this.uiLabel21.Location = new System.Drawing.Point(220, 210); this.uiLabel21.Location = new System.Drawing.Point(203, 210);
this.uiLabel21.Name = "uiLabel21"; this.uiLabel21.Name = "uiLabel21";
this.uiLabel21.Size = new System.Drawing.Size(61, 38); this.uiLabel21.Size = new System.Drawing.Size(93, 38);
this.uiLabel21.Style = Sunny.UI.UIStyle.Custom; this.uiLabel21.Style = Sunny.UI.UIStyle.Custom;
this.uiLabel21.StyleCustomMode = true; this.uiLabel21.StyleCustomMode = true;
this.uiLabel21.TabIndex = 18; this.uiLabel21.TabIndex = 18;
this.uiLabel21.Text = "水表"; this.uiLabel21.Text = "总耗水量";
this.uiLabel21.TextAlign = System.Drawing.ContentAlignment.MiddleCenter; this.uiLabel21.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
this.uiLabel21.ZoomScaleRect = new System.Drawing.Rectangle(0, 0, 0, 0); this.uiLabel21.ZoomScaleRect = new System.Drawing.Rectangle(0, 0, 0, 0);
// //
@ -471,13 +475,13 @@ namespace GuideScreen.UI
// //
this.uiLabel18.Font = new System.Drawing.Font("微软雅黑", 14.25F, System.Drawing.FontStyle.Bold); this.uiLabel18.Font = new System.Drawing.Font("微软雅黑", 14.25F, System.Drawing.FontStyle.Bold);
this.uiLabel18.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(65)))), ((int)(((byte)(128)))), ((int)(((byte)(195))))); this.uiLabel18.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(65)))), ((int)(((byte)(128)))), ((int)(((byte)(195)))));
this.uiLabel18.Location = new System.Drawing.Point(79, 210); this.uiLabel18.Location = new System.Drawing.Point(56, 211);
this.uiLabel18.Name = "uiLabel18"; this.uiLabel18.Name = "uiLabel18";
this.uiLabel18.Size = new System.Drawing.Size(61, 38); this.uiLabel18.Size = new System.Drawing.Size(105, 38);
this.uiLabel18.Style = Sunny.UI.UIStyle.Custom; this.uiLabel18.Style = Sunny.UI.UIStyle.Custom;
this.uiLabel18.StyleCustomMode = true; this.uiLabel18.StyleCustomMode = true;
this.uiLabel18.TabIndex = 4; this.uiLabel18.TabIndex = 4;
this.uiLabel18.Text = "电表"; this.uiLabel18.Text = "总耗电量";
this.uiLabel18.TextAlign = System.Drawing.ContentAlignment.MiddleCenter; this.uiLabel18.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
this.uiLabel18.ZoomScaleRect = new System.Drawing.Rectangle(0, 0, 0, 0); this.uiLabel18.ZoomScaleRect = new System.Drawing.Rectangle(0, 0, 0, 0);
// //
@ -860,7 +864,7 @@ namespace GuideScreen.UI
// pictureBox9 // pictureBox9
// //
this.pictureBox9.Image = ((System.Drawing.Image)(resources.GetObject("pictureBox9.Image"))); this.pictureBox9.Image = ((System.Drawing.Image)(resources.GetObject("pictureBox9.Image")));
this.pictureBox9.Location = new System.Drawing.Point(79, 155); this.pictureBox9.Location = new System.Drawing.Point(78, 155);
this.pictureBox9.Name = "pictureBox9"; this.pictureBox9.Name = "pictureBox9";
this.pictureBox9.Size = new System.Drawing.Size(61, 52); this.pictureBox9.Size = new System.Drawing.Size(61, 52);
this.pictureBox9.SizeMode = System.Windows.Forms.PictureBoxSizeMode.StretchImage; this.pictureBox9.SizeMode = System.Windows.Forms.PictureBoxSizeMode.StretchImage;
@ -872,8 +876,9 @@ namespace GuideScreen.UI
this.uiPanel6.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom) this.uiPanel6.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom)
| System.Windows.Forms.AnchorStyles.Right))); | System.Windows.Forms.AnchorStyles.Right)));
this.uiPanel6.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(21)))), ((int)(((byte)(36)))), ((int)(((byte)(59))))); this.uiPanel6.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(21)))), ((int)(((byte)(36)))), ((int)(((byte)(59)))));
this.uiPanel6.Controls.Add(this.uiLabel24);
this.uiPanel6.Controls.Add(this.uiLabel6);
this.uiPanel6.Controls.Add(this.uiLabel11); this.uiPanel6.Controls.Add(this.uiLabel11);
this.uiPanel6.Controls.Add(this.thermometer);
this.uiPanel6.Controls.Add(this.analogMeterFrequency2); this.uiPanel6.Controls.Add(this.analogMeterFrequency2);
this.uiPanel6.Controls.Add(this.analogMeterElectricity2); this.uiPanel6.Controls.Add(this.analogMeterElectricity2);
this.uiPanel6.Controls.Add(this.analogMeterFrequency1); this.uiPanel6.Controls.Add(this.analogMeterFrequency1);
@ -900,6 +905,8 @@ namespace GuideScreen.UI
this.uiPanel6.Controls.Add(this.lblElectricity1); this.uiPanel6.Controls.Add(this.lblElectricity1);
this.uiPanel6.Controls.Add(this.uiLabel10); this.uiPanel6.Controls.Add(this.uiLabel10);
this.uiPanel6.Controls.Add(this.uiLabel3); this.uiPanel6.Controls.Add(this.uiLabel3);
this.uiPanel6.Controls.Add(this.uiLabel19);
this.uiPanel6.Controls.Add(this.thermometer);
this.uiPanel6.FillColor = System.Drawing.Color.Empty; this.uiPanel6.FillColor = System.Drawing.Color.Empty;
this.uiPanel6.Font = new System.Drawing.Font("微软雅黑", 12F); this.uiPanel6.Font = new System.Drawing.Font("微软雅黑", 12F);
this.uiPanel6.Location = new System.Drawing.Point(1551, 397); this.uiPanel6.Location = new System.Drawing.Point(1551, 397);
@ -915,12 +922,23 @@ namespace GuideScreen.UI
this.uiPanel6.TextAlignment = System.Drawing.ContentAlignment.MiddleCenter; this.uiPanel6.TextAlignment = System.Drawing.ContentAlignment.MiddleCenter;
this.uiPanel6.ZoomScaleRect = new System.Drawing.Rectangle(0, 0, 0, 0); this.uiPanel6.ZoomScaleRect = new System.Drawing.Rectangle(0, 0, 0, 0);
// //
// uiLabel6
//
this.uiLabel6.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.uiLabel6.Location = new System.Drawing.Point(-9, 86);
this.uiLabel6.Name = "uiLabel6";
this.uiLabel6.Size = new System.Drawing.Size(58, 471);
this.uiLabel6.Style = Sunny.UI.UIStyle.Custom;
this.uiLabel6.TabIndex = 69;
this.uiLabel6.TextAlign = System.Drawing.ContentAlignment.MiddleLeft;
this.uiLabel6.ZoomScaleRect = new System.Drawing.Rectangle(0, 0, 0, 0);
//
// uiLabel11 // uiLabel11
// //
this.uiLabel11.BackColor = System.Drawing.Color.Transparent; 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.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.ForeColor = System.Drawing.Color.White;
this.uiLabel11.Location = new System.Drawing.Point(30, 583); this.uiLabel11.Location = new System.Drawing.Point(21, 571);
this.uiLabel11.Name = "uiLabel11"; this.uiLabel11.Name = "uiLabel11";
this.uiLabel11.Size = new System.Drawing.Size(18, 37); this.uiLabel11.Size = new System.Drawing.Size(18, 37);
this.uiLabel11.Style = Sunny.UI.UIStyle.Custom; this.uiLabel11.Style = Sunny.UI.UIStyle.Custom;
@ -930,34 +948,6 @@ namespace GuideScreen.UI
this.uiLabel11.TextAlign = System.Drawing.ContentAlignment.MiddleCenter; this.uiLabel11.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
this.uiLabel11.ZoomScaleRect = new System.Drawing.Rectangle(0, 0, 0, 0); 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 // analogMeterFrequency2
// //
this.analogMeterFrequency2.BackColor = System.Drawing.Color.Transparent; this.analogMeterFrequency2.BackColor = System.Drawing.Color.Transparent;
@ -983,7 +973,7 @@ namespace GuideScreen.UI
// //
this.analogMeterElectricity2.BackColor = System.Drawing.Color.Transparent; 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.Font = new System.Drawing.Font("微软雅黑", 14.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.analogMeterElectricity2.Location = new System.Drawing.Point(135, 438); this.analogMeterElectricity2.Location = new System.Drawing.Point(116, 438);
this.analogMeterElectricity2.MaxValue = 10D; this.analogMeterElectricity2.MaxValue = 10D;
this.analogMeterElectricity2.MinimumSize = new System.Drawing.Size(1, 1); this.analogMeterElectricity2.MinimumSize = new System.Drawing.Size(1, 1);
this.analogMeterElectricity2.MinValue = 0D; this.analogMeterElectricity2.MinValue = 0D;
@ -1025,7 +1015,7 @@ namespace GuideScreen.UI
// //
this.analogMeterElectricity1.BackColor = System.Drawing.Color.Transparent; 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.Font = new System.Drawing.Font("微软雅黑", 14.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.analogMeterElectricity1.Location = new System.Drawing.Point(135, 126); this.analogMeterElectricity1.Location = new System.Drawing.Point(118, 126);
this.analogMeterElectricity1.MaxValue = 10D; this.analogMeterElectricity1.MaxValue = 10D;
this.analogMeterElectricity1.MinimumSize = new System.Drawing.Size(1, 1); this.analogMeterElectricity1.MinimumSize = new System.Drawing.Size(1, 1);
this.analogMeterElectricity1.MinValue = 0D; this.analogMeterElectricity1.MinValue = 0D;
@ -1059,7 +1049,7 @@ namespace GuideScreen.UI
// LedBulbTwoRun // LedBulbTwoRun
// //
this.LedBulbTwoRun.Color = System.Drawing.Color.Gray; this.LedBulbTwoRun.Color = System.Drawing.Color.Gray;
this.LedBulbTwoRun.Location = new System.Drawing.Point(305, 356); this.LedBulbTwoRun.Location = new System.Drawing.Point(288, 355);
this.LedBulbTwoRun.Name = "LedBulbTwoRun"; this.LedBulbTwoRun.Name = "LedBulbTwoRun";
this.LedBulbTwoRun.Size = new System.Drawing.Size(39, 34); this.LedBulbTwoRun.Size = new System.Drawing.Size(39, 34);
this.LedBulbTwoRun.TabIndex = 115; this.LedBulbTwoRun.TabIndex = 115;
@ -1073,7 +1063,7 @@ namespace GuideScreen.UI
this.LedDisplayTwoTime.BorderInColor = System.Drawing.Color.FromArgb(((int)(((byte)(21)))), ((int)(((byte)(36)))), ((int)(((byte)(59))))); this.LedDisplayTwoTime.BorderInColor = System.Drawing.Color.FromArgb(((int)(((byte)(21)))), ((int)(((byte)(36)))), ((int)(((byte)(59)))));
this.LedDisplayTwoTime.CharCount = 6; this.LedDisplayTwoTime.CharCount = 6;
this.LedDisplayTwoTime.ForeColor = System.Drawing.Color.Lime; this.LedDisplayTwoTime.ForeColor = System.Drawing.Color.Lime;
this.LedDisplayTwoTime.Location = new System.Drawing.Point(125, 605); this.LedDisplayTwoTime.Location = new System.Drawing.Point(99, 605);
this.LedDisplayTwoTime.Name = "LedDisplayTwoTime"; this.LedDisplayTwoTime.Name = "LedDisplayTwoTime";
this.LedDisplayTwoTime.Size = new System.Drawing.Size(118, 34); this.LedDisplayTwoTime.Size = new System.Drawing.Size(118, 34);
this.LedDisplayTwoTime.TabIndex = 121; this.LedDisplayTwoTime.TabIndex = 121;
@ -1083,7 +1073,7 @@ namespace GuideScreen.UI
// //
this.uiLabel20.Font = new System.Drawing.Font("微软雅黑", 15F, System.Drawing.FontStyle.Bold); this.uiLabel20.Font = new System.Drawing.Font("微软雅黑", 15F, System.Drawing.FontStyle.Bold);
this.uiLabel20.ForeColor = System.Drawing.Color.White; this.uiLabel20.ForeColor = System.Drawing.Color.White;
this.uiLabel20.Location = new System.Drawing.Point(255, 405); this.uiLabel20.Location = new System.Drawing.Point(250, 405);
this.uiLabel20.Name = "uiLabel20"; this.uiLabel20.Name = "uiLabel20";
this.uiLabel20.Size = new System.Drawing.Size(84, 26); this.uiLabel20.Size = new System.Drawing.Size(84, 26);
this.uiLabel20.Style = Sunny.UI.UIStyle.Custom; this.uiLabel20.Style = Sunny.UI.UIStyle.Custom;
@ -1100,7 +1090,7 @@ namespace GuideScreen.UI
this.LedDisplayTwoCount.BorderInColor = System.Drawing.Color.FromArgb(((int)(((byte)(21)))), ((int)(((byte)(36)))), ((int)(((byte)(59))))); this.LedDisplayTwoCount.BorderInColor = System.Drawing.Color.FromArgb(((int)(((byte)(21)))), ((int)(((byte)(36)))), ((int)(((byte)(59)))));
this.LedDisplayTwoCount.CharCount = 6; this.LedDisplayTwoCount.CharCount = 6;
this.LedDisplayTwoCount.ForeColor = System.Drawing.Color.Lime; this.LedDisplayTwoCount.ForeColor = System.Drawing.Color.Lime;
this.LedDisplayTwoCount.Location = new System.Drawing.Point(238, 605); this.LedDisplayTwoCount.Location = new System.Drawing.Point(240, 605);
this.LedDisplayTwoCount.Name = "LedDisplayTwoCount"; this.LedDisplayTwoCount.Name = "LedDisplayTwoCount";
this.LedDisplayTwoCount.Size = new System.Drawing.Size(118, 34); this.LedDisplayTwoCount.Size = new System.Drawing.Size(118, 34);
this.LedDisplayTwoCount.TabIndex = 118; this.LedDisplayTwoCount.TabIndex = 118;
@ -1110,7 +1100,7 @@ namespace GuideScreen.UI
// //
this.uiLabel5.Font = new System.Drawing.Font("微软雅黑", 15F, System.Drawing.FontStyle.Bold); this.uiLabel5.Font = new System.Drawing.Font("微软雅黑", 15F, System.Drawing.FontStyle.Bold);
this.uiLabel5.ForeColor = System.Drawing.Color.White; this.uiLabel5.ForeColor = System.Drawing.Color.White;
this.uiLabel5.Location = new System.Drawing.Point(136, 561); this.uiLabel5.Location = new System.Drawing.Point(118, 561);
this.uiLabel5.Name = "uiLabel5"; this.uiLabel5.Name = "uiLabel5";
this.uiLabel5.Size = new System.Drawing.Size(96, 35); this.uiLabel5.Size = new System.Drawing.Size(96, 35);
this.uiLabel5.Style = Sunny.UI.UIStyle.Custom; this.uiLabel5.Style = Sunny.UI.UIStyle.Custom;
@ -1124,7 +1114,7 @@ namespace GuideScreen.UI
// //
this.lblElectricity2.Font = new System.Drawing.Font("微软雅黑", 15F, System.Drawing.FontStyle.Bold); this.lblElectricity2.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.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(109)))), ((int)(((byte)(212)))), ((int)(((byte)(0)))));
this.lblElectricity2.Location = new System.Drawing.Point(147, 534); this.lblElectricity2.Location = new System.Drawing.Point(129, 534);
this.lblElectricity2.Name = "lblElectricity2"; this.lblElectricity2.Name = "lblElectricity2";
this.lblElectricity2.Size = new System.Drawing.Size(75, 26); this.lblElectricity2.Size = new System.Drawing.Size(75, 26);
this.lblElectricity2.Style = Sunny.UI.UIStyle.Custom; this.lblElectricity2.Style = Sunny.UI.UIStyle.Custom;
@ -1152,7 +1142,7 @@ namespace GuideScreen.UI
// //
this.uiLabel25.Font = new System.Drawing.Font("微软雅黑", 15F, System.Drawing.FontStyle.Bold); this.uiLabel25.Font = new System.Drawing.Font("微软雅黑", 15F, System.Drawing.FontStyle.Bold);
this.uiLabel25.ForeColor = System.Drawing.Color.White; this.uiLabel25.ForeColor = System.Drawing.Color.White;
this.uiLabel25.Location = new System.Drawing.Point(142, 405); this.uiLabel25.Location = new System.Drawing.Point(119, 405);
this.uiLabel25.Name = "uiLabel25"; this.uiLabel25.Name = "uiLabel25";
this.uiLabel25.Size = new System.Drawing.Size(84, 26); this.uiLabel25.Size = new System.Drawing.Size(84, 26);
this.uiLabel25.Style = Sunny.UI.UIStyle.Custom; this.uiLabel25.Style = Sunny.UI.UIStyle.Custom;
@ -1166,7 +1156,7 @@ namespace GuideScreen.UI
// //
this.uiLabel15.Font = new System.Drawing.Font("微软雅黑", 14.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.uiLabel15.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.ForeColor = System.Drawing.Color.White;
this.uiLabel15.Location = new System.Drawing.Point(127, 352); this.uiLabel15.Location = new System.Drawing.Point(110, 352);
this.uiLabel15.Name = "uiLabel15"; this.uiLabel15.Name = "uiLabel15";
this.uiLabel15.Size = new System.Drawing.Size(206, 40); this.uiLabel15.Size = new System.Drawing.Size(206, 40);
this.uiLabel15.Style = Sunny.UI.UIStyle.Custom; this.uiLabel15.Style = Sunny.UI.UIStyle.Custom;
@ -1179,7 +1169,7 @@ namespace GuideScreen.UI
// LedBulbOneRun // LedBulbOneRun
// //
this.LedBulbOneRun.Color = System.Drawing.Color.Gray; this.LedBulbOneRun.Color = System.Drawing.Color.Gray;
this.LedBulbOneRun.Location = new System.Drawing.Point(299, 47); this.LedBulbOneRun.Location = new System.Drawing.Point(285, 47);
this.LedBulbOneRun.Name = "LedBulbOneRun"; this.LedBulbOneRun.Name = "LedBulbOneRun";
this.LedBulbOneRun.Size = new System.Drawing.Size(41, 34); this.LedBulbOneRun.Size = new System.Drawing.Size(41, 34);
this.LedBulbOneRun.TabIndex = 62; this.LedBulbOneRun.TabIndex = 62;
@ -1193,7 +1183,7 @@ namespace GuideScreen.UI
this.LedDisplayOneTime.BorderInColor = System.Drawing.Color.FromArgb(((int)(((byte)(21)))), ((int)(((byte)(36)))), ((int)(((byte)(59))))); this.LedDisplayOneTime.BorderInColor = System.Drawing.Color.FromArgb(((int)(((byte)(21)))), ((int)(((byte)(36)))), ((int)(((byte)(59)))));
this.LedDisplayOneTime.CharCount = 6; this.LedDisplayOneTime.CharCount = 6;
this.LedDisplayOneTime.ForeColor = System.Drawing.Color.Lime; this.LedDisplayOneTime.ForeColor = System.Drawing.Color.Lime;
this.LedDisplayOneTime.Location = new System.Drawing.Point(125, 315); this.LedDisplayOneTime.Location = new System.Drawing.Point(108, 315);
this.LedDisplayOneTime.Name = "LedDisplayOneTime"; this.LedDisplayOneTime.Name = "LedDisplayOneTime";
this.LedDisplayOneTime.Size = new System.Drawing.Size(118, 34); this.LedDisplayOneTime.Size = new System.Drawing.Size(118, 34);
this.LedDisplayOneTime.TabIndex = 114; this.LedDisplayOneTime.TabIndex = 114;
@ -1203,7 +1193,7 @@ namespace GuideScreen.UI
// //
this.uiLabel23.Font = new System.Drawing.Font("微软雅黑", 15F, System.Drawing.FontStyle.Bold); this.uiLabel23.Font = new System.Drawing.Font("微软雅黑", 15F, System.Drawing.FontStyle.Bold);
this.uiLabel23.ForeColor = System.Drawing.Color.White; this.uiLabel23.ForeColor = System.Drawing.Color.White;
this.uiLabel23.Location = new System.Drawing.Point(19, 47); this.uiLabel23.Location = new System.Drawing.Point(10, 47);
this.uiLabel23.Name = "uiLabel23"; this.uiLabel23.Name = "uiLabel23";
this.uiLabel23.Size = new System.Drawing.Size(114, 37); this.uiLabel23.Size = new System.Drawing.Size(114, 37);
this.uiLabel23.Style = Sunny.UI.UIStyle.Custom; this.uiLabel23.Style = Sunny.UI.UIStyle.Custom;
@ -1230,7 +1220,7 @@ namespace GuideScreen.UI
// //
this.uiLabel12.Font = new System.Drawing.Font("微软雅黑", 15F, System.Drawing.FontStyle.Bold); this.uiLabel12.Font = new System.Drawing.Font("微软雅黑", 15F, System.Drawing.FontStyle.Bold);
this.uiLabel12.ForeColor = System.Drawing.Color.White; this.uiLabel12.ForeColor = System.Drawing.Color.White;
this.uiLabel12.Location = new System.Drawing.Point(136, 270); this.uiLabel12.Location = new System.Drawing.Point(119, 270);
this.uiLabel12.Name = "uiLabel12"; this.uiLabel12.Name = "uiLabel12";
this.uiLabel12.Size = new System.Drawing.Size(96, 35); this.uiLabel12.Size = new System.Drawing.Size(96, 35);
this.uiLabel12.Style = Sunny.UI.UIStyle.Custom; this.uiLabel12.Style = Sunny.UI.UIStyle.Custom;
@ -1258,9 +1248,9 @@ namespace GuideScreen.UI
// //
this.uiLabel1.Font = new System.Drawing.Font("微软雅黑", 14.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.uiLabel1.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.ForeColor = System.Drawing.Color.White;
this.uiLabel1.Location = new System.Drawing.Point(116, 44); this.uiLabel1.Location = new System.Drawing.Point(115, 44);
this.uiLabel1.Name = "uiLabel1"; this.uiLabel1.Name = "uiLabel1";
this.uiLabel1.Size = new System.Drawing.Size(211, 40); this.uiLabel1.Size = new System.Drawing.Size(195, 40);
this.uiLabel1.Style = Sunny.UI.UIStyle.Custom; this.uiLabel1.Style = Sunny.UI.UIStyle.Custom;
this.uiLabel1.StyleCustomMode = true; this.uiLabel1.StyleCustomMode = true;
this.uiLabel1.TabIndex = 91; this.uiLabel1.TabIndex = 91;
@ -1286,7 +1276,7 @@ namespace GuideScreen.UI
// //
this.uiLabel16.Font = new System.Drawing.Font("微软雅黑", 15F, System.Drawing.FontStyle.Bold); this.uiLabel16.Font = new System.Drawing.Font("微软雅黑", 15F, System.Drawing.FontStyle.Bold);
this.uiLabel16.ForeColor = System.Drawing.Color.White; this.uiLabel16.ForeColor = System.Drawing.Color.White;
this.uiLabel16.Location = new System.Drawing.Point(255, 94); this.uiLabel16.Location = new System.Drawing.Point(250, 94);
this.uiLabel16.Name = "uiLabel16"; this.uiLabel16.Name = "uiLabel16";
this.uiLabel16.Size = new System.Drawing.Size(84, 26); this.uiLabel16.Size = new System.Drawing.Size(84, 26);
this.uiLabel16.Style = Sunny.UI.UIStyle.Custom; this.uiLabel16.Style = Sunny.UI.UIStyle.Custom;
@ -1300,7 +1290,7 @@ namespace GuideScreen.UI
// //
this.lblElectricity1.Font = new System.Drawing.Font("微软雅黑", 15F, System.Drawing.FontStyle.Bold); this.lblElectricity1.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.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(109)))), ((int)(((byte)(212)))), ((int)(((byte)(0)))));
this.lblElectricity1.Location = new System.Drawing.Point(147, 228); this.lblElectricity1.Location = new System.Drawing.Point(130, 228);
this.lblElectricity1.Name = "lblElectricity1"; this.lblElectricity1.Name = "lblElectricity1";
this.lblElectricity1.Size = new System.Drawing.Size(75, 26); this.lblElectricity1.Size = new System.Drawing.Size(75, 26);
this.lblElectricity1.Style = Sunny.UI.UIStyle.Custom; this.lblElectricity1.Style = Sunny.UI.UIStyle.Custom;
@ -1314,7 +1304,7 @@ namespace GuideScreen.UI
// //
this.uiLabel10.Font = new System.Drawing.Font("微软雅黑", 15F, System.Drawing.FontStyle.Bold); this.uiLabel10.Font = new System.Drawing.Font("微软雅黑", 15F, System.Drawing.FontStyle.Bold);
this.uiLabel10.ForeColor = System.Drawing.Color.White; this.uiLabel10.ForeColor = System.Drawing.Color.White;
this.uiLabel10.Location = new System.Drawing.Point(142, 94); this.uiLabel10.Location = new System.Drawing.Point(119, 97);
this.uiLabel10.Name = "uiLabel10"; this.uiLabel10.Name = "uiLabel10";
this.uiLabel10.Size = new System.Drawing.Size(84, 26); this.uiLabel10.Size = new System.Drawing.Size(84, 26);
this.uiLabel10.Style = Sunny.UI.UIStyle.Custom; this.uiLabel10.Style = Sunny.UI.UIStyle.Custom;
@ -1339,11 +1329,51 @@ namespace GuideScreen.UI
this.uiLabel3.TextAlign = System.Drawing.ContentAlignment.MiddleLeft; this.uiLabel3.TextAlign = System.Drawing.ContentAlignment.MiddleLeft;
this.uiLabel3.ZoomScaleRect = new System.Drawing.Rectangle(0, 0, 0, 0); this.uiLabel3.ZoomScaleRect = new System.Drawing.Rectangle(0, 0, 0, 0);
// //
// uiLabel19
//
this.uiLabel19.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.uiLabel19.Location = new System.Drawing.Point(80, 84);
this.uiLabel19.Name = "uiLabel19";
this.uiLabel19.Size = new System.Drawing.Size(39, 476);
this.uiLabel19.Style = Sunny.UI.UIStyle.Custom;
this.uiLabel19.TabIndex = 131;
this.uiLabel19.TextAlign = System.Drawing.ContentAlignment.MiddleLeft;
this.uiLabel19.ZoomScaleRect = new System.Drawing.Rectangle(0, 0, 0, 0);
//
// thermometer
//
this.thermometer.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(30)))), ((int)(((byte)(159)))), ((int)(((byte)(255)))));
this.thermometer.GlassTubeColor = System.Drawing.Color.FromArgb(((int)(((byte)(47)))), ((int)(((byte)(64)))), ((int)(((byte)(86)))));
this.thermometer.LeftTemperatureUnit = HZH_Controls.Controls.TemperatureUnit.Re;
this.thermometer.Location = new System.Drawing.Point(9, 97);
this.thermometer.MaxValue = new decimal(new int[] {
0,
0,
0,
0});
this.thermometer.MercuryColor = System.Drawing.Color.FromArgb(((int)(((byte)(0)))), ((int)(((byte)(150)))), ((int)(((byte)(136)))));
this.thermometer.MinValue = new decimal(new int[] {
100,
0,
0,
-2147483648});
this.thermometer.Name = "thermometer";
this.thermometer.RightTemperatureUnit = HZH_Controls.Controls.TemperatureUnit.Re;
this.thermometer.Size = new System.Drawing.Size(110, 523);
this.thermometer.SplitCount = 10;
this.thermometer.TabIndex = 130;
this.thermometer.Value = new decimal(new int[] {
55,
0,
0,
0});
//
// uiPanel7 // uiPanel7
// //
this.uiPanel7.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom) 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.Left)
| System.Windows.Forms.AnchorStyles.Right))); | System.Windows.Forms.AnchorStyles.Right)));
this.uiPanel7.Controls.Add(this.uiLabel22);
this.uiPanel7.Controls.Add(this.pictureBox5); this.uiPanel7.Controls.Add(this.pictureBox5);
this.uiPanel7.Controls.Add(this.pictureBox4); this.uiPanel7.Controls.Add(this.pictureBox4);
this.uiPanel7.Controls.Add(this.pBoxPitWomanThree); this.uiPanel7.Controls.Add(this.pBoxPitWomanThree);
@ -1392,6 +1422,20 @@ namespace GuideScreen.UI
this.uiPanel7.TextAlignment = System.Drawing.ContentAlignment.MiddleCenter; this.uiPanel7.TextAlignment = System.Drawing.ContentAlignment.MiddleCenter;
this.uiPanel7.ZoomScaleRect = new System.Drawing.Rectangle(0, 0, 0, 0); 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 // pictureBox5
// //
this.pictureBox5.Image = ((System.Drawing.Image)(resources.GetObject("pictureBox5.Image"))); this.pictureBox5.Image = ((System.Drawing.Image)(resources.GetObject("pictureBox5.Image")));
@ -1585,9 +1629,9 @@ namespace GuideScreen.UI
// //
// lblPassengerFlowHistoryCount // lblPassengerFlowHistoryCount
// //
this.lblPassengerFlowHistoryCount.Font = new System.Drawing.Font("微软雅黑", 18F, System.Drawing.FontStyle.Bold); this.lblPassengerFlowHistoryCount.Font = new System.Drawing.Font("微软雅黑", 15F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.lblPassengerFlowHistoryCount.ForeColor = System.Drawing.Color.Yellow; this.lblPassengerFlowHistoryCount.ForeColor = System.Drawing.Color.Yellow;
this.lblPassengerFlowHistoryCount.Location = new System.Drawing.Point(972, 916); this.lblPassengerFlowHistoryCount.Location = new System.Drawing.Point(847, 5);
this.lblPassengerFlowHistoryCount.Name = "lblPassengerFlowHistoryCount"; this.lblPassengerFlowHistoryCount.Name = "lblPassengerFlowHistoryCount";
this.lblPassengerFlowHistoryCount.Size = new System.Drawing.Size(221, 45); this.lblPassengerFlowHistoryCount.Size = new System.Drawing.Size(221, 45);
this.lblPassengerFlowHistoryCount.Style = Sunny.UI.UIStyle.Custom; this.lblPassengerFlowHistoryCount.Style = Sunny.UI.UIStyle.Custom;
@ -1907,6 +1951,20 @@ namespace GuideScreen.UI
this.lblTime.TextAlign = System.Drawing.ContentAlignment.MiddleCenter; this.lblTime.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
this.lblTime.ZoomScaleRect = new System.Drawing.Rectangle(0, 0, 0, 0); this.lblTime.ZoomScaleRect = new System.Drawing.Rectangle(0, 0, 0, 0);
// //
// uiLabel24
//
this.uiLabel24.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.uiLabel24.ForeColor = System.Drawing.Color.White;
this.uiLabel24.Location = new System.Drawing.Point(40, 87);
this.uiLabel24.Name = "uiLabel24";
this.uiLabel24.Size = new System.Drawing.Size(52, 37);
this.uiLabel24.Style = Sunny.UI.UIStyle.Custom;
this.uiLabel24.StyleCustomMode = true;
this.uiLabel24.TabIndex = 132;
this.uiLabel24.Text = "KPa";
this.uiLabel24.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
this.uiLabel24.ZoomScaleRect = new System.Drawing.Rectangle(0, 0, 0, 0);
//
// FormScreen // FormScreen
// //
this.AllowShowTitle = false; this.AllowShowTitle = false;
@ -2093,5 +2151,9 @@ namespace GuideScreen.UI
private PictureBox pBoxManPitOne; private PictureBox pBoxManPitOne;
private PictureBox pictureBox5; private PictureBox pictureBox5;
private PictureBox pictureBox4; private PictureBox pictureBox4;
private Sunny.UI.UILabel uiLabel6;
private Sunny.UI.UILabel uiLabel19;
private Sunny.UI.UILabel uiLabel22;
private Sunny.UI.UILabel uiLabel24;
} }
} }

@ -39,8 +39,10 @@ namespace GuideScreen.UI
private CommonController commonController; private CommonController commonController;
//PLC相关 //PLC相关
private PLCController plcController; private PLCController plcController;
//客流量 //今日客流量
private int passengerFlowDayCount = 0; private int passengerFlowDayTotal = 0;
//客流总量
private int passengerFlowTotal = 0;
//男厕使用数量 //男厕使用数量
private const string currentManNumStrFormat = "5/{0}"; private const string currentManNumStrFormat = "5/{0}";
//女厕使用数量 //女厕使用数量
@ -78,21 +80,16 @@ namespace GuideScreen.UI
//获取标题 //获取标题
lblTitle.Text = commonController.Title; lblTitle.Text = commonController.Title;
//启动客流服务
//passengerFlowStatisticsController.StartMonitoring();
//获取今日客流数
passengerFlowDayCount = passengerFlowStatisticsController.GetDayCount(DateTime.Now);
//更新客流数据
PassengerFlowUpdate();
//开启PLC通信 //开启PLC通信
plcController.Start(); plcController.Start();
//今日厕位使用情况 //今日厕位使用情况
toilets = plcController.ToiletPositionRecordTotalByToday(); toilets = plcController.ToiletPositionRecordTotalByToday();
ToileUseChartByDay();
//总统计
passengerFlowTotal = plcController.GetToiletPositionRecordTotal();
PassengerFlowUpdate();
//获取天气信息 //获取天气信息
await GetWeather(); await GetWeather();
@ -241,6 +238,14 @@ namespace GuideScreen.UI
} }
} }
if (use)
{
passengerFlowTotal++;
}
//更新客流信息
PassengerFlowUpdate();
ToileUseChartByDay(); ToileUseChartByDay();
SetDayWarterAndelEctricity(); SetDayWarterAndelEctricity();
@ -345,23 +350,27 @@ namespace GuideScreen.UI
/// <param name="e"></param> /// <param name="e"></param>
private void PassengerFlowStatisticsController_Action(object sender, Common.Services.Models.PassengerFlowStatisticsModel e) private void PassengerFlowStatisticsController_Action(object sender, Common.Services.Models.PassengerFlowStatisticsModel e)
{ {
passengerFlowDayCount++;
PassengerFlowUpdate();
} }
/// <summary>
/// 客流量更新
/// </summary>
private void PassengerFlowUpdate() private void PassengerFlowUpdate()
{ {
//日统计 passengerFlowDayTotal = toilets.Values.Sum();
var dayStr = passengerFlowDayCount.ToString("D6"); if (passengerFlowDayTotal == 0)
lblPassengerFlow.Text = dayStr.Aggregate(string.Empty, (c, i) => c + i + " "); {
passengerFlowDayTotal = 1;
//周统计 }
//var weekModel = passengerFlowStatisticsController.GetWeekCount(DateTime.Now); lblPassengerFlow.Text = passengerFlowDayTotal.ToString("D5").Aggregate(string.Empty, (c, i) => c + i + " ");
//PassengerFlowChart(weekModel);
//历史统计 if (passengerFlowTotal == 0)
var totalStr = passengerFlowStatisticsController.GetTotalCount().ToString("D8"); {
lblPassengerFlowHistoryCount.Text = totalStr.Aggregate(string.Empty, (c, i) => c + i + " "); passengerFlowTotal = 1;
}
lblPassengerFlowHistoryCount.Text = passengerFlowTotal.ToString("D8").Aggregate(string.Empty, (c, i) => c + i + " ");
//侧位图表
ToileUseChartByDay();
} }
#endregion #endregion
@ -623,13 +632,12 @@ namespace GuideScreen.UI
{ {
value1 = 1; value1 = 1;
} }
//模拟计算
var dayStr = Math.Round(value1 * 0.0085,2).ToString().Aggregate(string.Empty, (c, i) => c + i + " "); var dayStr = Math.Round(value1 * 0.0085,2).ToString().Aggregate(string.Empty, (c, i) => c + i + " ");
lblDayWarter.Text = $"今日用水量 {dayStr} 吨 "; lblDayWarter.Text = $"今日用水量 {dayStr} 吨 ";
var dayStr1 = Math.Round(value1 * 0.0038,2).ToString().Aggregate(string.Empty, (c, i) => c + i + " "); var dayStr1 = Math.Round(value1 * 0.0038,2).ToString().Aggregate(string.Empty, (c, i) => c + i + " ");
lblElectricQuantity.Text = $"今日耗电量 {dayStr1} 千瓦时 "; lblElectricQuantity.Text = $"今日耗电量 {dayStr1} 千瓦时 ";
//今日客流量
lblPassengerFlow.Text= count.ToString("D5").Aggregate(string.Empty, (c, i) => c + i + " ");
} }
#region Timer #region Timer
@ -652,17 +660,16 @@ namespace GuideScreen.UI
var enviHydrogenSulfide = 0.09 + (rd.Next(6,8)/100f); //e.GetValue<float>(); var enviHydrogenSulfide = 0.09 + (rd.Next(6,8)/100f); //e.GetValue<float>();
lblEnviHydrogenSulfide.Text = Math.Round(enviHydrogenSulfide, 2).ToString() + " PPM"; lblEnviHydrogenSulfide.Text = Math.Round(enviHydrogenSulfide, 2).ToString() + " PPM";
processEnviHydrogenSulfide.Value = Convert.ToInt32(enviHydrogenSulfide); processEnviHydrogenSulfide.Value = Convert.ToInt32(enviHydrogenSulfide * 100);
var ammoniaGas = 0.01 + (rd.Next(1, 3) / 100f);//e.GetValue<float>(); var ammoniaGas = 0.01 + (rd.Next(1, 3) / 100f);//e.GetValue<float>();
lblEnviAmmoniaGas.Text = Math.Round(ammoniaGas, 2).ToString() + " PPM"; lblEnviAmmoniaGas.Text = Math.Round(ammoniaGas, 2).ToString() + " PPM";
processEnviAmmoniaGas.Value = Convert.ToInt32(ammoniaGas); processEnviAmmoniaGas.Value = Convert.ToInt32(ammoniaGas * 100) ;
} }
//零点以后更新的数据 //零点以后更新的数据
if (dateTime.ToString("HH:mm:ss") == zeroTime) if (dateTime.ToString("HH:mm:ss") == zeroTime)
{ {
//更新厕位使用情况 //更新厕位使用情况
toilets = plcController.ToiletPositionRecordTotalByToday(); toilets = plcController.ToiletPositionRecordTotalByToday();
ToileUseChartByDay(); ToileUseChartByDay();

@ -8846,6 +8846,6 @@
<value>107, 17</value> <value>107, 17</value>
</metadata> </metadata>
<metadata name="$this.TrayHeight" type="System.Int32, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089"> <metadata name="$this.TrayHeight" type="System.Int32, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<value>25</value> <value>91</value>
</metadata> </metadata>
</root> </root>

@ -1,9 +1,11 @@
 
using GuideScreen.Common; using GuideScreen.Common;
using GuideScreen.Common.Constants; using GuideScreen.Common.Constants;
using System; using System;
using System.Collections.Generic; using System.Collections.Generic;
using System.Linq; using System.Linq;
using System.Threading;
using System.Windows.Forms; using System.Windows.Forms;
namespace GuideScreen.UI namespace GuideScreen.UI
@ -16,12 +18,26 @@ namespace GuideScreen.UI
[STAThread] [STAThread]
static void Main() static void Main()
{ {
Application.EnableVisualStyles(); //--------------------------只运行一个--------------------------------------------------
Application.SetCompatibleTextRenderingDefault(false); //第一个参数:true--给调用线程赋予互斥体的初始所属权
Application.ThreadException += Application_ThreadException; //第一个参数:互斥体的名称
Application.ApplicationExit += Application_ApplicationExit; //第三个参数:返回值,如果调用线程已被授予互斥体的初始所属权,则返回true
AppDomain.CurrentDomain.UnhandledException += CurrentDomain_UnhandledException; bool flag = false;
Application.Run(new FormScreen()); using (Mutex mutex = new Mutex(true, "GuideScreen.UI 3811C0BC-C49B-4181-B67F-124DFE8D4D5C", out flag))
{
if (!flag)
{
MessageBox.Show("【智慧真空公厕引导系统】已经运行!", "请确定", MessageBoxButtons.OK, MessageBoxIcon.Exclamation);
Environment.Exit(0);
}
Application.EnableVisualStyles();
Application.SetCompatibleTextRenderingDefault(false);
Application.ThreadException += Application_ThreadException;
Application.ApplicationExit += Application_ApplicationExit;
AppDomain.CurrentDomain.UnhandledException += CurrentDomain_UnhandledException;
Application.Run(new FormScreen());
}
} }
static void Application_ApplicationExit(object sender, EventArgs e) static void Application_ApplicationExit(object sender, EventArgs e)
@ -32,14 +48,14 @@ namespace GuideScreen.UI
static void Application_ThreadException(object sender, System.Threading.ThreadExceptionEventArgs e) static void Application_ThreadException(object sender, System.Threading.ThreadExceptionEventArgs e)
{ {
e.Exception.WriteFatalLog(); e.Exception.WriteFatalLog();
MessageBox.Show(e.Exception.Message); //MessageBox.Show(e.Exception.Message);
} }
static void CurrentDomain_UnhandledException(object sender, UnhandledExceptionEventArgs e) static void CurrentDomain_UnhandledException(object sender, UnhandledExceptionEventArgs e)
{ {
var message = ((Exception)e.ExceptionObject).Message; var message = ((Exception)e.ExceptionObject).Message;
message.WriteFatalLog(); message.WriteFatalLog();
MessageBox.Show(message); //MessageBox.Show(message);
} }
} }

Loading…
Cancel
Save