Skip to content

V
VIZ.TVP.CBA
Commit 3457f635 by wangonghui
Options

CBA界面改造

parent 2279edcf
Showing with 92 additions and 50 deletions
VIZ.MIGU.CBA.Module/DayMatch/View/DayMatchUI.xaml
......@@ -25,15 +25,11 @@
</ResourceDictionary>
</UserControl.Resources>
<Grid>
<Grid.ColumnDefinitions>
<ColumnDefinition Width="197*"/>
<ColumnDefinition Width="*"/>
</Grid.ColumnDefinitions>
<Grid.RowDefinitions>
<RowDefinition Height="30.76"/>
<RowDefinition Height="40"/>
<RowDefinition Height="*"/>
</Grid.RowDefinitions>
<WrapPanel Grid.Row="0" Height="40" Width="900" HorizontalAlignment="Center" VerticalAlignment="Center" >
<WrapPanel Height="40" Width="900" HorizontalAlignment="Left" VerticalAlignment="Center" Grid.ColumnSpan="3" Margin="-2,0,0,0" >
<Grid>
<Grid.ColumnDefinitions>
<ColumnDefinition Width="100"/>
......@@ -49,7 +45,7 @@
<dxe:TextEdit Grid.Column="1" Width="150" FontSize="20" HorizontalContentAlignment="Center"
HorizontalAlignment="Left" VerticalAlignment="Center" Text="{Binding Title,Mode=TwoWay }"></dxe:TextEdit>
<TextBlock TextBlock.TextAlignment="Center" Text="日期:" Width="60" Grid.Column="2" FontSize="20" VerticalAlignment="Center"/>
<!--<DatePicker Grid.Column="3" HorizontalAlignment="Center" Name="Date_MatchDate" Width="200"
SelectedDate="{Binding MatchDate,Mode=TwoWay}" FontSize="20" >
<DatePicker.Resources>
......@@ -120,15 +116,15 @@
</DataGrid>-->
<DockPanel Grid.Row="1">
<DockPanel Grid.Row="1" Grid.ColumnSpan="2">
<ScrollViewer HorizontalScrollBarVisibility="Disabled"
VerticalScrollBarVisibility="Auto"
Name="PART_Options"
DockPanel.Dock="Right"
dx:ScrollBarExtensions.ScrollBarMode="TouchOverlap"
Focusable="False">
</ScrollViewer>
<dxg:GridControl x:Name="grid" ShowBorder="False" ItemsSource="{Binding Path= MatchData,Mode=TwoWay}">
<dxg:GridControl.Bands>
......@@ -155,9 +151,9 @@
<dxe:ComboBoxEditSettings IsTextEditable="False" />
</dxg:GridColumn.EditSettings>
</dxg:GridColumn>-->
</dxg:GridControlBand>
</dxg:GridControl.Bands>
<!--#endregion-->
<dxg:GridControl.View>
......@@ -192,7 +188,7 @@
</dxg:IconSetFormatCondition.Format>
</dxg:IconSetFormatCondition>
</dxg:TableView.FormatConditions>
<!--<dxmvvm:Interaction.Behaviors>
<dxrudex:GridReportManagerService Name="rmsExcelStyleFiltering" />
</dxmvvm:Interaction.Behaviors>-->
......@@ -204,5 +200,5 @@
</UserControl>
VIZ.MIGU.CBA.Module/Main/MainView.xaml
......@@ -32,7 +32,7 @@
</Grid.RowDefinitions>
<WrapPanel Grid.Row="0" Background="Black">
<WrapPanel Grid.Row="0" >
<Grid>
<Grid.ColumnDefinitions>
......@@ -44,7 +44,7 @@
<ColumnDefinition Width="450"/>
</Grid.ColumnDefinitions>
<TextBlock Text="比赛日期:" Grid.Column="0" FontSize="20" Foreground="White" HorizontalAlignment="Center" VerticalAlignment="Center"/>
<!--<TextBlock Text="比赛日期:" Grid.Column="0" FontSize="20" Foreground="White" HorizontalAlignment="Center" VerticalAlignment="Center"/>
<DatePicker Grid.Column="1" HorizontalAlignment="Center" Name="Date_MatchDateInfo" Width="200"
SelectedDate="{Binding MatchDate,Mode=TwoWay}" FontSize="20" Style="{StaticResource DatePicker_Black}" SelectedDateChanged="Date_MatchDateInfo_SelectedDateChanged" >
......@@ -57,7 +57,7 @@
SelectedItem="{Binding Path=SelectMatchItems,Mode=TwoWay}" SelectionChanged="ComboBox_SelectionChanged">
</ComboBox>
<TextBox Grid.Column="4" Foreground="White" Background="Black" FontSize="20" HorizontalAlignment="Center" VerticalAlignment="Center" Text="{Binding MatchStatus,Mode=TwoWay}" Width="80"/>
<TextBox Grid.Column="4" Foreground="White" Background="Black" FontSize="20" HorizontalAlignment="Center" VerticalAlignment="Center" Text="{Binding MatchStatus,Mode=TwoWay}" Width="80"/>-->
<StackPanel Orientation="Horizontal" Margin="0,0,5,0" HorizontalAlignment="Right" Grid.Column="5">
......@@ -135,22 +135,22 @@
</dx:DXTabItem>
</dx:DXTabControl>-->
<TabControl Grid.Row="1" Background="Black" Style="{StaticResource TabControlStyle}">
<TabItem Header="今日赛程" Foreground="White" FontSize="20">
<Grid Background="Black">
<TabControl Grid.Row="1" >
<TabItem Header="今日赛程" FontSize="20">
<Grid >
<my:DayMatchUI>
</my:DayMatchUI>
</Grid>
</TabItem>
<TabItem Header="球队排行榜" Foreground="White" FontSize="20">
<Grid Background="Black">
<TabItem Header="球队排行榜" FontSize="20">
<Grid >
<team:TeamStandingUI>
</team:TeamStandingUI>
</Grid>
</TabItem>
<TabItem Header="本轮和下轮对阵" Foreground="White" FontSize="20">
<TabItem Header="本轮和下轮对阵" FontSize="20">
<Grid>
<round:RoundMatchUI>
......@@ -158,7 +158,7 @@
</Grid>
</TabItem>
<TabItem Header="球队数据对比" Foreground="White" FontSize="20">
<TabItem Header="球队数据对比" FontSize="20">
<Grid>
<teamStats:TeamStatsUI>
......@@ -166,7 +166,7 @@
</Grid>
</TabItem>
<TabItem Header="单人球员" Foreground="White" FontSize="20">
<TabItem Header="单人球员" FontSize="20">
<Grid>
<single:SinglePlayerUI Grid.ColumnSpan="3">
......@@ -176,7 +176,7 @@
</TabItem>
<TabItem Header="球员数据对比" Foreground="White" FontSize="20">
<TabItem Header="球员数据对比" FontSize="20">
<Grid>
<playCom:PlayerComPareUI>
......
VIZ.MIGU.CBA.Module/Main/MainView.xaml.cs
......@@ -105,10 +105,10 @@ namespace VIZ.TVP.CBA.Module
//SetHData();
//SetAData();
Utils.SetHomeTeamDictionary(vm);
Utils.SetVisitTeamDictionary(vm);
Utils.SetHData(vm, teamStatsViewModel);
Utils.SetAData(vm, teamStatsViewModel);
//Utils.SetHomeTeamDictionary(vm);
//Utils.SetVisitTeamDictionary(vm);
//Utils.SetHData(vm, teamStatsViewModel);
//Utils.SetAData(vm, teamStatsViewModel);
}
......
VIZ.MIGU.CBA.Module/PlayerCompare/Model/PlayerComModel.cs
using DevExpress.Mvvm;

using DevExpress.Mvvm.POCO;
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
using VIZ.Framework.Core;
using VIZ.TVP.CBA.Module.PlayerCompare.ViewModel;
using VIZ.TVP.CBA.Module.TempEnum;
namespace VIZ.TVP.CBA.Module.PlayerCompare.Model
{
public class PlayerComModel: ViewModelBase
{
private string hScore;
public string HScore
{
......@@ -60,5 +64,30 @@ namespace VIZ.TVP.CBA.Module.PlayerCompare.Model
get { return techStats; }
set { techStats = value; this.RaisePropertyChanged(nameof(TechStats)); }
}
private string selectLight = "不高亮";
public string SelectLight
{
get { return selectLight; }
set { selectLight = value; this.RaisePropertyChanged(nameof(SelectLight)); }
}
private string techStatsName;
public string TechStatsName
{
get { return techStatsName; }
set
{
techStatsName = value;
this.RaisePropertyChanged(nameof(TechStatsName));
}
}
}
}
VIZ.MIGU.CBA.Module/SinglePlayer/View/SinglePlayerUI.xaml
......@@ -41,22 +41,23 @@
<ColumnDefinition Width="100"/>
<ColumnDefinition Width="200"/>
<ColumnDefinition Width="100"/>
<ColumnDefinition Width="200"/>
<ColumnDefinition Width="200"/>
<ColumnDefinition Width="450"/>
<ColumnDefinition Width="350"/>
<ColumnDefinition Width="150"/>
</Grid.ColumnDefinitions>
<TextBlock Text="比赛日期:" Grid.Column="0" FontSize="20" HorizontalAlignment="Center" VerticalAlignment="Center"/>
<dxe:DateEdit Grid.Column="1" HorizontalAlignment="Center" Name="Date_MatchDateInfo" Width="200"
EditValue="{Binding MatchDate,Mode=TwoWay}" FontSize="20" EditValueChanged="Date_MatchDateInfo_EditValueChanged">
EditValue="{Binding MatchDate,Mode=TwoWay}" FontSize="20" ShowToday="False" ShowClearButton="False"
VerticalAlignment="Center" MaskUseAsDisplayFormat="True" >
</dxe:DateEdit>
<TextBlock Text="赛程:" Grid.Column="2" FontSize="20" HorizontalAlignment="Center" VerticalAlignment="Center"/>
<dxe:ComboBoxEdit Grid.Column="3" HorizontalAlignment="Center" VerticalAlignment="Center" FontSize="20"
Width="200" ItemsSource="{Binding Path=MatchItems,Mode=TwoWay}"
SelectedItem="{Binding Path=SelectMatchItems,Mode=TwoWay}" SelectedIndexChanged="ComboBoxEdit_SelectedIndexChanged">
Width="350" ItemsSource="{Binding Path=MatchItems,Mode=TwoWay}"
SelectedItem="{Binding Path=SelectMatchItems,Mode=TwoWay}" >
</dxe:ComboBoxEdit>
<TextBox Grid.Column="4" FontSize="20" HorizontalAlignment="Center" VerticalAlignment="Center" Text="{Binding MatchStatus,Mode=TwoWay}" Width="80"/>
......@@ -87,32 +88,31 @@
<TextBlock Grid.Column="0" Text="标题：" FontSize="20" VerticalAlignment="Center"/>
<TextBox Grid.Column="1" Width="150" FontSize="20" HorizontalContentAlignment="Center"
HorizontalAlignment="Left" VerticalAlignment="Center" Text="{Binding Title,Mode=TwoWay }"></TextBox>
<dxe:TextEdit Grid.Column="1" Width="150" FontSize="20" HorizontalContentAlignment="Center"
HorizontalAlignment="Left" VerticalAlignment="Center" Text="{Binding Title,Mode=TwoWay }"></dxe:TextEdit>
<TextBlock Grid.Column="2" Text="球队：" Width="80" FontSize="20" VerticalAlignment="Center" HorizontalAlignment="Right"/>
<ComboBox Grid.Column="3" Name="com_TeamItem" Width="150" HorizontalAlignment="Center" VerticalAlignment="Center"
<dxe:ComboBoxEdit Grid.Column="3" Name="com_TeamItem" Width="150" HorizontalAlignment="Center" VerticalAlignment="Center"
ItemsSource="{Binding Path=TeamItems,Mode=TwoWay}" SelectedItem="{Binding Path=SelectTeamItem,Mode=TwoWay}" SelectedIndex="{Binding SelectedIndex}"
FontSize="20"
SelectionChanged="com_TeamItem_SelectionChanged">
</ComboBox>
FontSize="20">
</dxe:ComboBoxEdit>
<TextBlock Text="球员:" Grid.Column="4" VerticalAlignment="Center" HorizontalAlignment="Right" FontSize="20" Width="80"/>
<ComboBox Grid.Column="5" x:Name="com_players" HorizontalAlignment="Center" VerticalAlignment="Center" Width="120"
<dxe:ComboBoxEdit Grid.Column="5" x:Name="com_players" HorizontalAlignment="Center" VerticalAlignment="Center" Width="120"
ItemsSource="{Binding Path=PlayerItems,Mode=TwoWay}"
SelectedItem="{Binding Path=SelectPlayer,Mode=TwoWay}" FontSize="20" SelectionChanged="com_players_SelectionChanged"/>
SelectedItem="{Binding Path=SelectPlayer,Mode=TwoWay}" FontSize="20" />
<TextBlock Text="球员号码:" Grid.Column="6" VerticalAlignment="Center" HorizontalAlignment="Right" FontSize="20" Width="90"/>
<TextBox Text="{Binding PlayNum}" Grid.Column="7" VerticalAlignment="Center" HorizontalAlignment="Right" FontSize="20" Width="100" ></TextBox>
<dxe:TextEdit Text="{Binding PlayNum,Mode=TwoWay}" Grid.Column="7" VerticalAlignment="Center" HorizontalAlignment="Right" FontSize="20" Width="100" ></dxe:TextEdit>
<TextBlock Text="显示项数:" Grid.Column="8" VerticalAlignment="Center" HorizontalAlignment="Right" FontSize="20" Width="90"/>
<ComboBox Grid.Column="9" x:Name="com_matchStatsId" HorizontalAlignment="Center" VerticalAlignment="Center" Width="80"
<dxe:ComboBoxEdit Grid.Column="9" x:Name="com_matchStatsId" HorizontalAlignment="Center" VerticalAlignment="Center" Width="80"
ItemsSource="{Binding Path=MatchStatsIds,Mode=TwoWay}"
SelectedItem="{Binding Path=MatchStatsId,Mode=TwoWay}" SelectionChanged="ComboBox_SelectionChanged" FontSize="20">
</ComboBox>
SelectedItem="{Binding Path=MatchStatsId,Mode=TwoWay}" FontSize="20">
</dxe:ComboBoxEdit>
<Button Content="刷新" Command="{Binding BtnCmd}" HorizontalContentAlignment="Center"
Grid.Column="10" Width="120" Height="40" FontSize="20"/>
<Button Content="单人球员" Command="{Binding SingleCommand}" HorizontalContentAlignment="Center"
......@@ -200,7 +200,7 @@
</dxg:GridColumn.EditSettings>
</dxg:GridColumn>
<dxg:GridColumn FieldName="SelectLight" Header="" Width="112">
<dxg:GridColumn FieldName="TechStatsName" Header="" Width="112">
<dxg:GridColumn.EditSettings>
<dxe:ComboBoxEditSettings
ItemsSource="{Binding Source={x:Static Member=storage:StaticEnumInfos.EnumTechStatsDescriptions}}" IsTextEditable="False" />
......
VIZ.MIGU.CBA.Module/TeamStats/Model/MatchStatsNumbers.cs
......@@ -78,5 +78,22 @@ namespace VIZ.TVP.CBA.Module.TeamStats.Model
set { techStats = value; this.RaisePropertiesChanged(nameof(TechStats)); }
}
private string selectLight = "不高亮";
public string SelectLight
{
get { return selectLight; }
set { selectLight = value; this.RaisePropertyChanged(nameof(SelectLight)); }
}
private string techStatsName;
public string TechStatsName
{
get { return techStatsName; }
set { techStatsName = value; this.RaisePropertyChanged(nameof(TechStatsName)); }
}
}
}
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