diff --git a/src/components/drawers/CheckVote.vue b/src/components/drawers/CheckVote.vue index 28c93747..3d9335a1 100644 --- a/src/components/drawers/CheckVote.vue +++ b/src/components/drawers/CheckVote.vue @@ -31,6 +31,8 @@ > {{items.optionName}} +
+ @@ -151,9 +153,8 @@ export default { } } } + console.log(choiceArr) state.currentChoice = choiceArr - - }).catch(err=>{ console.log(err) }) diff --git a/src/components/drawers/MemberList.vue b/src/components/drawers/MemberList.vue index e2049235..6ba67c16 100644 --- a/src/components/drawers/MemberList.vue +++ b/src/components/drawers/MemberList.vue @@ -48,6 +48,7 @@
添加组员
--> -
+
批量删除
-
+
导出组员
@@ -192,6 +193,7 @@ import { toDate } from "../../api/method"; import { message } from "ant-design-vue"; // import AddGroupMembers from "./AddGroupMembers.vue"; import CommonStudent from "@/components/student/CommonStudent"; +import {checkPer} from "@/utils/utils"; export default { name: "MemberList", components: { @@ -220,6 +222,14 @@ export default { type: Number, default: null, }, + createId: { + type: Number, + default: null, + }, + permissions: { + type: String, + default: null, + }, }, setup(props, ctx) { @@ -293,13 +303,14 @@ export default { scopedSlots: { customRender: "action" }, //引入的插槽 customRender: (value) => { return ( + checkPer(props.permissions,props.createId)?
{ deleteOne(value.record.key,value.record); }} > 删除 -
+
:'' ); }, }, @@ -556,6 +567,7 @@ export default { return { ...toRefs(state), closeDrawer, + checkPer, showModal, closeModal, showStuAdd, 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/project/NameInput.vue b/src/components/project/NameInput.vue index efd00ba2..d7f2c3c9 100644 --- a/src/components/project/NameInput.vue +++ b/src/components/project/NameInput.vue @@ -5,12 +5,12 @@ :show-count="showCount" :maxlength="maxlength" /> -
+
名称重复,请重新输入