Skip to content

V
VIZ.TVP.CBA
Commit 5da45715 by wangonghui
Options

修改界面bug

parent 7fb5a437
Showing with 46 additions and 29 deletions
VIZ.MIGU.CBA.Module/DayMatch/View/DayMatchView.xaml
...@@ -26,8 +26,7 @@ ...@@ -26,8 +26,7 @@
</UserControl.Resources> </UserControl.Resources>
<Grid> <Grid>
<Grid.RowDefinitions> <Grid.RowDefinitions>
<RowDefinition Height="40"/> <RowDefinition Height="60"/>
<RowDefinition Height="*"/> <RowDefinition Height="*"/>
</Grid.RowDefinitions> </Grid.RowDefinitions>
<WrapPanel Width="650" HorizontalAlignment="Left" VerticalAlignment="Center" Margin="-2,0,0,0" > <WrapPanel Width="650" HorizontalAlignment="Left" VerticalAlignment="Center" Margin="-2,0,0,0" >
...@@ -42,8 +41,8 @@ ...@@ -42,8 +41,8 @@
<TextBlock Grid.Column="0" Text="标题：" FontSize="16" VerticalAlignment="Center" HorizontalAlignment="Center"/> <TextBlock Grid.Column="0" Text="标题：" FontSize="16" VerticalAlignment="Center" HorizontalAlignment="Center"/>
<dxe:TextEdit Grid.Column="1" Width="170" FontSize="16" HorizontalContentAlignment="Center" <dxe:TextEdit Grid.Column="1" Width="170" FontSize="16" HorizontalContentAlignment="Left"
HorizontalAlignment="Left" VerticalAlignment="Center" Text="{Binding Title,Mode=TwoWay }"></dxe:TextEdit> HorizontalAlignment="Center" VerticalAlignment="Center" Text="{Binding Title,Mode=TwoWay }"></dxe:TextEdit>
<TextBlock TextBlock.TextAlignment="Center" Text="日期:" Width="60" Grid.Column="2" FontSize="16" VerticalAlignment="Center"/> <TextBlock TextBlock.TextAlignment="Center" Text="日期:" Width="60" Grid.Column="2" FontSize="16" VerticalAlignment="Center"/>
......
VIZ.MIGU.CBA.Module/HeaderPage/View/DateHeaderView.xaml
...@@ -13,7 +13,7 @@ ...@@ -13,7 +13,7 @@
xmlns:core="clr-namespace:VIZ.Framework.Core;assembly=VIZ.Framework.Core" xmlns:core="clr-namespace:VIZ.Framework.Core;assembly=VIZ.Framework.Core"
xmlns:storage="clr-namespace:VIZ.TVP.CBA.Module" xmlns:storage="clr-namespace:VIZ.TVP.CBA.Module"
mc:Ignorable="d" mc:Ignorable="d"
d:DesignHeight="800" d:DesignWidth="770" > d:DesignHeight="800" d:DesignWidth="800" >
<UserControl.Resources> <UserControl.Resources>
<!--<local:DemoDataProvider x:Key="DemoDataProvider" />--> <!--<local:DemoDataProvider x:Key="DemoDataProvider" />-->
...@@ -51,7 +51,7 @@ ...@@ -51,7 +51,7 @@
<ColumnDefinition Width="120"/> <ColumnDefinition Width="120"/>
<ColumnDefinition Width="80"/> <ColumnDefinition Width="80"/>
<ColumnDefinition Width="80"/> <ColumnDefinition Width="80"/>
<ColumnDefinition Width="120"/> <ColumnDefinition Width="150"/>
<ColumnDefinition Width="280"/> <ColumnDefinition Width="280"/>
</Grid.ColumnDefinitions> </Grid.ColumnDefinitions>
...@@ -65,11 +65,11 @@ ...@@ -65,11 +65,11 @@
<WrapPanel Grid.Column="4" VerticalAlignment="Center"> <WrapPanel Grid.Column="4" VerticalAlignment="Center">
<Grid> <Grid>
<Grid.ColumnDefinitions> <Grid.ColumnDefinitions>
<ColumnDefinition Width="50"/> <ColumnDefinition Width="80"/>
<ColumnDefinition Width="35"/> <ColumnDefinition Width="35"/>
<ColumnDefinition Width="35"/> <ColumnDefinition Width="35"/>
</Grid.ColumnDefinitions> </Grid.ColumnDefinitions>
<TextBlock Text="数据源" HorizontalAlignment="Center" VerticalAlignment="Center" FontSize="14" /> <TextBlock Text="数据源：" HorizontalAlignment="Right" VerticalAlignment="Center" FontSize="14" />
<RadioButton Content="主" FontSize="14" Grid.Column="1" IsChecked="{Binding MainDataConnection,Mode=TwoWay}"/> <RadioButton Content="主" FontSize="14" Grid.Column="1" IsChecked="{Binding MainDataConnection,Mode=TwoWay}"/>
<RadioButton Content="备" FontSize="14" Grid.Column="2" IsChecked="{Binding BackDataConnection,Mode=TwoWay}"/> <RadioButton Content="备" FontSize="14" Grid.Column="2" IsChecked="{Binding BackDataConnection,Mode=TwoWay}"/>
</Grid> </Grid>
......
VIZ.MIGU.CBA.Module/PlayerCompare/View/NewPlayerComPareView.xaml.cs
...@@ -50,7 +50,11 @@ namespace VIZ.TVP.CBA.Module ...@@ -50,7 +50,11 @@ namespace VIZ.TVP.CBA.Module
{ {
if (!string.IsNullOrEmpty(vm.ScheduleID) && !string.IsNullOrEmpty(vm.Matchtypeid)) if (!string.IsNullOrEmpty(vm.ScheduleID) && !string.IsNullOrEmpty(vm.Matchtypeid))
{ {
vm.SetCompareData(); if(e.NewValue!=null&&Convert.ToBoolean(e.NewValue))
{
vm.SetCompareData();
}
} }
} }
......
VIZ.MIGU.CBA.Module/RoundMatch/View/RoundMatchView.xaml
...@@ -22,7 +22,7 @@ ...@@ -22,7 +22,7 @@
</UserControl.Resources> </UserControl.Resources>
<Grid> <Grid>
<Grid.RowDefinitions> <Grid.RowDefinitions>
<RowDefinition Height="40"/> <RowDefinition Height="60"/>
<RowDefinition Height="*"/> <RowDefinition Height="*"/>
</Grid.RowDefinitions> </Grid.RowDefinitions>
...@@ -47,7 +47,7 @@ ...@@ -47,7 +47,7 @@
SelectedItem="{Binding Path=RoundMatchItem,Mode=TwoWay}"> SelectedItem="{Binding Path=RoundMatchItem,Mode=TwoWay}">
</dxe:ComboBoxEdit> </dxe:ComboBoxEdit>
<dx:SimpleButton Grid.Row="0" Grid.Column="5" Content="刷新" Glyph='/VIZ.TVP.CBA.Module;component/Image/CBAPng/refresh2525.png' FontSize="16" <dx:SimpleButton Grid.Row="0" Grid.Column="5" Content="加载数据" FontSize="16"
Command="{Binding BtnCmd}" HorizontalContentAlignment="Center" Width="95" Height="30" /> Command="{Binding BtnCmd}" HorizontalContentAlignment="Center" Width="95" Height="30" />
</Grid> </Grid>
......
VIZ.MIGU.CBA.Module/SinglePlayer/View/NewSinglePlayerView.xaml
...@@ -19,10 +19,14 @@ ...@@ -19,10 +19,14 @@
dx:ScrollBarExtensions.ScrollBarMode="TouchOverlap" dx:ScrollBarExtensions.ScrollBarMode="TouchOverlap"
Focusable="False"> Focusable="False">
<Grid> <Grid>
<Grid.RowDefinitions> <Grid.ColumnDefinitions>
<ColumnDefinition Width="197*"/>
</Grid.ColumnDefinitions>
<Grid.RowDefinitions>
<RowDefinition Height="0"/> <RowDefinition Height="0"/>
<RowDefinition Height="40"/> <RowDefinition Height="60"/>
<RowDefinition Height="40"/> <RowDefinition Height="40"/>
<!--<RowDefinition Height="160"/>--> <!--<RowDefinition Height="160"/>-->
<RowDefinition Height="*"/> <RowDefinition Height="*"/>
...@@ -34,7 +38,7 @@ ...@@ -34,7 +38,7 @@
<!--<ColumnDefinition Width="50"/> <!--<ColumnDefinition Width="50"/>
<ColumnDefinition Width="120"/> 650--> <ColumnDefinition Width="120"/> 650-->
<ColumnDefinition Width="120"/> <ColumnDefinition Width="122"/>
<ColumnDefinition Width="140"/> <ColumnDefinition Width="140"/>
<ColumnDefinition Width="50"/> <ColumnDefinition Width="50"/>
<ColumnDefinition Width="140"/> <ColumnDefinition Width="140"/>
...@@ -63,11 +67,11 @@ ...@@ -63,11 +67,11 @@
ItemsSource="{Binding Path=PlayerItems,Mode=TwoWay}" ItemsSource="{Binding Path=PlayerItems,Mode=TwoWay}"
SelectedItem="{Binding Path=SelectPlayer,Mode=TwoWay}" FontSize="16" /> SelectedItem="{Binding Path=SelectPlayer,Mode=TwoWay}" FontSize="16" />
<TextBlock Text="球衣号:" Grid.Column="4" VerticalAlignment="Center" HorizontalAlignment="Right" FontSize="16" /> <TextBlock Text="球衣号：" Grid.Column="4" VerticalAlignment="Center" HorizontalAlignment="Right" FontSize="16" />
<dxe:TextEdit Text="{Binding PlayNum,Mode=TwoWay}" Grid.Column="5" VerticalAlignment="Center" HorizontalAlignment="Right" FontSize="16" Width="50" ></dxe:TextEdit> <dxe:TextEdit Text="{Binding PlayNum,Mode=TwoWay}" Grid.Column="5" VerticalAlignment="Center" HorizontalAlignment="Right" FontSize="16" Width="50" ></dxe:TextEdit>
<TextBlock Text="项数:" Grid.Column="6" VerticalAlignment="Center" HorizontalAlignment="Right" FontSize="16" /> <TextBlock Text="项数：" Grid.Column="6" VerticalAlignment="Center" HorizontalAlignment="Right" FontSize="16" />
<dxe:ComboBoxEdit Grid.Column="7" x:Name="com_matchStatsId" HorizontalAlignment="Center" VerticalAlignment="Center" Width="80" <dxe:ComboBoxEdit Grid.Column="7" x:Name="com_matchStatsId" HorizontalAlignment="Center" VerticalAlignment="Center" Width="80"
ItemsSource="{Binding Path=MatchStatsIds,Mode=TwoWay}" ItemsSource="{Binding Path=MatchStatsIds,Mode=TwoWay}"
...@@ -84,7 +88,7 @@ ...@@ -84,7 +88,7 @@
</Grid> </Grid>
</WrapPanel> </WrapPanel>
<WrapPanel Grid.Row="1" HorizontalAlignment="Left" Width="760" VerticalAlignment="Center"> <WrapPanel Grid.Row="1" HorizontalAlignment="Left" Width="760" VerticalAlignment="Center" Margin="0,0,0,0">
<Grid> <Grid>
<Grid.ColumnDefinitions> <Grid.ColumnDefinitions>
<ColumnDefinition Width="120"/> <ColumnDefinition Width="120"/>
...@@ -97,8 +101,8 @@ ...@@ -97,8 +101,8 @@
<TextBlock Grid.Column="0" Text="标题：" FontSize="16" HorizontalAlignment="Right" VerticalAlignment="Center"/> <TextBlock Grid.Column="0" Text="标题：" FontSize="16" HorizontalAlignment="Right" VerticalAlignment="Center"/>
<dxe:TextEdit Grid.Column="1" Width="170" FontSize="16" HorizontalContentAlignment="Center" <dxe:TextEdit Grid.Column="1" Width="170" FontSize="16" HorizontalContentAlignment="Left"
HorizontalAlignment="Left" VerticalAlignment="Center" Text="{Binding Title,Mode=TwoWay }"></dxe:TextEdit> HorizontalAlignment="Center" VerticalAlignment="Center" Text="{Binding Title,Mode=TwoWay }"></dxe:TextEdit>
<Button Content="任务开始" Name="task_Start" Click="task_Start_Click" Grid.Column="2" FontSize="14" Height="30" Width="90"/> <Button Content="任务开始" Name="task_Start" Click="task_Start_Click" Grid.Column="2" FontSize="14" Height="30" Width="90"/>
......
VIZ.MIGU.CBA.Module/TeamStandings/View/TeamStandingView.xaml
...@@ -20,8 +20,11 @@ ...@@ -20,8 +20,11 @@
</ResourceDictionary> </ResourceDictionary>
</UserControl.Resources> </UserControl.Resources>
<Grid > <Grid >
<Grid.ColumnDefinitions>
<ColumnDefinition Width="197*"/>
</Grid.ColumnDefinitions>
<Grid.RowDefinitions> <Grid.RowDefinitions>
<RowDefinition Height="40"/> <RowDefinition Height="60"/>
<RowDefinition Height="*"/> <RowDefinition Height="*"/>
</Grid.RowDefinitions> </Grid.RowDefinitions>
...@@ -38,7 +41,7 @@ ...@@ -38,7 +41,7 @@
<TextBlock Grid.Column="0" Text="标题：" FontSize="16" VerticalAlignment="Center" HorizontalAlignment="Center"/> <TextBlock Grid.Column="0" Text="标题：" FontSize="16" VerticalAlignment="Center" HorizontalAlignment="Center"/>
<dxe:TextEdit Grid.Column="1" Width="170" FontSize="16" HorizontalContentAlignment="Center" <dxe:TextEdit Grid.Column="1" Width="170" FontSize="16" HorizontalContentAlignment="Left"
HorizontalAlignment="Left" VerticalAlignment="Center" Text="{Binding Title,Mode=TwoWay }"></dxe:TextEdit> HorizontalAlignment="Left" VerticalAlignment="Center" Text="{Binding Title,Mode=TwoWay }"></dxe:TextEdit>
<!--<TextBlock TextBlock.TextAlignment="Center" Text="球队排行榜" Grid.Column="0" Foreground="White" FontSize="20" Background="Black" Margin="100,0,3,0" Grid.ColumnSpan="2" />--> <!--<TextBlock TextBlock.TextAlignment="Center" Text="球队排行榜" Grid.Column="0" Foreground="White" FontSize="20" Background="Black" Margin="100,0,3,0" Grid.ColumnSpan="2" />-->
<Button Grid.Column="4" Content="加载数据" FontSize="14" Width="95" Height="30" Command="{Binding BtnCmd}" /> <Button Grid.Column="4" Content="加载数据" FontSize="14" Width="95" Height="30" Command="{Binding BtnCmd}" />
......
VIZ.MIGU.CBA.Module/TeamStats/View/NewTeamStatsView.xaml
...@@ -18,13 +18,17 @@ ...@@ -18,13 +18,17 @@
dx:ScrollBarExtensions.ScrollBarMode="TouchOverlap" dx:ScrollBarExtensions.ScrollBarMode="TouchOverlap"
Focusable="False"> Focusable="False">
<Grid> <Grid>
<Grid.ColumnDefinitions>
<ColumnDefinition Width="197*"/>
</Grid.ColumnDefinitions>
<Grid.RowDefinitions> <Grid.RowDefinitions>
<RowDefinition Height="40"/> <RowDefinition Height="60"/>
<RowDefinition Height="40"/> <RowDefinition Height="40"/>
<RowDefinition Height="*"/> <RowDefinition Height="*"/>
</Grid.RowDefinitions> </Grid.RowDefinitions>
<WrapPanel Grid.Row="1" VerticalAlignment="Center" HorizontalAlignment="Left" Width="760"> <WrapPanel Grid.Row="1" VerticalAlignment="Center" HorizontalAlignment="Left" Width="760" >
<Grid> <Grid>
<Grid.ColumnDefinitions> <Grid.ColumnDefinitions>
<ColumnDefinition Width="75"/> <ColumnDefinition Width="75"/>
...@@ -55,7 +59,7 @@ ...@@ -55,7 +59,7 @@
</Grid> </Grid>
</WrapPanel> </WrapPanel>
<WrapPanel Grid.Row="0" VerticalAlignment="Center" HorizontalAlignment="Left" Width="760"> <WrapPanel VerticalAlignment="Center" HorizontalAlignment="Left" Width="760" Grid.ColumnSpan="2">
<Grid> <Grid>
<Grid.ColumnDefinitions> <Grid.ColumnDefinitions>
<ColumnDefinition Width="75"/> <ColumnDefinition Width="75"/>
...@@ -67,7 +71,7 @@ ...@@ -67,7 +71,7 @@
</Grid.ColumnDefinitions> </Grid.ColumnDefinitions>
<TextBlock Grid.Column="0" Text="标题：" FontSize="16" VerticalAlignment="Center" HorizontalAlignment="Center"/> <TextBlock Grid.Column="0" Text="标题：" FontSize="16" VerticalAlignment="Center" HorizontalAlignment="Center"/>
<dxe:TextEdit Grid.Column="1" Width="170" FontSize="16" HorizontalAlignment="Left" HorizontalContentAlignment="Center" <dxe:TextEdit Grid.Column="1" Width="170" FontSize="16" HorizontalAlignment="Left" HorizontalContentAlignment="Left"
VerticalAlignment="Center" Text="{Binding Title,Mode=TwoWay }" /> VerticalAlignment="Center" Text="{Binding Title,Mode=TwoWay }" />
<Button Content="任务开始" Name="task_Start" Click="task_Start_Click" Grid.Column="2" FontSize="14" Height="30" Width="90"/> <Button Content="任务开始" Name="task_Start" Click="task_Start_Click" Grid.Column="2" FontSize="14" Height="30" Width="90"/>
...@@ -77,14 +81,14 @@ ...@@ -77,14 +81,14 @@
<!--<Button Content="刷新" Command="{Binding BtnCommand}" HorizontalContentAlignment="Center" <!--<Button Content="刷新" Command="{Binding BtnCommand}" HorizontalContentAlignment="Center"
Grid.Column="5" Width="95" Height="30" FontSize="14"/>--> Grid.Column="5" Width="95" Height="30" FontSize="14"/>-->
<dx:SimpleButton Grid.Row="0" Grid.Column="5" Content="刷新" Glyph='/VIZ.TVP.CBA.Module;component/Image/CBAPng/refresh2525.png' FontSize="16" <dx:SimpleButton Grid.Row="0" Grid.Column="5" Content="刷新" Glyph='/VIZ.TVP.CBA.Module;component/Image/CBAPng/refresh2525.png' FontSize="16"
Command="{Binding BtnCommand}" HorizontalContentAlignment="Center" Width="95" Height="30" /> Command="{Binding BtnCommand}" HorizontalContentAlignment="Center" Width="95" Height="30" />
</Grid> </Grid>
</WrapPanel> </WrapPanel>
<WrapPanel Grid.Row="3" HorizontalAlignment="Left" VerticalAlignment="Center" Width="760"> <WrapPanel Grid.Row="2" HorizontalAlignment="Left" VerticalAlignment="Center" Width="760" Grid.ColumnSpan="2">
<Grid> <Grid>
<Grid.RowDefinitions> <Grid.RowDefinitions>
......
VIZ.MIGU.CBA.Module/TeamStats/View/NewTeamStatsView.xaml.cs
...@@ -51,7 +51,10 @@ namespace VIZ.TVP.CBA.Module ...@@ -51,7 +51,10 @@ namespace VIZ.TVP.CBA.Module
{ {
if(!string.IsNullOrEmpty(vm.ScheduleID)&&!string.IsNullOrEmpty(vm.Matchtypeid)) if(!string.IsNullOrEmpty(vm.ScheduleID)&&!string.IsNullOrEmpty(vm.Matchtypeid))
{ {
vm.SetTeamData(); if (e.NewValue != null && Convert.ToBoolean(e.NewValue))
{
vm.SetTeamData();
}
} }
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment