Commit b26a0573 authored by 潘栩锋's avatar 潘栩锋 🚴

Merge remote-tracking branch 'origin/master' into dev5.5

parents a8f8dabe 0e43eedb
......@@ -51,5 +51,5 @@ using System.Windows;
//可以指定所有这些值,也可以使用“生成号”和“修订号”的默认值,
// 方法是按如下所示使用“*”: :
// [assembly: AssemblyVersion("1.0.*")]
[assembly: AssemblyVersion("5.2.0.0")]
[assembly: AssemblyFileVersion("5.2.0.0")]
[assembly: AssemblyVersion("5.2.3.0")]
[assembly: AssemblyFileVersion("5.2.3.0")]
......@@ -51,5 +51,5 @@ using System.Windows;
// 可以指定所有这些值,也可以使用“内部版本号”和“修订号”的默认值,
// 方法是按如下所示使用“*”:
// [assembly: AssemblyVersion("1.0.*")]
[assembly: AssemblyVersion("5.1.2.0")]
[assembly: AssemblyFileVersion("5.1.2.0")]
[assembly: AssemblyVersion("5.1.3.0")]
[assembly: AssemblyFileVersion("5.1.3.0")]
......@@ -32,5 +32,5 @@ using System.Runtime.InteropServices;
//可以指定所有这些值,也可以使用“生成号”和“修订号”的默认值,
// 方法是按如下所示使用“*”: :
// [assembly: AssemblyVersion("1.0.*")]
[assembly: AssemblyVersion("5.1.2.0")]
[assembly: AssemblyFileVersion("5.1.2.0")]
[assembly: AssemblyVersion("5.1.3.0")]
[assembly: AssemblyFileVersion("5.1.3.0")]
......@@ -21,7 +21,7 @@ using Misc;
namespace FLY.Weight.Server
{
public class WeightSystem: IWeightSystemService, Misc.ISaveToXml,IPropertyOpt
public class WeightSystem : IWeightSystemService, Misc.ISaveToXml, IPropertyOpt
{
#region 延时推送 MARKNO
const int MARKNO_SAVE = 1;
......@@ -38,7 +38,7 @@ namespace FLY.Weight.Server
/// 当卸料时,提起3秒前的数据保存
/// </summary>
List<Dictionary<WeighterC, Lc_Mix>> mix10 = new List<Dictionary<WeighterC, Lc_Mix>>();
public WeighterAccessory Accessory { get; } = new WeighterAccessory();
private PLCProxySystem plcos = new PLCProxySystem();
......@@ -703,7 +703,8 @@ namespace FLY.Weight.Server
foreach (var plc in plcos.PLCs)
plc.Build();
//这个是从测厚仪获取的,每几秒就写一次,不调试!!!!!
plcos.IgnoreLogProperties.Add(new SenderProperty() { sender = Accessory, propertyName = "CurrentVelocitySet" });
}
......
<?xml version="1.0" encoding="utf-8"?>
<BulkGraphParam DynAreaWidth="250" IsReversed="False">
<Items>
<BulkTabItem Header="自动上料" ColumnCount="1" RowCount="2" ControllerState="SCAN">
<Graphs>
<BulkGraphItemCustom Column="0" Row="0" RowSpan="1" ColumnSpan="1" Module="weight.FLY.Weight.UI.Client.MainPageModule" />
<BulkGraphItemCustom Column="0" Row="1" RowSpan="1" ColumnSpan="1" Module="weight.FLY.Weight.UI.Client.GraphModule" />
</Graphs>
</BulkTabItem>
<BulkTabItem Header="自动风环" ColumnCount="1" RowCount="4" ControllerState="SCAN">
<Graphs>
<BulkGraphItemScan2 Column="0" Row="0" RowSpan="1" ColumnSpan="1" Title="扫描图" Mix="1" YRangePercent="3" IsAutoTarget="True" IsPercent="True" ChartType="Column" BM="-2" />
<BulkGraphItemScan2 Column="0" Row="1" RowSpan="1" ColumnSpan="1" Title="扫描图" Mix="1" YRangePercent="3" IsAutoTarget="True" IsPercent="True" ChartType="Column" BM="-1" />
<BulkGraphItemCustom Column="0" Row="2" RowSpan="2" ColumnSpan="1" Module="feedbackrenzijia.FLY.FeedbackRenZiJia.UI.Client.MainPageModule" />
</Graphs>
</BulkTabItem>
<BulkTabItem Header="扫 描" ColumnCount="1" RowCount="4" ControllerState="SCAN">
<Graphs>
<BulkGraphItemScan Column="0" Row="0" RowSpan="1" ColumnSpan="1" Title="扫描图" Mix="1" YRangePercent="3" IsAutoTarget="True" IsPercent="True" ChartType="Column" BM="-3" />
<BulkGraphItemScan Column="0" Row="1" RowSpan="1" ColumnSpan="1" Title="扫描图" Mix="1" YRangePercent="3" IsAutoTarget="True" IsPercent="True" ChartType="Column" BM="-2" />
<BulkGraphItemScan Column="0" Row="2" RowSpan="1" ColumnSpan="1" Title="扫描图" Mix="1" YRangePercent="3" IsAutoTarget="True" IsPercent="True" ChartType="Column" BM="-1" />
<BulkGraphItemScan Column="0" Row="3" RowSpan="1" ColumnSpan="1" Title="扫描图" Mix="1" YRangePercent="3" IsAutoTarget="True" IsPercent="True" ChartType="Column" BM="0" />
</Graphs>
</BulkTabItem>
<BulkTabItem Header="扫描环形" ColumnCount="1" RowCount="1" ControllerState="SCAN">
<Graphs>
<BulkGraphItemCircular Column="0" Row="0" RowSpan="1" ColumnSpan="1" Title="扫描图" Mix="1" YRangePercent="1" IsAutoTarget="False" IsPercent="False" BM="-1" BoltNoWithManual1st="1" ManualCnt="8" MPIsRight="True" />
</Graphs>
</BulkTabItem>
<BulkTabItem Header="2σ趋势图" ColumnCount="1" RowCount="2" ControllerState="SCAN">
<Graphs>
<BulkGraphItemScan Column="0" Row="0" RowSpan="1" ColumnSpan="1" Title="扫描图" Mix="1" YRangePercent="3" IsAutoTarget="True" IsPercent="False" ChartType="Column" BM="-1" />
<BulkGraphItemTrend Column="0" Row="1" RowSpan="1" ColumnSpan="1" Title="趋势图" Mix="1" YRangePercent="3" IsAutoTarget="True" IsPercent="True" Len="120" BeginNo="0" EndNo="20" IsAll="True" Type="Sigma2" XType="Time" />
</Graphs>
</BulkTabItem>
<BulkTabItem Header="定 点" ColumnCount="1" RowCount="2" ControllerState="SCAN">
<Graphs>
<BulkGraphItemFix Column="0" Row="0" RowSpan="1" ColumnSpan="1" Title="3s 定点图" Mix="1" IsAutoTarget="True" IsPercent="True" Len="1000" Interval="1000" AnalyzeModule="FFT.FLY.FFT.FFTC" />
<BulkGraphItemFix Column="0" Row="1" RowSpan="1" ColumnSpan="1" Title="0.1s 定点图" Mix="10" IsAutoTarget="True" IsPercent="True" Len="500" Interval="50" AnalyzeModule="FFT.FLY.FFT.FFTC" />
</Graphs>
</BulkTabItem>
</Items>
<DynAreaItems>
<DynAreaItem Module="feedbackrenzijia.FLY.FeedbackRenZiJia.UI.Client.DynAreaModule" />
<DynAreaItem Module="weight.FLY.Weight.UI.Client.DynAreaModule" />
</DynAreaItems>
</BulkGraphParam>
\ No newline at end of file
This diff is collapsed.
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment