Skip to content

H
hemei
Commit 8fb735ed authored by 潘栩锋's avatar 潘栩锋 🚴
Browse files
Options

吸料与称重合体

parent 611f4460
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 480 additions and 269 deletions
Project.FLY.DownBlowing/FLY.DownBlowing.UI.Server/Properties/AssemblyInfo.cs
View file @ 8fb735ed
...@@ -51,7 +51,7 @@ using System.Windows; ...@@ -51,7 +51,7 @@ using System.Windows;
// 可以指定所有值，也可以使用以下所示的 "*" 预置版本号和修订号 // 可以指定所有值，也可以使用以下所示的 "*" 预置版本号和修订号
// 方法是按如下所示使用“*”: : // 方法是按如下所示使用“*”: :
// [assembly: AssemblyVersion("1.0.*")] // [assembly: AssemblyVersion("1.0.*")]
[assembly: AssemblyVersion("7.0.9")] [assembly: AssemblyVersion("7.5.0")]
[assembly: AssemblyFileVersion("7.0.9")] [assembly: AssemblyFileVersion("7.5.0")]
[assembly: Guid("A4B71A37-7B77-47AA-9F59-ACC3EF84C4E0")] [assembly: Guid("A4B71A37-7B77-47AA-9F59-ACC3EF84C4E0")]
Project.FLY.Weight/FLY.Weight.UI.Server/Properties/AssemblyInfo.cs
View file @ 8fb735ed
...@@ -51,6 +51,6 @@ using System.Windows; ...@@ -51,6 +51,6 @@ using System.Windows;
// 可以指定所有这些值，也可以使用“内部版本号”和“修订号”的默认值， // 可以指定所有这些值，也可以使用“内部版本号”和“修订号”的默认值，
// 方法是按如下所示使用“*”: // 方法是按如下所示使用“*”:
// [assembly: AssemblyVersion("1.0.*")] // [assembly: AssemblyVersion("1.0.*")]
[assembly: AssemblyVersion("7.0.2.0")] [assembly: AssemblyVersion("7.5.0.0")]
[assembly: AssemblyFileVersion("7.0.2.0")] [assembly: AssemblyFileVersion("7.5.0.0")]
[assembly: Guid("AC4FFE57-FF42-4B4D-9E23-FF583D78187D")] [assembly: Guid("AC4FFE57-FF42-4B4D-9E23-FF583D78187D")]
Project.FLY.Weight/FLY.Weight.UI.Server/WdSetupFeeder.xaml.cs
View file @ 8fb735ed
...@@ -165,14 +165,18 @@ namespace FLY.Weight.UI.Server ...@@ -165,14 +165,18 @@ namespace FLY.Weight.UI.Server
} }
} }
SelectedItem = null;
foreach (var item in PlcGroupItems) if (File.Exists(plcgroup_filePath))
{ {
if (IsSameContent(item.Path, plcgroup_filePath)) SelectedItem = null;
foreach (var item in PlcGroupItems)
{ {
//找到了 if (IsSameContent(item.Path, plcgroup_filePath))
SelectedItem = item; {
break; //找到了
SelectedItem = item;
break;
}
} }
} }
} }
......
脚本/install/install.json
View file @ 8fb735ed
...@@ -54,7 +54,8 @@ ...@@ -54,7 +54,8 @@
"Name":"称重", "Name":"称重",
"IsAutoRun":true, "IsAutoRun":true,
"Others":[ "Others":[
"Gage1\\plcgroups" "Gage1\\plcgroups",
"Gage1\\feeder_plcgroups"
] ]
}, },
{ {
......
脚本/release_conf/FLY.Thick.BlowingScan.UI.Client/default/layout.default/风环-称重-下吹/graphcustom.json
View file @ 8fb735ed
...@@ -198,7 +198,7 @@ ...@@ -198,7 +198,7 @@
{ {
"Graphs": [ "Graphs": [
{ {
"ID": 53704147, "ID": 48252249,
"Rect": "0, 0, 1, 1" "Rect": "0, 0, 1, 1"
} }
], ],
...@@ -215,158 +215,158 @@ ...@@ -215,158 +215,158 @@
], ],
"Components": [ "Components": [
{ {
"ID": 17611460, "ID": 13630977,
"Module": "FLY.Weight.UI.Client.UiModule.UiModule2_MainGraph", "Module": "FLY.DownBlowing.UI.Client.UiModule.UiModule2_MenuSetting",
"ServiceContainerName": "gage0.service" "ServiceContainerName": "gage0.service"
}, },
{ {
"ID": 24554252, "ID": 24847051,
"Module": "FLY.DownBlowing.UI.Client.UiModule.UiModule2_TempAreaPanel", "Module": "FLY.Weight.UI.Client.UiModule.UiModule2_MenuSetting",
"ServiceContainerName": "gage0.service" "ServiceContainerName": "gage0.service"
}, },
{ {
"ID": 48662582, "ID": 44866487,
"Module": "FLY.FeedbackRenZiJia.UI.Client.UiModule.UiModule2_GraphAirRing", "Module": "FLY.FeedbackRenZiJia.UI.Client.UiModule.UiModule2_MenuSetting",
"ServiceContainerName": "gage0.service" "ServiceContainerName": "gage0.service"
}, },
{ {
"ID": 1501989, "ID": 43552930,
"Module": "FLY.Thick.Blowing.UI.UiModule.UiModule2_ScanGraph2", "Module": "FLY.Thick.BlowingScan.UI.Client.UiModule.UiModule2_MenuSetting",
"ServiceContainerName": "gage0.service" "ServiceContainerName": "gage0.service"
}, },
{ {
"ID": 52015891, "ID": 8223768,
"Module": "FLY.Thick.Blowing.UI.UiModule.UiModule2_ScanGraph2", "Module": "FLY.Thick.Blowing.UI.UiModule.UiModule2_MenuProfile",
"ServiceContainerName": "gage0.service" "ServiceContainerName": "gage0.service"
}, },
{ {
"ID": 44960719, "ID": 66283545,
"Module": "FLY.Thick.Blowing.UI.UiModule.UiModule2_ScanGraph", "Module": "FLY.Thick.Base.UI.UiModule.UiModule2_MenuMotion",
"ServiceContainerName": "gage0.service" "ServiceContainerName": "gage0.service"
}, },
{ {
"ID": 38016717, "ID": 31616714,
"Module": "FLY.Thick.Blowing.UI.UiModule.UiModule2_ScanGraph", "Module": "FLY.Thick.Base.UI.UiModule.UiModule2_DynAreaThick",
"ServiceContainerName": "gage0.service" "ServiceContainerName": "gage0.service"
}, },
{ {
"ID": 6455868, "ID": 38141718,
"Module": "FLY.Thick.Blowing.UI.UiModule.UiModule2_ScanGraph", "Module": "FLY.Thick.Blowing.UI.UiModule.UiModule2_DynAreaProfile",
"ServiceContainerName": "gage0.service" "ServiceContainerName": "gage0.service"
}, },
{ {
"ID": 33594135, "ID": 27935207,
"Module": "FLY.Thick.Blowing.UI.UiModule.UiModule2_ScanGraph2", "Module": "FLY.Thick.BlowingScan.UI.Client.UiModule.UiModule2_DynAreaFilmWidth",
"ServiceContainerName": "gage0.service" "ServiceContainerName": "gage0.service"
}, },
{ {
"ID": 29300865, "ID": 64726287,
"Module": "FLY.Weight.UI.Client.UiModule.UiModule2_FlowGraph", "Module": "FLY.Thick.Base.UI.UiModule.UiModule2_DynAreaSample",
"ServiceContainerName": "gage0.service" "ServiceContainerName": "gage0.service"
}, },
{ {
"ID": 64244561, "ID": 48687165,
"Module": "FLY.Thick.Blowing.UI.UiModule.UiModule2_TrendGraph", "Module": "FLY.Thick.BlowingScan.UI.Client.UiModule.UiModule2_DynAreaBlowing",
"ServiceContainerName": "gage0.service" "ServiceContainerName": "gage0.service"
}, },
{ {
"ID": 62419562, "ID": 21215025,
"Module": "FLY.Thick.Blowing.UI.UiModule.UiModule2_ScanGraphCircular", "Module": "FLY.Thick.Base.UI.UiModule.UiModule2_DynAreaIO",
"ServiceContainerName": "gage0.service" "ServiceContainerName": "gage0.service"
}, },
{ {
"ID": 28792051, "ID": 22167861,
"Module": "FLY.Thick.Base.UI.UiModule.UiModule2_FixGraph", "Module": "FLY.FeedbackRenZiJia.UI.Client.UiModule.UiModule2_DynAreaAirRing",
"ServiceContainerName": "gage0.service" "ServiceContainerName": "gage0.service"
}, },
{ {
"ID": 18036132, "ID": 40975656,
"Module": "FLY.Thick.Base.UI.UiModule.UiModule2_FixGraph", "Module": "FLY.Weight.UI.Client.UiModule.UiModule2_DynAreaWeight",
"ServiceContainerName": "gage0.service" "ServiceContainerName": "gage0.service"
}, },
{ {
"ID": 57121810, "ID": 36105850,
"Module": "FLY.DownBlowing.UI.Client.UiModule.UiModule2_WinderPanel", "Module": "FLY.DownBlowing.UI.Client.UiModule.UiModule2_DynAreaWinder",
"ServiceContainerName": "gage0.service" "ServiceContainerName": "gage0.service"
}, },
{ {
"ID": 53704147, "ID": 17611460,
"Module": "FLY.DownBlowing.UI.Client.UiModule.UiModule2_FeederPanel", "Module": "FLY.Weight.UI.Client.UiModule.UiModule2_MainGraph",
"ServiceContainerName": "gage0.service" "ServiceContainerName": "gage0.service"
}, },
{ {
"ID": 13630977, "ID": 24554252,
"Module": "FLY.DownBlowing.UI.Client.UiModule.UiModule2_MenuSetting", "Module": "FLY.DownBlowing.UI.Client.UiModule.UiModule2_TempAreaPanel",
"ServiceContainerName": "gage0.service" "ServiceContainerName": "gage0.service"
}, },
{ {
"ID": 24847051, "ID": 48662582,
"Module": "FLY.Weight.UI.Client.UiModule.UiModule2_MenuSetting", "Module": "FLY.FeedbackRenZiJia.UI.Client.UiModule.UiModule2_GraphAirRing",
"ServiceContainerName": "gage0.service" "ServiceContainerName": "gage0.service"
}, },
{ {
"ID": 44866487, "ID": 1501989,
"Module": "FLY.FeedbackRenZiJia.UI.Client.UiModule.UiModule2_MenuSetting", "Module": "FLY.Thick.Blowing.UI.UiModule.UiModule2_ScanGraph2",
"ServiceContainerName": "gage0.service" "ServiceContainerName": "gage0.service"
}, },
{ {
"ID": 43552930, "ID": 52015891,
"Module": "FLY.Thick.BlowingScan.UI.Client.UiModule.UiModule2_MenuSetting", "Module": "FLY.Thick.Blowing.UI.UiModule.UiModule2_ScanGraph2",
"ServiceContainerName": "gage0.service" "ServiceContainerName": "gage0.service"
}, },
{ {
"ID": 8223768, "ID": 44960719,
"Module": "FLY.Thick.Blowing.UI.UiModule.UiModule2_MenuProfile", "Module": "FLY.Thick.Blowing.UI.UiModule.UiModule2_ScanGraph",
"ServiceContainerName": "gage0.service" "ServiceContainerName": "gage0.service"
}, },
{ {
"ID": 66283545, "ID": 38016717,
"Module": "FLY.Thick.Base.UI.UiModule.UiModule2_MenuMotion", "Module": "FLY.Thick.Blowing.UI.UiModule.UiModule2_ScanGraph",
"ServiceContainerName": "gage0.service" "ServiceContainerName": "gage0.service"
}, },
{ {
"ID": 31616714, "ID": 6455868,
"Module": "FLY.Thick.Base.UI.UiModule.UiModule2_DynAreaThick", "Module": "FLY.Thick.Blowing.UI.UiModule.UiModule2_ScanGraph",
"ServiceContainerName": "gage0.service" "ServiceContainerName": "gage0.service"
}, },
{ {
"ID": 38141718, "ID": 33594135,
"Module": "FLY.Thick.Blowing.UI.UiModule.UiModule2_DynAreaProfile", "Module": "FLY.Thick.Blowing.UI.UiModule.UiModule2_ScanGraph2",
"ServiceContainerName": "gage0.service" "ServiceContainerName": "gage0.service"
}, },
{ {
"ID": 27935207, "ID": 29300865,
"Module": "FLY.Thick.BlowingScan.UI.Client.UiModule.UiModule2_DynAreaFilmWidth", "Module": "FLY.Weight.UI.Client.UiModule.UiModule2_FlowGraph",
"ServiceContainerName": "gage0.service" "ServiceContainerName": "gage0.service"
}, },
{ {
"ID": 64726287, "ID": 64244561,
"Module": "FLY.Thick.Base.UI.UiModule.UiModule2_DynAreaSample", "Module": "FLY.Thick.Blowing.UI.UiModule.UiModule2_TrendGraph",
"ServiceContainerName": "gage0.service" "ServiceContainerName": "gage0.service"
}, },
{ {
"ID": 48687165, "ID": 62419562,
"Module": "FLY.Thick.BlowingScan.UI.Client.UiModule.UiModule2_DynAreaBlowing", "Module": "FLY.Thick.Blowing.UI.UiModule.UiModule2_ScanGraphCircular",
"ServiceContainerName": "gage0.service" "ServiceContainerName": "gage0.service"
}, },
{ {
"ID": 21215025, "ID": 28792051,
"Module": "FLY.Thick.Base.UI.UiModule.UiModule2_DynAreaIO", "Module": "FLY.Thick.Base.UI.UiModule.UiModule2_FixGraph",
"ServiceContainerName": "gage0.service" "ServiceContainerName": "gage0.service"
}, },
{ {
"ID": 22167861, "ID": 18036132,
"Module": "FLY.FeedbackRenZiJia.UI.Client.UiModule.UiModule2_DynAreaAirRing", "Module": "FLY.Thick.Base.UI.UiModule.UiModule2_FixGraph",
"ServiceContainerName": "gage0.service" "ServiceContainerName": "gage0.service"
}, },
{ {
"ID": 40975656, "ID": 57121810,
"Module": "FLY.Weight.UI.Client.UiModule.UiModule2_DynAreaWeight", "Module": "FLY.DownBlowing.UI.Client.UiModule.UiModule2_WinderPanel",
"ServiceContainerName": "gage0.service" "ServiceContainerName": "gage0.service"
}, },
{ {
"ID": 36105850, "ID": 48252249,
"Module": "FLY.DownBlowing.UI.Client.UiModule.UiModule2_DynAreaWinder", "Module": "FLY.Weight.UI.Client.UiModule.UiModule2_FeederPanel",
"ServiceContainerName": "gage0.service" "ServiceContainerName": "gage0.service"
} }
] ]
......
脚本/release_conf/FLY.Thick.BlowingScan.UI.Client/default/layout.default/风环-称重-下吹/trendgraph.json
View file @ 8fb735ed
{"Items":[{"Len":120,"BeginNo":0,"EndNo":20,"IsAll":true,"Type":0,"XType":0,"BM":0,"YRangePercent":3.0,"Title":"趋势图","Mix":1,"IsAutoTarget":true,"IsPercent":true,"ID":48220637}]} {
\ No newline at end of file "Items": [
{
"Interval": 1,
"YRangePercent": 3.0,
"Mix": 1,
"ID": 64244561
}
]
}
\ No newline at end of file
脚本/release_conf/FLY.Thick.BlowingScan.UI.Client/default/layout.default/风环-称重-吸料/fixgraph.json 0 → 100644
View file @ 8fb735ed
{"Items":[{"Len":500,"Interval":1000,"Mix":1,"IsAutoTarget":true,"IsADMode":false,"IsAutoY":false,"YTarget":0.0,"YRange":10.0,"ID":28792051},{"Len":500,"Interval":50,"Mix":1,"IsAutoTarget":true,"IsADMode":false,"IsAutoY":false,"YTarget":0.0,"YRange":10.0,"ID":18036132}]}
\ No newline at end of file
脚本/release_conf/FLY.Thick.BlowingScan.UI.Client/default/layout.default/风环-称重-吸料/graphcustom.json 0 → 100644
View file @ 8fb735ed
{
"GageTabItems": [
{
"Title": "吹膜",
"ServiceContainerName": "gage0.service",
"MenuItems": [
24847051,
44866487,
43552930,
2441771,
66283545
],
"DynAreaItems": [
31616714,
65313539,
27935207,
64726287,
48687165,
21215025,
22167861,
40975656
],
"Items": [
{
"Graphs": [
{
"ID": 17611460,
"Rect": "0, 0, 1, 1"
}
],
"ColumnCount": 1,
"RowCount": 1,
"RowDefinitions": [
false
],
"ColumnDefinitions": [
false
],
"Header": "称重"
},
{
"Graphs": [
{
"ID": 48662582,
"Rect": "0, 2, 1, 2"
},
{
"ID": 41709209,
"Rect": "0, 0, 1, 1"
},
{
"ID": 63400648,
"Rect": "0, 1, 1, 1"
}
],
"ColumnCount": 1,
"RowCount": 4,
"RowDefinitions": [
false,
false,
false,
false
],
"ColumnDefinitions": [
false
],
"Header": "风环"
},
{
"Graphs": [
{
"ID": 54302323,
"Rect": "0, 0, 1, 1"
},
{
"ID": 46404226,
"Rect": "0, 1, 1, 1"
},
{
"ID": 42496437,
"Rect": "0, 2, 1, 1"
},
{
"ID": 50443655,
"Rect": "0, 3, 1, 1"
}
],
"ColumnCount": 1,
"RowCount": 4,
"RowDefinitions": [
false,
false,
false,
false
],
"ColumnDefinitions": [
false
],
"Header": "扫描"
},
{
"Graphs": [
{
"ID": 29300865,
"Rect": "0, 1, 1, 1"
},
{
"ID": 26947909,
"Rect": "0, 0, 1, 1"
}
],
"ColumnCount": 1,
"RowCount": 2,
"RowDefinitions": [
false,
false
],
"ColumnDefinitions": [
false
],
"Header": "趋势"
},
{
"Graphs": [
{
"ID": 13361120,
"Rect": "0, 0, 1, 1"
}
],
"ColumnCount": 1,
"RowCount": 1,
"RowDefinitions": [
false
],
"ColumnDefinitions": [
false
],
"Header": "环型"
},
{
"Graphs": [
{
"ID": 28792051,
"Rect": "0, 0, 1, 1"
},
{
"ID": 18036132,
"Rect": "0, 1, 1, 1"
}
],
"ColumnCount": 1,
"RowCount": 2,
"RowDefinitions": [
false,
false
],
"ColumnDefinitions": [
false
],
"Header": "定点"
},
{
"Graphs": [
{
"ID": 11611586,
"Rect": "0, 0, 1, 1"
}
],
"ColumnCount": 1,
"RowCount": 1,
"RowDefinitions": [
false
],
"ColumnDefinitions": [
false
],
"Header": "吸料"
}
],
"Components": [
{
"ID": 24847051,
"Module": "FLY.Weight.UI.Client.UiModule.UiModule2_MenuSetting",
"ServiceContainerName": "gage0.service"
},
{
"ID": 44866487,
"Module": "FLY.FeedbackRenZiJia.UI.Client.UiModule.UiModule2_MenuSetting",
"ServiceContainerName": "gage0.service"
},
{
"ID": 43552930,
"Module": "FLY.Thick.BlowingScan.UI.Client.UiModule.UiModule2_MenuSetting",
"ServiceContainerName": "gage0.service"
},
{
"ID": 2441771,
"Module": "FLY.Thick.Blowing.UI.UiModule.UiModule2_MenuProfile",
"ServiceContainerName": "gage0.service"
},
{
"ID": 66283545,
"Module": "FLY.Thick.Base.UI.UiModule.UiModule2_MenuMotion",
"ServiceContainerName": "gage0.service"
},
{
"ID": 31616714,
"Module": "FLY.Thick.Base.UI.UiModule.UiModule2_DynAreaThick",
"ServiceContainerName": "gage0.service"
},
{
"ID": 65313539,
"Module": "FLY.Thick.Blowing.UI.UiModule.UiModule2_DynAreaProfile",
"ServiceContainerName": "gage0.service"
},
{
"ID": 27935207,
"Module": "FLY.Thick.BlowingScan.UI.Client.UiModule.UiModule2_DynAreaFilmWidth",
"ServiceContainerName": "gage0.service"
},
{
"ID": 64726287,
"Module": "FLY.Thick.Base.UI.UiModule.UiModule2_DynAreaSample",
"ServiceContainerName": "gage0.service"
},
{
"ID": 48687165,
"Module": "FLY.Thick.BlowingScan.UI.Client.UiModule.UiModule2_DynAreaBlowing",
"ServiceContainerName": "gage0.service"
},
{
"ID": 21215025,
"Module": "FLY.Thick.Base.UI.UiModule.UiModule2_DynAreaIO",
"ServiceContainerName": "gage0.service"
},
{
"ID": 22167861,
"Module": "FLY.FeedbackRenZiJia.UI.Client.UiModule.UiModule2_DynAreaAirRing",
"ServiceContainerName": "gage0.service"
},
{
"ID": 40975656,
"Module": "FLY.Weight.UI.Client.UiModule.UiModule2_DynAreaWeight",
"ServiceContainerName": "gage0.service"
},
{
"ID": 17611460,
"Module": "FLY.Weight.UI.Client.UiModule.UiModule2_MainGraph",
"ServiceContainerName": "gage0.service"
},
{
"ID": 48662582,
"Module": "FLY.FeedbackRenZiJia.UI.Client.UiModule.UiModule2_GraphAirRing",
"ServiceContainerName": "gage0.service"
},
{
"ID": 41709209,
"Module": "FLY.Thick.Blowing.UI.UiModule.UiModule2_ScanGraph2",
"ServiceContainerName": "gage0.service"
},
{
"ID": 63400648,
"Module": "FLY.Thick.Blowing.UI.UiModule.UiModule2_ScanGraph2",
"ServiceContainerName": "gage0.service"
},
{
"ID": 54302323,
"Module": "FLY.Thick.Blowing.UI.UiModule.UiModule2_ScanGraph",
"ServiceContainerName": "gage0.service"
},
{
"ID": 46404226,
"Module": "FLY.Thick.Blowing.UI.UiModule.UiModule2_ScanGraph",
"ServiceContainerName": "gage0.service"
},
{
"ID": 42496437,
"Module": "FLY.Thick.Blowing.UI.UiModule.UiModule2_ScanGraph",
"ServiceContainerName": "gage0.service"
},
{
"ID": 50443655,
"Module": "FLY.Thick.Blowing.UI.UiModule.UiModule2_ScanGraph2",
"ServiceContainerName": "gage0.service"
},
{
"ID": 29300865,
"Module": "FLY.Weight.UI.Client.UiModule.UiModule2_FlowGraph",
"ServiceContainerName": "gage0.service"
},
{
"ID": 26947909,
"Module": "FLY.Thick.Blowing.UI.UiModule.UiModule2_TrendGraph",
"ServiceContainerName": "gage0.service"
},
{
"ID": 13361120,
"Module": "FLY.Thick.Blowing.UI.UiModule.UiModule2_ScanGraphCircular",
"ServiceContainerName": "gage0.service"
},
{
"ID": 28792051,
"Module": "FLY.Thick.Base.UI.UiModule.UiModule2_FixGraph",
"ServiceContainerName": "gage0.service"
},
{
"ID": 18036132,
"Module": "FLY.Thick.Base.UI.UiModule.UiModule2_FixGraph",
"ServiceContainerName": "gage0.service"
},
{
"ID": 11611586,
"Module": "FLY.Weight.UI.Client.UiModule.UiModule2_FeederPanel",
"ServiceContainerName": "gage0.service"
}
]
}
],
"DynAreaWidth": 250,
"IsDynAreaVisible": true,
"IsLogoHidden": true,
"Rect": "0, 0, 1382, 744",
"WindowState": 2
}
\ No newline at end of file
脚本/release_conf/FLY.Thick.BlowingScan.UI.Client/default/layout.default/风环-称重-吸料/scangraph.json 0 → 100644
View file @ 8fb735ed
{"Items":[{"UiModule":"scangraph2","YRangePercent":3.0,"Mix":1,"Number":-5,"IsPercent":true,"IsAutoTarget":true,"ID":41709209},{"UiModule":"scangraph2","YRangePercent":3.0,"Mix":1,"Number":0,"IsPercent":true,"IsAutoTarget":true,"ID":63400648},{"UiModule":"scangraph","YRangePercent":3.0,"Mix":1,"Number":-15,"IsPercent":true,"IsAutoTarget":true,"ID":54302323},{"UiModule":"scangraph","YRangePercent":3.0,"Mix":1,"Number":-10,"IsPercent":true,"IsAutoTarget":true,"ID":46404226},{"UiModule":"scangraph","YRangePercent":3.0,"Mix":1,"Number":-5,"IsPercent":true,"IsAutoTarget":true,"ID":42496437},{"UiModule":"scangraph2","YRangePercent":3.0,"Mix":1,"Number":0,"IsPercent":true,"IsAutoTarget":true,"ID":50443655}]}
\ No newline at end of file
脚本/release_conf/FLY.Thick.BlowingScan.UI.Client/default/layout.default/风环-称重-吸料/scangraphcircular.json 0 → 100644
View file @ 8fb735ed
{"Items":[{"Mix":1,"Number":0,"YRangePercent":3.0,"IsPercent":true,"IsAutoTarget":true,"HasAlianZone":false,"AlianZoneBoltNoOf3oClock":1.0,"AlianZoneBoltCnt":8,"AlianZoneIsCCW":false,"AlianZoneIsShowXStep":false,"ID":13361120}]}
\ No newline at end of file
脚本/release_conf/FLY.Thick.BlowingScan.UI.Client/default/layout.default/风环-称重-吸料/trendgraph.json 0 → 100644
View file @ 8fb735ed
{"Items":[{"Len":120,"BeginNo":0,"EndNo":20,"IsAll":true,"Type":0,"XType":0,"BM":0,"YRangePercent":3.0,"Title":"趋势图","Mix":1,"IsAutoTarget":true,"IsPercent":true,"ID":48220637}]}
\ No newline at end of file
脚本/release_conf/FLY.Thick.BlowingScan.UI.Client/default/layout.default/风环-称重-吸料/trendgraph2.json 0 → 100644
View file @ 8fb735ed
{"Items":[{"Interval":1,"YRangePercent":3.0,"Mix":1,"ID":26947909}]}
\ No newline at end of file
脚本/release_conf/FLY.Thick.BlowingScan.UI.Client/default/layout.default/风环-称重/flowgraph.json deleted 100644 → 0
View file @ 611f4460
{"Interval":6,"IsYRangeAuto":false,"IsYRangePercent":true,"YRangePercent":0.15,"YRange":20}
\ No newline at end of file
脚本/release_conf/FLY.Thick.BlowingScan.UI.Client/default/layout.default/风环-称重/graphcustom.json
View file @ 8fb735ed
...@@ -158,23 +158,6 @@ ...@@ -158,23 +158,6 @@
false false
], ],
"Header": "定点" "Header": "定点"
},
{
"Graphs": [
{
"ID": 37010918,
"Rect": "0, 0, 1, 1"
}
],
"ColumnCount": 1,
"RowCount": 1,
"RowDefinitions": [
false
],
"ColumnDefinitions": [
false
],
"Header": "趋势2"
} }
], ],
"Components": [ "Components": [
...@@ -307,11 +290,6 @@ ...@@ -307,11 +290,6 @@
"ID": 18036132, "ID": 18036132,
"Module": "FLY.Thick.Base.UI.UiModule.UiModule2_FixGraph", "Module": "FLY.Thick.Base.UI.UiModule.UiModule2_FixGraph",
"ServiceContainerName": "gage0.service" "ServiceContainerName": "gage0.service"
},
{
"ID": 37010918,
"Module": "FLY.Thick.Blowing.UI.UiModule.UiModule2_TrendGraph2",
"ServiceContainerName": "gage0.service"
} }
] ]
} }
......
脚本/release_conf/FLY.Thick.BlowingScan.UI.Client/default/layout.default/风环-称重/scangraph.json
View file @ 8fb735ed
{ {"Items":[{"UiModule":"scangraph2","YRangePercent":3.0,"Mix":1,"Number":-5,"IsPercent":true,"IsAutoTarget":true,"ID":41709209},{"UiModule":"scangraph2","YRangePercent":3.0,"Mix":1,"Number":0,"IsPercent":true,"IsAutoTarget":true,"ID":63400648},{"UiModule":"scangraph","YRangePercent":3.0,"Mix":1,"Number":-15,"IsPercent":true,"IsAutoTarget":true,"ID":54302323},{"UiModule":"scangraph","YRangePercent":3.0,"Mix":1,"Number":-10,"IsPercent":true,"IsAutoTarget":true,"ID":46404226},{"UiModule":"scangraph","YRangePercent":3.0,"Mix":1,"Number":-5,"IsPercent":true,"IsAutoTarget":true,"ID":42496437},{"UiModule":"scangraph2","YRangePercent":3.0,"Mix":1,"Number":0,"IsPercent":true,"IsAutoTarget":true,"ID":50443655}]}
"Items": [ \ No newline at end of file
{
"UiModule": "scangraph2",
"YRangePercent": 3.0,
"Mix": 1,
"Number": -5,
"IsPercent": true,
"IsAutoTarget": true,
"ID": 41709209
},
{
"UiModule": "scangraph2",
"YRangePercent": 3.0,
"Mix": 1,
"Number": 0,
"IsPercent": true,
"IsAutoTarget": true,
"ID": 63400648
},
{
"UiModule": "scangraph",
"YRangePercent": 3.0,
"Mix": 1,
"Number": -15,
"IsPercent": true,
"IsAutoTarget": true,
"ID": 54302323
},
{
"UiModule": "scangraph",
"YRangePercent": 3.0,
"Mix": 1,
"Number": -10,
"IsPercent": true,
"IsAutoTarget": true,
"ID": 46404226
},
{
"UiModule": "scangraph",
"YRangePercent": 3.0,
"Mix": 1,
"Number": -5,
"IsPercent": true,
"IsAutoTarget": true,
"ID": 42496437
},
{
"UiModule": "scangraph2",
"YRangePercent": 3.0,
"Mix": 1,
"Number": 0,
"IsPercent": true,
"IsAutoTarget": true,
"ID": 50443655
},
{
"UiModule": "scangraph",
"YRangePercent": 3.0,
"Mix": 1,
"Number": 0,
"IsPercent": true,
"IsAutoTarget": true,
"ID": 37010918
}
]
}
\ No newline at end of file
脚本/release_conf/FLY.Thick.BlowingScan.UI.Client/default/layout.default/风环-称重/trendgraph.json
View file @ 8fb735ed
{ {"Items":[{"Len":120,"BeginNo":0,"EndNo":20,"IsAll":true,"Type":0,"XType":0,"BM":0,"YRangePercent":3.0,"Title":"趋势图","Mix":1,"IsAutoTarget":true,"IsPercent":true,"ID":48220637}]}
"Items": [ \ No newline at end of file
{
"Interval": 1,
"YRangePercent": 3.0,
"Mix": 1,
"ID": 26947909
},
{
"Interval": 1,
"YRangePercent": 3.0,
"Mix": 1,
"ID": 37010918
}
]
}
\ No newline at end of file
脚本/release_conf/FLY.Thick.BlowingScan.UI.Client/default/layout.default/风环-称重吸料-收卷中心-IBC温控/fixgraph.json 0 → 100644
View file @ 8fb735ed
{"Items":[{"Len":500,"Interval":1000,"Mix":1,"IsAutoTarget":true,"IsADMode":false,"IsAutoY":false,"YTarget":0.0,"YRange":10.0,"ID":28792051},{"Len":500,"Interval":50,"Mix":1,"IsAutoTarget":true,"IsADMode":false,"IsAutoY":false,"YTarget":0.0,"YRange":10.0,"ID":18036132}]}
\ No newline at end of file
脚本/release_conf/FLY.Thick.BlowingScan.UI.Client/default/layout.default/风环-称重吸料-收卷中心-IBC温控/scangraph.json 0 → 100644
View file @ 8fb735ed
{"Items":[{"UiModule":"scangraph2","YRangePercent":3.0,"Mix":1,"Number":-5,"IsPercent":true,"IsAutoTarget":true,"ID":28722627},{"UiModule":"scangraph2","YRangePercent":3.0,"Mix":1,"Number":0,"IsPercent":true,"IsAutoTarget":true,"ID":44810590},{"UiModule":"scangraph","YRangePercent":3.0,"Mix":1,"Number":-15,"IsPercent":true,"IsAutoTarget":true,"ID":19620867},{"UiModule":"scangraph","YRangePercent":3.0,"Mix":1,"Number":-10,"IsPercent":true,"IsAutoTarget":true,"ID":23742817},{"UiModule":"scangraph","YRangePercent":3.0,"Mix":1,"Number":-5,"IsPercent":true,"IsAutoTarget":true,"ID":9828942},{"UiModule":"scangraph2","YRangePercent":3.0,"Mix":1,"Number":0,"IsPercent":true,"IsAutoTarget":true,"ID":37500900}]}
\ No newline at end of file
脚本/release_conf/FLY.Thick.BlowingScan.UI.Client/default/layout.default/风环-称重吸料-收卷中心-IBC温控/scangraphcircular.json 0 → 100644
View file @ 8fb735ed
{"Items":[{"Mix":1,"Number":0,"YRangePercent":3.0,"IsPercent":true,"IsAutoTarget":true,"HasAlianZone":false,"AlianZoneBoltNoOf3oClock":1.0,"AlianZoneBoltCnt":8,"AlianZoneIsCCW":false,"AlianZoneIsShowXStep":false,"ID":43629015}]}
\ No newline at end of file
脚本/release_conf/FLY.Thick.BlowingScan.UI.Client/default/layout.default/风环-称重吸料-收卷中心-IBC温控/trendgraph.json 0 → 100644
View file @ 8fb735ed
{
"Items": [
{
"Interval": 1,
"YRangePercent": 3.0,
"Mix": 1,
"ID": 51283066
}
]
}
\ No newline at end of file
脚本/release_conf/FLY.Thick.BlowingScan.UI.Client/default/layout.default/风环-称重吸料-收卷中心-IBC温控/trendgraph2.json 0 → 100644
View file @ 8fb735ed
{"Items":[{"Interval":1,"YRangePercent":3.0,"Mix":1,"ID":51283066}]}
\ No newline at end of file
脚本/release_conf/FLY.Thick.BlowingScan.UI.Client/default/layout.default/风环/fixgraph.json
View file @ 8fb735ed
{ {"Items":[{"Len":500,"Interval":1000,"Mix":1,"IsAutoTarget":true,"IsADMode":false,"IsAutoY":false,"YTarget":0.0,"YRange":10.0,"ID":28792051}]}
"Items": [ \ No newline at end of file
{
"Len": 500,
"Interval": 1000,
"Mix": 1,
"IsAutoTarget": true,
"IsADMode": false,
"IsAutoY": false,
"YTarget": 0.0,
"YRange": 10.0,
"ID": 28792051
}
]
}
\ No newline at end of file
脚本/release_conf/FLY.Thick.BlowingScan.UI.Client/default/layout.default/风环/graphcustom.json
View file @ 8fb735ed
...@@ -82,7 +82,7 @@ ...@@ -82,7 +82,7 @@
{ {
"Graphs": [ "Graphs": [
{ {
"ID": 19728236, "ID": 54302323,
"Rect": "0, 0, 1, 1" "Rect": "0, 0, 1, 1"
} }
], ],
...@@ -224,7 +224,7 @@ ...@@ -224,7 +224,7 @@
"ServiceContainerName": "gage0.service" "ServiceContainerName": "gage0.service"
}, },
{ {
"ID": 19728236, "ID": 54302323,
"Module": "FLY.Thick.Blowing.UI.UiModule.UiModule2_TrendGraph2", "Module": "FLY.Thick.Blowing.UI.UiModule.UiModule2_TrendGraph2",
"ServiceContainerName": "gage0.service" "ServiceContainerName": "gage0.service"
}, },
......
脚本/release_conf/FLY.Thick.BlowingScan.UI.Client/default/layout.default/风环/scangraph.json
View file @ 8fb735ed
...@@ -57,11 +57,11 @@ ...@@ -57,11 +57,11 @@
{ {
"UiModule": "scangraph", "UiModule": "scangraph",
"YRangePercent": 3.0, "YRangePercent": 3.0,
"Mix": 2, "Mix": 1,
"Number": 0, "Number": 0,
"IsPercent": true, "IsPercent": true,
"IsAutoTarget": true, "IsAutoTarget": true,
"ID": 19728236 "ID": 54302323
} }
] ]
} }
\ No newline at end of file
脚本/release_conf/FLY.Thick.BlowingScan.UI.Client/default/layout.default/风环/scangraphcircular.json
View file @ 8fb735ed
{ {"Items":[{"Mix":1,"Number":0,"YRangePercent":3.0,"IsPercent":true,"IsAutoTarget":true,"HasAlianZone":false,"AlianZoneBoltNoOf3oClock":1.0,"AlianZoneBoltCnt":8,"AlianZoneIsCCW":false,"AlianZoneIsShowXStep":false,"ID":32000920}]}
"Items": [ \ No newline at end of file
{
"Mix": 1,
"Number": 0,
"YRangePercent": 3.0,
"IsPercent": true,
"IsAutoTarget": true,
"HasAlianZone": false,
"AlianZoneBoltNoOf3oClock": 1.0,
"AlianZoneBoltCnt": 8,
"AlianZoneIsCCW": false,
"AlianZoneIsShowXStep": false,
"ID": 32000920
}
]
}
\ No newline at end of file
脚本/release_conf/FLY.Thick.BlowingScan.UI.Client/default/layout.default/风环/trendgraph.json
View file @ 8fb735ed
...@@ -4,7 +4,7 @@ ...@@ -4,7 +4,7 @@
"Interval": 1, "Interval": 1,
"YRangePercent": 3.0, "YRangePercent": 3.0,
"Mix": 1, "Mix": 1,
"ID": 19728236 "ID": 54302323
} }
] ]
} }
\ No newline at end of file
脚本/release_conf/FLY.Thick.BlowingScan.UI.Client/layout/fixgraph.json
View file @ 8fb735ed
{ {"Items":[{"Len":500,"Interval":1000,"Mix":1,"IsAutoTarget":true,"IsADMode":false,"IsAutoY":false,"YTarget":0.0,"YRange":10.0,"ID":28792051}]}
"Items": [ \ No newline at end of file
{
"Len": 500,
"Interval": 1000,
"Mix": 1,
"IsAutoTarget": true,
"IsADMode": false,
"IsAutoY": false,
"YTarget": 0.0,
"YRange": 10.0,
"ID": 28792051
}
]
}
\ No newline at end of file
脚本/release_conf/FLY.Thick.BlowingScan.UI.Client/layout/flowgraph.json deleted 100644 → 0
View file @ 611f4460
{"Interval":6,"IsYRangeAuto":false,"IsYRangePercent":true,"YRangePercent":0.15,"YRange":20}
\ No newline at end of file
脚本/release_conf/FLY.Thick.BlowingScan.UI.Client/layout/graphcustom.json
View file @ 8fb735ed
...@@ -82,7 +82,7 @@ ...@@ -82,7 +82,7 @@
{ {
"Graphs": [ "Graphs": [
{ {
"ID": 19728236, "ID": 54302323,
"Rect": "0, 0, 1, 1" "Rect": "0, 0, 1, 1"
} }
], ],
...@@ -224,7 +224,7 @@ ...@@ -224,7 +224,7 @@
"ServiceContainerName": "gage0.service" "ServiceContainerName": "gage0.service"
}, },
{ {
"ID": 19728236, "ID": 54302323,
"Module": "FLY.Thick.Blowing.UI.UiModule.UiModule2_TrendGraph2", "Module": "FLY.Thick.Blowing.UI.UiModule.UiModule2_TrendGraph2",
"ServiceContainerName": "gage0.service" "ServiceContainerName": "gage0.service"
}, },
......
脚本/release_conf/FLY.Thick.BlowingScan.UI.Client/layout/scangraph.json
View file @ 8fb735ed
...@@ -57,11 +57,11 @@ ...@@ -57,11 +57,11 @@
{ {
"UiModule": "scangraph", "UiModule": "scangraph",
"YRangePercent": 3.0, "YRangePercent": 3.0,
"Mix": 2, "Mix": 1,
"Number": 0, "Number": 0,
"IsPercent": true, "IsPercent": true,
"IsAutoTarget": true, "IsAutoTarget": true,
"ID": 19728236 "ID": 54302323
} }
] ]
} }
\ No newline at end of file
脚本/release_conf/FLY.Thick.BlowingScan.UI.Client/layout/scangraphcircular.json
View file @ 8fb735ed
{ {"Items":[{"Mix":1,"Number":0,"YRangePercent":3.0,"IsPercent":true,"IsAutoTarget":true,"HasAlianZone":false,"AlianZoneBoltNoOf3oClock":1.0,"AlianZoneBoltCnt":8,"AlianZoneIsCCW":false,"AlianZoneIsShowXStep":false,"ID":32000920}]}
"Items": [ \ No newline at end of file
{
"Mix": 1,
"Number": 0,
"YRangePercent": 3.0,
"IsPercent": true,
"IsAutoTarget": true,
"HasAlianZone": false,
"AlianZoneBoltNoOf3oClock": 1.0,
"AlianZoneBoltCnt": 8,
"AlianZoneIsCCW": false,
"AlianZoneIsShowXStep": false,
"ID": 32000920
}
]
}
\ No newline at end of file
脚本/release_conf/FLY.Thick.BlowingScan.UI.Client/layout/trendgraph.json
View file @ 8fb735ed
...@@ -4,7 +4,7 @@ ...@@ -4,7 +4,7 @@
"Interval": 1, "Interval": 1,
"YRangePercent": 3.0, "YRangePercent": 3.0,
"Mix": 1, "Mix": 1,
"ID": 19728236 "ID": 54302323
} }
] ]
} }
\ No newline at end of file
脚本/release_conf/FLY.Thick.BlowingScan.UI.Client/unity/downBlowing.component.config
View file @ 8fb735ed
...@@ -12,7 +12,6 @@ ...@@ -12,7 +12,6 @@
<register type="IUiModule2" mapTo="UiModule2_DynAreaWinder" name="downBlowing_daw" /> <register type="IUiModule2" mapTo="UiModule2_DynAreaWinder" name="downBlowing_daw" />
<register type="IUiModule2" mapTo="UiModule2_WinderPanel" name="downBlowing_wp" /> <register type="IUiModule2" mapTo="UiModule2_WinderPanel" name="downBlowing_wp" />
<register type="IUiModule2" mapTo="UiModule2_TempAreaPanel" name="downBlowing_tap" /> <register type="IUiModule2" mapTo="UiModule2_TempAreaPanel" name="downBlowing_tap" />
<register type="IUiModule2" mapTo="UiModule2_FeederPanel" name="downBlowing_fp" />
</container> </container>
</unity> </unity>
</configuration> </configuration>
\ No newline at end of file
脚本/release_conf/FLY.Thick.BlowingScan.UI.Client/unity/weighter.component.config
View file @ 8fb735ed
...@@ -12,6 +12,7 @@ ...@@ -12,6 +12,7 @@
<register type="IUiModule2" mapTo="UiModule2_DynAreaWeight" name="weighter_da" /> <register type="IUiModule2" mapTo="UiModule2_DynAreaWeight" name="weighter_da" />
<register type="IUiModule2" mapTo="UiModule2_FlowGraph" name="weighter_fg" /> <register type="IUiModule2" mapTo="UiModule2_FlowGraph" name="weighter_fg" />
<register type="IUiModule2" mapTo="UiModule2_MainGraph" name="weighter_mg" /> <register type="IUiModule2" mapTo="UiModule2_MainGraph" name="weighter_mg" />
<register type="IUiModule2" mapTo="UiModule2_FeederPanel" name="weighter_feeder" />
</container> </container>
</unity> </unity>
</configuration> </configuration>
\ No newline at end of file
脚本/release_conf/FLY.Thick.BlowingScan.UI.Client/unity/weighter.service.config
View file @ 8fb735ed
...@@ -42,6 +42,13 @@ ...@@ -42,6 +42,13 @@
<param name="connName" dependencyName="cn2" /> <param name="connName" dependencyName="cn2" />
</constructor> </constructor>
</register> </register>
<register type="IFeederSystemService" mapTo="FeederSystemServiceClient">
<lifetime type="singleton" />
<constructor>
<param name="serviceId" value="35050" />
<param name="connName" dependencyName="cn2" />
</constructor>
</register>
</container> </container>
</unity> </unity>
</configuration> </configuration>
\ No newline at end of file
脚本/release_conf/FLY.Weight.UI.Server/Gage1/weight2NumberNames.json deleted 100644 → 0
View file @ 611f4460
{"NumberNames":null,"VersionString":"version=6;itemStyle=0"}
\ No newline at end of file
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