From 8ca301256d4236d500b70cd774bcce8dfc57bd23 Mon Sep 17 00:00:00 2001 From: zhangsir <2207038757@qq.com> Date: Thu, 21 Sep 2023 15:04:07 +0800 Subject: [PATCH 01/43] =?UTF-8?q?=E6=8E=A8=E8=8D=90=E8=AF=BE=E7=A8=8B?= =?UTF-8?q?=E5=88=9D=E5=A7=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .env | 25 +- src/components/BreadCrumb.vue | 16 + src/components/NavLeft.vue | 15 + .../courserecommended/CourseRecommended.vue | 385 ++++++++ src/views/courselibrary/CourseRecommended.vue | 934 ++++++++++++++++++ 5 files changed, 1363 insertions(+), 12 deletions(-) create mode 100644 src/components/courserecommended/CourseRecommended.vue create mode 100644 src/views/courselibrary/CourseRecommended.vue diff --git a/.env b/.env index 409b9fb6..c4abd398 100644 --- a/.env +++ b/.env @@ -11,22 +11,23 @@ VUE_APP_TOOL_FOLDERID=1147577145918910464 #文件路径 VUE_APP_FILE_PATH=/upload/ # 代理url 本地调试,不可以用在其他地方 -VUE_APP_PROXY_URL=//u-pre.boe.com/manageApi +VUE_APP_PROXY_URL=//pretest.zcwytd.com/manageApi # 登录url -VUE_APP_LOGIN_URL=//u-pre.boe.com/web?returnUrl= +# VUE_APP_LOGIN_URL=//pretest.zcwytd.com/web?returnUrl= +VUE_APP_LOGIN_URL=/pc/login # boe域名 -VUE_APP_BOE_API_URL=//u-pre.boe.com +VUE_APP_BOE_API_URL=//pretest.zcwytd.com #打包路径 VUE_APP_OUTPUT_DIR=./dist # iframe嵌套url -VUE_APP_IFRAME_URL=//u-pre.boe.com/pc/iframe +VUE_APP_IFRAME_URL=//pretest.zcwytd.com/pc/iframe # 学员端路由 -VUE_APP_IFRAME_STUDENT_URL=//u-pre.boe.com/pc/loading -VUE_APP_IFRAME_TEACHER_URL=//u-pre.boe.com/pc/need/waitaudit +VUE_APP_IFRAME_STUDENT_URL=//pretest.zcwytd.com/pc/loading +VUE_APP_IFRAME_TEACHER_URL=//pretest.zcwytd.com/pc/need/waitaudit # 课程二维码 -VUE_APP_COURSE_STUDY=//u-pre.boe.com/pc/course/studyindex?id= +VUE_APP_COURSE_STUDY=//pretest.zcwytd.com/pc/course/studyindex?id= # 导入学员模板 VUE_APP_UP_LOAD_STUDENT_TEMPLATE=导入学员模版-1673963663229.xlsx @@ -34,16 +35,16 @@ VUE_APP_UP_LOAD_STUDENT_TEMPLATE=导入学员模版-1673963663229.xlsx VUE_APP_UP_LOAD_STUDENT_SCORE_TEMPLATE=外部考试学员成绩导入模板-1676551319283.xlsx #在线 -VUE_APP_ONLINE_CLASS_URL=//u-pre.boe.com/mobile/pages/study/courseStudy?id= +VUE_APP_ONLINE_CLASS_URL=//pretest.zcwytd.com/mobile/pages/study/courseStudy?id= #案例 -VITE_BOE_CASS_DETAIL_URL=//u-pre.boe.com/pc/case/detail?id= +VITE_BOE_CASS_DETAIL_URL=//pretest.zcwytd.com/pc/case/detail?id= #考试 -VUE_APP_EXAM_DETAIL_URL=//u-pre.boe.com/mobile/pages/exam/exam?id= +VUE_APP_EXAM_DETAIL_URL=//pretest.zcwytd.com/mobile/pages/exam/exam?id= #h5的基本url -VUE_APP_H5=//u-pre.boe.com/student-h5 +VUE_APP_H5=//pretest.zcwytd.com/student-h5 #用户头像 VUE_APP_AVATAR_PATH=/upload/ # 旧版管理员界面 -VUE_APP_OLD_MANAGE=//u-pre.boe.com/resource/index.html +VUE_APP_OLD_MANAGE=//pretest.zcwytd.com/resource/index.html # 批量面授报名模板 VUE_APP_FACE_STUDENT_TEMPLATE=批量面授报名模版-1673963663229.xlsx \ No newline at end of file diff --git a/src/components/BreadCrumb.vue b/src/components/BreadCrumb.vue index faead9c5..5d0f2c03 100644 --- a/src/components/BreadCrumb.vue +++ b/src/components/BreadCrumb.vue @@ -194,6 +194,22 @@ }, ]; } + if ( + n.indexOf("/courserecommended") !== -1 || + n.indexOf("/CourseRecommended") !== -1 + ) { + state.list = [ + { + name: "课程库", + href: "", + // href: "#/coursewaremanage", + }, + { + name: "课程推荐", + href: "", + }, + ]; + } if ( n.indexOf("/coursemanage") !== -1 || n.indexOf("/CourseManage") !== -1 diff --git a/src/components/NavLeft.vue b/src/components/NavLeft.vue index 4d2fa72d..c6ffb053 100644 --- a/src/components/NavLeft.vue +++ b/src/components/NavLeft.vue @@ -153,6 +153,15 @@ > 课件管理 + + + 课程推荐 + + + + + diff --git a/src/views/courselibrary/CourseRecommended.vue b/src/views/courselibrary/CourseRecommended.vue new file mode 100644 index 00000000..05707b4a --- /dev/null +++ b/src/views/courselibrary/CourseRecommended.vue @@ -0,0 +1,934 @@ + + + + From 15c80cf02d19c65708c843f5c1c4ae92d27ebf83 Mon Sep 17 00:00:00 2001 From: NiSen Date: Thu, 21 Sep 2023 15:07:53 +0800 Subject: [PATCH 02/43] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E9=85=8D=E7=BD=AEenv?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .env | 25 ++++++++++++------------- 1 file changed, 12 insertions(+), 13 deletions(-) diff --git a/.env b/.env index c4abd398..409b9fb6 100644 --- a/.env +++ b/.env @@ -11,23 +11,22 @@ VUE_APP_TOOL_FOLDERID=1147577145918910464 #文件路径 VUE_APP_FILE_PATH=/upload/ # 代理url 本地调试,不可以用在其他地方 -VUE_APP_PROXY_URL=//pretest.zcwytd.com/manageApi +VUE_APP_PROXY_URL=//u-pre.boe.com/manageApi # 登录url -# VUE_APP_LOGIN_URL=//pretest.zcwytd.com/web?returnUrl= -VUE_APP_LOGIN_URL=/pc/login +VUE_APP_LOGIN_URL=//u-pre.boe.com/web?returnUrl= # boe域名 -VUE_APP_BOE_API_URL=//pretest.zcwytd.com +VUE_APP_BOE_API_URL=//u-pre.boe.com #打包路径 VUE_APP_OUTPUT_DIR=./dist # iframe嵌套url -VUE_APP_IFRAME_URL=//pretest.zcwytd.com/pc/iframe +VUE_APP_IFRAME_URL=//u-pre.boe.com/pc/iframe # 学员端路由 -VUE_APP_IFRAME_STUDENT_URL=//pretest.zcwytd.com/pc/loading -VUE_APP_IFRAME_TEACHER_URL=//pretest.zcwytd.com/pc/need/waitaudit +VUE_APP_IFRAME_STUDENT_URL=//u-pre.boe.com/pc/loading +VUE_APP_IFRAME_TEACHER_URL=//u-pre.boe.com/pc/need/waitaudit # 课程二维码 -VUE_APP_COURSE_STUDY=//pretest.zcwytd.com/pc/course/studyindex?id= +VUE_APP_COURSE_STUDY=//u-pre.boe.com/pc/course/studyindex?id= # 导入学员模板 VUE_APP_UP_LOAD_STUDENT_TEMPLATE=导入学员模版-1673963663229.xlsx @@ -35,16 +34,16 @@ VUE_APP_UP_LOAD_STUDENT_TEMPLATE=导入学员模版-1673963663229.xlsx VUE_APP_UP_LOAD_STUDENT_SCORE_TEMPLATE=外部考试学员成绩导入模板-1676551319283.xlsx #在线 -VUE_APP_ONLINE_CLASS_URL=//pretest.zcwytd.com/mobile/pages/study/courseStudy?id= +VUE_APP_ONLINE_CLASS_URL=//u-pre.boe.com/mobile/pages/study/courseStudy?id= #案例 -VITE_BOE_CASS_DETAIL_URL=//pretest.zcwytd.com/pc/case/detail?id= +VITE_BOE_CASS_DETAIL_URL=//u-pre.boe.com/pc/case/detail?id= #考试 -VUE_APP_EXAM_DETAIL_URL=//pretest.zcwytd.com/mobile/pages/exam/exam?id= +VUE_APP_EXAM_DETAIL_URL=//u-pre.boe.com/mobile/pages/exam/exam?id= #h5的基本url -VUE_APP_H5=//pretest.zcwytd.com/student-h5 +VUE_APP_H5=//u-pre.boe.com/student-h5 #用户头像 VUE_APP_AVATAR_PATH=/upload/ # 旧版管理员界面 -VUE_APP_OLD_MANAGE=//pretest.zcwytd.com/resource/index.html +VUE_APP_OLD_MANAGE=//u-pre.boe.com/resource/index.html # 批量面授报名模板 VUE_APP_FACE_STUDENT_TEMPLATE=批量面授报名模版-1673963663229.xlsx \ No newline at end of file From 4d91d763301b57df4f7ef50d651ff86be9b1fddb Mon Sep 17 00:00:00 2001 From: zhangsir <2207038757@qq.com> Date: Thu, 21 Sep 2023 17:52:43 +0800 Subject: [PATCH 03/43] =?UTF-8?q?=E8=AF=BE=E7=A8=8B=E6=8E=A8=E8=8D=90?= =?UTF-8?q?=E5=AE=8C=E5=96=84=E5=BC=B9=E7=AA=97?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../courserecommended/CourseRecommended.vue | 48 +++++++++---------- src/views/courselibrary/CourseRecommended.vue | 4 +- 2 files changed, 26 insertions(+), 26 deletions(-) diff --git a/src/components/courserecommended/CourseRecommended.vue b/src/components/courserecommended/CourseRecommended.vue index 547708d6..11cf1db6 100644 --- a/src/components/courserecommended/CourseRecommended.vue +++ b/src/components/courserecommended/CourseRecommended.vue @@ -10,6 +10,7 @@ width="80%" @cancel="handleCancel" @ok="handleCancel" + style="overflow-y:auto" >
项目管理系列课
@@ -24,8 +25,9 @@
- + +
+ +
- - - + From 41b73b387887d334067a28d7ed2a0695a86533e8 Mon Sep 17 00:00:00 2001 From: zhangsir <2207038757@qq.com> Date: Mon, 25 Sep 2023 09:54:22 +0800 Subject: [PATCH 07/43] =?UTF-8?q?=E5=88=97=E8=A1=A8=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../courserecommended/CourseCheck.vue | 12 +++---- .../courserecommended/CourseRecommended.vue | 31 ++++++++++++++++--- 2 files changed, 32 insertions(+), 11 deletions(-) diff --git a/src/components/courserecommended/CourseCheck.vue b/src/components/courserecommended/CourseCheck.vue index 68d3f839..b43441bc 100644 --- a/src/components/courserecommended/CourseCheck.vue +++ b/src/components/courserecommended/CourseCheck.vue @@ -1,4 +1,4 @@ - +