From 0406942da726c8c170fe393ad81a62e2f13b2c7a Mon Sep 17 00:00:00 2001 From: dyy <807692433@qq.com> Date: Thu, 9 Jun 2022 17:39:32 +0800 Subject: [PATCH 1/8] =?UTF-8?q?=E3=80=90=E5=9C=A8=E5=86=8C=E8=B5=84?= =?UTF-8?q?=E4=BA=A7=E6=98=8E=E7=BB=86=E3=80=91=E6=96=B0=E5=A2=9E=E6=88=96?= =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=98=BE=E7=A4=BA=E4=B8=BA=E3=80=90=E9=87=91?= =?UTF-8?q?=E9=9A=85=E7=BC=96=E5=8F=B7=E3=80=91=EF=BC=8C=E6=94=B9=E4=B8=BA?= =?UTF-8?q?=E3=80=90=E8=B5=84=E4=BA=A7=E7=BC=96=E5=8F=B7=E3=80=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../AssetManagementSystem/Views/Ass_AssetsInfoItem/Form.cshtml | 2 +- .../Views/Ass_AssetsInfoItem/FormView.cshtml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/AssetManagementSystem/Views/Ass_AssetsInfoItem/Form.cshtml b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/AssetManagementSystem/Views/Ass_AssetsInfoItem/Form.cshtml index 2e89dc1cb..2698030e8 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/AssetManagementSystem/Views/Ass_AssetsInfoItem/Form.cshtml +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/AssetManagementSystem/Views/Ass_AssetsInfoItem/Form.cshtml @@ -38,7 +38,7 @@
*@
-
金隅编号
+
资产编号
diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/AssetManagementSystem/Views/Ass_AssetsInfoItem/FormView.cshtml b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/AssetManagementSystem/Views/Ass_AssetsInfoItem/FormView.cshtml index 23c6f1cca..809cb2eaa 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/AssetManagementSystem/Views/Ass_AssetsInfoItem/FormView.cshtml +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/AssetManagementSystem/Views/Ass_AssetsInfoItem/FormView.cshtml @@ -22,7 +22,7 @@ *@
-
金隅资产编号
+
资产编号
From 39b129b4d6e9e058711234fe0adee4ceeedc3ed5 Mon Sep 17 00:00:00 2001 From: zhangli <1109134334@qq.com> Date: Fri, 10 Jun 2022 09:39:26 +0800 Subject: [PATCH 2/8] =?UTF-8?q?=E8=87=AA=E5=8A=A8=E7=94=9F=E6=88=90?= =?UTF-8?q?=E8=80=83=E8=AF=95=E8=AF=BE=E7=A8=8B=E6=8E=92=E8=80=83=E6=97=B6?= =?UTF-8?q?=E9=97=B4=EF=BC=88=E6=9C=AA=E5=AE=8C=E6=88=90=EF=BC=89?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Controllers/Exam_ExamPlanController.cs | 28 +++++++++-- .../Views/Exam_ExamPlan/Index.js | 15 ++++++ .../Exam_ExamPlanLessonBLL.cs | 20 ++++++++ .../Exam_ExamPlanLessonEntity.cs | 5 ++ .../Exam_ExamPlanLessonIBLL.cs | 2 + .../Exam_ExamPlanLessonService.cs | 49 +++++++++++++++++++ 6 files changed, 114 insertions(+), 5 deletions(-) diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Controllers/Exam_ExamPlanController.cs b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Controllers/Exam_ExamPlanController.cs index 6e7b8efa4..02954f117 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Controllers/Exam_ExamPlanController.cs +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Controllers/Exam_ExamPlanController.cs @@ -269,11 +269,11 @@ namespace Learun.Application.Web.Areas.EducationalAdministration.Controllers return Success("操作成功！"); } /// - /// 一键安排班级 - /// - /// - /// - [HttpPost] + /// 一键安排班级 + /// + /// + /// + [HttpPost] [AjaxOnly] public ActionResult PlanClassByEPId(string keyValue) { @@ -286,6 +286,24 @@ namespace Learun.Application.Web.Areas.EducationalAdministration.Controllers exam_ExamPlanClassIBLL.PlanClassByEPId(keyValue); return Success("操作成功！"); } + /// + /// 自动生成考试课程排考时间 + /// + /// + /// + [HttpPost] + [AjaxOnly] + public ActionResult PlanLessonTimeByEPId(string keyValue) + { + var count = exam_ExamPlanLessonIBLL.GetListByEPId(keyValue).Count(); + if (count <= 0) + { + return Fail("请先安排课程！"); + } + exam_ExamPlanLessonIBLL.PlanLessonTimeByEPId(keyValue); + return Success("操作成功！"); + } + #endregion } diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/Exam_ExamPlan/Index.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/Exam_ExamPlan/Index.js index 8f43e80d8..913b3239c 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/Exam_ExamPlan/Index.js +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/Exam_ExamPlan/Index.js @@ -190,6 +190,21 @@ var bootstrap = function ($, learun) { }); } }); + + //自动生成排考时间 + $('#lr_examlessontime').on('click', + function () { + var keyValue = $('#gridtable').jfGridValue('EPId'); + if (learun.checkrow(keyValue)) { + learun.layerConfirm('是否确认生成排考时间！', function (res) { + if (res) { + learun.postForm(top.$.rootUrl + '/EducationalAdministration/Exam_ExamPlan/PlanLessonTimeByEPId', { keyValue: keyValue }, function () { + refreshGirdData(); + }); + } + }); + } + }); }, // 初始化列表 initGird: function () { diff --git a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/Exam_ExamPlanLesson/Exam_ExamPlanLessonBLL.cs b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/Exam_ExamPlanLesson/Exam_ExamPlanLessonBLL.cs index 76c291449..3dd2fe689 100644 --- a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/Exam_ExamPlanLesson/Exam_ExamPlanLessonBLL.cs +++ b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/Exam_ExamPlanLesson/Exam_ExamPlanLessonBLL.cs @@ -263,6 +263,26 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration } } } + + public (bool flag, string msg) PlanLessonTimeByEPId(string EPId) + { + try + { + return exam_ExamPlanLessonService.PlanLessonTimeByEPId(EPId); + } + catch (Exception ex) + { + if (ex is ExceptionEx) + { + throw; + } + else + { + throw ExceptionEx.ThrowBusinessException(ex); + } + } + } + #endregion } diff --git a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/Exam_ExamPlanLesson/Exam_ExamPlanLessonEntity.cs b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/Exam_ExamPlanLesson/Exam_ExamPlanLessonEntity.cs index 6cfa48f54..01ff1f76d 100644 --- a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/Exam_ExamPlanLesson/Exam_ExamPlanLessonEntity.cs +++ b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/Exam_ExamPlanLesson/Exam_ExamPlanLessonEntity.cs @@ -108,6 +108,11 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration public string AcademicYearNo { get; set; } [NotMapped] public string Semester { get; set; } + /// + /// 考试时长 + /// + [NotMapped] + public int? ExamLength { get; set; } #endregion } diff --git a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/Exam_ExamPlanLesson/Exam_ExamPlanLessonIBLL.cs b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/Exam_ExamPlanLesson/Exam_ExamPlanLessonIBLL.cs index 9557074df..051781014 100644 --- a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/Exam_ExamPlanLesson/Exam_ExamPlanLessonIBLL.cs +++ b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/Exam_ExamPlanLesson/Exam_ExamPlanLessonIBLL.cs @@ -52,6 +52,8 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration /// 实体 void SaveEntity(string keyValue, Exam_ExamPlanLessonEntity entity); + (bool flag, string msg) PlanLessonTimeByEPId(string keyValue); + (bool flag, string lessonname) IsExamTimeClash(Exam_ExamPlanLessonEntity entity); #endregion diff --git a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/Exam_ExamPlanLesson/Exam_ExamPlanLessonService.cs b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/Exam_ExamPlanLesson/Exam_ExamPlanLessonService.cs index 5c3f6a862..33ddb0c9f 100644 --- a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/Exam_ExamPlanLesson/Exam_ExamPlanLessonService.cs +++ b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/Exam_ExamPlanLesson/Exam_ExamPlanLessonService.cs @@ -411,6 +411,55 @@ and AcademicYearNo='{exam_ExamPlan.AcademicYearNo}' and Semester='{exam_ExamPlan } } } + + /// + /// 自动生成考试课程排考时间 + /// + /// + /// + public (bool flag, string msg) PlanLessonTimeByEPId(string EPId) + { + try + { + /* + * 1.查询考试记录是否已安排时间 + * 2.查询考试课程的考试时长是否大于0 + * 3.同一时间段内只能一个专业安排一门课程 + */ + + //安排时间数据 + var EPTimeList = this.BaseRepository("CollegeMIS") + .FindList(x => x.EPId == EPId); + if (EPTimeList.Count() <= 0) + { + return (false, "请先安排考试记录时间！"); + } + //考试课程数据 + var EPLessonList = this.BaseRepository("CollegeMIS") + .FindList($@"select elesson.ExamTime as ExamLength,t.* from Exam_ExamPlanLesson t +join Exam_ExamLesson elesson on t.LessonNo=elesson.LessonNo + where t.EPId='{EPId}'"); + if (EPLessonList.ToList().Exists(x => x.ExamLength == null || x.ExamLength == 0)) + { + return (false, "请先设置考试课程时长！"); + } + + + return (true, ""); + } + catch (Exception ex) + { + if (ex is ExceptionEx) + { + throw; + } + else + { + throw ExceptionEx.ThrowServiceException(ex); + } + } + } + #endregion } From 9ca7c13f6bc7c3866576051f3385c0373884105f Mon Sep 17 00:00:00 2001 From: zhangli <1109134334@qq.com> Date: Fri, 10 Jun 2022 10:00:51 +0800 Subject: [PATCH 3/8] =?UTF-8?q?=E8=80=83=E8=AF=95=E8=AE=B0=E5=BD=95?= =?UTF-8?q?=E5=AE=89=E6=8E=92=E6=97=B6=E9=97=B4=E6=96=B0=E5=A2=9E=E8=80=83?= =?UTF-8?q?=E8=AF=95=E6=97=B6=E9=95=BF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Controllers/Exam_ExamPlanController.cs | 15 ++++++++++++--- .../Exam_ExamPlanTime/Exam_ExamPlanTimeEntity.cs | 5 +++++ 2 files changed, 17 insertions(+), 3 deletions(-) diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Controllers/Exam_ExamPlanController.cs b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Controllers/Exam_ExamPlanController.cs index 02954f117..649203288 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Controllers/Exam_ExamPlanController.cs +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Controllers/Exam_ExamPlanController.cs @@ -175,7 +175,7 @@ namespace Learun.Application.Web.Areas.EducationalAdministration.Controllers { if (list.Count <= 0) { - return Fail("请安排时间"); + return Fail("请安排时间！"); } foreach (var entity in list) @@ -183,12 +183,21 @@ namespace Learun.Application.Web.Areas.EducationalAdministration.Controllers DateTime time; if (!DateTime.TryParse(entity.ExamTimeStart, out time)) { - return Fail("结束时间格式不正确！"); + return Fail("开始时间格式不正确！"); } if (!DateTime.TryParse(entity.ExamTimeEnd, out time)) { return Fail("结束时间格式不正确！"); } + + var startTime = Convert.ToDateTime(entity.ExamDate.Value.ToString("yyyy-MM-dd") + " " + entity.ExamTimeStart); + var endTime = Convert.ToDateTime(entity.ExamDate.Value.ToString("yyyy-MM-dd") + " " + entity.ExamTimeEnd); + if (endTime <= startTime) + { + return Fail("结束时间必须大于开始时间！"); + } + //考试时长 + entity.ExamTimeLength = (endTime - startTime).TotalMinutes; } exam_ExamPlanIBLL.SavePlanTime(EPId, list); return Success("保存成功！"); @@ -303,7 +312,7 @@ namespace Learun.Application.Web.Areas.EducationalAdministration.Controllers exam_ExamPlanLessonIBLL.PlanLessonTimeByEPId(keyValue); return Success("操作成功！"); } - + #endregion } diff --git a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/Exam_ExamPlanTime/Exam_ExamPlanTimeEntity.cs b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/Exam_ExamPlanTime/Exam_ExamPlanTimeEntity.cs index 9e0b2009a..157874cb1 100644 --- a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/Exam_ExamPlanTime/Exam_ExamPlanTimeEntity.cs +++ b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/Exam_ExamPlanTime/Exam_ExamPlanTimeEntity.cs @@ -40,6 +40,11 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration [Column("EXAMTIMEEND")] public string ExamTimeEnd { get; set; } /// + /// 考试时长 + /// + [Column("EXAMTIMELENGTH")] + public double? ExamTimeLength { get; set; } + /// /// 排考名称 /// [Column("EXAMTYPE")] From 7525f5b4c584bc2107fa278fc78ca72e80e1c938 Mon Sep 17 00:00:00 2001 From: liangkun Date: Fri, 10 Jun 2022 10:24:34 +0800 Subject: [PATCH 4/8] =?UTF-8?q?=E8=AF=84=E6=95=99api=E5=9C=B0=E5=9D=80?= =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=AD=A3=E7=A1=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Learun.Application.WebApi/Modules/EvalApi.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Learun.Framework.Ultimate V7/Learun.Application.WebApi/Modules/EvalApi.cs b/Learun.Framework.Ultimate V7/Learun.Application.WebApi/Modules/EvalApi.cs index 5fa59f7ae..8c8f984d6 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.WebApi/Modules/EvalApi.cs +++ b/Learun.Framework.Ultimate V7/Learun.Application.WebApi/Modules/EvalApi.cs @@ -17,7 +17,7 @@ namespace Learun.Application.WebApi.Modules public class EvalApi : BaseApi { public EvalApi() - : base("/learun/adms/eval") + : base("/learun/eval") { Get["/paper"] = GetPaper;// 获取组织机构数据映射表 Get["/studentlist"] = GetStudentList; From 658b1751740594d03b4d2902c02d27aaaaf41902 Mon Sep 17 00:00:00 2001 From: liangkun Date: Fri, 10 Jun 2022 14:26:44 +0800 Subject: [PATCH 5/8] =?UTF-8?q?=E5=BC=80=E6=94=BE=E6=95=99=E5=B8=88?= =?UTF-8?q?=E9=80=89=E4=BF=AE=E6=88=90=E7=BB=A9=E5=BD=95=E5=85=A5=E6=8C=89?= =?UTF-8?q?=E9=92=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../StuScore/InputScoreIndexOfElectiveInTeacher.cshtml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuScore/InputScoreIndexOfElectiveInTeacher.cshtml b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuScore/InputScoreIndexOfElectiveInTeacher.cshtml index 72044bbf9..f16cdbf5a 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuScore/InputScoreIndexOfElectiveInTeacher.cshtml +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuScore/InputScoreIndexOfElectiveInTeacher.cshtml @@ -86,17 +86,17 @@
- @*
+
 开始录入  提交教务处  去审核成绩  设置成绩比例 -
*@ +
- @*
+
比例设置： 平时成绩占比 0 %， 期中成绩占比 0 %， @@ -108,7 +108,7 @@ 分钟（秒）
续时
-
*@ +
From d3c60e8025ba75428a6e152893f4643d5ad340d0 Mon Sep 17 00:00:00 2001 From: dyy <807692433@qq.com> Date: Fri, 10 Jun 2022 15:10:13 +0800 Subject: [PATCH 6/8] =?UTF-8?q?=E3=80=90=E4=BF=AE=E6=94=B9=E3=80=91?= =?UTF-8?q?=E7=99=BB=E8=AE=B0=E5=9C=A8=E5=86=8C=E8=B5=84=E4=BA=A7=EF=BC=9A?= =?UTF-8?q?=E8=B5=84=E4=BA=A7=E6=98=8E=E7=BB=86=E7=BC=96=E5=8F=B7=EF=BC=8C?= =?UTF-8?q?=E6=9C=80=E5=90=8E=E7=9A=84=E5=BA=8F=E5=8F=B7=E4=B8=BA5?= =?UTF-8?q?=E4=BD=8D=EF=BC=8C=E4=B8=8D=E8=B6=B3=E7=9A=840=E4=BB=A3?= =?UTF-8?q?=E6=9B=BF=EF=BC=8C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Views/Ass_AssetsInfoItem/Form.cshtml | 4 ++-- .../Ass_AssetsInfo/Ass_AssetsInfoService.cs | 14 +++++++------- .../Ass_AssetsInfoApplyService.cs | 12 ++++++------ 3 files changed, 15 insertions(+), 15 deletions(-) diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/AssetManagementSystem/Views/Ass_AssetsInfoItem/Form.cshtml b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/AssetManagementSystem/Views/Ass_AssetsInfoItem/Form.cshtml index 2698030e8..83a11a01a 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/AssetManagementSystem/Views/Ass_AssetsInfoItem/Form.cshtml +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/AssetManagementSystem/Views/Ass_AssetsInfoItem/Form.cshtml @@ -42,8 +42,8 @@
-
资产名称
- +
资产名称*
+
部门
diff --git a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/AssetManagementSystem/Ass_AssetsInfo/Ass_AssetsInfoService.cs b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/AssetManagementSystem/Ass_AssetsInfo/Ass_AssetsInfoService.cs index 0e5d53689..28ff56fd0 100644 --- a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/AssetManagementSystem/Ass_AssetsInfo/Ass_AssetsInfoService.cs +++ b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/AssetManagementSystem/Ass_AssetsInfo/Ass_AssetsInfoService.cs @@ -227,7 +227,7 @@ namespace Learun.Application.TwoDevelopment.AssetManagementSystem { codeNum++; infoItem.AId = assInfoEntity.AId; - infoItem.AICode = assInfoEntity.ACode + "_" + codeNum.ToString(); + infoItem.AICode = assInfoEntity.ACode + "_" + codeNum.ToString().PadLeft(5, '0'); infoItem.AICodeNum = codeNum; } @@ -301,8 +301,8 @@ namespace Learun.Application.TwoDevelopment.AssetManagementSystem Ass_AssetsInfoItem.AISpecification = entity.ASpecification;//规格 Ass_AssetsInfoItem.AIAssType = entity.AAssType;//属性 Ass_AssetsInfoItem.AICodeNum = i + 1; - Ass_AssetsInfoItem.AICode = entity.ACode + "_" + Ass_AssetsInfoItem.AICodeNum; - Ass_AssetsInfoItem.AICodeNumJY = entity.ACode + "_" + Ass_AssetsInfoItem.AICodeNum; + Ass_AssetsInfoItem.AICode = entity.ACode + "_" + Ass_AssetsInfoItem.AICodeNum.ToString().PadLeft(5, '0'); + Ass_AssetsInfoItem.AICodeNumJY = entity.ACode + "_" + Ass_AssetsInfoItem.AICodeNum.ToString().PadLeft(5, '0'); Ass_AssetsInfoItem.AIIStorageId = entity.AIIStorageId; Ass_AssetsInfoItem.AIIStoragePosition = entity.AIIStoragePosition; Ass_AssetsInfoItem.AIIsInStorage = true; @@ -326,8 +326,8 @@ namespace Learun.Application.TwoDevelopment.AssetManagementSystem Ass_AssetsInfoItem.AISpecification = entity.ASpecification;//规格 Ass_AssetsInfoItem.AIAssType = entity.AAssType;//属性 Ass_AssetsInfoItem.AICodeNum = 1; - Ass_AssetsInfoItem.AICode = entity.ACode + "_" + Ass_AssetsInfoItem.AICodeNum; - Ass_AssetsInfoItem.AICodeNumJY = entity.ACode + "_" + Ass_AssetsInfoItem.AICodeNum; + Ass_AssetsInfoItem.AICode = entity.ACode + "_" + Ass_AssetsInfoItem.AICodeNum.ToString().PadLeft(5, '0'); + Ass_AssetsInfoItem.AICodeNumJY = entity.ACode + "_" + Ass_AssetsInfoItem.AICodeNum.ToString().PadLeft(5, '0'); Ass_AssetsInfoItem.AIIStorageId = entity.AIIStorageId; Ass_AssetsInfoItem.AIIStoragePosition = entity.AIIStoragePosition; Ass_AssetsInfoItem.AIIsInStorage = false; @@ -351,8 +351,8 @@ namespace Learun.Application.TwoDevelopment.AssetManagementSystem Ass_AssetsInfoItem.AISpecification = entity.ASpecification;//规格 Ass_AssetsInfoItem.AIAssType = entity.AAssType;//属性 Ass_AssetsInfoItem.AICodeNum = 1; - Ass_AssetsInfoItem.AICode = entity.ACode + "_" + Ass_AssetsInfoItem.AICodeNum; - Ass_AssetsInfoItem.AICodeNumJY = entity.ACode + "_" + Ass_AssetsInfoItem.AICodeNum; + Ass_AssetsInfoItem.AICode = entity.ACode + "_" + Ass_AssetsInfoItem.AICodeNum.ToString().PadLeft(5,'0'); + Ass_AssetsInfoItem.AICodeNumJY = entity.ACode + "_" + Ass_AssetsInfoItem.AICodeNum.ToString().PadLeft(5, '0'); Ass_AssetsInfoItem.AIIStorageId = entity.AIIStorageId; Ass_AssetsInfoItem.AIIStoragePosition = entity.AIIStoragePosition; Ass_AssetsInfoItem.AIIsInStorage = entity.AStock > 0; diff --git a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/AssetManagementSystem/Ass_AssetsInfoApply/Ass_AssetsInfoApplyService.cs b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/AssetManagementSystem/Ass_AssetsInfoApply/Ass_AssetsInfoApplyService.cs index 1400a9021..939443024 100644 --- a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/AssetManagementSystem/Ass_AssetsInfoApply/Ass_AssetsInfoApplyService.cs +++ b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/AssetManagementSystem/Ass_AssetsInfoApply/Ass_AssetsInfoApplyService.cs @@ -320,8 +320,8 @@ namespace Learun.Application.TwoDevelopment.AssetManagementSystem insertassinfoitem.Create(); insertassinfoitem.AId = assinfoitem.AId; insertassinfoitem.AICodeNum = Ass_AssetsInfoItemMaxNum + 1 + i; - insertassinfoitem.AICode = assinfoitem.ACode + "_" + insertassinfoitem.AICodeNum.ToString(); - insertassinfoitem.AICodeNumJY = assinfoitem.ACode + "_" + insertassinfoitem.AICodeNum.ToString();//金隅编号 + insertassinfoitem.AICode = assinfoitem.ACode + "_" + insertassinfoitem.AICodeNum.ToString().PadLeft(5, '0'); + insertassinfoitem.AICodeNumJY = assinfoitem.ACode + "_" + insertassinfoitem.AICodeNum.ToString().PadLeft(5, '0');//金隅编号 insertassinfoitem.AIAssValue = assinfoitem.APrice;//价值 insertassinfoitem.AIUnits = assinfoitem.AUnit;//单位 insertassinfoitem.AISpecificationtype = assinfoitem.AModel;//型号 @@ -426,8 +426,8 @@ namespace Learun.Application.TwoDevelopment.AssetManagementSystem insertassinfoitem.Create(); insertassinfoitem.AId = insertAss_AssetsInfo.AId; insertassinfoitem.AICodeNum = i + 1; - insertassinfoitem.AICode = insertAss_AssetsInfo.ACode + "_" + insertassinfoitem.AICodeNum.ToString(); - insertassinfoitem.AICodeNumJY = insertAss_AssetsInfo.ACode + "_" + insertassinfoitem.AICodeNum.ToString(); + insertassinfoitem.AICode = insertAss_AssetsInfo.ACode + "_" + insertassinfoitem.AICodeNum.ToString().PadLeft(5, '0'); + insertassinfoitem.AICodeNumJY = insertAss_AssetsInfo.ACode + "_" + insertassinfoitem.AICodeNum.ToString().PadLeft(5, '0'); insertassinfoitem.AIAssValue = assitemapp.AAIPrice;//价值 insertassinfoitem.AIUnits = assitemapp.AAIUnit;//单位 insertassinfoitem.AISpecificationtype = assitemapp.AAIModel;//型号 @@ -489,8 +489,8 @@ namespace Learun.Application.TwoDevelopment.AssetManagementSystem insertassinfoitem.Create(); insertassinfoitem.AId = insertAss_AssetsInfo.AId; insertassinfoitem.AICodeNum = 1; - insertassinfoitem.AICode = insertAss_AssetsInfo.ACode + "_" + insertassinfoitem.AICodeNum.ToString(); - insertassinfoitem.AICodeNumJY = insertAss_AssetsInfo.ACode + "_" + insertassinfoitem.AICodeNum.ToString(); + insertassinfoitem.AICode = insertAss_AssetsInfo.ACode + "_" + insertassinfoitem.AICodeNum.ToString().PadLeft(5, '0'); + insertassinfoitem.AICodeNumJY = insertAss_AssetsInfo.ACode + "_" + insertassinfoitem.AICodeNum.ToString().PadLeft(5, '0'); insertassinfoitem.AIAssValue = assitemapp.AAIPrice;//价值 insertassinfoitem.AIUnits = assitemapp.AAIUnit;//单位 insertassinfoitem.AISpecificationtype = assitemapp.AAIModel;//型号 From e31ffebae4e35ef468811e5b6116cd7c20f4241d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=9D=A4=20=E6=A2=81?= Date: Sat, 11 Jun 2022 14:31:11 +0800 Subject: [PATCH 7/8] =?UTF-8?q?=E8=AF=84=E6=95=99h5=E9=A1=B5=E9=9D=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../pages/EvaluationTeach/EvaluationTeach.css | 12 ++ .../EvaluationTeach/EvaluationTeach.html | 22 +++ .../pages/EvaluationTeach/EvaluationTeach.js | 76 ++++++++ .../EvaluationTeahcers/EvaluationTeahcers.css | 170 ++++++++++++++++++ .../EvaluationTeahcers.html | 14 ++ .../EvaluationTeahcers/EvaluationTeahcers.js | 168 +++++++++++++++++ 6 files changed, 462 insertions(+) create mode 100644 Learun.Framework.Ultimate V7/Learun.Application.Mobile/www/pages/EvaluationTeach/EvaluationTeach.css create mode 100644 Learun.Framework.Ultimate V7/Learun.Application.Mobile/www/pages/EvaluationTeach/EvaluationTeach.html create mode 100644 Learun.Framework.Ultimate V7/Learun.Application.Mobile/www/pages/EvaluationTeach/EvaluationTeach.js create mode 100644 Learun.Framework.Ultimate V7/Learun.Application.Mobile/www/pages/EvaluationTeach/EvaluationTeahcers/EvaluationTeahcers.css create mode 100644 Learun.Framework.Ultimate V7/Learun.Application.Mobile/www/pages/EvaluationTeach/EvaluationTeahcers/EvaluationTeahcers.html create mode 100644 Learun.Framework.Ultimate V7/Learun.Application.Mobile/www/pages/EvaluationTeach/EvaluationTeahcers/EvaluationTeahcers.js diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Mobile/www/pages/EvaluationTeach/EvaluationTeach.css b/Learun.Framework.Ultimate V7/Learun.Application.Mobile/www/pages/EvaluationTeach/EvaluationTeach.css new file mode 100644 index 000000000..d01e93557 --- /dev/null +++ b/Learun.Framework.Ultimate V7/Learun.Application.Mobile/www/pages/EvaluationTeach/EvaluationTeach.css @@ -0,0 +1,12 @@ +#lr_im_message_list .lr-list-item-media img { + border-radius:5px; +} +#lr_im_message_list .lr-list-item-media .date { + position: absolute; + top: 15px; + right: 5px; + text-align: right; + font-size: 12px; + font-weight: 400; + color: #8f8f94; +} diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Mobile/www/pages/EvaluationTeach/EvaluationTeach.html b/Learun.Framework.Ultimate V7/Learun.Application.Mobile/www/pages/EvaluationTeach/EvaluationTeach.html new file mode 100644 index 000000000..0e3cad6d5 --- /dev/null +++ b/Learun.Framework.Ultimate V7/Learun.Application.Mobile/www/pages/EvaluationTeach/EvaluationTeach.html @@ -0,0 +1,22 @@ +
+
+
+ 总共0条 +
+
+
+ +
+
+ + +
+
+
+
+
+
+ +
\ No newline at end of file diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Mobile/www/pages/EvaluationTeach/EvaluationTeach.js b/Learun.Framework.Ultimate V7/Learun.Application.Mobile/www/pages/EvaluationTeach/EvaluationTeach.js new file mode 100644 index 000000000..347ad0d1b --- /dev/null +++ b/Learun.Framework.Ultimate V7/Learun.Application.Mobile/www/pages/EvaluationTeach/EvaluationTeach.js @@ -0,0 +1,76 @@ +(function () { + var multipleData = null; + var page = { + grid: null, + init: function ($page) { + page.grid = $page.find('#lr_EvaluationTeach_list').lrpagination({ + lclass: page.lclass, + rows: 10, // 每页行数 + getData: function (param, callback) {// 获取数据 param 分页参数,callback 异步回调 + param.multipleData = multipleData; + page.loadData(param, callback, $page); + }, + renderData: function (_index, _item, _$item) {// 渲染数据模板 + return page.rowRender(_index, _item, _$item, $page); + }, + click: function (item, $item, $et) {// 列表行点击事件 + if ($et.hasClass('lr-btn-success')) { + page.btnClick(item, $item, $page); + } + else { + page.rowClick(item, $item, $page); + } + } + //btns: page.rowBtns + }); + }, + lclass: 'lr-list', + loadData: function (param, callback, $page) {// 列表加载后台数据 + var _postParam = { + pagination: { + rows: param.rows, + page: param.page + }, + queryJson: '{}' + }; + if (param.multipleData) { + _postParam.queryJson = JSON.stringify(multipleData); + } + learun.httpget(config.webapi + '/learun/eval/studentlist', _postParam, (data) => { + $page.find('.lr-badge').text('0'); + if (data) { + $page.find('.lr-badge').text(data.records); + callback(data.rows, parseInt(data.records)); + } + else { + callback([], 0); + } + }); + }, + rowRender: function (_index, _item, _$item, $page) {// 渲染列表行数据 + _$item.addClass('lr-list-item lr-list-item-multi'); + _$item.append($('

学年:

').dataFormatter({ value: _item.AcademicYearNo })); + _$item.append($('

学期:

').dataFormatter({ value: _item.Semester })); + _$item.append($('

教师姓名:

').dataFormatter({ value: _item.EmpName })); + _$item.append($('

课程名称:

').dataFormatter({ value: _item.LessonName })); + _$item.append($('

评教状态:

').dataFormatter({ value: (_item.UID != undefined && _item.UID !== '') ? "已评" : "未评" })); + return ''; + }, + rowClick: function (item, $item, $page) {// 列表行点击触发方法 + if (item.UID != undefined && item.UID !== '') { + learun.layer.warning("当前项目已评教！"); + return; + } + learun.nav.go({ path: 'EvaluationTeach/EvaluationTeahcers', title: '评价教师', type: 'right', param: { VID: item.VID, EmpNo: item.EmpNo, LessonNo: item.LessonNo } }); + }, + btnClick: function (item, $item, $page) {// 左滑按钮点击事件 + if (item.UID == undefined || item.UID === '') { + learun.layer.warning("当前项目未评教！"); + return; + } + learun.nav.go({ path: 'EvaluationTeach/EvaluationTeahcers', title: '评价教师', type: 'right', param: { VID: item.VID, StuNo: item.StuNo } }); + }, + rowBtns: ['查看'] // 列表行左滑按钮 + }; + return page; +})(); \ No newline at end of file diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Mobile/www/pages/EvaluationTeach/EvaluationTeahcers/EvaluationTeahcers.css b/Learun.Framework.Ultimate V7/Learun.Application.Mobile/www/pages/EvaluationTeach/EvaluationTeahcers/EvaluationTeahcers.css new file mode 100644 index 000000000..78fc8c547 --- /dev/null +++ b/Learun.Framework.Ultimate V7/Learun.Application.Mobile/www/pages/EvaluationTeach/EvaluationTeahcers/EvaluationTeahcers.css @@ -0,0 +1,170 @@ +@charset "utf-8"; +/* CSS Document */ + + +body { + font-family: "Microsoft YaHei", "微软雅黑" !important; +} + + + + +/*****sec1*******/ +.eva_sec1{ + padding: 1px 0; +} +.eva_sec1 .index_box { + padding: 0 12px 15px; + border: 1px solid #E5E5E7; + width: 94%; + margin: 20px auto; +} +.inSecTitle{ + font-size: 20px; + text-align: center; + margin: 20px 0 0px; +} +.inSecTime{ + font-size: 12px; + text-align: center; +} +.shenInput { + margin-top: 15px; + font-size: 14px; + line-height: 24px; +} +.shenInput3 { + display: none; +} +.shenInput:before, .shenInput:after { + display: table; + content: " "; +} +.shenInput:after { + clear: both; +} +.signTxt { + line-height: 24px; + font-size: 14px; + position: relative; +} +.shenInputBox { + position: relative; +} +.shenInputBox1 { + margin-left: 60px; +} +.inputRadioRow { + overflow: hidden; +} +.inputRadioCol4 {margin-top: 8px;} +.inputRadio { + border-radius: 50%; +} +.inputCheck{ + border-radius: 2px; +} +.inputRadio.active:after { + content: ''; + width: 12px; + height: 12px; + background: #0C86D8; + position: absolute; + left: 0; + right: 0; + bottom: 0; + top: 0; + margin: auto; + border-radius: 50%; +} +.inputCheck.active:after { + content: ''; + width: 12px; + height: 12px; + background: #0C86D8; + position: absolute; + left: 0; + right: 0; + bottom: 0; + top: 0; + margin: auto; + border-radius: 2px; +} +.inputRadio,.inputCheck { + font-style: normal; + display: inline-block; + vertical-align: middle; + width: 20px; + height: 20px; + border: 1px solid #CBCBCB; + margin: 0 10px; + position: relative; + cursor: pointer; +} + + +.shenInputBox>span, .inputRadioCol4 span, .inputRadioCol3 span, .inputRadioCol2 span { + display: inline-block; + vertical-align: middle; +} +.shenInput>span { + display: block; + float: left; + width: 60px; + text-align: right; + padding: 4px 8px 4px 0px; + line-height: 24px; +} +.shenInputBox .inputTxt { + width: 100%; + display: block; + height: 32px; + line-height: 20px; + border: 1px solid #CBCBCB; + padding: 6px 10px; + font-size: 14px; +} +.shenBtnBox .signTxt { + margin-top: 30px; + margin-left: 30px; +} +.shenBtn { + width: 74%; + background: #0C86D8; + text-align: center; + line-height: 40px; + margin: 20px auto 20px; + font-size: 17px; + color: #fff; + border-radius: 2px; + cursor: pointer; + border-radius: 4px; + -webkit-user-select: none; + -moz-user-select: none; + -ms-user-select: none; + user-select: none; +} +.signTextareaBox { + margin-top: 20px; + position: relative; +} +.inputRadioRow { + overflow: hidden; +} +.inputRadioCol2 { + margin-top: 8px; +} +.inputCheck img { + width: 100%; + display: none; +} +.signTextarea { + margin-top: 15px; + font-size: 14px; + line-height: 24px; +} +.redEva{ + color: red!important; +} +/*****sec1*******/ + diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Mobile/www/pages/EvaluationTeach/EvaluationTeahcers/EvaluationTeahcers.html b/Learun.Framework.Ultimate V7/Learun.Application.Mobile/www/pages/EvaluationTeach/EvaluationTeahcers/EvaluationTeahcers.html new file mode 100644 index 000000000..6a420b147 --- /dev/null +++ b/Learun.Framework.Ultimate V7/Learun.Application.Mobile/www/pages/EvaluationTeach/EvaluationTeahcers/EvaluationTeahcers.html @@ -0,0 +1,14 @@ +
+ +
+
+
+
+ +
+
+
保  存
+
+
+ +
diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Mobile/www/pages/EvaluationTeach/EvaluationTeahcers/EvaluationTeahcers.js b/Learun.Framework.Ultimate V7/Learun.Application.Mobile/www/pages/EvaluationTeach/EvaluationTeahcers/EvaluationTeahcers.js new file mode 100644 index 000000000..bdf5ddf64 --- /dev/null +++ b/Learun.Framework.Ultimate V7/Learun.Application.Mobile/www/pages/EvaluationTeach/EvaluationTeahcers/EvaluationTeahcers.js @@ -0,0 +1,168 @@ +(function() { + var page = { + isScroll: true, + init: function($page, param) { + var path = config.webapi; + learun.layer.loading(true, "加载数据中..."); + learun.httpget(path + "/learun/eval/paper", { + VID: param.VID + }, (res) => { + learun.layer.loading(false); + $page.find('.inSecTitle').html(res.VTitle).end().find('.inSecTime').html(res.VStartTime + ' - ' + res.VStopTime) + var dataList = res.Eval_Questions; + var otherHtml = '
'+ + '其他'+ + '
'+ + ''+ + '
'+ + '
'; + var html = ''; + $.each(dataList, function(i, n){ + html += '
'; + var flag = false; + if(n.QType == 1){ + html += '
'+ + '
'+ + '
'+ n.QTitle +'
'+ + '
'; + $.each(n.Eval_QuestionItems, function(j, m){ + m.QShowText ? flag = true : ''; + html += '
'+ + ''+ + ''+ m.ITitle +''+ + '
'; + + }) + }else if(n.QType == 2){ + html += '
'+ + '
'+ + '
'+ n.QTitle +'
'+ + '
'; + $.each(n.Eval_QuestionItems, function(j, m){ + if(m.QShowText){ + flag = true; + } + html += '
'+ + ''+ + ''+ m.ITitle +''+ + '
'; + }) + } + html += '
'; + html += flag? otherHtml + '
' : '
'; + }) + $('.index_box').html(html) + }); + + + $page.find('.shenBtn').on('tap', function() { + var jsonArr= []; + var qmustFlag = false; + var flag = false; + $('.signTxt').removeClass('redEva'); + $('.signSec2Box').each(function(i, n){ + var _this = $(n); + var qmust = _this.attr('qmust'); + var qmin = _this.attr('qmin') == 'null'? 0 : _this.attr('qmin'); + var qmax = _this.attr('qmax') == 'null'? 0 : _this.attr('qmax'); + var checkBoxs = _this.find('.checkBoxs.active'); + var ind = checkBoxs.length; + if(qmust == 'true' && ind == 0){ + qmustFlag = true; + _this.find('.signTxt').addClass('redEva'); + } + if((qmin && ind < qmin) || (qmax && ind > qmax)){ + flag = true; + _this.find('.signTxt').addClass('redEva'); + } + var UText = _this.find('.shenInput3 .inputTxt').val(); + var qid = $(this).attr("qid"); + checkBoxs.each(function(j, m){ + var txt = $(m).attr('flag') == 'true'? UText : ''; + jsonArr.push({QID: qid, IID: $(m).attr("iid"), UText: txt}) + }) + }) + // console.log(jsonArr) + if(qmustFlag){ + learun.layer.toast('有必选项未选择'); + return + } + if(flag){ + learun.layer.toast('有选择项少选或多选'); + return + } + // return + learun.httpget(path + "/learun/eval/savepaper", + { + VID: param.VID, + LessonNo: param.LessonNo, + EmpNo: param.EmpNo, + postarray: jsonArr + }, (res) => { + learun.layer.toast('操作成功'); + learun.nav.closeCurrent(); + var prepage = learun.nav.getpage('EvaluationTeach'); + prepage.grid.reload(); + }); + }) + + //单选框 + $page.on('tap', '.shenInputBox .inputRadio', function() { + if (!$(this).hasClass('active')) { + // var iid = $(this).attr('iid'); + $(this).addClass('active').parents('.shenInputBox').find('.inputRadio').not($(this)).removeClass('active'); + judgeRideo($(this)) + } + }) + + //多选框 + $page.on('tap', '.inputCheck', function() { + var parents = $(this).parents('.signSec2Box'); + var qmin = parents.attr('qmin') == 'null'? 0 : parents.attr('qmin'); + var qmax = parents.attr('qmax') == 'null'? 0 : parents.attr('qmax'); + var ind = parents.find('.inputCheck.active').length; + if ($(this).hasClass('active')) { + if(qmin && ind <= qmin){ + learun.layer.toast('该选项最少选择'+ qmin + '项'); + return + } + $(this).removeClass('active') + } else { + if(qmax && ind >= qmax){ + learun.layer.toast('该选项最多选择'+ qmax + '项'); + return + } + $(this).addClass('active'); + } + // var iids = ''; + // parents.find('.inputCheck.active').each(function(i, n){ + // var iid = $(n).attr('iid'); + // iids += i== 0? iid : ',' + iid; + // }) + // parents.attr('iid', iids) + judgeRideo($(this)) + }) + //是否为其他选项判断 + function judgeRideo(obj) { + var parents = obj.parents('.signSec2Box'); + var inputs = parents.find('.shenInput3'); + + if (parents.find("i[flag='true']").hasClass('active')) { + inputs.css({ + display: 'block' + }); + } else { + inputs.css({ + display: 'none' + }).find('input').val(''); + } + } + + + }, + destroy: function(pageinfo) { + + } + }; + return page; +})(); From 7577e647874f541327ced1e96af2f6c8abe5fa15 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=9D=A4=20=E6=A2=81?= Date: Sun, 12 Jun 2022 15:19:44 +0800 Subject: [PATCH 8/8] =?UTF-8?q?=E8=AF=84=E6=95=99=E6=8F=90=E4=BA=A4?= =?UTF-8?q?=E8=AF=95=E5=8D=B7=E6=94=B9=E4=B8=BApost?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../EvaluationTeach/EvaluationTeahcers/EvaluationTeahcers.js | 2 +- .../Learun.Application.WebApi/Modules/EvalApi.cs | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Mobile/www/pages/EvaluationTeach/EvaluationTeahcers/EvaluationTeahcers.js b/Learun.Framework.Ultimate V7/Learun.Application.Mobile/www/pages/EvaluationTeach/EvaluationTeahcers/EvaluationTeahcers.js index bdf5ddf64..373a8a33c 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Mobile/www/pages/EvaluationTeach/EvaluationTeahcers/EvaluationTeahcers.js +++ b/Learun.Framework.Ultimate V7/Learun.Application.Mobile/www/pages/EvaluationTeach/EvaluationTeahcers/EvaluationTeahcers.js @@ -92,7 +92,7 @@ return } // return - learun.httpget(path + "/learun/eval/savepaper", + learun.httppost(path + "/learun/eval/savepaper", { VID: param.VID, LessonNo: param.LessonNo, diff --git a/Learun.Framework.Ultimate V7/Learun.Application.WebApi/Modules/EvalApi.cs b/Learun.Framework.Ultimate V7/Learun.Application.WebApi/Modules/EvalApi.cs index 8c8f984d6..ba9dfb7ae 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.WebApi/Modules/EvalApi.cs +++ b/Learun.Framework.Ultimate V7/Learun.Application.WebApi/Modules/EvalApi.cs @@ -21,7 +21,7 @@ namespace Learun.Application.WebApi.Modules { Get["/paper"] = GetPaper;// 获取组织机构数据映射表 Get["/studentlist"] = GetStudentList; - Get["/savepaper"] = SavePaper; + Post["/savepaper"] = SavePaper; } private Eval_MainIBLL ask_MainIBLL = new Eval_MainBLL();