Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Contribute to GitLab
Sign in / Register
Toggle navigation
T
thick-casting
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
潘栩锋
thick-casting
Commits
860cc3c1
Commit
860cc3c1
authored
Mar 04, 2022
by
潘栩锋
🚴
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
把称重状态的报警提示关闭
parent
27d5d716
Show whitespace changes
Inline
Side-by-side
Showing
11 changed files
with
188 additions
and
125 deletions
+188
-125
DynAreaWeight.xaml
...eight/FLY.Weight.UI.Client/UiModule/V3/DynAreaWeight.xaml
+41
-43
DynAreaWeight.xaml.cs
...ht/FLY.Weight.UI.Client/UiModule/V3/DynAreaWeight.xaml.cs
+3
-6
DynAreaWeightV4.xaml
...ght/FLY.Weight.UI.Client/UiModule/V4/DynAreaWeightV4.xaml
+23
-24
DynAreaWeightV4.xaml.cs
.../FLY.Weight.UI.Client/UiModule/V4/DynAreaWeightV4.xaml.cs
+3
-7
DynAreaWeightV5.xaml
...ght/FLY.Weight.UI.Client/UiModule/V5/DynAreaWeightV5.xaml
+35
-36
DynAreaWeightV5.xaml.cs
.../FLY.Weight.UI.Client/UiModule/V5/DynAreaWeightV5.xaml.cs
+2
-7
gage0.service.config
脚本/流延客户端容器描述.unity/unity/gage0.service.config
+2
-0
relationship.json
脚本/流延客户端容器描述.unity/unity/relationship.json
+4
-2
warnings.service.config
脚本/流延客户端容器描述.unity/unity/warnings.service.config
+9
-0
weighter.component.config
脚本/流延客户端容器描述.unity/unity/weighter.component.config
+18
-0
weighter.service.config
脚本/流延客户端容器描述.unity/unity/weighter.service.config
+48
-0
No files found.
Project.FLY.Weight/FLY.Weight.UI.Client/UiModule/V3/DynAreaWeight.xaml
View file @
860cc3c1
...
...
@@ -14,7 +14,6 @@
<ResourceDictionary Source="pack://application:,,,/FLY.Weight.UI.Client;component/Themes/UcWeighterItemStyle.xaml"/>
<ResourceDictionary Source="pack://application:,,,/FLY.Thick.Base.UI;component/Themes/DynAreaErrorStyle.xaml"/>
</ResourceDictionary.MergedDictionaries>
<baseUiModule:DynAreaErrorVm2 x:Key="errorVm" IsError="True" ErrMsg="枫莱尔控制器连接断开 枫莱尔控制器连接断开"/>
</ResourceDictionary>
</UserControl.Resources>
...
...
@@ -78,7 +77,6 @@
</Grid>
</StackPanel>
</Border>
<Button x:Name="grid_error" Style="{StaticResource DynAreaErrorStyle}" d:DataContext="{StaticResource errorVm}"/>
</Grid>
...
...
Project.FLY.Weight/FLY.Weight.UI.Client/UiModule/V3/DynAreaWeight.xaml.cs
View file @
860cc3c1
...
...
@@ -31,7 +31,7 @@ namespace FLY.Weight.UI.Client.UiModule
IUnityContainer
container
;
IWeightSystemService
weightSystemService
;
DynAreaErrorVm2
errorVm
;
SetPLCUpdatePlan
setPlan
;
public
DynAreaWeight
()
...
...
@@ -43,8 +43,7 @@ namespace FLY.Weight.UI.Client.UiModule
[
InjectionMethod
]
public
void
Init
(
IUnityContainer
container
,
IWeightSystemService
weightSystemService
,
[
Dependency
(
"weighterWarningService"
)]
IWarningSystem2Service
warningSystem
)
IWeightSystemService
weightSystemService
)
{
this
.
container
=
container
;
this
.
weightSystemService
=
weightSystemService
;
...
...
@@ -52,9 +51,7 @@ namespace FLY.Weight.UI.Client.UiModule
grid_weighter
.
DataContext
=
this
.
weightSystemService
;
errorVm
=
new
DynAreaErrorVm2
();
errorVm
.
Init
(
container
,
warningSystem
,
"称重"
);
grid_error
.
DataContext
=
errorVm
;
//注册属性更新计划
string
objname
=
nameof
(
IWeightSystemService
.
Accessory
);
...
...
Project.FLY.Weight/FLY.Weight.UI.Client/UiModule/V4/DynAreaWeightV4.xaml
View file @
860cc3c1
...
...
@@ -58,7 +58,6 @@
</Grid>
</StackPanel>
</Border>
<Button x:Name="grid_error" Style="{StaticResource DynAreaErrorStyle}" d:DataContext="{StaticResource errorVm}"/>
</Grid>
...
...
Project.FLY.Weight/FLY.Weight.UI.Client/UiModule/V4/DynAreaWeightV4.xaml.cs
View file @
860cc3c1
...
...
@@ -31,7 +31,7 @@ namespace FLY.Weight.UI.Client.UiModule
IUnityContainer
container
;
IWeightSystemService
weightSystemService
;
DynAreaErrorVm2
errorVm
;
//SetPLCUpdatePlan setPlan;
...
...
@@ -44,9 +44,7 @@ namespace FLY.Weight.UI.Client.UiModule
[
InjectionMethod
]
public
void
Init
(
IUnityContainer
container
,
IWeightSystemService
weightSystemService
,
[
Dependency
(
"weighterWarningService"
)]
IWarningSystem2Service
warningSystem
IWeightSystemService
weightSystemService
)
{
this
.
container
=
container
;
...
...
@@ -54,9 +52,7 @@ namespace FLY.Weight.UI.Client.UiModule
grid_weighter
.
DataContext
=
this
.
weightSystemService
;
errorVm
=
new
DynAreaErrorVm2
();
errorVm
.
Init
(
container
,
warningSystem
,
"称重"
);
grid_error
.
DataContext
=
errorVm
;
//注册属性更新计划
//setPlan = new SetPLCUpdatePlan(
// this.weightSystemService.PLCos,
...
...
Project.FLY.Weight/FLY.Weight.UI.Client/UiModule/V5/DynAreaWeightV5.xaml
View file @
860cc3c1
...
...
@@ -72,7 +72,6 @@
</Grid>
</StackPanel>
</Border>
<Button x:Name="grid_error" Style="{StaticResource DynAreaErrorStyle}" d:DataContext="{StaticResource errorVm}"/>
</Grid>
...
...
Project.FLY.Weight/FLY.Weight.UI.Client/UiModule/V5/DynAreaWeightV5.xaml.cs
View file @
860cc3c1
...
...
@@ -32,7 +32,7 @@ namespace FLY.Weight.UI.Client.UiModule
IUnityContainer
container
;
IWeightSystemService
weightSystemService
;
SetPLCUpdatePlan
setPlan
;
DynAreaErrorVm2
errorVm
;
public
DynAreaWeightV5
()
{
...
...
@@ -44,8 +44,7 @@ namespace FLY.Weight.UI.Client.UiModule
public
void
Init
(
IUnityContainer
container
,
IWeightSystemService
weightSystemService
,
[
Dependency
(
"weighterWarningService"
)]
IWarningSystem2Service
warningSystem
IWeightSystemService
weightSystemService
)
{
this
.
container
=
container
;
...
...
@@ -53,10 +52,6 @@ namespace FLY.Weight.UI.Client.UiModule
grid_weighter
.
DataContext
=
this
.
weightSystemService
;
errorVm
=
new
DynAreaErrorVm2
();
errorVm
.
Init
(
container
,
warningSystem
,
"称重"
);
grid_error
.
DataContext
=
errorVm
;
//注册属性更新计划
string
objname
=
nameof
(
IWeightSystemService
.
Accessory
);
setPlan
=
new
SetPLCUpdatePlan
(
...
...
脚本/流延客户端容器描述.unity/unity/gage0.service.config
View file @
860cc3c1
...
...
@@ -7,6 +7,7 @@
<
container
>
<
instance
name
=
"cn0"
value
=
"thick"
/>
<
instance
name
=
"cn1"
value
=
"autoDie"
/>
<
instance
name
=
"cn2"
value
=
"weighter"
/>
</
container
>
</
unity
>
</
configuration
>
\ No newline at end of file
脚本/流延客户端容器描述.unity/unity/relationship.json
View file @
860cc3c1
...
...
@@ -12,7 +12,8 @@
"base.service.config"
,
"autoDie.service.config"
,
"objcomponents.service.config"
,
"thick.service.config"
"thick.service.config"
,
"weighter.service.config"
],
"Children"
:
[]
},
...
...
@@ -42,7 +43,8 @@
"Path"
:
[
"base.component.config"
,
"thick.component.config"
,
"autoDie.component.config"
"autoDie.component.config"
,
"weighter.component.config"
],
"Children"
:
[]
}
...
...
脚本/流延客户端容器描述.unity/unity/warnings.service.config
View file @
860cc3c1
...
...
@@ -23,6 +23,14 @@
<
param
name
=
"devName"
value
=
"测厚仪"
/>
</
constructor
>
</
register
>
<
register
type
=
"WarningSystem2ServiceClientWithName"
name
=
"称重"
>
<
lifetime
type
=
"singleton"
/>
<
constructor
>
<
param
name
=
"serviceId"
value
=
"20000"
/>
<
param
name
=
"connName"
value
=
"weighter"
/>
<
param
name
=
"devName"
value
=
"称重"
/>
</
constructor
>
</
register
>
</
container
>
</
unity
>
</
configuration
>
\ No newline at end of file
脚本/流延客户端容器描述.unity/unity/weighter.component.config
0 → 100644
View file @
860cc3c1
<?
xml
version
=
"1.0"
encoding
=
"utf-8"
?>
<
configuration
>
<
configSections
>
<
section
name
=
"unity"
type
=
"Microsoft.Practices.Unity.Configuration.UnityConfigurationSection,Unity.Configuration"
/>
</
configSections
>
<
unity
>
<
assembly
name
=
"FLY.Weight.UI.Client"
/>
<
namespace
name
=
"FLY.Weight.UI.Client.UiModule"
/>
<
alias
alias
=
"IUiModule2"
type
=
"MultiLayout.UiModule.IUiModule2, MultiLayout"
/>
<
container
>
<
register
type
=
"IUiModule2"
mapTo
=
"UiModule2_MenuSetting"
name
=
"weighter_ms"
/>
<
register
type
=
"IUiModule2"
mapTo
=
"UiModule2_DynAreaWeight"
name
=
"weighter_da"
/>
<
register
type
=
"IUiModule2"
mapTo
=
"UiModule2_FlowGraph"
name
=
"weighter_fg"
/>
<
register
type
=
"IUiModule2"
mapTo
=
"UiModule2_MainGraph"
name
=
"weighter_mg"
/>
</
container
>
</
unity
>
</
configuration
>
\ No newline at end of file
脚本/流延客户端容器描述.unity/unity/weighter.service.config
0 → 100644
View file @
860cc3c1
<?
xml
version
=
"1.0"
encoding
=
"utf-8"
?>
<
configuration
>
<
configSections
>
<
section
name
=
"unity"
type
=
"Microsoft.Practices.Unity.Configuration.UnityConfigurationSection,Unity.Configuration"
/>
</
configSections
>
<
unity
>
<
assembly
name
=
"FLY.Weight"
/>
<
namespace
name
=
"FLY.Weight.IService"
/>
<
namespace
name
=
"FLY.Weight.Client"
/>
<
namespace
name
=
"FLY.Weight.Server.Model"
/>
<
assembly
name
=
"FLY.OBJComponents"
/>
<
namespace
name
=
"FLY.OBJComponents.IService"
/>
<
namespace
name
=
"FLY.OBJComponents.Client"
/>
<
assembly
name
=
"FLY.Weight.UI.Client"
/>
<
namespace
name
=
"FLY.Weight.UI.Client"
/>
<
container
>
<
register
type
=
"IWeightSystemService"
mapTo
=
"WeightSystemServiceClientWithColor"
>
<
lifetime
type
=
"singleton"
/>
<
constructor
>
<
param
name
=
"serviceId"
value
=
"35000"
/>
<
param
name
=
"connName"
dependencyName
=
"cn2"
/>
</
constructor
>
</
register
>
<
register
type
=
"IBulkDbFlowService"
mapTo
=
"BulkDbFlowServiceClient"
>
<
lifetime
type
=
"singleton"
/>
<
constructor
>
<
param
name
=
"serviceId"
value
=
"35004"
/>
<
param
name
=
"connName"
dependencyName
=
"cn2"
/>
</
constructor
>
</
register
>
<
register
type
=
"MixBufferCollection"
>
<
lifetime
type
=
"singleton"
/>
<
constructor
>
<
param
name
=
"baseId"
value
=
"35005"
/>
<
param
name
=
"connName"
dependencyName
=
"cn2"
/>
</
constructor
>
</
register
>
<
register
type
=
"IWarningSystem2Service"
mapTo
=
"WarningSystem2ServiceClient"
name
=
"weighterWarningService"
>
<
lifetime
type
=
"singleton"
/>
<
constructor
>
<
param
name
=
"serviceId"
value
=
"20000"
/>
<
param
name
=
"connName"
dependencyName
=
"cn2"
/>
</
constructor
>
</
register
>
</
container
>
</
unity
>
</
configuration
>
\ No newline at end of file
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment