Merge branch 'master_1202_0319' into master_1202

# Conflicts:
#	src/views/courselibrary/CoursewareManage.vue

src/views/courselibrary/CoursewareManage.vue

@@ -3940,7 +3940,7 @@ function onFocusEnd(){
       state.changeName = true
       state.xjkkinputV3 = [moment().format('YYYY-MM-DD HH:mm'),'']
 
-      // state.examInfo = {};
+      state.examInfo = {};
       //清除缓存
       state.cstm_hs = true;
     };
@@ -4032,7 +4032,8 @@ function onFocusEnd(){
         afterStart: state.afterStartValue, //考勤 开始后
         score: state.scoreParams,
       };
-      /*if(state.kk_eidt){
+      //todo 为了合并代码
+      if(state.kk_eidt){
         //编辑
         postData.examInfo = state.examInfo;
       }else{