diff --git a/.env b/.env index 02fee926..df36dccb 100644 --- a/.env +++ b/.env @@ -18,6 +18,7 @@ VUE_APP_OUTPUT_DIR=./dist VUE_APP_IFRAME_URL=//u-pre.boe.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_COURSE_STUDY=//u-pre.boe.com/pc/course/studyindex?id= diff --git a/.env.prod b/.env.prod index 863de9ff..40aef55d 100644 --- a/.env.prod +++ b/.env.prod @@ -10,6 +10,7 @@ VUE_APP_BOE_API_URL=//u.boe.com VUE_APP_IFRAME_URL=//u.boe.com/pc/iframe VUE_APP_IFRAME_STUDENT_URL=//u.boe.com/pc/loading +VUE_APP_IFRAME_TEACHER_URL=//u-pre.boe.com/pc/need/waitaudit VUE_APP_COURSE_STUDY=//u.boe.com/pc/course/studyindex?id= diff --git a/.env.release b/.env.release index 0efa2573..d54ac429 100644 --- a/.env.release +++ b/.env.release @@ -10,6 +10,7 @@ VUE_APP_BOE_API_URL=//u.boe.com VUE_APP_IFRAME_URL=//u.boe.com/pc-release/iframe VUE_APP_IFRAME_STUDENT_URL=//u.boe.com/pc-release/loading +VUE_APP_IFRAME_TEACHER_URL=//u-pre.boe.com/pc-release/need/waitaudit VUE_APP_COURSE_STUDY=//u.boe.com/pc-release/course/studyindex?id= diff --git a/src/api/method.js b/src/api/method.js index f5826d2f..fa365a79 100644 --- a/src/api/method.js +++ b/src/api/method.js @@ -280,6 +280,7 @@ const organizationalTree = [] const iframeUrl = window.location.protocol + process.env.VUE_APP_IFRAME_URL //学员端路由 const studentUrl = window.location.protocol + process.env.VUE_APP_IFRAME_STUDENT_URL +const teacherUrl = window.location.protocol + process.env.VUE_APP_IFRAME_TEACHER_URL //二维码 const codeUrl = window.location.protocol + "//u-pre.boe.com" @@ -297,5 +298,6 @@ export { organizationalTree, iframeUrl, studentUrl, + teacherUrl, codeUrl, } \ No newline at end of file diff --git a/src/components/NavLeft.vue b/src/components/NavLeft.vue index 5ea91d91..215b32a5 100644 --- a/src/components/NavLeft.vue +++ b/src/components/NavLeft.vue @@ -1,39 +1,46 @@ - + \ No newline at end of file + diff --git a/src/components/drawers/ViewAssess.vue b/src/components/drawers/ViewAssess.vue index d60c4054..fe707fd7 100644 --- a/src/components/drawers/ViewAssess.vue +++ b/src/components/drawers/ViewAssess.vue @@ -41,17 +41,22 @@
-
-
选择{{indexss+1}}：
-
-
-
+
+
+
选择{{indexss+1}}：
+
+
+
+
+
+ {{itteems.singleOptionName}}
-
- {{itteems.singleOptionName}}
+ +
+
@@ -68,15 +73,19 @@
-
-
选择{{indexss+1}}：
-
-
-
+
+
+
选择{{indexss+1}}：
+
+
+
+
+
+ {{itteems.multipleOptionName}}
-
- {{itteems.multipleOptionName}}
+ +
@@ -217,10 +226,31 @@ export default { } }; + // 判断当前题目中是否有的选项有图片有的没有 + const isExistImg = (data, index) => { + let exist = false; + data.forEach((i,n)=>{ + console.log(i,n) + if(index==1){ + if(i.singleOptionPictureAddress){ + exist = true; + return exist; + } + }else{ + if(i.multipleOptionPictureAddress){ + exist = true; + return exist; + } + } + }) + return exist; + } + return { ...toRefs(state), afterVisibleChange, closeDrawer, + isExistImg // change, }; }, diff --git a/src/components/drawers/project/ProjectExamManage.vue b/src/components/drawers/project/ProjectExamManage.vue index d856d88a..c983fe8c 100644 --- a/src/components/drawers/project/ProjectExamManage.vue +++ b/src/components/drawers/project/ProjectExamManage.vue @@ -370,10 +370,10 @@ export default { 'courseId': props.datasource.courseId,//任务的Id 'courseName': props.title,//任务的名称 'logo': '1',//项目或径的标识 1-项目 2-路径图 3面授课 - 'routerTaskId': props.datasource.routerId,//任务的routerTaskld或projectTaskld - 'targetId': props.datasource.routerId,//路径图的就是routerId,项目的是projectId;根据这张图来看的话 + 'routerTaskId': props.datasource.projectId,//任务的routerTaskld或projectTaskld + 'targetId': props.datasource.projectId,//路径图的就是routerId,项目的是projectId;根据这张图来看的话 'taskType': props.datasource.type,//催促的任务的类型 - 'chapterId': props.datasource.chapterId,//阶段或关卡Id + 'chapterId': props.datasource.stageId,//阶段或关卡Id }; batchSendMessage(obj).then(res => { console.log(res) diff --git a/src/components/drawers/project/ProjectExternalExamManage.vue b/src/components/drawers/project/ProjectExternalExamManage.vue index d1925f05..a7909ceb 100644 --- a/src/components/drawers/project/ProjectExternalExamManage.vue +++ b/src/components/drawers/project/ProjectExternalExamManage.vue @@ -366,10 +366,10 @@ 'courseId': props.datasource.courseId,//任务的Id 'courseName': props.title,//任务的名称 'logo': '1',//项目或径的标识 1-项目 2-路径图 3面授课 - 'routerTaskId': props.datasource.routerId,//任务的routerTaskld或projectTaskld - 'targetId': props.datasource.routerId,//路径图的就是routerId,项目的是projectId;根据这张图来看的话 + 'routerTaskId': props.datasource.projectId,//任务的routerTaskld或projectTaskld + 'targetId': props.datasource.projectId,//路径图的就是routerId,项目的是projectId;根据这张图来看的话 'taskType': props.datasource.type,//催促的任务的类型 - 'chapterId': props.datasource.chapterId,//阶段或关卡Id + 'chapterId': props.datasource.stageId,//阶段或关卡Id }; batchSendMessage(obj).then(res => { message.success("催促" + props.title + "成功"); diff --git a/src/components/drawers/router/RouterCommonManage.vue b/src/components/drawers/router/RouterCommonManage.vue index d78015cb..5994d21b 100644 --- a/src/components/drawers/router/RouterCommonManage.vue +++ b/src/components/drawers/router/RouterCommonManage.vue @@ -500,7 +500,6 @@ export default { // 导出数据 function exportTaskStu() { - debugger if(props.datasource.type==1){ {/* 在线课导出 */} window.open(`${process.env.VUE_APP_BASE_API}/admin/online/manage/exportOnline?chapterId=${props.datasource.chapterId}&type=${2}&targetId=${props.datasource.routerId}&taskId=${props.datasource.courseId}`) diff --git a/src/components/project/OrgClassCheck.vue b/src/components/project/OrgClassCheck.vue index 4033a65a..92605241 100644 --- a/src/components/project/OrgClassCheck.vue +++ b/src/components/project/OrgClassCheck.vue @@ -2,7 +2,7 @@ * @Author: lixg lixg@dongwu-inc.com * @Date: 2023-02-23 14:57:21 * @LastEditors: lixg lixg@dongwu-inc.com - * @LastEditTime: 2023-02-24 22:54:03 + * @LastEditTime: 2023-03-07 17:30:12 * @FilePath: /fe-manage/src/components/project/OrgClassCheck.vue * @Description: 这是默认设置,请设置`customMade`, 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE --> diff --git a/src/components/student/TableStudent.vue b/src/components/student/TableStudent.vue index 79ba5630..9dcfc1de 100644 --- a/src/components/student/TableStudent.vue +++ b/src/components/student/TableStudent.vue @@ -692,7 +692,6 @@ const deleteId = ref(null); const deleteTargetId = ref(null); const deleteType = ref(null); function del(id, row) { - debugger if (row.isLeader === "1") { return message.warning("" + row.name + "是小组长，请勿删除!"); } diff --git a/src/utils/utils.js b/src/utils/utils.js index b2956865..77f98431 100644 --- a/src/utils/utils.js +++ b/src/utils/utils.js @@ -31,10 +31,16 @@ export function traverseArr(arr, traverseObj, saveOld = false) { const admin = [5, 6, 8, 9, 11, 12]; //检查 管理权和归属权 -export function checkPer(per) { +export function checkPer(per,createId) { + if(createId && store?.state?.userInfo?.id === createId){ + return true; + } if (store?.state?.userInfo?.roleList.some(t => t.code === "system-admin")) { return true; } + if (store?.state?.userInfo?.isHrbp) { + return true; + } if (!per) { return false; } diff --git a/src/views/courselibrary/CoursewareManage.vue b/src/views/courselibrary/CoursewareManage.vue index 3d68b861..375d3493 100644 --- a/src/views/courselibrary/CoursewareManage.vue +++ b/src/views/courselibrary/CoursewareManage.vue @@ -1251,6 +1251,7 @@ :id="offcoursePlanId" :columns="stuColumns" :visable="sm_hs" + :permissions="permissions" :isgetStudent="isgetStudent" > @@ -601,7 +601,7 @@ class="oneedi" @click="showbtn" v-show="twobtn" - v-if="checkPer(permissions)" + v-if="checkPer(permissions,createId)" > 编辑
@@ -692,7 +692,7 @@
- +
@@ -1424,6 +1424,7 @@ export default { const stuRef = ref(); // const store = useStore(); const state = reactive({ + createId:null, permissions: "", hasTask: false, stage: [], @@ -2289,6 +2290,7 @@ export default { .then((res) => { console.log("router-list", res); state.fileList = JSON.parse(res.data.data.routerInfo.attach); + state.createId = res.data.data.routerInfo.createId; state.permissions = res.data.data.routerInfo.permissions; console.log("asdasdasd-------->", state.fileList); state.docChecked = diff --git a/src/views/projectcenter/ProjectManage.vue b/src/views/projectcenter/ProjectManage.vue index 45a48f7d..76b91291 100644 --- a/src/views/projectcenter/ProjectManage.vue +++ b/src/views/projectcenter/ProjectManage.vue @@ -199,7 +199,7 @@ >结束 撤回
-
{{ item.groupName }}
+
{{ item.groupName }}
进度
{ state.stugroup = false; + state.buttonLoading = false state.groupInfo = {}; state.groupMemberCountContrast = null; getGroup(); @@ -3931,7 +3934,6 @@ export default { }; //创建小组 const createGroup = async () => { - debugger; console.log("state.groupPageList" + state.groupPageList); const id = state.groupInfo.id; const d = state.groupPageList @@ -6792,6 +6794,12 @@ export default { font-size: 16px; line-height: 36px; font-weight: 600; + + overflow: hidden; + text-overflow: ellipsis; + white-space: nowrap; + cursor: pointer; + } .more { diff --git a/src/views/research/ManagePage.vue b/src/views/research/ManagePage.vue index 764cbcbe..39ed0052 100644 --- a/src/views/research/ManagePage.vue +++ b/src/views/research/ManagePage.vue @@ -105,7 +105,7 @@ export default { evalStuListDataTotal: 0, evalCurrentPage: 1 }); - + const getInfoDate = async () => { state.tableDataTotalLoading = true; await queryAssessmentDetailList({ @@ -144,7 +144,7 @@ export default { // 导出学员信息 function exportStudentInfo() { - window.open(`${process.env.VUE_APP_BASE_API}/admin/assessment/manage/exportAssessmentMessage?assessmentId=${router.currentRoute.value.params.id}`) + window.open(`${process.env.VUE_APP_BASE_API}/admin/assessment/manage/exportAssessmentMessage?courseId=${router.currentRoute.value.params.id}`) } //分页 @@ -324,7 +324,7 @@ export default { showassess, changePaginationStu, exportStudentInfo, - createName, + createName, createTime }; }, @@ -507,4 +507,4 @@ export default { .btn2:active { background: #0982ff; } -} \ No newline at end of file +} diff --git a/src/views/research/components/ResearchAddPin.vue b/src/views/research/components/ResearchAddPin.vue index fd2ed4d7..8912e533 100644 --- a/src/views/research/components/ResearchAddPin.vue +++ b/src/views/research/components/ResearchAddPin.vue @@ -74,11 +74,11 @@
配置权重
-
+ +
权重比例