页面修改

EduSpider.Services/CourseService.cs

@@ -97,15 +97,20 @@ namespace EduSpider.Services
             {
                 foreach (var item in examList)
                 {
+                    decimal score_p = 0;
+                    if (item.ExamScore > 0)
+                    {
+                        score_p = Math.Round(item.TScore / item.ExamScore, 4);
+                    }
                     dataList.Add(new ExamWorkResult()
                     {
-                        ResultType=2,
-                        Title=item.ExamName,
-                        CreateTime=item.ExamCreateTime,
-                        Score=item.TScore,
-                        //Score_p=0,
-                        ExamRank=item.Rank,
-                        ExamRankRate=item.RankRate,
+                        ResultType = 2,
+                        Title = item.ExamName,
+                        CreateTime = item.ExamCreateTime,
+                        Score = item.TScore,
+                        Score_p = score_p,
+                        ExamRank = item.Rank,
+                        ExamRankRate = item.RankRate,
                     });
                 }
             }
@@ -115,12 +120,12 @@ namespace EduSpider.Services
                 dataList = dataList.OrderBy(qitem => qitem.CreateTime).ToList();
                 foreach (var item in dataList)
                 {
-                    list.Add(new
+                    object obj = new();
+                    //家庭作业
+                    if (item.ResultType == 1)
+                    {
+                        obj = new
                         {
-                        item.ResultType,
-                        item.ResultTypeStr,
-                        item.Title,
-                        CreateTime = VTX.FW.Helper.ConvertHelper.FormatTime(item.CreateTime, 2),
                             item.Score,
                             item.Score_p,
                             item.ScoreType,
@@ -128,7 +133,35 @@ namespace EduSpider.Services
                             item.Score_Value,
                             item.HomeWorkStatus,
                             item.HomeWorkStatusStr,
-                        item.Comment,
+                        };
+                    }
+                    //考试
+                    if (item.ResultType == 2)
+                    {
+                        obj = new
+                        {
+                            item.Score,
+                            item.Score_p,
+                            item.ExamRank,
+                            item.ExamRankRate,
+                        };
+                    }
+                    //评语
+                    if (item.ResultType == 3)
+                    {
+                        obj = new
+                        {
+                            item.Comment
+                        };
+                    }
+
+                    list.Add(new
+                    {
+                        item.ResultType,
+                        item.ResultTypeStr,
+                        item.Title,
+                        CreateTime = VTX.FW.Helper.ConvertHelper.FormatTime(item.CreateTime, 2),
+                        DataObj = obj
                     });
                 }
             }