feat:合并

2025-12-15 22:06:45 +08:00 · 2022-11-29 09:47:46 +08:00
parent 3804d11f6a 2df25055d9
commit d51df54728
13 changed files with 337 additions and 152 deletions
--- a/src/App.vue
+++ b/src/App.vue
@@ -1,5 +1,5 @@
 <template>
-  <div id="container">
+  <div id="container" v-if="!isLogin">
    <nav-top />
    <div style="display: flex">
      <nav-left />
@@ -14,9 +14,12 @@
      </div>
    </div>
  </div>
+  <div id="container" v-if="isLogin">
+    <router-view/>
+  </div>
 </template>
 <script>
-import { computed, defineComponent } from "vue";
+import {computed, defineComponent, ref, watch} from "vue";
 import { useRouter, useRoute } from "vue-router";
 import { useStore } from "vuex";
 import NavLeft from "@/components/NavLeft";
@@ -36,11 +39,16 @@ export default defineComponent({
    const router = useRouter();
    const route = useRoute();
    const store = useStore();
+    const isLogin = ref(false)
    // console.log("router", router.getRoutes(), route);
    const routes = computed(() => {
      return router.getRoutes().filter((e) => e.meta?.isLink);
    });

+    watch(() => route.path, () => {
+      route.path === '/login' && (isLogin.value = true)
+    })
+
    const currentRouteName = computed(() => route.name);

    //获取组织树
@@ -68,6 +76,7 @@ export default defineComponent({
    getOrgTree();

    return {
+      isLogin,
      routes,
      name: currentRouteName,
      zhCN,
--- a/src/api/index.js
+++ b/src/api/index.js
@@ -75,3 +75,5 @@ export const getTemplateDetail = (obj) => http.get('/admin/project/template/deta
 //获取项目统计
 export const getProjectCount = (projectId) => http.get('/admin/project/projectCount', { params: { projectId: projectId } })

+export const login = (obj) => http.post('/admin/CheckUser/userLogin', obj)
+
--- a/src/api/method.js
+++ b/src/api/method.js
@@ -169,7 +169,7 @@ const setCookie = (name, value, perpetual) => {
  console.log('存储token到cookie')
  let exdate = new Date()
  exdate.setDate(perpetual * 24 * 60 * 60 * 1000)  //exdate.setDate(exdate.getDate() + 365)
-  document.cookie = name + '=' + value + ';expires=' + exdate.toGMTString()
+  document.cookie = `${name}=${value};expires=${exdate.toGMTString()};path=/`
  //永久有效
  //document.cookie = name + '=' + value + ';expires=' + 'Fri, 31 Dec 9999 23:59:59 GMT'    
 }
--- a/src/components/drawers/
+++ b/src/components/drawers/
@@ -110,7 +110,7 @@ export default {
    };
    const afterVisibleChange = (bool) => {
      console.log("state getAllInvistText", bool,"======",props.titleTag);
-      if (props.assessmentVisible) {
+      if (props.assessmentVisible&&bool) {
        getAllInvistText();
      }
    };
--- a/src/components/drawers/AddFaceteach.vue
+++ b/src/components/drawers/AddFaceteach.vue
@@ -181,7 +181,7 @@
                      border-radius: 8px;
                      overflow: hidden;
                    "
-                    :v-model:value="beforeStart"
+                    :v-model:value="beforeStartValue"
                  ></a-input-number>
                  <span style="color: #999999; margin-left: 8px">分钟</span>
                </div>
@@ -195,9 +195,8 @@
                      width: 88px;
                      height: 32px;
                      border-radius: 8px;
-                      overflow: hidden;
-                    "
-                    :v-model:value="afterStart"
+                      overflow: hidden;"
+                    :value="afterStartValue"
                  ></a-input-number>
                  <span style="color: #999999; margin-left: 8px">分钟</span>
                </div>
@@ -223,7 +222,7 @@
              <span style="margin-right: 3px">其他设置：</span>
            </div>
            <div class="btnbox">
-              <a-checkbox v-model:checked="complete_leave"  @click="complete_leave=!complete_leave"
+              <a-checkbox v-model:checked="completeLeave"  @click="completeLeave=!completeLeave"
                >学员请假后记为任务完成</a-checkbox
              >
            </div>
@@ -242,7 +241,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>
@@ -408,6 +407,11 @@ export default {
      type: Number,
      default: null,
    },
+    projectTemplateId:{
+      type: Number,
+      default: null,
+    },
+   
  },
  setup(props, ctx) {
    const options = ref([]);
@@ -426,10 +430,10 @@ export default {
      memberId: 0,
      pageSize: 10,
      courseName: "",
-      duration: "",
+      duration:null,
      address: null,
-      beforeStart: null,
-      afterStart: null,
+      beforeStartValue:20,
+      afterStartValue:10,
      description: "",
      chooseTime: [],
      fileList: [],
@@ -437,19 +441,20 @@ export default {
      assessmentId:null,
      EditTestId:null,
      EditWorkId:null,
-      assessmentVisible: false,
+      assessmentVisible:false,
+      needEval:false,
  
      
    });
    const clear = () => {
-      state.courseName = null;
+      state.courseName = "";
      state.memberValue = null;
      state.duration = null;
      state.address = null;
-      state.beforeStart = null;
-      state.afterStart = null;
+      state.beforeStart = 0;
+      state.afterStartValue =0;
      state.chooseTime = [];
-      state.description = null;
+      state.description ="";
      state.onlySign =false;
      state.completeLeave =false;
      state.projectMember =false;
@@ -458,7 +463,9 @@ export default {
      state.EditTestId =null;
      state.assessmentId=null;
      state.EditWorkId=null;
-    
+      state.EditEvalId=null;
+      state.applyFlag="";
+      console.log("state.afterStart",state.afterStartValue);
    };
    const closeDrawer = () => {
      ctx.emit("update:addfaceteachVisible", false);
@@ -505,6 +512,7 @@ export default {

    //查询面授
    const queryFaceTeach = () => {
+      console.log("props.EditFaceI========d",props.EditFaceId);
      queryFaceDetailById(props.EditFaceId).then((res) => {
        console.log("获取到了面授课开课详情", res.data.data);
        let result = res.data.data;
@@ -522,14 +530,15 @@ export default {
        }
        state.address = result.address;
        state.beforeStart = result.beforeStart;
-        state.afterStart = result.afterStart;
+        state.afterStartValue = result.afterStart;
+        console.log("编辑========",state.afterStartValue);
        state.fileList = JSON.parse(result.attach);
        state.EditWorkId = result.homeWorkId;
-        state.onlySign = result.completeType.split(",")[0]==1?true:false;
-        state.completeLeave =result.completeType.split(",")[1]==1?true:false;
+        state.onlySign = result.completeType.split(",")[0]=="1"?true:false;
+        state.completeLeave =result.completeType.split(",")[1]=="1"?true:false;
        state.chooseCourse =result.offcourseId;
-        state.projectMember = result.projectMember.split(",")[0]==1?true:false;
-        state.noProjectMember = result.projectMember.split(",")[1]==1?true:false;
+        state.projectMember = result.projectMember.split(",")[0]=="1"?true:false;
+        state.noProjectMember = result.projectMember.split(",")[1]=="1"?true:false;
        state.EditTestId = result.testId;
        state.EditWorkId=result.homeWorkId;
        state.assessmentId =result.evaluateId;
@@ -539,13 +548,18 @@ export default {
    //新建或编辑面授
    // 新增任务
    const updateFaceTeach = () => {
+      console.log("v",state.beforeStart,"v",state.afterStartValue,"v",
+        state.applyFlag,"v",state.evalFlag,"v",state.completeType,"state.address",state.address);
      if (
+        /*
        state.courseName == "" ||
-        state.chooseCourse == null ||
+        state.chooseCourse == null ||s
        state.memberValue == "" ||
        state.chooseTime == [] ||
        state.duration == "" ||
+        */
        state.address == ""
+    
      ) {
        message.destroy();
        return message.warning("请输入必填字段");
@@ -554,27 +568,27 @@ export default {
          teacherId:state.memberValue.value,
          teacher:state.memberValue.label,
          address:state.address,
-          applyFlag: 1,
+          applyFlag: state.applyFlag,
          attach: JSON.stringify(state.fileList),
-          afterStart: state.afterStart || 0,
-          beforeStart: state.beforeStart || 0,
+          afterStart:state.afterStartValue ||0,
+          beforeStart:state.beforeStart,
          beginTime: parseInt( new Date(state.chooseTime[0].$d).getTime() / 1000),
          completeType: state.onlySign? "1,":"0," + state.completeLeave?"1":"0",
          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,
          homeWorkId: state.EditWorkId,
          name: state.courseName,
-          projectMember:state.innerPersion?"1":"0" + state.outPerson?"1":"0",
+          projectMember:state.innerPersion?"1,":"0," + state.outPerson?"1":"0",
          offcourseId:state.chooseCourse,
          offcoursePlanId:props.EditFaceId >0 ? props.EditFaceId : 0,
-          signFlag: 0,
          testId: state.EditTestId
        };

        editPlan(obj)
            .then((res) => {
+              console.log("更新任务s's");
              updateTask(res);
              closeDrawer();
            }).catch((err) => {
@@ -588,6 +602,7 @@ export default {
    //更新任务列表
    // 新增编辑或新增项目任务
    const updateTask = (res) => {
+      console.log("props.isLevel=====",props.isLevel);
      if (props.isLevel == 1) {
        let editObj1 = {
          chapterId: props.isactive,
@@ -610,7 +625,7 @@ export default {
      } else if (props.isLevel == 2) {
        let editObj = {
          courseId: res.data.data.offcoursePlanId,
-          duration: 0,
+          duration: res.data.data.duration,
          name: res.data.data.name,
          projectId: props.projectId,
          projectTaskId: props.projectTaskId || 0,
@@ -629,11 +644,12 @@ export default {
            message.error(`${props.EditFaceId ? "编辑" : "新增"}阶段任务失败`);
          });
      } else if (props.isLevel == 3) {
+        console.log("dddddddddddd33333333");
        addTempTask({
          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,
--- a/src/components/drawers/AddInvist.vue
+++ b/src/components/drawers/AddInvist.vue
@@ -276,7 +276,6 @@ export default {
      afterVisibleChange,
      closeDrawer,
      updateTask,
-      AssessmentList,
      checkAssDrawer,
      getCheckedAss,
    };
--- a/src/components/drawers/AddLive.vue
+++ b/src/components/drawers/AddLive.vue
@@ -121,39 +121,44 @@
              ></a-auto-complete>
            </div>
          </div>
-          <div class="main_item2">
-            <div class="signbox">
-              <span style="margin-right: 3px">直播封面：</span>
-            </div>
-            <div
-              class="textarea"
-              style="overflow: hidden; width: 102px; height: 102px"
-            >
-              <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
-                  v-if="imageUrl"
-                  :src="imageUrl"
-                  alt="avatar"
-                  style="“width：100px；height:100px;”"
-                />
-                <div v-else>
-                  <loading-outlined v-if="loading"></loading-outlined>
-                  <plus-outlined v-else></plus-outlined>
-                  <div class="ant-upload-text">Upload</div>
-                </div>
-              </a-upload>
-              <div class="tip">支持图片格式为jpg/jpeg/png 图片最大为2MB</div>
-            </div>
-          </div>
+          <div class="mbl_items2">
+                  <div class="item_nam">
+                    <div class="asterisk_icon">
+                      <img
+                        src="@/assets/images/coursewareManage/asterisk.png"
+                        alt=""
+                      />
+                    </div>
+                    <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>
+                    </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>
+              <span style="margin-right: 3px">评估：</span>
            </div>
-            <div class="btnbox">
-              <a-checkbox v-model:checked="checkedC1" @change="checkRadio"
-                >需要评估</a-checkbox
-              >
+            <div class="btnbox2">
+              <a-checkbox v-model:checked="needEval"  @click="needEval=!needEval"
+                >需要评估</a-checkbox >
            </div>
          </div>
-          <div
-            class="main_item"
-            style="margin-top: -25px"
-            :style="{ display: checkedC1 ? 'block' : 'none' }"
-          >
-            <div class="signbox"></div>
+          <div v-if="needEval" class="main_item">
+            <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>
+              <button class="xkbtn" @click="showAssessment">选择评估</button>
+              <div v-if = "assessmentId >0 ">
+              <a-tag  closable   color="processing" @close="logA">
+            <span style="font-size:14px;line-height: 33px;" >删除评估</span>
+            </a-tag></div>
+            <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>
@@ -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 = () => {
-      if (props.edit) {
+    const afterVisibleChange = (bool) => {
+      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 {
--- a/src/components/drawers/AddTest.vue
+++ b/src/components/drawers/AddTest.vue
@@ -392,7 +392,7 @@ export default {
  setup(props, ctx) {
    const formState = reactive({
      examinationName: "",
-      examinationDuration: "",
+      examinationDuration:0,
      examinationLimit: "",
      passLine:null,
      examinationEndTime: "",
--- a/src/views/courselibrary/CoursewareManage.vue
+++ b/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"
@@ -1750,21 +1745,16 @@
              <span style="margin-right: 3px">完成规则</span>
            </div>
            <div class="b_input">
-              <a-radio-group v-model:value="xjkkradioV2">
-                <a-radio :value="1" @click="clear_xjkkradioV2">
-                  <span style="color: #6d7584; margin-right: 30px">
-                    报名即完成
-                  </span>
-                </a-radio>
-                <a-radio :value="2" @click="clear_xjkkradioV2">
-                  <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-radio-group>
+              <a-checkbox v-model:checked="regisCom" @click="regisCom =!regisCom">
+                <span style="color: #6d7584">报名即完成</span>
+              </a-checkbox>
+              <a-checkbox v-model:checked="signCom" @click="signCom =!signCom">
+                <span style="color: #6d7584">签到即完成</span>
+              </a-checkbox>
+              <a-checkbox v-model:checked="comLeave" @click="comLeave =!comLeave">
+                <span style="color: #6d7584">请假算完成</span>
+              </a-checkbox>
+
            </div>
          </div>
          <div class="cstm_items items_fj">
@@ -3343,7 +3333,7 @@ export default defineComponent({
      kkinputV2: "",
      //新建开课
      xjkkradioV1: "",
-      xjkkradioV2: "",
+      completeType: "",
      xjkkinputV1: "",
      xjkkinputV2: "",
      xjkkinputV3: "",
@@ -3379,7 +3369,9 @@ export default defineComponent({
      checked4: false,
      offcoursePlanId: 0,
      filesList: [],
-
+      signCom:false ,
+      regisCom:false,
+      comLeave:false,
      studentId: 0,
      studentItem: {},
      addOnlineCoursevisible: false, //新建面授弹窗
@@ -4107,7 +4099,7 @@ export default defineComponent({
      state.cstm_hs = false;
      state.kk_eidt = false;
      state.xjkkradioV1 = "";
-      state.xjkkradioV2 = "";
+      state.completeType = "";
      state.xjkkinputV1 = "";
      state.xjkkinputV2 = "";
      state.xjkkinputV3 = "";
@@ -4130,12 +4122,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);
@@ -4178,13 +4170,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;
@@ -4192,6 +4188,7 @@ export default defineComponent({
      if (item.signFlag === 0 && item.signWordFlag === 0) {
        state.xjkkradioV1 = "";
      }
+      */
      state.xjkkinputV4 = item.teacherId;

      getTea();
@@ -4399,7 +4396,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);
--- a/src/views/login.vue
+++ b/src/views/login.vue
@@ -0,0 +1,51 @@
+<template>
+  <div :style="{
+       margin: 'auto',
+  background: 'url(http://img.gz2c.com/FoTcLY8ww-ISCFlwyCoYuLim1BMt) no-repeat',
+  backgroundSize: '100% 100%',
+  width: '100%',
+  height: '100vh',
+  display:'flex'
+  }">
+    <div
+        :style="{width:'300px', height: '300px', margin:'10% auto',padding:'20px 30px',textAlign:'center', borderRadius:'10px', background:'#e0e0e0',boxShadow:'20px 20px 60px #bebebe,-20px -20px 60px #ffffff'}">
+      <div :style="{fontSize:'24px',paddingBottom:'30px'}">用户登录</div>
+      <div>
+        <a-input placeholder='用户名' v-model:value="form.account"/>
+        <a-input placeholder='密码' v-model:value="form.password" :style="{marginTop: '30px'}" type='password'/>
+        <a-button :style="{marginTop:'30px'}" @click="loginUser">登录</a-button>
+      </div>
+    </div>
+  </div>
+</template>
+<script>
+import {reactive, toRefs} from "vue";
+import * as api from "@/api";
+import {setCookie} from "@/api/method";
+import {useRouter} from "vue-router";
+
+export default {
+  name: "loginPage",
+  setup() {
+    const router = useRouter()
+    const state = reactive({
+      form: {
+        account: '10181461',
+        password: '1234567890Aa'
+      }
+    })
+
+    async function loginUser() {
+      const {data: {data: token}} = await api.login(state.form)
+      setCookie("token", token, 10)
+      await router.push({path: '/learningpath'})
+      location.reload()
+    }
+
+    return {
+      ...toRefs(state),
+      loginUser
+    }
+  }
+}
+</script>
--- a/src/views/projectcenter/LibraryAdd.vue
+++ b/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": "",
-          "status": 0,
+          "remark": state.projectInfo.remark,
+          "status": state.projectInfo.status,
        };
      api.templateEdit(obj).then(res => {
        message.success("公告发布成功")
--- a/src/views/projectcenter/TaskPage.vue
+++ b/src/views/projectcenter/TaskPage.vue
@@ -1,4 +1,4 @@
-<!-- 任务页面 -->
+<!-- 任务页面 -->img
 <template>
  <div class="taskpage">
    <div class="addhead" style="flex-shrink: 0">
--- a/src/views/projectcenter/temTask.vue
+++ b/src/views/projectcenter/temTask.vue
@@ -196,7 +196,13 @@
            <div>
              <add-faceteach
                v-model:addfaceteachVisible="addfaceteachvisible"
-                v-model:EditEvalId="EditEvalId"
+                @changeData="updateTableData"
+                :isLevel="isLevel"
+                v-model:edit="edit"
+                v-model:projectTemplateId="projectTemplateId"
+                v-model:chooseStageId="chooseStageId"
+                v-model:projectTaskId="projectTaskId"
+                v-model:EditFaceId="EditFaceId"
              />
            </div>
            <!-- 添加面授侧弹窗 -->
@@ -1127,7 +1133,7 @@ export default {
      EditTestId: null, // 要编辑的考试id
      EditCaseId: null, //要编辑的案例id
      EditOnlineId: null, //要编辑的在线id
-      EditFaceTeach: null,
+      EditFaceId: null,
      EditEvalId: null,
      EditInvistId: null,
      EditVoteId: null, //编辑需要投票的id
@@ -1619,8 +1625,8 @@ export default {
      } else {
        {
          let obj = {
-            stageId: state.removeStageId,
-            projectTaskId: state.selectRow,
+            templateStageId: state.removeStageId,
+            projectTemplateTaskId: state.selectRow,
          };
          api
            .moveTask(obj)
@@ -1771,8 +1777,11 @@ export default {
      state.EditOnlineId = id;
      state.projectTaskId = eleId;
    };
-    const showDrawerFaceteach = () => {
+    const showDrawerFaceteach = (id, eleId) => {
      state.addfaceteachvisible = true;
+      console.log("id==========",id);
+      state.EditFaceId = id;
+      state.projectTaskId = eleId;
    };
    const showDrawerAddCase = (id, eleId) => {
      state.addcasevisible = true;
@@ -1917,18 +1926,19 @@ 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,
        flag: ele.checked1,
        name: ele.creater,
        projectTemplateId: ele.projectTemplateId,
-        projectTaskId: ele.id,
-        stageId: ele.templateStageId,
+        projectTaskId:ele.id, 
+        stageId:ele.stageId,
        type: ele.type,
      };
      api
-        .addTask(obj)
+        .editTask(obj)
        .then((res) => {
          console.log(`修改状态成功${res.data}`);
          message.destroy();
@@ -1972,6 +1982,8 @@ export default {
        showDrawerAddTest(id, eleId);
      } else if (type == "在线") {
        showDrawerOnline(id, eleId);
+      }else if (type == "面授") {
+        showDrawerFaceteach(id, eleId);
      }
    };
    const showdeAll = () => {