diff --git a/.env b/.env index 2843407d..f02adc52 100644 --- a/.env +++ b/.env @@ -7,7 +7,7 @@ VUE_APP_FILE_PATH=/upload/ # 代理url 本地调试，不可以用在其他地方 VUE_APP_PROXY_URL=//43.143.139.204/manageApi # 登录url -VUE_APP_LOGIN_URL=//u-pre.boe.com/web +VUE_APP_LOGIN_URL=//u-pre.boe.com/web?returnUrl= # boe域名 VUE_APP_BOE_API_URL=//u-pre.boe.com #打包路径 @@ -36,4 +36,6 @@ VUE_APP_EXAM_DETAIL_URL=//u-pre.boe.com/mobile/pages/exam/exam?id= #h5的基本url VUE_APP_H5=//u-pre.boe.com/student-h5 #用户头像 -VUE_APP_AVATAR_PATH=/upload/ \ No newline at end of file +VUE_APP_AVATAR_PATH=/upload/ +# 旧版管理员界面 +VUE_APP_OLD_MANAGE=//u-pre.boe.com/resource/index.html \ No newline at end of file diff --git a/.env.boe b/.env.boe index cce03937..dff531eb 100644 --- a/.env.boe +++ b/.env.boe @@ -2,7 +2,7 @@ NODE_ENV=boe VUE_APP_BASE=/manage VUE_APP_BASE_API=/manageApi -VUE_APP_LOGIN_URL=//u-pre.boe.com/web +VUE_APP_LOGIN_URL=//u-pre.boe.com/web?returnUrl= VUE_APP_BOE_API_URL=//u-pre.boe.com diff --git a/.env.prod b/.env.prod index 95f57361..54f6aaed 100644 --- a/.env.prod +++ b/.env.prod @@ -4,7 +4,7 @@ VUE_APP_BASE_API=/manageApi VUE_APP_PROXY_URL=//u.boe.com/ -VUE_APP_LOGIN_URL=//u.boe.com/web +VUE_APP_LOGIN_URL=//u.boe.com/web?returnUrl= VUE_APP_BOE_API_URL=//u.boe.com @@ -27,4 +27,6 @@ VUE_APP_H5=//u.boe.com/student-h5 #文件基础路径调试 只在生产做了变更 VUE_APP_FILE_PATH=/upload/boe/file/ #用户头像 -VUE_APP_AVATAR_PATH=/upload/ \ No newline at end of file +VUE_APP_AVATAR_PATH=/upload/ +# 旧版管理员界面 +VUE_APP_OLD_MANAGE=//u.boe.com/resource/index.html \ No newline at end of file diff --git a/.env.release b/.env.release index d6f1580a..95765bc6 100644 --- a/.env.release +++ b/.env.release @@ -3,7 +3,7 @@ VUE_APP_BASE=/manage-release VUE_APP_BASE_API=/manageApi-release VUE_APP_PROXY_URL=//u-pre.boe.com/ -VUE_APP_LOGIN_URL=//u.boe.com/web-release +VUE_APP_LOGIN_URL=//u.boe.com/web-release?returnUrl= VUE_APP_BOE_API_URL=//u.boe.com @@ -23,4 +23,6 @@ VUE_APP_EXAM_DETAIL_URL=//u.boe.com/mobile-release/pages/exam/exam?id= #h5的基本url VUE_APP_H5=//u.boe.com/student-h5-release #用户头像 -VUE_APP_AVATAR_PATH=/upload/ \ No newline at end of file +VUE_APP_AVATAR_PATH=/upload/ +# 旧版管理员界面 +VUE_APP_OLD_MANAGE=//u-pre.boe.com/resource/index.html \ No newline at end of file diff --git a/src/api/config.js b/src/api/config.js index 74e67963..f7faae2f 100644 --- a/src/api/config.js +++ b/src/api/config.js @@ -58,7 +58,9 @@ http.interceptors.response.use( return response; } if (code === 1000) { - (process.env.NODE_ENV === 'development' || process.env.NODE_ENV === 'alpine') ? router.push({path: 'login'}) : (window.location.href = process.env.VUE_APP_LOGIN_URL) + (process.env.NODE_ENV === 'development' || process.env.NODE_ENV === 'alpine') ? + router.push({path: 'login', query: { returnUrl: router.currentRoute.value.fullPath }}) : + (window.location.href = process.env.VUE_APP_LOGIN_URL + encodeURIComponent(window.location.protocol + import.meta.env.VUE_APP_BOE_API_URL + import.meta.env.VUE_APP_BASE + router.currentRoute.value.fullPath)) return Promise.reject(response); } show && message.error(msg); diff --git a/src/components/NavLeft.vue b/src/components/NavLeft.vue index 6737e480..ad43b991 100644 --- a/src/components/NavLeft.vue +++ b/src/components/NavLeft.vue @@ -436,7 +436,7 @@ src="../assets/images/navleft/review.png" /> - 旧版管理员界面 + 旧版管理员界面 @@ -807,6 +807,7 @@ export default { pagename: "字典管理", }, ], + oldManage: window.location.protocol + process.env.VUE_APP_OLD_MANAGE }); // console.log(state.openKeys, state.selectedKeys); diff --git a/src/components/common/FJUpload.vue b/src/components/common/FJUpload.vue index a9f9bffc..c46c161b 100644 --- a/src/components/common/FJUpload.vue +++ b/src/components/common/FJUpload.vue @@ -23,7 +23,11 @@ {{ item.name.indexOf('http')!==-1? item.name.slice(item.name.lastIndexOf('/') + 1) - :item.name.indexOf('-')!==-1?item.name.slice(0,item.name.indexOf('-')) + item.name.slice(item.name.indexOf('.')) :item.name + :item.name.indexOf('-')!==-1? + item.name.indexOf('/')!==-1? + item.name.slice(item.name.lastIndexOf('/') + 1).slice(0,item.name.slice(item.name.lastIndexOf('/') + 1).indexOf('-')) + item.name.slice(item.name.indexOf('.')) + :item.name.slice(0,item.name.indexOf('-')) + item.name.slice(item.name.indexOf('.')) + :item.name }} diff --git a/src/components/drawers/ActiveAttendance.vue b/src/components/drawers/ActiveAttendance.vue index 60467d03..78ec3de6 100644 --- a/src/components/drawers/ActiveAttendance.vue +++ b/src/components/drawers/ActiveAttendance.vue @@ -126,6 +126,21 @@ }" /> +
+
+ +
+
@@ -459,6 +474,13 @@ export default { } }; + //分页 + const changePagination = (page) => { + state.tableDataTotalLoading = true; + state.currentPage = page; + getTableData(); + }; + const getTableData = () => { // debugger console.log("当前是项目还是路径图 1 项目 2 路径图", props); @@ -510,6 +532,7 @@ export default { .catch((err) => { console.log(err); state.tableDataTotalLoading = false; + state.tableDataTotal = 0; state.tableData = []; }); } else if ( @@ -560,10 +583,12 @@ export default { console.log(err); state.tableDataTotalLoading = false; state.tableData = []; + state.tableDataTotal = 0; }); } else { state.tableDataTotalLoading = false; state.tableData = []; + state.tableDataTotal = 0; } // let arr = state.tableData; @@ -1047,6 +1072,7 @@ export default { searchTaskList, resetTaskList, exportTaskStu, + changePagination }; }, }; diff --git a/src/components/drawers/ProjectScore.vue b/src/components/drawers/ProjectScore.vue index b1d0d768..45355039 100644 --- a/src/components/drawers/ProjectScore.vue +++ b/src/components/drawers/ProjectScore.vue @@ -158,89 +158,73 @@
-
- 当前设计下，学员可以获得 {{ scoresum }}积分 -
+
- 完成【必修/选修】获得 {{ score1 }} 积分 + 每完成一项任务则可获得 {{ score1 }} 积分,除此以外:
+ + +
- 前{{ four1 }}名学完在线课程获得 - {{ four2 }}积分 前作业：最早完成任意一项目作业的前{{ four3 }}名提交作业且成绩不低于 + >名学员且成绩不低于 {{ four4 }}分获得 {{ four5 }}积分
- 考试成绩高于在线：最早完成任意一门课程的{{ four1 }}名学员获得 + {{ four2 }}积分 + +
+
+ 考试：完成任意一场考试且成绩高于{{ five1 }}分获得 {{ five2 }}积分
- 考勤正常学员获得 面授、直播、活动：完成任意一面授课、直播、活动且考勤正常学员获得 {{ six1 }}积分
+
成为小组长获得{{ seven1 }}积分 + >积分（同一项目只加一次） +
优秀学员可获得 {{ seven2 }}积分 + >积分（同一项目只加一次）
-
- 当前设计下，学员可以获得 {{ scoresum }}积分 -
+
- 完成【必修/选修】获得 每完成一项任务则可获得 积分 + >积分，除此以外：
- 完成作业成绩不低于 分获得 - 积分 -
-
- 前名学完在线课程获得 - 积分 - 前作业：最早完成任意一项作业的名提交作业且成绩不低于名学员且成绩不低于 分获得
- 考试成绩高于在线：最早完成任意一门课程的名学完在线课程获得 + 积分 + +
+
+ 考试：完成任意一场考试且成绩高于分获得 @@ -259,20 +254,21 @@ >
- 考勤正常学员获得 面授、直播、活动：完成任意一面授课、直播、活动且考勤正常学员获得 积分
+
成为小组长获得积分 + >积分（同一项目只加一次）
优秀学员可获得 积分积分（同一项目只加一次）
diff --git a/src/router/index.js b/src/router/index.js index f376229f..d7a2556a 100644 --- a/src/router/index.js +++ b/src/router/index.js @@ -8,6 +8,8 @@ */ import { createRouter, createWebHistory } from 'vue-router'; import routesConfig from './config'; +import store from "@/store"; + const routes = [ { path: '/', @@ -21,4 +23,26 @@ const router = createRouter({ routes, }) + +let count = 0; +const timers = setInterval(() => { + count ++ + let pathArr = store.state.menus + let currentPath = router.options.history.location + console.log(pathArr, currentPath, pathArr.indexOf(currentPath)) + if(pathArr.length!==0){ + // 刷新界面是否重新执行 + if(pathArr.indexOf(currentPath)==-1){ + clearInterval(timers) + router.push({path: pathArr[0]}) + }else{ + clearInterval(timers) + } + } + // 30s超时结束 + if(count==60&&pathArr.length==0){ + clearInterval(timers) + } +}, 500); + export default router \ No newline at end of file diff --git a/src/store/index.js b/src/store/index.js index 004edc54..c064244c 100644 --- a/src/store/index.js +++ b/src/store/index.js @@ -12,14 +12,7 @@ export default createStore({ state: { openpages: localStorage.getItem("openpages") ? JSON.parse(localStorage.getItem("openpages")) - : [ - { - pagename: "学习路径图", - href: "/learningpath", - active: true, - }, - ], - + : [], assessmentName: "", routerId: null, projectTemplateId: null, diff --git a/src/views/courselibrary/CoursewareManage.vue b/src/views/courselibrary/CoursewareManage.vue index c6360a1c..e42a7538 100644 --- a/src/views/courselibrary/CoursewareManage.vue +++ b/src/views/courselibrary/CoursewareManage.vue @@ -321,7 +321,7 @@ :scroll="{ x: 'max-content' }" >