From 8406d689577ae99a2187db98b42fb37c9e216af8 Mon Sep 17 00:00:00 2001 From: hanqiangqiang <1364346467@qq.com> Date: Wed, 19 Aug 2026 14:04:50 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9PC=E7=9B=B8=E5=85=B3=E9=97=AE?= =?UTF-8?q?=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../SicModules/Config/PM/PM1/_ioDefinePM1.xml | 2 +- App/SicUI/Models/Maintenances/TM/TMView.xaml | 281 +++++++++--------- App/SicUI/Models/PMs/PMOperationViewModel.cs | 18 +- 3 files changed, 151 insertions(+), 150 deletions(-) diff --git a/App/Modules/SicModules/Config/PM/PM1/_ioDefinePM1.xml b/App/Modules/SicModules/Config/PM/PM1/_ioDefinePM1.xml index a16bda5..bb6b34c 100644 --- a/App/Modules/SicModules/Config/PM/PM1/_ioDefinePM1.xml +++ b/App/Modules/SicModules/Config/PM/PM1/_ioDefinePM1.xml @@ -413,7 +413,7 @@ - + diff --git a/App/SicUI/Models/Maintenances/TM/TMView.xaml b/App/SicUI/Models/Maintenances/TM/TMView.xaml index 3afd7bd..b5ef1eb 100644 --- a/App/SicUI/Models/Maintenances/TM/TMView.xaml +++ b/App/SicUI/Models/Maintenances/TM/TMView.xaml @@ -11,16 +11,16 @@ xmlns:deviceControl="clr-namespace:Aitex.Core.UI.DeviceControl;assembly=MECF.Framework.UI.Core" xmlns:i="http://schemas.microsoft.com/expression/2010/interactivity" xmlns:industrialcontrol="clr-namespace:MECF.Framework.UI.Client.IndustrialControl;assembly=MECF.Framework.UI.Client" + xmlns:lex="http://wpflocalizeextension.codeplex.com" xmlns:m2c4parts="clr-namespace:SicUI.Controls.M2C4Parts" xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" xmlns:unitControls="clr-namespace:MECF.Framework.UI.Client.Ctrlib.UnitControls;assembly=MECF.Framework.UI.Client" - xmlns:lex="http://wpflocalizeextension.codeplex.com" d:DesignHeight="800" d:DesignWidth="1920" - mc:Ignorable="d" lex:LocalizeDictionary.DesignCulture="en" lex:ResxLocalizationProvider.DefaultAssembly="Sicentury.Localization" - lex:ResxLocalizationProvider.DefaultDictionary="lang_common"> + lex:ResxLocalizationProvider.DefaultDictionary="lang_common" + mc:Ignorable="d"> DimGray LightGray @@ -88,8 +88,8 @@ BorderBrush="{DynamicResource Table_BD}" BorderThickness="0,0,0,1"> - + @@ -240,8 +240,8 @@ BorderBrush="{DynamicResource Table_BD}" BorderThickness="1,0,1,1"> - + @@ -649,8 +649,8 @@ BorderBrush="{DynamicResource Table_BD}" BorderThickness="1,0,1,1"> - + @@ -1600,8 +1600,8 @@ BorderBrush="{DynamicResource Table_BD}" BorderThickness="1,0,1,1"> + Grid.Row="5" + Padding="5,1,0,1" + Background="{DynamicResource Table_BG_Title}" + BorderBrush="{DynamicResource Table_BD}" + BorderThickness="1,0,1,1"> + VerticalAlignment="Center" + lex:ResxLocalizationProvider.DefaultDictionary="lang_efemview" + FontFamily="Arial" + FontSize="12" + Foreground="{DynamicResource FG_Black}" + Text="{lex:Loc ID_TXT_Door}" + TextWrapping="Wrap" /> - + Grid.Row="5" + Grid.Column="1" + Padding="5,1,0,1" + Background="{DynamicResource Table_BG_Content}" + BorderBrush="{DynamicResource Table_BD}" + BorderThickness="0,0,0,1"> + + Grid.Row="5" + Grid.Column="2" + Padding="5,1" + Background="{DynamicResource Table_BG_Content}" + BorderBrush="{DynamicResource Table_BD}" + BorderThickness="1,0,1,1"> + HorizontalAlignment="Center" + VerticalAlignment="Center" + GreenColor="True" + LightOnValue="{Binding LoadLockLSideDoorOpenSensor}" /> + HorizontalAlignment="Center" + VerticalAlignment="Center" + GreenColor="True" + LightOnValue="{Binding LoadLockLSideDoorCloseSensor}" /> + Grid.Row="6" + Padding="5,1,0,1" + Background="{DynamicResource Table_BG_Title}" + BorderBrush="{DynamicResource Table_BD}" + BorderThickness="1,0,1,1"> + VerticalAlignment="Center" + lex:ResxLocalizationProvider.DefaultDictionary="lang_efemview" + FontFamily="Arial" + FontSize="12" + Foreground="{DynamicResource FG_Black}" + Text="{lex:Loc ID_TXT_Lift}" + TextWrapping="Wrap" /> + Grid.Row="6" + Grid.Column="1" + Padding="5,1,0,1" + Background="{DynamicResource Table_BG_Content}" + BorderBrush="{DynamicResource Table_BD}" + BorderThickness="0,0,0,1"> + VerticalAlignment="Center" + FontFamily="Arial" + FontSize="12" + Foreground="{DynamicResource FG_Black}" + Text="" + TextAlignment="Center" + TextWrapping="Wrap" /> + Grid.Row="6" + Grid.Column="2" + Padding="5,1" + Background="{DynamicResource Table_BG_Content}" + BorderBrush="{DynamicResource Table_BD}" + BorderThickness="1,0,1,1"> + Margin="10,0,0,0" + HorizontalAlignment="Center" + GreenColor="True" + LightOnValue="{Binding LoadLiftUpSensor}" /> + Margin="60,0,0,0" + HorizontalAlignment="Center" + GreenColor="True" + LightOnValue="{Binding LoadLiftDownSensor}" /> - + @@ -3160,8 +3161,8 @@ TextWrapping="Wrap" /> BorderBrush="{DynamicResource Table_BD}" BorderThickness="1,0,1,1"> BorderBrush="{DynamicResource Table_BD}" BorderThickness="1,0,1,1">