Преглед на файлове

mxg:待建模、建模规范检查,立管检查 样式和流程细节调整

mengxiangge преди 5 години
родител
ревизия
b9df520ab0

+ 6 - 10
FWindSoft/Saga.PlugIn/CreateFacility/VMCreateFacility.cs

@@ -146,17 +146,13 @@ namespace Saga.PlugIn.CreateFacility
                 return;
             }
             //创建
-            var winBase = param as Window;
-            if (winBase != null)
+            id = CreateFacilityRevitUtils.CreateFacility(m_Document, facilityClass, MFacilityTabCode.BIMLocation,
+                MFacilityTabCode.Id);
+            if (!string.IsNullOrEmpty(id))
             {
-                winBase.Close();
-                id = CreateFacilityRevitUtils.CreateFacility(m_Document, facilityClass, MFacilityTabCode.BIMLocation,
-                    MFacilityTabCode.Id);
-                if (!string.IsNullOrEmpty(id))
-                {
-                    WinTipCreateSuccess winTipCreateSuccess=new WinTipCreateSuccess(id);
-                    winTipCreateSuccess.ShowDialog();
-                }
+                CreateFacilityRevitUtils.FocusFacility(id);
+                WinTipCreateSuccess winTipCreateSuccess = new WinTipCreateSuccess(id);
+                winTipCreateSuccess.ShowDialog();
             }
 
         }

+ 18 - 15
FWindSoft/Saga.PlugIn/CreateFacility/WinCreateFacility.xaml

@@ -6,16 +6,16 @@
              xmlns:converter="clr-namespace:SAGA.DotNetUtils.WPF.Converter;assembly=SAGA.DotNetUtils"
              xmlns:local="clr-namespace:Saga.PlugIn.ModelCheck"
              xmlns:createFacility="clr-namespace:Saga.PlugIn.CreateFacility"
-             mc:Ignorable="d"  Title="待建模设备" WindowStartupLocation="CenterScreen"
+             mc:Ignorable="d"  Title="待建模设备" WindowStartupLocation="Manual" 
         ResizeMode="NoResize"
-        Height="587" Width="600">
+        Height="550" Width="400">
     <Grid>
         <Grid.RowDefinitions>
             <RowDefinition Height="*"></RowDefinition>
             <RowDefinition Height="80"></RowDefinition>
-            <RowDefinition Height="60"></RowDefinition>
+            <RowDefinition Height="43"></RowDefinition>
         </Grid.RowDefinitions>
-        <Grid  Margin="5,0">
+        <Grid  Margin="10,0">
             <Grid.RowDefinitions>
                 <RowDefinition Height="30"></RowDefinition>
                 <RowDefinition Height="*"></RowDefinition>
@@ -23,8 +23,8 @@
             </Grid.RowDefinitions>
             <Grid  Height="30" >
                     <Label Content="需建模的设备标记码:"></Label>
-                    <Button Width="120" Height="25" Background="White"  Foreground="Black" Content="从剪切板粘贴" 
-                            HorizontalAlignment="Right" Margin="0,0,5,0" VerticalAlignment="Center" 
+                    <Button Width="82" Height="23" Content="从剪切板粘贴" 
+                            HorizontalAlignment="Right" VerticalAlignment="Center" 
                             Command="{Binding Path=Commands.PasteTabCode}" 
                     ></Button>
                 </Grid>
@@ -39,7 +39,7 @@
                     </TextBox.Resources>
                     <TextBox.Style>
                         <Style TargetType="TextBox">
-                            <Setter Property="FontSize" Value="14"/>
+                            <Setter Property="FontSize" Value="12"/>
                             <Setter Property="Foreground" Value="#FF333333"/>
                             <Setter Property="BorderBrush" Value="#8F666666"/>
                             <Setter Property="TextWrapping" Value="Wrap"/>
@@ -62,22 +62,25 @@
                 <TextBlock Text="{Binding Path=FacilityLocated}" VerticalAlignment="Center"></TextBlock>
             </WrapPanel>
         </Grid>
-        <Grid Grid.Row="1" Margin="5,0">
+        <Grid Grid.Row="1"  Margin="10,0">
             <Label Content="当前打开的模型文件:"  Foreground="DarkGray" ></Label>
-            <TextBlock Margin="5,15,0,0" Foreground="Black" 
+            <TextBlock Margin="8,15,0,0"
                        Text="{Binding Path=ModelFilePath}" 
                        VerticalAlignment="Center" TextWrapping="WrapWithOverflow" ></TextBlock>
         </Grid>
-        <Grid Grid.Row="2" Background="LightGray">
-            <Button Width="120" Height="25" Background="White"  Foreground="Black" Content="重新输入" 
-                    HorizontalAlignment="Right" Margin="0,0,115,0" VerticalAlignment="Center" 
+        <Grid Grid.Row="2" Background="#F0F0F0">
+            <WrapPanel HorizontalAlignment="Right">
+ <Button Width="82" Height="23"  Content="重新输入" 
+                    HorizontalAlignment="Right" Margin="0,10,6,10"
                     Command="{Binding Path=Commands.ClearTabCode}" 
             ></Button>
-            <Button Width="100" Height="25" Background="Black"  Foreground="White" Content="下一步"
-                    HorizontalAlignment="Right" Margin="0,0,5,0" VerticalAlignment="Center" 
+            <Button Width="82" Height="23" Content="下一步"
+                    HorizontalAlignment="Right" Margin="0,10,10,10"
                     Command="{Binding Path=Commands.Execute}"
                     CommandParameter="{Binding RelativeSource={RelativeSource AncestorType=Window, Mode=FindAncestor}}"
-                    ></Button>
+                    IsDefault="True"></Button>
+            </WrapPanel>
+           
         </Grid>
     </Grid>
 </Window>

+ 4 - 0
FWindSoft/Saga.PlugIn/CreateFacility/WinCreateFacility.xaml.cs

@@ -9,6 +9,8 @@ using Microsoft.Win32;
 using SAGA.DotNetUtils;
 using SAGA.DotNetUtils.Extend;
 using System.Windows.Forms;
+using FWindSoft.Revit;
+using FWindSoft.Revit.Common;
 using Saga.PlugIn.CreateFacility;
 
 namespace Saga.PlugIn.ModelCheck
@@ -22,6 +24,8 @@ namespace Saga.PlugIn.ModelCheck
         {
             InitializeComponent();
             this.DataContext = viewmodel;
+            this.Left = RevitTools.RevitRightPoint - 10 - this.Width;
+            this.Top = RevitTools.RevitTopPoint + 210;
         }
         
 

+ 15 - 11
FWindSoft/Saga.PlugIn/CreateFacility/WinSelectDeviceClass.xaml

@@ -11,30 +11,34 @@
     <Grid>
         <Grid.RowDefinitions>
             <RowDefinition Height="*"></RowDefinition>
-            <RowDefinition Height="60"></RowDefinition>
+            <RowDefinition Height="43"></RowDefinition>
         </Grid.RowDefinitions>
-        <Grid>
+        <Grid Margin="10,0">
             <Grid.RowDefinitions>
-                <RowDefinition Height="50"></RowDefinition>
-                <RowDefinition Height="35"></RowDefinition>
+                <RowDefinition Height="*"></RowDefinition>
+                <RowDefinition Height="*"></RowDefinition>
             </Grid.RowDefinitions>
             <Grid >
-                    <Label VerticalAlignment="Bottom" Margin="5"
+                    <Label VerticalAlignment="Bottom"
                            Content="请选择需建模的设备类型:"></Label>
                 </Grid>
-            <ComboBox Grid.Row="1" Margin="5"
+            <ComboBox Grid.Row="1" Height="23" VerticalAlignment="Top"
                       ItemsSource="{Binding Path=ClassCodes}"
                       SelectedItem="{Binding Path=SelectedCode}"
                       DisplayMemberPath="name"></ComboBox>
         </Grid>
-        <Grid Grid.Row="1" Background="LightGray">
-            <Button Width="100" Height="25" Background="White"  Foreground="Black" Content="上一步" 
-                    HorizontalAlignment="Right" Margin="0,0,115,0" VerticalAlignment="Center" 
+        <Grid Grid.Row="1" Background="#F0F0F0">
+            <WrapPanel HorizontalAlignment="Right">
+  <Button Width="82" Height="23"
+                    Content="上一步" 
+                    HorizontalAlignment="Right" Margin="0,10,6,10" VerticalAlignment="Center" 
                     IsCancel="True"
             ></Button>
-            <Button Width="100" Height="25" Background="Black"  Foreground="White" Content="确认"
-                    HorizontalAlignment="Right" Margin="0,0,5,0" VerticalAlignment="Center" 
+            <Button Width="82" Height="23" Content="确认"
+                    HorizontalAlignment="Right" Margin="0,10,10,10" VerticalAlignment="Center" 
                     Click="ButtonNext_OnClick" ></Button>
+            </WrapPanel>
+          
         </Grid>
     </Grid>
 </Window>

+ 9 - 10
FWindSoft/Saga.PlugIn/CreateFacility/WinTipCreateSuccess.xaml

@@ -10,9 +10,9 @@
     <Grid>
         <Grid.RowDefinitions>
             <RowDefinition></RowDefinition>
-            <RowDefinition Height="60"></RowDefinition>
+            <RowDefinition Height="43"></RowDefinition>
         </Grid.RowDefinitions>
-        <Grid>
+        <Grid Margin="10,0">
             <Grid.RowDefinitions>
                 <RowDefinition></RowDefinition>
                 <RowDefinition></RowDefinition>
@@ -21,16 +21,15 @@
                 <ColumnDefinition Width="100"></ColumnDefinition>
                 <ColumnDefinition></ColumnDefinition>
             </Grid.ColumnDefinitions>
-            <Image Height="40" Width="40" VerticalAlignment="Bottom" HorizontalAlignment="Right" Margin="10,0"
+            <Image Height="36" Width="36" VerticalAlignment="Bottom" HorizontalAlignment="Right"
                    Source="Image/成功.png"></Image>
             <Label Grid.Row="0" Grid.Column="1" Content="创建模型成功"
-                   FontSize="20" FontWeight="UltraBlack"
+                   FontSize="16" FontWeight="UltraBlack"
                    VerticalAlignment="Bottom"></Label>
             <WrapPanel  Grid.Row="1" Grid.Column="1" >
                 <TextBlock Text="{Binding Path=Tip}" 
-                           TextWrapping="WrapWithOverflow"
-                           FontSize="15" Margin="0,10,50,0"></TextBlock>
-                <Button Height="24" Content="复制"  Margin="0,10"
+                           TextWrapping="WrapWithOverflow"></TextBlock>
+                <Button Height="23" Content="复制" Margin="6,0"
                         Click="ButtonCopy_OnClick">
                     <Button.Style >
                         <Style TargetType="Button">
@@ -43,9 +42,9 @@
             </WrapPanel>
             
         </Grid>
-        <Grid Grid.Row="1" Background="LightGray">
-            <Button Width="100" Height="25" Background="Black"  Foreground="White" Content="确认"
-                    HorizontalAlignment="Right" Margin="0,0,5,0" VerticalAlignment="Center" 
+        <Grid Grid.Row="1" Background="#F0F0F0">
+            <Button Width="82" Height="23" Content="确认"
+                    HorizontalAlignment="Right" Margin="0,10,10,10" VerticalAlignment="Center" 
                     Click="ButtonNext_OnClick" ></Button>
         </Grid>
     </Grid>

+ 14 - 12
FWindSoft/Saga.PlugIn/CreateFacility/WinTipExisted.xaml

@@ -10,9 +10,9 @@
     <Grid>
         <Grid.RowDefinitions>
             <RowDefinition></RowDefinition>
-            <RowDefinition Height="60"></RowDefinition>
+            <RowDefinition Height="43"></RowDefinition>
         </Grid.RowDefinitions>
-        <Grid>
+        <Grid Margin="10,0">
             <Grid.RowDefinitions>
                 <RowDefinition></RowDefinition>
                 <RowDefinition></RowDefinition>
@@ -21,16 +21,15 @@
                 <ColumnDefinition Width="100"></ColumnDefinition>
                 <ColumnDefinition></ColumnDefinition>
             </Grid.ColumnDefinitions>
-            <Image Height="40" Width="40" VerticalAlignment="Bottom" HorizontalAlignment="Right" Margin="10,0"
+            <Image Height="36" Width="36" VerticalAlignment="Bottom" HorizontalAlignment="Right"
                    Source="Image/警告.png"></Image>
             <Label Grid.Row="0" Grid.Column="1" Content="设备已存在,请检查"
-                   FontSize="20" FontWeight="UltraBlack"
+                   FontSize="16" FontWeight="UltraBlack"
                    VerticalAlignment="Bottom"></Label>
             <WrapPanel  Grid.Row="1" Grid.Column="1" >
                 <TextBlock Text="{Binding Path=Tip}" 
-                           TextWrapping="WrapWithOverflow"
-                           FontSize="15" Margin="0,10,50,0"></TextBlock>
-                <Button Height="24" Content="复制"  Margin="0,10"
+                           TextWrapping="WrapWithOverflow" VerticalAlignment="Center"></TextBlock>
+                <Button Height="23" Content="复制" 
                         Click="ButtonCopy_OnClick">
                     <Button.Style >
                         <Style TargetType="Button">
@@ -43,14 +42,17 @@
             </WrapPanel>
             
         </Grid>
-        <Grid Grid.Row="1" Background="LightGray">
-            <Button Width="100" Height="25" Background="White"  Foreground="Black" Content="定位模型" 
-                    HorizontalAlignment="Right" Margin="0,0,115,0" VerticalAlignment="Center" 
+        <Grid Grid.Row="1" Background="#F0F0F0">
+            <WrapPanel HorizontalAlignment="Right">
+<Button Width="82" Height="23" Content="定位模型" 
+                    HorizontalAlignment="Right" Margin="0,10,6,10"
                     Click="ButtonFocus_OnClick"
             ></Button>
-            <Button Width="100" Height="25" Background="Black"  Foreground="White" Content="重新输入"
-                    HorizontalAlignment="Right" Margin="0,0,5,0" VerticalAlignment="Center" 
+            <Button Width="82" Height="23" Content="重新输入"
+                    HorizontalAlignment="Right" Margin="0,10,10,10"
                     Click="ButtonNext_OnClick" ></Button>
+            </WrapPanel>
+            
         </Grid>
     </Grid>
 </Window>

+ 8 - 9
FWindSoft/Saga.PlugIn/CreateFacility/WinTipMissFamily.xaml

@@ -10,9 +10,9 @@
     <Grid>
         <Grid.RowDefinitions>
             <RowDefinition></RowDefinition>
-            <RowDefinition Height="60"></RowDefinition>
+            <RowDefinition Height="43"></RowDefinition>
         </Grid.RowDefinitions>
-        <Grid>
+        <Grid Margin="10,0">
             <Grid.RowDefinitions>
                 <RowDefinition></RowDefinition>
                 <RowDefinition></RowDefinition>
@@ -21,18 +21,17 @@
                 <ColumnDefinition Width="100"></ColumnDefinition>
                 <ColumnDefinition></ColumnDefinition>
             </Grid.ColumnDefinitions>
-            <Image Height="40" Width="40" VerticalAlignment="Bottom" HorizontalAlignment="Right" Margin="10,0"
+            <Image Height="36" Width="36" VerticalAlignment="Bottom" HorizontalAlignment="Right" 
                    Source="Image/错误.png"></Image>
             <Label Grid.Row="0" Grid.Column="1" Content="自动创建设备异常!"
-                   FontSize="20" FontWeight="UltraBlack"
+                   FontSize="16" FontWeight="UltraBlack"
                    VerticalAlignment="Bottom"></Label>
             <TextBlock Grid.Row="1" Grid.Column="1" Text="{Binding Path=Tip}" 
-                       TextWrapping="WrapWithOverflow"
-                       FontSize="15" Margin="0,10,100,0"></TextBlock>
+                       TextWrapping="WrapWithOverflow"></TextBlock>
         </Grid>
-        <Grid Grid.Row="1" Background="LightGray">
-            <Button Width="100" Height="25" Background="Black"  Foreground="White" Content="确认"
-                    HorizontalAlignment="Right" Margin="0,0,5,0" VerticalAlignment="Center" 
+        <Grid Grid.Row="1" Background="#F0F0F0">
+            <Button Width="82" Height="23" Content="确认"
+                    HorizontalAlignment="Right" Margin="0,10,10,10"
                     Click="ButtonNext_OnClick" ></Button>
         </Grid>
     </Grid>

+ 33 - 32
FWindSoft/Saga.PlugIn/ModelCheck/WinModeCheck.xaml

@@ -19,16 +19,16 @@
             <RowDefinition Height="*"></RowDefinition>
             <RowDefinition Height="Auto"></RowDefinition>
         </Grid.RowDefinitions>
-        <Grid Grid.Row="0">
-            <GroupBox Header="当前打开的模型文件" Foreground="DarkGray" Margin="10,10,10,5">
-                <TextBlock Margin="5,0" Foreground="Black" 
+        <Grid Grid.Row="0" Margin="10,0">
+            <GroupBox Header="当前打开的模型文件">
+                <TextBlock Foreground="Black" 
                            Text="{Binding Path=ModelFilePath}" 
                            VerticalAlignment="Center" TextWrapping="WrapWithOverflow" ></TextBlock>
             </GroupBox>
         </Grid>
         <Grid Grid.Row="1" Margin="10,0">
             <Grid.RowDefinitions>
-                <RowDefinition Height="26"></RowDefinition>
+                <RowDefinition Height="20"></RowDefinition>
                 <RowDefinition Height="*"></RowDefinition>
             </Grid.RowDefinitions>
             <Grid Grid.Row="0">
@@ -39,7 +39,7 @@
                     <ListBox.ItemTemplate>
                         <DataTemplate>
                             <WrapPanel  >
-                                <Image Width="26" Visibility="{Binding Path=ModelCheckState,
+                                <Image Width="20" Visibility="{Binding Path=ModelCheckState,
                                     Converter={StaticResource ItemImageEqualVisibleConverter},
                                             ConverterParameter={x:Static local:ModelCheckState.Prepare}}">
                                     <Image.Source>
@@ -68,27 +68,26 @@
                 <Grid.RowDefinitions>
                     <RowDefinition Height="40"></RowDefinition>
                     <RowDefinition Height="40"></RowDefinition>
-                    <RowDefinition Height="60"></RowDefinition>
+                    <RowDefinition Height="43"></RowDefinition>
                 </Grid.RowDefinitions>
-                <Grid Grid.Row="0" Margin="5,8,0,2">
+                <Grid Grid.Row="0" Margin="10,0">
                     <Label Content="检查结果储存位置:" VerticalAlignment="Center" Foreground="LightGray"></Label>
                 </Grid>
-                <Grid Grid.Row="1" Margin="5,3,0,8">
+                <Grid Grid.Row="1" Margin="10,0">
                     <Grid.ColumnDefinitions>
                         <ColumnDefinition Width="*"></ColumnDefinition>
-                        <ColumnDefinition Width="100"></ColumnDefinition>
+                        <ColumnDefinition Width="82"></ColumnDefinition>
                     </Grid.ColumnDefinitions>
-                    <TextBox Margin="10,0,0,0" VerticalContentAlignment="Center" Height="25" 
-                             Name="txtPath"
+                    <TextBox VerticalContentAlignment="Center" Height="23" 
+                             Name="txtPath" Margin="6,0,6,0"
                              Text="{Binding Path=SaveDir,UpdateSourceTrigger=PropertyChanged,Mode=TwoWay}" 
                              VerticalAlignment="Center"></TextBox>
-                    <Button Grid.Column="1" Content="浏览" Height="25" Margin="10,0,5,0"
+                    <Button Grid.Column="1" Content="浏览" Height="25"
                             Click="SelectFile_OnClick"></Button>
                 </Grid>
-                <Grid Grid.Row="2" Background="LightGray">
-                    <Button Width="100" Height="25" Background="Black"  Foreground="White" Content="开始检查" 
-                            HorizontalAlignment="Right" 
-                            Margin="0,0,5,0" VerticalAlignment="Center"
+                <Grid Grid.Row="2" Background="#F0F0F0">
+                    <Button Width="82" Height="23" Content="开始检查" 
+                            HorizontalAlignment="Right" Margin="0,10,10,10"
                             Command="{Binding Path=Commands.Execute}" 
                             CommandParameter="{Binding RelativeSource={RelativeSource AncestorType=Window,Mode=FindAncestor}}"
                             ></Button>
@@ -100,9 +99,9 @@
                 <Grid.RowDefinitions>
                     <RowDefinition Height="30"></RowDefinition>
                     <RowDefinition Height="40"></RowDefinition>
-                    <RowDefinition Height="60"></RowDefinition>
+                    <RowDefinition Height="43"></RowDefinition>
                 </Grid.RowDefinitions>
-                <Grid Grid.Row="0" Margin="5,0">
+                <Grid Grid.Row="0" Margin="10,0">
                     <WrapPanel>
                         <Label Content="建模规范检查进度...(" VerticalAlignment="Center"></Label>
                         <Label Margin="0" Content="{Binding ElementName=ProgressBar,Path=Value}" VerticalAlignment="Center"></Label>
@@ -110,15 +109,14 @@
                         <Label Margin="0" Content="{Binding ElementName=ProgressBar,Path=Maximum}" VerticalAlignment="Center"></Label>
                         <Label Margin="0" Content=")" VerticalAlignment="Center"></Label>
                     </WrapPanel>
-                    
                 </Grid>
-                <Grid Grid.Row="1" Margin="15,0">
+                <Grid Grid.Row="1" Margin="10,0">
                     <ProgressBar x:Name="ProgressBar"  Grid.Column="0" Height="30" Value="{Binding Path=CurrentIndex}" Maximum="{Binding Path=CheckItems.Count}"></ProgressBar>
                 </Grid>
-                <Grid Grid.Row="2" Background="LightGray">
-                    <Button Width="100" Height="25" 
+                <Grid Grid.Row="2" Background="#F0F0F0">
+                    <Button Width="82" Height="23" 
                             Content="检查中..." IsEnabled="False"
-                            HorizontalAlignment="Right" Margin="0,0,5,0" VerticalAlignment="Center" 
+                            HorizontalAlignment="Right" Margin="0,10,10,10"
                             ></Button>
                 </Grid>
             </Grid>
@@ -128,23 +126,26 @@
                 <Grid.RowDefinitions>
                     <RowDefinition Height="30"></RowDefinition>
                     <RowDefinition Height="40"></RowDefinition>
-                    <RowDefinition Height="60"></RowDefinition>
+                    <RowDefinition Height="43"></RowDefinition>
                 </Grid.RowDefinitions>
-                <Grid Grid.Row="0" Margin="5,0">
+                <Grid Grid.Row="0" Margin="10,0">
                     <Label Content="当前校验结果:" VerticalAlignment="Center" Foreground="LightGray"></Label>
                 </Grid>
-                <Grid Grid.Row="1"  Margin="5,0">
-                    <TextBlock Margin="10,0"  Height="30" Text="{Binding Path=SavePath}"
+                <Grid Grid.Row="1" Margin="10,0">
+                    <TextBlock Margin="10,0"  Height="23" Text="{Binding Path=SavePath}"
                                 VerticalAlignment="Center"></TextBlock>
                 </Grid>
-                <Grid Grid.Row="2" Background="LightGray">
-                    <Button Width="120" Height="25" Background="White"  Foreground="Black" Content="打开文件位置" 
-                            HorizontalAlignment="Right" Margin="0,0,115,0" VerticalAlignment="Center" 
+                <Grid Grid.Row="2" Background="#F0F0F0">
+                    <WrapPanel HorizontalAlignment="Right">
+<Button Width="82" Height="23" Content="打开文件位置" 
+                            HorizontalAlignment="Right" Margin="0,10,6,10" VerticalAlignment="Center" 
                             Command="{Binding Path=Commands.Execute}" 
                             ></Button>
-                    <Button Width="100" Height="25" Background="Black"  Foreground="White" Content="确认"
-                            HorizontalAlignment="Right" Margin="0,0,5,0" VerticalAlignment="Center" 
+                    <Button Width="82" Height="23" Content="确认"
+                            HorizontalAlignment="Right" Margin="0,10,10,10"
                             Click="ButtonNext_OnClick" ></Button>
+                    </WrapPanel>
+                    
                 </Grid>
             </Grid>
         </Grid>

+ 7 - 7
FWindSoft/Saga.PlugIn/ModelCheck/WinTipCheckComplete.xaml

@@ -10,9 +10,9 @@
     <Grid>
         <Grid.RowDefinitions>
             <RowDefinition></RowDefinition>
-            <RowDefinition Height="60"></RowDefinition>
+            <RowDefinition Height="43"></RowDefinition>
         </Grid.RowDefinitions>
-        <Grid>
+        <Grid Margin="10,0">
             <Grid.RowDefinitions>
                 <RowDefinition></RowDefinition>
                 <RowDefinition></RowDefinition>
@@ -21,16 +21,16 @@
                 <ColumnDefinition Width="100"></ColumnDefinition>
                 <ColumnDefinition></ColumnDefinition>
             </Grid.ColumnDefinitions>
-            <Image Height="40" Width="40" VerticalAlignment="Bottom" HorizontalAlignment="Right" Margin="10,0"
+            <Image Height="36" Width="36" VerticalAlignment="Bottom" HorizontalAlignment="Right"
                    Source="../CreateFacility/Image/成功.png"></Image>
             <Label Grid.Row="0" Grid.Column="1" Content="建模规范检查已完成"
-                   FontSize="20" FontWeight="UltraBlack"
+                   FontSize="16" FontWeight="UltraBlack"
                    VerticalAlignment="Bottom"></Label>
             
         </Grid>
-        <Grid Grid.Row="1" Background="LightGray">
-            <Button Width="100" Height="25" Background="Black"  Foreground="White" Content="确认"
-                    HorizontalAlignment="Right" Margin="0,0,5,0" VerticalAlignment="Center" 
+        <Grid Grid.Row="1" Background="#F0F0F0">
+            <Button Width="82" Height="23" Content="确认"
+                    HorizontalAlignment="Right" Margin="0,10,10,10" 
                     Click="ButtonNext_OnClick" ></Button>
         </Grid>
     </Grid>

+ 5 - 5
FWindSoft/Saga.PlugIn/VerticalPipeCheck/WinTipVPipeCheckComplete.xaml

@@ -9,7 +9,7 @@
     <Grid>
         <Grid.RowDefinitions>
             <RowDefinition></RowDefinition>
-            <RowDefinition Height="60"></RowDefinition>
+            <RowDefinition Height="43"></RowDefinition>
         </Grid.RowDefinitions>
         <Grid>
             <Grid.RowDefinitions>
@@ -20,10 +20,10 @@
                 <ColumnDefinition Width="100"></ColumnDefinition>
                 <ColumnDefinition></ColumnDefinition>
             </Grid.ColumnDefinitions>
-            <Image Height="40" Width="40" VerticalAlignment="Bottom" HorizontalAlignment="Right" Margin="10,0"
+            <Image Height="36" Width="36" VerticalAlignment="Bottom" HorizontalAlignment="Right"
                    Source="../CreateFacility/Image/成功.png"></Image>
             <Label Grid.Row="0" Grid.Column="1" Content="立管连接检查已完成"
-                   FontSize="20" FontWeight="UltraBlack"
+                   FontSize="16" FontWeight="UltraBlack"
                    VerticalAlignment="Bottom"></Label>
             <StackPanel Grid.Row="1" Grid.Column="1">
                 <WrapPanel>
@@ -39,8 +39,8 @@
             </StackPanel>
         </Grid>
         <Grid Grid.Row="1" Background="LightGray">
-            <Button Width="100" Height="25" Background="Black"  Foreground="White" Content="确认"
-                    HorizontalAlignment="Right" Margin="0,0,5,0" VerticalAlignment="Center" 
+            <Button Width="82" Height="23" Content="确认"
+                    HorizontalAlignment="Right" Margin="0,10,10,10"
                     Click="ButtonNext_OnClick" ></Button>
         </Grid>
     </Grid>

+ 44 - 39
FWindSoft/Saga.PlugIn/VerticalPipeCheck/WinVecticalPipeCheck.xaml

@@ -19,14 +19,14 @@
             <RowDefinition Height="Auto"></RowDefinition>
             <RowDefinition Height="Auto"></RowDefinition>
         </Grid.RowDefinitions>
-        <Grid Grid.Row="0">
+        <Grid Grid.Row="0" Margin="10,0">
             <StackPanel>
-                <Label Margin="10,10,0,0" Content="请选择相邻两层模型,进行立管连接检查"></Label>
+                <Label Margin="0,10,0,0" Content="请选择相邻两层模型,进行立管连接检查"></Label>
                 <Grid>
                     <Grid.ColumnDefinitions>
-                        <ColumnDefinition Width="100"></ColumnDefinition>
+                        <ColumnDefinition Width="25"></ColumnDefinition>
                         <ColumnDefinition Width="*"></ColumnDefinition>
-                        <ColumnDefinition Width="100"></ColumnDefinition>
+                        <ColumnDefinition Width="83"></ColumnDefinition>
                     </Grid.ColumnDefinitions>
                     <Grid.RowDefinitions>
                         <RowDefinition Height="10" ></RowDefinition>
@@ -36,56 +36,58 @@
                     </Grid.RowDefinitions>
                     <Image Grid.Row="1" Grid.Column="0"
                            Source="../Image/上一层.png"></Image>
-                    <TextBox Grid.Row="1" Grid.Column="1" Name="TxtUpPath"  IsReadOnly="True"
+                    <TextBox Grid.Row="1" Grid.Column="1" Name="TxtUpPath"  IsReadOnly="True" Margin="0,0,6,0"
+                             VerticalContentAlignment="Center"
                              Text="{Binding Path=UpFilePath,UpdateSourceTrigger=PropertyChanged,Mode=TwoWay}"></TextBox>
                     <Button Grid.Row="1" Grid.Column="2" Click="BtnSelectFileUp_OnClick" Content="选择"
-                            Margin="10,0,5,0"></Button>
+                            ></Button>
                     <Image Grid.Row="3" Grid.Column="0"
                            Source="../Image/下一层.png"></Image>
-                    <TextBox Grid.Row="3" Grid.Column="1" Name="TxtDownPath"  IsReadOnly="True"
+                    <TextBox Grid.Row="3" Grid.Column="1" Name="TxtDownPath"  IsReadOnly="True" Margin="0,0,6,0"
+                             VerticalContentAlignment="Center"
                              Text="{Binding Path=DownFilePath,UpdateSourceTrigger=PropertyChanged,Mode=TwoWay}"></TextBox>
                     <Button Grid.Row="3" Grid.Column="2" Click="BtnSelectFileDown_OnClick" Content="选择"
-                            Margin="10,0,5,0"></Button>
+                            ></Button>
                 </Grid>
             </StackPanel>
         </Grid>
-        <Grid Grid.Row="1">
+        <Grid Grid.Row="1" Margin="10,0">
             <!--虚线-->
-            <Line X1="10" Y1="15" X2="590" Y2="15" StrokeDashArray="3" Stroke="LightGray" StrokeThickness="2"></Line>
+            <Line X1="0" Y1="15" X2="590" Y2="15" StrokeDashArray="3" Stroke="LightGray" StrokeThickness="2"></Line>
         </Grid>
-        <Grid Grid.Row="2" >
+        <Grid Grid.Row="2">
             <Grid.RowDefinitions>
                 <RowDefinition></RowDefinition>
                 <RowDefinition></RowDefinition>
                 <RowDefinition></RowDefinition>
             </Grid.RowDefinitions>
-            <Grid Grid.Row="0"  Visibility="{Binding Path=ModelCheckState,
+            <Grid 
+                Grid.Row="0"  Visibility="{Binding Path=ModelCheckState,
                                     Converter={StaticResource ItemImageUnEqualVisibleConverter},
                                             ConverterParameter={x:Static local:ModelCheckState.Prepare}}">
                 <Grid.RowDefinitions>
                     <RowDefinition Height="40"></RowDefinition>
                     <RowDefinition Height="40"></RowDefinition>
-                    <RowDefinition Height="60"></RowDefinition>
+                    <RowDefinition Height="43"></RowDefinition>
                 </Grid.RowDefinitions>
-                <Grid Grid.Row="0" Margin="5,8,0,2">
-                    <Label Margin="10,0,0,0" Content="检查结果储存位置:" VerticalAlignment="Center" Foreground="LightGray"></Label>
+                <Grid Grid.Row="0"  Margin="10,0" >
+                    <Label Content="检查结果储存位置:" VerticalAlignment="Center" Foreground="LightGray"></Label>
                 </Grid>
-                <Grid Grid.Row="1" Margin="5,3,0,8">
+                <Grid Grid.Row="1" Margin="10,0" >
                     <Grid.ColumnDefinitions>
                         <ColumnDefinition Width="*"></ColumnDefinition>
-                        <ColumnDefinition Width="100"></ColumnDefinition>
+                        <ColumnDefinition Width="83"></ColumnDefinition>
                     </Grid.ColumnDefinitions>
-                    <TextBox Margin="10,0,0,0" VerticalContentAlignment="Center" Height="25" IsReadOnly="True"
+                    <TextBox Margin="6,0,6,0" VerticalContentAlignment="Center" Height="25" IsReadOnly="True" 
                              Name="txtPath"
                              Text="{Binding Path=SaveDir,UpdateSourceTrigger=PropertyChanged,Mode=TwoWay}" 
                              VerticalAlignment="Center"></TextBox>
-                    <Button Grid.Column="1" Content="浏览" Height="25" Margin="10,0,5,0"
+                    <Button Grid.Column="1" Content="浏览" Height="25"
                             Click="SelectDir_OnClick"></Button>
                 </Grid>
-                <Grid Grid.Row="2" Background="LightGray">
-                    <Button Width="100" Height="25" Background="Black"  Foreground="White" Content="开始检查" 
-                            HorizontalAlignment="Right" 
-                            Margin="0,0,5,0" VerticalAlignment="Center"
+                <Grid Grid.Row="2" Background="#F0F0F0">
+                    <Button Width="82" Height="23" Content="开始检查" 
+                            HorizontalAlignment="Right" Margin="0,10,10,10"
                             Command="{Binding Path=Commands.Execute}" 
                             CommandParameter="{Binding RelativeSource={RelativeSource AncestorType=Window,Mode=FindAncestor}}"
                             ></Button>
@@ -97,18 +99,18 @@
                 <Grid.RowDefinitions>
                     <RowDefinition Height="40"></RowDefinition>
                     <RowDefinition Height="40"></RowDefinition>
-                    <RowDefinition Height="60"></RowDefinition>
+                    <RowDefinition Height="43"></RowDefinition>
                 </Grid.RowDefinitions>
-                <Grid Grid.Row="0" Margin="5,8,0,2">
-                    <Label Margin="10,0,0,0" Content="检查中..." VerticalAlignment="Center" Foreground="LightGray"></Label>
+                <Grid Grid.Row="0" Margin="10,0">
+                    <Label  Content="检查中..." VerticalAlignment="Center" Foreground="LightGray"></Label>
                 </Grid>
-                <Grid Grid.Row="1" Margin="15,0">
+                <Grid Grid.Row="1" Margin="10,0">
                     <Image Height="15"  gif:AnimationBehavior.SourceUri="../Image/进度条.gif" />
                 </Grid>
-                <Grid Grid.Row="2" Background="LightGray">
-                    <Button Width="100" Height="25" 
+                <Grid Grid.Row="2" Background="#F0F0F0">
+                    <Button Width="82" Height="23" 
                             Content="检查中..." IsEnabled="False"
-                            HorizontalAlignment="Right" Margin="0,0,5,0" VerticalAlignment="Center" 
+                            HorizontalAlignment="Right" Margin="0,10,10,10"
                             ></Button>
                 </Grid>
             </Grid>
@@ -118,23 +120,26 @@
                 <Grid.RowDefinitions>
                     <RowDefinition Height="30"></RowDefinition>
                     <RowDefinition Height="40"></RowDefinition>
-                    <RowDefinition Height="60"></RowDefinition>
+                    <RowDefinition Height="43"></RowDefinition>
                 </Grid.RowDefinitions>
-                <Grid Grid.Row="0" Margin="5,0">
+                <Grid Grid.Row="0" Margin="10,0">
                     <Label Content="当前校验结果:" VerticalAlignment="Center" Foreground="LightGray"></Label>
                 </Grid>
-                <Grid Grid.Row="1"  Margin="5,0">
-                    <TextBlock Margin="10,0"  Height="30" Text="{Binding Path=SavePath}"
+                <Grid Grid.Row="1" Margin="10,0">
+                    <TextBlock   Text="{Binding Path=SavePath}"
                                 VerticalAlignment="Center"></TextBlock>
                 </Grid>
-                <Grid Grid.Row="2" Background="LightGray">
-                    <Button Width="120" Height="25" Background="White"  Foreground="Black" Content="打开文件位置" 
-                            HorizontalAlignment="Right" Margin="0,0,115,0" VerticalAlignment="Center" 
+                <Grid Grid.Row="2" Background="#F0F0F0">
+                    <WrapPanel HorizontalAlignment="Right">
+ <Button Width="83" Height="23" Content="打开文件位置" 
+                            HorizontalAlignment="Right" Margin="0,10,6,10" VerticalAlignment="Center" 
                             Command="{Binding Path=Commands.OpenDir}" 
                             ></Button>
-                    <Button Width="100" Height="25" Background="Black"  Foreground="White" Content="继续检查"
-                            HorizontalAlignment="Right" Margin="0,0,5,0" VerticalAlignment="Center" 
+                    <Button Width="83" Height="23" Content="继续检查"
+                            HorizontalAlignment="Right" Margin="0,10,10,10" VerticalAlignment="Center" 
                             Command="{Binding Path=Commands.Execute}" ></Button>
+                    </WrapPanel>
+                   
                 </Grid>
             </Grid>
         </Grid>