直播bug 添加面授bug

src/components/drawers/ AssessmentList.vue

@@ -110,7 +110,7 @@ export default {
     };
     const afterVisibleChange = (bool) => {
       console.log("state getAllInvistText", bool,"======",props.titleTag);
-      if (props.assessmentVisible) {
+      if (props.assessmentVisible&&bool) {
         getAllInvistText();
       }
     };

src/components/drawers/AddFaceteach.vue

@@ -242,7 +242,7 @@
               <span style="margin-right: 3px">评估：</span>
             </div>
             <div class="btnbox2">
-              <a-checkbox v-model:checked="needEval"
+              <a-checkbox v-model:checked="needEval" @click="needEval=!needEval"
                 >需要评估</a-checkbox >
             </div>
           </div>
@@ -438,6 +438,7 @@ export default {
       EditTestId:null,
       EditWorkId:null,
       assessmentVisible:false,
+      needEval:false,
   
       
     });

src/components/drawers/AddInvist.vue

@@ -276,7 +276,6 @@ export default {
       afterVisibleChange,
       closeDrawer,
       updateTask,
-      AssessmentList,
       checkAssDrawer,
       getCheckedAss,
     };

src/components/drawers/AddLive.vue

@@ -121,39 +121,44 @@
               ></a-auto-complete>
             </div>
           </div>
-          <div class="main_item2">
+          <div class="mbl_items2">
-            <div class="signbox">
+                  <div class="item_nam">
-              <span style="margin-right: 3px">直播封面：</span>
+                    <div class="asterisk_icon">
+                      <img
+                        src="@/assets/images/coursewareManage/asterisk.png"
+                        alt=""
+                      />
                     </div>
-            <div
+                    <span style="margin-right: 14px">直播封面</span>
-              class="textarea"
+                  </div>
-              style="overflow: hidden; width: 102px; height: 102px"
+                  <div class="item_inp">
-            >
+              
                     <a-upload
-                v-model:file-list="fileList"
                       name="avatar"
                       list-type="picture-card"
                       class="avatar-uploader"
                       :show-upload-list="false"
-                action="/manageApi/file/upload"
                       :before-upload="beforeUpload"
-                @change="handleChange"
                     >
                       <img
+                        class="i_upload_img"
                         v-if="imageUrl"
                         :src="imageUrl"
                         alt="avatar"
-                  style="“width：100px；height:100px;”"
                       />
-                <div v-else>
+                      <div class="i_upload" v-else>
-                  <loading-outlined v-if="loading"></loading-outlined>
+                        <div class="addimg">
-                  <plus-outlined v-else></plus-outlined>
+                          <div class="heng"></div>
-                  <div class="ant-upload-text">Upload</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">
               <span style="margin-right: 3px">直播链接：</span>
@@ -174,7 +179,7 @@
               <a-switch v-model:checked="switchC1" @click="PlayBack" />
             </div>
           </div>
-          <div :style="{ display: playback ? 'block' : 'none' }">
+          <div v-if ="switchC1">
             <div class="main_item">
               <div class="signbox">
                 <span style="margin-right: 3px">回放链接：</span>
@@ -189,33 +194,34 @@
             </div>
           </div>
 
-          <div class="main_item">
+          <div class="main_item2">
+            <div class="signbox">
+              <span style="margin-right: 3px">评估：</span>
+            </div>
+            <div class="btnbox2">
+              <a-checkbox v-model:checked="needEval"  @click="needEval=!needEval"
+                >需要评估</a-checkbox >
+            </div>
+          </div>
+          <div v-if="needEval" class="main_item">
             <div class="signbox">  
-              <span style="margin-right: 3px">评价：</span>
             </div>
             <div class="btnbox">
-              <a-checkbox v-model:checked="checkedC1" @change="checkRadio"
+              <button class="xkbtn" @click="showAssessment">选择评估</button>
-                >需要评估</a-checkbox
+              <div v-if = "assessmentId >0 ">
-              >
+              <a-tag  closable   color="processing" @close="logA">
-            </div>
+            <span style="font-size:14px;line-height: 33px;" >删除评估</span>
-          </div>
+            </a-tag></div>
-          <div
+            <AssessmentList
-            class="main_item"
+                      v-model:assessmentVisible="assessmentVisible"
-            style="margin-top: -25px"
+                      v-model:titleTag="titleTag"
-            :style="{ display: checkedC1 ? 'block' : 'none' }"
+                      v-model:assessmentId="assessmentId"
-          >
+                    />
-            <div class="signbox"></div>
+
-            <div class="btnbox">
-              <a-select
-                v-model:value="assessmentvalue"
-                show-search
-                placeholder="选择评估"
-                style="width: 364px"
-                :options="assessment"
-                @change="handleChangeAssessment"
-              ></a-select>
             </div>
           </div>
+
+        
           <div class="main_item2">
             <div class="signbox">
               <span style="margin-right: 3px">考勤设置：</span>
@@ -327,6 +333,9 @@ import { RouterEditTask } from "@/api/indexTask";
 import { addTempTask } from "../../api/indexTaskadd";
 import { getMemberInfo } from "@/api/index1";
 import dayjs from "dayjs";
+import { fileUp } from "../../api/indexEval";
+import AssessmentList from "../drawers/ AssessmentList.vue";
+
 import { debounce } from "lodash-es";
 // import { useRouter } from "vue-router";
 function getBase64(img, callback) {
@@ -337,6 +346,9 @@ function getBase64(img, callback) {
 
 export default {
   name: "AddLive",
+  components:{
+    AssessmentList
+  },
   props: {
     addliveVisible: {
       type: Boolean,
@@ -419,6 +431,9 @@ export default {
       obj: {}, //要传的obj数据
       assessment: [], //评估信息
       assessmentvalue: null,
+      needEval:false,
+      otherSettings:false,
+      assessmentVisible:false,
     });
     const closeDrawer = () => {
       ctx.emit("update:addliveVisible", false);
@@ -437,12 +452,14 @@ export default {
       state.textV1 = "";
       state.switchC1 = "";
       state.imageUrl = "";
+      state.needEval=false;
+      state.otherSettings;
       ctx.emit("changeData", false);
       localStorage.setItem("stageId", props.chooseStageId);
       localStorage.setItem("chapterId", props.isactive);
     };
-    const afterVisibleChange = () => {
+    const afterVisibleChange = (bool) => {
-      if (props.edit) {
+      if (props.edit&&bool) {
         queryLive();
       }
       api
@@ -492,6 +509,7 @@ export default {
         });
     };
 
+
     const cloradio1 = (value) => {
       if (state.radioV1 === value.target._value) {
         state.radioV1 = "";
@@ -519,24 +537,7 @@ export default {
         message.error("upload error");
       }
     };
-    const beforeUpload = (file) => {
-      const isJpgOrPng =
-        file.type === "image/jpeg" ||
-        file.type === "image/png" ||
-        file.type === "image/jpg";
 
-      if (!isJpgOrPng) {
-        message.error("You can only upload JPG file!");
-      }
-
-      const isLt2M = file.size / 1024 / 1024 < 2;
-
-      if (!isLt2M) {
-        message.error("Image must smaller than 2MB!");
-      }
-
-      return isJpgOrPng && isLt2M;
-    };
     const updateTask = (res) => {
       if (props.isLevel == 1) {
         RouterEditTask({
@@ -593,6 +594,11 @@ export default {
           });
       }
     };
+    const showAssessment = () => {
+      
+      state.assessmentVisible = true;
+      console.log("hshs======",state.assessmentVisible);
+    };
     //创建直播
     const updateLiveBroadcast = () => {
       if (!state.inputV1) {
@@ -638,9 +644,10 @@ export default {
         livePlayback: state.playback ? "true" : "false",
         livePlaybackLink: state.playback ? state.inputV5 : "",
         liveTeacherId: state.inputV3,
-        otherSettings: 0, //1或0
+        otherSettings: state.otherSettings, //1或0
         signOutTime: state.inputV8,
         standardSettings: state.radioV1, //1或2
+        isEvaluate:state.eedEval ? "1":"0",
       };
       if (props.edit) {
         api
@@ -662,6 +669,42 @@ export default {
           .catch(() => {});
       }
     };
+    const beforeUpload = (file) => {
+      return new Promise((resolve, reject) => {
+        const isJpgOrPng =
+          file.type === "image/jpg" ||
+          file.type === "image/jpeg" ||
+          file.type === "image/png" ||
+          file.type === "image/svg" ||
+          file.type === "image/bmp" ||
+          file.type === "image/gif";
+        if (!isJpgOrPng) {
+          message.error("仅支持jpg、gif、png、jpeg、svg、bmp格式!");
+          return reject(false);
+        }
+
+        let reader = new FileReader();
+        reader.readAsDataURL(file);
+        reader.onload = () => {
+          const image = new Image();
+          image.src = reader.result;
+          image.onload = () => {
+            const formData = new FormData();
+              formData.append("file", file);
+              console.log(file);
+              fileUp(formData).then((res) => {
+                if (res.data.code === 200) {
+                  state.imageUrl = res.data.data;
+                }
+              });
+              return resolve(true);
+          };
+        };
+
+        return reject(false);
+      });
+    };
+
     const templateScroll = (e) => {
       console.log("滚动", e);
       const { target } = e;
@@ -728,9 +771,7 @@ export default {
         state.discussSettings = "false";
       }
     };
-    const handleChangeAssessment = (option) => {
+  
-      state.assessmentId = option.assessmentId;
-    };
     return {
       ...toRefs(state),
       afterVisibleChange,
@@ -743,10 +784,10 @@ export default {
       handleChange2,
       options,
       checkRadio,
-      handleChangeAssessment,
       queryMember,
       templateScroll,
       handleSearch,
+      showAssessment,
     };
   },
 };
@@ -874,6 +915,63 @@ export default {
             }
           }
         }
+        .mbl_items2 {
+                display: flex;
+                align-items: start;
+                margin-top: 10px;
+                margin-bottom: 10px;
+                .i_bottom{
+                  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;
+                      }
+                      .shu {
+                        position: absolute;
+                        top: 25px;
+                        left: 50px;
+                        height: 50px;
+                        border: 1px solid #4ea6ff;
+                      }
+                    }
+                  }
+                }
+              }
+        
       }
     }
     .main_btns {

src/views/courselibrary/CoursewareManage.vue

@@ -370,12 +370,7 @@
                     <span style="margin-right: 14px">封面图</span>
                   </div>
                   <div class="item_inp">
-                    <!-- <div class="i_upload">
+              
-                      <div class="addimg">
-                        <div class="heng"></div>
-                        <div class="shu"></div>
-                      </div>
-                    </div> -->
                     <a-upload
                       name="avatar"
                       list-type="picture-card"
@@ -1747,21 +1742,16 @@
               <span style="margin-right: 3px">完成规则</span>
             </div>
             <div class="b_input">
-              <a-radio-group v-model:value="xjkkradioV2">
+              <a-checkbox v-model:checked="regisCom" @click="regisCom =!regisCom">
-                <a-radio :value="1" @click="clear_xjkkradioV2">
+                <span style="color: #6d7584">报名即完成</span>
-                  <span style="color: #6d7584; margin-right: 30px">
+              </a-checkbox>
-                    报名即完成
+              <a-checkbox v-model:checked="signCom" @click="signCom =!signCom">
-                  </span>
+                <span style="color: #6d7584">签到即完成</span>
-                </a-radio>
+              </a-checkbox>
-                <a-radio :value="2" @click="clear_xjkkradioV2">
+              <a-checkbox v-model:checked="comLeave" @click="comLeave =!comLeave">
-                  <span style="color: #6d7584; margin-right: 30px">
-                    签到即完成
-                  </span>
-                </a-radio>
-                <a-radio :value="3" @click="clear_xjkkradioV2">
                 <span style="color: #6d7584">请假算完成</span>
-                </a-radio>
+              </a-checkbox>
-              </a-radio-group>
+
             </div>
           </div>
           <div class="cstm_items items_fj">
@@ -3340,7 +3330,7 @@ export default defineComponent({
       kkinputV2: "",
       //新建开课
       xjkkradioV1: "",
-      xjkkradioV2: "",
+      completeType: "",
       xjkkinputV1: "",
       xjkkinputV2: "",
       xjkkinputV3: "",
@@ -3376,7 +3366,9 @@ export default defineComponent({
       checked4: false,
       offcoursePlanId: 0,
       filesList: [],
-
+      signCom:false ,
+      regisCom:false,
+      comLeave:false,
       studentId: 0,
       studentItem: {},
       addOnlineCoursevisible: false, //新建面授弹窗
@@ -4104,7 +4096,7 @@ export default defineComponent({
       state.cstm_hs = false;
       state.kk_eidt = false;
       state.xjkkradioV1 = "";
-      state.xjkkradioV2 = "";
+      state.completeType = "";
       state.xjkkinputV1 = "";
       state.xjkkinputV2 = "";
       state.xjkkinputV3 = "";
@@ -4127,12 +4119,12 @@ export default defineComponent({
         applyFlag: state.checked1 ? 1 : 0,
         attach: state.filesList.length ? state.filesList.join(",") : "",
         beginTime: startTime,
-        completeType: state.xjkkradioV2,
+        completeType: state.regisCom?"1,":"0,"+state.signCom?"1,":"0,"+state.comLeave?"1":"0",
         endTime: endTime,
         evalFlag: state.checked4 ? 1 : 0,
         name: state.xjkkinputV1,
         signFlag: state.xjkkradioV1 === 0 ? 1 : 0, //是否允许未报名的签到:1是0否
-        signWordFlag: state.xjkkradioV1 === 1 ? 1 : 0, //签到是否需要口令:1是0否
+       // signWordFlag: state.xjkkradioV1 === 1 ? 1 : 0, //签到是否需要口令:1是0否
         teacherId: state.xjkkinputV4 ? state.xjkkinputV4 : 1,
       };
       console.log(postData);
@@ -4175,13 +4167,17 @@ export default defineComponent({
         dayjs(item.endTime, "YYYY/MM/DD"),
       ];
       options4CurId.value = item.teacherId;
-      state.xjkkradioV2 = item.completeType;
+      state.regisCom = item.completeType.split(",")[0]==1?true:false,
+      state.signCom = item.completeType.split(",")[1]==1?true:false,
+      state.comLeave = item.completeType.split(",")[2]==1?true:false,
+      state.completeType = state.regisCom?"1,":"0,"+state.signCom?"1,":"0,"+state.comLeave?"1":"0", 
       state.checked4 = item.evalFlag === 1 ? true : false;
       state.xjkkinputV1 = item.name;
       if (item.signFlag === 1) {
         //是否允许未报名的签到:1是0否
         state.xjkkradioV1 = 0;
       }
+      /*
       if (item.signWordFlag === 1) {
         //签到是否需要口令:1是0否
         state.xjkkradioV1 = 1;
@@ -4189,6 +4185,7 @@ export default defineComponent({
       if (item.signFlag === 0 && item.signWordFlag === 0) {
         state.xjkkradioV1 = "";
       }
+      */
       state.xjkkinputV4 = item.teacherId;
 
       getTea();
@@ -4396,7 +4393,7 @@ export default defineComponent({
             evalFlag: item.evalFlag,
             name: item.name,
             signFlag: item.signFlag, //是否允许未报名的签到:1是0否
-            signWordFlag: item.signWordFlag, //签到是否需要口令:1是0否
+            //signWordFlag: item.signWordFlag, //签到是否需要口令:1是0否
             teacherId: item.teacherId,
           };
           console.log(obj);

src/views/projectcenter/LibraryAdd.vue

@@ -901,6 +901,7 @@ export default defineComponent({
         state.projectInfo.status = res.data.data.projectTemplateInfo.status
         state.projectInfo.picUrl = res.data.data.projectTemplateInfo.picUrl
         let data = res.data.data.stageList;
+        console.log("data=====",data);
         for(let i in data) {
           state.taskSyllabus.push({text: data[i].name,children:[]});
           for(let j in data[i].taskList) {
@@ -939,8 +940,8 @@ export default defineComponent({
           "notice": state.projectInfo.notice,
           "noticeFlag": 0,
           "projectTemplateId": localStorage.getItem('projectTemplateId'),
-          "remark": "",
+          "remark": state.projectInfo.remark,
-          "status": 0,
+          "status": state.projectInfo.status,
         };
       api.templateEdit(obj).then(res => {
         message.success("公告发布成功")

src/views/projectcenter/TaskPage.vue

@@ -1,4 +1,4 @@
-<!-- 任务页面 -->
+<!-- 任务页面 -->img
 <template>
   <div class="taskpage">
     <div class="addhead" style="flex-shrink: 0">

src/views/projectcenter/temTask.vue

@@ -1618,8 +1618,8 @@ export default {
       } else {
         {
           let obj = {
-            stageId: state.removeStageId,
+            templateStageId: state.removeStageId,
-            projectTaskId: state.selectRow,
+            projectTemplateTaskId: state.selectRow,
           };
           api
             .moveTask(obj)
@@ -1916,6 +1916,7 @@ export default {
     const changeCourseType = (ele) => {
       console.log("任务id", ele.id);
       console.log("flag", ele.checked1);
+      console.log("ele", ele);
       let obj = {
         courseId: ele.courseId,
         duration: ele.cretime == "-" ? 0 : ele.cretime,
@@ -1923,11 +1924,11 @@ export default {
         name: ele.creater,
         projectTemplateId: ele.projectTemplateId,
         projectTaskId:ele.id, 
-        stageId: ele.templateStageId,
+        stageId:ele.stageId,
         type: ele.type,
       };
       api
-        .addTask(obj)
+        .editTask(obj)
         .then((res) => {
           console.log(`修改状态成功${res.data}`);
           message.destroy();