临时提交

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

@@ -6,7 +6,7 @@
              xmlns:local="clr-namespace:SCADA_DAQ.Plugin.Qilin.Uct.BedNetworkInformation" xmlns:uct="clr-namespace:SCADA_DAQ.Plugin.Qilin.Uct" xmlns:qilin="clr-namespace:SCADA_DAQ.Plugin.Qilin"
              mc:Ignorable="d" 
              d:DesignHeight="450" d:DesignWidth="800">
-    <qilin:DashboardCard>
+    
         <Grid>
         <Grid.ColumnDefinitions>
             <ColumnDefinition/>
@@ -27,54 +27,53 @@
                 <uct:UctLowerReadingControl Grid.Row="1" x:Name="CutterPosition" VerticalContentAlignment="Center"  Grid.Column="1"/>
             </Grid>
         </Grid>
-        <Grid Grid.Column="1">
-            <Grid.RowDefinitions>
-                <RowDefinition/>
-                <RowDefinition/>
-                <RowDefinition/>
-            </Grid.RowDefinitions>
-            <TextBlock Text="床网手动操作" VerticalAlignment="Bottom" HorizontalAlignment="Right" FontSize="30"/>
-            <Grid Grid.Row="1">
-                <Grid>
-                    <Grid.ColumnDefinitions>
-                        <ColumnDefinition Width="1*"/>
-                        <ColumnDefinition Width="2*"/>
-                        <ColumnDefinition Width="3*"/>
-                        <ColumnDefinition Width="2*"/>
-                        <ColumnDefinition Width="3*"/>
-                    </Grid.ColumnDefinitions>
-                    <Grid.RowDefinitions>
-                        <RowDefinition Height="1*"/>
+        <qilin:DashboardCard  Grid.Column="1">
+            <Grid>
+                <Grid.RowDefinitions>
+                    <RowDefinition/>
+                    <RowDefinition/>
+                    <RowDefinition/>
+                </Grid.RowDefinitions>
+                <TextBlock Text="床网手动操作" VerticalAlignment="Bottom" HorizontalAlignment="Right" FontSize="30"/>
+                <Grid Grid.Row="1">
+                    <Grid>
+                        <Grid.ColumnDefinitions>
+                            <ColumnDefinition Width="1*"/>
+                            <ColumnDefinition Width="2*"/>
+                            <ColumnDefinition Width="3*"/>
+                            <ColumnDefinition Width="2*"/>
+                            <ColumnDefinition Width="3*"/>
+                        </Grid.ColumnDefinitions>
+                        <Grid.RowDefinitions>
+                            <RowDefinition Height="1*"/>
                             <RowDefinition Height="2*"/>
                         </Grid.RowDefinitions>
-                    <uct:UctLowerReadingControl   x:Name="JoggingSpeed" VerticalAlignment="Bottom" Grid.Row="1" Grid.Column="1" FontSize="20"/>
+                        <uct:UctLowerReadingControl   x:Name="JoggingSpeed" VerticalAlignment="Bottom" Grid.Row="1" Grid.Column="1" FontSize="20"/>
                         <uct:UctLowerReadingControl  Grid.Column="3" x:Name="RealtimeLocation"  VerticalContentAlignment="Bottom" Grid.Row="1" FontSize="20"/>
+                    </Grid>
                 </Grid>
-
-            </Grid>
-            <Grid Grid.Row="2">
-                <Grid>
-                    <Grid.ColumnDefinitions>
-                        <ColumnDefinition />
-                        <ColumnDefinition/>
-                        <ColumnDefinition />
-                        <ColumnDefinition />
-                        <ColumnDefinition />
-                        
-                    </Grid.ColumnDefinitions>
-                    <Grid.RowDefinitions>
-                        <RowDefinition Height="1*"/>
-                        <RowDefinition Height="1*"/>
-                        
-                    </Grid.RowDefinitions>
-                    <uct:UctSingleButtonControl Title="退一簧" x:Name="BackASpring" Grid.Row="1"  Margin="-14,0,15,0" />
-                    <uct:UctPressOneLooseZeroButtonControl Title="原点" Grid.Column="1" x:Name="Origin" Grid.Row="1" />
-                    <uct:UctSingleButtonControl Title="点检" Grid.Column="2" x:Name="SpotCheck" Grid.Row="1" />
-                    <uct:UctPressOneLooseZeroButtonControl Title="往里" Grid.Column="3" x:Name="Inward" Grid.Row="1"  />
-                    <uct:UctPressOneLooseZeroButtonControl Title="往外" Grid.Column="5" x:Name="Outward" Grid.Row="1" />
+                <Grid Grid.Row="2">
+                    <Grid>
+                        <Grid.ColumnDefinitions>
+                            <ColumnDefinition />
+                            <ColumnDefinition/>
+                            <ColumnDefinition />
+                            <ColumnDefinition />
+                            <ColumnDefinition />
+                        </Grid.ColumnDefinitions>
+                        <Grid.RowDefinitions>
+                            <RowDefinition Height="1*"/>
+                            <RowDefinition Height="1*"/>
+                        </Grid.RowDefinitions>
+                        <uct:UctSingleButtonControl Title="退一簧" x:Name="BackASpring" Grid.Row="1"  Margin="-14,0,15,0" />
+                        <uct:UctPressOneLooseZeroButtonControl Title="原点" Grid.Column="1" x:Name="Origin" Grid.Row="1" />
+                        <uct:UctSingleButtonControl Title="点检" Grid.Column="2" x:Name="SpotCheck" Grid.Row="1" />
+                        <uct:UctPressOneLooseZeroButtonControl Title="往里" Grid.Column="3" x:Name="Inward" Grid.Row="1"  />
+                        <uct:UctPressOneLooseZeroButtonControl Title="往外" Grid.Column="5" x:Name="Outward" Grid.Row="1" />
+                    </Grid>
                 </Grid>
             </Grid>
-        </Grid>
+        </qilin:DashboardCard>
     </Grid>
-    </qilin:DashboardCard>
+    
 </UserControl>

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

@@ -14,7 +14,7 @@
                             </Grid.RowDefinitions>
                             <StackPanel Orientation="Horizontal" Margin="8,4">
                                 <Image Stretch="None" Source="/SCADA_DAQ.Plugin.Qilin;component/Content/Img/Title_Icon.png"/>
-                                <TextBlock Text="{TemplateBinding Title}" Margin="8,0" FontSize="15" Foreground="Cyan" HorizontalAlignment="Center"/>
+                                <TextBlock Text="{TemplateBinding Title}" Margin="8,0" FontSize="{TemplateBinding FontSize}" Foreground="{TemplateBinding Foreground}" HorizontalAlignment="Center"/>
                             </StackPanel>
                             <ContentPresenter Grid.Row="1" HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}" SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}" VerticalAlignment="{TemplateBinding VerticalContentAlignment}"/>
                         </Grid>

skoda-scada-daq3.0-master/skoda-scada-daq3.0-master/scada_-daq3.0-master/SCADA_DAQ.Plugin.Qilin/UctFrmPushSpringMain.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" FontSize="30" Foreground="Cyan"/>
             <maincontrol1:UctFirstPushSpring Grid.Column="1" Grid.Row="1"/>
         </Grid>
     </Grid>