临时提交

skoda-scada-daq3.0-master/skoda-scada-daq3.0-master/scada_-daq3.0-master/SCADA_DAQ.Plugin.Qilin/Uct/UctTitleRegEditViewUnitControl.xaml

@@ -7,14 +7,11 @@
              mc:Ignorable="d"
              x:Name="this"
              d:DesignHeight="450" d:DesignWidth="800">
-    <qilin:DashboardCard>
+    <qilin:DashboardCard Margin="4">
         <Grid>
-        <Grid.RowDefinitions>
-            <RowDefinition/>
-            <RowDefinition/>
-        </Grid.RowDefinitions>
-        <TextBlock Text="{Binding Comment.Annotation}"  VerticalAlignment="Bottom"  HorizontalAlignment="Center" Margin="0,0,60,0"/>
-        <StackPanel Orientation="Horizontal"  VerticalAlignment="Top" HorizontalAlignment="Center" Grid.Row="1">
+        
+        <!--<TextBlock Text="{Binding Comment.Annotation}"  VerticalAlignment="Bottom"  HorizontalAlignment="Center" Margin="0,0,60,0"/>-->
+        <StackPanel Orientation="Horizontal"  VerticalAlignment="Center" HorizontalAlignment="Center" Grid.Row="1">
         <scadaui:RegEditView TitleVisibility="Collapsed" Width="120" Margin="0,0,25,0" />
             <!--<TextBlock Text="{Binding Comment.Unit}" Margin="10,0,0,0" VerticalAlignment="Center" HorizontalAlignment="Center"/>-->
         </StackPanel>

skoda-scada-daq3.0-master/skoda-scada-daq3.0-master/scada_-daq3.0-master/SCADA_DAQ.Plugin.Qilin/UctFrmBeamMain.xaml

@@ -24,7 +24,7 @@
                     <ColumnDefinition Width="1*"/>
                     <ColumnDefinition Width="1*"/>
                 </Grid.ColumnDefinitions>
-                <uct:UctBeamPart />
+                <!--<uct:UctBeamPart />-->
                 <beaminformation:UctSencdBeamPart Grid.Column="1" Grid.Row="1"/>
             </Grid>
         </Grid>

skoda-scada-daq3.0-master/skoda-scada-daq3.0-master/scada_-daq3.0-master/SCADA_DAQ.Plugin.Qilin/UctFrmFeedingMain.xaml

@@ -24,7 +24,7 @@
                     <ColumnDefinition Width="1*"/>
                     <ColumnDefinition Width="1*"/>
                 </Grid.ColumnDefinitions>
-                <uct:UctFeedingPart/>
+                <!--<uct:UctFeedingPart/>-->
                 <beaminformation:UctScendFeedingPart  Grid.Column="1"/>
             </Grid>
         </Grid>

skoda-scada-daq3.0-master/skoda-scada-daq3.0-master/scada_-daq3.0-master/SCADA_DAQ.Plugin.Qilin/UctFrmSpringTrimmingMain.xaml

@@ -18,7 +18,7 @@
                 <RowDefinition Height="1*"/>
                 <RowDefinition Height="9*"/>
             </Grid.RowDefinitions>
-            <uct:UctMidCard Title="弹簧微调主页"  Grid.Row="0" Grid.ColumnSpan="2"/>
+            <uct:UctMidCard Title="弹簧微调主页"  Grid.Row="0" Grid.ColumnSpan="2"/> 
             <uct:UctSpringTrimming Grid.Column="1" Grid.Row="1"/>
         </Grid>
     </Grid>