Commit 33ce1603 authored by 黄奎's avatar 黄奎

页面修改

parent a8ceaa7f
...@@ -632,8 +632,9 @@ namespace Edu.Module.Exam ...@@ -632,8 +632,9 @@ namespace Edu.Module.Exam
/// 根据试卷编号获取试卷实体 /// 根据试卷编号获取试卷实体
/// </summary> /// </summary>
/// <param name="PaperId"></param> /// <param name="PaperId"></param>
/// <param name="isShowAnswer">是否查询答案</param>
/// <returns></returns> /// <returns></returns>
public RB_Examination_Paper_ViewModel GetExaminationPaperModule(object PaperId) public RB_Examination_Paper_ViewModel GetExaminationPaperModule(object PaperId,bool isShowAnswer=true)
{ {
// 定义正则表达式用来匹配 img 标签 // 定义正则表达式用来匹配 img 标签
string str = @"<img\b[^<>]*?\bsrc[\s\t\r\n]*=[\s\t\r\n]*[""']?[\s\t\r\n]*(?<imgUrl>[^\s\t\r\n""'<>]*)[^<>]*?/?[\s\t\r\n]*>"; string str = @"<img\b[^<>]*?\bsrc[\s\t\r\n]*=[\s\t\r\n]*[""']?[\s\t\r\n]*(?<imgUrl>[^\s\t\r\n""'<>]*)[^<>]*?/?[\s\t\r\n]*>";
...@@ -673,6 +674,11 @@ namespace Edu.Module.Exam ...@@ -673,6 +674,11 @@ namespace Edu.Module.Exam
gItem.GScore = gItem?.DetailsList?.Sum(qitem => qitem.Score) ?? 0; gItem.GScore = gItem?.DetailsList?.Sum(qitem => qitem.Score) ?? 0;
foreach (var sItem in gItem.DetailsList) foreach (var sItem in gItem.DetailsList)
{ {
if (!isShowAnswer)
{
sItem.Answer = "";
sItem.AnswerParse = "";
}
sItem.QuestionPointList = pointList?.Where(qitem => sItem.Knowledge.Contains(qitem.PointId.ToString()))?.ToList() ?? new List<RB_Question_Point_ViewModel>(); sItem.QuestionPointList = pointList?.Where(qitem => sItem.Knowledge.Contains(qitem.PointId.ToString()))?.ToList() ?? new List<RB_Question_Point_ViewModel>();
sItem.QuestionContentObj = analysisQuestion.ParsingQuestion(sItem.QuestionTypeKey, sItem.QuestionContent); sItem.QuestionContentObj = analysisQuestion.ParsingQuestion(sItem.QuestionTypeKey, sItem.QuestionContent);
string newTitle = sItem.Title; string newTitle = sItem.Title;
......
...@@ -562,8 +562,7 @@ namespace Edu.WebApi.Controllers.Applet ...@@ -562,8 +562,7 @@ namespace Edu.WebApi.Controllers.Applet
var PaperId = base.ParmJObj.GetInt("PaperId"); var PaperId = base.ParmJObj.GetInt("PaperId");
var Id = base.ParmJObj.GetInt("Id"); var Id = base.ParmJObj.GetInt("Id");
var modelPublish = paperModule.GetExaminationPublishModule(Id); var modelPublish = paperModule.GetExaminationPublishModule(Id);
var modelPaper = paperModule.GetExaminationPaperModule(PaperId); var modelPaper = paperModule.GetExaminationPaperModule(PaperId, isShowAnswer: false);
return ApiResult.Success(data: new{ Publish= modelPublish, Paper = modelPaper }); return ApiResult.Success(data: new{ Publish= modelPublish, Paper = modelPaper });
} }
#endregion #endregion
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment