From 74c3f6d572b4beda48010dfe0b0ccbe65dc80ef3 Mon Sep 17 00:00:00 2001 From: dyy <807692433@qq.com> Date: Fri, 9 Jun 2023 14:41:50 +0800 Subject: [PATCH] =?UTF-8?q?=E3=80=90=E5=A2=9E=E5=8A=A0=E3=80=91=E6=89=8B?= =?UTF-8?q?=E6=9C=BA=E7=AB=AF=EF=BC=9A=E7=BA=BF=E4=B8=8A=E8=AF=BE=E7=A8=8B?= =?UTF-8?q?=E9=80=89=E8=AF=BE=EF=BC=9B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Modules/LessonInfoOfElectiveOnlineApi.cs | 35 +- .../LearunApp-2.2.0/config.js | 13 +- .../LearunApp-2.2.0/pages.json | 13 + .../LessonInfoOfElectiveOnline/from.vue | 137 ++++++++ .../LessonInfoOfElectiveOnline/list.vue | 304 ++++++++++++++++++ 5 files changed, 474 insertions(+), 28 deletions(-) create mode 100644 Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages/EducationalAdministration/LessonInfoOfElectiveOnline/from.vue create mode 100644 Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages/EducationalAdministration/LessonInfoOfElectiveOnline/list.vue diff --git a/Learun.Framework.Ultimate V7/Learun.Application.WebApi/Modules/LessonInfoOfElectiveOnlineApi.cs b/Learun.Framework.Ultimate V7/Learun.Application.WebApi/Modules/LessonInfoOfElectiveOnlineApi.cs index acdbdcc1b..eaace65ed 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.WebApi/Modules/LessonInfoOfElectiveOnlineApi.cs +++ b/Learun.Framework.Ultimate V7/Learun.Application.WebApi/Modules/LessonInfoOfElectiveOnlineApi.cs @@ -52,13 +52,13 @@ namespace Learun.Application.WebApi var stuInfoBasicEntity = stuInfoBasicIBLL.GetStuInfoBasicEntityByStuNo(account); if (stuInfoBasicEntity == null) { - return Fail("当前学员不存在！"); + return Success(new { msg = "当前学员不存在！" }); } //课程信息 var olpeEntity = lessonInfoOfElectiveOnlineIbll.GetLessonInfoOfElectiveOnlineEntity(keyValue); if (olpeEntity == null) { - return Fail("当前课程不存在！"); + return Success(new { msg = "当前课程不存在！" }); } //当前学员本学期是否有报名课程：每学期一门 @@ -96,11 +96,11 @@ namespace Learun.Application.WebApi { if (sslleEntity.Status == 1) { - return Fail("当前课程报名审核中，请耐心等待！"); + return Success(new { msg = "当前课程报名审核中，请耐心等待！" }); } else if (sslleEntity.Status == 2) { - return Fail("当前课程已报名成功！"); + return Success(new { msg = "当前课程已报名成功！" }); } } else @@ -110,7 +110,7 @@ namespace Learun.Application.WebApi var aaa = aa.Count(x => x.Status == 1 || x.Status == 2); if (aaa >= olpeEntity.StuNumMax) { - return Fail("当前课程报名人数已满，请选择其他课程！"); + return Success(new { msg = "当前课程报名人数已满，请选择其他课程！" }); } //每学期最多两门 var sslleList = stuSelectLessonListOfElectiveOnlineIBLL.GetStuSelectLessonListOfElectiveOnlineListByStuNo(account); @@ -118,15 +118,15 @@ namespace Learun.Application.WebApi var sslleListOfNow1 = sslleListOfNow.Where(x => x.Status == 1 || x.Status == 2); if (sslleListOfNow1.Count() >= Config.GetValue("OnlineElectiveLessonApplyMax").ToInt()) { - return Fail("每学期最多选择" + Config.GetValue("OnlineElectiveLessonApplyMax").ToInt() + "门线上选修课！"); + return Success(new { msg = "每学期最多选择" + Config.GetValue("OnlineElectiveLessonApplyMax").ToInt() + "门线上选修课！" }); } //相同时间不能报名 - if (sslleListOfNow1.Where(x => x.LessonSection == olpeEntity.LessonSection).Any()) + if (!string.IsNullOrEmpty(olpeEntity.LessonSection) && sslleListOfNow1.Where(x => x.LessonSection == olpeEntity.LessonSection).Any()) { //相同时间不能报名 - return Fail("本学期此时间段已有报名的选修课！"); + return Success(new { msg = "本学期此时间段已有报名的选修课！" }); } - + } return Fail("正在提交，请等待！"); @@ -173,20 +173,11 @@ namespace Learun.Application.WebApi public Response GetForm(dynamic _) { string keyValue = this.GetReqData(); - var JournalReceiveData = lessonInfoOfElectiveOnlineIbll.GetLessonInfoOfElectiveOnlineEntity(keyValue); - if (lessonInfoIbll.GetLessonInfoEntityByLessonNo(JournalReceiveData.LessonNo) != null) - { - if (!string.IsNullOrEmpty(lessonInfoIbll.GetLessonInfoEntityByLessonNo(JournalReceiveData.LessonNo).Introduction)) - JournalReceiveData.Introduction = WebHelper.NoHtml(WebHelper.HtmlDecode(lessonInfoIbll.GetLessonInfoEntityByLessonNo(JournalReceiveData.LessonNo).Introduction)) ?? ""; - } - if (empInfoIbll.GetEmpInfoEntityByEmpNo(JournalReceiveData.EmpNo) != null) - { - if (!string.IsNullOrEmpty(empInfoIbll.GetEmpInfoEntityByEmpNo(JournalReceiveData.EmpNo).resume)) - JournalReceiveData.resume = WebHelper.NoHtml(WebHelper.HtmlDecode(empInfoIbll.GetEmpInfoEntityByEmpNo(JournalReceiveData.EmpNo).resume)) ?? ""; - } + var Data = lessonInfoOfElectiveOnlineIbll.GetLessonInfoOfElectiveOnlineEntity(keyValue); + var jsonData = new { - JournalReceive = JournalReceiveData, + data = Data, }; return Success(jsonData); } @@ -223,7 +214,7 @@ namespace Learun.Application.WebApi if (sslleEntity.Status != 2) { stuSelectLessonListOfElectiveOnlineIBLL.DeleteEntity(sslleEntity.Id); - return Fail("取消成功"); + return Success("取消成功"); } else { diff --git a/Learun.Framework.Ultimate V7/LearunApp-2.2.0/config.js b/Learun.Framework.Ultimate V7/LearunApp-2.2.0/config.js index 5cad72901..8b6aafae8 100644 --- a/Learun.Framework.Ultimate V7/LearunApp-2.2.0/config.js +++ b/Learun.Framework.Ultimate V7/LearunApp-2.2.0/config.js @@ -12,14 +12,15 @@ export default { // "apiHost": [ // "http://123.57.209.16:31174/learun/adms" // ], - // "apiHost": [ - // "http://localhost:8088/" - // ], "apiHost": [ - "http://10.30.0.10:9002/" - // "/api/", + "http://localhost:8088/" ], - "webHost":"http://10.30.0.10:8000/", + // "apiHost": [ + // "http://10.30.0.10:9002/" + // // "/api/", + // ], + // "webHost":"http://10.30.0.10:8000/", + "webHost":"http://localhost:8087/", // 开发环境下自动填充登录账号密码，与接口地址一一对应，只在开发环境下显示 "devAccount": [ { username: "system", password: "www.qj.com" } diff --git a/Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages.json b/Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages.json index ff1ff458b..d82e8cb8e 100644 --- a/Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages.json +++ b/Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages.json @@ -745,6 +745,19 @@ "navigationBarTitleText": "查看详情" } }, + //线上课程选课 + { + "path": "pages/EducationalAdministration/LessonInfoOfElectiveOnline/list", + "style": { + "navigationBarTitleText": "线上课程选课" + } + }, + { + "path": "pages/EducationalAdministration/LessonInfoOfElectiveOnline/from", + "style": { + "navigationBarTitleText": "查看详情" + } + }, //学费查询 { "path": "pages/StuPayFee/list", diff --git a/Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages/EducationalAdministration/LessonInfoOfElectiveOnline/from.vue b/Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages/EducationalAdministration/LessonInfoOfElectiveOnline/from.vue new file mode 100644 index 000000000..7f3b862a1 --- /dev/null +++ b/Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages/EducationalAdministration/LessonInfoOfElectiveOnline/from.vue @@ -0,0 +1,137 @@ + + + + + \ No newline at end of file diff --git a/Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages/EducationalAdministration/LessonInfoOfElectiveOnline/list.vue b/Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages/EducationalAdministration/LessonInfoOfElectiveOnline/list.vue new file mode 100644 index 000000000..8dd9b5e32 --- /dev/null +++ b/Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages/EducationalAdministration/LessonInfoOfElectiveOnline/list.vue @@ -0,0 +1,304 @@ + + + + + \ No newline at end of file