Merge branch 'develop' of ssh://gitlab.dongwu-inc.com:10022/BOE/fe-manage into develop

src/components/drawers/AddOnline.vue

@@ -270,7 +270,17 @@ export default {
     };
     const onSelectChange = (selectedRowKeys,selectedRows) => {
         state.selectedRowKeys = selectedRowKeys;
-        state.addOnlineList = selectedRows
+        state.addOnlineList = selectedRows;
+        if( props.edit && selectedRows.length > 0 ){
+          selectedRows.map((value)=>{
+            if(value.courseId == props.EditOnlineId){
+              message.destroy()
+              message.error('选项相同，请重新选择')
+              state.selectedRowKeys = []
+              state.addOnlineList = []
+            }
+          })
+        }
     };
     //清空所选
     const clearLine = () => {
@@ -294,6 +304,7 @@ export default {
             teacher:value.teacher,
             sysCreateBy:value.sysCreateBy,
             overtime:"",
+            courseId: Number(value.onlineClassesId),
           };
           array.push(obj);
         }

src/views/projectcenter/TaskAdd.vue

@@ -1209,6 +1209,7 @@ export default {
             taskList: value.taskList,
             value: value.stageId,
             label: value.name,
+            courseId: value.courseId ? value.courseId : null
           };
           array.push(obj);
         }
@@ -1660,6 +1661,7 @@ export default {
         "0px 1px 35px 0px rgba(118, 136, 166, 0.07)";
     });
     const showDrawerOnline = (id, eleId) => {
+      console.log('id, eleId',id, eleId);
       state.addonlinevisible = true;
       state.EditOnlineId = id;
       state.projectTaskId = eleId;
@@ -1834,7 +1836,7 @@ export default {
     //编辑的按钮
     const decideType = (type, id, eleId) => {
       state.edit = true;
-      console.log(type, id);
+      console.log(type, id, eleId);
       if (type == "外链") {
         showDrawerAddRef(id, eleId);
       } else if (type == "直播") {