足球功能开发

VIZ.MIGU.CBA.Module/Common/Utils.cs

@@ -894,67 +894,1000 @@ namespace VIZ.TVP.CBA.Module
 
 
 
 
         /// <summary>
         /// <summary>
-        /// 设置客队数据
+        /// 设置任务的主队信息
         /// </summary>
         /// </summary>
-        /// <param name="mainViewModel"></param>
         /// <param name="teamStatsViewModel"></param>
         /// <param name="teamStatsViewModel"></param>
-        public static void SetAData(TeamStatsViewModel teamStatsViewModel)
+
+        public static void NewSetHData(TeamStatsTaskViewModel teamStatsViewModel, int index)
         {
         {
 
 
+            if (teamStatsViewModel != null)
+            {
+                if (teamStatsViewModel.HomeTeam == null || string.IsNullOrEmpty(teamStatsViewModel.HomeTeam)) return;
+            }
+
+            if (index == 1)
+            {
+                //第一项
+
+                if (teamStatsViewModel.HomeTeamCompareOptionDictionary.ContainsKey(teamStatsViewModel.SelectTechStats))
+                {
+                    teamStatsViewModel.HomeScore = teamStatsViewModel.HomeTeamCompareOptionDictionary[teamStatsViewModel.SelectTechStats];
+                }
+                else
+                {
+                    teamStatsViewModel.HomeScore = "0";
+                }
+                if (teamStatsViewModel != null)
+                {
+                    if (teamStatsViewModel.HomeTeam == null) return;
+
+                    if (teamStatsViewModel.CNAliasVisitSportsDictionary.ContainsKey(teamStatsViewModel.HomeTeam))
+                    {
+                        var teamSeasonData = teamStatsViewModel.CNAliasVisitSportsDictionary[teamStatsViewModel.HomeTeam];
+                        if (teamSeasonData.ContainsKey(teamStatsViewModel.SelectTechStats))
+                        {
+                            teamStatsViewModel.HSeasonScore = teamSeasonData[teamStatsViewModel.SelectTechStats];
+                        }
+                        else
+                        {
+                            teamStatsViewModel.HSeasonScore = "0";
+                        }
+                    }
+                }
+            }
+            else if (index == 2)
+            {
+
+
+                //第二项
+
+                if (teamStatsViewModel.HomeTeamCompareOptionDictionary.ContainsKey(teamStatsViewModel.SelectTechStats1))
+                {
+                    teamStatsViewModel.HomeScore1 = teamStatsViewModel.HomeTeamCompareOptionDictionary[teamStatsViewModel.SelectTechStats1];
+                }
+                else
+                {
+                    teamStatsViewModel.HomeScore1 = "0";
+                }
+                if (teamStatsViewModel != null)
+                {
+                    if (teamStatsViewModel.HomeTeam == null) return;
+
+                    if (teamStatsViewModel.CNAliasVisitSportsDictionary.ContainsKey(teamStatsViewModel.HomeTeam))
+                    {
+                        var teamSeasonData = teamStatsViewModel.CNAliasVisitSportsDictionary[teamStatsViewModel.HomeTeam];
+                        if (teamSeasonData.ContainsKey(teamStatsViewModel.SelectTechStats1))
+                        {
+                            teamStatsViewModel.HSeasonScore1 = teamSeasonData[teamStatsViewModel.SelectTechStats1];
+                        }
+                        else
+                        {
+                            teamStatsViewModel.HSeasonScore1 = "0";
+                        }
+                    }
+                }
+            }
+            else if (index == 3)
+            {
+                //第三项
+
+                if (teamStatsViewModel.HomeTeamCompareOptionDictionary.ContainsKey(teamStatsViewModel.SelectTechStats2))
+                {
+                    teamStatsViewModel.HomeScore2 = teamStatsViewModel.HomeTeamCompareOptionDictionary[teamStatsViewModel.SelectTechStats2];
+                }
+                else
+                {
+                    teamStatsViewModel.HomeScore2 = "0";
+                }
+                if (teamStatsViewModel != null)
+                {
+                    if (teamStatsViewModel.HomeTeam == null) return;
+
+                    if (teamStatsViewModel.CNAliasVisitSportsDictionary.ContainsKey(teamStatsViewModel.HomeTeam))
+                    {
+                        var teamSeasonData = teamStatsViewModel.CNAliasVisitSportsDictionary[teamStatsViewModel.HomeTeam];
+                        if (teamSeasonData.ContainsKey(teamStatsViewModel.SelectTechStats2))
+                        {
+                            teamStatsViewModel.HSeasonScore2 = teamSeasonData[teamStatsViewModel.SelectTechStats2];
+                        }
+                        else
+                        {
+                            teamStatsViewModel.HSeasonScore2 = "0";
+                        }
+                    }
+                }
+
+            }
+            else if (index == 4)
+            {
+                //第四项
+
+                if (teamStatsViewModel.HomeTeamCompareOptionDictionary.ContainsKey(teamStatsViewModel.SelectTechStats3))
+                {
+                    teamStatsViewModel.HomeScore3 = teamStatsViewModel.HomeTeamCompareOptionDictionary[teamStatsViewModel.SelectTechStats3];
+                }
+                else
+                {
+                    teamStatsViewModel.HomeScore3 = "0";
+                }
+                if (teamStatsViewModel != null)
+                {
+                    if (teamStatsViewModel.HomeTeam == null) return;
+
+                    if (teamStatsViewModel.CNAliasVisitSportsDictionary.ContainsKey(teamStatsViewModel.HomeTeam))
+                    {
+                        var teamSeasonData = teamStatsViewModel.CNAliasVisitSportsDictionary[teamStatsViewModel.HomeTeam];
+                        if (teamSeasonData.ContainsKey(teamStatsViewModel.SelectTechStats3))
+                        {
+                            teamStatsViewModel.HSeasonScore3 = teamSeasonData[teamStatsViewModel.SelectTechStats3];
+                        }
+                        else
+                        {
+                            teamStatsViewModel.HSeasonScore3 = "0";
+                        }
+                    }
+                }
+
+            }
+            else if (index == 5)
+            {
+
+                //第五项
+
+                if (teamStatsViewModel.HomeTeamCompareOptionDictionary.ContainsKey(teamStatsViewModel.SelectTechStats3))
+                {
+                    teamStatsViewModel.HomeScore4 = teamStatsViewModel.HomeTeamCompareOptionDictionary[teamStatsViewModel.SelectTechStats4];
+                }
+                else
+                {
+                    teamStatsViewModel.HomeScore4 = "0";
+                }
+                if (teamStatsViewModel != null)
+                {
+                    if (teamStatsViewModel.HomeTeam == null) return;
+
+                    if (teamStatsViewModel.CNAliasVisitSportsDictionary.ContainsKey(teamStatsViewModel.HomeTeam))
+                    {
+                        var teamSeasonData = teamStatsViewModel.CNAliasVisitSportsDictionary[teamStatsViewModel.HomeTeam];
+                        if (teamSeasonData.ContainsKey(teamStatsViewModel.SelectTechStats4))
+                        {
+                            teamStatsViewModel.HSeasonScore4 = teamSeasonData[teamStatsViewModel.SelectTechStats4];
+                        }
+                        else
+                        {
+                            teamStatsViewModel.HSeasonScore4 = "0";
+                        }
+                    }
+                }
+
+            }
+            else if (index == 6)
+            {
+
+                //第六项
+
+                if (teamStatsViewModel.HomeTeamCompareOptionDictionary.ContainsKey(teamStatsViewModel.SelectTechStats5))
+                {
+                    teamStatsViewModel.HomeScore5 = teamStatsViewModel.HomeTeamCompareOptionDictionary[teamStatsViewModel.SelectTechStats5];
+                }
+                else
+                {
+                    teamStatsViewModel.HomeScore5 = "0";
+                }
+                if (teamStatsViewModel != null)
+                {
+                    if (teamStatsViewModel.HomeTeam == null) return;
+
+                    if (teamStatsViewModel.CNAliasVisitSportsDictionary.ContainsKey(teamStatsViewModel.HomeTeam))
+                    {
+                        var teamSeasonData = teamStatsViewModel.CNAliasVisitSportsDictionary[teamStatsViewModel.HomeTeam];
+                        if (teamSeasonData.ContainsKey(teamStatsViewModel.SelectTechStats5))
+                        {
+                            teamStatsViewModel.HSeasonScore5 = teamSeasonData[teamStatsViewModel.SelectTechStats5];
+                        }
+                        else
+                        {
+                            teamStatsViewModel.HSeasonScore5 = "0";
+                        }
+                    }
+                }
+
+            }
+            else if (index == 7)
+            {
+                //第七项
+
+                if (teamStatsViewModel.HomeTeamCompareOptionDictionary.ContainsKey(teamStatsViewModel.SelectTechStats6))
+                {
+                    teamStatsViewModel.HomeScore6 = teamStatsViewModel.HomeTeamCompareOptionDictionary[teamStatsViewModel.SelectTechStats6];
+                }
+                else
+                {
+                    teamStatsViewModel.HomeScore6 = "0";
+                }
+                if (teamStatsViewModel != null)
+                {
+                    if (teamStatsViewModel.HomeTeam == null) return;
+
+                    if (teamStatsViewModel.CNAliasVisitSportsDictionary.ContainsKey(teamStatsViewModel.HomeTeam))
+                    {
+                        var teamSeasonData = teamStatsViewModel.CNAliasVisitSportsDictionary[teamStatsViewModel.HomeTeam];
+                        if (teamSeasonData.ContainsKey(teamStatsViewModel.SelectTechStats6))
+                        {
+                            teamStatsViewModel.HSeasonScore6 = teamSeasonData[teamStatsViewModel.SelectTechStats6];
+                        }
+                        else
+                        {
+                            teamStatsViewModel.HSeasonScore6 = "0";
+                        }
+                    }
+                }
+            }
+            else
+            {
+
+
+                //第一项
+
+                if (teamStatsViewModel.HomeTeamCompareOptionDictionary.ContainsKey(teamStatsViewModel.SelectTechStats))
+                {
+                    teamStatsViewModel.HomeScore = teamStatsViewModel.HomeTeamCompareOptionDictionary[teamStatsViewModel.SelectTechStats];
+                }
+                else
+                {
+                    teamStatsViewModel.HomeScore = "0";
+                }
+                if (teamStatsViewModel != null)
+                {
+                    if (teamStatsViewModel.HomeTeam == null) return;
+
+                    if (teamStatsViewModel.CNAliasVisitSportsDictionary.ContainsKey(teamStatsViewModel.HomeTeam))
+                    {
+                        var teamSeasonData = teamStatsViewModel.CNAliasVisitSportsDictionary[teamStatsViewModel.HomeTeam];
+                        if (teamSeasonData.ContainsKey(teamStatsViewModel.SelectTechStats))
+                        {
+                            teamStatsViewModel.HSeasonScore = teamSeasonData[teamStatsViewModel.SelectTechStats];
+                        }
+                        else
+                        {
+                            teamStatsViewModel.HSeasonScore = "0";
+                        }
+                    }
+                }
+
+
+
+                //第二项
+
+                if (teamStatsViewModel.HomeTeamCompareOptionDictionary.ContainsKey(teamStatsViewModel.SelectTechStats1))
+                {
+                    teamStatsViewModel.HomeScore1 = teamStatsViewModel.HomeTeamCompareOptionDictionary[teamStatsViewModel.SelectTechStats1];
+                }
+                else
+                {
+                    teamStatsViewModel.HomeScore1 = "0";
+                }
+                if (teamStatsViewModel != null)
+                {
+                    if (teamStatsViewModel.HomeTeam == null) return;
+
+                    if (teamStatsViewModel.CNAliasVisitSportsDictionary.ContainsKey(teamStatsViewModel.HomeTeam))
+                    {
+                        var teamSeasonData = teamStatsViewModel.CNAliasVisitSportsDictionary[teamStatsViewModel.HomeTeam];
+                        if (teamSeasonData.ContainsKey(teamStatsViewModel.SelectTechStats1))
+                        {
+                            teamStatsViewModel.HSeasonScore1 = teamSeasonData[teamStatsViewModel.SelectTechStats1];
+                        }
+                        else
+                        {
+                            teamStatsViewModel.HSeasonScore1 = "0";
+                        }
+                    }
+                }
+
+
+                //第三项
+
+                if (teamStatsViewModel.HomeTeamCompareOptionDictionary.ContainsKey(teamStatsViewModel.SelectTechStats2))
+                {
+                    teamStatsViewModel.HomeScore2 = teamStatsViewModel.HomeTeamCompareOptionDictionary[teamStatsViewModel.SelectTechStats2];
+                }
+                else
+                {
+                    teamStatsViewModel.HomeScore2 = "0";
+                }
+                if (teamStatsViewModel != null)
+                {
+                    if (teamStatsViewModel.HomeTeam == null) return;
+
+                    if (teamStatsViewModel.CNAliasVisitSportsDictionary.ContainsKey(teamStatsViewModel.HomeTeam))
+                    {
+                        var teamSeasonData = teamStatsViewModel.CNAliasVisitSportsDictionary[teamStatsViewModel.HomeTeam];
+                        if (teamSeasonData.ContainsKey(teamStatsViewModel.SelectTechStats2))
+                        {
+                            teamStatsViewModel.HSeasonScore2 = teamSeasonData[teamStatsViewModel.SelectTechStats2];
+                        }
+                        else
+                        {
+                            teamStatsViewModel.HSeasonScore2 = "0";
+                        }
+                    }
+                }
+
+
+                //第四项
+
+                if (teamStatsViewModel.HomeTeamCompareOptionDictionary.ContainsKey(teamStatsViewModel.SelectTechStats3))
+                {
+                    teamStatsViewModel.HomeScore3 = teamStatsViewModel.HomeTeamCompareOptionDictionary[teamStatsViewModel.SelectTechStats3];
+                }
+                else
+                {
+                    teamStatsViewModel.HomeScore3 = "0";
+                }
+                if (teamStatsViewModel != null)
+                {
+                    if (teamStatsViewModel.HomeTeam == null) return;
+
+                    if (teamStatsViewModel.CNAliasVisitSportsDictionary.ContainsKey(teamStatsViewModel.HomeTeam))
+                    {
+                        var teamSeasonData = teamStatsViewModel.CNAliasVisitSportsDictionary[teamStatsViewModel.HomeTeam];
+                        if (teamSeasonData.ContainsKey(teamStatsViewModel.SelectTechStats3))
+                        {
+                            teamStatsViewModel.HSeasonScore3 = teamSeasonData[teamStatsViewModel.SelectTechStats3];
+                        }
+                        else
+                        {
+                            teamStatsViewModel.HSeasonScore3 = "0";
+                        }
+                    }
+                }
+
+
+
+                //第五项
+
+                if (teamStatsViewModel.HomeTeamCompareOptionDictionary.ContainsKey(teamStatsViewModel.SelectTechStats3))
+                {
+                    teamStatsViewModel.HomeScore4 = teamStatsViewModel.HomeTeamCompareOptionDictionary[teamStatsViewModel.SelectTechStats4];
+                }
+                else
+                {
+                    teamStatsViewModel.HomeScore4 = "0";
+                }
+                if (teamStatsViewModel != null)
+                {
+                    if (teamStatsViewModel.HomeTeam == null) return;
+
+                    if (teamStatsViewModel.CNAliasVisitSportsDictionary.ContainsKey(teamStatsViewModel.HomeTeam))
+                    {
+                        var teamSeasonData = teamStatsViewModel.CNAliasVisitSportsDictionary[teamStatsViewModel.HomeTeam];
+                        if (teamSeasonData.ContainsKey(teamStatsViewModel.SelectTechStats4))
+                        {
+                            teamStatsViewModel.HSeasonScore4 = teamSeasonData[teamStatsViewModel.SelectTechStats4];
+                        }
+                        else
+                        {
+                            teamStatsViewModel.HSeasonScore4 = "0";
+                        }
+                    }
+                }
+
+
+
+                //第六项
+
+                if (teamStatsViewModel.HomeTeamCompareOptionDictionary.ContainsKey(teamStatsViewModel.SelectTechStats5))
+                {
+                    teamStatsViewModel.HomeScore5 = teamStatsViewModel.HomeTeamCompareOptionDictionary[teamStatsViewModel.SelectTechStats5];
+                }
+                else
+                {
+                    teamStatsViewModel.HomeScore5 = "0";
+                }
+                if (teamStatsViewModel != null)
+                {
+                    if (teamStatsViewModel.HomeTeam == null) return;
+
+                    if (teamStatsViewModel.CNAliasVisitSportsDictionary.ContainsKey(teamStatsViewModel.HomeTeam))
+                    {
+                        var teamSeasonData = teamStatsViewModel.CNAliasVisitSportsDictionary[teamStatsViewModel.HomeTeam];
+                        if (teamSeasonData.ContainsKey(teamStatsViewModel.SelectTechStats5))
+                        {
+                            teamStatsViewModel.HSeasonScore5 = teamSeasonData[teamStatsViewModel.SelectTechStats5];
+                        }
+                        else
+                        {
+                            teamStatsViewModel.HSeasonScore5 = "0";
+                        }
+                    }
+                }
+
+
+
+                //第七项
+
+                if (teamStatsViewModel.HomeTeamCompareOptionDictionary.ContainsKey(teamStatsViewModel.SelectTechStats6))
+                {
+                    teamStatsViewModel.HomeScore6 = teamStatsViewModel.HomeTeamCompareOptionDictionary[teamStatsViewModel.SelectTechStats6];
+                }
+                else
+                {
+                    teamStatsViewModel.HomeScore6 = "0";
+                }
+                if (teamStatsViewModel != null)
+                {
+                    if (teamStatsViewModel.HomeTeam == null) return;
+
+                    if (teamStatsViewModel.CNAliasVisitSportsDictionary.ContainsKey(teamStatsViewModel.HomeTeam))
+                    {
+                        var teamSeasonData = teamStatsViewModel.CNAliasVisitSportsDictionary[teamStatsViewModel.HomeTeam];
+                        if (teamSeasonData.ContainsKey(teamStatsViewModel.SelectTechStats6))
+                        {
+                            teamStatsViewModel.HSeasonScore6 = teamSeasonData[teamStatsViewModel.SelectTechStats6];
+                        }
+                        else
+                        {
+                            teamStatsViewModel.HSeasonScore6 = "0";
+                        }
+                    }
+                }
+            }
+
+
+        }
+
+
+
+
+        /// <summary>
+        /// 设置客队数据
+        /// </summary>
+        /// <param name="mainViewModel"></param>
+        /// <param name="teamStatsViewModel"></param>
+        public static void SetAData(TeamStatsViewModel teamStatsViewModel)
+        {
+
+
+            foreach (var teamStats in teamStatsViewModel.MatchStatsNumbers)
+            {
+                if (teamStatsViewModel.VisitTeamCompareOptionDictionary.ContainsKey(teamStats.TechStatsName.ToString()))
+                {
+                    teamStats.AwayScore = teamStatsViewModel.VisitTeamCompareOptionDictionary[teamStats.TechStatsName.ToString()];
+                }
+                else
+                {
+                    teamStats.AwayScore = "0";
+                }
+            }
+
+
+
+
+            if (teamStatsViewModel != null)
+            {
+                //var singlePlayerData = mainViewModel.PlayerSeasonData.PlayerstatsList.Where(a => a.CNAlias == vm.SelectPlayer).FirstOrDefault();
+
+
+                if (teamStatsViewModel.AwayTeam == null) return;
+                if (teamStatsViewModel.CNAliasVisitSportsDictionary.ContainsKey(teamStatsViewModel.AwayTeam))
+                {
+                    var teamSeasonData = teamStatsViewModel.CNAliasVisitSportsDictionary[teamStatsViewModel.AwayTeam];
+                    foreach (var teamStats in teamStatsViewModel.MatchStatsNumbers)
+                    {
+                        if (teamSeasonData.ContainsKey(teamStats.TechStatsName.ToString()))
+                        {
+                            teamStats.ASeasonScore = teamSeasonData[teamStats.TechStatsName.ToString()];
+                        }
+                        else
+                        {
+                            teamStats.ASeasonScore = "0";
+                        }
+                    }
+                }
+
+            }
+
+        }
+
+
+
+        /// <summary>
+        /// 设置新的主队信息
+        /// </summary>
+        /// <param name="teamStatsViewModel"></param>
+        public static void NewSetAData(NewTeamStatsViewModel teamStatsViewModel,int index)
+        {
+
+            if (teamStatsViewModel != null)
+            {
+                if (teamStatsViewModel.AwayTeam == null||string.IsNullOrEmpty(teamStatsViewModel.AwayTeam)) return;
+            }
+
+
+
+            if (index == 1)
+            {
+                //第一项
+                if (teamStatsViewModel.VisitTeamCompareOptionDictionary.ContainsKey(teamStatsViewModel.SelectTechStats))
+                {
+                    teamStatsViewModel.AwayScore = teamStatsViewModel.VisitTeamCompareOptionDictionary[teamStatsViewModel.SelectTechStats];
+                }
+                else
+                {
+                    teamStatsViewModel.AwayScore = "0";
+                }
+
+                if (teamStatsViewModel != null)
+                {
+
+                    if (teamStatsViewModel.AwayTeam == null) return;
+                    if (teamStatsViewModel.CNAliasVisitSportsDictionary.ContainsKey(teamStatsViewModel.AwayTeam))
+                    {
+                        var teamSeasonData = teamStatsViewModel.CNAliasVisitSportsDictionary[teamStatsViewModel.AwayTeam];
+
+                        if (teamSeasonData.ContainsKey(teamStatsViewModel.SelectTechStats))
+                        {
+                            teamStatsViewModel.ASeasonScore = teamSeasonData[teamStatsViewModel.SelectTechStats];
+                        }
+                        else
+                        {
+                            teamStatsViewModel.ASeasonScore = "0";
+                        }
+
+                    }
+
+                }
+            }
+            else if (index == 2)
+            {
+                //第二项
+                if (teamStatsViewModel.VisitTeamCompareOptionDictionary.ContainsKey(teamStatsViewModel.SelectTechStats1))
+                {
+                    teamStatsViewModel.AwayScore1 = teamStatsViewModel.VisitTeamCompareOptionDictionary[teamStatsViewModel.SelectTechStats1];
+                }
+                else
+                {
+                    teamStatsViewModel.AwayScore1 = "0";
+                }
+
+                if (teamStatsViewModel != null)
+                {
+
+                    if (teamStatsViewModel.AwayTeam == null) return;
+                    if (teamStatsViewModel.CNAliasVisitSportsDictionary.ContainsKey(teamStatsViewModel.AwayTeam))
+                    {
+                        var teamSeasonData = teamStatsViewModel.CNAliasVisitSportsDictionary[teamStatsViewModel.AwayTeam];
+
+                        if (teamSeasonData.ContainsKey(teamStatsViewModel.SelectTechStats1))
+                        {
+                            teamStatsViewModel.ASeasonScore1 = teamSeasonData[teamStatsViewModel.SelectTechStats1];
+                        }
+                        else
+                        {
+                            teamStatsViewModel.ASeasonScore1 = "0";
+                        }
+
+                    }
+
+                }
+            }
+            else if (index == 3)
+            {
+
+                //第三项
+                if (teamStatsViewModel.VisitTeamCompareOptionDictionary.ContainsKey(teamStatsViewModel.SelectTechStats2))
+                {
+                    teamStatsViewModel.AwayScore2 = teamStatsViewModel.VisitTeamCompareOptionDictionary[teamStatsViewModel.SelectTechStats2];
+                }
+                else
+                {
+                    teamStatsViewModel.AwayScore2 = "0";
+                }
+
+                if (teamStatsViewModel != null)
+                {
+
+                    if (teamStatsViewModel.AwayTeam == null) return;
+                    if (teamStatsViewModel.CNAliasVisitSportsDictionary.ContainsKey(teamStatsViewModel.AwayTeam))
+                    {
+                        var teamSeasonData = teamStatsViewModel.CNAliasVisitSportsDictionary[teamStatsViewModel.AwayTeam];
+
+                        if (teamSeasonData.ContainsKey(teamStatsViewModel.SelectTechStats2))
+                        {
+                            teamStatsViewModel.ASeasonScore2 = teamSeasonData[teamStatsViewModel.SelectTechStats2];
+                        }
+                        else
+                        {
+                            teamStatsViewModel.ASeasonScore2 = "0";
+                        }
+
+                    }
+
+                }
+
+            }
+            else if (index == 4)
+            {
+                //第四项
+                if (teamStatsViewModel.VisitTeamCompareOptionDictionary.ContainsKey(teamStatsViewModel.SelectTechStats3))
+                {
+                    teamStatsViewModel.AwayScore3 = teamStatsViewModel.VisitTeamCompareOptionDictionary[teamStatsViewModel.SelectTechStats3];
+                }
+                else
+                {
+                    teamStatsViewModel.AwayScore3 = "0";
+                }
+
+                if (teamStatsViewModel != null)
+                {
+
+                    if (teamStatsViewModel.AwayTeam == null) return;
+                    if (teamStatsViewModel.CNAliasVisitSportsDictionary.ContainsKey(teamStatsViewModel.AwayTeam))
+                    {
+                        var teamSeasonData = teamStatsViewModel.CNAliasVisitSportsDictionary[teamStatsViewModel.AwayTeam];
+
+                        if (teamSeasonData.ContainsKey(teamStatsViewModel.SelectTechStats3))
+                        {
+                            teamStatsViewModel.ASeasonScore3 = teamSeasonData[teamStatsViewModel.SelectTechStats3];
+                        }
+                        else
+                        {
+                            teamStatsViewModel.ASeasonScore3 = "0";
+                        }
+
+                    }
+
+                }
+
+            }
+
+            else if (index == 5)
+            {
+                //第五项
+                if (teamStatsViewModel.VisitTeamCompareOptionDictionary.ContainsKey(teamStatsViewModel.SelectTechStats4))
+                {
+                    teamStatsViewModel.AwayScore4 = teamStatsViewModel.VisitTeamCompareOptionDictionary[teamStatsViewModel.SelectTechStats4];
+                }
+                else
+                {
+                    teamStatsViewModel.AwayScore4 = "0";
+                }
+
+                if (teamStatsViewModel != null)
+                {
+
+                    if (teamStatsViewModel.AwayTeam == null) return;
+                    if (teamStatsViewModel.CNAliasVisitSportsDictionary.ContainsKey(teamStatsViewModel.AwayTeam))
+                    {
+                        var teamSeasonData = teamStatsViewModel.CNAliasVisitSportsDictionary[teamStatsViewModel.AwayTeam];
+
+                        if (teamSeasonData.ContainsKey(teamStatsViewModel.SelectTechStats4))
+                        {
+                            teamStatsViewModel.ASeasonScore4 = teamSeasonData[teamStatsViewModel.SelectTechStats4];
+                        }
+                        else
+                        {
+                            teamStatsViewModel.ASeasonScore4 = "0";
+                        }
+
+                    }
+
+                }
+
+            }
+            else if (index == 6)
+            {
+
+
+                //第六项
+                if (teamStatsViewModel.VisitTeamCompareOptionDictionary.ContainsKey(teamStatsViewModel.SelectTechStats5))
+                {
+                    teamStatsViewModel.AwayScore5 = teamStatsViewModel.VisitTeamCompareOptionDictionary[teamStatsViewModel.SelectTechStats5];
+                }
+                else
+                {
+                    teamStatsViewModel.AwayScore5 = "0";
+                }
+
+                if (teamStatsViewModel != null)
+                {
+
+                    if (teamStatsViewModel.AwayTeam == null) return;
+                    if (teamStatsViewModel.CNAliasVisitSportsDictionary.ContainsKey(teamStatsViewModel.AwayTeam))
+                    {
+                        var teamSeasonData = teamStatsViewModel.CNAliasVisitSportsDictionary[teamStatsViewModel.AwayTeam];
+
+                        if (teamSeasonData.ContainsKey(teamStatsViewModel.SelectTechStats5))
+                        {
+                            teamStatsViewModel.ASeasonScore5 = teamSeasonData[teamStatsViewModel.SelectTechStats5];
+                        }
+                        else
+                        {
+                            teamStatsViewModel.ASeasonScore5 = "0";
+                        }
+
+                    }
+
+                }
+            }
+            else if (index == 7)
+            {
+                //第七项
+                if (teamStatsViewModel.VisitTeamCompareOptionDictionary.ContainsKey(teamStatsViewModel.SelectTechStats6))
+                {
+                    teamStatsViewModel.AwayScore6 = teamStatsViewModel.VisitTeamCompareOptionDictionary[teamStatsViewModel.SelectTechStats6];
+                }
+                else
+                {
+                    teamStatsViewModel.AwayScore6 = "0";
+                }
+
+                if (teamStatsViewModel != null)
+                {
+
+                    if (teamStatsViewModel.AwayTeam == null) return;
+                    if (teamStatsViewModel.CNAliasVisitSportsDictionary.ContainsKey(teamStatsViewModel.AwayTeam))
+                    {
+                        var teamSeasonData = teamStatsViewModel.CNAliasVisitSportsDictionary[teamStatsViewModel.AwayTeam];
+
+                        if (teamSeasonData.ContainsKey(teamStatsViewModel.SelectTechStats6))
+                        {
+                            teamStatsViewModel.ASeasonScore6 = teamSeasonData[teamStatsViewModel.SelectTechStats6];
+                        }
+                        else
+                        {
+                            teamStatsViewModel.ASeasonScore6 = "0";
+                        }
+
+                    }
+
+                }
+            }
+            else
+            {
+
+                //第一项
+                if (teamStatsViewModel.VisitTeamCompareOptionDictionary.ContainsKey(teamStatsViewModel.SelectTechStats))
+                {
+                    teamStatsViewModel.AwayScore = teamStatsViewModel.VisitTeamCompareOptionDictionary[teamStatsViewModel.SelectTechStats];
+                }
+                else
+                {
+                    teamStatsViewModel.AwayScore = "0";
+                }
+
+                if (teamStatsViewModel != null)
+                {
+
+                    if (teamStatsViewModel.AwayTeam == null) return;
+                    if (teamStatsViewModel.CNAliasVisitSportsDictionary.ContainsKey(teamStatsViewModel.AwayTeam))
+                    {
+                        var teamSeasonData = teamStatsViewModel.CNAliasVisitSportsDictionary[teamStatsViewModel.AwayTeam];
+
+                        if (teamSeasonData.ContainsKey(teamStatsViewModel.SelectTechStats))
+                        {
+                            teamStatsViewModel.ASeasonScore = teamSeasonData[teamStatsViewModel.SelectTechStats];
+                        }
+                        else
+                        {
+                            teamStatsViewModel.ASeasonScore = "0";
+                        }
+
+                    }
+
+                }
 
 
-            foreach (var teamStats in teamStatsViewModel.MatchStatsNumbers)
-            {
-                if (teamStatsViewModel.VisitTeamCompareOptionDictionary.ContainsKey(teamStats.TechStatsName.ToString()))
+
+                //第二项
+                if (teamStatsViewModel.VisitTeamCompareOptionDictionary.ContainsKey(teamStatsViewModel.SelectTechStats1))
                 {
                 {
-                    teamStats.AwayScore = teamStatsViewModel.VisitTeamCompareOptionDictionary[teamStats.TechStatsName.ToString()];
+                    teamStatsViewModel.AwayScore1 = teamStatsViewModel.VisitTeamCompareOptionDictionary[teamStatsViewModel.SelectTechStats1];
                 }
                 }
                 else
                 else
                 {
                 {
-                    teamStats.AwayScore = "0";
+                    teamStatsViewModel.AwayScore1 = "0";
                 }
                 }
-            }
 
 
+                if (teamStatsViewModel != null)
+                {
 
 
+                    if (teamStatsViewModel.AwayTeam == null) return;
+                    if (teamStatsViewModel.CNAliasVisitSportsDictionary.ContainsKey(teamStatsViewModel.AwayTeam))
+                    {
+                        var teamSeasonData = teamStatsViewModel.CNAliasVisitSportsDictionary[teamStatsViewModel.AwayTeam];
 
 
+                        if (teamSeasonData.ContainsKey(teamStatsViewModel.SelectTechStats1))
+                        {
+                            teamStatsViewModel.ASeasonScore1 = teamSeasonData[teamStatsViewModel.SelectTechStats1];
+                        }
+                        else
+                        {
+                            teamStatsViewModel.ASeasonScore1 = "0";
+                        }
 
 
-            if (teamStatsViewModel != null)
-            {
-                //var singlePlayerData = mainViewModel.PlayerSeasonData.PlayerstatsList.Where(a => a.CNAlias == vm.SelectPlayer).FirstOrDefault();
+                    }
 
 
+                }
 
 
-                if (teamStatsViewModel.AwayTeam == null) return;
-                if (teamStatsViewModel.CNAliasVisitSportsDictionary.ContainsKey(teamStatsViewModel.AwayTeam))
+
+                //第三项
+                if (teamStatsViewModel.VisitTeamCompareOptionDictionary.ContainsKey(teamStatsViewModel.SelectTechStats2))
                 {
                 {
-                    var teamSeasonData = teamStatsViewModel.CNAliasVisitSportsDictionary[teamStatsViewModel.AwayTeam];
-                    foreach (var teamStats in teamStatsViewModel.MatchStatsNumbers)
+                    teamStatsViewModel.AwayScore2 = teamStatsViewModel.VisitTeamCompareOptionDictionary[teamStatsViewModel.SelectTechStats2];
+                }
+                else
+                {
+                    teamStatsViewModel.AwayScore2 = "0";
+                }
+
+                if (teamStatsViewModel != null)
+                {
+
+                    if (teamStatsViewModel.AwayTeam == null) return;
+                    if (teamStatsViewModel.CNAliasVisitSportsDictionary.ContainsKey(teamStatsViewModel.AwayTeam))
                     {
                     {
-                        if (teamSeasonData.ContainsKey(teamStats.TechStatsName.ToString()))
+                        var teamSeasonData = teamStatsViewModel.CNAliasVisitSportsDictionary[teamStatsViewModel.AwayTeam];
+
+                        if (teamSeasonData.ContainsKey(teamStatsViewModel.SelectTechStats2))
                         {
                         {
-                            teamStats.ASeasonScore = teamSeasonData[teamStats.TechStatsName.ToString()];
+                            teamStatsViewModel.ASeasonScore2 = teamSeasonData[teamStatsViewModel.SelectTechStats2];
                         }
                         }
                         else
                         else
                         {
                         {
-                            teamStats.ASeasonScore = "0";
+                            teamStatsViewModel.ASeasonScore2 = "0";
+                        }
+
+                    }
+
+                }
+
+
+                //第四项
+                if (teamStatsViewModel.VisitTeamCompareOptionDictionary.ContainsKey(teamStatsViewModel.SelectTechStats3))
+                {
+                    teamStatsViewModel.AwayScore3 = teamStatsViewModel.VisitTeamCompareOptionDictionary[teamStatsViewModel.SelectTechStats3];
+                }
+                else
+                {
+                    teamStatsViewModel.AwayScore3 = "0";
+                }
+
+                if (teamStatsViewModel != null)
+                {
+
+                    if (teamStatsViewModel.AwayTeam == null) return;
+                    if (teamStatsViewModel.CNAliasVisitSportsDictionary.ContainsKey(teamStatsViewModel.AwayTeam))
+                    {
+                        var teamSeasonData = teamStatsViewModel.CNAliasVisitSportsDictionary[teamStatsViewModel.AwayTeam];
+
+                        if (teamSeasonData.ContainsKey(teamStatsViewModel.SelectTechStats3))
+                        {
+                            teamStatsViewModel.ASeasonScore3 = teamSeasonData[teamStatsViewModel.SelectTechStats3];
+                        }
+                        else
+                        {
+                            teamStatsViewModel.ASeasonScore3 = "0";
+                        }
+
+                    }
+
+                }
+
+
+
+                //第五项
+                if (teamStatsViewModel.VisitTeamCompareOptionDictionary.ContainsKey(teamStatsViewModel.SelectTechStats4))
+                {
+                    teamStatsViewModel.AwayScore4 = teamStatsViewModel.VisitTeamCompareOptionDictionary[teamStatsViewModel.SelectTechStats4];
+                }
+                else
+                {
+                    teamStatsViewModel.AwayScore4 = "0";
+                }
+
+                if (teamStatsViewModel != null)
+                {
+
+                    if (teamStatsViewModel.AwayTeam == null) return;
+                    if (teamStatsViewModel.CNAliasVisitSportsDictionary.ContainsKey(teamStatsViewModel.AwayTeam))
+                    {
+                        var teamSeasonData = teamStatsViewModel.CNAliasVisitSportsDictionary[teamStatsViewModel.AwayTeam];
+
+                        if (teamSeasonData.ContainsKey(teamStatsViewModel.SelectTechStats4))
+                        {
+                            teamStatsViewModel.ASeasonScore4 = teamSeasonData[teamStatsViewModel.SelectTechStats4];
+                        }
+                        else
+                        {
+                            teamStatsViewModel.ASeasonScore4 = "0";
+                        }
+
+                    }
+
+                }
+
+
+                //第六项
+                if (teamStatsViewModel.VisitTeamCompareOptionDictionary.ContainsKey(teamStatsViewModel.SelectTechStats5))
+                {
+                    teamStatsViewModel.AwayScore5 = teamStatsViewModel.VisitTeamCompareOptionDictionary[teamStatsViewModel.SelectTechStats5];
+                }
+                else
+                {
+                    teamStatsViewModel.AwayScore5 = "0";
+                }
+
+                if (teamStatsViewModel != null)
+                {
+
+                    if (teamStatsViewModel.AwayTeam == null) return;
+                    if (teamStatsViewModel.CNAliasVisitSportsDictionary.ContainsKey(teamStatsViewModel.AwayTeam))
+                    {
+                        var teamSeasonData = teamStatsViewModel.CNAliasVisitSportsDictionary[teamStatsViewModel.AwayTeam];
+
+                        if (teamSeasonData.ContainsKey(teamStatsViewModel.SelectTechStats5))
+                        {
+                            teamStatsViewModel.ASeasonScore5 = teamSeasonData[teamStatsViewModel.SelectTechStats5];
+                        }
+                        else
+                        {
+                            teamStatsViewModel.ASeasonScore5 = "0";
                         }
                         }
+
                     }
                     }
+
+                }
+
+
+                //第七项
+                if (teamStatsViewModel.VisitTeamCompareOptionDictionary.ContainsKey(teamStatsViewModel.SelectTechStats6))
+                {
+                    teamStatsViewModel.AwayScore6 = teamStatsViewModel.VisitTeamCompareOptionDictionary[teamStatsViewModel.SelectTechStats6];
+                }
+                else
+                {
+                    teamStatsViewModel.AwayScore6 = "0";
                 }
                 }
 
 
+                if (teamStatsViewModel != null)
+                {
+
+                    if (teamStatsViewModel.AwayTeam == null) return;
+                    if (teamStatsViewModel.CNAliasVisitSportsDictionary.ContainsKey(teamStatsViewModel.AwayTeam))
+                    {
+                        var teamSeasonData = teamStatsViewModel.CNAliasVisitSportsDictionary[teamStatsViewModel.AwayTeam];
+
+                        if (teamSeasonData.ContainsKey(teamStatsViewModel.SelectTechStats6))
+                        {
+                            teamStatsViewModel.ASeasonScore6 = teamSeasonData[teamStatsViewModel.SelectTechStats6];
+                        }
+                        else
+                        {
+                            teamStatsViewModel.ASeasonScore6 = "0";
+                        }
+
+                    }
+
+                }
             }
             }
 
 
+
         }
         }
 
 
 
 
 
 
         /// <summary>
         /// <summary>
-        /// 设置新的主队信息
+        /// 设置新任务主队信息
         /// </summary>
         /// </summary>
         /// <param name="teamStatsViewModel"></param>
         /// <param name="teamStatsViewModel"></param>
-        public static void NewSetAData(NewTeamStatsViewModel teamStatsViewModel,int index)
+        public static void NewSetAData(TeamStatsTaskViewModel teamStatsViewModel, int index)
         {
         {
 
 
             if (teamStatsViewModel != null)
             if (teamStatsViewModel != null)
             {
             {
-                if (teamStatsViewModel.AwayTeam == null||string.IsNullOrEmpty(teamStatsViewModel.AwayTeam)) return;
+                if (teamStatsViewModel.AwayTeam == null || string.IsNullOrEmpty(teamStatsViewModel.AwayTeam)) return;
             }
             }
 
 
 
 
@@ -1495,6 +2428,41 @@ namespace VIZ.TVP.CBA.Module
 
 
         }
         }
 
 
+
+        /// <summary>
+        /// 设置新的主队技术统计得分
+        /// </summary>
+        /// <param name="mainViewModel"></param>
+        public static void NewSetHomeTeamDictionary(TeamStatsTaskViewModel mainViewModel)
+        {
+            mainViewModel.HomeTeamCompareOptionDictionary.Clear();
+
+            mainViewModel.HomeTeamCompareOptionDictionary.Add("得分", mainViewModel.onAirDataModel.liveTeamStatH.Points);
+            mainViewModel.HomeTeamCompareOptionDictionary.Add("篮板", mainViewModel.onAirDataModel.liveTeamStatH.Rebounds);
+            mainViewModel.HomeTeamCompareOptionDictionary.Add("助攻", mainViewModel.onAirDataModel.liveTeamStatH.Assists);
+            mainViewModel.HomeTeamCompareOptionDictionary.Add("抢断", mainViewModel.onAirDataModel.liveTeamStatH.Steals);
+            mainViewModel.HomeTeamCompareOptionDictionary.Add("盖帽", mainViewModel.onAirDataModel.liveTeamStatH.Blocked);
+            mainViewModel.HomeTeamCompareOptionDictionary.Add("失误", mainViewModel.onAirDataModel.liveTeamStatH.Turnovers);
+            mainViewModel.HomeTeamCompareOptionDictionary.Add("犯规", mainViewModel.onAirDataModel.liveTeamStatH.PersonalFouls);
+            mainViewModel.HomeTeamCompareOptionDictionary.Add("罚球", mainViewModel.onAirDataModel.liveTeamStatH.FreeThrows.ToString());
+            //HomeTeamCompareOptionDictionary.Add(TeamDataCompareOptionChinese[7], Json_OnAirData.liveTeamStatH.FlagrantFouls);
+            mainViewModel.HomeTeamCompareOptionDictionary.Add("罚球命中率", (mainViewModel.onAirDataModel.liveTeamStatH.FreeThrowsPercentage * 100).ToString("F1") + "%");
+            mainViewModel.HomeTeamCompareOptionDictionary.Add("两分命中率", (mainViewModel.onAirDataModel.liveTeamStatH.TwoPointPercentage * 100).ToString("F1") + "%");
+            mainViewModel.HomeTeamCompareOptionDictionary.Add("三分命中率", (mainViewModel.onAirDataModel.liveTeamStatH.ThreePointPercentage * 100).ToString("F1") + "%");
+            mainViewModel.HomeTeamCompareOptionDictionary.Add("投篮命中率", (mainViewModel.onAirDataModel.liveTeamStatH.FieldGoalsPercentage * 100).ToString("F1") + "%");
+            mainViewModel.HomeTeamCompareOptionDictionary.Add("篮下投篮命中率", (mainViewModel.onAirDataModel.liveTeamStatH.FieldGoalsAtRimPercentage * 100).ToString("F1") + "%");
+            mainViewModel.HomeTeamCompareOptionDictionary.Add("中距离投篮命中率", (mainViewModel.onAirDataModel.liveTeamStatH.FieldGoalsMidRangePercentage * 100).ToString("F1") + "%");
+            mainViewModel.HomeTeamCompareOptionDictionary.Add("三分", mainViewModel.onAirDataModel.liveTeamStatH.ThreePointGoals + "/"
+                + mainViewModel.onAirDataModel.liveTeamStatH.ThreePointAttempted);
+            mainViewModel.HomeTeamCompareOptionDictionary.Add("两分", mainViewModel.onAirDataModel.liveTeamStatH.TwoPointGoals + "/"
+                + mainViewModel.onAirDataModel.liveTeamStatH.TwoPointAttempted);
+            //HomeTeamCompareOptionDictionary.Add(TeamDataCompareOptionChinese[16], Json_OnAirData.liveTeamStatH.FastBreakPoints);
+            mainViewModel.HomeTeamCompareOptionDictionary.Add("三分得分", (Convert.ToInt32(mainViewModel.onAirDataModel.liveTeamStatH.ThreePointGoals) * 3).ToString());
+
+
+        }
+
+
         /// <summary>
         /// <summary>
         /// 设置客队技术统计得分
         /// 设置客队技术统计得分
         /// </summary>
         /// </summary>
@@ -1559,5 +2527,37 @@ namespace VIZ.TVP.CBA.Module
             mainViewModel.VisitTeamCompareOptionDictionary.Add("三分得分", (Convert.ToInt32(mainViewModel.onAirDataModel.liveTeamStatV.ThreePointGoals) * 3).ToString());
             mainViewModel.VisitTeamCompareOptionDictionary.Add("三分得分", (Convert.ToInt32(mainViewModel.onAirDataModel.liveTeamStatV.ThreePointGoals) * 3).ToString());
         }
         }
 
 
+        /// <summary>
+        /// 设置新的任务客队技术统计
+        /// </summary>
+        /// <param name="mainViewModel"></param>
+        public static void NewSetVisitTeamDictionary(TeamStatsTaskViewModel mainViewModel)
+        {
+            mainViewModel.VisitTeamCompareOptionDictionary.Clear();
+
+            mainViewModel.VisitTeamCompareOptionDictionary.Add("得分", mainViewModel.onAirDataModel.liveTeamStatV.Points);
+            mainViewModel.VisitTeamCompareOptionDictionary.Add("篮板", mainViewModel.onAirDataModel.liveTeamStatV.Rebounds);
+            mainViewModel.VisitTeamCompareOptionDictionary.Add("助攻", mainViewModel.onAirDataModel.liveTeamStatV.Assists);
+            mainViewModel.VisitTeamCompareOptionDictionary.Add("抢断", mainViewModel.onAirDataModel.liveTeamStatV.Steals);//Steals
+            mainViewModel.VisitTeamCompareOptionDictionary.Add("盖帽", mainViewModel.onAirDataModel.liveTeamStatV.Blocked);
+            mainViewModel.VisitTeamCompareOptionDictionary.Add("失误", mainViewModel.onAirDataModel.liveTeamStatV.Turnovers);
+            mainViewModel.VisitTeamCompareOptionDictionary.Add("犯规", mainViewModel.onAirDataModel.liveTeamStatV.PersonalFouls);
+            mainViewModel.VisitTeamCompareOptionDictionary.Add("罚球", mainViewModel.onAirDataModel.liveTeamStatV.FreeThrows.ToString());
+            //HomeTeamCompareOptionDictionary.Add(TeamDataCompareOptionChinese[7], Json_OnAirData.liveTeamStatH.FlagrantFouls);
+            mainViewModel.VisitTeamCompareOptionDictionary.Add("罚球命中率", (mainViewModel.onAirDataModel.liveTeamStatV.FreeThrowsPercentage * 100).ToString("F1") + "%");
+            mainViewModel.VisitTeamCompareOptionDictionary.Add("两分命中率", (mainViewModel.onAirDataModel.liveTeamStatV.TwoPointPercentage * 100).ToString("F1") + "%");
+            mainViewModel.VisitTeamCompareOptionDictionary.Add("三分命中率", (mainViewModel.onAirDataModel.liveTeamStatV.ThreePointPercentage * 100).ToString("F1") + "%");
+            mainViewModel.VisitTeamCompareOptionDictionary.Add("投篮命中率", (mainViewModel.onAirDataModel.liveTeamStatV.FieldGoalsPercentage * 100).ToString("F1") + "%");
+            mainViewModel.VisitTeamCompareOptionDictionary.Add("篮下投篮命中率", (mainViewModel.onAirDataModel.liveTeamStatV.FieldGoalsAtRimPercentage * 100).ToString("F1") + "%");
+            mainViewModel.VisitTeamCompareOptionDictionary.Add("中距离投篮命中率", (mainViewModel.onAirDataModel.liveTeamStatV.FieldGoalsMidRangePercentage * 100).ToString("F1") + "%");
+            mainViewModel.VisitTeamCompareOptionDictionary.Add("三分", mainViewModel.onAirDataModel.liveTeamStatV.ThreePointGoals + "/"
+                + mainViewModel.onAirDataModel.liveTeamStatV.ThreePointAttempted);
+            mainViewModel.VisitTeamCompareOptionDictionary.Add("两分", mainViewModel.onAirDataModel.liveTeamStatV.TwoPointGoals + "/"
+                + mainViewModel.onAirDataModel.liveTeamStatV.TwoPointAttempted);
+            //HomeTeamCompareOptionDictionary.Add(TeamDataCompareOptionChinese[16], Json_OnAirData.liveTeamStatH.FastBreakPoints);
+            mainViewModel.VisitTeamCompareOptionDictionary.Add("三分得分", (Convert.ToInt32(mainViewModel.onAirDataModel.liveTeamStatV.ThreePointGoals) * 3).ToString());
+        }
+
+
     }
     }
 }
 }

VIZ.MIGU.CBA.Module/DayMatch/View/DayMatchView.xaml

@@ -9,10 +9,13 @@
                       xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
                       xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
                       xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
                       xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
                       xmlns:core="clr-namespace:VIZ.Framework.Core;assembly=VIZ.Framework.Core"
                       xmlns:core="clr-namespace:VIZ.Framework.Core;assembly=VIZ.Framework.Core"
+                      xmlns:dxb="http://schemas.devexpress.com/winfx/2008/xaml/bars"
                       xmlns:storage="clr-namespace:VIZ.TVP.CBA.Module"
                       xmlns:storage="clr-namespace:VIZ.TVP.CBA.Module"
+                      xmlns:common="clr-namespace:VIZ.Package.Common;assembly=VIZ.Package.Common"
                       mc:Ignorable="d"
                       mc:Ignorable="d"
                       d:DesignHeight="400"
                       d:DesignHeight="400"
                       d:DesignWidth="750"
                       d:DesignWidth="750"
+                      x:Name="uc"
                       HorizontalAlignment="Stretch"
                       HorizontalAlignment="Stretch"
                       VerticalAlignment="Stretch">
                       VerticalAlignment="Stretch">
     <UserControl.Resources>
     <UserControl.Resources>
@@ -200,12 +203,38 @@
 
 
                 <!--#endregion-->
                 <!--#endregion-->
                 <dxg:GridControl.View>
                 <dxg:GridControl.View>
-                    <dxg:TableView AutoWidth="True"  ShowGroupPanel="False" 
+                    <!--<dxg:TableView AutoWidth="True"  ShowGroupPanel="False" 
+                               IsColumnChooserVisible="{Binding Path=IsColumnChooserVisible,Mode=TwoWay}"
                                BorderThickness="0"  
                                BorderThickness="0"  
                                ShowFilterPanelMode="Never" 
                                ShowFilterPanelMode="Never" 
                                AllowColumnFiltering="False"
                                AllowColumnFiltering="False"
                                AllowSorting="False"
                                AllowSorting="False"
-                               IsColumnMenuEnabled="False"  >
+                               IsColumnMenuEnabled="False"  >-->
+
+                    <dxg:TableView IsColumnMenuEnabled="True"
+                                                       IsColumnChooserVisible="{Binding Path=IsColumnChooserVisible,Mode=TwoWay}"
+                                                       AllowEditing="True" ShowIndicator="False"  AutoWidth="True"
+                                                       NavigationStyle="Cell" ShowVerticalLines="False" ShowHorizontalLines="False"
+                                                       ShowGroupPanel="False" EditorShowMode="MouseDown"
+                                                       AllowDragDrop="True"
+                                                       AlternateRowBackground="#05ffffff"
+                                                       ShowBandsPanel="False"
+                                                       ShowTotalSummary="False"
+                                                       ShowFixedTotalSummary="False" 
+                                                       ShowDragDropHint="False" 
+                                                       AllowSorting="False" 
+                                                       AllowColumnFiltering="False"
+                                                       ShowTargetInfoInDragDropHint="false">
+
+                        <dxmvvm:Interaction.Behaviors>
+                            <dxmvvm:EventToCommand EventName="ShowGridMenu" Command="{Binding ElementName=uc, Path=DataContext.ShowGridMenuCommand}" PassEventArgsToCommand="True"></dxmvvm:EventToCommand>
+                        </dxmvvm:Interaction.Behaviors>
+
+                        <dxg:TableView.ColumnMenuCustomizations>
+                            <dxb:BarButtonItem Name="ShowColumnChooser" Content="显示列选择" 
+                                               Command="{Binding ElementName=uc,Path=DataContext.ColumnChoiceCommand}"
+                                               Tag="{x:Static Member=common:GridControlHelper.KEEP_MENU_TAG}"/>
+                        </dxg:TableView.ColumnMenuCustomizations>
                     </dxg:TableView>
                     </dxg:TableView>
 
 
                 </dxg:GridControl.View>
                 </dxg:GridControl.View>

VIZ.MIGU.CBA.Module/DayMatch/ViewModel/DayMatchViewModel.cs

@@ -7,9 +7,10 @@ using System.Threading.Tasks;
 using VIZ.Framework.Core;
 using VIZ.Framework.Core;
 using log4net;
 using log4net;
 using VIZ.Package.Domain;
 using VIZ.Package.Domain;
-using VIZ.TVP.CBA.Module.Message.ViewModel;
 using VIZ.Package.Service;
 using VIZ.Package.Service;
 using VIZ.Package.Storage;
 using VIZ.Package.Storage;
+using DevExpress.Xpf.Grid;
+using VIZ.Package.Common;
 
 
 namespace VIZ.TVP.CBA.Module
 namespace VIZ.TVP.CBA.Module
 {
 {
@@ -33,6 +34,8 @@ namespace VIZ.TVP.CBA.Module
             BtnMatchDayUp = new VCommand(BtnMatchDayUpData);
             BtnMatchDayUp = new VCommand(BtnMatchDayUpData);
             BtnRoundCmd = new VCommand(BtmRoundCommand);
             BtnRoundCmd = new VCommand(BtmRoundCommand);
             PromptCommand = new VCommand(PromptCmd);
             PromptCommand = new VCommand(PromptCmd);
+            ColumnChoiceCommand = new VCommand(ColumnChoice);
+            ShowGridMenuCommand = new VCommand<GridMenuEventArgs>(ShowGridMenu);
             matchDate = DateTime.Today.ToShortDateString();
             matchDate = DateTime.Today.ToShortDateString();
             GetSchedule();
             GetSchedule();
 
 
@@ -330,6 +333,57 @@ namespace VIZ.TVP.CBA.Module
             set { roundBtnEnable = value; this.RaisePropertyChanged(nameof(RoundBtnEnable)); }
             set { roundBtnEnable = value; this.RaisePropertyChanged(nameof(RoundBtnEnable)); }
         }
         }
 
 
+        #region IsColumnChooserVisible -- 是否显示列选择器
+
+        private bool isColumnChooserVisible;
+        /// <summary>
+        /// 是否显示列选择器
+        /// </summary>
+        public bool IsColumnChooserVisible
+        {
+            get { return isColumnChooserVisible; }
+            set { isColumnChooserVisible = value; this.RaisePropertyChanged(nameof(IsColumnChooserVisible)); }
+        }
+
+        #endregion
+
+
+        #region ColumnChoiceCommand -- 列选择命令
+
+        /// <summary>
+        /// 列选择命令
+        /// </summary>
+        public VCommand ColumnChoiceCommand { get; set; }
+
+        /// <summary>
+        /// 列选择
+        /// </summary>
+        private void ColumnChoice()
+        {
+            this.IsColumnChooserVisible = true;
+        }
+
+        #endregion
+
+
+        #region ShowGridMenuCommand -- 显示列命令
+
+        /// <summary>
+        /// 显示列命令
+        /// </summary>
+        public VCommand<GridMenuEventArgs> ShowGridMenuCommand { get; set; }
+
+        /// <summary>
+        /// 显示列
+        /// </summary>
+        /// <param name="e">事件参数</param>
+        private void ShowGridMenu(GridMenuEventArgs e)
+        {
+            GridControlHelper.RemoveAllDefaultMenuItem(e);
+        }
+
+        #endregion
+
         #region 打开更新数据时间日志
         #region 打开更新数据时间日志
         /// <summary>
         /// <summary>
         /// 打开数据更新日志
         /// 打开数据更新日志

VIZ.MIGU.CBA.Module/HeaderPage/ViewModel/DateHeaderViewModel.cs

@@ -341,7 +341,7 @@ namespace VIZ.TVP.CBA.Module
                 ScheduleID = selectMatchData.ScheduleID;
                 ScheduleID = selectMatchData.ScheduleID;
                 Matchtypeid = selectMatchData.ScheduleTypeID;
                 Matchtypeid = selectMatchData.ScheduleTypeID;
 
 
-                #region 球员统计信息
+                #region 球队统计信息
 
 
 
 
                 //if (TeamStatsViewModel.TeamStatsViewModelInstance.Count>0)
                 //if (TeamStatsViewModel.TeamStatsViewModelInstance.Count>0)
@@ -381,6 +381,48 @@ namespace VIZ.TVP.CBA.Module
 
 
                 #endregion
                 #endregion
 
 
+
+
+                #region 球队任务统计信息
+
+
+                //if (TeamStatsViewModel.TeamStatsViewModelInstance.Count>0)
+                //{
+                //   // Log.Error(string.Format("TeamStatsViewModel.CreateInstance Count:{0}", TeamStatsViewModel.TeamStatsViewModelInstance.Count));
+                //    foreach(var tempTeamStatsViewModel in TeamStatsViewModel.TeamStatsViewModelInstance)
+                //    {
+                //       // if(ApplicationDomainEx.CurrentPage == page;
+                //        // TeamStatsViewModel teamStatsViewModel = tempTeamStatsViewModel;
+                //        // Log.Error("DateHeaderViewModel_CreateTeamStatsViewModel");
+                //        tempTeamStatsViewModel.ScheduleID = selectMatchData.ScheduleID;
+                //        tempTeamStatsViewModel.Matchtypeid = selectMatchData.ScheduleTypeID;
+                //       // Log.Error(string.Format("DateHeader_ScheduleId:{0}", selectMatchData.ScheduleID));
+                //        //Log.Error(string.Format("DateHeader_ScheduleTypeId:{0}", selectMatchData.ScheduleTypeID));
+                //        tempTeamStatsViewModel.SetTeamData();
+                //    }
+
+                //}
+
+
+                if (TeamStatsTaskViewModel.TeamStatsTaskViewModelInstance.Count > 0)
+                {
+                    foreach (var tempTeamStatsViewModel in TeamStatsTaskViewModel.TeamStatsTaskViewModelInstance)
+                    {
+                        tempTeamStatsViewModel.ScheduleID = selectMatchData.ScheduleID;
+                        tempTeamStatsViewModel.Matchtypeid = selectMatchData.ScheduleTypeID;
+                        if (tempTeamStatsViewModel.page != null && ApplicationDomainEx.CurrentPage == tempTeamStatsViewModel.page)
+                        {
+
+
+                            tempTeamStatsViewModel.SetTeamData();
+                        }
+
+                    }
+                }
+
+
+                #endregion
+
                 #region 单个球员信息
                 #region 单个球员信息
 
 
                 //if(SinglePlayerViewModel.SinglePlayerViewModelInstance.Count>0)
                 //if(SinglePlayerViewModel.SinglePlayerViewModelInstance.Count>0)
@@ -396,7 +438,7 @@ namespace VIZ.TVP.CBA.Module
                 //}
                 //}
 
 
 
 
-                if(NewSinglePlayerViewModel.SinglePlayerViewModelInstance.Count>0)
+                if (NewSinglePlayerViewModel.SinglePlayerViewModelInstance.Count>0)
                 {
                 {
                     foreach (var tempSinglePlayerViewModel in NewSinglePlayerViewModel.SinglePlayerViewModelInstance)
                     foreach (var tempSinglePlayerViewModel in NewSinglePlayerViewModel.SinglePlayerViewModelInstance)
                     {
                     {
@@ -466,6 +508,26 @@ namespace VIZ.TVP.CBA.Module
 
 
                 }
                 }
 
 
+                #region  双球员————任务
+
+                if (PlayerComPareViewModelTask.PlayerCompareViewModelTaskInstance.Count > 0)
+                {
+                    foreach (var playerCompareViewModel in PlayerComPareViewModelTask.PlayerCompareViewModelTaskInstance)
+                    {
+                        playerCompareViewModel.ScheduleID = selectMatchData.ScheduleID;
+                        playerCompareViewModel.Matchtypeid = selectMatchData.ScheduleTypeID;
+                        //PlayerCompareViewModel playerCompareViewModel = PlayerCompareViewModel.CreateInstance;
+                        if (playerCompareViewModel.page != null && ApplicationDomainEx.CurrentPage == playerCompareViewModel.page)
+                        {
+
+                            playerCompareViewModel.SetCompareData();
+                        }
+                    }
+
+                }
+
+                #endregion 双球员---任务
+
                 //设置球队赛季数据
                 //设置球队赛季数据
                 GetTeamSeasonData();
                 GetTeamSeasonData();
                 #endregion
                 #endregion
@@ -474,7 +536,7 @@ namespace VIZ.TVP.CBA.Module
 
 
         private void ClearData()
         private void ClearData()
         {
         {
-            #region 球员统计信息
+            #region 球队统计信息
 
 
             if (NewTeamStatsViewModel.TeamStatsViewModelInstance.Count > 0)
             if (NewTeamStatsViewModel.TeamStatsViewModelInstance.Count > 0)
             {
             {
@@ -492,6 +554,26 @@ namespace VIZ.TVP.CBA.Module
             }
             }
 
 
 
 
+            //球队任务统计
+
+            if (TeamStatsTaskViewModel.TeamStatsTaskViewModelInstance.Count > 0)
+            {
+                foreach (var tempTeamStatsViewModel in TeamStatsTaskViewModel.TeamStatsTaskViewModelInstance)
+                {
+                    tempTeamStatsViewModel.ScheduleID = "";
+                    tempTeamStatsViewModel.Matchtypeid = "";
+                    if (tempTeamStatsViewModel.page != null && ApplicationDomainEx.CurrentPage == tempTeamStatsViewModel.page)
+                    {
+
+
+                        tempTeamStatsViewModel.SetTeamData();
+                    }
+
+                }
+            }
+
+
+
             #endregion
             #endregion
 
 
             #region 单个球员信息
             #region 单个球员信息
@@ -556,6 +638,28 @@ namespace VIZ.TVP.CBA.Module
 
 
             }
             }
             #endregion
             #endregion
+
+
+            #region 球员对比任务
+
+            if (PlayerComPareViewModelTask.PlayerCompareViewModelTaskInstance.Count > 0)
+            {
+                foreach (var playerCompareViewModel in PlayerComPareViewModelTask.PlayerCompareViewModelTaskInstance)
+                {
+                    playerCompareViewModel.ScheduleID = "";
+                    playerCompareViewModel.Matchtypeid ="";
+                    //PlayerCompareViewModel playerCompareViewModel = PlayerCompareViewModel.CreateInstance;
+                    if (playerCompareViewModel.page != null && ApplicationDomainEx.CurrentPage == playerCompareViewModel.page)
+                    {
+
+                        playerCompareViewModel.SetCompareData();
+                    }
+                }
+
+            }
+
+            #endregion 球员对比任务
+
         }
         }
 
 
 
 

VIZ.MIGU.CBA.Module/MVPPlayer/ViewModel/MvpPlayerViewModel.cs

@@ -12,7 +12,6 @@ using VIZ.Framework.Core;
 using VIZ.Package.Domain;
 using VIZ.Package.Domain;
 using System.Windows.Media;
 using System.Windows.Media;
 using System.IO;
 using System.IO;
-using VIZ.TVP.CBA.Module.Message.ViewModel;
 using VIZ.Package.Service;
 using VIZ.Package.Service;
 using VIZ.Package.Storage;
 using VIZ.Package.Storage;
 
 

VIZ.MIGU.CBA.Module/Message/View/MessageLastRecordDate.xaml.cs

@@ -12,7 +12,6 @@ using System.Windows.Media;
 using System.Windows.Media.Imaging;
 using System.Windows.Media.Imaging;
 using System.Windows.Shapes;
 using System.Windows.Shapes;
 using VIZ.Framework.Core;
 using VIZ.Framework.Core;
-using VIZ.TVP.CBA.Module.Message.ViewModel;
 
 
 namespace VIZ.TVP.CBA.Module
 namespace VIZ.TVP.CBA.Module
 {
 {

VIZ.MIGU.CBA.Module/Message/ViewModel/MessageLRDateViewModel.cs

@@ -8,7 +8,7 @@ using VIZ.Framework.Core;
 using VIZ.Package.Domain;
 using VIZ.Package.Domain;
 using VIZ.Package.Module;
 using VIZ.Package.Module;
 
 
-namespace VIZ.TVP.CBA.Module.Message.ViewModel
+namespace VIZ.TVP.CBA.Module
 {
 {
     public class MessageLRDateViewModel : ViewModelBase
     public class MessageLRDateViewModel : ViewModelBase
     {
     {

VIZ.MIGU.CBA.Module/PlayerComPareTask/PlayerCompareViewModelPluginTask.cs

+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using VIZ.Package.Domain;
+
+namespace VIZ.TVP.CBA.Module
+{ 
+    public class PlayerCompareViewModelPluginTask : IPluginLifeCycle
+    {
+        /// <summary>
+        /// 插件ID
+        /// </summary>
+        /// <remarks>
+        /// 插件ID不能包含点号
+        /// </remarks>
+        public const string PLUGIN_ID = "PlayerComPareViewTask";
+
+        /// <summary>
+        /// 插件显示名称
+        /// </summary>
+        public const string PLUGIN_NAME = "球员数据对比(任务测试)";
+        public void Dispose()
+        {
+
+        }
+
+        public void Initialize()
+        {
+
+        }
+
+        public PluginInfo Register()
+        {
+            PluginInfo info = new PluginInfo();
+            info.Group = PluginConstant.GroupName;
+            info.ID = PLUGIN_ID;
+            info.Name = PLUGIN_NAME;
+            info.PluginType = PluginType.Page;
+            info.ViewType = typeof(PlayerComPareViewTask);
+
+            //info.SettingViewType = typeof(DayMatchUI);
+
+            return info;
+        }
+    }
+}

VIZ.MIGU.CBA.Module/PlayerComPareTask/View/PlayerComPareViewTask.xaml

+<UserControl x:Class="VIZ.TVP.CBA.Module.PlayerComPareViewTask"
+   xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+                      xmlns:dx="http://schemas.devexpress.com/winfx/2008/xaml/core"
+                      xmlns:dxe="http://schemas.devexpress.com/winfx/2008/xaml/editors"
+                      xmlns:dxg="http://schemas.devexpress.com/winfx/2008/xaml/grid"
+                      xmlns:dxmvvm="http://schemas.devexpress.com/winfx/2008/xaml/mvvm"
+                      xmlns:dxrudex="http://schemas.devexpress.com/winfx/2008/xaml/reports/userdesignerextensions"
+                      xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
+                      xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+                      xmlns:fcommon="clr-namespace:VIZ.Framework.Common;assembly=VIZ.Framework.Common"
+                      xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
+                      xmlns:core="clr-namespace:VIZ.Framework.Core;assembly=VIZ.Framework.Core"
+                      xmlns:storage="clr-namespace:VIZ.TVP.CBA.Module">
+    <Grid>
+        <ScrollViewer HorizontalScrollBarVisibility="Disabled"
+                      VerticalScrollBarVisibility="Auto"
+                      Name="PART_Options"
+                      DockPanel.Dock="Right"
+                      dx:ScrollBarExtensions.ScrollBarMode="TouchOverlap"
+                      Focusable="False">
+            <Grid>
+                <Grid.ColumnDefinitions>
+                    <ColumnDefinition Width="197*"/>
+                </Grid.ColumnDefinitions>
+
+
+                <Grid.RowDefinitions>
+                    <RowDefinition Height="250"/>
+                    <RowDefinition Height="*"/>
+                </Grid.RowDefinitions>
+                <WrapPanel Grid.Row="0"  Width="765" HorizontalAlignment="Left" VerticalAlignment="Center"  >
+                    <Grid >
+                        <Grid.RowDefinitions>
+                            <RowDefinition Height="40"/>
+                            <RowDefinition Height="0"/>
+                            <RowDefinition Height="40"/>
+                            <RowDefinition Height="40"/>
+                            <RowDefinition Height="110"/>
+                            <!--<RowDefinition Height="40"/>
+                        <RowDefinition Height="40"/>
+                        <RowDefinition Height="40"/>
+                        <RowDefinition Height="40"/>
+                        <RowDefinition Height="40"/>
+                        <RowDefinition Height="40"/>
+                         <RowDefinition Height="40"/>
+                         <RowDefinition Height="40"/>-->
+
+                        </Grid.RowDefinitions>
+                        <Grid.ColumnDefinitions>
+                            <ColumnDefinition Width="3"/>
+                            <ColumnDefinition Width="67"/>
+                            <ColumnDefinition Width="175"/>
+                            <ColumnDefinition Width="130"/>
+                            <ColumnDefinition Width="130"/>
+                            <ColumnDefinition Width="127"/>
+                            <ColumnDefinition Width="130"/>
+                        </Grid.ColumnDefinitions>
+
+                        <TextBlock Grid.Column="1"  Text="标题"  FontSize="16"  HorizontalAlignment="Left" VerticalAlignment="Center" Margin="16,0,0,0"  />
+
+
+                        <WrapPanel Grid.Row="0" Grid.Column="6" HorizontalAlignment="Center" VerticalAlignment="Center">
+
+                            <Grid>
+
+                                <Grid.ColumnDefinitions>
+                                    <ColumnDefinition Width="100"/>
+                                    <ColumnDefinition Width="30"/>
+                                </Grid.ColumnDefinitions>
+
+                                <dx:SimpleButton  Grid.Column="0" Content="刷新"  Glyph='/VIZ.TVP.CBA.Module;component/Image/CBAPng/refresh2525.png' FontSize="16" 
+                                          Command="{Binding BtnCommand}" HorizontalContentAlignment="Center"   Width="90" Height="30"  />
+
+                                <dx:SimpleButton  Grid.Column="1"  Glyph='/VIZ.TVP.CBA.Module;component/Image/CBAPng/Prompt2525.png' FontSize="16" 
+                                          Command="{Binding PromptCommand}" HorizontalContentAlignment="Center"  Width="30" Height="30"  />
+                            </Grid>
+                        </WrapPanel>
+
+
+
+                        <Button  Grid.Row="0" Content="任务开始"  Name="task_Start" Click="task_Start_Click" Grid.Column="3" FontSize="14" Height="30" Width="90" Margin="20,5,20,5"/>
+                        <Button  Grid.Row="0" Content="任务暂停"  Name="task_continue" Click="task_continue_Click" Grid.Column="4" FontSize="14" Height="30" Width="90" Margin="20,5,20,5"/>
+                        <Button  Grid.Row="0" Content="任务停止"  Name="task_Stop"  Click="task_Stop_Click" Grid.Column="5" FontSize="14" Height="30" Width="90" Margin="19,5,18,5"/>
+
+                        <dxe:TextEdit Grid.Column="2"   Width="170" 
+                         FontSize="16"   HorizontalContentAlignment="Left" 
+                         HorizontalAlignment="Center" VerticalAlignment="Center"  Text="{Binding Title,Mode=TwoWay }" />
+                        <dxe:ListBoxEdit  Margin="48,6,0,0" Grid.Row="2" Grid.RowSpan="3"  Grid.Column="2" x:Name="com_HPlayer" HorizontalAlignment="Left" VerticalAlignment="Top" Width="120" Height="178" FontSize="16" 
+                          ItemsSource="{Binding Path=HPlayers,Mode=TwoWay}"
+                          SelectedItem="{Binding Path=HPlayer,Mode=TwoWay}">
+                        </dxe:ListBoxEdit>
+
+
+                        <dxe:TextEdit Text="{Binding HName,Mode=TwoWay}"  Width="120"  FontSize="16" Grid.Column="3"  Grid.Row="2" VerticalAlignment="Center" Margin="5,0,5,0" />
+                        <dxe:TextEdit Text="{Binding AName,Mode=TwoWay}"  Grid.Row="2" Grid.Column="4" Width="120"  FontSize="16"  VerticalAlignment="Center" Margin="5,0,5,0" />
+
+
+                        <dxe:ListBoxEdit  Grid.Row="2" Grid.RowSpan="3" Grid.Column="5" x:Name="com_APlayer" HorizontalAlignment="Center" VerticalAlignment="Top" Width="120" Height="178" FontSize="16"
+                          ItemsSource="{Binding Path=APlayers,Mode=TwoWay}"
+                          SelectedItem="{Binding Path=APlayer,Mode=TwoWay}" Margin="0,6,0,0" >
+                        </dxe:ListBoxEdit>
+
+
+                        <WrapPanel Grid.Row="2" Grid.Column="6" VerticalAlignment="Center">
+
+                            <Grid>
+                                <Grid.ColumnDefinitions>
+                                    <ColumnDefinition Width="45"/>
+                                    <ColumnDefinition Width="75"/>
+                                </Grid.ColumnDefinitions>
+
+                                <TextBlock  Grid.Column="0" TextBlock.TextAlignment="Center" Text="项数：" Width="45"  FontSize="16"   HorizontalAlignment="Right" VerticalAlignment="Center" />
+                                <dxe:ComboBoxEdit Grid.Column="1" x:Name="com_matchStatsId"  HorizontalAlignment="Left" VerticalAlignment="Center" Width="75" FontSize="16"
+                             ItemsSource="{Binding Path=MatchStatsIds,Mode=TwoWay}"
+                             SelectedItem="{Binding Path=MatchStatsId,Mode=TwoWay}" >
+                                </dxe:ComboBoxEdit>
+                            </Grid>
+
+                        </WrapPanel>
+
+                        <dxe:TextEdit Grid.Row="3" Text="{Binding HNums}"  Width="70" FontSize="16"  Grid.Column="3" 
+                         HorizontalContentAlignment="Center" 
+                         HorizontalAlignment="Center" VerticalAlignment="Center"/>
+
+                        <dxe:TextEdit Grid.Row="3" Text="{Binding ANums}" Width="70" FontSize="16"  Grid.Column="4"  
+                         HorizontalContentAlignment="Center" 
+                         HorizontalAlignment="Center" VerticalAlignment="Center"/>
+
+                        <dxe:ImageEdit Grid.Row="4" Grid.Column="3" Height="100" Width="120" x:Name="HPlayer_Logo" ShowMenu="False" EditValue="{Binding Path=HPlayerLogo}"  
+                               ShowLoadDialogOnClickMode="Never" Margin="5,5,5,5"/>
+
+                        <dxe:ImageEdit Grid.Row="4" Grid.Column="4" Height="100" Width="120" x:Name="APlayer_Logo" ShowMenu="False" EditValue="{Binding Path=APlayerLogo}" 
+                               ShowLoadDialogOnClickMode="Never" Margin="5,5,5,5" />
+
+                    </Grid>
+                </WrapPanel>
+
+                <WrapPanel Margin="40,0,0,0" Grid.Row="1"  Width="710" HorizontalAlignment="Left" VerticalAlignment="Center"  >
+                    <Grid >
+                        <Grid.RowDefinitions>
+                            <RowDefinition Height="0"/>
+                            <RowDefinition Height="0"/>
+                            <RowDefinition Height="0"/>
+                            <RowDefinition Height="0"/>
+                            <RowDefinition Height="0"/>
+                            <RowDefinition Height="34"/>
+                            <RowDefinition Height="34"/>
+                            <RowDefinition Height="34"/>
+                            <RowDefinition Height="34"/>
+                            <RowDefinition Height="34"/>
+                            <RowDefinition Height="34"/>
+                            <RowDefinition Height="34"/>
+                            <RowDefinition Height="34"/>
+                        </Grid.RowDefinitions>
+                        <Grid.ColumnDefinitions>
+                            <ColumnDefinition Width="50"/>
+                            <ColumnDefinition Width="115"/>
+                            <ColumnDefinition Width="116"/>
+                            <ColumnDefinition Width="127"/>
+                            <ColumnDefinition Width="115"/>
+                            <ColumnDefinition Width="115"/>
+                        </Grid.ColumnDefinitions>
+
+
+                        <TextBlock Grid.Row="5" Grid.Column="1" Text="主队球员本场" FontSize="12" HorizontalAlignment="Center" VerticalAlignment="Center"/>
+                        <TextBlock Grid.Row="5" Grid.Column="2" Text="主队球员赛季" FontSize="12" HorizontalAlignment="Center" VerticalAlignment="Center"/>
+
+                        <TextBlock Grid.Row="5" Grid.Column="4" Text="客队球员本场" FontSize="12" HorizontalAlignment="Center" VerticalAlignment="Center"/>
+                        <TextBlock Grid.Row="5" Grid.Column="5" Text="客队球员赛季" FontSize="12" HorizontalAlignment="Center" VerticalAlignment="Center"/>
+
+
+                        <!--第一项-->
+                        <dxe:CheckEdit Grid.Row="6" HorizontalAlignment="Center" IsChecked="{Binding IsHeight}"  Visibility="{Binding IsCheckVisible,Mode=TwoWay}"/>
+                        <dxe:TextEdit Grid.Row="6" Grid.Column="1"   Width="110" 
+                         FontSize="16"   HorizontalContentAlignment="Center" 
+                         HorizontalAlignment="Center" VerticalAlignment="Center"  Text="{Binding HScore,Mode=TwoWay }"  Visibility="{Binding HScoreVisible,Mode=TwoWay}"/>
+                        <dxe:TextEdit Grid.Row="6" Grid.Column="2"   Width="110" 
+                         FontSize="16"   HorizontalContentAlignment="Center" 
+                         HorizontalAlignment="Center" VerticalAlignment="Center"  Text="{Binding HSeasonScore,Mode=TwoWay }"  Visibility="{Binding HSeasonScoreVisible,Mode=TwoWay}"/>
+
+                        <dxe:ComboBoxEdit  Grid.Row="6" Grid.Column="3" x:Name="com_techStats" HorizontalAlignment="Center" VerticalAlignment="Center" Width="120" FontSize="16"
+                          ItemsSource="{Binding Path=TechStats,Mode=TwoWay}"
+                          SelectedItem="{Binding Path=SelectTechStats,Mode=TwoWay}" Visibility="{Binding TechStatsVisible,Mode=TwoWay}">
+                        </dxe:ComboBoxEdit>
+
+                        <dxe:TextEdit Grid.Row="6" Grid.Column="4"   Width="110" 
+                         FontSize="16"   HorizontalContentAlignment="Center" 
+                         HorizontalAlignment="Center" VerticalAlignment="Center"  Text="{Binding AScore,Mode=TwoWay }" Visibility="{Binding AScoreVisible,Mode=TwoWay}" />
+                        <dxe:TextEdit Grid.Row="6" Grid.Column="5"   Width="110" 
+                         FontSize="16"   HorizontalContentAlignment="Center" 
+                         HorizontalAlignment="Center" VerticalAlignment="Center"  Text="{Binding ASeasonScore,Mode=TwoWay }" Visibility="{Binding ASeasonScoreVisible}" />
+
+                        <!--第二项-->
+                        <dxe:CheckEdit Grid.Row="7" HorizontalAlignment="Center" IsChecked="{Binding IsHeight1}" Visibility="{Binding IsCheckVisible1,Mode=TwoWay}"/>
+                        <dxe:TextEdit Grid.Row="7" Grid.Column="1"   Width="110" 
+                         FontSize="16"   HorizontalContentAlignment="Center" 
+                         HorizontalAlignment="Center" VerticalAlignment="Center"  Text="{Binding HScore1,Mode=TwoWay }" Visibility="{Binding HScoreVisible1,Mode=TwoWay}"/>
+                        <dxe:TextEdit Grid.Row="7" Grid.Column="2"   Width="110" 
+                         FontSize="16"   HorizontalContentAlignment="Center" 
+                         HorizontalAlignment="Center" VerticalAlignment="Center"  Text="{Binding HSeasonScore1,Mode=TwoWay }" Visibility="{Binding HSeasonScoreVisible1,Mode=TwoWay}" />
+
+                        <dxe:ComboBoxEdit  Grid.Row="7" Grid.Column="3" x:Name="com_techStats1" HorizontalAlignment="Center" VerticalAlignment="Center" Width="120" FontSize="16"
+                          ItemsSource="{Binding Path=TechStats1,Mode=TwoWay}"
+                          SelectedItem="{Binding Path=SelectTechStats1,Mode=TwoWay}" Visibility="{Binding TechStatsVisible1,Mode=TwoWay}">
+                        </dxe:ComboBoxEdit>
+                        <dxe:TextEdit Grid.Row="7" Grid.Column="4"   Width="110" 
+                         FontSize="16"   HorizontalContentAlignment="Center" 
+                         HorizontalAlignment="Center" VerticalAlignment="Center"  Text="{Binding AScore1,Mode=TwoWay }" Visibility="{Binding AScoreVisible1,Mode=TwoWay}"/>
+                        <dxe:TextEdit Grid.Row="7" Grid.Column="5"   Width="110" 
+                         FontSize="16"   HorizontalContentAlignment="Center" 
+                         HorizontalAlignment="Center" VerticalAlignment="Center"  Text="{Binding ASeasonScore1,Mode=TwoWay }" Visibility="{Binding ASeasonScoreVisible1}"/>
+
+
+                        <!--第三项-->
+
+                        <dxe:CheckEdit Grid.Row="8" HorizontalAlignment="Center"  IsChecked="{Binding IsHeight2}" Visibility="{Binding IsCheckVisible2,Mode=TwoWay}"/>
+                        <dxe:TextEdit Grid.Row="8" Grid.Column="1"   Width="110" 
+                         FontSize="16"   HorizontalContentAlignment="Center" 
+                         HorizontalAlignment="Center" VerticalAlignment="Center"  Text="{Binding HScore2,Mode=TwoWay }" Visibility="{Binding HScoreVisible2,Mode=TwoWay}"/>
+                        <dxe:TextEdit Grid.Row="8" Grid.Column="2"   Width="110" 
+                         FontSize="16"   HorizontalContentAlignment="Center" 
+                         HorizontalAlignment="Center" VerticalAlignment="Center"  Text="{Binding HSeasonScore2,Mode=TwoWay }" Visibility="{Binding HSeasonScoreVisible2,Mode=TwoWay}" />
+
+                        <dxe:ComboBoxEdit  Grid.Row="8" Grid.Column="3" x:Name="com_techStats2" HorizontalAlignment="Center" VerticalAlignment="Center" Width="120" FontSize="16"
+                          ItemsSource="{Binding Path=TechStats2,Mode=TwoWay}"
+                          SelectedItem="{Binding Path=SelectTechStats2,Mode=TwoWay}" Visibility="{Binding TechStatsVisible2,Mode=TwoWay}">
+                        </dxe:ComboBoxEdit>
+                        <dxe:TextEdit Grid.Row="8" Grid.Column="4"   Width="110" 
+                         FontSize="16"   HorizontalContentAlignment="Center" 
+                         HorizontalAlignment="Center" VerticalAlignment="Center"  Text="{Binding AScore2,Mode=TwoWay }" Visibility="{Binding AScoreVisible2,Mode=TwoWay}"/>
+                        <dxe:TextEdit Grid.Row="8" Grid.Column="5"   Width="110" 
+                         FontSize="16"   HorizontalContentAlignment="Center" 
+                         HorizontalAlignment="Center" VerticalAlignment="Center"  Text="{Binding ASeasonScore2,Mode=TwoWay }" Visibility="{Binding ASeasonScoreVisible2,Mode=TwoWay}"/>
+
+
+                        <!--第四项-->
+
+                        <dxe:CheckEdit Grid.Row="9" HorizontalAlignment="Center" IsChecked="{Binding IsHeight3}" Visibility="{Binding IsCheckVisible3,Mode=TwoWay}"/>
+                        <dxe:TextEdit Grid.Row="9" Grid.Column="1"   Width="110" 
+                         FontSize="16"   HorizontalContentAlignment="Center" 
+                         HorizontalAlignment="Center" VerticalAlignment="Center"  Text="{Binding HScore3,Mode=TwoWay }" Visibility="{Binding HScoreVisible3,Mode=TwoWay}"/>
+                        <dxe:TextEdit Grid.Row="9" Grid.Column="2"   Width="110" 
+                         FontSize="16"   HorizontalContentAlignment="Center" 
+                         HorizontalAlignment="Center" VerticalAlignment="Center"  Text="{Binding HSeasonScore3,Mode=TwoWay }" Visibility="{Binding HSeasonScoreVisible3,Mode=TwoWay}"/>
+
+                        <dxe:ComboBoxEdit  Grid.Row="9" Grid.Column="3" x:Name="com_techStats3" HorizontalAlignment="Center" VerticalAlignment="Center" Width="120" FontSize="16"
+                          ItemsSource="{Binding Path=TechStats3,Mode=TwoWay}"
+                          SelectedItem="{Binding Path=SelectTechStats3,Mode=TwoWay}" Visibility="{Binding TechStatsVisible3,Mode=TwoWay}">
+                        </dxe:ComboBoxEdit>
+                        <dxe:TextEdit Grid.Row="9" Grid.Column="4"   Width="110" 
+                         FontSize="16"   HorizontalContentAlignment="Center" 
+                         HorizontalAlignment="Center" VerticalAlignment="Center"  Text="{Binding AScore3,Mode=TwoWay }" Visibility="{Binding AScoreVisible3,Mode=TwoWay}"/>
+                        <dxe:TextEdit Grid.Row="9" Grid.Column="5"   Width="110" 
+                         FontSize="16"   HorizontalContentAlignment="Center" 
+                         HorizontalAlignment="Center" VerticalAlignment="Center"  Text="{Binding ASeasonScore3,Mode=TwoWay }" Visibility="{Binding ASeasonScoreVisible3,Mode=TwoWay}"/>
+
+                        <!--第五项-->
+
+                        <dxe:CheckEdit Grid.Row="10" HorizontalAlignment="Center" IsChecked="{Binding IsHeight4}"  Visibility="{Binding IsCheckVisible4,Mode=TwoWay}"/>
+                        <dxe:TextEdit Grid.Row="10" Grid.Column="1"   Width="110" 
+                         FontSize="16"   HorizontalContentAlignment="Center" 
+                         HorizontalAlignment="Center" VerticalAlignment="Center"  Text="{Binding HScore4,Mode=TwoWay }" Visibility="{Binding HScoreVisible4,Mode=TwoWay}" />
+                        <dxe:TextEdit Grid.Row="10" Grid.Column="2"   Width="110" 
+                         FontSize="16"   HorizontalContentAlignment="Center" 
+                         HorizontalAlignment="Center" VerticalAlignment="Center"  Text="{Binding HSeasonScore4,Mode=TwoWay }"  Visibility="{Binding HSeasonScoreVisible4,Mode=TwoWay}"/>
+
+                        <dxe:ComboBoxEdit  Grid.Row="10" Grid.Column="3" x:Name="com_techStats4" HorizontalAlignment="Center" VerticalAlignment="Center" Width="120" FontSize="16"
+                          ItemsSource="{Binding Path=TechStats4,Mode=TwoWay}"
+                          SelectedItem="{Binding Path=SelectTechStats4,Mode=TwoWay}" Visibility="{Binding TechStatsVisible4,Mode=TwoWay}">
+                        </dxe:ComboBoxEdit>
+                        <dxe:TextEdit Grid.Row="10" Grid.Column="4"   Width="110" 
+                         FontSize="16"   HorizontalContentAlignment="Center" 
+                         HorizontalAlignment="Center" VerticalAlignment="Center"  Text="{Binding AScore4,Mode=TwoWay }" Visibility="{Binding AScoreVisible4,Mode=TwoWay}" />
+                        <dxe:TextEdit Grid.Row="10" Grid.Column="5"   Width="110" 
+                         FontSize="16"   HorizontalContentAlignment="Center" 
+                         HorizontalAlignment="Center" VerticalAlignment="Center"  Text="{Binding ASeasonScore4,Mode=TwoWay }" Visibility="{Binding ASeasonScoreVisible4,Mode=TwoWay}" />
+
+
+                        <!--第六项-->
+
+                        <dxe:CheckEdit Grid.Row="11" HorizontalAlignment="Center" IsChecked="{Binding IsHeight5}" Visibility="{Binding IsCheckVisible5,Mode=TwoWay}"/>
+                        <dxe:TextEdit Grid.Row="11" Grid.Column="1"   Width="110" 
+                         FontSize="16"   HorizontalContentAlignment="Center" 
+                         HorizontalAlignment="Center" VerticalAlignment="Center"  Text="{Binding HScore5,Mode=TwoWay }" Visibility="{Binding HScoreVisible5,Mode=TwoWay}"/>
+                        <dxe:TextEdit Grid.Row="11" Grid.Column="2"   Width="110" 
+                         FontSize="16"   HorizontalContentAlignment="Center" 
+                         HorizontalAlignment="Center" VerticalAlignment="Center"  Text="{Binding HSeasonScore5,Mode=TwoWay }"  Visibility="{Binding HSeasonScoreVisible5,Mode=TwoWay}"/>
+
+                        <dxe:ComboBoxEdit  Grid.Row="11" Grid.Column="3" x:Name="com_techStats5" HorizontalAlignment="Center" VerticalAlignment="Center" Width="120" FontSize="16"
+                          ItemsSource="{Binding Path=TechStats5,Mode=TwoWay}"
+                          SelectedItem="{Binding Path=SelectTechStats5,Mode=TwoWay}" Visibility="{Binding TechStatsVisible5,Mode=TwoWay}">
+                        </dxe:ComboBoxEdit>
+                        <dxe:TextEdit Grid.Row="11" Grid.Column="4"   Width="110" 
+                         FontSize="16"   HorizontalContentAlignment="Center" 
+                         HorizontalAlignment="Center" VerticalAlignment="Center"  Text="{Binding AScore5,Mode=TwoWay }"  Visibility="{Binding AScoreVisible5,Mode=TwoWay}"/>
+                        <dxe:TextEdit Grid.Row="11" Grid.Column="5"   Width="110" 
+                         FontSize="16"   HorizontalContentAlignment="Center" 
+                         HorizontalAlignment="Center" VerticalAlignment="Center"  Text="{Binding ASeasonScore5,Mode=TwoWay }" Visibility="{Binding ASeasonScoreVisible5,Mode=TwoWay}" />
+
+
+                        <!--第七项-->
+
+                        <dxe:CheckEdit Grid.Row="12" HorizontalAlignment="Center" IsChecked="{Binding IsHeight6}" Visibility="{Binding IsCheckVisible6,Mode=TwoWay}"/>
+                        <dxe:TextEdit Grid.Row="12" Grid.Column="1"   Width="110" 
+                         FontSize="16"   HorizontalContentAlignment="Center" 
+                         HorizontalAlignment="Center" VerticalAlignment="Center"  Text="{Binding HScore6,Mode=TwoWay }" Visibility="{Binding HScoreVisible6,Mode=TwoWay}" />
+                        <dxe:TextEdit Grid.Row="12" Grid.Column="2"   Width="110" 
+                         FontSize="16"   HorizontalContentAlignment="Center" 
+                         HorizontalAlignment="Center" VerticalAlignment="Center"  Text="{Binding HSeasonScore6,Mode=TwoWay }"  Visibility="{Binding HSeasonScoreVisible6,Mode=TwoWay}"/>
+
+                        <dxe:ComboBoxEdit  Grid.Row="12" Grid.Column="3" x:Name="com_techStats6" HorizontalAlignment="Center" VerticalAlignment="Center" Width="120" FontSize="16"
+                          ItemsSource="{Binding Path=TechStats6,Mode=TwoWay}"
+                          SelectedItem="{Binding Path=SelectTechStats6,Mode=TwoWay}" Visibility="{Binding TechStatsVisible6,Mode=TwoWay}" >
+                        </dxe:ComboBoxEdit>
+                        <dxe:TextEdit Grid.Row="12" Grid.Column="4"   Width="110" 
+                         FontSize="16"   HorizontalContentAlignment="Center" 
+                         HorizontalAlignment="Center" VerticalAlignment="Center"  Text="{Binding AScore6,Mode=TwoWay }" Visibility="{Binding AScoreVisible6,Mode=TwoWay}"/>
+                        <dxe:TextEdit Grid.Row="12" Grid.Column="5"   Width="110" 
+                         FontSize="16"   HorizontalContentAlignment="Center" 
+                         HorizontalAlignment="Center" VerticalAlignment="Center"  Text="{Binding ASeasonScore6,Mode=TwoWay }" Visibility="{Binding ASeasonScoreVisible6,Mode=TwoWay}"/>
+                    </Grid>
+                </WrapPanel>
+            </Grid>
+
+        </ScrollViewer>
+
+    </Grid>
+</UserControl>

VIZ.MIGU.CBA.Module/PlayerComPareTask/View/PlayerComPareViewTask.xaml.cs

+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Windows;
+using System.Windows.Controls;
+using System.Windows.Data;
+using System.Windows.Documents;
+using System.Windows.Input;
+using System.Windows.Media;
+using System.Windows.Media.Imaging;
+using System.Windows.Navigation;
+using System.Windows.Shapes;
+using VIZ.Framework.Core;
+using VIZ.Package.Domain;
+using VIZ.Package.Module;
+using VIZ.Package.Service;
+using VIZ.Package.Storage;
+
+namespace VIZ.TVP.CBA.Module
+{
+    /// <summary>
+    /// Interaction logic for PlayerComPareViewTask.xaml
+    /// </summary>
+    public partial class PlayerComPareViewTask : UserControl,IPluginView
+    {
+        public PlayerComPareViewModelTask vm = new PlayerComPareViewModelTask();
+
+        /// <summary>
+        /// 操作日志服务
+        /// </summary>
+        private RecordLogService recordLogService = new RecordLogService();
+
+        public PlayerComPareViewTask()
+        {
+            InitializeComponent();
+
+            PlayerComPareViewModelTask.PlayerCompareViewModelTaskInstance.Add(vm);
+            WPFHelper.BindingViewModel(this, vm);
+
+
+
+            task_Start.IsEnabled = true;
+            task_Stop.IsEnabled = false;
+            task_continue.IsEnabled = false;
+
+            this.Loaded += NewPlayerComPareView_Loaded;
+            this.IsVisibleChanged += NewPlayerComPareView_IsVisibleChanged;
+
+        }
+
+        private void NewPlayerComPareView_IsVisibleChanged(object sender, DependencyPropertyChangedEventArgs e)
+        {
+            if (!string.IsNullOrEmpty(vm.ScheduleID) && !string.IsNullOrEmpty(vm.Matchtypeid))
+            {
+                if (e.NewValue != null && Convert.ToBoolean(e.NewValue))
+                {
+                    vm.SetCompareData();
+                }
+
+            }
+        }
+
+        private void NewPlayerComPareView_Loaded(object sender, RoutedEventArgs e)
+        {
+            var service = ApplicationDomainEx.ServiceManager.GetService<IPluginService>(ViewServiceKeys.PLUGIN_SERVICE);
+            if (service == null)
+                return;
+            vm.page = service.GetPageModelFromView(this);
+        }
+
+        public void Dispose()
+        {
+
+        }
+
+        public void PreviewContinue(ConnModel conn)
+        {
+
+        }
+
+        public void PreviewIn(ConnModel conn)
+        {
+            this.recordLogService.AppendLog(ApplicationConstants.APPLICATION_GROUP_NAME, RecordLogOperate.Operate, RecordLogTrigger.Human, RecordLogConstants.OPERATE_PREVIEW_PLAY);
+            if (conn.IsConnected)
+            {
+                conn.EndpointManager.Send(String.Format(VizEngineCommands.SCRIPT_INVOKE, "dqyData", vm.CombinePlayerCommand()));
+            }
+        }
+
+        public void PreviewOut(ConnModel conn)
+        {
+            //if(conn.IsConnected)
+            // {
+            //     conn.EndpointManager.Send(VizEngineCommands.STAGE_CONTINUE);
+            // }
+        }
+
+        public void TakeContinue(ConnModel conns)
+        {
+
+        }
+
+        public void TakeOut(ConnModel conns)
+        {
+            this.recordLogService.AppendLog(ApplicationConstants.APPLICATION_GROUP_NAME, RecordLogOperate.Operate, RecordLogTrigger.Human, RecordLogConstants.OPERATE_TAKE_OUT);
+            if (conns.IsConnected)
+            {
+                conns.EndpointManager.Send(VizEngineCommands.STAGE_CONTINUE);
+            }
+        }
+
+        public void TakeUpdate(ConnModel conns)
+        {
+            this.recordLogService.AppendLog(ApplicationConstants.APPLICATION_GROUP_NAME, RecordLogOperate.Operate, RecordLogTrigger.Human, RecordLogConstants.OPERATE_TAKE_UPDATE);
+            if (conns.IsConnected)
+            {
+                conns.EndpointManager.Send(String.Format(VizEngineCommands.SCRIPT_INVOKE, "dqyData", vm.CombinePlayerCommand()));
+            }
+        }
+
+        public void TakIn(ConnModel conns)
+        {
+            this.recordLogService.AppendLog(ApplicationConstants.APPLICATION_GROUP_NAME, RecordLogOperate.Operate, RecordLogTrigger.Human, RecordLogConstants.OPERATE_TAKE_TAKE);
+            if (conns.IsConnected)
+            {
+                conns.EndpointManager.Send(String.Format(VizEngineCommands.SCRIPT_INVOKE, "dqyData", vm.CombinePlayerCommand()));
+            }
+        }
+
+
+
+        /// <summary>
+        /// 注册任务
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        private void PlayerComPareView_Init()
+        {
+            if (task != null)
+                return;
+
+            task = new PackageTaskModel(this);
+            task.PreviewUpdateAction = OnPreviewUpdate;
+            task.TakeUpdateAction = OnTakeUpdate;
+
+            task.IsPreviewEnabled = true;
+            task.IsTakeEnabled = true;
+            task.IsRunning = true;
+
+            task.Name = "球员对比";
+
+
+            service = ApplicationDomainEx.ServiceManager.GetService<IPackageTaskService>(ViewServiceKeys.PACKAGE_TASK_SERVICE);
+            if (service == null)
+                return;
+
+            service.Register(task);
+
+        }
+
+
+        /// <summary>
+        /// 任务模型
+        /// </summary>
+        public PackageTaskModel task;
+
+        IPackageTaskService service;
+
+        private void OnPreviewUpdate(ConnModel conn)
+        {
+            if (conn.IsConnected)
+            {
+                vm.BtnCmd();
+                //task.CanExecute = vm.flag;
+                //SCRIPT_INVOKE
+                if (vm.onAirDataModel != null)
+                {
+                    conn.EndpointManager.Send(String.Format(VizEngineCommands.SCRIPT_INVOKE, "dqyData", vm.CombinePlayerCommand()));
+                }
+
+            }
+        }
+
+        private void OnTakeUpdate(ConnModel conn)
+        {
+            if (conn.IsConnected)
+            {
+                vm.BtnCmd();
+
+                if (vm.onAirDataModel != null)
+                {
+                    conn.EndpointManager.Send(String.Format(VizEngineCommands.SCRIPT_INVOKE, "dqyData", vm.CombinePlayerCommand()));
+                }
+                //SCRIPT_INVOKE
+
+            }
+        }
+
+        private void task_Start_Click(object sender, RoutedEventArgs e)
+        {
+            PlayerComPareView_Init();
+            task_Start.IsEnabled = false;
+            task_Stop.IsEnabled = true;
+            task_continue.IsEnabled = true;
+        }
+
+        private void task_continue_Click(object sender, RoutedEventArgs e)
+        {
+            if (task.IsRunning)
+            {
+                task.IsRunning = false;
+                task_continue.Content = "任务继续";
+            }
+            else
+            {
+                task.IsRunning = true;
+                task_continue.Content = "任务暂停";
+            }
+            task_Start.IsEnabled = false;
+            task_Stop.IsEnabled = true;
+        }
+
+        private void task_Stop_Click(object sender, RoutedEventArgs e)
+        {
+            service.Cancel(task);
+
+            task = null;
+            task_Start.IsEnabled = true;
+            task_continue.Content = "任务暂停";
+            task_continue.IsEnabled = false;
+            task_Stop.IsEnabled = false;
+        }
+
+        public void PageOpend(ConnModel conn, PageModel page)
+        {
+            if (conn.IsConnected)
+            {
+                conn.EndpointManager.Send(String.Format(VizEngineCommands.SCRIPT_INVOKE, "dqyData", vm.CombinePlayerCommand()));
+            }
+        }
+
+        public void PreviewUpdate(ConnModel conn)
+        {
+            this.recordLogService.AppendLog(ApplicationConstants.APPLICATION_GROUP_NAME, RecordLogOperate.Operate, RecordLogTrigger.Human, RecordLogConstants.OPERATE_PREVIEW_UPDATE);
+            if (conn.IsConnected)
+            {
+                conn.EndpointManager.Send(String.Format(VizEngineCommands.SCRIPT_INVOKE, "dqyData", vm.CombinePlayerCommand()));
+            }
+        }
+    }
+}

VIZ.MIGU.CBA.Module/PlayerCompare/ViewModel/NewPlayerComPareViewModel.cs

@@ -15,7 +15,6 @@ using DevExpress.Data;
 using System.IO;
 using System.IO;
 using VIZ.Package.Domain;
 using VIZ.Package.Domain;
 using VIZ.Package.Module;
 using VIZ.Package.Module;
-using VIZ.TVP.CBA.Module.Message.ViewModel;
 using VIZ.Package.Service;
 using VIZ.Package.Service;
 using VIZ.Package.Storage;
 using VIZ.Package.Storage;
 
 

VIZ.MIGU.CBA.Module/SinglePlayer/ViewModel/NewSinglePlayerViewModel.cs

@@ -12,7 +12,6 @@ using VIZ.Framework.Core;
 using System.Windows.Media;
 using System.Windows.Media;
 using System.IO;
 using System.IO;
 using VIZ.Package.Domain;
 using VIZ.Package.Domain;
-using VIZ.TVP.CBA.Module.Message.ViewModel;
 using VIZ.Package.Service;
 using VIZ.Package.Service;
 using VIZ.Package.Storage;
 using VIZ.Package.Storage;
 
 

VIZ.MIGU.CBA.Module/TeamStandings/View/TeamStandingView.xaml

@@ -10,6 +10,9 @@
                       xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
                       xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
                       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"
+                      xmlns:common="clr-namespace:VIZ.Package.Common;assembly=VIZ.Package.Common"
+                      xmlns:dxb="http://schemas.devexpress.com/winfx/2008/xaml/bars"
+                      x:Name="uc"
              mc:Ignorable="d"
              mc:Ignorable="d"
              d:DesignHeight="800" d:DesignWidth="650">
              d:DesignHeight="800" d:DesignWidth="650">
     <UserControl.Resources>
     <UserControl.Resources>
@@ -139,12 +142,38 @@
                         </dxg:GridColumn>-->
                         </dxg:GridColumn>-->
                 <!--#endregion-->
                 <!--#endregion-->
                 <dxg:GridControl.View>
                 <dxg:GridControl.View>
-                    <dxg:TableView AutoWidth="True"  ShowGroupPanel="False" 
+                    <!--<dxg:TableView AutoWidth="True"  ShowGroupPanel="False" 
                                BorderThickness="0"  
                                BorderThickness="0"  
                                ShowFilterPanelMode="Never" 
                                ShowFilterPanelMode="Never" 
                                AllowColumnFiltering="False"
                                AllowColumnFiltering="False"
                                AllowSorting="False"
                                AllowSorting="False"
                                IsColumnMenuEnabled="False"  >
                                IsColumnMenuEnabled="False"  >
+                    </dxg:TableView>-->
+                    <dxg:TableView IsColumnMenuEnabled="True"
+                                                       IsColumnChooserVisible="{Binding Path=IsColumnChooserVisible,Mode=TwoWay}"
+                                                       AllowEditing="True" ShowIndicator="False"  AutoWidth="True"
+                                                       NavigationStyle="Cell" ShowVerticalLines="False" ShowHorizontalLines="False"
+                                                       ShowGroupPanel="False" EditorShowMode="MouseDown"
+                                                       AllowDragDrop="True"
+                                                       AlternateRowBackground="#05ffffff"
+                                                       ShowBandsPanel="False"
+                                                       ShowTotalSummary="False"
+                                                       ShowFixedTotalSummary="False" 
+                                                       ShowDragDropHint="False" 
+                                                       AllowSorting="False" 
+                                                       AllowColumnFiltering="False"
+                                                       ShowTargetInfoInDragDropHint="false">
+
+                        <dxmvvm:Interaction.Behaviors>
+                            <dxmvvm:EventToCommand EventName="ShowGridMenu" Command="{Binding ElementName=uc, Path=DataContext.ShowGridMenuCommand}" PassEventArgsToCommand="True"></dxmvvm:EventToCommand>
+                        </dxmvvm:Interaction.Behaviors>
+
+                        <dxg:TableView.ColumnMenuCustomizations>
+                            <dxb:BarButtonItem Name="ShowColumnChooser" Content="显示列选择" 
+                                               Command="{Binding ElementName=uc,Path=DataContext.ColumnChoiceCommand}"
+                                               Tag="{x:Static Member=common:GridControlHelper.KEEP_MENU_TAG}"/>
+                        </dxg:TableView.ColumnMenuCustomizations>
+
                     </dxg:TableView>
                     </dxg:TableView>
                 </dxg:GridControl.View>
                 </dxg:GridControl.View>
             </dxg:GridControl>
             </dxg:GridControl>

VIZ.MIGU.CBA.Module/TeamStandings/ViewModel/TeamStandingViewModel.cs

@@ -6,10 +6,12 @@ using System.Text;
 using System.Threading.Tasks;
 using System.Threading.Tasks;
 using VIZ.Framework.Core;
 using VIZ.Framework.Core;
 using log4net;
 using log4net;
-using VIZ.TVP.CBA.Module.Message.ViewModel;
+
 using VIZ.Package.Service;
 using VIZ.Package.Service;
 using VIZ.Package.Domain;
 using VIZ.Package.Domain;
 using VIZ.Package.Storage;
 using VIZ.Package.Storage;
+using DevExpress.Xpf.Grid;
+using VIZ.Package.Common;
 
 
 namespace VIZ.TVP.CBA.Module
 namespace VIZ.TVP.CBA.Module
 {
 {
@@ -139,6 +141,9 @@ namespace VIZ.TVP.CBA.Module
             BtnCmdTeamStandingUp = new VCommand(BtnCmdTeamStandingUpData);
             BtnCmdTeamStandingUp = new VCommand(BtnCmdTeamStandingUpData);
             BtnCmdNextPage = new VCommand(BtnCmdNextPageData);
             BtnCmdNextPage = new VCommand(BtnCmdNextPageData);
             PromptCommand = new VCommand(PromptCmd);
             PromptCommand = new VCommand(PromptCmd);
+
+            ColumnChoiceCommand = new VCommand(ColumnChoice);
+            ShowGridMenuCommand = new VCommand<GridMenuEventArgs>(ShowGridMenu);
         }
         }
 
 
 
 
@@ -268,6 +273,59 @@ namespace VIZ.TVP.CBA.Module
             set { title = value;this.RaisePropertyChanged(nameof(Title)); }   
             set { title = value;this.RaisePropertyChanged(nameof(Title)); }   
         }
         }
 
 
+
+        #region IsColumnChooserVisible -- 是否显示列选择器
+
+        private bool isColumnChooserVisible;
+        /// <summary>
+        /// 是否显示列选择器
+        /// </summary>
+        public bool IsColumnChooserVisible
+        {
+            get { return isColumnChooserVisible; }
+            set { isColumnChooserVisible = value; this.RaisePropertyChanged(nameof(IsColumnChooserVisible)); }
+        }
+
+        #endregion
+
+
+        #region ColumnChoiceCommand -- 列选择命令
+
+        /// <summary>
+        /// 列选择命令
+        /// </summary>
+        public VCommand ColumnChoiceCommand { get; set; }
+
+        /// <summary>
+        /// 列选择
+        /// </summary>
+        private void ColumnChoice()
+        {
+            this.IsColumnChooserVisible = true;
+        }
+
+        #endregion
+
+
+        #region ShowGridMenuCommand -- 显示列命令
+
+        /// <summary>
+        /// 显示列命令
+        /// </summary>
+        public VCommand<GridMenuEventArgs> ShowGridMenuCommand { get; set; }
+
+        /// <summary>
+        /// 显示列
+        /// </summary>
+        /// <param name="e">事件参数</param>
+        private void ShowGridMenu(GridMenuEventArgs e)
+        {
+            GridControlHelper.RemoveAllDefaultMenuItem(e);
+        }
+
+        #endregion
+
+
         #region 打开更新数据时间日志
         #region 打开更新数据时间日志
         /// <summary>
         /// <summary>
         /// 打开数据更新日志
         /// 打开数据更新日志

VIZ.MIGU.CBA.Module/TeamStats/ViewModel/NewTeamStatsViewModel.cs

@@ -14,7 +14,7 @@ using VIZ.Framework.Core;
 using VIZ.Package.Domain;
 using VIZ.Package.Domain;
 using VIZ.Package.Service;
 using VIZ.Package.Service;
 using VIZ.Package.Storage;
 using VIZ.Package.Storage;
-using VIZ.TVP.CBA.Module.Message.ViewModel;
+
 
 
 namespace VIZ.TVP.CBA.Module
 namespace VIZ.TVP.CBA.Module
 {
 {

VIZ.MIGU.CBA.Module/TeamStatsTask/TeamStatsTaskPlugin.cs

+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using VIZ.Package.Domain;
+
+namespace VIZ.TVP.CBA.Module
+{
+    public class TeamStatsTaskPlugin : IPluginLifeCycle
+    {
+        /// <summary>
+        /// 插件ID
+        /// </summary>
+        /// <remarks>
+        /// 插件ID不能包含点号
+        /// </remarks>
+        public const string PLUGIN_ID = "TeamStatsTaskView";
+
+        /// <summary>
+        /// 插件显示名称
+        /// </summary>
+        public const string PLUGIN_NAME = "球队数据对比(任务测试)";
+
+        public void Dispose()
+        {
+
+        }
+
+        public void Initialize()
+        {
+
+        }
+
+        public PluginInfo Register()
+        {
+            PluginInfo info = new PluginInfo();
+            info.Group = PluginConstant.GroupName;
+            info.ID = PLUGIN_ID;
+            info.Name = PLUGIN_NAME;
+            info.PluginType = PluginType.Page;
+            info.ViewType = typeof(TeamStatsTaskView);
+
+            //info.SettingViewType = typeof(DayMatchUI);
+
+            return info;
+        }
+    }
+}

VIZ.MIGU.CBA.Module/TeamStatsTask/View/TeamStatsTaskView.xaml

+<UserControl x:Class="VIZ.TVP.CBA.Module.TeamStatsTaskView"
+     xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+                      xmlns:dx="http://schemas.devexpress.com/winfx/2008/xaml/core"
+                      xmlns:dxe="http://schemas.devexpress.com/winfx/2008/xaml/editors"
+                      xmlns:dxg="http://schemas.devexpress.com/winfx/2008/xaml/grid"
+                      xmlns:dxmvvm="http://schemas.devexpress.com/winfx/2008/xaml/mvvm"
+                      xmlns:dxrudex="http://schemas.devexpress.com/winfx/2008/xaml/reports/userdesignerextensions"
+                      xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
+                      xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+                      xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
+                      xmlns:core="clr-namespace:VIZ.Framework.Core;assembly=VIZ.Framework.Core"
+                      xmlns:storage="clr-namespace:VIZ.TVP.CBA.Module">
+    <Grid>
+        <ScrollViewer HorizontalScrollBarVisibility="Disabled"
+                      VerticalScrollBarVisibility="Auto"
+                      Name="PART_Options"
+                      DockPanel.Dock="Right"
+                      dx:ScrollBarExtensions.ScrollBarMode="TouchOverlap"
+                      Focusable="False">
+            <Grid>
+                <Grid.ColumnDefinitions>
+                    <ColumnDefinition Width="197*"/>
+                </Grid.ColumnDefinitions>
+
+                <Grid.RowDefinitions>
+                    <RowDefinition Height="60"/>
+                    <RowDefinition Height="40"/>
+                    <RowDefinition Height="*"/>
+                </Grid.RowDefinitions>
+
+                <WrapPanel Grid.Row="1"   VerticalAlignment="Center" HorizontalAlignment="Left" Width="760" >
+                    <Grid>
+                        <Grid.ColumnDefinitions>
+                            <ColumnDefinition Width="75"/>
+                            <ColumnDefinition Width="0"/>
+                            <ColumnDefinition Width="120"/>
+                            <ColumnDefinition Width="40"/>
+                            <ColumnDefinition Width="120"/>
+                            <ColumnDefinition Width="50"/>
+                            <ColumnDefinition Width="100"/>
+                        </Grid.ColumnDefinitions>
+
+                        <TextBlock Grid.Column="0" Text="球队："  FontSize="16" VerticalAlignment="Center" HorizontalAlignment="Center"/>
+                        <!--<dxe:TextEdit  Grid.Column="1" Width="120"  FontSize="16"   HorizontalContentAlignment="Center" 
+                          VerticalAlignment="Center"  Text="{Binding Title,Mode=TwoWay }"   />-->
+
+                        <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="16"  HorizontalAlignment="Center" VerticalAlignment="Center"/>
+                        <dxe:TextEdit Text="{Binding AwayTeam}"  Grid.Column="4" Width="120"  FontSize="16"  HorizontalAlignment="Center" VerticalAlignment="Center"/>
+
+
+                        <TextBlock  Grid.Column="5" TextBlock.TextAlignment="Center" Text="项数:" Width="45"  FontSize="16"   HorizontalAlignment="Right" VerticalAlignment="Center" />
+                        <dxe:ComboBoxEdit  Grid.Column="6" x:Name="com_matchStatsId"  HorizontalAlignment="Center" VerticalAlignment="Center" Width="80" FontSize="16" 
+                          ItemsSource="{Binding Path=MatchStatsIds,Mode=TwoWay}"
+                          SelectedItem="{Binding Path=MatchStatsId,Mode=TwoWay}" >
+                        </dxe:ComboBoxEdit>
+
+                    </Grid>
+                </WrapPanel>
+
+                <WrapPanel   VerticalAlignment="Center" HorizontalAlignment="Left"  Width="760" Grid.ColumnSpan="2">
+                    <Grid>
+                        <Grid.ColumnDefinitions>
+                            <ColumnDefinition Width="75"/>
+                            <ColumnDefinition Width="175"/>
+                            <ColumnDefinition Width="130"/>
+                            <ColumnDefinition Width="130"/>
+                            <ColumnDefinition Width="110"/>
+                            <ColumnDefinition Width="130"/>
+
+                        </Grid.ColumnDefinitions>
+
+                        <TextBlock Grid.Column="0" Text="标题："  FontSize="16" VerticalAlignment="Center" HorizontalAlignment="Center"/>
+                        <dxe:TextEdit  Grid.Column="1" Width="170"  FontSize="16"  HorizontalAlignment="Left"  HorizontalContentAlignment="Left" 
+                          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_continue" Click="task_continue_Click" Grid.Column="3" FontSize="14" Height="30" Width="90"/>
+
+                        <Button  Content="任务停止"  Name="task_Stop" Click="task_Stop_Click" Grid.Column="4" FontSize="14" Height="30" Width="90"/>
+
+                        <!--<Button Content="刷新" Command="{Binding BtnCommand}" HorizontalContentAlignment="Center"  
+                              Grid.Column="5" Width="95" Height="30"  FontSize="14"/>-->
+
+
+
+
+                        <WrapPanel Grid.Row="0" Grid.Column="5" HorizontalAlignment="Center" VerticalAlignment="Center">
+
+                            <Grid>
+                                <Grid.ColumnDefinitions>
+                                    <ColumnDefinition Width="100"/>
+                                    <ColumnDefinition Width="30"/>
+                                </Grid.ColumnDefinitions>
+
+                                <dx:SimpleButton  Grid.Row="0" Grid.Column="0" Content="刷新"  Glyph='/VIZ.TVP.CBA.Module;component/Image/CBAPng/refresh2525.png' FontSize="16" 
+                                          Command="{Binding BtnCommand}" HorizontalContentAlignment="Center" Width="90" Height="30" />
+
+                                <dx:SimpleButton  Grid.Row="0" Grid.Column="1"  Glyph='/VIZ.TVP.CBA.Module;component/Image/CBAPng/Prompt2525.png' FontSize="16" 
+                                          Command="{Binding PromptCommand}" HorizontalContentAlignment="Center"  Width="30" Height="30"  />
+                            </Grid>
+                        </WrapPanel>
+
+
+                    </Grid>
+                </WrapPanel>
+
+                <WrapPanel Grid.Row="2" HorizontalAlignment="Left" VerticalAlignment="Center"  Width="760" Grid.ColumnSpan="2">
+
+                    <Grid>
+                        <Grid.RowDefinitions>
+                            <RowDefinition Height="34"/>
+                            <RowDefinition Height="34"/>
+                            <RowDefinition Height="34"/>
+                            <RowDefinition Height="34"/>
+                            <RowDefinition Height="34"/>
+                            <RowDefinition Height="34"/>
+                            <RowDefinition Height="34"/>
+                            <RowDefinition Height="34"/>
+                        </Grid.RowDefinitions>
+                        <Grid.ColumnDefinitions>
+                            <ColumnDefinition Width="80"/>
+                            <ColumnDefinition Width="115"/>
+                            <ColumnDefinition Width="116"/>
+                            <ColumnDefinition Width="127"/>
+                            <ColumnDefinition Width="115"/>
+                            <ColumnDefinition Width="115"/>
+                        </Grid.ColumnDefinitions>
+
+                        <TextBlock Grid.Row="0" Grid.Column="1" Text="主队本场" FontSize="12" HorizontalAlignment="Center" VerticalAlignment="Center"/>
+                        <TextBlock Grid.Row="0" Grid.Column="2" Text="主队赛季" FontSize="12" HorizontalAlignment="Center" VerticalAlignment="Center"/>
+
+                        <TextBlock Grid.Row="0" Grid.Column="4" Text="客队本场" FontSize="12" HorizontalAlignment="Center" VerticalAlignment="Center"/>
+                        <TextBlock Grid.Row="0" Grid.Column="5" Text="客队赛季" FontSize="12" HorizontalAlignment="Center" VerticalAlignment="Center"/>
+
+                        <!--第一项-->
+                        <dxe:CheckEdit Grid.Row="1" HorizontalAlignment="Center" IsChecked="{Binding IsHeight}"  Visibility="{Binding IsCheckVisible,Mode=TwoWay}"/>
+                        <dxe:TextEdit Grid.Row="1" Grid.Column="1"   Width="110" 
+                         FontSize="16"   HorizontalContentAlignment="Center" 
+                         HorizontalAlignment="Center" VerticalAlignment="Center"  Text="{Binding HomeScore,Mode=TwoWay }"  Visibility="{Binding HScoreVisible,Mode=TwoWay}"/>
+                        <dxe:TextEdit Grid.Row="1" Grid.Column="2"   Width="110" 
+                         FontSize="16"   HorizontalContentAlignment="Center" 
+                         HorizontalAlignment="Center" VerticalAlignment="Center"  Text="{Binding HSeasonScore,Mode=TwoWay }"  Visibility="{Binding HSeasonScoreVisible,Mode=TwoWay}"/>
+                        <dxe:ComboBoxEdit  Grid.Row="1" Grid.Column="3" x:Name="com_techStats" HorizontalAlignment="Center" VerticalAlignment="Center" Width="120" FontSize="16"
+                          ItemsSource="{Binding Path=TechStats,Mode=TwoWay}"
+                          SelectedItem="{Binding Path=SelectTechStats,Mode=TwoWay}" Visibility="{Binding TechStatsVisible,Mode=TwoWay}">
+                        </dxe:ComboBoxEdit>
+                        <dxe:TextEdit Grid.Row="1" Grid.Column="4"   Width="110" 
+                         FontSize="16"   HorizontalContentAlignment="Center" 
+                         HorizontalAlignment="Center" VerticalAlignment="Center"  Text="{Binding AwayScore,Mode=TwoWay }" Visibility="{Binding AScoreVisible,Mode=TwoWay}" />
+                        <dxe:TextEdit Grid.Row="1" Grid.Column="5"   Width="110" 
+                         FontSize="16"   HorizontalContentAlignment="Center" 
+                         HorizontalAlignment="Center" VerticalAlignment="Center"  Text="{Binding ASeasonScore,Mode=TwoWay }" Visibility="{Binding ASeasonScoreVisible}" />
+
+                        <!--第二项-->
+                        <dxe:CheckEdit Grid.Row="2" HorizontalAlignment="Center" IsChecked="{Binding IsHeight1}"  Visibility="{Binding IsCheckVisible1,Mode=TwoWay}"/>
+                        <dxe:TextEdit Grid.Row="2" Grid.Column="1"   Width="110" 
+                         FontSize="16"   HorizontalContentAlignment="Center" 
+                         HorizontalAlignment="Center" VerticalAlignment="Center"  Text="{Binding HomeScore1,Mode=TwoWay }"  Visibility="{Binding HScoreVisible1,Mode=TwoWay}"/>
+                        <dxe:TextEdit Grid.Row="2" Grid.Column="2"   Width="110" 
+                         FontSize="16"   HorizontalContentAlignment="Center" 
+                         HorizontalAlignment="Center" VerticalAlignment="Center"  Text="{Binding HSeasonScore1,Mode=TwoWay }"  Visibility="{Binding HSeasonScoreVisible1,Mode=TwoWay}"/>
+                        <dxe:ComboBoxEdit  Grid.Row="2" Grid.Column="3" x:Name="com_techStats1" HorizontalAlignment="Center" VerticalAlignment="Center" Width="120" FontSize="16"
+                          ItemsSource="{Binding Path=TechStats1,Mode=TwoWay}"
+                          SelectedItem="{Binding Path=SelectTechStats1,Mode=TwoWay}" Visibility="{Binding TechStatsVisible,Mode=TwoWay}">
+                        </dxe:ComboBoxEdit>
+                        <dxe:TextEdit Grid.Row="2" Grid.Column="4"   Width="110" 
+                         FontSize="16"   HorizontalContentAlignment="Center" 
+                         HorizontalAlignment="Center" VerticalAlignment="Center"  Text="{Binding AwayScore1,Mode=TwoWay }" Visibility="{Binding AScoreVisible1,Mode=TwoWay}" />
+                        <dxe:TextEdit Grid.Row="2" Grid.Column="5"   Width="110" 
+                         FontSize="16"   HorizontalContentAlignment="Center" 
+                         HorizontalAlignment="Center" VerticalAlignment="Center"  Text="{Binding ASeasonScore1,Mode=TwoWay }" Visibility="{Binding ASeasonScoreVisible1}" />
+
+
+                        <!--第三项-->
+                        <dxe:CheckEdit Grid.Row="3" HorizontalAlignment="Center" IsChecked="{Binding IsHeight2}"  Visibility="{Binding IsCheckVisible2,Mode=TwoWay}"/>
+
+                        <dxe:TextEdit Grid.Row="3" Grid.Column="1"   Width="110" 
+                         FontSize="16"   HorizontalContentAlignment="Center" 
+                         HorizontalAlignment="Center" VerticalAlignment="Center"  Text="{Binding HomeScore2,Mode=TwoWay }"  Visibility="{Binding HScoreVisible12,Mode=TwoWay}"/>
+
+                        <dxe:TextEdit Grid.Row="3" Grid.Column="2"   Width="110" 
+                         FontSize="16"   HorizontalContentAlignment="Center" 
+                         HorizontalAlignment="Center" VerticalAlignment="Center"  Text="{Binding HSeasonScore2,Mode=TwoWay }"  Visibility="{Binding HSeasonScoreVisible12,Mode=TwoWay}"/>
+
+                        <dxe:ComboBoxEdit  Grid.Row="3" Grid.Column="3" x:Name="com_techStats2" HorizontalAlignment="Center" VerticalAlignment="Center" Width="120" FontSize="16"
+                          ItemsSource="{Binding Path=TechStats2,Mode=TwoWay}"
+                          SelectedItem="{Binding Path=SelectTechStats2,Mode=TwoWay}" Visibility="{Binding TechStatsVisible2,Mode=TwoWay}">
+                        </dxe:ComboBoxEdit>
+
+                        <dxe:TextEdit Grid.Row="3" Grid.Column="4"   Width="110" 
+                         FontSize="16"   HorizontalContentAlignment="Center" 
+                         HorizontalAlignment="Center" VerticalAlignment="Center"  Text="{Binding AwayScore2,Mode=TwoWay }" Visibility="{Binding AScoreVisible2,Mode=TwoWay}" />
+
+                        <dxe:TextEdit Grid.Row="3" Grid.Column="5"   Width="110" 
+                         FontSize="16"   HorizontalContentAlignment="Center" 
+                         HorizontalAlignment="Center" VerticalAlignment="Center"  Text="{Binding ASeasonScore2,Mode=TwoWay }" Visibility="{Binding ASeasonScoreVisible2}" />
+
+
+
+
+                        <!--第四项-->
+                        <dxe:CheckEdit Grid.Row="4" HorizontalAlignment="Center" IsChecked="{Binding IsHeight3}"  Visibility="{Binding IsCheckVisible3,Mode=TwoWay}"/>
+
+                        <dxe:TextEdit Grid.Row="4" Grid.Column="1"   Width="110" 
+                         FontSize="16"   HorizontalContentAlignment="Center" 
+                         HorizontalAlignment="Center" VerticalAlignment="Center"  Text="{Binding HomeScore3,Mode=TwoWay }"  Visibility="{Binding HScoreVisible13,Mode=TwoWay}"/>
+
+                        <dxe:TextEdit Grid.Row="4" Grid.Column="2"   Width="110" 
+                         FontSize="16"   HorizontalContentAlignment="Center" 
+                         HorizontalAlignment="Center" VerticalAlignment="Center"  Text="{Binding HSeasonScore3,Mode=TwoWay }"  Visibility="{Binding HSeasonScoreVisible13,Mode=TwoWay}"/>
+
+                        <dxe:ComboBoxEdit  Grid.Row="4" Grid.Column="3" x:Name="com_techStats3" HorizontalAlignment="Center" VerticalAlignment="Center" Width="120" FontSize="16"
+                          ItemsSource="{Binding Path=TechStats3,Mode=TwoWay}"
+                          SelectedItem="{Binding Path=SelectTechStats3,Mode=TwoWay}" Visibility="{Binding TechStatsVisible3,Mode=TwoWay}">
+                        </dxe:ComboBoxEdit>
+
+                        <dxe:TextEdit Grid.Row="4" Grid.Column="4"   Width="110" 
+                         FontSize="16"   HorizontalContentAlignment="Center" 
+                         HorizontalAlignment="Center" VerticalAlignment="Center"  Text="{Binding AwayScore3,Mode=TwoWay }" Visibility="{Binding AScoreVisible3,Mode=TwoWay}" />
+
+                        <dxe:TextEdit Grid.Row="4" Grid.Column="5"   Width="110" 
+                         FontSize="16"   HorizontalContentAlignment="Center" 
+                         HorizontalAlignment="Center" VerticalAlignment="Center"  Text="{Binding ASeasonScore3,Mode=TwoWay }" Visibility="{Binding ASeasonScoreVisible3}" />
+
+
+
+                        <!--第五项-->
+                        <dxe:CheckEdit Grid.Row="5" HorizontalAlignment="Center" IsChecked="{Binding IsHeight4}"  Visibility="{Binding IsCheckVisible4,Mode=TwoWay}"/>
+
+                        <dxe:TextEdit Grid.Row="5" Grid.Column="1"   Width="110" 
+                         FontSize="16"   HorizontalContentAlignment="Center" 
+                         HorizontalAlignment="Center" VerticalAlignment="Center"  Text="{Binding HomeScore4,Mode=TwoWay }"  Visibility="{Binding HScoreVisible14,Mode=TwoWay}"/>
+
+                        <dxe:TextEdit Grid.Row="5" Grid.Column="2"   Width="110" 
+                         FontSize="16"   HorizontalContentAlignment="Center" 
+                         HorizontalAlignment="Center" VerticalAlignment="Center"  Text="{Binding HSeasonScore4,Mode=TwoWay }"  Visibility="{Binding HSeasonScoreVisible14,Mode=TwoWay}"/>
+
+                        <dxe:ComboBoxEdit  Grid.Row="5" Grid.Column="3" x:Name="com_techStats4" HorizontalAlignment="Center" VerticalAlignment="Center" Width="120" FontSize="16"
+                          ItemsSource="{Binding Path=TechStats4,Mode=TwoWay}"
+                          SelectedItem="{Binding Path=SelectTechStats4,Mode=TwoWay}" Visibility="{Binding TechStatsVisible4,Mode=TwoWay}">
+                        </dxe:ComboBoxEdit>
+
+                        <dxe:TextEdit Grid.Row="5" Grid.Column="4"   Width="110" 
+                         FontSize="16"   HorizontalContentAlignment="Center" 
+                         HorizontalAlignment="Center" VerticalAlignment="Center"  Text="{Binding AwayScore4,Mode=TwoWay }" Visibility="{Binding AScoreVisible4,Mode=TwoWay}" />
+
+                        <dxe:TextEdit Grid.Row="5" Grid.Column="5"   Width="110" 
+                         FontSize="16"   HorizontalContentAlignment="Center" 
+                         HorizontalAlignment="Center" VerticalAlignment="Center"  Text="{Binding ASeasonScore4,Mode=TwoWay }" Visibility="{Binding ASeasonScoreVisible4}" />
+
+
+
+                        <!--第六项-->
+                        <dxe:CheckEdit Grid.Row="6" HorizontalAlignment="Center" IsChecked="{Binding IsHeight5}"  Visibility="{Binding IsCheckVisible5,Mode=TwoWay}"/>
+
+                        <dxe:TextEdit Grid.Row="6" Grid.Column="1"   Width="110" 
+                         FontSize="16"   HorizontalContentAlignment="Center" 
+                         HorizontalAlignment="Center" VerticalAlignment="Center"  Text="{Binding HomeScore5,Mode=TwoWay }"  Visibility="{Binding HScoreVisible5,Mode=TwoWay}"/>
+
+                        <dxe:TextEdit Grid.Row="6" Grid.Column="2"   Width="110" 
+                         FontSize="16"   HorizontalContentAlignment="Center" 
+                         HorizontalAlignment="Center" VerticalAlignment="Center"  Text="{Binding HSeasonScore5,Mode=TwoWay }"  Visibility="{Binding HSeasonScoreVisible5,Mode=TwoWay}"/>
+
+                        <dxe:ComboBoxEdit  Grid.Row="6" Grid.Column="3" x:Name="com_techStats5" HorizontalAlignment="Center" VerticalAlignment="Center" Width="120" FontSize="16"
+                          ItemsSource="{Binding Path=TechStats5,Mode=TwoWay}"
+                          SelectedItem="{Binding Path=SelectTechStats5,Mode=TwoWay}" Visibility="{Binding TechStatsVisible5,Mode=TwoWay}">
+                        </dxe:ComboBoxEdit>
+
+                        <dxe:TextEdit Grid.Row="6" Grid.Column="4"   Width="110" 
+                         FontSize="16"   HorizontalContentAlignment="Center" 
+                         HorizontalAlignment="Center" VerticalAlignment="Center"  Text="{Binding AwayScore5,Mode=TwoWay }" Visibility="{Binding AScoreVisible5,Mode=TwoWay}" />
+
+                        <dxe:TextEdit Grid.Row="6" Grid.Column="5"   Width="110" 
+                         FontSize="16"   HorizontalContentAlignment="Center" 
+                         HorizontalAlignment="Center" VerticalAlignment="Center"  Text="{Binding ASeasonScore5,Mode=TwoWay }" Visibility="{Binding ASeasonScoreVisible5}" />
+
+
+                        <!--第七项-->
+                        <dxe:CheckEdit Grid.Row="7" HorizontalAlignment="Center" IsChecked="{Binding IsHeight6}"  Visibility="{Binding IsCheckVisible6,Mode=TwoWay}"/>
+
+                        <dxe:TextEdit Grid.Row="7" Grid.Column="1"   Width="110" 
+                         FontSize="16"   HorizontalContentAlignment="Center" 
+                         HorizontalAlignment="Center" VerticalAlignment="Center"  Text="{Binding HomeScore6,Mode=TwoWay }"  Visibility="{Binding HScoreVisible6,Mode=TwoWay}"/>
+
+                        <dxe:TextEdit Grid.Row="7" Grid.Column="2"   Width="110" 
+                         FontSize="16"   HorizontalContentAlignment="Center" 
+                         HorizontalAlignment="Center" VerticalAlignment="Center"  Text="{Binding HSeasonScore6,Mode=TwoWay }"  Visibility="{Binding HSeasonScoreVisible6,Mode=TwoWay}"/>
+
+                        <dxe:ComboBoxEdit  Grid.Row="7" Grid.Column="3" x:Name="com_techStats6" HorizontalAlignment="Center" VerticalAlignment="Center" Width="120" FontSize="16"
+                          ItemsSource="{Binding Path=TechStats6,Mode=TwoWay}"
+                          SelectedItem="{Binding Path=SelectTechStats6,Mode=TwoWay}" Visibility="{Binding TechStatsVisible6,Mode=TwoWay}">
+                        </dxe:ComboBoxEdit>
+
+                        <dxe:TextEdit Grid.Row="7" Grid.Column="4"   Width="110" 
+                         FontSize="16"   HorizontalContentAlignment="Center" 
+                         HorizontalAlignment="Center" VerticalAlignment="Center"  Text="{Binding AwayScore6,Mode=TwoWay }" Visibility="{Binding AScoreVisible6,Mode=TwoWay}" />
+
+                        <dxe:TextEdit Grid.Row="7" Grid.Column="5"   Width="110" 
+                         FontSize="16"   HorizontalContentAlignment="Center" 
+                         HorizontalAlignment="Center" VerticalAlignment="Center"  Text="{Binding ASeasonScore6,Mode=TwoWay }" Visibility="{Binding ASeasonScoreVisible6}" />
+
+                    </Grid>
+
+                </WrapPanel>
+            </Grid>
+        </ScrollViewer>
+
+    </Grid>
+</UserControl>
+

VIZ.MIGU.CBA.Module/TeamStatsTask/View/TeamStatsTaskView.xaml.cs

+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Windows;
+using System.Windows.Controls;
+using System.Windows.Data;
+using System.Windows.Documents;
+using System.Windows.Input;
+using System.Windows.Media;
+using System.Windows.Media.Imaging;
+using System.Windows.Navigation;
+using System.Windows.Shapes;
+using VIZ.Framework.Core;
+using VIZ.Package.Domain;
+using VIZ.Package.Module;
+using VIZ.Package.Service;
+using VIZ.Package.Storage;
+
+namespace VIZ.TVP.CBA.Module
+{
+    /// <summary>
+    /// Interaction logic for TeamStatsTaskView.xaml
+    /// </summary>
+    public partial class TeamStatsTaskView : UserControl, IPluginView
+    {
+        public TeamStatsTaskViewModel vm = new TeamStatsTaskViewModel();
+
+        /// <summary>
+        /// 操作日志服务
+        /// </summary>
+        private RecordLogService recordLogService = new RecordLogService();
+
+        public TeamStatsTaskView()
+        {
+            InitializeComponent();
+
+
+
+            TeamStatsTaskViewModel.TeamStatsTaskViewModelInstance.Add(vm);
+            WPFHelper.BindingViewModel(this, vm);
+
+
+
+            task_Start.IsEnabled = true;
+            task_Stop.IsEnabled = false;
+            task_continue.IsEnabled = false;
+
+            this.Loaded += NewTeamStatsView_Loaded;
+            this.IsVisibleChanged += NewTeamStatsView_IsVisibleChanged;
+
+
+        }
+
+        private void NewTeamStatsView_IsVisibleChanged(object sender, DependencyPropertyChangedEventArgs e)
+        {
+            if (!string.IsNullOrEmpty(vm.ScheduleID) && !string.IsNullOrEmpty(vm.Matchtypeid))
+            {
+                if (e.NewValue != null && Convert.ToBoolean(e.NewValue))
+                {
+                    vm.SetTeamData();
+                }
+            }
+        }
+
+        private void NewTeamStatsView_Loaded(object sender, RoutedEventArgs e)
+        {
+            var service = ApplicationDomainEx.ServiceManager.GetService<IPluginService>(ViewServiceKeys.PLUGIN_SERVICE);
+            if (service == null)
+                return;
+            vm.page = service.GetPageModelFromView(this);
+
+
+
+        }
+
+        public void Dispose()
+        {
+
+        }
+
+        public void PreviewContinue(ConnModel conn)
+        {
+
+        }
+
+        public void PreviewIn(ConnModel conn)
+        {
+            this.recordLogService.AppendLog(ApplicationConstants.APPLICATION_GROUP_NAME, RecordLogOperate.Operate, RecordLogTrigger.Human, RecordLogConstants.OPERATE_PREVIEW_PLAY);
+            if (conn.IsConnected)
+            {
+                conn.EndpointManager.Send(String.Format(VizEngineCommands.SCRIPT_INVOKE, "dqyData", vm.CombineTeamComData()));
+            }
+        }
+
+        public void PreviewOut(ConnModel conn)
+        {
+            //if(conn.IsConnected)
+            //{
+            //    conn.EndpointManager.Send(VizEngineCommands.STAGE_CONTINUE);
+            //}
+        }
+
+        public void TakeContinue(ConnModel conns)
+        {
+
+        }
+
+        public void TakeOut(ConnModel conns)
+        {
+            this.recordLogService.AppendLog(ApplicationConstants.APPLICATION_GROUP_NAME, RecordLogOperate.Operate, RecordLogTrigger.Human, RecordLogConstants.OPERATE_TAKE_OUT);
+            if (conns.IsConnected)
+            {
+                conns.EndpointManager.Send(VizEngineCommands.STAGE_CONTINUE);
+            }
+        }
+
+        public void TakeUpdate(ConnModel conns)
+        {
+
+            this.recordLogService.AppendLog(ApplicationConstants.APPLICATION_GROUP_NAME, RecordLogOperate.Operate, RecordLogTrigger.Human, RecordLogConstants.OPERATE_TAKE_UPDATE);
+
+            if (conns.IsConnected)
+            {
+                conns.EndpointManager.Send(string.Format(VizEngineCommands.SCRIPT_INVOKE, "dqyData", vm.CombineTeamComData()));
+            }
+        }
+
+        public void TakIn(ConnModel conns)
+        {
+            this.recordLogService.AppendLog(ApplicationConstants.APPLICATION_GROUP_NAME, RecordLogOperate.Operate, RecordLogTrigger.Human, RecordLogConstants.OPERATE_TAKE_TAKE);
+
+            if (conns.IsConnected)
+            {
+                conns.EndpointManager.Send(string.Format(VizEngineCommands.SCRIPT_INVOKE, "dqyData", vm.CombineTeamComData()));
+            }
+        }
+
+
+        private void OnPreviewUpdate(ConnModel conn)
+        {
+            if (conn.IsConnected)
+            {
+                vm.BtnCmd();
+                if (vm.onAirDataModel != null)
+                {
+                    conn.EndpointManager.Send(string.Format(VizEngineCommands.SCRIPT_INVOKE, "dqyData", vm.CombineTeamComData()));
+                }
+                //task.CanExecute = vm.flag;
+                //SCRIPT_INVOKE
+
+            }
+        }
+
+        private void OnTakeUpdate(ConnModel conn)
+        {
+            this.recordLogService.AppendLog(ApplicationConstants.APPLICATION_GROUP_NAME, RecordLogOperate.Operate, RecordLogTrigger.Human, RecordLogConstants.OPERATE_TAKE_UPDATE);
+            if (conn.IsConnected)
+            {
+                vm.BtnCmd();
+
+                if (vm.onAirDataModel != null)
+                {
+                    conn.EndpointManager.Send(string.Format(VizEngineCommands.SCRIPT_INVOKE, "dqyData", vm.CombineTeamComData()));
+                }
+                //SCRIPT_INVOKE
+
+            }
+        }
+
+
+
+        private void task_Start_Click(object sender, RoutedEventArgs e)
+        {
+            TeamStatsView_Init();
+            task_Start.IsEnabled = false;
+            task_Stop.IsEnabled = true;
+            task_continue.IsEnabled = true;
+        }
+
+        private void task_continue_Click(object sender, RoutedEventArgs e)
+        {
+            if (task.IsRunning)
+            {
+                task.IsRunning = false;
+                task_continue.Content = "任务继续";
+            }
+            else
+            {
+                task.IsRunning = true;
+                task_continue.Content = "任务暂停";
+            }
+            task_Start.IsEnabled = false;
+            task_Stop.IsEnabled = true;
+        }
+
+        private void task_Stop_Click(object sender, RoutedEventArgs e)
+        {
+            service.Cancel(task);
+
+            task = null;
+            task_Start.IsEnabled = true;
+            task_continue.Content = "任务暂停";
+            task_continue.IsEnabled = false;
+            task_Stop.IsEnabled = false;
+        }
+
+
+
+        /// <summary>
+        /// 任务模型
+        /// </summary>
+        public PackageTaskModel task;
+        /// <summary>
+        /// 服务
+        /// </summary>
+        IPackageTaskService service;
+
+        /// <summary>
+        /// 注册任务
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        private void TeamStatsView_Init()
+        {
+            if (task != null)
+                return;
+
+            task = new PackageTaskModel(this);
+            task.PreviewUpdateAction = OnPreviewUpdate;
+            task.TakeUpdateAction = OnTakeUpdate;
+            task.IsPreviewEnabled = true;
+            task.IsTakeEnabled = true;
+            task.IsRunning = true;
+
+            task.Name = "球队对比数据";
+            service = ApplicationDomainEx.ServiceManager.GetService<IPackageTaskService>(ViewServiceKeys.PACKAGE_TASK_SERVICE);
+            if (service == null)
+                return;
+            service.Register(task);
+
+            //var service2 = ApplicationDomainEx.ServiceManager.GetService<IPluginService>(ViewServiceKeys.PLUGIN_SERVICE);
+            //if (service2 == null)
+            //    return;
+
+            //PageModel page= service2.GetPageModelFromView(this);
+            //ApplicationDomainEx.CurrentPage == page;
+
+
+        }
+
+        public void PageOpend(ConnModel conn, PageModel page)
+        {
+            if (conn.IsConnected)
+            {
+                conn.EndpointManager.Send(String.Format(VizEngineCommands.SCRIPT_INVOKE, "dqyData", vm.CombineTeamComData()));
+            }
+        }
+
+        public void PreviewUpdate(ConnModel conn)
+        {
+            this.recordLogService.AppendLog(ApplicationConstants.APPLICATION_GROUP_NAME, RecordLogOperate.Operate, RecordLogTrigger.Human, RecordLogConstants.OPERATE_PREVIEW_UPDATE);
+
+            if (conn.IsConnected)
+            {
+                conn.EndpointManager.Send(String.Format(VizEngineCommands.SCRIPT_INVOKE, "dqyData", vm.CombineTeamComData()));
+            }
+        }
+    }
+}

VIZ.MIGU.CBA.Module/TeamStatsTask/ViewModel/TeamStatsTaskViewModel.cs

+using DevExpress.Mvvm.POCO;
+using log4net;
+using System;
+using System.Collections.Generic;
+using System.Collections.ObjectModel;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using System.Windows;
+using System.Windows.Media;
+using VIZ.Framework.Core;
+using VIZ.Package.Domain;
+using VIZ.Package.Service;
+using VIZ.Package.Storage;
+
+namespace VIZ.TVP.CBA.Module
+{
+    public class TeamStatsTaskViewModel: ViewModelBase
+    {
+        private static ILog Log = LogManager.GetLogger(typeof(TeamStatsTaskViewModel));
+
+        public static List<TeamStatsTaskViewModel> TeamStatsTaskViewModelInstance = new List<TeamStatsTaskViewModel>();
+
+        /// <summary>
+        /// 操作日志服务
+        /// </summary>
+        private RecordLogService recordLogService = new RecordLogService();
+        public TeamStatsTaskViewModel()
+        {
+            BtnCommand = new VCommand(BtnCmd);
+
+
+            matchStatsIds = new ObservableCollection<int>()
+            {
+                5,
+                6,
+                7
+            };
+
+            PromptCommand = new VCommand(this.PromptCmd);
+            ScheduleID = DateHeaderViewModel.ScheduleID;
+            Matchtypeid = DateHeaderViewModel.Matchtypeid;
+            SetTeamData();
+        }
+
+
+
+
+        private string selectMatchItems;
+
+        /// <summary>
+        /// 选中得赛程信息
+        /// </summary>
+        public string SelectMatchItems
+        {
+            get { return selectMatchItems; }
+            set
+            {
+                selectMatchItems = value;
+                this.RaisePropertyChanged(nameof(SelectMatchItems));
+                if (selectMatchItems == null) return;
+                //SetSingleData();
+                SetTeamData();
+            }
+        }
+
+        private string matchStatus;
+
+        public string MatchStatus
+        {
+            get { return matchStatus; }
+
+            set
+            {
+                matchStatus = value;
+                this.RaisePropertyChanged(nameof(MatchStatus));
+            }
+        }
+
+
+
+        /// <summary>
+        /// 主队队伍图标
+        /// </summary>
+        private ImageSource homeTeamLogo;
+
+        public ImageSource HomeTeamLogo
+        {
+            get { return homeTeamLogo; }
+            set { homeTeamLogo = value; this.RaisePropertyChanged(nameof(HomeTeamLogo)); }
+        }
+
+
+
+        /// <summary>
+        /// 客队队伍图标
+        /// </summary>
+        private ImageSource awayTeamLogo;
+
+        public ImageSource AwayTeamLogo
+        {
+            get { return awayTeamLogo; }
+            set { awayTeamLogo = value; this.RaisePropertyChanged(nameof(AwayTeamLogo)); }
+        }
+
+
+        //球员赛季数据
+        public string Matchtypeid = "";
+        //比赛赛程Id
+        public string ScheduleID = "";
+
+        //创建【球队】数据对比时的字典---主队球员数据与对比项的一一对应【主队-例如:得分--读取接口得分数据】
+        public Dictionary<string, string> HomeTeamCompareOptionDictionary = new Dictionary<string, string>();
+        //创建【球队】数据对比时的字典---客队球员数据与对比项的一一对应【客队队-例如:得分--读取接口得分数据】
+        public Dictionary<string, string> VisitTeamCompareOptionDictionary = new Dictionary<string, string>();
+
+        public Dictionary<string, Dictionary<string, string>> CNAliasVisitSportsDictionary
+= new Dictionary<string, Dictionary<string, string>>();
+
+        /// <summary>
+        /// 球员赛季数据
+        /// </summary>
+        public PlayerSeasonData PlayerSeasonData = new PlayerSeasonData();
+
+        /// <summary>
+        /// 队伍赛程信息
+        /// </summary>
+        public TeamSeasonData TeamSeasonData = new TeamSeasonData();
+
+        /// <summary>
+        /// 实时直播数据
+        /// </summary>
+        public OnAirDataModel onAirDataModel = new OnAirDataModel();
+
+        /// <summary>
+        /// 技术统计项
+        /// </summary>
+        private int matchStatsId = 7;
+
+        public int MatchStatsId
+        {
+            get { return matchStatsId; }
+
+            set
+            {
+
+                matchStatsId = value;
+                this.RaisePropertyChanged(nameof(MatchStatsId));
+
+
+                if (matchStatsId == 5)
+                {
+
+                    IsCheckVisible5 = Visibility.Hidden;
+                    HScoreVisible5 = Visibility.Hidden;
+                    HSeasonScoreVisible5 = Visibility.Hidden;
+                    TechStatsVisible5 = Visibility.Hidden;
+                    AScoreVisible5 = Visibility.Hidden;
+                    ASeasonScoreVisible5 = Visibility.Hidden;
+
+                    IsCheckVisible6 = Visibility.Hidden;
+                    HScoreVisible6 = Visibility.Hidden;
+                    HSeasonScoreVisible6 = Visibility.Hidden;
+                    TechStatsVisible6 = Visibility.Hidden;
+                    AScoreVisible6 = Visibility.Hidden;
+                    ASeasonScoreVisible6 = Visibility.Hidden;
+                }
+                else if (matchStatsId == 6)
+                {
+                    IsCheckVisible5 = Visibility.Visible;
+                    HScoreVisible5 = Visibility.Visible;
+                    HSeasonScoreVisible5 = Visibility.Visible;
+                    TechStatsVisible5 = Visibility.Visible;
+                    AScoreVisible5 = Visibility.Visible;
+                    ASeasonScoreVisible5 = Visibility.Visible;
+
+                    IsCheckVisible6 = Visibility.Hidden;
+                    HScoreVisible6 = Visibility.Hidden;
+                    HSeasonScoreVisible6 = Visibility.Hidden;
+                    TechStatsVisible6 = Visibility.Hidden;
+                    AScoreVisible6 = Visibility.Hidden;
+                    ASeasonScoreVisible6 = Visibility.Hidden;
+
+                }
+                else if (matchStatsId == 7)
+                {
+                    IsCheckVisible5 = Visibility.Visible;
+                    HScoreVisible5 = Visibility.Visible;
+                    HSeasonScoreVisible5 = Visibility.Visible;
+                    TechStatsVisible5 = Visibility.Visible;
+                    AScoreVisible5 = Visibility.Visible;
+                    ASeasonScoreVisible5 = Visibility.Visible;
+
+                    IsCheckVisible6 = Visibility.Visible;
+                    HScoreVisible6 = Visibility.Visible;
+                    HSeasonScoreVisible6 = Visibility.Visible;
+                    TechStatsVisible6 = Visibility.Visible;
+                    AScoreVisible6 = Visibility.Visible;
+                    ASeasonScoreVisible6 = Visibility.Visible;
+                }
+
+                Utils.NewSetHData(this, 0);
+                Utils.NewSetAData(this, 0);
+
+            }
+        }
+
+        private ObservableCollection<int> matchStatsIds;
+
+        public ObservableCollection<int> MatchStatsIds
+        {
+            get { return matchStatsIds; }
+
+            set { matchStatsIds = value; this.RaisePropertyChanged(nameof(MatchStatsIds)); }
+        }
+
+        private string homeTeam;
+
+        public string HomeTeam
+        {
+            get { return homeTeam; }
+            set { homeTeam = value; this.RaisePropertyChanged(nameof(HomeTeam)); }
+        }
+
+
+        private string awayTeam;
+
+        public string AwayTeam
+        {
+            get { return awayTeam; }
+
+            set { awayTeam = value; this.RaisePropertyChanged(nameof(AwayTeam)); }
+        }
+
+        private string title = "球队对比数据";
+
+        public string Title
+        {
+            get { return title; }
+
+            set { title = value; this.RaisePropertyChanged(nameof(Title)); }
+        }
+
+        public VCommand BtnCommand { get; set; }
+
+
+        public VCommand BtnCmdUpData { get; set; }
+
+        #region 打开更新数据时间日志
+        /// <summary>
+        /// 打开数据更新日志
+        /// </summary>
+        public VCommand PromptCommand { get; set; }
+
+
+        MessageLastRecordDate messageLastRecordDate = new MessageLastRecordDate();
+        private void PromptCmd()
+        {
+            this.recordLogService.AppendLog(ApplicationConstants.APPLICATION_GROUP_NAME, RecordLogOperate.Operate, RecordLogTrigger.Human, "CBA球队数据统计：" + PluginConstant.Operate_Message);
+            MessageLRDateViewModel vm = messageLastRecordDate.DataContext as MessageLRDateViewModel;
+            if (onAirDataModel != null)
+            {
+                string onAirLastDate = $"直播接口更新时间：{onAirDataModel.LastPushDataDateTime}";
+                vm.OnErrorLogMessage(onAirLastDate);
+            }
+
+            if (PlayerSeasonData != null)
+            {
+                string playerSeasonLastDate = $"球员赛季接口更新时间：{PlayerSeasonData.LastPushDataDateTime}";
+                vm.OnErrorLogMessage(playerSeasonLastDate);
+            }
+
+            if (TeamSeasonData != null)
+            {
+                string teamSeasonLastDate = $"球队赛季接口更新时间:{TeamSeasonData.LastPushDataDateTime}";
+                vm.OnErrorLogMessage(teamSeasonLastDate);
+            }
+            messageLastRecordDate.Visibility = System.Windows.Visibility.Visible;
+            messageLastRecordDate.WindowState = System.Windows.WindowState.Normal;
+
+            // messageLastRecordDate.ShowDialog();
+        }
+
+        #endregion
+        public string CombineTeamComData()
+        {
+            try
+            {
+                string data = "";
+
+                if (matchStatsId != 0)
+                {
+                    data += matchStatsId.ToString().Replace(" ", "") + "*";
+                }
+                else
+                {
+                    data += "7*";
+                }
+                data += title.ToString().Replace(" ", "") + "*";
+
+                if (!string.IsNullOrEmpty(homeTeam))
+                {
+                    data += homeTeam.Replace(" ", "") + "*";
+                }
+                else
+                {
+                    data += "" + "*";
+                }
+
+                if (!string.IsNullOrEmpty(awayTeam))
+                {
+                    data += awayTeam.Replace(" ", "") + "&";
+                }
+                else
+                {
+                    data += "" + "&";
+                }
+
+                if (matchStatsId == 7)
+                {
+
+                    //第一项
+                    if (IsHeight == false)
+                    {
+                        data += "0" + "*";
+                    }
+                    else
+                    {
+                        data += "1" + "*";
+                    }
+
+                    if (!string.IsNullOrEmpty(HomeScore))
+                    {
+                        data += HomeScore.Replace(" ", "") + "*";
+                    }
+                    else
+                    {
+                        data += "" + "*";
+                    }
+
+                    if (!string.IsNullOrEmpty(HSeasonScore))
+                    {
+                        data += HSeasonScore.Replace(" ", "") + "*";
+                    }
+                    else
+                    {
+                        data += "" + "*";
+                    }
+
+
+                    data += selectTechStats.Replace(" ", "") + "*";
+
+                    if (!string.IsNullOrEmpty(AwayScore))
+                    {
+                        data += AwayScore.Replace(" ", "") + "*";
+                    }
+                    else
+                    {
+                        data += "" + "*";
+                    }
+
+
+                    if (!string.IsNullOrEmpty(ASeasonScore))
+                    {
+                        data += ASeasonScore.Replace(" ", "") + ";";
+                    }
+                    else
+                    {
+                        data += "" + ";";
+                    }
+
+
+
+                    //第二项
+                    if (IsHeight1 == false)
+                    {
+                        data += "0" + "*";
+                    }
+                    else
+                    {
+                        data += "1" + "*";
+                    }
+
+                    if (!string.IsNullOrEmpty(HomeScore1))
+                    {
+                        data += HomeScore1.Replace(" ", "") + "*";
+                    }
+                    else
+                    {
+                        data += "" + "*";
+                    }
+
+                    if (!string.IsNullOrEmpty(HSeasonScore1))
+                    {
+                        data += HSeasonScore1.Replace(" ", "") + "*";
+                    }
+                    else
+                    {
+                        data += "" + "*";
+                    }
+
+
+                    data += selectTechStats1.Replace(" ", "") + "*";
+
+                    if (!string.IsNullOrEmpty(AwayScore1))
+                    {
+                        data += AwayScore1.Replace(" ", "") + "*";
+                    }
+                    else
+                    {
+                        data += "" + "*";
+                    }
+
+
+                    if (!string.IsNullOrEmpty(ASeasonScore1))
+                    {
+                        data += ASeasonScore1.Replace(" ", "") + ";";
+                    }
+                    else
+                    {
+                        data += "" + ";";
+                    }
+
+
+
+                    //第三项
+                    if (IsHeight2 == false)
+                    {
+                        data += "0" + "*";
+                    }
+                    else
+                    {
+                        data += "1" + "*";
+                    }
+
+                    if (!string.IsNullOrEmpty(HomeScore2))
+                    {
+                        data += HomeScore2.Replace(" ", "") + "*";
+                    }
+                    else
+                    {
+                        data += "" + "*";
+                    }
+
+                    if (!string.IsNullOrEmpty(HSeasonScore2))
+                    {
+                        data += HSeasonScore2.Replace(" ", "") + "*";
+                    }
+                    else
+                    {
+                        data += "" + "*";
+                    }
+
+
+                    data += selectTechStats2.Replace(" ", "") + "*";
+
+                    if (!string.IsNullOrEmpty(AwayScore2))
+                    {
+                        data += AwayScore2.Replace(" ", "") + "*";
+                    }
+                    else
+                    {
+                        data += "" + "*";
+                    }
+
+
+                    if (!string.IsNullOrEmpty(ASeasonScore2))
+                    {
+                        data += ASeasonScore2.Replace(" ", "") + ";";
+                    }
+                    else
+                    {
+                        data += "" + ";";
+                    }
+
+
+                    //第四项
+                    if (IsHeight3 == false)
+                    {
+                        data += "0" + "*";
+                    }
+                    else
+                    {
+                        data += "1" + "*";
+                    }
+
+                    if (!string.IsNullOrEmpty(HomeScore3))
+                    {
+                        data += HomeScore3.Replace(" ", "") + "*";
+                    }
+                    else
+                    {
+                        data += "" + "*";
+                    }
+
+                    if (!string.IsNullOrEmpty(HSeasonScore3))
+                    {
+                        data += HSeasonScore3.Replace(" ", "") + "*";
+                    }
+                    else
+                    {
+                        data += "" + "*";
+                    }
+
+
+                    data += selectTechStats3.Replace(" ", "") + "*";
+
+                    if (!string.IsNullOrEmpty(AwayScore3))
+                    {
+                        data += AwayScore3.Replace(" ", "") + "*";
+                    }
+                    else
+                    {
+                        data += "" + "*";
+                    }
+
+
+                    if (!string.IsNullOrEmpty(ASeasonScore3))
+                    {
+                        data += ASeasonScore3.Replace(" ", "") + ";";
+                    }
+                    else
+                    {
+                        data += "" + ";";
+                    }
+
+
+
+                    //第五项
+                    if (IsHeight4 == false)
+                    {
+                        data += "0" + "*";
+                    }
+                    else
+                    {
+                        data += "1" + "*";
+                    }
+
+                    if (!string.IsNullOrEmpty(HomeScore4))
+                    {
+                        data += HomeScore4.Replace(" ", "") + "*";
+                    }
+                    else
+                    {
+                        data += "" + "*";
+                    }
+
+                    if (!string.IsNullOrEmpty(HSeasonScore4))
+                    {
+                        data += HSeasonScore4.Replace(" ", "") + "*";
+                    }
+                    else
+                    {
+                        data += "" + "*";
+                    }
+
+
+                    data += selectTechStats4.Replace(" ", "") + "*";
+
+                    if (!string.IsNullOrEmpty(AwayScore4))
+                    {
+                        data += AwayScore4.Replace(" ", "") + "*";
+                    }
+                    else
+                    {
+                        data += "" + "*";
+                    }
+
+
+                    if (!string.IsNullOrEmpty(ASeasonScore4))
+                    {
+                        data += ASeasonScore4.Replace(" ", "") + ";";
+                    }
+                    else
+                    {
+                        data += "" + ";";
+                    }
+
+
+
+                    //第六项
+                    if (IsHeight5 == false)
+                    {
+                        data += "0" + "*";
+                    }
+                    else
+                    {
+                        data += "1" + "*";
+                    }
+
+                    if (!string.IsNullOrEmpty(HomeScore5))
+                    {
+                        data += HomeScore5.Replace(" ", "") + "*";
+                    }
+                    else
+                    {
+                        data += "" + "*";
+                    }
+
+                    if (!string.IsNullOrEmpty(HSeasonScore5))
+                    {
+                        data += HSeasonScore5.Replace(" ", "") + "*";
+                    }
+                    else
+                    {
+                        data += "" + "*";
+                    }
+
+
+                    data += selectTechStats5.Replace(" ", "") + "*";
+
+                    if (!string.IsNullOrEmpty(AwayScore5))
+                    {
+                        data += AwayScore5.Replace(" ", "") + "*";
+                    }
+                    else
+                    {
+                        data += "" + "*";
+                    }
+
+
+                    if (!string.IsNullOrEmpty(ASeasonScore5))
+                    {
+                        data += ASeasonScore5.Replace(" ", "") + ";";
+                    }
+                    else
+                    {
+                        data += "" + ";";
+                    }
+
+
+                    //第七项
+                    if (IsHeight6 == false)
+                    {
+                        data += "0" + "*";
+                    }
+                    else
+                    {
+                        data += "1" + "*";
+                    }
+
+                    if (!string.IsNullOrEmpty(HomeScore6))
+                    {
+                        data += HomeScore6.Replace(" ", "") + "*";
+                    }
+                    else
+                    {
+                        data += "" + "*";
+                    }
+
+                    if (!string.IsNullOrEmpty(HSeasonScore6))
+                    {
+                        data += HSeasonScore6.Replace(" ", "") + "*";
+                    }
+                    else
+                    {
+                        data += "" + "*";
+                    }
+
+
+                    data += selectTechStats6.Replace(" ", "") + "*";
+
+                    if (!string.IsNullOrEmpty(AwayScore6))
+                    {
+                        data += AwayScore6.Replace(" ", "") + "*";
+                    }
+                    else
+                    {
+                        data += "" + "*";
+                    }
+
+
+                    if (!string.IsNullOrEmpty(ASeasonScore6))
+                    {
+                        data += ASeasonScore6.Replace(" ", "") + ";";
+                    }
+                    else
+                    {
+                        data += "" + ";";
+                    }
+
+
+                }
+
+                else if (matchStatsId == 6)
+                {
+                    //第一项
+                    if (IsHeight == false)
+                    {
+                        data += "0" + "*";
+                    }
+                    else
+                    {
+                        data += "1" + "*";
+                    }
+
+                    if (!string.IsNullOrEmpty(HomeScore))
+                    {
+                        data += HomeScore.Replace(" ", "") + "*";
+                    }
+                    else
+                    {
+                        data += "" + "*";
+                    }
+
+                    if (!string.IsNullOrEmpty(HSeasonScore))
+                    {
+                        data += HSeasonScore.Replace(" ", "") + "*";
+                    }
+                    else
+                    {
+                        data += "" + "*";
+                    }
+
+
+                    data += selectTechStats.Replace(" ", "") + "*";
+
+                    if (!string.IsNullOrEmpty(AwayScore))
+                    {
+                        data += AwayScore.Replace(" ", "") + "*";
+                    }
+                    else
+                    {
+                        data += "" + "*";
+                    }
+
+
+                    if (!string.IsNullOrEmpty(ASeasonScore))
+                    {
+                        data += ASeasonScore.Replace(" ", "") + ";";
+                    }
+                    else
+                    {
+                        data += "" + ";";
+                    }
+
+
+
+                    //第二项
+                    if (IsHeight1 == false)
+                    {
+                        data += "0" + "*";
+                    }
+                    else
+                    {
+                        data += "1" + "*";
+                    }
+
+                    if (!string.IsNullOrEmpty(HomeScore1))
+                    {
+                        data += HomeScore1.Replace(" ", "") + "*";
+                    }
+                    else
+                    {
+                        data += "" + "*";
+                    }
+
+                    if (!string.IsNullOrEmpty(HSeasonScore1))
+                    {
+                        data += HSeasonScore1.Replace(" ", "") + "*";
+                    }
+                    else
+                    {
+                        data += "" + "*";
+                    }
+
+
+                    data += selectTechStats1.Replace(" ", "") + "*";
+
+                    if (!string.IsNullOrEmpty(AwayScore1))
+                    {
+                        data += AwayScore1.Replace(" ", "") + "*";
+                    }
+                    else
+                    {
+                        data += "" + "*";
+                    }
+
+
+                    if (!string.IsNullOrEmpty(ASeasonScore1))
+                    {
+                        data += ASeasonScore1.Replace(" ", "") + ";";
+                    }
+                    else
+                    {
+                        data += "" + ";";
+                    }
+
+
+
+                    //第三项
+                    if (IsHeight2 == false)
+                    {
+                        data += "0" + "*";
+                    }
+                    else
+                    {
+                        data += "1" + "*";
+                    }
+
+                    if (!string.IsNullOrEmpty(HomeScore2))
+                    {
+                        data += HomeScore2.Replace(" ", "") + "*";
+                    }
+                    else
+                    {
+                        data += "" + "*";
+                    }
+
+                    if (!string.IsNullOrEmpty(HSeasonScore2))
+                    {
+                        data += HSeasonScore2.Replace(" ", "") + "*";
+                    }
+                    else
+                    {
+                        data += "" + "*";
+                    }
+
+
+                    data += selectTechStats2.Replace(" ", "") + "*";
+
+                    if (!string.IsNullOrEmpty(AwayScore2))
+                    {
+                        data += AwayScore2.Replace(" ", "") + "*";
+                    }
+                    else
+                    {
+                        data += "" + "*";
+                    }
+
+
+                    if (!string.IsNullOrEmpty(ASeasonScore2))
+                    {
+                        data += ASeasonScore2.Replace(" ", "") + ";";
+                    }
+                    else
+                    {
+                        data += "" + ";";
+                    }
+
+
+                    //第四项
+                    if (IsHeight3 == false)
+                    {
+                        data += "0" + "*";
+                    }
+                    else
+                    {
+                        data += "1" + "*";
+                    }
+
+                    if (!string.IsNullOrEmpty(HomeScore3))
+                    {
+                        data += HomeScore3.Replace(" ", "") + "*";
+                    }
+                    else
+                    {
+                        data += "" + "*";
+                    }
+
+                    if (!string.IsNullOrEmpty(HSeasonScore3))
+                    {
+                        data += HSeasonScore3.Replace(" ", "") + "*";
+                    }
+                    else
+                    {
+                        data += "" + "*";
+                    }
+
+
+                    data += selectTechStats3.Replace(" ", "") + "*";
+
+                    if (!string.IsNullOrEmpty(AwayScore3))
+                    {
+                        data += AwayScore3.Replace(" ", "") + "*";
+                    }
+                    else
+                    {
+                        data += "" + "*";
+                    }
+
+
+                    if (!string.IsNullOrEmpty(ASeasonScore3))
+                    {
+                        data += ASeasonScore3.Replace(" ", "") + ";";
+                    }
+                    else
+                    {
+                        data += "" + ";";
+                    }
+
+
+
+                    //第五项
+                    if (IsHeight4 == false)
+                    {
+                        data += "0" + "*";
+                    }
+                    else
+                    {
+                        data += "1" + "*";
+                    }
+
+                    if (!string.IsNullOrEmpty(HomeScore4))
+                    {
+                        data += HomeScore4.Replace(" ", "") + "*";
+                    }
+                    else
+                    {
+                        data += "" + "*";
+                    }
+
+                    if (!string.IsNullOrEmpty(HSeasonScore4))
+                    {
+                        data += HSeasonScore4.Replace(" ", "") + "*";
+                    }
+                    else
+                    {
+                        data += "" + "*";
+                    }
+
+
+                    data += selectTechStats4.Replace(" ", "") + "*";
+
+                    if (!string.IsNullOrEmpty(AwayScore4))
+                    {
+                        data += AwayScore4.Replace(" ", "") + "*";
+                    }
+                    else
+                    {
+                        data += "" + "*";
+                    }
+
+
+                    if (!string.IsNullOrEmpty(ASeasonScore4))
+                    {
+                        data += ASeasonScore4.Replace(" ", "") + ";";
+                    }
+                    else
+                    {
+                        data += "" + ";";
+                    }
+
+
+
+                    //第六项
+                    if (IsHeight5 == false)
+                    {
+                        data += "0" + "*";
+                    }
+                    else
+                    {
+                        data += "1" + "*";
+                    }
+
+                    if (!string.IsNullOrEmpty(HomeScore5))
+                    {
+                        data += HomeScore5.Replace(" ", "") + "*";
+                    }
+                    else
+                    {
+                        data += "" + "*";
+                    }
+
+                    if (!string.IsNullOrEmpty(HSeasonScore5))
+                    {
+                        data += HSeasonScore5.Replace(" ", "") + "*";
+                    }
+                    else
+                    {
+                        data += "" + "*";
+                    }
+
+
+                    data += selectTechStats5.Replace(" ", "") + "*";
+
+                    if (!string.IsNullOrEmpty(AwayScore5))
+                    {
+                        data += AwayScore5.Replace(" ", "") + "*";
+                    }
+                    else
+                    {
+                        data += "" + "*";
+                    }
+
+
+                    if (!string.IsNullOrEmpty(ASeasonScore5))
+                    {
+                        data += ASeasonScore5.Replace(" ", "") + ";";
+                    }
+                    else
+                    {
+                        data += "" + ";";
+                    }
+
+
+                }
+                else if (matchStatsId == 5)
+                {
+                    //第一项
+                    if (IsHeight == false)
+                    {
+                        data += "0" + "*";
+                    }
+                    else
+                    {
+                        data += "1" + "*";
+                    }
+
+                    if (!string.IsNullOrEmpty(HomeScore))
+                    {
+                        data += HomeScore.Replace(" ", "") + "*";
+                    }
+                    else
+                    {
+                        data += "" + "*";
+                    }
+
+                    if (!string.IsNullOrEmpty(HSeasonScore))
+                    {
+                        data += HSeasonScore.Replace(" ", "") + "*";
+                    }
+                    else
+                    {
+                        data += "" + "*";
+                    }
+
+
+                    data += selectTechStats.Replace(" ", "") + "*";
+
+                    if (!string.IsNullOrEmpty(AwayScore))
+                    {
+                        data += AwayScore.Replace(" ", "") + "*";
+                    }
+                    else
+                    {
+                        data += "" + "*";
+                    }
+
+
+                    if (!string.IsNullOrEmpty(ASeasonScore))
+                    {
+                        data += ASeasonScore.Replace(" ", "") + ";";
+                    }
+                    else
+                    {
+                        data += "" + ";";
+                    }
+
+
+
+                    //第二项
+                    if (IsHeight1 == false)
+                    {
+                        data += "0" + "*";
+                    }
+                    else
+                    {
+                        data += "1" + "*";
+                    }
+
+                    if (!string.IsNullOrEmpty(HomeScore1))
+                    {
+                        data += HomeScore1.Replace(" ", "") + "*";
+                    }
+                    else
+                    {
+                        data += "" + "*";
+                    }
+
+                    if (!string.IsNullOrEmpty(HSeasonScore1))
+                    {
+                        data += HSeasonScore1.Replace(" ", "") + "*";
+                    }
+                    else
+                    {
+                        data += "" + "*";
+                    }
+
+
+                    data += selectTechStats1.Replace(" ", "") + "*";
+
+                    if (!string.IsNullOrEmpty(AwayScore1))
+                    {
+                        data += AwayScore1.Replace(" ", "") + "*";
+                    }
+                    else
+                    {
+                        data += "" + "*";
+                    }
+
+
+                    if (!string.IsNullOrEmpty(ASeasonScore1))
+                    {
+                        data += ASeasonScore1.Replace(" ", "") + ";";
+                    }
+                    else
+                    {
+                        data += "" + ";";
+                    }
+
+
+
+                    //第三项
+                    if (IsHeight2 == false)
+                    {
+                        data += "0" + "*";
+                    }
+                    else
+                    {
+                        data += "1" + "*";
+                    }
+
+                    if (!string.IsNullOrEmpty(HomeScore2))
+                    {
+                        data += HomeScore2.Replace(" ", "") + "*";
+                    }
+                    else
+                    {
+                        data += "" + "*";
+                    }
+
+                    if (!string.IsNullOrEmpty(HSeasonScore2))
+                    {
+                        data += HSeasonScore2.Replace(" ", "") + "*";
+                    }
+                    else
+                    {
+                        data += "" + "*";
+                    }
+
+
+                    data += selectTechStats2.Replace(" ", "") + "*";
+
+                    if (!string.IsNullOrEmpty(AwayScore2))
+                    {
+                        data += AwayScore2.Replace(" ", "") + "*";
+                    }
+                    else
+                    {
+                        data += "" + "*";
+                    }
+
+
+                    if (!string.IsNullOrEmpty(ASeasonScore2))
+                    {
+                        data += ASeasonScore2.Replace(" ", "") + ";";
+                    }
+                    else
+                    {
+                        data += "" + ";";
+                    }
+
+
+                    //第四项
+                    if (IsHeight3 == false)
+                    {
+                        data += "0" + "*";
+                    }
+                    else
+                    {
+                        data += "1" + "*";
+                    }
+
+                    if (!string.IsNullOrEmpty(HomeScore3))
+                    {
+                        data += HomeScore3.Replace(" ", "") + "*";
+                    }
+                    else
+                    {
+                        data += "" + "*";
+                    }
+
+                    if (!string.IsNullOrEmpty(HSeasonScore3))
+                    {
+                        data += HSeasonScore3.Replace(" ", "") + "*";
+                    }
+                    else
+                    {
+                        data += "" + "*";
+                    }
+
+
+                    data += selectTechStats3.Replace(" ", "") + "*";
+
+                    if (!string.IsNullOrEmpty(AwayScore3))
+                    {
+                        data += AwayScore3.Replace(" ", "") + "*";
+                    }
+                    else
+                    {
+                        data += "" + "*";
+                    }
+
+
+                    if (!string.IsNullOrEmpty(ASeasonScore3))
+                    {
+                        data += ASeasonScore3.Replace(" ", "") + ";";
+                    }
+                    else
+                    {
+                        data += "" + ";";
+                    }
+
+
+                    //第五项
+                    if (IsHeight4 == false)
+                    {
+                        data += "0" + "*";
+                    }
+                    else
+                    {
+                        data += "1" + "*";
+                    }
+
+                    if (!string.IsNullOrEmpty(HomeScore4))
+                    {
+                        data += HomeScore4.Replace(" ", "") + "*";
+                    }
+                    else
+                    {
+                        data += "" + "*";
+                    }
+
+                    if (!string.IsNullOrEmpty(HSeasonScore4))
+                    {
+                        data += HSeasonScore4.Replace(" ", "") + "*";
+                    }
+                    else
+                    {
+                        data += "" + "*";
+                    }
+
+
+                    data += selectTechStats4.Replace(" ", "") + "*";
+
+                    if (!string.IsNullOrEmpty(AwayScore4))
+                    {
+                        data += AwayScore4.Replace(" ", "") + "*";
+                    }
+                    else
+                    {
+                        data += "" + "*";
+                    }
+
+
+                    if (!string.IsNullOrEmpty(ASeasonScore4))
+                    {
+                        data += ASeasonScore4.Replace(" ", "") + ";";
+                    }
+                    else
+                    {
+                        data += "" + ";";
+                    }
+                }
+
+
+                return data;
+            }
+            catch (Exception ex)
+            {
+                Log.Error(ex.Message);
+                return "";
+            }
+        }
+
+
+
+        public void BtnCmd()
+        {
+
+            this.recordLogService.AppendLog(ApplicationConstants.APPLICATION_GROUP_NAME, RecordLogOperate.Operate, RecordLogTrigger.Human, "CBA球队数据统计：" + PluginConstant.Operate_Message);
+
+            onAirDataModel = JsonModel.PostOnAirData_Path(ScheduleID);
+            if (onAirDataModel == null) return;
+            Utils.NewSetHomeTeamDictionary(this);
+            Utils.NewSetVisitTeamDictionary(this);
+            Utils.NewSetHData(this, 0);
+            Utils.NewSetAData(this, 0);
+        }
+
+
+
+        public async void SetTeamData()
+        {
+            //if (SelectMatchItems == null) return;
+            //ScheduleID = SetMatchDict[SelectMatchItems];
+
+            Log.Error(string.Format("teamStatsViewModel:{0}", ScheduleID));
+            onAirDataModel = JsonModel.PostOnAirData_Path(ScheduleID);
+            ClearData();
+            if (onAirDataModel == null) return;
+            if (onAirDataModel != null)
+            {
+
+                if (onAirDataModel.liveTeamInfo.StatusCNName == "")
+                {
+                    MatchStatus = "未开始";
+                }
+                else if (onAirDataModel.liveTeamInfo.StatusCNName != "")
+                {
+                    MatchStatus = onAirDataModel.liveTeamInfo.StatusCNName;
+                }
+            }
+            else
+            {
+                MatchStatus = "未开始";
+            }
+
+
+
+            //PlayerCompareViewModel.HName = vm.onAirDataModel.liveTeamInfo.HomeTeamCNAlias;
+            //PlayerCompareViewModel.AName = vm.onAirDataModel.liveTeamInfo.VisitingTeamCNAlias;
+
+            HomeTeam = onAirDataModel.liveTeamInfo.HomeTeamCNAlias;
+
+
+            //string baesePath = AppDomain.CurrentDomain.BaseDirectory;
+            //if (!string.IsNullOrEmpty(HomeTeam))
+            //{
+            //    if (HomeTeam == "北京控股666")
+            //    {
+            //        if(File.Exists(string.Format("{0}Image\\Teamlogo\\{1}.png", baesePath, "北京控股")))
+            //        {
+            //            HomeTeamLogo = new BitmapImage(new Uri(string.Format("{0}Image\\Teamlogo\\{1}.png", baesePath, "北京控股")));
+            //        }
+
+            //    }
+            //    else
+            //    {
+            //        if(File.Exists(string.Format("{0}Image\\Teamlogo\\{1}.png", baesePath, HomeTeam)))
+            //        {
+            //            HomeTeamLogo = new BitmapImage(new Uri(string.Format("{0}Image\\Teamlogo\\{1}.png", baesePath, HomeTeam)));
+            //        }
+
+            //    }
+
+            //}
+
+            AwayTeam = onAirDataModel.liveTeamInfo.VisitingTeamCNAlias;
+
+            //if (!string.IsNullOrEmpty(AwayTeam))
+            //{
+            //    if (AwayTeam == "北京控股666")
+            //    {
+            //        if(File.Exists(string.Format("{0}Image\\Teamlogo\\{1}.png", baesePath, "北京控股")))
+            //        {
+            //            AwayTeamLogo = new BitmapImage(new Uri(string.Format("{0}Image\\Teamlogo\\{1}.png", baesePath, "北京控股")));
+            //        }
+
+            //    }
+            //    else
+            //    {
+            //        if(File.Exists(string.Format("{0}Image\\Teamlogo\\{1}.png", baesePath, AwayTeam)))
+            //        {
+            //            AwayTeamLogo = new BitmapImage(new Uri(string.Format("{0}Image\\Teamlogo\\{1}.png", baesePath, AwayTeam)));
+            //        } 
+            //    }
+            //}
+
+            TeamSeasonData = await JsonModel.PostTeamSeasonData_Path(Matchtypeid);
+
+            SetTeamSeasonDictionary();
+
+            Utils.NewSetHomeTeamDictionary(this);
+            Utils.NewSetVisitTeamDictionary(this);
+            Utils.NewSetHData(this, 0);
+            Utils.NewSetAData(this, 0);
+
+
+        }
+
+        private void ClearData()
+        {
+
+            if (onAirDataModel != null) return;
+            HomeTeam = "";
+            AwayTeam = "";
+
+            HomeScore = "";
+            HSeasonScore = "";
+            HomeScore1 = "";
+            HSeasonScore1 = "";
+            HomeScore2 = "";
+            HSeasonScore2 = "";
+            HomeScore3 = "";
+            HSeasonScore3 = "";
+            HomeScore4 = "";
+            HSeasonScore4 = "";
+            HomeScore5 = "";
+            HSeasonScore5 = "";
+            HomeScore6 = "";
+            HSeasonScore6 = "";
+
+
+            AwayScore = "";
+            ASeasonScore = "";
+            AwayScore1 = "";
+            ASeasonScore1 = "";
+            AwayScore2 = "";
+            ASeasonScore2 = "";
+            AwayScore3 = "";
+            ASeasonScore3 = "";
+            AwayScore4 = "";
+            ASeasonScore4 = "";
+            AwayScore5 = "";
+            ASeasonScore5 = "";
+            AwayScore6 = "";
+            ASeasonScore6 = "";
+
+        }
+
+        /// <summary>
+        /// 设置球队赛季数据字典集合
+        /// </summary>
+        private void SetTeamSeasonDictionary()
+        {
+            CNAliasVisitSportsDictionary.Clear();
+            if (TeamSeasonData == null) return;
+            foreach (var teamSeasonData in TeamSeasonData.teamstats)
+            {
+
+                Dictionary<string, string> CompareItemToNumber = new Dictionary<string, string>();
+
+                CompareItemToNumber.Add("得分", teamSeasonData.PointsAverage);
+                CompareItemToNumber.Add("篮板", teamSeasonData.ReboundsAverage);
+                CompareItemToNumber.Add("助攻", teamSeasonData.AssistsAverage);
+                CompareItemToNumber.Add("抢断", teamSeasonData.StealsAverage);//StealsAverage
+                CompareItemToNumber.Add("盖帽", teamSeasonData.BlockedAverage);
+                CompareItemToNumber.Add("失误", teamSeasonData.TurnoversAverage);
+                CompareItemToNumber.Add("犯规", teamSeasonData.PersonalFoulsAverage);
+                CompareItemToNumber.Add("罚球", teamSeasonData.FreeThrowsAverage.ToString());
+                //HomeTeamCompareOptionDictionary.Add(TeamDataCompareOptionChinese[7], Json_OnAirData.liveTeamStatH.FlagrantFouls);
+                CompareItemToNumber.Add("罚球命中率", (teamSeasonData.FreeThrowsPercentageAverage).ToString("F1") + "%");
+                CompareItemToNumber.Add("两分命中率", (teamSeasonData.TwoPointPercentageAverage).ToString("F1") + "%");
+                CompareItemToNumber.Add("三分命中率", (teamSeasonData.ThreePointPercentageAverage).ToString("F1") + "%");
+                CompareItemToNumber.Add("投篮命中率", (teamSeasonData.FieldGoalsPercentageAverage).ToString("F1") + "%");
+                CompareItemToNumber.Add("篮下投篮命中率", (teamSeasonData.FieldGoalsAtRimPercentageAverage * 100).ToString("F1") + "%");
+                CompareItemToNumber.Add("中距离投篮命中率", (teamSeasonData.FieldGoalsMidRangePercentageAverage * 100).ToString("F1") + "%");
+
+                if (!CNAliasVisitSportsDictionary.ContainsKey(teamSeasonData.TeamCNAlias))
+                {
+                    CNAliasVisitSportsDictionary.Add(teamSeasonData.TeamCNAlias, CompareItemToNumber);
+                }
+
+            }
+
+
+        }
+
+        public PageModel page = null;
+
+        static ObservableCollection<string> listTechStats = new ObservableCollection<string>() { "得分", "篮板", "助攻", "抢断", "盖帽", "投篮命中率", "两分命中率", "三分命中率", "罚球命中率", "篮下投篮命中率",
+                                                                                            "中距离投篮命中率","罚球","失误","犯规","三分","两分","三分得分"};//"罚球",
+
+        #region 第一项数据
+
+        /// <summary>
+        /// 是否高亮
+        /// </summary>
+
+        private bool isHeight;
+
+        public bool IsHeight
+        {
+            get { return isHeight; }
+            set { isHeight = value; this.RaisePropertyChanged(nameof(IsHeight)); }
+        }
+
+        /// <summary>
+        /// 是否显示
+        /// </summary>
+        private Visibility isCheckVisible;
+        public Visibility IsCheckVisible
+        {
+            get { return isCheckVisible; }
+            set { isCheckVisible = value; this.RaisePropertyChanged(nameof(IsCheckVisible)); }
+        }
+
+
+
+        /// <summary>
+        ///主队本场得分
+        /// </summary>
+        private string homeScore;
+
+        public string HomeScore
+        {
+            get { return homeScore; }
+            set { homeScore = value; this.RaisePropertyChanged(nameof(HomeScore)); }
+        }
+
+
+        /// <summary>
+        /// 主队本场得分是否可见
+        /// </summary>
+
+        public Visibility hScoreVisible;
+
+        public Visibility HScoreVisible
+        {
+            get { return hScoreVisible; }
+            set { hScoreVisible = value; this.RaisePropertyChanged(nameof(hScoreVisible)); }
+        }
+
+
+        /// <summary>
+        /// 赛季球员得分
+        /// </summary>
+
+        public string hSeasonScore;
+
+        public string HSeasonScore
+        {
+            get { return hSeasonScore; }
+            set { hSeasonScore = value; this.RaisePropertyChanged(nameof(HSeasonScore)); }
+        }
+
+
+        /// <summary>
+        /// 赛季球员是否可见
+        /// </summary>
+        private Visibility hSeasonScoreVisible;
+        public Visibility HSeasonScoreVisible
+        {
+            get { return hSeasonScoreVisible; }
+            set { hSeasonScoreVisible = value; this.RaisePropertyChanged(nameof(HSeasonScoreVisible)); }
+        }
+
+
+        /// <summary>
+        /// 技术统计
+        /// </summary>
+        private ObservableCollection<string> techStats = listTechStats;
+
+        public ObservableCollection<string> TechStats
+        {
+            get { return techStats; }
+            set { techStats = value; this.RaisePropertyChanged(nameof(TechStats)); }
+        }
+
+
+
+        /// <summary>
+        /// 选中的值
+        /// </summary>
+        private string selectTechStats = "得分";
+
+        public string SelectTechStats
+        {
+            get { return selectTechStats; }
+            set
+            {
+                selectTechStats = value;
+                this.RaisePropertyChanged(nameof(SelectTechStats));
+
+                Utils.NewSetHData(this, 1);
+                Utils.NewSetAData(this, 1);
+            }
+        }
+
+
+        /// <summary>
+        /// 技术统计是否可见
+        /// </summary>
+        private Visibility techStatsVisible;
+
+
+        public Visibility TechStatsVisible
+        {
+            get { return techStatsVisible; }
+            set { techStatsVisible = value; this.RaisePropertyChanged(nameof(TechStatsVisible)); }
+        }
+
+
+        /// <summary>
+        /// 客队得分
+        /// </summary>
+
+        private string awayScore;
+
+        public string AwayScore
+        {
+            get { return awayScore; }
+            set { awayScore = value; this.RaisePropertyChanged(nameof(AwayScore)); }
+        }
+
+
+        /// <summary>
+        /// 客队得分是否可见
+        /// </summary>
+        private Visibility aScoreVisible;
+
+        public Visibility AScoreVisible
+        {
+            get { return aScoreVisible; }
+
+            set { aScoreVisible = value; this.RaisePropertyChanged(nameof(AScoreVisible)); }
+        }
+
+
+        /// <summary>
+        /// 客队赛季得分
+        /// </summary>
+        private string aSeasonScore;
+
+        public string ASeasonScore
+        {
+            get { return aSeasonScore; }
+
+            set { aSeasonScore = value; this.RaisePropertyChanged(nameof(ASeasonScore)); }
+        }
+
+
+        /// <summary>
+        /// 客队赛季得分是否可见
+        /// </summary>
+        private Visibility aSeasonScoreVisible;
+
+        public Visibility ASeasonScoreVisible
+        {
+            get { return aSeasonScoreVisible; }
+            set { aSeasonScoreVisible = value; this.RaisePropertyChanged(nameof(ASeasonScoreVisible)); }
+        }
+
+        #endregion
+
+
+        #region 第二项数据
+
+        /// <summary>
+        /// 是否高亮
+        /// </summary>
+
+        private bool isHeight1;
+
+        public bool IsHeight1
+        {
+            get { return isHeight1; }
+            set { isHeight1 = value; this.RaisePropertyChanged(nameof(IsHeight1)); }
+        }
+
+        /// <summary>
+        /// 是否显示
+        /// </summary>
+        private Visibility isCheckVisible1;
+        public Visibility IsCheckVisible1
+        {
+            get { return isCheckVisible1; }
+            set { isCheckVisible1 = value; this.RaisePropertyChanged(nameof(IsCheckVisible1)); }
+        }
+
+
+
+        /// <summary>
+        ///主队本场得分
+        /// </summary>
+        private string homeScore1;
+
+        public string HomeScore1
+        {
+            get { return homeScore1; }
+            set { homeScore1 = value; this.RaisePropertyChanged(nameof(HomeScore1)); }
+        }
+
+
+        /// <summary>
+        /// 主队本场得分是否可见
+        /// </summary>
+
+        public Visibility hScoreVisible1;
+
+        public Visibility HScoreVisible1
+        {
+            get { return hScoreVisible1; }
+            set { hScoreVisible1 = value; this.RaisePropertyChanged(nameof(hScoreVisible1)); }
+        }
+
+
+        /// <summary>
+        /// 赛季球员得分
+        /// </summary>
+
+        public string hSeasonScore1;
+
+        public string HSeasonScore1
+        {
+            get { return hSeasonScore1; }
+            set { hSeasonScore1 = value; this.RaisePropertyChanged(nameof(HSeasonScore1)); }
+        }
+
+
+        /// <summary>
+        /// 赛季球员是否可见
+        /// </summary>
+        private Visibility hSeasonScoreVisible1;
+        public Visibility HSeasonScoreVisible1
+        {
+            get { return hSeasonScoreVisible1; }
+            set { hSeasonScoreVisible1 = value; this.RaisePropertyChanged(nameof(HSeasonScoreVisible1)); }
+        }
+
+
+        /// <summary>
+        /// 技术统计
+        /// </summary>
+        private ObservableCollection<string> techStats1 = listTechStats;
+
+        public ObservableCollection<string> TechStats1
+        {
+            get { return techStats1; }
+            set { techStats1 = value; this.RaisePropertyChanged(nameof(TechStats1)); }
+        }
+
+
+
+        /// <summary>
+        /// 选中的值
+        /// </summary>
+        private string selectTechStats1 = "篮板";
+
+        public string SelectTechStats1
+        {
+            get { return selectTechStats1; }
+            set
+            {
+                selectTechStats1 = value;
+                this.RaisePropertyChanged(nameof(SelectTechStats1));
+
+                Utils.NewSetHData(this, 2);
+                Utils.NewSetAData(this, 2);
+            }
+        }
+
+
+        /// <summary>
+        /// 技术统计是否可见
+        /// </summary>
+        private Visibility techStatsVisible1;
+
+
+        public Visibility TechStatsVisible1
+        {
+            get { return techStatsVisible1; }
+            set { techStatsVisible1 = value; this.RaisePropertyChanged(nameof(TechStatsVisible1)); }
+        }
+
+
+        /// <summary>
+        /// 客队得分
+        /// </summary>
+
+        private string awayScore1;
+
+        public string AwayScore1
+        {
+            get { return awayScore1; }
+            set { awayScore1 = value; this.RaisePropertyChanged(nameof(AwayScore1)); }
+        }
+
+
+        /// <summary>
+        /// 客队得分是否可见
+        /// </summary>
+        private Visibility aScoreVisible1;
+
+        public Visibility AScoreVisible1
+        {
+            get { return aScoreVisible1; }
+
+            set { aScoreVisible1 = value; this.RaisePropertyChanged(nameof(AScoreVisible1)); }
+        }
+
+
+        /// <summary>
+        /// 客队赛季得分
+        /// </summary>
+        private string aSeasonScore1;
+
+        public string ASeasonScore1
+        {
+            get { return aSeasonScore1; }
+
+            set { aSeasonScore1 = value; this.RaisePropertyChanged(nameof(ASeasonScore1)); }
+        }
+
+
+        /// <summary>
+        /// 客队赛季得分是否可见
+        /// </summary>
+        private Visibility aSeasonScoreVisible1;
+
+        public Visibility ASeasonScoreVisible1
+        {
+            get { return aSeasonScoreVisible1; }
+            set { aSeasonScoreVisible1 = value; this.RaisePropertyChanged(nameof(ASeasonScoreVisible1)); }
+        }
+
+        #endregion
+
+
+        #region 第三项数据
+
+        /// <summary>
+        /// 是否高亮
+        /// </summary>
+
+        private bool isHeight2;
+
+        public bool IsHeight2
+        {
+            get { return isHeight2; }
+            set { isHeight2 = value; this.RaisePropertyChanged(nameof(IsHeight2)); }
+        }
+
+        /// <summary>
+        /// 是否显示
+        /// </summary>
+        private Visibility isCheckVisible2;
+        public Visibility IsCheckVisible2
+        {
+            get { return isCheckVisible2; }
+            set { isCheckVisible2 = value; this.RaisePropertyChanged(nameof(IsCheckVisible2)); }
+        }
+
+
+
+        /// <summary>
+        ///主队本场得分
+        /// </summary>
+        private string homeScore2;
+
+        public string HomeScore2
+        {
+            get { return homeScore2; }
+            set { homeScore2 = value; this.RaisePropertyChanged(nameof(HomeScore2)); }
+        }
+
+
+        /// <summary>
+        /// 主队本场得分是否可见
+        /// </summary>
+
+        public Visibility hScoreVisible2;
+
+        public Visibility HScoreVisible2
+        {
+            get { return hScoreVisible2; }
+            set { hScoreVisible2 = value; this.RaisePropertyChanged(nameof(hScoreVisible2)); }
+        }
+
+
+        /// <summary>
+        /// 赛季球员得分
+        /// </summary>
+
+        public string hSeasonScore2;
+
+        public string HSeasonScore2
+        {
+            get { return hSeasonScore2; }
+            set { hSeasonScore2 = value; this.RaisePropertyChanged(nameof(HSeasonScore2)); }
+        }
+
+
+        /// <summary>
+        /// 赛季球员是否可见
+        /// </summary>
+        private Visibility hSeasonScoreVisible2;
+        public Visibility HSeasonScoreVisible2
+        {
+            get { return hSeasonScoreVisible2; }
+            set { hSeasonScoreVisible2 = value; this.RaisePropertyChanged(nameof(HSeasonScoreVisible2)); }
+        }
+
+
+        /// <summary>
+        /// 技术统计
+        /// </summary>
+        private ObservableCollection<string> techStats2 = listTechStats;
+
+        public ObservableCollection<string> TechStats2
+        {
+            get { return techStats2; }
+            set { techStats2 = value; this.RaisePropertyChanged(nameof(TechStats2)); }
+        }
+
+
+
+        /// <summary>
+        /// 选中的值
+        /// </summary>
+        private string selectTechStats2 = "助攻";
+
+        public string SelectTechStats2
+        {
+            get { return selectTechStats2; }
+            set
+            {
+                selectTechStats2 = value;
+                this.RaisePropertyChanged(nameof(SelectTechStats2));
+
+                Utils.NewSetHData(this, 3);
+                Utils.NewSetAData(this, 3);
+            }
+        }
+
+
+        /// <summary>
+        /// 技术统计是否可见
+        /// </summary>
+        private Visibility techStatsVisible2;
+
+
+        public Visibility TechStatsVisible2
+        {
+            get { return techStatsVisible2; }
+            set { techStatsVisible2 = value; this.RaisePropertyChanged(nameof(TechStatsVisible2)); }
+        }
+
+
+        /// <summary>
+        /// 客队得分
+        /// </summary>
+
+        private string awayScore2;
+
+        public string AwayScore2
+        {
+            get { return awayScore2; }
+            set { awayScore2 = value; this.RaisePropertyChanged(nameof(AwayScore2)); }
+        }
+
+
+        /// <summary>
+        /// 客队得分是否可见
+        /// </summary>
+        private Visibility aScoreVisible2;
+
+        public Visibility AScoreVisible2
+        {
+            get { return aScoreVisible2; }
+
+            set { aScoreVisible2 = value; this.RaisePropertyChanged(nameof(AScoreVisible2)); }
+        }
+
+
+        /// <summary>
+        /// 客队赛季得分
+        /// </summary>
+        private string aSeasonScore2;
+
+        public string ASeasonScore2
+        {
+            get { return aSeasonScore2; }
+
+            set { aSeasonScore2 = value; this.RaisePropertyChanged(nameof(ASeasonScore2)); }
+        }
+
+
+        /// <summary>
+        /// 客队赛季得分是否可见
+        /// </summary>
+        private Visibility aSeasonScoreVisible2;
+
+        public Visibility ASeasonScoreVisible2
+        {
+            get { return aSeasonScoreVisible2; }
+            set { aSeasonScoreVisible2 = value; this.RaisePropertyChanged(nameof(ASeasonScoreVisible2)); }
+        }
+
+        #endregion
+
+
+        #region 第四项数据
+
+        /// <summary>
+        /// 是否高亮
+        /// </summary>
+
+        private bool isHeight3;
+
+        public bool IsHeight3
+        {
+            get { return isHeight3; }
+            set { isHeight3 = value; this.RaisePropertyChanged(nameof(IsHeight3)); }
+        }
+
+        /// <summary>
+        /// 是否显示
+        /// </summary>
+        private Visibility isCheckVisible3;
+        public Visibility IsCheckVisible3
+        {
+            get { return isCheckVisible3; }
+            set { isCheckVisible3 = value; this.RaisePropertyChanged(nameof(IsCheckVisible3)); }
+        }
+
+
+
+        /// <summary>
+        ///主队本场得分
+        /// </summary>
+        private string homeScore3;
+
+        public string HomeScore3
+        {
+            get { return homeScore3; }
+            set { homeScore3 = value; this.RaisePropertyChanged(nameof(HomeScore3)); }
+        }
+
+
+        /// <summary>
+        /// 主队本场得分是否可见
+        /// </summary>
+
+        public Visibility hScoreVisible3;
+
+        public Visibility HScoreVisible3
+        {
+            get { return hScoreVisible3; }
+            set { hScoreVisible3 = value; this.RaisePropertyChanged(nameof(hScoreVisible3)); }
+        }
+
+
+        /// <summary>
+        /// 赛季球员得分
+        /// </summary>
+
+        public string hSeasonScore3;
+
+        public string HSeasonScore3
+        {
+            get { return hSeasonScore3; }
+            set { hSeasonScore3 = value; this.RaisePropertyChanged(nameof(HSeasonScore3)); }
+        }
+
+
+        /// <summary>
+        /// 赛季球员是否可见
+        /// </summary>
+        private Visibility hSeasonScoreVisible3;
+        public Visibility HSeasonScoreVisible3
+        {
+            get { return hSeasonScoreVisible3; }
+            set { hSeasonScoreVisible3 = value; this.RaisePropertyChanged(nameof(HSeasonScoreVisible3)); }
+        }
+
+
+        /// <summary>
+        /// 技术统计
+        /// </summary>
+        private ObservableCollection<string> techStats3 = listTechStats;
+
+        public ObservableCollection<string> TechStats3
+        {
+            get { return techStats3; }
+            set { techStats3 = value; this.RaisePropertyChanged(nameof(TechStats3)); }
+        }
+
+
+
+        /// <summary>
+        /// 选中的值
+        /// </summary>
+        private string selectTechStats3 = "盖帽";
+
+        public string SelectTechStats3
+        {
+            get { return selectTechStats3; }
+            set
+            {
+                selectTechStats3 = value;
+                this.RaisePropertyChanged(nameof(SelectTechStats3));
+
+                Utils.NewSetHData(this, 4);
+                Utils.NewSetAData(this, 4);
+            }
+        }
+
+
+        /// <summary>
+        /// 技术统计是否可见
+        /// </summary>
+        private Visibility techStatsVisible3;
+
+
+        public Visibility TechStatsVisible3
+        {
+            get { return techStatsVisible3; }
+            set { techStatsVisible3 = value; this.RaisePropertyChanged(nameof(TechStatsVisible3)); }
+        }
+
+
+        /// <summary>
+        /// 客队得分
+        /// </summary>
+
+        private string awayScore3;
+
+        public string AwayScore3
+        {
+            get { return awayScore3; }
+            set { awayScore3 = value; this.RaisePropertyChanged(nameof(AwayScore3)); }
+        }
+
+
+        /// <summary>
+        /// 客队得分是否可见
+        /// </summary>
+        private Visibility aScoreVisible3;
+
+        public Visibility AScoreVisible3
+        {
+            get { return aScoreVisible3; }
+
+            set { aScoreVisible3 = value; this.RaisePropertyChanged(nameof(AScoreVisible3)); }
+        }
+
+
+        /// <summary>
+        /// 客队赛季得分
+        /// </summary>
+        private string aSeasonScore3;
+
+        public string ASeasonScore3
+        {
+            get { return aSeasonScore3; }
+
+            set { aSeasonScore3 = value; this.RaisePropertyChanged(nameof(ASeasonScore3)); }
+        }
+
+
+        /// <summary>
+        /// 客队赛季得分是否可见
+        /// </summary>
+        private Visibility aSeasonScoreVisible3;
+
+        public Visibility ASeasonScoreVisible3
+        {
+            get { return aSeasonScoreVisible3; }
+            set { aSeasonScoreVisible3 = value; this.RaisePropertyChanged(nameof(ASeasonScoreVisible3)); }
+        }
+
+        #endregion
+
+
+        #region 第五项数据
+
+        /// <summary>
+        /// 是否高亮
+        /// </summary>
+
+        private bool isHeight4;
+
+        public bool IsHeight4
+        {
+            get { return isHeight4; }
+            set { isHeight4 = value; this.RaisePropertyChanged(nameof(IsHeight4)); }
+        }
+
+        /// <summary>
+        /// 是否显示
+        /// </summary>
+        private Visibility isCheckVisible4;
+        public Visibility IsCheckVisible4
+        {
+            get { return isCheckVisible4; }
+            set { isCheckVisible4 = value; this.RaisePropertyChanged(nameof(IsCheckVisible4)); }
+        }
+
+
+
+        /// <summary>
+        ///主队本场得分
+        /// </summary>
+        private string homeScore4;
+
+        public string HomeScore4
+        {
+            get { return homeScore4; }
+            set { homeScore4 = value; this.RaisePropertyChanged(nameof(HomeScore4)); }
+        }
+
+
+        /// <summary>
+        /// 主队本场得分是否可见
+        /// </summary>
+
+        public Visibility hScoreVisible4;
+
+        public Visibility HScoreVisible4
+        {
+            get { return hScoreVisible4; }
+            set { hScoreVisible4 = value; this.RaisePropertyChanged(nameof(hScoreVisible4)); }
+        }
+
+
+        /// <summary>
+        /// 赛季球员得分
+        /// </summary>
+
+        public string hSeasonScore4;
+
+        public string HSeasonScore4
+        {
+            get { return hSeasonScore4; }
+            set { hSeasonScore4 = value; this.RaisePropertyChanged(nameof(HSeasonScore4)); }
+        }
+
+
+        /// <summary>
+        /// 赛季球员是否可见
+        /// </summary>
+        private Visibility hSeasonScoreVisible4;
+        public Visibility HSeasonScoreVisible4
+        {
+            get { return hSeasonScoreVisible4; }
+            set { hSeasonScoreVisible4 = value; this.RaisePropertyChanged(nameof(HSeasonScoreVisible4)); }
+        }
+
+
+        /// <summary>
+        /// 技术统计
+        /// </summary>
+        private ObservableCollection<string> techStats4 = listTechStats;
+
+        public ObservableCollection<string> TechStats4
+        {
+            get { return techStats4; }
+            set { techStats4 = value; this.RaisePropertyChanged(nameof(TechStats4)); }
+        }
+
+
+
+        /// <summary>
+        /// 选中的值
+        /// </summary>
+        private string selectTechStats4 = "抢断";
+
+        public string SelectTechStats4
+        {
+            get { return selectTechStats4; }
+            set
+            {
+                selectTechStats4 = value;
+                this.RaisePropertyChanged(nameof(SelectTechStats4));
+
+                Utils.NewSetHData(this, 5);
+                Utils.NewSetAData(this, 5);
+            }
+        }
+
+
+        /// <summary>
+        /// 技术统计是否可见
+        /// </summary>
+        private Visibility techStatsVisible4;
+
+
+        public Visibility TechStatsVisible4
+        {
+            get { return techStatsVisible4; }
+            set { techStatsVisible3 = value; this.RaisePropertyChanged(nameof(TechStatsVisible4)); }
+        }
+
+
+        /// <summary>
+        /// 客队得分
+        /// </summary>
+
+        private string awayScore4;
+
+        public string AwayScore4
+        {
+            get { return awayScore4; }
+            set { awayScore4 = value; this.RaisePropertyChanged(nameof(AwayScore4)); }
+        }
+
+
+        /// <summary>
+        /// 客队得分是否可见
+        /// </summary>
+        private Visibility aScoreVisible4;
+
+        public Visibility AScoreVisible4
+        {
+            get { return aScoreVisible4; }
+
+            set { aScoreVisible3 = value; this.RaisePropertyChanged(nameof(AScoreVisible4)); }
+        }
+
+
+        /// <summary>
+        /// 客队赛季得分
+        /// </summary>
+        private string aSeasonScore4;
+
+        public string ASeasonScore4
+        {
+            get { return aSeasonScore4; }
+
+            set { aSeasonScore4 = value; this.RaisePropertyChanged(nameof(ASeasonScore4)); }
+        }
+
+
+        /// <summary>
+        /// 客队赛季得分是否可见
+        /// </summary>
+        private Visibility aSeasonScoreVisible4;
+
+        public Visibility ASeasonScoreVisible4
+        {
+            get { return aSeasonScoreVisible4; }
+            set { aSeasonScoreVisible4 = value; this.RaisePropertyChanged(nameof(ASeasonScoreVisible4)); }
+        }
+
+        #endregion
+
+
+        #region 第六项数据
+
+        /// <summary>
+        /// 是否高亮
+        /// </summary>
+
+        private bool isHeight5;
+
+        public bool IsHeight5
+        {
+            get { return isHeight5; }
+            set { isHeight5 = value; this.RaisePropertyChanged(nameof(IsHeight5)); }
+        }
+
+        /// <summary>
+        /// 是否显示
+        /// </summary>
+        private Visibility isCheckVisible5;
+        public Visibility IsCheckVisible5
+        {
+            get { return isCheckVisible5; }
+            set { isCheckVisible5 = value; this.RaisePropertyChanged(nameof(IsCheckVisible5)); }
+        }
+
+
+
+        /// <summary>
+        ///主队本场得分
+        /// </summary>
+        private string homeScore5;
+
+        public string HomeScore5
+        {
+            get { return homeScore5; }
+            set { homeScore5 = value; this.RaisePropertyChanged(nameof(HomeScore5)); }
+        }
+
+
+        /// <summary>
+        /// 主队本场得分是否可见
+        /// </summary>
+
+        public Visibility hScoreVisible5;
+
+        public Visibility HScoreVisible5
+        {
+            get { return hScoreVisible5; }
+            set { hScoreVisible5 = value; this.RaisePropertyChanged(nameof(hScoreVisible5)); }
+        }
+
+
+        /// <summary>
+        /// 赛季球员得分
+        /// </summary>
+
+        public string hSeasonScore5;
+
+        public string HSeasonScore5
+        {
+            get { return hSeasonScore5; }
+            set { hSeasonScore5 = value; this.RaisePropertyChanged(nameof(HSeasonScore5)); }
+        }
+
+
+        /// <summary>
+        /// 赛季球员是否可见
+        /// </summary>
+        private Visibility hSeasonScoreVisible5;
+        public Visibility HSeasonScoreVisible5
+        {
+            get { return hSeasonScoreVisible5; }
+            set { hSeasonScoreVisible5 = value; this.RaisePropertyChanged(nameof(HSeasonScoreVisible5)); }
+        }
+
+
+        /// <summary>
+        /// 技术统计
+        /// </summary>
+        private ObservableCollection<string> techStats5 = listTechStats;
+
+        public ObservableCollection<string> TechStats5
+        {
+            get { return techStats5; }
+            set { techStats5 = value; this.RaisePropertyChanged(nameof(TechStats5)); }
+        }
+
+
+
+        /// <summary>
+        /// 选中的值
+        /// </summary>
+        private string selectTechStats5 = "投篮命中率";
+
+        public string SelectTechStats5
+        {
+            get { return selectTechStats5; }
+            set
+            {
+                selectTechStats5 = value;
+                this.RaisePropertyChanged(nameof(SelectTechStats5));
+
+                Utils.NewSetHData(this, 6);
+                Utils.NewSetAData(this, 6);
+            }
+        }
+
+
+        /// <summary>
+        /// 技术统计是否可见
+        /// </summary>
+        private Visibility techStatsVisible5;
+
+
+        public Visibility TechStatsVisible5
+        {
+            get { return techStatsVisible5; }
+            set { techStatsVisible5 = value; this.RaisePropertyChanged(nameof(TechStatsVisible5)); }
+        }
+
+
+        /// <summary>
+        /// 客队得分
+        /// </summary>
+
+        private string awayScore5;
+
+        public string AwayScore5
+        {
+            get { return awayScore5; }
+            set { awayScore5 = value; this.RaisePropertyChanged(nameof(AwayScore5)); }
+        }
+
+
+        /// <summary>
+        /// 客队得分是否可见
+        /// </summary>
+        private Visibility aScoreVisible5;
+
+        public Visibility AScoreVisible5
+        {
+            get { return aScoreVisible5; }
+
+            set { aScoreVisible5 = value; this.RaisePropertyChanged(nameof(AScoreVisible5)); }
+        }
+
+
+        /// <summary>
+        /// 客队赛季得分
+        /// </summary>
+        private string aSeasonScore5;
+
+        public string ASeasonScore5
+        {
+            get { return aSeasonScore5; }
+
+            set { aSeasonScore5 = value; this.RaisePropertyChanged(nameof(ASeasonScore5)); }
+        }
+
+
+        /// <summary>
+        /// 客队赛季得分是否可见
+        /// </summary>
+        private Visibility aSeasonScoreVisible5;
+
+        public Visibility ASeasonScoreVisible5
+        {
+            get { return aSeasonScoreVisible5; }
+            set { aSeasonScoreVisible5 = value; this.RaisePropertyChanged(nameof(ASeasonScoreVisible5)); }
+        }
+
+        #endregion
+
+
+        #region 第七项数据
+
+        /// <summary>
+        /// 是否高亮
+        /// </summary>
+
+        private bool isHeight6;
+
+        public bool IsHeight6
+        {
+            get { return isHeight6; }
+            set { isHeight6 = value; this.RaisePropertyChanged(nameof(IsHeight5)); }
+        }
+
+        /// <summary>
+        /// 是否显示
+        /// </summary>
+        private Visibility isCheckVisible6;
+        public Visibility IsCheckVisible6
+        {
+            get { return isCheckVisible6; }
+            set { isCheckVisible6 = value; this.RaisePropertyChanged(nameof(IsCheckVisible6)); }
+        }
+
+
+
+        /// <summary>
+        ///主队本场得分
+        /// </summary>
+        private string homeScore6;
+
+        public string HomeScore6
+        {
+            get { return homeScore6; }
+            set { homeScore6 = value; this.RaisePropertyChanged(nameof(HomeScore6)); }
+        }
+
+
+        /// <summary>
+        /// 主队本场得分是否可见
+        /// </summary>
+
+        public Visibility hScoreVisible6;
+
+        public Visibility HScoreVisible6
+        {
+            get { return hScoreVisible6; }
+            set { hScoreVisible6 = value; this.RaisePropertyChanged(nameof(hScoreVisible6)); }
+        }
+
+
+        /// <summary>
+        /// 赛季球员得分
+        /// </summary>
+
+        public string hSeasonScore6;
+
+        public string HSeasonScore6
+        {
+            get { return hSeasonScore6; }
+            set { hSeasonScore6 = value; this.RaisePropertyChanged(nameof(HSeasonScore6)); }
+        }
+
+
+        /// <summary>
+        /// 赛季球员是否可见
+        /// </summary>
+        private Visibility hSeasonScoreVisible6;
+        public Visibility HSeasonScoreVisible6
+        {
+            get { return hSeasonScoreVisible6; }
+            set { hSeasonScoreVisible6 = value; this.RaisePropertyChanged(nameof(HSeasonScoreVisible6)); }
+        }
+
+
+        /// <summary>
+        /// 技术统计
+        /// </summary>
+        private ObservableCollection<string> techStats6 = listTechStats;
+
+        public ObservableCollection<string> TechStats6
+        {
+            get { return techStats6; }
+            set { techStats6 = value; this.RaisePropertyChanged(nameof(TechStats6)); }
+        }
+
+
+
+        /// <summary>
+        /// 选中的值
+        /// </summary>
+        private string selectTechStats6 = "三分命中率";
+
+        public string SelectTechStats6
+        {
+            get { return selectTechStats6; }
+            set
+            {
+                selectTechStats6 = value;
+                this.RaisePropertyChanged(nameof(SelectTechStats6));
+
+                Utils.NewSetHData(this, 7);
+                Utils.NewSetAData(this, 7);
+            }
+        }
+
+
+        /// <summary>
+        /// 技术统计是否可见
+        /// </summary>
+        private Visibility techStatsVisible6;
+
+
+        public Visibility TechStatsVisible6
+        {
+            get { return techStatsVisible6; }
+            set { techStatsVisible6 = value; this.RaisePropertyChanged(nameof(TechStatsVisible6)); }
+        }
+
+
+        /// <summary>
+        /// 客队得分
+        /// </summary>
+
+        private string awayScore6;
+
+        public string AwayScore6
+        {
+            get { return awayScore6; }
+            set { awayScore6 = value; this.RaisePropertyChanged(nameof(AwayScore6)); }
+        }
+
+
+        /// <summary>
+        /// 客队得分是否可见
+        /// </summary>
+        private Visibility aScoreVisible6;
+
+        public Visibility AScoreVisible6
+        {
+            get { return aScoreVisible6; }
+
+            set { aScoreVisible6 = value; this.RaisePropertyChanged(nameof(AScoreVisible6)); }
+        }
+
+
+        /// <summary>
+        /// 客队赛季得分
+        /// </summary>
+        private string aSeasonScore6;
+
+        public string ASeasonScore6
+        {
+            get { return aSeasonScore6; }
+
+            set { aSeasonScore6 = value; this.RaisePropertyChanged(nameof(ASeasonScore6)); }
+        }
+
+
+        /// <summary>
+        /// 客队赛季得分是否可见
+        /// </summary>
+        private Visibility aSeasonScoreVisible6;
+
+        public Visibility ASeasonScoreVisible6
+        {
+            get { return aSeasonScoreVisible6; }
+            set { aSeasonScoreVisible6 = value; this.RaisePropertyChanged(nameof(ASeasonScoreVisible6)); }
+        }
+
+        #endregion
+    }
+}

VIZ.MIGU.CBA.Module/VIZ.TVP.CBA.Module.csproj

@@ -151,6 +151,11 @@
     <Compile Include="OnAirData\LiveTeamStatH.cs" />
     <Compile Include="OnAirData\LiveTeamStatH.cs" />
     <Compile Include="OnAirData\LiveTeamStatV.cs" />
     <Compile Include="OnAirData\LiveTeamStatV.cs" />
     <Compile Include="OnAirData\OnAirDataModel.cs" />
     <Compile Include="OnAirData\OnAirDataModel.cs" />
+    <Compile Include="PlayerComPareTask\PlayerCompareViewModelPluginTask.cs" />
+    <Compile Include="PlayerComPareTask\ViewModel\PlayerComPareViewModelTask.cs" />
+    <Compile Include="PlayerComPareTask\View\PlayerComPareViewTask.xaml.cs">
+      <DependentUpon>PlayerComPareViewTask.xaml</DependentUpon>
+    </Compile>
     <Compile Include="PlayerCompare\Model\PlayerComModel.cs" />
     <Compile Include="PlayerCompare\Model\PlayerComModel.cs" />
     <Compile Include="PlayerCompare\PlayerComparePlugin.cs" />
     <Compile Include="PlayerCompare\PlayerComparePlugin.cs" />
     <Compile Include="PlayerCompare\ViewModel\NewPlayerComPareViewModel.cs" />
     <Compile Include="PlayerCompare\ViewModel\NewPlayerComPareViewModel.cs" />
@@ -197,6 +202,11 @@
     <Compile Include="TeamStandings\View\TeamStandingView.xaml.cs">
     <Compile Include="TeamStandings\View\TeamStandingView.xaml.cs">
       <DependentUpon>TeamStandingView.xaml</DependentUpon>
       <DependentUpon>TeamStandingView.xaml</DependentUpon>
     </Compile>
     </Compile>
+    <Compile Include="TeamStatsTask\TeamStatsTaskPlugin.cs" />
+    <Compile Include="TeamStatsTask\ViewModel\TeamStatsTaskViewModel.cs" />
+    <Compile Include="TeamStatsTask\View\TeamStatsTaskView.xaml.cs">
+      <DependentUpon>TeamStatsTaskView.xaml</DependentUpon>
+    </Compile>
     <Compile Include="TeamStats\Model\MatchStatsNumbers.cs" />
     <Compile Include="TeamStats\Model\MatchStatsNumbers.cs" />
     <Compile Include="TeamStats\TeamStatsPlugin.cs" />
     <Compile Include="TeamStats\TeamStatsPlugin.cs" />
     <Compile Include="TeamStats\ViewModel\NewTeamStatsViewModel.cs" />
     <Compile Include="TeamStats\ViewModel\NewTeamStatsViewModel.cs" />
@@ -280,6 +290,10 @@
       <Project>{06b80c09-343d-4bb2-aeb1-61cfbfbf5cad}</Project>
       <Project>{06b80c09-343d-4bb2-aeb1-61cfbfbf5cad}</Project>
       <Name>VIZ.Framework.Storage</Name>
       <Name>VIZ.Framework.Storage</Name>
     </ProjectReference>
     </ProjectReference>
+    <ProjectReference Include="..\..\VIZ.Package\VIZ.Package.Common\VIZ.Package.Common.csproj">
+      <Project>{e4912bce-bc90-4457-9ee3-06435496d979}</Project>
+      <Name>VIZ.Package.Common</Name>
+    </ProjectReference>
     <ProjectReference Include="..\..\VIZ.Package\VIZ.Package.Connection\VIZ.Package.Connection.csproj">
     <ProjectReference Include="..\..\VIZ.Package\VIZ.Package.Connection\VIZ.Package.Connection.csproj">
       <Project>{421527f6-37b8-4615-9317-ffd5e272181b}</Project>
       <Project>{421527f6-37b8-4615-9317-ffd5e272181b}</Project>
       <Name>VIZ.Package.Connection</Name>
       <Name>VIZ.Package.Connection</Name>
@@ -330,6 +344,10 @@
       <SubType>Designer</SubType>
       <SubType>Designer</SubType>
       <Generator>MSBuild:Compile</Generator>
       <Generator>MSBuild:Compile</Generator>
     </Page>
     </Page>
+    <Page Include="PlayerComPareTask\View\PlayerComPareViewTask.xaml">
+      <SubType>Designer</SubType>
+      <Generator>MSBuild:Compile</Generator>
+    </Page>
     <Page Include="PlayerCompare\View\NewPlayerComPareView.xaml">
     <Page Include="PlayerCompare\View\NewPlayerComPareView.xaml">
       <SubType>Designer</SubType>
       <SubType>Designer</SubType>
       <Generator>MSBuild:Compile</Generator>
       <Generator>MSBuild:Compile</Generator>
@@ -366,6 +384,10 @@
       <SubType>Designer</SubType>
       <SubType>Designer</SubType>
       <Generator>MSBuild:Compile</Generator>
       <Generator>MSBuild:Compile</Generator>
     </Page>
     </Page>
+    <Page Include="TeamStatsTask\View\TeamStatsTaskView.xaml">
+      <SubType>Designer</SubType>
+      <Generator>MSBuild:Compile</Generator>
+    </Page>
     <Page Include="TeamStats\View\NewTeamStatsView.xaml">
     <Page Include="TeamStats\View\NewTeamStatsView.xaml">
       <SubType>Designer</SubType>
       <SubType>Designer</SubType>
       <Generator>MSBuild:Compile</Generator>
       <Generator>MSBuild:Compile</Generator>

VIZ.TVP.FTB.Module/Common/JsonModel.cs

@@ -171,7 +171,7 @@ namespace VIZ.TVP.FTB.Module
         /// <param name="footballType"></param>
         /// <param name="footballType"></param>
         /// <param name="seasonId"></param>
         /// <param name="seasonId"></param>
         /// <returns></returns>
         /// <returns></returns>
-        public async static Task<ShootPlayerRanks> Post_ShootPlayerRankData(string footballType, string seasonId)
+        public async static Task<ShootPlayerRanks> Post_ShootPlayerRankData(string footballType, string seasonId,string startOffset,string endOffset)
         {
         {
             try
             try
             {
             {
@@ -184,6 +184,8 @@ namespace VIZ.TVP.FTB.Module
 
 
                     dict.Add("competitionId", footballType);
                     dict.Add("competitionId", footballType);
                     dict.Add("seasonId", seasonId);//"110000005454"
                     dict.Add("seasonId", seasonId);//"110000005454"
+                    dict.Add("startOffset", startOffset);
+                    dict.Add("endOffset", endOffset);
 
 
                     string newKey = Utils.GetKey(appID, appKey);
                     string newKey = Utils.GetKey(appID, appKey);
 
 

VIZ.TVP.FTB.Module/FDayMatch/View/FDayMatchView.xaml

@@ -10,6 +10,10 @@
                       xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
                       xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
                       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.FTB.Module"
                       xmlns:storage="clr-namespace:VIZ.TVP.FTB.Module"
+             
+                      xmlns:common="clr-namespace:VIZ.Package.Common;assembly=VIZ.Package.Common"
+                      xmlns:dxb="http://schemas.devexpress.com/winfx/2008/xaml/bars"
+                      x:Name="uc"
                       mc:Ignorable="d"
                       mc:Ignorable="d"
                       d:DesignHeight="400"
                       d:DesignHeight="400"
                       d:DesignWidth="750"
                       d:DesignWidth="750"
@@ -134,12 +138,40 @@
                 <dxg:GridColumn FieldName="status" Header="比赛状态" Width="180" />
                 <dxg:GridColumn FieldName="status" Header="比赛状态" Width="180" />
 
 
                 <dxg:GridControl.View>
                 <dxg:GridControl.View>
-                    <dxg:TableView AutoWidth="True"  ShowGroupPanel="False" 
+                    <!--<dxg:TableView AutoWidth="True"  ShowGroupPanel="False" 
                                BorderThickness="0"  
                                BorderThickness="0"  
                                ShowFilterPanelMode="Never" 
                                ShowFilterPanelMode="Never" 
                                AllowColumnFiltering="False"
                                AllowColumnFiltering="False"
                                AllowSorting="False"
                                AllowSorting="False"
                                IsColumnMenuEnabled="False"  >
                                IsColumnMenuEnabled="False"  >
+                    </dxg:TableView>-->
+
+
+                    <dxg:TableView IsColumnMenuEnabled="True"
+                                                       IsColumnChooserVisible="{Binding Path=IsColumnChooserVisible,Mode=TwoWay}"
+                                                       AllowEditing="True" ShowIndicator="False"  AutoWidth="True"
+                                                       NavigationStyle="Cell" ShowVerticalLines="False" ShowHorizontalLines="False"
+                                                       ShowGroupPanel="False" EditorShowMode="MouseDown"
+                                                       AllowDragDrop="True"
+                                                       AlternateRowBackground="#05ffffff"
+                                                       ShowBandsPanel="False"
+                                                       ShowTotalSummary="False"
+                                                       ShowFixedTotalSummary="False" 
+                                                       ShowDragDropHint="False" 
+                                                       AllowSorting="False" 
+                                                       AllowColumnFiltering="False"
+                                                       ShowTargetInfoInDragDropHint="false">
+
+                        <dxmvvm:Interaction.Behaviors>
+                            <dxmvvm:EventToCommand EventName="ShowGridMenu" Command="{Binding ElementName=uc, Path=DataContext.ShowGridMenuCommand}" PassEventArgsToCommand="True"></dxmvvm:EventToCommand>
+                        </dxmvvm:Interaction.Behaviors>
+
+                        <dxg:TableView.ColumnMenuCustomizations>
+                            <dxb:BarButtonItem Name="ShowColumnChooser" Content="显示列选择" 
+                                               Command="{Binding ElementName=uc,Path=DataContext.ColumnChoiceCommand}"
+                                               Tag="{x:Static Member=common:GridControlHelper.KEEP_MENU_TAG}"/>
+                        </dxg:TableView.ColumnMenuCustomizations>
+
                     </dxg:TableView>
                     </dxg:TableView>
 
 
                 </dxg:GridControl.View>
                 </dxg:GridControl.View>

VIZ.TVP.FTB.Module/FDayMatch/ViewModel/FDayMatchViewModel.cs

-using log4net;
+using DevExpress.Xpf.Grid;
+using log4net;
 using System;
 using System;
 using System.Collections.Generic;
 using System.Collections.Generic;
 using System.Collections.ObjectModel;
 using System.Collections.ObjectModel;
@@ -7,6 +8,7 @@ using System.Text;
 using System.Threading.Tasks;
 using System.Threading.Tasks;
 using System.Windows.Markup;
 using System.Windows.Markup;
 using VIZ.Framework.Core;
 using VIZ.Framework.Core;
+using VIZ.Package.Common;
 
 
 namespace VIZ.TVP.FTB.Module
 namespace VIZ.TVP.FTB.Module
 {
 {
@@ -208,6 +210,8 @@ namespace VIZ.TVP.FTB.Module
             BtnRoundCmd = new VCommand(BtmRoundCommand);
             BtnRoundCmd = new VCommand(BtmRoundCommand);
             PromptCommand = new VCommand(PromptCmd);
             PromptCommand = new VCommand(PromptCmd);
 
 
+            ColumnChoiceCommand = new VCommand(ColumnChoice);
+            ShowGridMenuCommand = new VCommand<GridMenuEventArgs>(ShowGridMenu);
 
 
             RoundMatchs = new ObservableCollection<int>();
             RoundMatchs = new ObservableCollection<int>();
             for (int i = 1; i < 39; i++)
             for (int i = 1; i < 39; i++)
@@ -223,6 +227,58 @@ namespace VIZ.TVP.FTB.Module
         }
         }
 
 
 
 
+        #region IsColumnChooserVisible -- 是否显示列选择器
+
+        private bool isColumnChooserVisible;
+        /// <summary>
+        /// 是否显示列选择器
+        /// </summary>
+        public bool IsColumnChooserVisible
+        {
+            get { return isColumnChooserVisible; }
+            set { isColumnChooserVisible = value; this.RaisePropertyChanged(nameof(IsColumnChooserVisible)); }
+        }
+
+        #endregion
+
+
+        #region ColumnChoiceCommand -- 列选择命令
+
+        /// <summary>
+        /// 列选择命令
+        /// </summary>
+        public VCommand ColumnChoiceCommand { get; set; }
+
+        /// <summary>
+        /// 列选择
+        /// </summary>
+        private void ColumnChoice()
+        {
+            this.IsColumnChooserVisible = true;
+        }
+
+        #endregion
+
+
+        #region ShowGridMenuCommand -- 显示列命令
+
+        /// <summary>
+        /// 显示列命令
+        /// </summary>
+        public VCommand<GridMenuEventArgs> ShowGridMenuCommand { get; set; }
+
+        /// <summary>
+        /// 显示列
+        /// </summary>
+        /// <param name="e">事件参数</param>
+        private void ShowGridMenu(GridMenuEventArgs e)
+        {
+            GridControlHelper.RemoveAllDefaultMenuItem(e);
+        }
+
+        #endregion
+
+
         /// <summary>
         /// <summary>
         /// 组装往包装发送得数据
         /// 组装往包装发送得数据
         /// </summary>
         /// </summary>

VIZ.TVP.FTB.Module/FTeamStandings/View/FTeamStandingView.xaml

@@ -10,6 +10,10 @@
                       xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
                       xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
                       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.FTB.Module"
                       xmlns:storage="clr-namespace:VIZ.TVP.FTB.Module"
+             
+                      xmlns:common="clr-namespace:VIZ.Package.Common;assembly=VIZ.Package.Common"
+                      xmlns:dxb="http://schemas.devexpress.com/winfx/2008/xaml/bars"
+                      x:Name="uc"
                       mc:Ignorable="d"
                       mc:Ignorable="d"
                       d:DesignHeight="800" d:DesignWidth="650">
                       d:DesignHeight="800" d:DesignWidth="650">
 
 
@@ -97,12 +101,39 @@
                 <dxg:GridColumn FieldName="score" Header="积分" Width="180"  />
                 <dxg:GridColumn FieldName="score" Header="积分" Width="180"  />
      
      
                 <dxg:GridControl.View>
                 <dxg:GridControl.View>
-                    <dxg:TableView AutoWidth="True"  ShowGroupPanel="False" 
+                    <!--<dxg:TableView AutoWidth="True"  ShowGroupPanel="False" 
                                BorderThickness="0"  
                                BorderThickness="0"  
                                ShowFilterPanelMode="Never" 
                                ShowFilterPanelMode="Never" 
                                AllowColumnFiltering="False"
                                AllowColumnFiltering="False"
                                AllowSorting="False"
                                AllowSorting="False"
                                IsColumnMenuEnabled="False"  >
                                IsColumnMenuEnabled="False"  >
+                    </dxg:TableView>-->
+
+                    <dxg:TableView IsColumnMenuEnabled="True"
+                                                       IsColumnChooserVisible="{Binding Path=IsColumnChooserVisible,Mode=TwoWay}"
+                                                       AllowEditing="True" ShowIndicator="False"  AutoWidth="True"
+                                                       NavigationStyle="Cell" ShowVerticalLines="False" ShowHorizontalLines="False"
+                                                       ShowGroupPanel="False" EditorShowMode="MouseDown"
+                                                       AllowDragDrop="True"
+                                                       AlternateRowBackground="#05ffffff"
+                                                       ShowBandsPanel="False"
+                                                       ShowTotalSummary="False"
+                                                       ShowFixedTotalSummary="False" 
+                                                       ShowDragDropHint="False" 
+                                                       AllowSorting="False" 
+                                                       AllowColumnFiltering="False"
+                                                       ShowTargetInfoInDragDropHint="false">
+
+                        <dxmvvm:Interaction.Behaviors>
+                            <dxmvvm:EventToCommand EventName="ShowGridMenu" Command="{Binding ElementName=uc, Path=DataContext.ShowGridMenuCommand}" PassEventArgsToCommand="True"></dxmvvm:EventToCommand>
+                        </dxmvvm:Interaction.Behaviors>
+
+                        <dxg:TableView.ColumnMenuCustomizations>
+                            <dxb:BarButtonItem Name="ShowColumnChooser" Content="显示列选择" 
+                                               Command="{Binding ElementName=uc,Path=DataContext.ColumnChoiceCommand}"
+                                               Tag="{x:Static Member=common:GridControlHelper.KEEP_MENU_TAG}"/>
+                        </dxg:TableView.ColumnMenuCustomizations>
+
                     </dxg:TableView>
                     </dxg:TableView>
                 </dxg:GridControl.View>
                 </dxg:GridControl.View>
             </dxg:GridControl>
             </dxg:GridControl>

VIZ.TVP.FTB.Module/FTeamStandings/ViewModel/FTeamStandingViewModel.cs

-using log4net;
+using DevExpress.Xpf.Grid;
+using log4net;
 using System;
 using System;
 using System.Collections.ObjectModel;
 using System.Collections.ObjectModel;
 using VIZ.Framework.Core;
 using VIZ.Framework.Core;
+using VIZ.Package.Common;
 
 
 namespace VIZ.TVP.FTB.Module
 namespace VIZ.TVP.FTB.Module
 {
 {
@@ -192,10 +194,65 @@ namespace VIZ.TVP.FTB.Module
 
 
             PromptCommand = new VCommand(PromptCmd);
             PromptCommand = new VCommand(PromptCmd);
 
 
+            ColumnChoiceCommand = new VCommand(ColumnChoice);
+            ShowGridMenuCommand = new VCommand<GridMenuEventArgs>(ShowGridMenu);
+
             FoolballType = DateHeaderViewModel.FoolballType;
             FoolballType = DateHeaderViewModel.FoolballType;
             SeasonId = DateHeaderViewModel.SeasonId;
             SeasonId = DateHeaderViewModel.SeasonId;
         }
         }
 
 
+
+        #region IsColumnChooserVisible -- 是否显示列选择器
+
+        private bool isColumnChooserVisible;
+        /// <summary>
+        /// 是否显示列选择器
+        /// </summary>
+        public bool IsColumnChooserVisible
+        {
+            get { return isColumnChooserVisible; }
+            set { isColumnChooserVisible = value; this.RaisePropertyChanged(nameof(IsColumnChooserVisible)); }
+        }
+
+        #endregion
+
+
+        #region ColumnChoiceCommand -- 列选择命令
+
+        /// <summary>
+        /// 列选择命令
+        /// </summary>
+        public VCommand ColumnChoiceCommand { get; set; }
+
+        /// <summary>
+        /// 列选择
+        /// </summary>
+        private void ColumnChoice()
+        {
+            this.IsColumnChooserVisible = true;
+        }
+
+        #endregion
+
+
+        #region ShowGridMenuCommand -- 显示列命令
+
+        /// <summary>
+        /// 显示列命令
+        /// </summary>
+        public VCommand<GridMenuEventArgs> ShowGridMenuCommand { get; set; }
+
+        /// <summary>
+        /// 显示列
+        /// </summary>
+        /// <param name="e">事件参数</param>
+        private void ShowGridMenu(GridMenuEventArgs e)
+        {
+            GridControlHelper.RemoveAllDefaultMenuItem(e);
+        }
+
+        #endregion
+
         #region 打开更新数据时间日志
         #region 打开更新数据时间日志
         /// <summary>
         /// <summary>
         /// 打开数据更新日志
         /// 打开数据更新日志

VIZ.TVP.FTB.Module/Setting/httpUrl/View/HttpUrlConfigView.xaml

@@ -42,10 +42,6 @@
                     <RowDefinition Height="40"></RowDefinition>
                     <RowDefinition Height="40"></RowDefinition>
                     <RowDefinition Height="40"></RowDefinition>
                     <RowDefinition Height="40"></RowDefinition>
                     <RowDefinition Height="40"></RowDefinition>
                     <RowDefinition Height="40"></RowDefinition>
-  
-
-
-
 
 
                 </Grid.RowDefinitions>
                 </Grid.RowDefinitions>
                 <!-- 地址 -->
                 <!-- 地址 -->

VIZ.TVP.FTB.Module/ShootPlayerRank/View/ShootPlayerRankView.xaml

@@ -10,8 +10,12 @@
                       xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
                       xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
                       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.FTB.Module"
                       xmlns:storage="clr-namespace:VIZ.TVP.FTB.Module"
+             
+                      xmlns:common="clr-namespace:VIZ.Package.Common;assembly=VIZ.Package.Common"
+                      xmlns:dxb="http://schemas.devexpress.com/winfx/2008/xaml/bars"
+                      x:Name="uc"
                       mc:Ignorable="d"
                       mc:Ignorable="d"
-                      d:DesignHeight="800" d:DesignWidth="650">
+                      d:DesignHeight="800" d:DesignWidth="800">
 
 
     <UserControl.Resources>
     <UserControl.Resources>
         <ResourceDictionary>
         <ResourceDictionary>
@@ -37,13 +41,13 @@
             <RowDefinition Height="*"/>
             <RowDefinition Height="*"/>
         </Grid.RowDefinitions>
         </Grid.RowDefinitions>
 
 
-        <WrapPanel Grid.Row="0" HorizontalAlignment="Center" VerticalAlignment="Center" Width="650" >
+        <WrapPanel Grid.Row="0" HorizontalAlignment="Center" VerticalAlignment="Center" Width="800" >
             <Grid>
             <Grid>
                 <Grid.ColumnDefinitions>
                 <Grid.ColumnDefinitions>
                     <ColumnDefinition Width="70"/>
                     <ColumnDefinition Width="70"/>
                     <ColumnDefinition Width="285"/>
                     <ColumnDefinition Width="285"/>
                     <ColumnDefinition Width="0"/>
                     <ColumnDefinition Width="0"/>
-                    <ColumnDefinition Width="150"/>
+                    <ColumnDefinition Width="300"/>
                     <ColumnDefinition Width="140"/>
                     <ColumnDefinition Width="140"/>
                     <!--<ColumnDefinition Width="120"/>-->
                     <!--<ColumnDefinition Width="120"/>-->
                 </Grid.ColumnDefinitions>
                 </Grid.ColumnDefinitions>
@@ -53,6 +57,33 @@
                 <dxe:TextEdit Grid.Column="1"   Width="280"  FontSize="16"   HorizontalContentAlignment="Left" 
                 <dxe:TextEdit Grid.Column="1"   Width="280"  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>
 
 
+
+                <WrapPanel Grid.Row="0" Grid.Column="3" VerticalAlignment="Center" HorizontalAlignment="Center" >
+
+                    <Grid>
+                        <Grid.ColumnDefinitions>
+                            <ColumnDefinition Width="75"/>
+                            <ColumnDefinition Width="75"/>
+                            <ColumnDefinition Width="75"/>
+                            <ColumnDefinition Width="75"/>
+                        </Grid.ColumnDefinitions>
+
+                        <TextBlock Text="起始："  FontSize="16"  Grid.Column="0" HorizontalAlignment="Center" VerticalAlignment="Center"></TextBlock>
+
+                        <dxe:TextEdit Grid.Column="1" FontSize="16" HorizontalAlignment="Center" VerticalAlignment="Center" HorizontalContentAlignment="Center" 
+                                      Text="{Binding  StartOffset,Mode=TwoWay}" Width="60"/>
+
+                        <TextBlock Text="结束：" FontSize="16"  Grid.Column="2" HorizontalAlignment="Center" VerticalAlignment="Center"></TextBlock>
+
+
+                        <dxe:TextEdit Grid.Column="4" FontSize="16" HorizontalAlignment="Center" VerticalAlignment="Center" HorizontalContentAlignment="Center" 
+                                      Text="{Binding EndOffset,Mode=TwoWay}" Width="60"/>
+
+
+                    </Grid>
+                    
+                </WrapPanel>
+
                 <WrapPanel Grid.Row="0" Grid.Column="4" HorizontalAlignment="Center" VerticalAlignment="Center">
                 <WrapPanel Grid.Row="0" Grid.Column="4" HorizontalAlignment="Center" VerticalAlignment="Center">
 
 
                     <Grid>
                     <Grid>
@@ -94,13 +125,42 @@
                 <dxg:GridColumn FieldName="PenaltyGoal" Header="点球" Width="100" />
                 <dxg:GridColumn FieldName="PenaltyGoal" Header="点球" Width="100" />
 
 
                 <dxg:GridControl.View>
                 <dxg:GridControl.View>
-                    <dxg:TableView AutoWidth="True"  ShowGroupPanel="False" 
+                    <!--<dxg:TableView AutoWidth="True"  ShowGroupPanel="False" 
                                BorderThickness="0"  
                                BorderThickness="0"  
                                ShowFilterPanelMode="Never" 
                                ShowFilterPanelMode="Never" 
                                AllowColumnFiltering="False"
                                AllowColumnFiltering="False"
                                AllowSorting="False"
                                AllowSorting="False"
                                IsColumnMenuEnabled="False"  >
                                IsColumnMenuEnabled="False"  >
+                    </dxg:TableView>-->
+
+
+                    <dxg:TableView IsColumnMenuEnabled="True"
+                                                       IsColumnChooserVisible="{Binding Path=IsColumnChooserVisible,Mode=TwoWay}"
+                                                       AllowEditing="True" ShowIndicator="False"  AutoWidth="True"
+                                                       NavigationStyle="Cell" ShowVerticalLines="False" ShowHorizontalLines="False"
+                                                       ShowGroupPanel="False" EditorShowMode="MouseDown"
+                                                       AllowDragDrop="True"
+                                                       AlternateRowBackground="#05ffffff"
+                                                       ShowBandsPanel="False"
+                                                       ShowTotalSummary="False"
+                                                       ShowFixedTotalSummary="False" 
+                                                       ShowDragDropHint="False" 
+                                                       AllowSorting="False" 
+                                                       AllowColumnFiltering="False"
+                                                       ShowTargetInfoInDragDropHint="false">
+
+                        <dxmvvm:Interaction.Behaviors>
+                            <dxmvvm:EventToCommand EventName="ShowGridMenu" Command="{Binding ElementName=uc, Path=DataContext.ShowGridMenuCommand}" PassEventArgsToCommand="True"></dxmvvm:EventToCommand>
+                        </dxmvvm:Interaction.Behaviors>
+
+                        <dxg:TableView.ColumnMenuCustomizations>
+                            <dxb:BarButtonItem Name="ShowColumnChooser" Content="显示列选择" 
+                                               Command="{Binding ElementName=uc,Path=DataContext.ColumnChoiceCommand}"
+                                               Tag="{x:Static Member=common:GridControlHelper.KEEP_MENU_TAG}"/>
+                        </dxg:TableView.ColumnMenuCustomizations>
+
                     </dxg:TableView>
                     </dxg:TableView>
+
                 </dxg:GridControl.View>
                 </dxg:GridControl.View>
             </dxg:GridControl>
             </dxg:GridControl>
         </DockPanel>
         </DockPanel>

VIZ.TVP.FTB.Module/ShootPlayerRank/ViewModel/ShootPlayerRankViewModel.cs

 using DevExpress.Mvvm.POCO;
 using DevExpress.Mvvm.POCO;
+using DevExpress.Xpf.Grid;
 using log4net;
 using log4net;
 using System;
 using System;
 using System.Collections.Generic;
 using System.Collections.Generic;
@@ -7,6 +8,7 @@ using System.Linq;
 using System.Text;
 using System.Text;
 using System.Threading.Tasks;
 using System.Threading.Tasks;
 using VIZ.Framework.Core;
 using VIZ.Framework.Core;
+using VIZ.Package.Common;
 
 
 namespace VIZ.TVP.FTB.Module
 namespace VIZ.TVP.FTB.Module
 {
 {
@@ -82,8 +84,7 @@ namespace VIZ.TVP.FTB.Module
 
 
                 SeasonId = AppSetup_InitLiteDB.HttpUrlConfigEntity.SLPSeasonId;
                 SeasonId = AppSetup_InitLiteDB.HttpUrlConfigEntity.SLPSeasonId;
             }
             }
-
-            shootPlayerRanks = await JsonModel.Post_ShootPlayerRankData(FoolballType, SeasonId);
+            shootPlayerRanks = await JsonModel.Post_ShootPlayerRankData(FoolballType, SeasonId,StartOffset,EndOffset);
             if (shootPlayerRanks == null) return;
             if (shootPlayerRanks == null) return;
             ShootPlayerModel = new ObservableCollection<ShootPlayerRank>();
             ShootPlayerModel = new ObservableCollection<ShootPlayerRank>();
         
         
@@ -157,10 +158,44 @@ namespace VIZ.TVP.FTB.Module
         public string Title
         public string Title
         {
         {
             get { return title; }
             get { return title; }
-            set { title = value; this.RaisePropertyChanged(nameof(Title)); }
+            set
+            {
+                title = value; 
+                this.RaisePropertyChanged(nameof(Title)); 
+            }
         }
         }
 
 
 
 
+        /// <summary>
+        /// 开始条数
+        /// </summary>
+        private string startOffset = "0";
+        public string StartOffset
+        {
+            get { return startOffset; }
+            set
+            {
+                startOffset = value;
+                this.RaisePropertyChanged(nameof(StartOffset));
+            } 
+        }
+
+        /// <summary>
+        /// 结束条数
+        /// </summary>
+        private string endOffset = "5";
+
+
+        public string EndOffset
+        {
+            get { return endOffset; }
+            set
+            { 
+                endOffset = value;
+                this.RaisePropertyChanged(nameof(EndOffset));
+            }
+        }
+
 
 
         /// <summary>
         /// <summary>
         /// 足球赛事类型
         /// 足球赛事类型
@@ -182,10 +217,65 @@ namespace VIZ.TVP.FTB.Module
 
 
             PromptCommand = new VCommand(PromptCmd);
             PromptCommand = new VCommand(PromptCmd);
 
 
+            ColumnChoiceCommand = new VCommand(ColumnChoice);
+            ShowGridMenuCommand = new VCommand<GridMenuEventArgs>(ShowGridMenu);
+
             FoolballType = DateHeaderViewModel.FoolballType;
             FoolballType = DateHeaderViewModel.FoolballType;
             SeasonId = DateHeaderViewModel.SeasonId;
             SeasonId = DateHeaderViewModel.SeasonId;
         }
         }
 
 
+
+        #region IsColumnChooserVisible -- 是否显示列选择器
+
+        private bool isColumnChooserVisible;
+        /// <summary>
+        /// 是否显示列选择器
+        /// </summary>
+        public bool IsColumnChooserVisible
+        {
+            get { return isColumnChooserVisible; }
+            set { isColumnChooserVisible = value; this.RaisePropertyChanged(nameof(IsColumnChooserVisible)); }
+        }
+
+        #endregion
+
+
+        #region ColumnChoiceCommand -- 列选择命令
+
+        /// <summary>
+        /// 列选择命令
+        /// </summary>
+        public VCommand ColumnChoiceCommand { get; set; }
+
+        /// <summary>
+        /// 列选择
+        /// </summary>
+        private void ColumnChoice()
+        {
+            this.IsColumnChooserVisible = true;
+        }
+
+        #endregion
+
+
+        #region ShowGridMenuCommand -- 显示列命令
+
+        /// <summary>
+        /// 显示列命令
+        /// </summary>
+        public VCommand<GridMenuEventArgs> ShowGridMenuCommand { get; set; }
+
+        /// <summary>
+        /// 显示列
+        /// </summary>
+        /// <param name="e">事件参数</param>
+        private void ShowGridMenu(GridMenuEventArgs e)
+        {
+            GridControlHelper.RemoveAllDefaultMenuItem(e);
+        }
+
+        #endregion
+
         #region 打开更新数据时间日志
         #region 打开更新数据时间日志
         /// <summary>
         /// <summary>
         /// 打开数据更新日志
         /// 打开数据更新日志

VIZ.TVP.FTB.Module/VIZ.TVP.FTB.Module.csproj

@@ -172,6 +172,10 @@
       <Project>{06b80c09-343d-4bb2-aeb1-61cfbfbf5cad}</Project>
       <Project>{06b80c09-343d-4bb2-aeb1-61cfbfbf5cad}</Project>
       <Name>VIZ.Framework.Storage</Name>
       <Name>VIZ.Framework.Storage</Name>
     </ProjectReference>
     </ProjectReference>
+    <ProjectReference Include="..\..\VIZ.Package\VIZ.Package.Common\VIZ.Package.Common.csproj">
+      <Project>{e4912bce-bc90-4457-9ee3-06435496d979}</Project>
+      <Name>VIZ.Package.Common</Name>
+    </ProjectReference>
     <ProjectReference Include="..\..\VIZ.Package\VIZ.Package.Connection\VIZ.Package.Connection.csproj">
     <ProjectReference Include="..\..\VIZ.Package\VIZ.Package.Connection\VIZ.Package.Connection.csproj">
       <Project>{421527f6-37b8-4615-9317-ffd5e272181b}</Project>
       <Project>{421527f6-37b8-4615-9317-ffd5e272181b}</Project>
       <Name>VIZ.Package.Connection</Name>
       <Name>VIZ.Package.Connection</Name>