Merge branch '长阳分支中职' of http://123.57.209.16:3000/bjquanjiang/DigitalScholl into 长阳分支中职

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Controllers/StuInfoFreshOnlineServiceController.cs

@@ -138,7 +138,7 @@ namespace Learun.Application.Web.Areas.EducationalAdministration.Controllers
         public ActionResult DeleteForm(string keyValue)
         {
             stuInfoFreshOnlineServiceIBLL.DeleteEntity(keyValue);
-            return Success("删除成功！");
+            return Success("提交成功！");
         }
         /// <summary>
         /// 保存实体数据（新增、修改）

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuInfoFresh/Index.cshtml

@@ -27,12 +27,12 @@
                         <a id="lr_view" class="btn btn-default"><i class="fa fa-pencil-square-o"></i>&nbsp;查看</a>
                     </div>
                     <div class=" btn-group btn-group-sm" learun-authorize="yes">
-                        @*<a id="lr_allocationClass" class="btn btn-default"><i class="fa fa-plus"></i>&nbsp;分配班级</a>
+                        <a id="lr_allocationClass" class="btn btn-default"><i class="fa fa-plus"></i>&nbsp;分配班级</a>
                         <a id="lr_newallocationDormitory" class="btn btn-default"><i class="fa fa-plus"></i>&nbsp;分配宿舍</a>
                         <a id="lr_newallocationBed" class="btn btn-default"><i class="fa fa-plus"></i>&nbsp;分配床位</a>
                         <a id="lr_confirmDormitory" class="btn btn-default"><i class="fa fa-plus"></i>&nbsp;确认分配</a>
                         <a id="lr_exportBed" class="btn btn-default"><i class="fa fa-sign-out"></i>&nbsp;导出学生宿舍</a>
-                        <a id="lr_insertStuInfoBasic" class="btn btn-default"><i class="fa fa-plus"></i>&nbsp;生成学籍信息</a>*@
+                        <a id="lr_insertStuInfoBasic" class="btn btn-default"><i class="fa fa-plus"></i>&nbsp;生成学籍信息</a>
                     </div>
                 </div>
             </div>

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EvaluationTeach/Views/Eval_Main/PaperAdminView.cshtml

@@ -29,7 +29,7 @@
                                     @foreach (var questionitem in question.Eval_QuestionItems)
                                     {
                                         <div class="inputRadioCol4">
-                                            <i class="@(question.QType == 1 ? "inputRadio" : "inputCheck")" hasinput="@(questionitem.QShowText == true ? "yes" : "")"><input id="@questionitem.IID" qid="@question.QID" hasinput="@(questionitem.QShowText == true ? "yes" : "")" @(question.QMust == true ? "data-rule=" + (question.QTypeString == "input" ? "\"required;\"" : "\"checked;\"") + (question.QMin.HasValue ? "checked(" + question.QMin.Value + "~);" : "") + (question.QMax.HasValue ? "checked(~" + question.QMax.Value + ");" : "") : "") name="@question.QSerial" type="@question.QTypeString" class="xuanze" /></i> <span>@questionitem.ITitle</span>
+                                            <i class="@(question.QType == 1 ? "inputRadio" :(question.QType==2?"inputCheck":"inputText") )" hasinput="@(questionitem.QShowText == true ? "yes" : "")"><input id="@questionitem.IID" qid="@question.QID" hasinput="@(questionitem.QShowText == true ? "yes" : "")" @(question.QMust == true ? "data-rule=" + (question.QTypeString == "input" ? "\"required;\"" : "\"checked;\"") + (question.QMin.HasValue ? "checked(" + question.QMin.Value + "~);" : "") + (question.QMax.HasValue ? "checked(~" + question.QMax.Value + ");" : "") : "") name="@question.QSerial" type="@question.QTypeString" class="xuanze" /></i> <span>@questionitem.ITitle</span>
                                         </div>
                                     }
                                 </div>