Merge branch 'master' of http://tayfx.work:3000/mingzf/StartServerWPF

StartServerWPF.Modules.Main/Views/Loading.xaml

@@ -143,7 +143,7 @@
                    Margin="0,10"/>
         <TextBlock Grid.Row="2" Margin="0,10" Foreground="Orange" VerticalAlignment="Center" HorizontalAlignment="Center"
                    Visibility="Collapsed">
-            <Hyperlink Command="{Binding CancelLoadingCommand}">取消</Hyperlink>
+            <!--<Hyperlink Command="{Binding CancelLoadingCommand}">取消</Hyperlink>-->
         </TextBlock>
     </Grid>
 </UserControl>

StartServerWPF.Modules.Main/Views/MainView.xaml

@@ -83,7 +83,7 @@
                         <TextBlock Grid.Row="2" Grid.Column="0" FontSize="20" Text="运行时间："  VerticalAlignment="Center"/>
                         <TextBlock Grid.Row="2" Grid.Column="1" FontSize="20" Text="{Binding RunTime,StringFormat=yyyy-MM-dd HH:mm:ss}"  VerticalAlignment="Center" HorizontalAlignment="Left"/>
                         <TextBlock Grid.Row="3" Grid.Column="0" FontSize="20" Text="监隔间隔(s):"  VerticalAlignment="Center"/>
-                        <ComboBox Grid.Row="3" Grid.Column="1"  ItemsSource="{Binding IntervalTimesSource}" SelectedIndex="{Binding selectedIndex}" Text="{Binding ProMonInterval}" VerticalAlignment="Center" HorizontalAlignment="Left" FontSize="20"/>
+                        <ComboBox Grid.Row="3" Grid.Column="1"  ItemsSource="{Binding IntervalTimesSource}" SelectedIndex="{Binding SelectedIndex}" Text="{Binding ProMonInterval}" VerticalAlignment="Center" HorizontalAlignment="Left" FontSize="20"/>
                         <!--<RadioButton GroupName="start" Content="一键启动" Grid.Column="0" VerticalAlignment="Center">
                         <i:Interaction.Triggers>
                             <i:EventTrigger EventName="Checked">