Commit e90e1fc5 by wangonghui

咪咕项目CBA通过插件界面的调整

parent 5b91cd45
...@@ -12,7 +12,7 @@ ...@@ -12,7 +12,7 @@
xmlns:storage="clr-namespace:VIZ.TVP.CBA.Module.TempEnum" xmlns:storage="clr-namespace:VIZ.TVP.CBA.Module.TempEnum"
mc:Ignorable="d" mc:Ignorable="d"
d:DesignHeight="400" d:DesignHeight="400"
d:DesignWidth="900" d:DesignWidth="650"
HorizontalAlignment="Stretch" HorizontalAlignment="Stretch"
VerticalAlignment="Stretch"> VerticalAlignment="Stretch">
<UserControl.Resources> <UserControl.Resources>
...@@ -29,22 +29,22 @@ ...@@ -29,22 +29,22 @@
<RowDefinition Height="40"/> <RowDefinition Height="40"/>
<RowDefinition Height="*"/> <RowDefinition Height="*"/>
</Grid.RowDefinitions> </Grid.RowDefinitions>
<WrapPanel Height="40" Width="900" HorizontalAlignment="Left" VerticalAlignment="Center" Grid.ColumnSpan="3" Margin="-2,0,0,0" > <WrapPanel Width="650" HorizontalAlignment="Left" VerticalAlignment="Center" Grid.ColumnSpan="3" Margin="-2,0,0,0" >
<Grid> <Grid>
<Grid.ColumnDefinitions> <Grid.ColumnDefinitions>
<ColumnDefinition Width="100"/> <ColumnDefinition Width="70"/>
<ColumnDefinition Width="150"/> <ColumnDefinition Width="130"/>
<ColumnDefinition Width="60"/> <ColumnDefinition Width="60"/>
<ColumnDefinition Width="200"/> <ColumnDefinition Width="120"/>
<ColumnDefinition Width="140"/> <ColumnDefinition Width="130"/>
<ColumnDefinition Width="150"/> <ColumnDefinition Width="120"/>
</Grid.ColumnDefinitions> </Grid.ColumnDefinitions>
<TextBlock Grid.Column="0" Text="标题:" FontSize="20" VerticalAlignment="Center"/> <TextBlock Grid.Column="0" Text="标题:" FontSize="16" VerticalAlignment="Center" HorizontalAlignment="Center"/>
<dxe:TextEdit Grid.Column="1" Width="150" FontSize="20" HorizontalContentAlignment="Center" <dxe:TextEdit Grid.Column="1" Width="120" FontSize="16" HorizontalContentAlignment="Center"
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="日期:" Width="60" Grid.Column="2" FontSize="20" VerticalAlignment="Center"/> <TextBlock TextBlock.TextAlignment="Center" Text="日期:" Width="60" Grid.Column="2" FontSize="16" VerticalAlignment="Center"/>
<!--<DatePicker Grid.Column="3" HorizontalAlignment="Center" Name="Date_MatchDate" Width="200" <!--<DatePicker Grid.Column="3" HorizontalAlignment="Center" Name="Date_MatchDate" Width="200"
SelectedDate="{Binding MatchDate,Mode=TwoWay}" FontSize="20" > SelectedDate="{Binding MatchDate,Mode=TwoWay}" FontSize="20" >
...@@ -62,17 +62,17 @@ ...@@ -62,17 +62,17 @@
</DatePicker.Resources> </DatePicker.Resources>
</DatePicker>--> </DatePicker>-->
<dxe:DateEdit Grid.Column="3" HorizontalAlignment="Center" FontSize="20" EditValue="{Binding MatchDate,Mode=TwoWay}" <dxe:DateEdit Grid.Column="3" HorizontalAlignment="Center" FontSize="16" EditValue="{Binding MatchDate,Mode=TwoWay}"
ShowToday="False" ShowClearButton="False" ShowToday="False" ShowClearButton="False"
VerticalAlignment="Center" MaskUseAsDisplayFormat="True" VerticalAlignment="Center" MaskUseAsDisplayFormat="True"
Width="200" Width="120"
> >
</dxe:DateEdit> </dxe:DateEdit>
<Button Content="加载数据" Command="{Binding BtnCmd}" HorizontalContentAlignment="Center" <Button Content="加载数据" Command="{Binding BtnCmd}" HorizontalContentAlignment="Center"
Grid.Column="4" Width="120" Height="40" FontSize="20" /> Grid.Column="4" Width="100" Height="30" FontSize="14" />
<Button Content="赛程数据上" Command="{Binding BtnMatchDayUp}" HorizontalContentAlignment="Center" <Button Content="赛程数据上" Command="{Binding BtnMatchDayUp}" HorizontalContentAlignment="Center"
Grid.Column="5" Width="120" Height="40" FontSize="20" /> Grid.Column="5" Width="110" Height="30" FontSize="14" />
</Grid> </Grid>
</WrapPanel> </WrapPanel>
<!--<DataGrid AutoGenerateColumns="False" CanUserAddRows="False" CanUserDeleteRows="False" CanUserReorderColumns="False" <!--<DataGrid AutoGenerateColumns="False" CanUserAddRows="False" CanUserDeleteRows="False" CanUserReorderColumns="False"
......
...@@ -11,7 +11,7 @@ ...@@ -11,7 +11,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.TempEnum" xmlns:storage="clr-namespace:VIZ.TVP.CBA.Module.TempEnum"
mc:Ignorable="d" mc:Ignorable="d"
d:DesignHeight="800" d:DesignWidth="900"> d:DesignHeight="800" d:DesignWidth="650">
<UserControl.Resources> <UserControl.Resources>
<ResourceDictionary> <ResourceDictionary>
<ResourceDictionary.MergedDictionaries> <ResourceDictionary.MergedDictionaries>
...@@ -26,30 +26,30 @@ ...@@ -26,30 +26,30 @@
<RowDefinition Height="*"/> <RowDefinition Height="*"/>
</Grid.RowDefinitions> </Grid.RowDefinitions>
<WrapPanel Grid.Row="0" HorizontalAlignment="Center" VerticalAlignment="Center" Width="900"> <WrapPanel Grid.Row="0" HorizontalAlignment="Center" VerticalAlignment="Center" Width="650">
<Grid> <Grid>
<Grid.ColumnDefinitions> <Grid.ColumnDefinitions>
<ColumnDefinition Width="100"/> <ColumnDefinition Width="70"/>
<ColumnDefinition Width="150"/> <ColumnDefinition Width="130"/>
<ColumnDefinition Width="100"/> <ColumnDefinition Width="65"/>
<ColumnDefinition Width="200"/> <ColumnDefinition Width="130"/>
<ColumnDefinition Width="140"/> <ColumnDefinition Width="130"/>
<ColumnDefinition Width="140"/> <ColumnDefinition Width="120"/>
</Grid.ColumnDefinitions> </Grid.ColumnDefinitions>
<TextBlock Grid.Column="0" Text="标题:" FontSize="20" VerticalAlignment="Center"/> <TextBlock Grid.Column="0" Text="标题:" FontSize="16" VerticalAlignment="Center" HorizontalAlignment="Center" />
<dxe:TextEdit Grid.Column="1" Width="150" FontSize="20" HorizontalContentAlignment="Center" <dxe:TextEdit Grid.Column="1" Width="120" FontSize="16" HorizontalContentAlignment="Center"
HorizontalAlignment="Left" VerticalAlignment="Center" Text="{Binding Title,Mode=TwoWay }"></dxe:TextEdit> HorizontalAlignment="Left" VerticalAlignment="Center" Text="{Binding Title,Mode=TwoWay }"></dxe:TextEdit>
<TextBlock Grid.Column="2" Text="轮次:" FontSize="20"/> <TextBlock Grid.Column="2" Text="轮次:" FontSize="16" VerticalAlignment="Center"/>
<dxe:ComboBoxEdit Grid.Column="3" HorizontalAlignment="Center" VerticalAlignment="Center" FontSize="20" <dxe:ComboBoxEdit Grid.Column="3" HorizontalAlignment="Center" VerticalAlignment="Center" FontSize="16"
Width="200" ItemsSource="{Binding Path=RoundMatchs,Mode=TwoWay}" Width="120" ItemsSource="{Binding Path=RoundMatchs,Mode=TwoWay}"
SelectedItem="{Binding Path=RoundMatchItem,Mode=TwoWay}"> SelectedItem="{Binding Path=RoundMatchItem,Mode=TwoWay}">
</dxe:ComboBoxEdit> </dxe:ComboBoxEdit>
<!--<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="20" Width="120" Command="{Binding BtnCmd}" /> <Button Grid.Column="4" Content="刷新" FontSize="14" Height="30" Width="95" Command="{Binding BtnCmd}" />
<Button Grid.Column="5" Content="数据上" FontSize="20" Width="120" Command="{Binding BtnCmdUp}" /> <Button Grid.Column="5" Content="数据上" FontSize="14" Height="30" Width="95" Command="{Binding BtnCmdUp}" />
</Grid> </Grid>
</WrapPanel> </WrapPanel>
......
...@@ -11,7 +11,7 @@ ...@@ -11,7 +11,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.TempEnum" xmlns:storage="clr-namespace:VIZ.TVP.CBA.Module.TempEnum"
mc:Ignorable="d" mc:Ignorable="d"
d:DesignHeight="800" d:DesignWidth="900"> d:DesignHeight="800" d:DesignWidth="650">
<UserControl.Resources> <UserControl.Resources>
<ResourceDictionary> <ResourceDictionary>
<ResourceDictionary.MergedDictionaries> <ResourceDictionary.MergedDictionaries>
...@@ -25,25 +25,25 @@ ...@@ -25,25 +25,25 @@
<RowDefinition Height="*"/> <RowDefinition Height="*"/>
</Grid.RowDefinitions> </Grid.RowDefinitions>
<WrapPanel Grid.Row="0" HorizontalAlignment="Center" VerticalAlignment="Center" Width="900" > <WrapPanel Grid.Row="0" HorizontalAlignment="Center" VerticalAlignment="Center" Width="650" >
<Grid> <Grid>
<Grid.ColumnDefinitions> <Grid.ColumnDefinitions>
<ColumnDefinition Width="100"/> <ColumnDefinition Width="70"/>
<ColumnDefinition Width="150"/> <ColumnDefinition Width="120"/>
<ColumnDefinition Width="150"/> <ColumnDefinition Width="80"/>
<ColumnDefinition Width="150"/> <ColumnDefinition Width="130"/>
<ColumnDefinition Width="150"/> <ColumnDefinition Width="120"/>
<ColumnDefinition Width="150"/> <ColumnDefinition Width="120"/>
</Grid.ColumnDefinitions> </Grid.ColumnDefinitions>
<TextBlock Grid.Column="0" Text="标题:" FontSize="20" VerticalAlignment="Center"/> <TextBlock Grid.Column="0" Text="标题:" FontSize="16" VerticalAlignment="Center" HorizontalAlignment="Center"/>
<dxe:TextEdit Grid.Column="1" Width="150" FontSize="20" HorizontalContentAlignment="Center" <dxe:TextEdit Grid.Column="1" Width="120" FontSize="16" HorizontalContentAlignment="Center"
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="3" Content="加载数据" FontSize="20" Width="130" Command="{Binding BtnCmd}" /> <Button Grid.Column="3" Content="加载数据" FontSize="14" Width="95" Height="30" Command="{Binding BtnCmd}" />
<Button Grid.Column="4" Content="数据上" FontSize="20" Width="130" Command="{Binding BtnCmdTeamStandingUp}" /> <Button Grid.Column="4" Content="数据上" FontSize="14" Width="95" Height="30" Command="{Binding BtnCmdTeamStandingUp}" />
<Button Grid.Column="5" Content="下一页数据" FontSize="20" Width="130" Command="{Binding BtnCmdNextPage}" /> <Button Grid.Column="5" Content="下一页数据" FontSize="14" Width="95" Height="30" Command="{Binding BtnCmdNextPage}" />
</Grid> </Grid>
......
...@@ -11,7 +11,7 @@ ...@@ -11,7 +11,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.TempEnum" xmlns:storage="clr-namespace:VIZ.TVP.CBA.Module.TempEnum"
mc:Ignorable="d" mc:Ignorable="d"
d:DesignHeight="800" d:DesignWidth="1200" > d:DesignHeight="800" d:DesignWidth="650" >
<UserControl.Resources> <UserControl.Resources>
<ResourceDictionary> <ResourceDictionary>
<ResourceDictionary.MergedDictionaries> <ResourceDictionary.MergedDictionaries>
...@@ -24,80 +24,93 @@ ...@@ -24,80 +24,93 @@
</ResourceDictionary> </ResourceDictionary>
</UserControl.Resources> </UserControl.Resources>
<Grid> <Grid>
<Grid.ColumnDefinitions>
<ColumnDefinition Width="197*"/>
<ColumnDefinition Width="*"/>
</Grid.ColumnDefinitions>
<Grid.RowDefinitions> <Grid.RowDefinitions>
<RowDefinition Height="40"/> <RowDefinition Height="40"/>
<RowDefinition Height="40"/> <RowDefinition Height="40"/>
<RowDefinition Height="40"/>
<RowDefinition Height="*"/> <RowDefinition Height="*"/>
</Grid.RowDefinitions> </Grid.RowDefinitions>
<WrapPanel Grid.Row="0"> <WrapPanel Grid.Row="0" VerticalAlignment="Center">
<Grid> <Grid>
<Grid.ColumnDefinitions> <Grid.ColumnDefinitions>
<ColumnDefinition Width="80"/>
<ColumnDefinition Width="120"/>
<ColumnDefinition Width="50"/>
<ColumnDefinition Width="280"/>
<ColumnDefinition Width="100"/> <ColumnDefinition Width="100"/>
<ColumnDefinition Width="200"/>
<ColumnDefinition Width="100"/>
<ColumnDefinition Width="350"/>
<ColumnDefinition Width="150"/>
</Grid.ColumnDefinitions> </Grid.ColumnDefinitions>
<TextBlock Text="比赛日期:" Grid.Column="0" FontSize="20" HorizontalAlignment="Center" VerticalAlignment="Center"/> <TextBlock Text="比赛日期:" Grid.Column="0" FontSize="16" HorizontalAlignment="Center" VerticalAlignment="Center"/>
<dxe:DateEdit Grid.Column="1" HorizontalAlignment="Center" Name="Date_MatchDateInfo" Width="200" <dxe:DateEdit Grid.Column="1" HorizontalAlignment="Center" Name="Date_MatchDateInfo" Width="120"
EditValue="{Binding MatchDate,Mode=TwoWay}" FontSize="20" ShowToday="False" ShowClearButton="False" EditValue="{Binding MatchDate,Mode=TwoWay}" FontSize="16" ShowToday="False" ShowClearButton="False"
VerticalAlignment="Center" MaskUseAsDisplayFormat="True" > VerticalAlignment="Center" MaskUseAsDisplayFormat="True" >
</dxe:DateEdit> </dxe:DateEdit>
<TextBlock Text="赛程:" Grid.Column="2" FontSize="20" HorizontalAlignment="Center" VerticalAlignment="Center"/> <TextBlock Text="赛程:" Grid.Column="2" FontSize="16" HorizontalAlignment="Center" VerticalAlignment="Center"/>
<dxe:ComboBoxEdit Grid.Column="3" HorizontalAlignment="Center" VerticalAlignment="Center" FontSize="20" <dxe:ComboBoxEdit Grid.Column="3" HorizontalAlignment="Center" VerticalAlignment="Center" FontSize="16"
Width="350" ItemsSource="{Binding Path=MatchItems,Mode=TwoWay}" Width="280" ItemsSource="{Binding Path=MatchItems,Mode=TwoWay}"
SelectedItem="{Binding Path=SelectMatchItems,Mode=TwoWay}" > SelectedItem="{Binding Path=SelectMatchItems,Mode=TwoWay}" >
</dxe:ComboBoxEdit> </dxe:ComboBoxEdit>
<TextBox Grid.Column="4" FontSize="20" HorizontalAlignment="Center" VerticalAlignment="Center" Text="{Binding MatchStatus,Mode=TwoWay}" Width="80"/> <TextBox Grid.Column="4" FontSize="16" HorizontalAlignment="Center" VerticalAlignment="Center" Text="{Binding MatchStatus,Mode=TwoWay}" Width="80"/>
</Grid> </Grid>
</WrapPanel> </WrapPanel>
<WrapPanel Grid.Row="1" Height="40" Width="1100" HorizontalAlignment="Center" VerticalAlignment="Center" Margin="-70,0,0,0" > <WrapPanel Grid.Row="1" VerticalAlignment="Center" >
<Grid> <Grid>
<Grid.ColumnDefinitions> <Grid.ColumnDefinitions>
<ColumnDefinition Width="90"/> <ColumnDefinition Width="75"/>
<ColumnDefinition Width="150"/> <ColumnDefinition Width="130"/>
<ColumnDefinition Width="150"/>
<ColumnDefinition Width="150"/>
<ColumnDefinition Width="150"/>
<ColumnDefinition Width="100"/>
<ColumnDefinition Width="120"/> <ColumnDefinition Width="120"/>
<ColumnDefinition Width="40"/>
<ColumnDefinition Width="120"/> <ColumnDefinition Width="120"/>
<ColumnDefinition Width="100"/>
<!--<ColumnDefinition Width="110"/>
<ColumnDefinition Width="110"/>-->
</Grid.ColumnDefinitions> </Grid.ColumnDefinitions>
<!--{Binding HomeTeam}--> <!--{Binding HomeTeam}-->
<TextBlock Grid.Column="0" Text="标题:" FontSize="20" VerticalAlignment="Center"/> <TextBlock Grid.Column="0" Text="标题:" FontSize="16" VerticalAlignment="Center" HorizontalAlignment="Center"/>
<dxe:TextEdit Width="142" FontSize="20" HorizontalContentAlignment="Center" <dxe:TextEdit Grid.Column="1" Width="120" FontSize="16" HorizontalContentAlignment="Center"
HorizontalAlignment="Left" VerticalAlignment="Center" Text="{Binding Title,Mode=TwoWay }" Grid.ColumnSpan="2" Margin="89,0,0,0" Height="40"/> VerticalAlignment="Center" Text="{Binding Title,Mode=TwoWay }" />
<dxe:TextEdit Text="{Binding HomeTeam}" Grid.Column="2" Width="150" FontSize="20"/> <dxe:TextEdit Text="{Binding HomeTeam}" Grid.Column="2" Width="120" HorizontalAlignment="Center" VerticalAlignment="Center" FontSize="16"/>
<TextBlock TextBlock.TextAlignment="Center" Text="VS" Width="60" Grid.Column="3" FontSize="20" /> <TextBlock TextBlock.TextAlignment="Center" Text="VS" Width="60" Grid.Column="3" FontSize="16" HorizontalAlignment="Center" VerticalAlignment="Center"/>
<dxe:TextEdit Text="{Binding AwayTeam}" Grid.Column="4" Width="150" FontSize="20" /> <dxe:TextEdit Text="{Binding AwayTeam}" Grid.Column="4" Width="120" FontSize="16" HorizontalAlignment="Center" VerticalAlignment="Center"/>
<dxe:ComboBoxEdit Grid.Column="5" x:Name="com_matchStatsId" HorizontalAlignment="Center" VerticalAlignment="Center" Width="80" FontSize="20" Height="40" <dxe:ComboBoxEdit Grid.Column="5" x:Name="com_matchStatsId" HorizontalAlignment="Center" VerticalAlignment="Center" Width="80" FontSize="16"
ItemsSource="{Binding Path=MatchStatsIds,Mode=TwoWay}" ItemsSource="{Binding Path=MatchStatsIds,Mode=TwoWay}"
SelectedItem="{Binding Path=MatchStatsId,Mode=TwoWay}" > SelectedItem="{Binding Path=MatchStatsId,Mode=TwoWay}" >
</dxe:ComboBoxEdit> </dxe:ComboBoxEdit>
<!--<Button Content="刷新" Command="{Binding BtnCommand}" HorizontalContentAlignment="Center"
Grid.Column="6" Width="95" Height="30" FontSize="14"/>
<Button Content="上数据" Command="{Binding BtnCmdUpData}" HorizontalContentAlignment="Center"
Grid.Column="7" Width="95" Height="30" FontSize="14"/>-->
</Grid>
</WrapPanel>
<WrapPanel Grid.Row="2" VerticalAlignment="Center" >
<Grid>
<Grid.ColumnDefinitions>
<ColumnDefinition Width="110"/>
<ColumnDefinition Width="110"/>
</Grid.ColumnDefinitions>
<!--{Binding HomeTeam}-->
<Button Content="刷新" Command="{Binding BtnCommand}" HorizontalContentAlignment="Center" <Button Content="刷新" Command="{Binding BtnCommand}" HorizontalContentAlignment="Center"
Grid.Column="6" Width="110" Height="40" FontSize="20"/> Grid.Column="0" Width="95" Height="30" FontSize="14"/>
<Button Content="上数据" Command="{Binding BtnCmdUpData}" HorizontalContentAlignment="Center" <Button Content="上数据" Command="{Binding BtnCmdUpData}" HorizontalContentAlignment="Center"
Grid.Column="7" Width="110" Height="40" FontSize="20"/> Grid.Column="1" Width="95" Height="30" FontSize="14"/>
</Grid> </Grid>
</WrapPanel> </WrapPanel>
...@@ -147,7 +160,6 @@ ...@@ -147,7 +160,6 @@
<DockPanel Grid.Row="3"> <DockPanel Grid.Row="3">
<ScrollViewer HorizontalScrollBarVisibility="Disabled" <ScrollViewer HorizontalScrollBarVisibility="Disabled"
VerticalScrollBarVisibility="Auto" VerticalScrollBarVisibility="Auto"
Name="PART_Options" Name="PART_Options"
......
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