案例、作业、直播bugMerge branch 'develop' of ssh://gitlab.dongwu-inc.com:10022/BOE/fe-manage into develop

src/components/drawers/AddDiscuss.vue

@@ -128,7 +128,7 @@ export default {
       type: Number,
       default: null,
     },
-    projectTemplateId:{
+    projectTemplateId: {
       type: Number,
       default: null,
     },
@@ -165,7 +165,7 @@ export default {
       state.textV1 = "";
       localStorage.setItem("stageId", props.chooseStageId);
       localStorage.setItem("chapterId", props.isactive);
-    }
+    };
     const queryDiscuss = () => {
       if (props.edit) {
         //编辑讨
@@ -197,7 +197,6 @@ export default {
           type: 8,
         })
           .then(() => {
-           
             //message.success(`${props.edit ? "编辑" : "新增"}关卡任务成功`);
           })
           .catch(() => {
@@ -214,7 +213,6 @@ export default {
             type: 8,
           })
           .then(() => {
-           
             //message.success(`${props.edit ? "编辑" : "新增"}关卡任务成功`);
           })
           .catch(() => {
@@ -231,7 +229,6 @@ export default {
           type: 8,
         })
           .then(() => {
-           
             //message.success(`${props.edit ? "编辑" : "新增"}关卡任务成功`);
           })
           .catch(() => {
@@ -258,11 +255,11 @@ export default {
             updateTask(res);
             closeDrawer();
             ctx.emit("changeData", false);
-            message.destroy()
+            message.destroy();
             message.success("创建讨论成功");
           })
           .catch(() => {
-            message.destroy()
+            message.destroy();
             message.error("创建讨论失败");
           });
       } else {
@@ -272,11 +269,11 @@ export default {
             updateTask(res);
             closeDrawer();
             ctx.emit("changeData", false);
-            message.destroy()
+            message.destroy();
             message.success("创建讨论成功");
           })
           .catch(() => {
-            message.destroy()
+            message.destroy();
             message.error("创建讨论失败");
           });
       }

src/components/drawers/AddFaceteach.vue

@@ -1,49 +1,30 @@
 <template>
-  <a-drawer
+  <a-drawer :visible="addfaceteachVisible" class="drawerStyle addfaceteachDrawer" width="90%" title="添加面授"
-    :visible="addfaceteachVisible"
+    placement="right" @after-visible-change="afterVisibleChange">
-    class="drawerStyle addfaceteachDrawer"
-    width="90%"
-    title="添加面授"
-    placement="right"
-    @after-visible-change="afterVisibleChange"
-  >
     <div class="drawerMain">
       <div class="header">
         <div class="headerTitle">添加面授</div>
-        <img
+        <img style="width: 29px; height: 29px; cursor: pointer" src="../../assets/images/basicinfo/close.png"
-          style="width: 29px; height: 29px; cursor: pointer"
+          @click="closeDrawer" />
-          src="../../assets/images/basicinfo/close.png"
-          @click="closeDrawer"
-        />
       </div>
       <div class="contentMain">
         <div class="main_left">
           <div class="main_item">
             <div class="signbox">
               <div class="sign">
-                <img
+                <img src="@/assets/images/coursewareManage/asterisk.png" alt="" />
-                  src="@/assets/images/coursewareManage/asterisk.png"
-                  alt=""
-                />
               </div>
               <span style="margin-right: 3px">课程名称：</span>
             </div>
             <div class="btnbox">
-              <a-input
+              <a-input v-model:value="courseName" style="width: 384px; height: 32px" placeholder="请输入名称"
-                v-model:value="courseName"
+                maxlength="20" />
-                style="width: 384px; height: 32px"
-                placeholder="请输入名称"
-                maxlength="20"
-              />
             </div>
           </div>
           <div class="main_item">
             <div class="signbox">
               <div class="sign">
-                <img
+                <img src="@/assets/images/coursewareManage/asterisk.png" alt="" />
-                  src="@/assets/images/coursewareManage/asterisk.png"
-                  alt=""
-                />
               </div>
               <span style="margin-right: 3px">选择课程：</span>
             </div>
@@ -51,19 +32,16 @@
               <button class="xkbtn">
                 {{ chooseCourse == null ? "选择" : "修改" }}面授课
               </button>
-              <div v-if = "chooseCourse > 0">
+              <div v-if="chooseCourse > 0">
-              <a-tag  closable   color="processing" @close="logC">
+                <a-tag closable color="processing" @close="logC">
-            <span style="font-size:14px;line-height: 33px;" >删除课程</span>
+                  <span style="font-size:14px;line-height: 33px;">删除课程</span>
-            </a-tag></div>
+                </a-tag>
+              </div>
 
             </div>
             <!-- 选择面授侧弹窗 -->
             <div>
-              <sel-facet
+              <sel-facet v-model:selfacetVisible="selfacetvisible" v-model:chooseCourse="chooseCourse" />
-                v-model:selfacetVisible="selfacetvisible"
-                v-model:chooseCourse="chooseCourse"
-            
-              />
             </div>
             <!-- 选择面授侧弹窗 -->
           </div>
@@ -72,100 +50,59 @@
               <span style="margin-right: 3px">面授说明：</span>
             </div>
             <div class="textarea">
-              <a-textarea
+              <a-textarea v-model:value="description" placeholder="请输入说明" allow-clear maxlength="100" />
-                v-model:value="description"
-                placeholder="请输入说明"
-                allow-clear
-                maxlength="100"
-              />
             </div>
           </div>
           <div class="main_item">
             <div class="signbox">
               <div class="sign">
-                <img
+                <img src="@/assets/images/coursewareManage/asterisk.png" alt="" />
-                  src="@/assets/images/coursewareManage/asterisk.png"
-                  alt=""
-                />
               </div>
               <span style="margin-right: 3px">授课教师：</span>
             </div>
             <div class="btnbox">
-              <a-auto-complete
+              <a-auto-complete v-model:value="memberValue.label" placeholder="选择老师" style="width: 364px"
-                v-model:value="memberValue.label"
+                :options="options" @search="handleSearch"></a-auto-complete>
-                show-search
-                :not-found-content="fetching ? undefined : null"
-                placeholder="Select a teacher"
-                style="width: 364px"
-                :options="options"
-                @focus="handleFocus"
-                @blur="handleBlur"
-                @change="handleChange2"
-                @popupScroll="templateScroll"
-                @search="handleSearch"
-              ></a-auto-complete>
             </div>
           </div>
           <div class="main_item">
             <div class="signbox">
               <div class="sign">
-                <img
+                <img src="@/assets/images/coursewareManage/asterisk.png" alt="" />
-                  src="@/assets/images/coursewareManage/asterisk.png"
-                  alt=""
-                />
               </div>
               <span style="margin-right: 3px">面授时间：</span>
             </div>
             <div class="btnbox">
-              <a-range-picker
+              <a-range-picker v-model:value="chooseTime" :placeholder="['      开始时间', '        结束时间']" />
-                v-model:value="chooseTime"
-                :placeholder="['      开始时间', '        结束时间']"
-              />
             </div>
           </div>
           <div class="main_item">
             <div class="signbox">
               <div class="sign">
-                <img
+                <img src="@/assets/images/coursewareManage/asterisk.png" alt="" />
-                  src="@/assets/images/coursewareManage/asterisk.png"
-                  alt=""
-                />
               </div>
               <span style="margin-right: 3px">面授时长：</span>
             </div>
             <div class="btnbox">
-              <a-input-number
+              <a-input-number :min="0" :max="300" :precision="0" style="
-                :min="0"
-                :max="300"
-                :precision="0"
-                style="
                   width: 364px;
                   height: 32px;
                   border-radius: 8px;
                   overflow: hidden;
-                "
+                " v-model:value="duration"></a-input-number>
-                v-model:value="duration"
-              ></a-input-number>
               <span style="margin-left: 5px; width: 30px">分钟</span>
             </div>
           </div>
           <div class="main_item">
             <div class="signbox">
               <div class="sign">
-                <img
+                <img src="@/assets/images/coursewareManage/asterisk.png" alt="" />
-                  src="@/assets/images/coursewareManage/asterisk.png"
-                  alt=""
-                />
               </div>
               <span style="margin-right: 3px">上课地址：</span>
             </div>
             <div class="btnbox">
-              <a-input
+              <a-input v-model:value="address" style="width: 384px; height: 32px" placeholder="请输入上课地址"
-                v-model:value="address"
+                maxlength="100" />
-                style="width: 384px; height: 32px"
-                placeholder="请输入上课地址"
-                maxlength="100"
-              />
             </div>
           </div>
           <div class="main_item2">
@@ -174,37 +111,27 @@
             </div>
             <div class="kqszbox">
               <div class="qdqtbox">
-                <div class="qdbtn"><div class="btntext">签到</div></div>
+                <div class="qdbtn">
+                  <div class="btntext">签到</div>
+                </div>
               </div>
               <div class="setbox">
                 <div class="timerbox">
                   <span>开始前：</span>
-                  <a-input-number
+                  <a-input-number :min="0" :max="300" :precision="0" style="
-                :min="0"
-                :max="300"
-                :precision="0"
-                style="
                   width: 100px;
                   height: 32px;
                   border-radius: 8px;
-                  overflow: hidden; "
+                  overflow: hidden; " v-model:value="before"></a-input-number>
-                v-model:value="before"
-              ></a-input-number>
                   <span style="color: #999999; margin-left: 8px">分钟</span>
                 </div>
                 <div class="timerbox">
                   <span>开始后：</span>
-                  <a-input-number
+                  <a-input-number :min="0" :max="300" :precision="0" style="
-                    :min="0"
-                    :max="300"
-                    :precision="0"
-                    style="
                       width: 100px;
                       height: 32px;
                       border-radius: 8px;
-                      overflow: hidden;"
+                      overflow: hidden;" v-model:value="afterStartValue"></a-input-number>
-                      v-model:value="afterStartValue"
-                  ></a-input-number>
                   <span style="color: #999999; margin-left: 8px">分钟</span>
                 </div>
               </div>
@@ -219,7 +146,7 @@
             <div class="btnbox">
 
 
-                <a-checkbox v-model:checked="onlySign"  @click="onlySign=!onlySign">仅签到</a-checkbox>
+              <a-checkbox v-model:checked="onlySign" @click="onlySign = !onlySign">仅签到</a-checkbox>
 
 
             </div>
@@ -229,9 +156,8 @@
               <span style="margin-right: 3px">其他设置：</span>
             </div>
             <div class="btnbox">
-              <a-checkbox v-model:checked="completeLeave"  @click="completeLeave=!completeLeave"
+              <a-checkbox v-model:checked="completeLeave"
-                >学员请假后记为任务完成</a-checkbox
+                @click="completeLeave = !completeLeave">学员请假后记为任务完成</a-checkbox>
-              >
             </div>
           </div>
           <div class="main_item">
@@ -239,8 +165,9 @@
               <span style="margin-right: 3px">现场参与：</span>
             </div>
             <div class="btnbox">
-              <a-checkbox v-model:checked="innerPersion"  @click="innerPersion=!innerPersion">允许项目内人员临时到场参加</a-checkbox>
+              <a-checkbox v-model:checked="innerPersion"
-              <a-checkbox v-model:checked="outPersion"  @click="outPersion=!outPersion">允许项目外人员临时到场参加</a-checkbox>           
+                @click="innerPersion = !innerPersion">允许项目内人员临时到场参加</a-checkbox>
+              <a-checkbox v-model:checked="outPersion" @click="outPersion = !outPersion">允许项目外人员临时到场参加</a-checkbox>
             </div>
           </div>
           <div class="main_item2">
@@ -248,8 +175,7 @@
               <span style="margin-right: 3px">评估：</span>
             </div>
             <div class="btnbox2">
-              <a-checkbox v-model:checked="needEval" @click="needEval=!needEval"
+              <a-checkbox v-model:checked="needEval" @click="needEval = !needEval">需要评估</a-checkbox>
-                >需要评估</a-checkbox >
             </div>
           </div>
           <div v-if="needEval" class="main_item">
@@ -257,15 +183,13 @@
             </div>
             <div class="btnbox">
               <button class="xkbtn" @click="showAssessment">选择评估</button>
-              <div v-if = "assessmentId >0 ">
+              <div v-if="assessmentId > 0">
-              <a-tag  closable   color="processing" @close="logA">
+                <a-tag closable color="processing" @close="logA">
-            <span style="font-size:14px;line-height: 33px;" >删除评估</span>
+                  <span style="font-size:14px;line-height: 33px;">删除评估</span>
-            </a-tag></div>
+                </a-tag>
-            <AssessmentList
+              </div>
-                      v-model:assessmentVisible="assessmentVisible"
+              <AssessmentList v-model:assessmentVisible="assessmentVisible" v-model:titleTag="titleTag"
-                      v-model:titleTag="titleTag"
+                v-model:assessmentId="assessmentId" />
-                      v-model:assessmentId="assessmentId"
-                    />
 
             </div>
           </div>
@@ -279,21 +203,18 @@
             </div>
             <div class="btnbox" @click="showDrawerAddHomework">
               <button class="xkbtn">配置</button>
-              <div v-if = "EditWorkId >0">
+              <div v-if="EditWorkId > 0">
-              <a-tag  closable   color="processing" @close="logW">
+                <a-tag closable color="processing" @close="logW">
-            <span style="font-size:14px;line-height: 33px;" >删除作业</span>
+                  <span style="font-size:14px;line-height: 33px;">删除作业</span>
-            </a-tag></div>
+                </a-tag>
+              </div>
 
             </div>
 
             <!-- 添加作业侧弹窗 -->
             <div>
-              <add-homework
+              <add-homework v-model:addhomeworkVisible="addhomeworkvisible" @getWork="getWork" :faceLevel="true"
-                v-model:addhomeworkVisible="addhomeworkvisible"
+                v-model:EditWorkId="EditWorkId" />
-                @getWork="getWork"
-                :faceLevel="true"
-                v-model:EditWorkId="EditWorkId"
-              />
             </div>
             <!-- 添加作业侧弹窗 -->
           </div>
@@ -306,18 +227,16 @@
             </div>
             <div class="btnbox" @click="showDrawerAddTest">
               <button class="xkbtn">配置</button>
-              <div v-if = "EditTestId >0">
+              <div v-if="EditTestId > 0">
-              <a-tag  closable   color="processing" @close="logT">
+                <a-tag closable color="processing" @close="logT">
-            <span style="font-size:14px;line-height: 33px;" >删除考试</span>
+                  <span style="font-size:14px;line-height: 33px;">删除考试</span>
-            </a-tag></div>
+                </a-tag>
+              </div>
 
             </div>
             <!-- 添加考试侧弹窗 -->
             <div>
-              <add-test v-model:addtestVisible="addtestvisible"  
+              <add-test v-model:addtestVisible="addtestvisible" v-model:EditTestId="EditTestId" :faceLevel="true" />
-              v-model:EditTestId ="EditTestId"
-              :faceLevel="true"
-              />
             </div>
             <!-- 添加考试侧弹窗 -->
           </div>
@@ -326,13 +245,8 @@
               <span style="margin-right: 3px">附件：</span>
             </div>
             <div class="btnbox">
-              <a-upload
+              <a-upload @change="handleChange" action="/manageApi/file/upload" v-model:file-list="fileList">
-                @change="handleChange"
+                <button class="xkbtn">上传附件</button></a-upload>
-                action="/manageApi/file/upload"
-                v-model:file-list="fileList"
-              >
-                <button class="xkbtn">上传附件</button></a-upload
-              >
             </div>
           </div>
         </div>
@@ -355,7 +269,7 @@ import { ProjectEditTask, RouterEditTask } from "@/api/indexTask";
 import { message } from "ant-design-vue";
 import { getMemberInfo } from "@/api/index1";
 import { debounce } from "lodash-es";
-import { queryFaceDetailById,editPlan } from "../../api/indexFace";
+import { queryFaceDetailById, editPlan } from "../../api/indexFace";
 import dayjs from "dayjs";
 import AssessmentList from "../drawers/ AssessmentList.vue";
 // import { toDate } from "../../api/method";、
@@ -414,7 +328,7 @@ export default {
       type: Number,
       default: null,
     },
-    projectTemplateId:{
+    projectTemplateId: {
       type: Number,
       default: null,
     },
@@ -427,8 +341,8 @@ export default {
       addhomeworkvisible: false,
       addtestvisible: false,
       memberValue: {
-        value:"",
+        value: "",
-        label:""
+        label: ""
       },
       fetching: false,
       totalPages: 0,
@@ -437,23 +351,23 @@ export default {
       memberId: 0,
       pageSize: 10,
       courseName: "",
-      duration:null,
+      duration: null,
       address: null,
-      before:null,
+      before: null,
-      afterStartValue:null,
+      afterStartValue: null,
       description: "",
       chooseTime: [],
       fileList: [],
       chooseCourse: null, //选择的在线课程
-      assessmentId:null,
+      assessmentId: null,
-      EditTestId:null,
+      EditTestId: null,
-      EditWorkId:null,
+      EditWorkId: null,
-      assessmentVisible:false,
+      assessmentVisible: false,
-      needEval:false,
+      needEval: false,
-      onlySign:false,
+      onlySign: false,
-      completeLeave:false,
+      completeLeave: false,
-      innerPersion:false,
+      innerPersion: false,
-      outPersion:false,
+      outPersion: false,
 
     });
     const clear = () => {
@@ -461,21 +375,21 @@ export default {
       state.memberValue = {};
       state.duration = null;
       state.address = null;
-      state.before=null;
+      state.before = null;
-      state.afterStartValue=null;
+      state.afterStartValue = null;
       state.chooseTime = [];
-      state.description ="";
+      state.description = "";
-      state.onlySign =false;
+      state.onlySign = false;
-      state.completeLeave =false;
+      state.completeLeave = false;
-      state.innerPersion =false;
+      state.innerPersion = false;
-      state.outPersion =false;
+      state.outPersion = false;
       state.chooseCourse = null;
-      state.EditTestId =null;
+      state.EditTestId = null;
-      state.assessmentId=null;
+      state.assessmentId = null;
-      state.EditWorkId=null;
+      state.EditWorkId = null;
-      state.EditEvalId=null;
+      state.EditEvalId = null;
-      state.applyFlag="";
+      state.applyFlag = "";
-      state.needEval=false;
+      state.needEval = false;
     };
     const closeDrawer = () => {
       ctx.emit("update:addfaceteachVisible", false);
@@ -491,20 +405,20 @@ export default {
       }
     };
 
-    const logC= e => {
+    const logC = e => {
-      state.chooseCourse=null;
+      state.chooseCourse = null;
       console.log(e);
     };
     const logW = e => {
-      state.EditWorkId=null;
+      state.EditWorkId = null;
       console.log(e);
     };
-    const logT= e => {
+    const logT = e => {
-      state.EditTestId=null;
+      state.EditTestId = null;
       console.log(e);
     };
-    const logA= e => {
+    const logA = e => {
-      state.EditEvalId=null;
+      state.EditEvalId = null;
       console.log(e);
     };
 
@@ -528,8 +442,8 @@ export default {
         let result = res.data.data;
         state.courseName = result.name;
         state.description = result.description;
-        state.memberValue= {value:result.teacherId,label:result.teacher}
+        state.memberValue = { value: result.teacherId, label: result.teacher }
-        state.duration =result.duration;
+        state.duration = result.duration;
         if (result.beginTime && result.endTime) {
           state.chooseTime = [
             dayjs(result.beginTime, "YYYY-MM-DD"),
@@ -539,21 +453,21 @@ export default {
           state.chooseTime = [];
         }
         state.address = result.address;
-        state.before =result.beforeStart;
+        state.before = result.beforeStart;
         state.afterStartValue = result.afterStart;
         state.fileList = JSON.parse(result.attach);
         state.EditWorkId = result.homeWorkId;
-        state.onlySign = result.completeType.split(",")[0]=="1"?true:false;
+        state.onlySign = result.completeType.split(",")[0] == "1" ? true : false;
-        state.completeLeave =result.completeType.split(",")[1]=="1"?true:false;
+        state.completeLeave = result.completeType.split(",")[1] == "1" ? true : false;
-        state.chooseCourse =result.offcourseId;
+        state.chooseCourse = result.offcourseId;
-        state.innerPersion = result.projectMember.split(",")[0]=="1"?true:false;
+        state.innerPersion = result.projectMember.split(",")[0] == "1" ? true : false;
-        state.outPersion = result.projectMember.split(",")[1]=="1"?true:false;
+        state.outPersion = result.projectMember.split(",")[1] == "1" ? true : false;
         state.EditTestId = result.testId;
-        state.EditWorkId=result.homeWorkId;
+        state.EditWorkId = result.homeWorkId;
-        state.assessmentId =result.evaluateId;
+        state.assessmentId = result.evaluateId;
         state.needEval = result.evaluateId;
 
-        console.log("state=======",state);
+        console.log("state=======", state);
       });
     };
 
@@ -578,32 +492,32 @@ export default {
         message.destroy();
         return message.warning("请输入必填字段");
       } else {
-        let type =state.onlySign ? "1,":"0,";
+        let type = state.onlySign ? "1," : "0,";
-        let t =  state.completeLeave?"1":"0";
+        let t = state.completeLeave ? "1" : "0";
-        let p=state.innerPersion?"1,":"0,";
+        let p = state.innerPersion ? "1," : "0,";
-        let p1=state.outPersion?"1":"0";
+        let p1 = state.outPersion ? "1" : "0";
         let obj = {
-          teacherId:state.memberValue.value,
+          teacherId: state.memberValue.value,
-          teacher:state.memberValue.label,
+          teacher: state.memberValue.label,
-          address:state.address,
+          address: state.address,
           applyFlag: state.applyFlag,
           attach: JSON.stringify(state.fileList),
-          afterStart:state.afterStartValue || 0,
+          afterStart: state.afterStartValue || 0,
-          beforeStart:state.before || 0,
+          beforeStart: state.before || 0,
-          beginTime: parseInt( new Date(state.chooseTime[0].$d).getTime() / 1000),
+          beginTime: parseInt(new Date(state.chooseTime[0].$d).getTime() / 1000),
-          completeType:type.concat(t),
+          completeType: type.concat(t),
           description: state.description,
           endTime: parseInt(new Date(state.chooseTime[1].$d).getTime() / 1000),
-          evalFlag:state.needEval?1:0,
+          evalFlag: state.needEval ? 1 : 0,
-          evaluateId:state.assessmentId,
+          evaluateId: state.assessmentId,
           homeWorkId: state.EditWorkId,
           name: state.courseName,
-          projectMember:p.concat(p1),
+          projectMember: p.concat(p1),
-          offcourseId:state.chooseCourse,
+          offcourseId: state.chooseCourse,
-          offcoursePlanId:props.EditFaceId >0 ? props.EditFaceId : 0,
+          offcoursePlanId: props.EditFaceId > 0 ? props.EditFaceId : 0,
           testId: state.EditTestId
         };
-        console.log("obj============",obj,"6"+"9");
+        console.log("obj============", obj, "6" + "9");
 
         editPlan(obj)
             .then((res) => {
@@ -624,7 +538,7 @@ export default {
     //更新任务列表
     // 新增编辑或新增项目任务
     const updateTask = (res) => {
-      console.log("props.isLevel=====",props.isLevel);
+      console.log("props.isLevel=====", props.isLevel);
       if (props.isLevel == 1) {
         let editObj1 = {
           chapterId: props.isactive,
@@ -657,7 +571,7 @@ export default {
         // 新增编辑或新增项目
         ProjectEditTask(editObj)
           .then(() => {
-            message.success(  `${props.EditFaceId ? "编辑" : "新增"}阶段任务成功` );
+            message.success(`${props.EditFaceId ? "编辑" : "新增"}阶段任务成功`);
 
           })
           .catch(() => {
@@ -669,7 +583,7 @@ export default {
           courseId: res.data.data.offcoursePlanId,
           name: res.data.data.name,
           duration: res.data.data.duration,
-          projectTemplateId:props.projectTemplateId,
+          projectTemplateId: props.projectTemplateId,
           projectTaskId: props.projectTaskId || 0,
           stageId: props.chooseStageId || 0,
           type: 2,
@@ -792,6 +706,7 @@ export default {
 .ant-table-striped :deep(.table-striped) td {
   background-color: #fafafa !important;
 }
+
 .addfaceteachDrawer {
   .drawerMain {
     .header {
@@ -801,6 +716,7 @@ export default {
       justify-content: space-between;
       align-items: center;
       flex-shrink: 0;
+
       .headerTitle {
         font-size: 18px;
         font-weight: 600;
@@ -809,14 +725,17 @@ export default {
         margin-left: 24px;
       }
     }
+
     .contentMain {
       display: flex;
       justify-content: space-between;
+
       .main_left {
         height: 1080px;
         padding-right: 30px;
         flex: 1;
         border-right: 1px solid #e8e8e8;
+
         .main_item {
           display: flex;
           align-items: center;
@@ -930,16 +849,19 @@ export default {
           align-items: center;
           margin-top: 32px;
           margin-bottom: 32px;
+
           .signbox {
             width: 120px;
             display: flex;
             justify-content: end;
             align-items: center;
           }
+
           .btnbox {
             display: flex;
             flex: 1;
             align-items: center;
+
             .xkbtn {
               cursor: pointer;
               width: 130px;
@@ -954,6 +876,7 @@ export default {
         }
       }
     }
+
     .main_btns {
       height: 72px;
       width: 100%;
@@ -963,6 +886,7 @@ export default {
       align-items: center;
       justify-content: center;
       box-shadow: 0px 1px 35px 0px rgba(118, 136, 166, 0.16);
+
       .btn1 {
         width: 100px;
         height: 40px;
@@ -972,6 +896,7 @@ export default {
         background-color: #fff;
         cursor: pointer;
       }
+
       .btn2 {
         cursor: pointer;
         width: 100px;

src/components/drawers/AddHomework.vue

@@ -169,7 +169,7 @@ export default {
       type: Boolean,
       default: false,
     },
-    projectTemplateId:{
+    projectTemplateId: {
       type: Number,
       default: null,
     },
@@ -263,20 +263,18 @@ export default {
 
     const fileList = ref([]);
     const closeDrawer = () => {
-     
-     
       formState.choosedTime = "";
       ctx.emit("update:addhomeworkVisible", false);
       ctx.emit("update:edit", false);
       ctx.emit("update:EditWorkId", state.EditWorkId);
-      console.log("state.EditWorkId==============",state.EditWorkId);
+      console.log("state.EditWorkId==============", state.EditWorkId);
       localStorage.setItem("stageId", props.chooseStageId);
       localStorage.setItem("chapterId", props.isactive);
       fileList.value = [];
       resetForm();
     };
     const afterVisibleChange = () => {
-      if (props.EditWorkId >0) {
+      if (props.EditWorkId > 0) {
         state.EditWorkId = props.EditWorkId;
         queryWork();
       }
@@ -292,9 +290,10 @@ export default {
         workName: formState.workName,
         workRequirement: formState.workRequirement,
       };
-      if (props.EditWorkId >0) {
+      if (props.EditWorkId > 0) {
         updateWorkTaskUsing(obj)
           .then((res) => {
+            // console.log("添加成功", res);
             updateTask(res);
             ctx.emit("changeData", false);
             closeDrawer();
@@ -306,6 +305,7 @@ export default {
       } else {
         createWorkTask(obj)
           .then((res) => {
+            console.log("添加成功", res);
             updateTask(res);
             ctx.emit("changeData", false);
             closeDrawer();
@@ -336,69 +336,73 @@ export default {
     };
     // 新增编辑或新增项目任务
     const updateTask = (res) => {
-     
+      if (props.faceLevel) {
-      if(props.faceLevel){
+        state.EditWorkId = res.data.data.workId;
-        state.EditWorkId = res.data.data.workId
+      } else {
-       
-      }else{
         if (props.isLevel == 1) {
-              let editObj1 = {
+          let editObj1 = {
-                chapterId: props.isactive,
+            chapterId: props.isactive,
-                courseId: res.data.data.workId,
+            courseId: res.data.data.workId,
-                name: res.data.data.workName,
+            name: res.data.data.workName,
-                routerId: props.routerId,
+            routerId: props.routerId,
-                routerTaskId: props.routerTaskId || 0,
+            routerTaskId: props.routerTaskId || 0,
-                type: 4,
+            type: 4,
-              };
+          };
 
-              RouterEditTask(editObj1)
+          RouterEditTask(editObj1)
-                .then(() => {
+            .then(() => {
-                  //message.success(`${props.EditWorkId > 0 ? "编辑" : "新增"}关卡任务成功`);
+              //message.success(`${props.EditWorkId > 0 ? "编辑" : "新增"}关卡任务成功`);
 
-                  state.addLoading = false;
+              state.addLoading = false;
-                })
+              ctx.emit("changeData", false);
-                .catch(() => {
+              closeDrawer();
-                  //message.error(`${props.EditWorkId > 0 ? "编辑" : "新增"}关卡任务失败`);
+            })
-                });
+            .catch(() => {
-            } else if (props.isLevel == 2) {
+              //message.error(`${props.EditWorkId > 0 ? "编辑" : "新增"}关卡任务失败`);
-              let editObj = {
+            });
-                courseId: res.data.data.workId,
+        } else if (props.isLevel == 2) {
-                name: res.data.data.workName,
+          let editObj = {
-                projectId: props.projectId ,
+            courseId: res.data.data.workId,
-                projectTaskId: props.projectTaskId || 0,
+            name: res.data.data.workName,
-                stageId: props.chooseStageId || 0 ,
+            projectId: props.projectId > 0 ? props.projectId : 0,
-                type: 4,
+            projectTaskId: props.projectTaskId || 0,
-              };
+            stageId: props.chooseStageId || 0,
-              ProjectEditTask(editObj)
+            type: 4,
-                .then(() => {
+          };
-                  //message.success(`${props.EditWorkId > 0 ? "编辑" : "新增"}阶段任务成功`);
+          console.log("editObj", editObj);
-                 
+          ProjectEditTask(editObj)
-                  state.addLoading = false;
+            .then((res) => {
-                })
+              //message.success(`${props.EditWorkId > 0 ? "编辑" : "新增"}阶段任务成功`);
-                .catch(() => {
+              console.log("chenggong", res);
-                  //message.error(`${props.EditWorkId > 0 ? "编辑" : "新增"}阶段任务失败`);
+              state.addLoading = false;
-                });
+              ctx.emit("changeData", false);
-            } else if (props.isLevel == 3) {
+              closeDrawer();
-              console.log("projectTemplateId,===",props.projectTemplateId);
+            })
-              addTempTask({
+            .catch((err) => {
-                courseId: res.data.data.workId,
+              console.log("shibaii", err);
-                name: res.data.data.workName,
+              //message.error(`${props.EditWorkId > 0 ? "编辑" : "新增"}阶段任务失败`);
-                projectTemplateId:props.projectTemplateId,
+            });
-                projectTaskId: props.projectTaskId || 0,
+        } else if (props.isLevel == 3) {
-                stageId: props.chooseStageId || 0,
+          console.log("projectTemplateId,===", props.projectTemplateId);
-                type: 4,
+          addTempTask({
-              })
+            courseId: res.data.data.workId,
-                .then(() => {
+            name: res.data.data.workName,
-                  //message.success(`${props.EditWorkId > 0 ? "编辑" : "新增"}阶段任务成功`);
+            projectTemplateId: props.projectTemplateId,
-                 
+            projectTaskId: props.projectTaskId || 0,
-                  state.addLoading = false;
+            stageId: props.chooseStageId || 0,
-                })
+            type: 4,
-                .catch(() => {
+          })
-                  //message.error(`${props.EditWorkId > 0 ? "编辑" : "新增"}阶段任务失败`);
+            .then(() => {
-                });
+              //message.success(`${props.EditWorkId > 0 ? "编辑" : "新增"}阶段任务成功`);
-            }
+              ctx.emit("changeData", false);
+              closeDrawer();
+              state.addLoading = false;
+            })
+            .catch(() => {
+              //message.error(`${props.EditWorkId > 0 ? "编辑" : "新增"}阶段任务失败`);
+            });
+        }
       }
-     
     };
 
     const cle = () => {

src/components/drawers/AddLive.vue

@@ -122,42 +122,41 @@
             </div>
           </div>
           <div class="mbl_items2">
-                  <div class="item_nam">
+            <div class="item_nam">
-                    <div class="asterisk_icon">
+              <div class="asterisk_icon">
-                      <img
+                <img
-                        src="@/assets/images/coursewareManage/asterisk.png"
+                  src="@/assets/images/coursewareManage/asterisk.png"
-                        alt=""
+                  alt=""
-                      />
+                />
-                    </div>
+              </div>
-                    <span style="margin-right: 14px">直播封面</span>
+              <span style="margin-right: 14px">直播封面</span>
+            </div>
+            <div class="item_inp">
+              <a-upload
+                name="avatar"
+                list-type="picture-card"
+                class="avatar-uploader"
+                :show-upload-list="false"
+                :before-upload="beforeUpload"
+              >
+                <img
+                  class="i_upload_img"
+                  v-if="imageUrl"
+                  :src="imageUrl"
+                  alt="avatar"
+                />
+                <div class="i_upload" v-else>
+                  <div class="addimg">
+                    <div class="heng"></div>
+                    <div class="shu"></div>
                   </div>
-                  <div class="item_inp">
+                </div>
-              
+              </a-upload>
-                    <a-upload
+              <div class="i_bottom">
-                      name="avatar"
+                <div class="tip">支持图片格式为jpg/jpeg/png 图片最大为2MB</div>
-                      list-type="picture-card"
+              </div>
-                      class="avatar-uploader"
+            </div>
-                      :show-upload-list="false"
+          </div>
-                      :before-upload="beforeUpload"
-                    >
-                      <img
-                        class="i_upload_img"
-                        v-if="imageUrl"
-                        :src="imageUrl"
-                        alt="avatar"
-                      />
-                      <div class="i_upload" v-else>
-                        <div class="addimg">
-                          <div class="heng"></div>
-                          <div class="shu"></div>
-                        </div>
-                      </div>
-                    </a-upload>
-                    <div class="i_bottom">
-                      <div class="tip">支持图片格式为jpg/jpeg/png 图片最大为2MB</div>
-                    </div>
-                  </div>
-           </div>
 
           <div class="main_item" style="margin-top: -10px">
             <div class="signbox">
@@ -179,7 +178,7 @@
               <a-switch v-model:checked="switchC1" @click="PlayBack" />
             </div>
           </div>
-          <div v-if ="switchC1">
+          <div v-if="switchC1">
             <div class="main_item">
               <div class="signbox">
                 <span style="margin-right: 3px">回放链接：</span>
@@ -199,29 +198,32 @@
               <span style="margin-right: 3px">评估：</span>
             </div>
             <div class="btnbox2">
-              <a-checkbox v-model:checked="needEval"  @click="needEval=!needEval"
+              <a-checkbox
-                >需要评估</a-checkbox >
+                v-model:checked="needEval"
+                @click="needEval = !needEval"
+                >需要评估</a-checkbox
+              >
             </div>
           </div>
           <div v-if="needEval" class="main_item">
-            <div class="signbox">  
+            <div class="signbox"></div>
-            </div>
             <div class="btnbox">
               <button class="xkbtn" @click="showAssessment">选择评估</button>
-              <div v-if = "assessmentId >0 ">
+              <div v-if="assessmentId > 0">
-              <a-tag  closable   color="processing" @close="logA">
+                <a-tag closable color="processing" @close="logA">
-            <span style="font-size:14px;line-height: 33px;" >删除评估</span>
+                  <span style="font-size: 14px; line-height: 33px"
-            </a-tag></div>
+                    >删除评估</span
-            <AssessmentList
+                  >
-                      v-model:assessmentVisible="assessmentVisible"
+                </a-tag>
-                      v-model:titleTag="titleTag"
+              </div>
-                      v-model:assessmentId="assessmentId"
+              <AssessmentList
-                    />
+                v-model:assessmentVisible="assessmentVisible"
-
+                v-model:titleTag="titleTag"
+                v-model:assessmentId="assessmentId"
+              />
             </div>
           </div>
 
-        
           <div class="main_item2">
             <div class="signbox">
               <span style="margin-right: 3px">考勤设置：</span>
@@ -346,8 +348,8 @@ function getBase64(img, callback) {
 
 export default {
   name: "AddLive",
-  components:{
+  components: {
-    AssessmentList
+    AssessmentList,
   },
   props: {
     addliveVisible: {
@@ -394,7 +396,7 @@ export default {
       type: Number,
       default: null,
     },
-    projectTemplateId:{
+    projectTemplateId: {
       type: Number,
       default: null,
     },
@@ -409,8 +411,8 @@ export default {
       fetching: false,
       totalPages: 0,
       memberValue: {
-        value:"",
+        value: "",
-        label:""
+        label: "",
       }, // 授课老师关键词
       inputV1: "", //*直播名称
       time: "", //*直播时间
@@ -434,9 +436,9 @@ export default {
       obj: {}, //要传的obj数据
       assessment: [], //评估信息
       assessmentvalue: null,
-      needEval:false,
+      needEval: false,
-      otherSettings:false,
+      otherSettings: false,
-      assessmentVisible:false,
+      assessmentVisible: false,
     });
     const closeDrawer = () => {
       ctx.emit("update:addliveVisible", false);
@@ -455,14 +457,14 @@ export default {
       state.textV1 = "";
       state.switchC1 = "";
       state.imageUrl = "";
-      state.needEval=false;
+      state.needEval = false;
       state.otherSettings;
       ctx.emit("changeData", false);
       localStorage.setItem("stageId", props.chooseStageId);
       localStorage.setItem("chapterId", props.isactive);
     };
     const afterVisibleChange = (bool) => {
-      if (props.edit&&bool) {
+      if (props.edit && bool) {
         queryLive();
       }
       api
@@ -512,7 +514,6 @@ export default {
         });
     };
 
-
     const cloradio1 = (value) => {
       if (state.radioV1 === value.target._value) {
         state.radioV1 = "";
@@ -579,12 +580,12 @@ export default {
             //message.error(`${props.edit ? "编辑" : "新增"}阶段任务失败`);
           });
       } else if (props.isLevel == 3) {
-        console.log("props.projectTemplateId",props.projectTemplateId);
+        console.log("props.projectTemplateId", props.projectTemplateId);
         addTempTask({
           courseId: res.data.data.liveId,
           duration: res.data.data.duration,
           name: res.data.data.liveName,
-          projectTemplateId:props.projectTemplateId,
+          projectTemplateId: props.projectTemplateId,
           projectTaskId: props.projectTaskId || 0,
           stageId: props.chooseStageId || 0,
           type: 6,
@@ -599,9 +600,8 @@ export default {
       }
     };
     const showAssessment = () => {
-      
       state.assessmentVisible = true;
-      console.log("hshs======",state.assessmentVisible);
+      console.log("hshs======", state.assessmentVisible);
     };
     //创建直播
     const updateLiveBroadcast = () => {
@@ -651,7 +651,7 @@ export default {
         otherSettings: state.otherSettings, //1或0
         signOutTime: state.inputV8,
         standardSettings: state.radioV1, //1或2
-        isEvaluate:state.eedEval ? "1":"0",
+        isEvaluate: state.eedEval ? "1" : "0",
       };
       if (props.edit) {
         api
@@ -697,14 +697,14 @@ export default {
           image.src = reader.result;
           image.onload = () => {
             const formData = new FormData();
-              formData.append("file", file);
+            formData.append("file", file);
-              console.log(file);
+            console.log(file);
-              fileUp(formData).then((res) => {
+            fileUp(formData).then((res) => {
-                if (res.data.code === 200) {
+              if (res.data.code === 200) {
-                  state.imageUrl = res.data.data;
+                state.imageUrl = res.data.data;
-                }
+              }
-              });
+            });
-              return resolve(true);
+            return resolve(true);
           };
         };
 
@@ -924,62 +924,61 @@ export default {
           }
         }
         .mbl_items2 {
-                display: flex;
+          display: flex;
-                align-items: start;
+          align-items: start;
-                margin-top: 10px;
+          margin-top: 10px;
-                margin-bottom: 10px;
+          margin-bottom: 10px;
-                .i_bottom{
+          .i_bottom {
-                  margin-bottom: 30px;
+            margin-bottom: 30px;
+          }
+          .item_nam {
+            width: 100px;
+            display: flex;
+            align-items: center;
+            justify-content: flex-end;
+            white-space: nowrap;
+            .asterisk_icon {
+              width: 10px;
+              height: 10px;
+              margin-right: 5px;
+              margin-top: -15px;
+            }
+          }
+          .item_inp {
+            flex: 1;
+            .i_upload_img {
+              width: 100px;
+              height: 100px;
+              border-radius: 8px;
+            }
+            .i_upload {
+              width: 100px;
+              height: 100px;
+              border: 1px solid #4ea6ff;
+              border-radius: 8px;
+              text-align: center;
+              align-items: center;
+              cursor: pointer;
+              .addimg {
+                position: relative;
+                .heng {
+                  position: absolute;
+                  top: 50px;
+                  left: 25px;
+                  width: 50px;
+                  border: 1px solid #4ea6ff;
                 }
-                .item_nam {
+                .shu {
-                  width: 100px;
+                  position: absolute;
-                  display: flex;
+                  top: 25px;
-                  align-items: center;
+                  left: 50px;
-                  justify-content: flex-end;
+                  height: 50px;
-                  white-space: nowrap;
+                  border: 1px solid #4ea6ff;
-                  .asterisk_icon {
-                    width: 10px;
-                    height: 10px;
-                    margin-right: 5px;
-                    margin-top: -15px;
-                  }
-                }
-                .item_inp {
-                  flex: 1;
-                  .i_upload_img {
-                    width: 100px;
-                    height: 100px;
-                    border-radius: 8px;
-                  }
-                  .i_upload {
-                    width: 100px;
-                    height: 100px;
-                    border: 1px solid #4ea6ff;
-                    border-radius: 8px;
-                    text-align: center;
-                    align-items: center;
-                    cursor: pointer;
-                    .addimg {
-                      position: relative;
-                      .heng {
-                        position: absolute;
-                        top: 50px;
-                        left: 25px;
-                        width: 50px;
-                        border: 1px solid #4ea6ff;
-                      }
-                      .shu {
-                        position: absolute;
-                        top: 25px;
-                        left: 50px;
-                        height: 50px;
-                        border: 1px solid #4ea6ff;
-                      }
-                    }
-                  }
                 }
               }
-        
+            }
+          }
+        }
       }
     }
     .main_btns {

src/components/drawers/AddTest.vue

@@ -24,13 +24,14 @@
         >
           系统考试
         </button>
-        <button
+        <!-- 2022-11-30注释 后面放开 -->
+        <!-- <button
           style="width: 100px"
           @click="changeOuter(2)"
           :class="[isOuter == 2 ? 'outer' : 'notOuter']"
         >
           外部考试
-        </button>
+        </button> -->
       </div>
       <a-form
         v-if="isOuter == 1"

src/views/examine/CourseReviewedN.vue

@@ -487,7 +487,6 @@ export default {
           }
         })
         .catch((err) => {
-          setFaceData([{}]);
           console.log("获取面授列表失败", err);
         });
     };

src/views/projectcenter/ClassAdd.vue

@@ -343,7 +343,8 @@
 					</div>
 				</div> -->
       </div>
-      <div class="template">
+      <!-- 2022-11-30注释 后面放开 -->
+      <!-- <div class="template">
         <div class="name">
           <div class="inname" style="width: 50px">模版</div>
           <div class="in select" style="margin-left: 2px">
@@ -381,7 +382,7 @@
             </a-select>
           </div>
         </div>
-      </div>
+      </div> -->
     </div>
     <div class="footer">
       <div class="btn">

src/views/projectcenter/ProjectAdd.vue

@@ -358,7 +358,8 @@
 					</div>
 				</div> -->
       </div>
-      <div class="template">
+      <!-- 2022-11-30注释 后面放开 -->
+      <!-- <div class="template">
         <div class="name">
           <div class="inname" style="width: 50px">模版</div>
           <div class="in select" style="margin-left: 2px">
@@ -396,7 +397,7 @@
             </a-select>
           </div>
         </div>
-      </div>
+      </div> -->
     </div>
     <div class="footer">
       <div class="btn">

src/views/projectcenter/ProjectManage.vue

@@ -37,7 +37,8 @@
           >
           </a-input>
         </div>
-        <div class="select">
+        <!-- 2022-11-30注释 后面放开 -->
+        <!-- <div class="select">
           <a-select
             v-model:value="sProjectState"
             style="width: 270px"
@@ -47,7 +48,7 @@
             allowClear
             showSearch
           ></a-select>
-        </div>
+        </div> -->
         <div class="select">
           <a-date-picker
             v-model:value="sProjectTime"

src/views/projectcenter/SonProject.vue

@@ -343,7 +343,8 @@
 					</div>
 				</div> -->
       </div>
-      <div class="template">
+      <!-- 2022-11-30注释 后面放开 -->
+      <!-- <div class="template">
         <div class="name">
           <div class="inname" style="width: 50px">模版</div>
           <div class="in select" style="margin-left: 2px">
@@ -381,7 +382,7 @@
             </a-select>
           </div>
         </div>
-      </div>
+      </div> -->
     </div>
     <div class="footer">
       <div class="btn">

src/views/projectcenter/TaskAdd.vue

@@ -1202,18 +1202,17 @@ export default {
       let data = tableData;
       let array = [];
       data.map((value) => {
-        if(value.stageId!=0){
+        if (value.stageId != 0) {
           let obj = {
-          id: value.stageId,
+            id: value.stageId,
-          tit: value.name,
+            tit: value.name,
-          name: value.remark,
+            name: value.remark,
-          taskList: value.taskList,
+            taskList: value.taskList,
-          value: value.stageId,
+            value: value.stageId,
-          label: value.name,
+            label: value.name,
-        };
+          };
-        array.push(obj);
+          array.push(obj);
         }
-        
       });
       state.level = array;
     };
@@ -1366,7 +1365,7 @@ export default {
               let stage = localStorage.getItem("stageId")
                 ? localStorage.getItem("stageId")
                 : null;
-                console.log("stage=====",stage);
+      
               // console.log("stage",Object.prototype.toString.call(stage))
               getStageData(res.data.data.stageList);
               if (stage != null) {
@@ -1677,6 +1676,7 @@ export default {
       state.projectTaskId = eleId;
     };
     const showDrawerAddHomework = (id, eleId) => {
+      console.log("id222222", id, eleId);
       state.EditWorkId = id;
       state.projectTaskId = eleId;
       state.addhomeworkvisible = true;