diff --git a/.env.boe b/.env.boe
index cac81a6a..413ee62d 100644
--- a/.env.boe
+++ b/.env.boe
@@ -14,4 +14,5 @@ VUE_APP_ONLINE_CLASS_URL=//u-pre.boe.com/mobile/pages/study/courseStudy?id=
 VITE_BOE_CASS_DETAIL_URL=//u-pre.boe.com/pc/case/detail?id=
 VUE_APP_EXAM_DETAIL_URL=//u-pre.boe.com/mobile/pages/exam/exam?id=
 # 批量面授报名模板
-VUE_APP_FACE_STUDENT_TEMPLATE=coursefile/批量面授报名模版-1679595849719.xlsx
\ No newline at end of file
+VUE_APP_FACE_STUDENT_TEMPLATE=coursefile/批量面授报名模版-1679595849719.xlsx
+VUE_APP_FILE_PATH=/upload/boe/file/
\ No newline at end of file
diff --git a/src/components/TwoDimensionalCodeNew.vue b/src/components/TwoDimensionalCodeNew.vue
new file mode 100644
index 00000000..de4f7bdd
--- /dev/null
+++ b/src/components/TwoDimensionalCodeNew.vue
@@ -0,0 +1,342 @@
+<template>
+  <div class="twoDimensionalCode">
+    <!--二维码页面 -->
+    <a-modal
+      :visible="codevisible"
+      :footer="null"
+      :closable="closableQR"
+      wrapClassName="codeModal"
+      style="margin-top: 400px"
+      :zIndex="9999"
+      @cancel="qr_exit"
+    >
+      <div id="qrcode" class="QR">
+        <div class="qr_header"></div>
+        <div class="qr_main">
+          <div class="qrm_header">
+            <span style="title">{{
+              codeInfo.title ? codeInfo.title : ""
+            }}</span>
+            <div class="close_exit" @click="closeCodeModal"></div>
+          </div>
+          <div class="downloadCode" style="">
+            <div class="qrm_body">
+              <div :class="codeInfo.teacherName?'qrm_body_item':''">
+                <div v-if="codeInfo.name&&!codeInfo.teacherName" class="codename">
+                  {{ codeInfo.name ? codeInfo.name : "" }}
+                </div>
+                <div v-if="codeInfo.name&&codeInfo.teacherName" class="codename" :title="codeInfo.name">
+                  开课：{{ codeInfo.name ? codeInfo.name : "" }}
+                </div>
+                <div v-if="codeInfo.teacherName" class="codename" :title="codeInfo.titleTeacherName">
+                  讲师：{{ codeInfo.teacherName ? codeInfo.teacherName : "" }}
+                </div>
+              </div>
+              <qrcode-vue
+                :value="codeInfo.url.startsWith('/')?(`${domain+codeInfo.url}&t=10`):`${codeInfo.url}&t=10`"
+                :size="qrcodeSize"
+                style="width: 200px; height: 200px"
+              ></qrcode-vue>
+            </div>
+          </div>
+          <div class="codeUrl" :style="{ display: showUrl ? 'flex' : 'flex' }">
+            <div class="codeUrlLink">链接</div>
+            <a-input
+              :value="codeInfo.url.startsWith('/')?`${domain+codeInfo.url}&t=10`:`${codeInfo.url}&t=10`"
+              disabled
+              class="codeUrlInp"
+            />
+            <a-input
+              :value="codeInfo.url.startsWith('/')?`${domain+codeInfo.url}&t=10`:`${codeInfo.url}&t=10`"
+              id="courseUrl"
+              class="codeUrlInp"
+              style="position: absolute; opacity: 0; z-index: -1"
+            />
+            <div @click="copyUrl" class="codeUrlCopy">复制链接</div>
+          </div>
+          <div class="qrm_footer">
+            <span
+              style="color: #387df7; cursor: pointer"
+              @click="downloadQr(200)"
+              >下载二维码</span
+            >
+            <!-- <div class="qrmbtn" @click="downloadQr(200)">
+              <div class="btntext">200*200</div>
+            </div> -->
+            <!-- <div class="qrmbtn" @click="downloadQr(200)">
+              <div class="btntext">400*400</div>
+            </div>
+            <div class="qrmbtn" @click="downloadQr(200)">
+              <div class="btntext">800*800</div>
+            </div> -->
+          </div>
+        </div>
+      </div>
+    </a-modal>
+    <!--二维码页面 -->
+  </div>
+</template>
+<script>
+import { reactive, toRefs, watch } from "vue";
+import QrcodeVue from "qrcode.vue";
+import html2canvas from "html2canvas";
+import { message } from "ant-design-vue";
+export default {
+  name: "TwoDimensionalCode",
+  components: {
+    QrcodeVue,
+  },
+  props: {
+    codevisible: {
+      type: Boolean,
+      default: false,
+    },
+    codeInfo: {
+      type: Object,
+      default: function () {
+        return {};
+      },
+    },
+    index: {
+      type: String,
+      default: "",
+    },
+    type: {
+      type: String,
+      default: "",
+    },
+  },
+  setup(props, ctx) {
+    const state = reactive({
+      qrcodeSize: 800,
+      codeInfo: {},
+      courseUrl: "https://www.baidu.com/",
+      showUrl: false,
+      domain: location.protocol+'//'+location.host
+    });
+
+    //下载二维码图片
+    const downloadQr = (num) => {
+      state.qrcodeSize = num;
+      html2canvas(
+        document.querySelectorAll(".downloadCode")[Number(props.index)],
+        {
+          useCORS: true, //支持图片跨域
+        }
+      ).then((canvas) => {
+        // console.log("canvas", canvas, canvas.width, canvas.style.width);
+        let filename = `${new Date().getTime()}.png`;
+        let imageUrl = canvas.toDataURL("image/png");
+        let a = document.createElement("a");
+        a.style.display = "none";
+        a.download = filename;
+        a.href = imageUrl;
+        document.body.appendChild(a);
+        a.click();
+      });
+      //           let canvas =document.getElementsByClassName('codeModal')[Number(props.index)].getElementsByTagName('canvas')[0];
+      //           let filename = `${new Date().getTime()}.png`;
+      //           let imageUrl = canvas.toDataURL("image/png");
+      //           let a = document.createElement("a");
+      //           a.style.display = "none";
+      //           a.download = filename;
+      //           a.href = imageUrl;
+      //           document.body.appendChild(a);
+      //           a.click();
+    };
+    //复制链接
+    const copyUrl = () => {
+      // const range = document.createRange(); //创建range对象
+      // 	range.selectNode(document.getElementById('courseUrl')); //获取复制内容的 id 选择器
+      // 	const selection = window.getSelection();  //创建 selection对象
+      // 	if (selection.rangeCount > 0) selection.removeAllRanges(); //如果页面已经有选取了的话，会自动删除这个选区，没有选区的话，会把这个选取加入选区
+      // 	selection.addRange(range); //将range对象添加到selection选区当中，会高亮文本块
+      // 	document.execCommand("Copy"); //复制选中的文字到剪贴板
+      // 	message.success('复制成功')
+      // 	selection.removeRange(range); // 移除选中的元素
+
+      var input = document.createElement("input"); // 创建input对象
+      input.value = state.codeInfo.url.startsWith('/')?(state.domain+state.codeInfo.url):state.codeInfo.url; // 设置复制内容
+      document.body.appendChild(input); // 添加临时实例
+      input.select(); // 选择实例内容
+      document.execCommand("Copy"); // 执行复制
+      document.body.removeChild(input); // 删除临时实例
+      message.success("复制成功！");
+    };
+    const closeCodeModal = () => {
+      ctx.emit("update:codevisible", false);
+    };
+    watch(() => {
+      let obj = {
+        title: "",
+        name: "",
+        url: "",
+        teacherName: "",
+      };
+      state.codeInfo = Object.assign(obj, props.codeInfo);
+      console.log("codeInfo22222", state.codeInfo, props.index, props.type);
+
+      if (props.type === "签到二维码"|| props.type === "评估二维码") {
+        state.showUrl = false;
+        console.log(" state.showUrl", state.showUrl);
+      } else if (props.type === "课程二维码") {
+        state.showUrl = true;
+      }
+    });
+    return {
+      ...toRefs(state),
+      downloadQr,
+      closeCodeModal,
+      copyUrl,
+    };
+  },
+};
+</script>
+<style scoped lang="scss">
+.twoDimensionalCode {
+}
+.codeModal {
+  .ant-modal {
+    .ant-modal-content {
+      width: 479px !important;
+      .ant-modal-body {
+        .QR {
+          z-index: 9999;
+          width: 520px;
+          background: #ffffff;
+          box-shadow: 0px 1px 35px 0px rgba(118, 136, 166, 0.21);
+          position: absolute;
+          left: 50%;
+          top: 10%;
+          transform: translate(-50%, -50%);
+          .qr_header {
+            position: absolute;
+            width: calc(100%);
+            height: 40px;
+            background: linear-gradient(
+              rgba(78, 166, 255, 0.2) 0%,
+              rgba(78, 166, 255, 0) 100%
+            );
+          }
+          .qr_main {
+            width: 100%;
+            position: relative;
+            .qrm_header {
+              display: flex;
+              align-items: center;
+              padding-top: 20px;
+              padding-left: 26px;
+              font-size: 16px;
+              .title {
+                font-size: 16px;
+                font-weight: 600;
+                color: #333333;
+                line-height: 22px;
+              }
+              .close_exit {
+                position: absolute;
+                right: 42px;
+                cursor: pointer;
+                width: 20px;
+                height: 20px;
+                background-image: url(@/assets/images/coursewareManage/close.png);
+                background-size: 100% 100%;
+              }
+            }
+            .qrm_body {
+              width: 100%;
+              padding-top: 22px;
+              padding-bottom: 32px;
+              display: flex;
+              flex-direction: column;
+              align-items: center;
+              .qrm_body_item{
+                width: 100%;
+                margin-left: 270px;
+              }
+              .codename {
+                font-size: 18px;
+                font-weight: 400;
+                color: #333333;
+                line-height: 25px;
+                margin-bottom: 20px;
+                margin-left: 20px;
+                margin-right: 20px;
+                overflow: hidden;
+                white-space: nowrap;
+                text-overflow: ellipsis;
+                max-width: 300px;
+              }
+            }
+            .codeUrl {
+              display: flex;
+              align-items: center;
+              justify-content: center;
+              margin-bottom: 24px;
+              .codeUrlLink {
+                width: 72px;
+                height: 40px;
+                display: flex;
+                align-items: center;
+                justify-content: center;
+                font-size: 14px;
+                font-weight: 400;
+                color: #c7cbd2;
+                line-height: 20px;
+                border: 1px solid #c7cbd2;
+                border-right: 0px solid #c7cbd2;
+              }
+              .codeUrlInp {
+                width: 305px;
+                height: 40px;
+                border: 1px solid #c7cbd2;
+              }
+              .ant-input-disabled {
+                background-color: rgba(0, 0, 0, 0) !important;
+              }
+              .ant-input[disabled] {
+                background-color: rgba(0, 0, 0, 0) !important;
+              }
+              .codeUrlCopy {
+                width: 96px;
+                height: 40px;
+                background-color: #4ea6ff;
+                border-radius: 8px;
+                display: flex;
+                align-items: center;
+                justify-content: center;
+                font-size: 14px;
+                font-weight: 400;
+                color: #ffffff;
+                line-height: 20px;
+                cursor: pointer;
+                margin-left: 8px;
+              }
+            }
+            .qrm_footer {
+              display: flex;
+              align-items: center;
+              justify-content: center;
+              margin-bottom: 44px;
+              .qrmbtn {
+                width: 80px;
+                height: 32px;
+                display: flex;
+                line-height: 32px;
+                justify-content: center;
+                border-radius: 4px;
+                border: 1px solid #387df7;
+                // margin-left: 16px;
+                cursor: pointer;
+                .btntext {
+                  color: #387df7;
+                }
+              }
+            }
+          }
+        }
+      }
+    }
+  }
+}
+</style>
diff --git a/src/components/student/TableStudent.vue b/src/components/student/TableStudent.vue
index 1f3fb378..a9fb4050 100644
--- a/src/components/student/TableStudent.vue
+++ b/src/components/student/TableStudent.vue
@@ -196,7 +196,7 @@
         :data-source="tableData.list"
         :pagination="stuPagination"
         :loading="tableData.loading"
-        :scroll="{ x: 1500 }"
+        :scroll="{ x: 1350 }"
         row-key="id"
         :row-selection="stuRowSelection"
       >
@@ -467,7 +467,7 @@ const tablecolumns = ref([
     title: "姓名",
     dataIndex: "studentName",
     key: "studentName",
-    width: "10%",
+    width: "80px",
     align: "left",
     className: "h",
     ellipsis: true,
@@ -496,7 +496,7 @@ const tablecolumns = ref([
     title: "工号",
     dataIndex: "studentUserNo",
     key: "studentUserNo",
-    width: "20%",
+    width: "60px",
     align: "center",
     className: "h",
     ellipsis: true,
@@ -505,12 +505,13 @@ const tablecolumns = ref([
     title: "部门",
     dataIndex: "studentDepartName",
     key: "studentDepartName",
-    width: "15%",
+    width: "120px",
     align: "center",
     className: "h",
-    ellipsis: true,
+    customCell  :() => {return {style: {maxWidth: '200px',overflow: 'hidden',whiteSpace: 'nowrap',textOverflow:'ellipsis',cursor:'pointer'}}},
     customRender: ({ record: { studentOrgName, studentDepartName } }) =>
-      allDepartShow(studentOrgName),
+      // <a-tooltip color="white" placement="topLeft" title={allDepartShow(studentOrgName)} >{allDepartShow(studentOrgName)}</a-tooltip>
+      <a-tooltip color="white" placement="topLeft" title={studentOrgName} >{studentDepartName}</a-tooltip>
   },
   {
     title: "所属小组",
@@ -522,10 +523,10 @@ const tablecolumns = ref([
     ellipsis: true,
   },
   {
-    title: "加入方式",
+    title: "报名方式",
     dataIndex: "source",
     key: "source",
-    width: "10%",
+    width: "60px",
     align: "center",
     customRender: ({ record: { source } }) =>
       // ({ 1: "快速添加", 2: "组织", 3: "受众", 4: "报名" }[source]),
@@ -535,8 +536,9 @@ const tablecolumns = ref([
         2: "手动加入",
         3: "手动加入",
         4: "导入",
-        5: "报名",
+        5: "自主报名",
         6: "导入",
+        8: "扫码报名",
       }[source]),
   },
   ...props.columns,
@@ -544,7 +546,8 @@ const tablecolumns = ref([
     title: "操作",
     dataIndex: "operation",
     key: "operation",
-    width: 260,
+    width: '120px',
+    fixed: "right",
     align: "center",
     slots: { customRender: "action" },
   },
@@ -559,7 +562,10 @@ function allDepartShow(a, b) {
         : a;
   let depart = b == "" || b == null || b == undefined ? (b = "") : b;
   let allname = org == "" && depart == "" ? "-" : org + depart;
-  return allname;
+  const parts = allname.split('/');
+  const reversedParts = parts.reverse();
+  const reversedStr = reversedParts.join('/');
+  return reversedStr;
 }
 
 const tableParam = ref({
@@ -858,7 +864,9 @@ const exportHomeWorkShow = () => {
     // message.success("导出作业成功");
     exportHomeWorkV.value = true;
     downloadUrl.value = res.data.data;
-  });
+  }).catch(err=>{
+    // message.error(err.data.msg)
+  })
 };
 // //导出作业
 // const exportHomeWork = () => {
diff --git a/src/views/courselibrary/CoursewareManage.vue b/src/views/courselibrary/CoursewareManage.vue
index f93ebafe..158ec038 100644
--- a/src/views/courselibrary/CoursewareManage.vue
+++ b/src/views/courselibrary/CoursewareManage.vue
@@ -10,6 +10,7 @@
               v-model:value="createName"
               style="width: 200px; height: 40px; border-radius: 8px"
               placeholder="请输入创建人"
+              @pressEnter="handleSearch1"
             />
           </div>
           <div class="pathnameInp">
@@ -17,6 +18,7 @@
               v-model:value="name"
               style="width: 200px; height: 40px; border-radius: 8px"
               placeholder="请输入名称"
+              @pressEnter="handleSearch1"
             />
           </div>
           <div class="pathnameInp">
@@ -24,6 +26,7 @@
               v-model:value="projectName"
               style="width: 200px; height: 40px; border-radius: 8px"
               placeholder="请输入所属项目"
+              @pressEnter="handleSearch1"
             />
           </div>
           <div class="select">
@@ -679,9 +682,8 @@
     </a-modal>
     <!-- 面授 课程管理查看详情 页面 -->
     <!--开课页面 -->
-    <a-modal
+    <a-drawer
       v-model:visible="stm_hs"
-      title="Title"
       @ok="stm_exit"
       :footer="null"
       :closable="false"
@@ -710,14 +712,15 @@
           <div class="st_main">
             <div class="stm_inputbtn">
               <a-input
-                v-model:value="kk_inputV1"
+                v-model:value="kk_inputV0"
                 style="
                   width: 270px;
                   height: 40px;
                   border-radius: 8px;
                   margin-right: 14px;
                 "
-                placeholder="请输入创建人"
+                placeholder="请输入开课名称"
+                @pressEnter="handleSearchTable"
               />
               <a-input
                 v-model:value="kk_inputV2"
@@ -727,7 +730,19 @@
                   border-radius: 8px;
                   margin-right: 14px;
                 "
-                placeholder="请输入教师名称"
+                placeholder="请输入授课教师姓名/工号"
+                @pressEnter="handleSearchTable"
+              />
+              <a-input
+                v-model:value="kk_inputV1"
+                style="
+                  width: 270px;
+                  height: 40px;
+                  border-radius: 8px;
+                  margin-right: 14px;
+                "
+                placeholder="请输入创建人姓名/工号"
+                @pressEnter="handleSearchTable"
               />
               <div class="select">
                 <!-- <a-date-picker
@@ -740,13 +755,8 @@
                   v-model:value="selectTime"
                   type="date"
                   style="width: 300px; margin-right: 14px"
-                  :placeholder="['  课程开始时间', '   课程结束时间']"
-                  :show-time="{
-                    defaultValue: [
-                      moment('00:00', 'HH:mm'),
-                      moment('23:59', 'HH:mm'),
-                    ],
-                  }"
+                  :placeholder="['  面授开始时间', '   面授结束时间']"
+                  format="YYYY/MM/DD"
                 />
               </div>
               <div class="btn btn1" @click="handleSearchTable">
@@ -761,6 +771,8 @@
                 <div class="search"></div>
                 <div class="btnText">重置</div>
               </div>
+            </div>
+            <div class="stm_inputbtn">
               <div class="btns" v-if="checkPer(permissions,createId)">
                 <div class="btn btn3" @click="createkk">
                   <div class="search"></div>
@@ -769,6 +781,7 @@
                   </div>
                 </div>
               </div>
+              
             </div>
             <!-- 无数据样式 -->
             <div class="notable" v-if="tableData6.length === 0">
@@ -788,12 +801,12 @@
             </div>
             <!-- 无数据样式 -->
             <!-- 有数据表格 -->
-            <div class="tableBox" v-else>
+            <div class="tableBox" v-else style="margin-left: 58px;">
               <a-table
                 :columns="columns6"
                 :data-source="tableData6"
                 :loading="tableCoursePlanLoading"
-                :scroll="{ x: 700, y: 800 }"
+                :scroll="{ x: 'max-content' }"
                 expandRowByClick="true"
                 @expand="expandTable"
                 :pagination="false"
@@ -801,9 +814,12 @@
                 <template #action="{ record, column }">
                     <div class="operation">
                       <div class="fb">
+                        <div class="jc" @click="qrcodeVisible(record, 3)" v-if="checkPer(permissions,createId)&&record.evalFlag">
+                          评估码
+                        </div>
                         <!--新加 签到 -->
                         <div class="jc" @click="qrcodeVisible(record, 2)" v-if="checkPer(permissions,createId)">
-                          签到
+                          签到码
                         </div>
 
                         <div
@@ -858,12 +874,17 @@
                         <div class="fb" style="margin-left: -20px">
                           <div class="jc">
                             更多
-                            <down-outlined />
+                            <DownOutlined style="color: #000"/>
                           </div>
                         </div>
                       </a-dropdown>
                     </div>
                 </template>
+                <template #teacherName="{record}">
+                  <div :title="moreLine(record.offteachers)">
+                    {{record.offteachers.map(item=>item.name).length > 3 ? record.offteachers.map(item=>item.name).slice(0,3).join(',')+'...':record.offteachers.map(item=>item.name).join(',') }}
+                  </div>
+                </template>
               </a-table>
               <div class="tableBox" style="margin-top: 50px">
                 <div class="pa">
@@ -884,7 +905,7 @@
           </div>
         </div>
       </div>
-    </a-modal>
+    </a-drawer>
     <!--开课页面 -->
     <!--新建开课页面 -->
     <a-modal
@@ -1074,14 +1095,13 @@
           </div>
           <div class="cstm_items">
             <div class="signbox">
-              <span style="margin-right: 3px">考勤设置：</span>
+              <span style="margin-right: 3px">签到时间</span>
             </div>
             <div style="display: flex; align-items: center">
-              <div style="margin-right: 10px">签到</div>
               <div
                 style="display: flex; align-items: center; margin-right: 20px"
               >
-                <span>开始前：</span>
+                <span style="color: #6d7584;margin-right:8px;">开始前</span>
                 <a-input-number
                   :min="0"
                   :max="999999"
@@ -1097,7 +1117,7 @@
                 <span style="color: #999999; margin-left: 8px">分钟</span>
               </div>
               <div style="display: flex; align-items: center">
-                <span>开始后：</span>
+                <span style="color: #6d7584;margin-right:8px;">开始后</span>
                 <a-input-number
                   :min="0"
                   :max="999999"
@@ -1114,6 +1134,16 @@
               </div>
             </div>
           </div>
+          <div class="cstm_items">
+            <div class="signbox">
+              <span style="margin-right: 3px">签到设置</span>
+            </div>
+            <div class="b_input">
+              <a-checkbox v-model:checked="xjkkradioV1" :disabled = "itemType!=3">
+                <span style="color: #6d7584">是否允许未报名的学员签到、评估</span>
+              </a-checkbox>
+            </div>
+          </div>
           <div class="cstm_items">
             <div class="signbox">
               <span style="margin-right: 3px">报名设置</span>
@@ -1124,18 +1154,25 @@
               </a-checkbox>
             </div>
           </div>
-
           <div class="cstm_items">
             <div class="signbox">
-              <span style="margin-right: 3px">签到设置</span>
+              <span style="margin-right: 3px">结业设置</span>
             </div>
             <div class="b_input">
-              <a-checkbox v-model:checked="xjkkradioV1" :disabled = "itemType!=3">
-                <span style="color: #6d7584">是否允许未报名的学员签到</span>
+              <a-checkbox v-model:checked="xjkkradioVEnd" :disabled = "itemType!=3">
+                <span style="color: #6d7584;margin-right:16px;">是否允许自动结业</span>
               </a-checkbox>
+              <span style="color: #6d7584" v-if="xjkkradioVEnd">面授时间结束后</span>
+              <a-input-number v-if="xjkkradioVEnd" :precision="0" :min="0"  v-model:value="xjkkradioVEndTime" style="
+                width: 60px;
+                height: 32px;
+                border-radius: 8px;
+                margin: 0 10px;"
+              />
+              <span v-if="xjkkradioVEnd" style="color: #6d7584">天</span>
             </div>
           </div>
-
+          
           <div class="cstm_items">
             <div class="signbox">
               <span style="margin-right: 3px">评估设置</span>
@@ -1292,8 +1329,7 @@
             <div class="stmmitems">
               <div class="stmm_i1">
                 <span style="margin-right: 52px">
-                  {{ currentPlanItem.name }}课程-第1期-
-                  {{ currentPlanItem.createTime }}
+                  {{ currentPlanItem.name }}课程-第1期
                 </span>
                 <span style="color: #ffb751"
                   >已开课
@@ -1305,7 +1341,7 @@
               </div>
               <div class="stmm_i2">
                 <span style="color: #999ba3">时间：</span>
-                <span>{{ currentPlanItem.endTime }}</span>
+                <span>{{currentPlanItem.beginTime}} ~ {{ currentPlanItem.endTime }}</span>
               </div>
               <div class="stmm_i3">
                 <span style="color: #999ba3">地点：</span>
@@ -1313,7 +1349,7 @@
               </div>
               <div class="stmm_i4">
                 <span style="color: #999ba3">授课教师：</span>
-                <!-- <span>{{ currentPlanItem.teacher }}</span> -->
+                <span>{{ currentPlanItem.offteachers.map(item=>item.name).join(',') }}</span>
               </div>
               <div class="stmm_i5">
                 <TableStudent
@@ -1324,6 +1360,7 @@
                   :visable="sm_hs"
                   :permissions="permissions"
                   :isgetStudent="isgetStudent"
+                  ref="tableStudentChange"
                 >
                   <!-- <template #extension="{ data: { record } }">
                     <a-button
@@ -1515,17 +1552,13 @@
                   <div class="bc_box">
                     <div class="ol_checkbox">
                       <a-radio
-                        v-model:checked="checked"
                         :value="1"
-                        @click="clear_jyradioV1"
                         >结业
                       </a-radio>
                     </div>
                     <div class="ol_checkbox">
                       <a-radio
-                        v-model:checked="checked"
                         :value="2"
-                        @click="clear_jyradioV1"
                         >不结业
                       </a-radio>
                     </div>
@@ -1742,7 +1775,7 @@
     v-model:codevisible="codevisible"
     :codeInfo="codeInfo"
     :index="codeIndex"
-    :type="codeType == 1 ? '课程二维码' : codeType == 2 ? '签到二维码' : ''"
+    :type="codeType == 1 ? '课程二维码' : codeType == 2 ? '签到二维码' : '评估二维码'"
   />
   <!-- 二维码弹窗 -->
 </template>
@@ -1805,7 +1838,7 @@ import ProjectManager from "@/components/project/ProjectManagerNewTeacher";
 import SeeModal from "./components/seeModal.vue";
 import CourseModal from "./courseModal.vue";
 import * as moment from "moment";
-import TwoDimensionalCode from "../../components/TwoDimensionalCode.vue";
+import TwoDimensionalCode from "../../components/TwoDimensionalCodeNew.vue";
 import { codeUrl, toDate } from "@/api/method";
 import { queryWorkDetailById } from "@/api/indexWork";
 import { queryExaminationDetailById } from "@/api/indexExam";
@@ -1819,10 +1852,15 @@ import DropDown from "@/components/common/DropDown";
 import { checkPer, checkOwner } from "@/utils/utils";
 import dayjs from "dayjs";
 import {duration} from "moment";
-import { DeleteOutlined } from '@ant-design/icons-vue';
+import { DeleteOutlined,DownOutlined } from '@ant-design/icons-vue';
 
 //列表表格
-
+const moreLine = (item) => {
+  item.map(val => {
+    return (val.line = val.teacherName + "  权重  " + val.weight + '%')
+  })
+  return item.map(i => i.line).join('\n')
+}
 //列表操作在线面授管理
 const columns2 = [
   {
@@ -1964,82 +2002,34 @@ const columns6 = [
   // },
   // },
   {
-    title: "课程名称",
+    title: "开课名称",
     dataIndex: "organization",
     key: "organization",
     width: "15%",
     align: "center",
-    ellipsis: true,
+    customCell:() => {return {style: {maxWidth: '200px',overflow: 'hidden',whiteSpace: 'nowrap',textOverflow:'ellipsis',cursor:'pointer',padding:'0px 10px'}}},
     customRender: ({ text }) => {
-      return text ? text : "-";
+      return <a-tooltip color="white" placement="bottomLeft" title = {text} >{text ? text : "-"}</a-tooltip>
     },
   },
   {
-    title: "场地",
-    dataIndex: "address",
-    key: "saddress",
-    width: "15%",
-    align: "center",
-    ellipsis: true,
-    customRender: ({ text }) => {
-      return text ? text : "-";
-    },
-  },
-  {
-    title: "教师名称",
+    title: "授课教师",
     dataIndex: "teacher",
     key: "teacher",
-    width: "8%",
+    width: "30%",
     align: "center",
     ellipsis: true,
-    customRender: ({ record }) => {
-      // const teachers = record.offteachers;
-      // return teachers.map((teacher, index) => {
-      //   // 如果需要显示为列表形式
-      //   return (
-      //     <div key={index}>
-      //       {teacher.teacherName}
-      //       {index !== teachers.length - 1 && ', '}
-      //     </div>
-      //   );
-      // });
-      return record.offteachers.map(item=>item.teacherName).join(',')
-    }
+    slots: { customRender: "teacherName" },
   },
-
   {
-    title: "开始时间",
+    title: "面授时间",
     dataIndex: "starttime",
     key: "starttime",
-    width: "12%",
+    width: "40%",
     ellipsis: true,
     align: "center",
-    customRender: ({ text }) => {
-      // return text ? getdateToTime(text * 1000) : "-";
-      return text ? text : "-";
-    },
-  },
-  {
-    title: "创建时间",
-    dataIndex: "createtime",
-    key: "createtime",
-    width: "12%",
-    ellipsis: true,
-    align: "center",
-    customRender: ({ text }) => {
-      // return text ? getdateToTime(text * 1000) : "-";
-      return text ? text : "-";
-    },
-  },
-  {
-    title: "创建人",
-    dataIndex: "createName",
-    key: "createName",
-    width: "8%",
-    align: "center",
-    ellipsis: true,
-    customRender: ({ text }) => {
-      return text ? text : "-";
+    customRender: ( text ) => {
+      return text.record.beginTime + ' ~ ' + text.record.endTime
     },
   },
   {
@@ -2049,19 +2039,94 @@ const columns6 = [
     width: 100,
     align: "center",
     ellipsis: true,
+    customRender: ( text ) => {
+      return(
+      <div style="display:flex;justify-content:center;align-items:center;">
+        <span>{text.record.studentCnt || '0'}</span>
+        <div class="daochu" onClick={()=>downStudent(text.record)} title="导出学员信息"></div>
+      </div>
+      )
+    },
+  },
+  {
+    title: "评分",
+    dataIndex: "studentCnt",
+    key: "studentCnt",
+    width: 100,
+    align: "center",
+    ellipsis: true,
+    customRender: ( text ) => {
+      return(
+        text.record && text.record.courseScore != -1 ?
+          <div style="display:flex;justify-content:center;align-items:center;">
+            <span>{(text.record.courseScore.toFixed(2) || '0.00')}</span>
+            <div class="daochu" onClick={()=>downPin(text.record)} title="导出评估信息"></div>
+          </div>
+          : '-'
+      )
+    },
+  },
+  {
+    title: "时长",
+    dataIndex: "duration",
+    key: "duration",
+    width: "12%",
+    ellipsis: true,
+    align: "center",
     customRender: ({ text }) => {
-      return text ? text : "0";
+      return text ? text : "-";
+    },
+  },
+  {
+    title: "创建人",
+    dataIndex: "createName",
+    key: "createName",
+    width: "10%",
+    align: "center",
+    ellipsis: true,
+    customRender: ( text ) => {
+      return <a-tooltip color="white" placement="bottom" title = {text.record.createName+text.record.createUserNo} >{text.record.createName}</a-tooltip>
+    },
+  },
+  {
+    title: "地点",
+    dataIndex: "address",
+    key: "saddress",
+    width: "30%",
+    align: "center",
+    customCell:() => {return {style: {maxWidth: '200px',minWidth: '100px',overflow: 'hidden',whiteSpace: 'nowrap',textOverflow:'ellipsis',cursor:'pointer',padding:'0px 10px'}}},
+    customRender: ( {text} ) => {
+      return <a-tooltip color="white" placement="bottomLeft" title = {text} >{text ? text : "-"}</a-tooltip>
     },
   },
   {
     title: "操作",
-    width: 200,
+    width: 300,
     dataIndex: "operation",
     key: "operation",
     align: "center",
+    fixed: "right",
     slots: { customRender: "action" },
   },
 ];
+const downStudent = (val) => {
+  if (val.id != undefined) {
+    window.open(
+      `${
+        process.env.VUE_APP_BASE_API
+      }/admin/student/exportTaskStudent?type=${3}&pid=${val.id}&thirdType=2`
+    );
+  }
+}
+const downPin = (val) => {
+  if (val.id != undefined) {
+    window.open(
+      `${
+        process.env.VUE_APP_BASE_API
+      }/admin/assessment/manage/exportCoursePlanAssessmentMessage?type=3&pid=${val.id}&courseId=${val.assessmentId}&taskId=${val.id}&taskType=11`
+    );
+  }
+}
 //开课学员管理
 const columns7 = [
   ////  {
@@ -2244,15 +2309,19 @@ export default defineComponent({
     // },
     addOnlineCourse,
     TwoDimensionalCode,
-    DeleteOutlined
+    DeleteOutlined,
+    DownOutlined
   },
   setup() {
     const CourseModalRef = ref(null);
     const store = useStore();
     const sysTypeOptions = computed(() => store.state.content_type);
-    const durationText = computed(() => state.xjkkinputV3?.length?dayjs(state.xjkkinputV3[1]).diff(dayjs(state.xjkkinputV3[0]),'minute'):'请输入持续时间');
+    const durationText = computed(() => state.xjkkinputV3?.length==2?dayjs(state.xjkkinputV3[1]).diff(dayjs(state.xjkkinputV3[0]),'minute')|| '请输入持续时间':'请输入持续时间');
     
     const state = reactive({
+      tableStudentChange: null,
+      isAssessmentId: null,
+      isHomeWorkId: null,
       tableCoursePlanLoading: false,
       permissions:null,
       createId:null,
@@ -2286,7 +2355,7 @@ export default defineComponent({
           align: "left",
           customCell  :() => {return {style: {maxWidth: '200px',overflow: 'hidden',whiteSpace: 'nowrap',textOverflow:'ellipsis',cursor:'pointer'}}},
           customRender: ({ text }) => {
-            return <a-tooltip placement="topLeft" title = {text} >{text ? text : "-"}</a-tooltip>
+            return <a-tooltip color="white" placement="topLeft" title = {text} >{text ? text : "-"}</a-tooltip>
           },
         },
         {
@@ -2683,6 +2752,8 @@ export default defineComponent({
       kkinputV2: "",
       //新建开课
       xjkkradioV1: false,
+      xjkkradioVEnd: false,
+      xjkkradioVEndTime: null,
       completeType: "",
       xjkkinputV1: "",
       onceName: "",
@@ -2700,7 +2771,7 @@ export default defineComponent({
       scoreId: null, //录入成绩id
       isgetStudent: false, //是否重新获取学员
       //结业
-      jyradioV1: "",
+      jyradioV1: 1,
 
       imageUrl: "",
       imgList: [],
@@ -2715,6 +2786,7 @@ export default defineComponent({
       pageSize222: 10,
       currentPage222: 1,
       tableDataTotal222: 0,
+      kk_inputV0: '',
       kk_inputV1: "",
       kk_inputV2: "",
       selectTime: "",
@@ -2902,6 +2974,10 @@ export default defineComponent({
         watch(durationText,(val)=>{
           nums.value++
           if(nums.value>1){
+            if(val == '请输入持续时间'){
+              state.duration = null;
+              return
+            }
             state.duration = val;
           }
     })
@@ -3589,7 +3665,8 @@ function onFocusEnd(){
         pageNo: type?state.currentPage2:state.currentPage222,
         pageSize: state.pageSize222,
         createName: state.kk_inputV1,
-        // teacher: state.kk_inputV2,
+        teacher: state.kk_inputV2,
+        name: state.kk_inputV0,
         beginTime: beginTime,
         endTime: endTime,
         offcourseId: state.offcourseId,
@@ -3847,7 +3924,7 @@ function onFocusEnd(){
     const stm_exit = () => {
       state.stm_hs = false;
       handleCancelStu();
-      handleRestTable();
+      // handleRestTable();
     };
     const createkk = () => {
       state.xjkkinputV1 = state.newCourseName
@@ -3870,6 +3947,8 @@ function onFocusEnd(){
 
       state.kk_eidt = false;
       state.xjkkradioV1 = false;
+      state.xjkkradioVEnd = false;
+      state.xjkkradioVEndTime = null;
       state.completeType = "";
       // state.xjkkinputV1 = "";
       state.onceName = "";
@@ -3931,11 +4010,13 @@ function onFocusEnd(){
         completeType: type,
         endTime: endTime,
         evalFlag: Number(state.assessmentId) > 0 && state.checked4 ? 1 : 0,
-        assessmentId: Number(state.assessmentId),
+        assessmentId: state.checked4==1?Number(state.assessmentId):0,
         testId: state.examInfo.examinationName ? state.EditTestId : null,
         homeWorkId: state.EditWorkId,
         name: state.xjkkinputV1,
         signFlag: state.xjkkradioV1 ? 1 : 0, //是否允许未报名的签到:1是0否
+        autoGraduateEnabled: state.xjkkradioVEnd ? 1 : 0,
+        autoGraduateDays: state.xjkkradioVEndTime,
         // signWordFlag: state.xjkkradioV1 === 1 ? 1 : 0, //签到是否需要口令:1是0否
         // teacherId: state.member.value,
         // teacher: state.member.name,
@@ -3978,6 +4059,16 @@ function onFocusEnd(){
         message.error('权重值不能为0%')
         return
       }
+      if(state.xjkkradioVEnd && (state.xjkkradioVEndTime==null||state.xjkkradioVEndTime==''||state.xjkkradioVEndTime<=0)){
+        message.error('请填写结业时间')
+        return
+      }
+      if(state.checked4 && (!state.assessmentId || state.assessmentId == '0' || state.assessmentId == 'null')){
+        return message.error('请选择评估');
+      }
+      if(!state.xjkkradioVEnd){
+        state.xjkkradioVEndTime = null
+      }
       console.log(postData,'传输的数据')
       // if(!postData.duration){
       //   return message.error("请输入持续时间");
@@ -4049,10 +4140,14 @@ function onFocusEnd(){
       state.onceName = item.name;
       state.beforeValue = item.beforeStart; //考勤 开始前
       state.afterStartValue = item.afterStart; //考勤 开始后
+      state.xjkkradioVEndTime = item.autoGraduateDays;
       if (item.signFlag === 1) {
         //是否允许未报名的签到:1是0否
         state.xjkkradioV1 = true;
       }
+      if(item.autoGraduateEnabled === 1){
+        state.xjkkradioVEnd = true;
+      }
       // state.member = { value: item.teacherId, name: item.teacher };
       state.offteachers = [...item.offteachers]
       state.cstm_hs = true;
@@ -4062,43 +4157,44 @@ function onFocusEnd(){
       console.log("itm", itm);
       //新加
       state.stuColumns = [
-        {
-          title: "岗位",
-          width: "8%",
-          dataIndex: "studentJobName",
-          key: "7",
-          align: "center",
-          customRender: (text) => {
-            return (
-              <div class="racona">
-                <span>
-                  {text && text.record.studentJobName
-                    ? text.record.studentJobName
-                    : "-"}
-                </span>
-              </div>
-            );
-          },
-        },
-        {
-          title: "Band",
-          width: "8%",
-          dataIndex: "studentBandDesc",
-          key: "7",
-          align: "center",
-          customRender: (text) => {
-            return (
-              <div class="racona">
-                <span>
-                  {text.record.studentBandDesc ? text.record.studentBandDesc : "-"}
-                </span>
-              </div>
-            );
-          },
-        },
+        // {
+        //   title: "岗位",
+        //   width: "100px",
+        //   dataIndex: "studentJobName",
+        //   key: "7",
+        //   align: "center",
+        //   customRender: (text) => {
+        //     return (
+        //       <div class="racona">
+        //         <span>
+        //           {text && text.record.studentJobName
+        //             ? text.record.studentJobName
+        //             : "-"}
+        //         </span>
+        //       </div>
+        //     );
+        //   },
+        // },
+        // {
+        //   title: "Band",
+        //   width: "80px",
+        //   dataIndex: "studentBandDesc",
+        //   key: "7",
+        //   align: "center",
+        //   ellipsis: true,
+        //   customRender: (text) => {
+        //     return (
+        //       <div class="racona">
+        //         <span>
+        //           {text.record.studentBandDesc ? text.record.studentBandDesc : "-"}
+        //         </span>
+        //       </div>
+        //     );
+        //   },
+        // },
         {
           title: "报名状态",
-          width: "8%",
+          width: "60px",
           dataIndex: "status",
           key: "5",
           align: "center",
@@ -4116,7 +4212,7 @@ function onFocusEnd(){
 
         {
           title: "签到状态",
-          width: "8%",
+          width: "60px",
           dataIndex: "signstatus",
           key: "7",
           align: "center",
@@ -4125,19 +4221,20 @@ function onFocusEnd(){
         },
         {
           title: "评估状态",
-          width: "8%",
+          width: "60px",
           dataIndex: "evastatus",
           key: "8",
           align: "center",
           customRender: ({ record }) =>
-            record.assessmentStatus?"已评估" : "未评估",
+            state.isAssessmentId&&state.isAssessmentId!='0' ? record.assessmentStatus?"已评估" : "未评估":'-',
         },
         {
           title: "评分",
-          width: "8%",
+          width: "60px",
           dataIndex: "studentScore",
           key: "8",
           align: "center",
+          ellipsis: true,
           customRender: ({ record }) => {
             return (
               <div class="racona">
@@ -4163,61 +4260,88 @@ function onFocusEnd(){
             // }
           },
         },
+        // {
+        //   title: "作业成绩",
+        //   width: "8%",
+        //   dataIndex: "workScore",
+        //   key: "7",
+        //   align: "center",
+        //   customRender: ({ record }) => {
+        //     return (
+        //       <div class="racona">
+        //         {record.workStatus? record.workScore?<span>{record.workScore || '-'}</span>:
+        //             <span style={{ color: "#4EA6FF", cursor: "pointer" }} onClick={() => handlJoinStu(record)}>
+        //               成绩录入
+        //             </span>
+        //           : <span>-</span>
+        //         }
+        //       </div>
+        //     );
+        //     // switch (String(record.status)) {
+        //     //   case "0":
+        //     //     return (
+        //     //       <span
+        //     //         style={{ color: "#4EA6FF", cursor: "pointer" }}
+        //     //         onClick={() => {
+        //     //           handlJoinStu(record);
+        //     //         }}
+        //     //       >
+        //     //         成绩录入
+        //     //       </span>
+        //     //     );
+        //     //   case "1":
+        //     //     return "-";
+        //     //   case "2":
+        //     //     return "-";
+        //     // }
+        //   },
+        // },
         {
-          title: "作业成绩",
-          width: "8%",
-          dataIndex: "workScore",
-          key: "7",
+          title: "作业状态",
+          width: "60px",
+          dataIndex: "workStatus",
+          key: "5",
           align: "center",
           customRender: ({ record }) => {
-            return (
-              <div class="racona">
-                {record.workStatus? record.workScore?<span>{record.workScore || '-'}</span>:
-                    <span style={{ color: "#4EA6FF", cursor: "pointer" }} onClick={() => handlJoinStu(record)}>
-                      成绩录入
-                    </span>
-                  : <span>-</span>
-                }
-              </div>
-            );
-            // switch (String(record.status)) {
+            // switch (String(record.workStatus)) {
+            //   case "null":
+            //     return "未提交";
             //   case "0":
-            //     return (
-            //       <span
-            //         style={{ color: "#4EA6FF", cursor: "pointer" }}
-            //         onClick={() => {
-            //           handlJoinStu(record);
-            //         }}
-            //       >
-            //         成绩录入
-            //       </span>
-            //     );
+            //     return "未提交";
             //   case "1":
-            //     return "-";
+            //     return "已提交";
             //   case "2":
-            //     return "-";
+            //     return "未提交";
             // }
+            const status = String(record.workStatus);
+            if (state.isHomeWorkId) {
+                return ["null", "0", "2"].includes(status) ? "未提交" : "已提交";
+            } else {
+                return '-';
+            }
           },
         },
         {
           title: "考试成绩",
-          width: "8%",
+          width: "60px",
           dataIndex: "examinationScore",
           key: "8",
           align: "center",
+          customRender: ({ record }) =>
+            record.examinationScore ? record.examinationScore : "-",
+          
         },
         {
           title: "结业状态",
-          width: "15%",
+          width: "60px",
           dataIndex: "completionStatus",
           key: "8",
           align: "center",
           customRender: ({ record }) => {
             return (
               <div>
-                {record.finishStatus == 1 &&
-                record.workScore != -2 &&
-                record.signStatus == 1 ? (
+                {
+                record.signStatus == 1 && record.completionStatus != 1 && record.completionStatus != 2 ? (
                   <div
                     style={{ color: "#4EA6FF", cursor: "pointer" }}
                     onClick={() => {
@@ -4228,6 +4352,8 @@ function onFocusEnd(){
                   </div>
                 ) : record.completionStatus == 1 ? (
                   <div>已结业</div>
+                ) : record.completionStatus == 2 ?(
+                  <div>不结业</div>
                 ) : (
                   <div>-</div>
                 )}
@@ -4257,6 +4383,8 @@ function onFocusEnd(){
 
       state.currentPlanItem = itm;
       state.newCourseName = itm.name;
+      state.isAssessmentId = itm.assessmentId;
+      state.isHomeWorkId = itm.homeWorkId;
       console.log(89877766666);
       console.log(state.currentPlanItem);
 
@@ -4310,6 +4438,7 @@ function onFocusEnd(){
     const graduate_exit = () => {
       state.graduate_hs = false;
       state.addLoading = false;
+      state.jyradioV1 = 1;
     };
     const agreereject_exit = () => {
       state.agreereject_hs = false;
@@ -4329,6 +4458,7 @@ function onFocusEnd(){
       state.rg_hs = false;
       state.graduate_hs = false;
       state.addLoading = false;
+      state.jyradioV1 = 1;
     };
     const handleRejectExit = (id, index, record) => {
       dialog({
@@ -4381,13 +4511,14 @@ function onFocusEnd(){
         // console.log("state.studentItem.id", state.studentItem.id);
         api1
           .batchUpdateStatus({
-            completionStatus: 1,
+            completionStatus: state.jyradioV1,
             ids: [state.studentItem?.id],
             // status: 1,
           })
           .then((res) => {
             if (res.data.code === 200) {
-              getTableDate2();
+              // getTableDate2();
+              state.tableStudentChange.getStuList()
               delete_exit1();
             }
           });
@@ -4790,7 +4921,8 @@ function onFocusEnd(){
       state.offcourseId = item.id;
       state.newCourseName = item.name;
       state.permissions = item.permissions;
-      getTableDate3(1);
+      // getTableDate3(1);
+      handleRestTable()
       state.stm_hs = true;
     };
 
@@ -4821,6 +4953,7 @@ function onFocusEnd(){
       getTableDate3();
     };
     const handleRestTable = () => {
+      state.kk_inputV0 = '';
       state.kk_inputV1 = "";
       state.kk_inputV2 = "";
       state.selectTime = "";
@@ -5134,21 +5267,22 @@ function onFocusEnd(){
     const qrcodeVisible = (record, type) => {
       // `${location.protocol}//${location.host}${import.meta.env.VUE_APP_BASE_API}/stu/project/redirectDetail?courseId=${record.id}`
       state.codevisible = true;
-      let teacherNames = record.offteachers?.filter(teacher => teacher.teacherName !== null).map(teacher => teacher.teacherName);
+      let teacherNames = record.offteachers?.filter(teacher => teacher.name !== null).map(teacher => teacher.name);
       state.codeInfo = {
-        title: type == 1 ? "【课程】二维码" : "【签到】二维码",
-        name: record.name ? record.name+'签到' : "",
-        teacherName: teacherNames.length > 0 ? teacherNames.join(' ') : "",
+        title: type == 1 ? "【课程】二维码" : type == 2 ? "【签到】二维码" : "【评估】二维码",
+        name: record.name,
+        teacherName: teacherNames.length > 3 ? teacherNames.slice(0,3).join(',')+'...' : teacherNames.join(','),
         url:
           type == 1
             ? process.env.VUE_APP_BASE_API +
               `/stu/project/redirectDetail?courseId=${record.id}`
-            : process.env.VUE_APP_BASE_API +
+            : type == 2 ? process.env.VUE_APP_BASE_API +
               `/admin/student/studentSign?taskId=${
                 record.id
               }&taskType=${2}&type=${3}&openCourseId=${
                 record.id
-              }`,
+              }` : `${location.protocol}//${location.host}/student-h5/investigatpage?id=${record.id}&type=3&infoId=${record.id}&courseId=${record.assessmentId}&chapterOrStageId=0&level=${record.name}`,
+        titleTeacherName: moreLine(record.offteachers),
       };
       console.log("codeInfo", state.codeInfo, record);
       state.codeIndex = 0;
@@ -5193,6 +5327,7 @@ function onFocusEnd(){
       handleEdit,
       handleDelete,
       changevalue,
+      moreLine,
       columns2,
       columns4,
       columns6,
@@ -5308,12 +5443,28 @@ function onFocusEnd(){
       inputWeightChange,
       totalWeightSum,
       inputAdd,
-      inputRemove
+      inputRemove,
+      downStudent,
+      downPin
     };
   },
 });
 </script>
 <style lang="scss">
+.ant-tooltip-inner{
+  color: #000 !important;
+}
+.daochu {
+  width: 14px;
+  height: 14px;
+  background: url("../../assets/images/coursewareManage/export.png") no-repeat;
+  background-size: 100%;
+  margin-left: 8px;
+  cursor: pointer;
+}
+.ant-drawer-body{
+  padding: 0;
+}
 .ant-table-cell-fix-right {
   width: 250px !important;
 }
@@ -7054,387 +7205,381 @@ function onFocusEnd(){
 }
 
 .schtimeModal {
-  .ant-modal {
-    .ant-modal-content {
-      // width:1358px !important;
-      .ant-modal-body {
-        .modalHeader {
+  .modalHeader {
+    display: flex;
+    align-items: center;
+    justify-content: space-between;
+    padding-top: 10px;
+    background: linear-gradient(180deg, rgba(103, 64, 255, 0.2) 0%, rgba(166, 168, 255, 0) 100%) !important;
+    .headerLeft {
+      margin-left: 27px;
+      display: flex;
+      align-items: center;
+
+      .headerLeftText {
+        font-size: 16px;
+        font-weight: 400;
+        color: #000000;
+        line-height: 36px;
+      }
+    }
+  }
+
+  .schooltime {
+    min-width: 1000px;
+    background: #ffffff;
+
+    .st_main {
+      width: 100%;
+
+      .tableBox {
+        margin: 20px 38px 30px;
+
+        th {
+          background-color: #eff4fc !important;
+          text-align: center !important;
+        }
+
+        .ant-table-tbody
+          > tr:hover:not(.ant-table-expanded-row):not(
+            .ant-table-row-selected
+          )
+          > td {
+          background: #f6f9fd;
+        }
+
+        .operation {
           display: flex;
-          align-items: center;
-          justify-content: space-between;
+          justify-content: right;
 
-          .headerLeft {
-            margin-left: 27px;
+          .fb {
             display: flex;
-            align-items: center;
+            margin-right: 20px;
 
-            .headerLeftText {
-              font-size: 16px;
-              font-weight: 400;
-              color: #000000;
-              line-height: 36px;
+            .jc {
+              color: #4ea6ff;
+              font-size: 14px;
+              margin-left: 20px;
+              white-space: nowrap;
+              cursor: pointer;
             }
           }
         }
 
-        .schooltime {
-          min-width: 1000px;
+        .ynuse {
+          display: flex;
+          justify-content: center;
+          align-items: center;
+
+          .use {
+            cursor: pointer;
+          }
+        }
+      }
+
+      .stm_inputbtn {
+        display: flex;
+        width: 90%;
+        margin: 20px auto;
+
+        .stm_btn {
+          width: 100px;
+          height: 40px;
+          margin-right: 14px;
           background: #ffffff;
+          border: 1px solid #4ea6ff;
+          border-radius: 8px;
+          display: flex;
+          align-items: center;
+          justify-content: center;
+          flex-shrink: 0;
+          cursor: pointer;
 
-          .st_main {
-            width: 100%;
+          .btnText {
+            color: #4ea6ff;
+            font-size: 14px;
+            font-weight: 400;
+            line-height: 40px;
+          }
+        }
 
-            .tableBox {
-              margin: 20px 38px 30px;
+        .btn {
+          padding: 0px 26px 0px 26px;
+          height: 38px;
+          background: #4ea6ff;
+          border-radius: 8px;
+          //border: 1px solid rgba(64, 158, 255, 1);
+          display: flex;
+          align-items: center;
+          justify-content: center;
+          margin-right: 14px;
+          flex-shrink: 0;
+          cursor: pointer;
 
-              th {
-                background-color: #eff4fc !important;
-                text-align: center !important;
-              }
+          .search {
+            background-size: 100%;
+          }
 
-              .ant-table-tbody
-                > tr:hover:not(.ant-table-expanded-row):not(
-                  .ant-table-row-selected
-                )
-                > td {
-                background: #f6f9fd;
-              }
+          .btnText {
+            font-size: 14px;
+            font-weight: 400;
+            color: #ffffff;
+            line-height: 36px;
+            margin-left: 5px;
+          }
+        }
 
-              .operation {
-                display: flex;
-                justify-content: right;
+        .btnn {
+          padding: 0px 26px 0px 26px;
+          height: 38px;
+          background: #4ea6ff;
+          border-radius: 8px;
+          border: 1px solid rgba(64, 158, 255, 1);
+          color: #fff;
+          display: flex;
+          align-items: center;
+          justify-content: center;
+          margin-right: 14px;
+          flex-shrink: 0;
+          cursor: pointer;
 
-                .fb {
-                  display: flex;
-                  margin-right: 20px;
+          .search {
+            background-size: 100%;
+          }
 
-                  .jc {
-                    color: #4ea6ff;
-                    font-size: 14px;
-                    margin-left: 20px;
-                    white-space: nowrap;
-                    cursor: pointer;
-                  }
-                }
-              }
+          .btnText {
+            font-size: 14px;
+            font-weight: 400;
+            color: #fff;
+            line-height: 36px;
+            margin-left: 5px;
+          }
+        }
 
-              .ynuse {
-                display: flex;
-                justify-content: center;
-                align-items: center;
+        .btn1 {
+          .search {
+            width: 15px;
+            height: 17px;
+            background-image: url("../../assets/images/courseManage/search0.png");
+          }
+        }
 
-                .use {
-                  cursor: pointer;
-                }
-              }
+        .btn2 {
+          .search {
+            width: 16px;
+            height: 18px;
+            background-image: url("../../assets/images/courseManage/reset0.png");
+          }
+        }
+
+        .btn1 {
+          .search {
+            background-image: url("../../assets/images/courseManage/search0.png");
+          }
+
+          .btnText {
+            color: #ffffff;
+          }
+        }
+
+        .btns {
+          display: flex;
+
+          // flex-wrap: wrap;
+          .btn {
+            padding: 0px 21px 0px 21px;
+            height: 38px;
+            background: #4ea6ff;
+            border-radius: 8px;
+            //border: 1px solid rgba(64, 158, 255, 1);
+            display: flex;
+            align-items: center;
+            justify-content: center;
+            margin-right: 14px;
+            flex-shrink: 0;
+            cursor: pointer;
+
+            .search {
+              background-size: 100%;
             }
 
-            .stm_inputbtn {
-              display: flex;
-              width: 90%;
-              margin: 20px auto;
-
-              .stm_btn {
-                width: 100px;
-                height: 40px;
-                margin-right: 14px;
-                background: #ffffff;
-                border: 1px solid #4ea6ff;
-                border-radius: 8px;
-                display: flex;
-                align-items: center;
-                justify-content: center;
-                flex-shrink: 0;
-                cursor: pointer;
-
-                .btnText {
-                  color: #4ea6ff;
-                  font-size: 14px;
-                  font-weight: 400;
-                  line-height: 40px;
-                }
-              }
-
-              .btn {
-                padding: 0px 26px 0px 26px;
-                height: 38px;
-                background: #4ea6ff;
-                border-radius: 8px;
-                //border: 1px solid rgba(64, 158, 255, 1);
-                display: flex;
-                align-items: center;
-                justify-content: center;
-                margin-right: 14px;
-                flex-shrink: 0;
-                cursor: pointer;
-
-                .search {
-                  background-size: 100%;
-                }
-
-                .btnText {
-                  font-size: 14px;
-                  font-weight: 400;
-                  color: #ffffff;
-                  line-height: 36px;
-                  margin-left: 5px;
-                }
-              }
-
-              .btnn {
-                padding: 0px 26px 0px 26px;
-                height: 38px;
-                background: #4ea6ff;
-                border-radius: 8px;
-                border: 1px solid rgba(64, 158, 255, 1);
-                color: #fff;
-                display: flex;
-                align-items: center;
-                justify-content: center;
-                margin-right: 14px;
-                flex-shrink: 0;
-                cursor: pointer;
-
-                .search {
-                  background-size: 100%;
-                }
-
-                .btnText {
-                  font-size: 14px;
-                  font-weight: 400;
-                  color: #fff;
-                  line-height: 36px;
-                  margin-left: 5px;
-                }
-              }
-
-              .btn1 {
-                .search {
-                  width: 15px;
-                  height: 17px;
-                  background-image: url("../../assets/images/courseManage/search0.png");
-                }
-              }
-
-              .btn2 {
-                .search {
-                  width: 16px;
-                  height: 18px;
-                  background-image: url("../../assets/images/courseManage/reset0.png");
-                }
-              }
-
-              .btn1 {
-                .search {
-                  background-image: url("../../assets/images/courseManage/search0.png");
-                }
-
-                .btnText {
-                  color: #ffffff;
-                }
-              }
-
-              .btns {
-                display: flex;
-
-                // flex-wrap: wrap;
-                .btn {
-                  padding: 0px 21px 0px 21px;
-                  height: 38px;
-                  background: #4ea6ff;
-                  border-radius: 8px;
-                  //border: 1px solid rgba(64, 158, 255, 1);
-                  display: flex;
-                  align-items: center;
-                  justify-content: center;
-                  margin-right: 14px;
-                  flex-shrink: 0;
-                  cursor: pointer;
-
-                  .search {
-                    background-size: 100%;
-                  }
-
-                  .btnText {
-                    font-size: 14px;
-                    font-weight: 400;
-                    color: #ffffff;
-                    line-height: 36px;
-                    margin-left: 5px;
-                  }
-
-                  .btn2 {
-                    margin-right: 0px;
-
-                    .img2 {
-                      width: 17px;
-                      height: 18px;
-                      background-image: url(../../assets/images/coursewareManage/export1.png);
-                    }
-                  }
-                }
-
-                .btn3 {
-                  .search {
-                    width: 17px;
-                    height: 18px;
-                    background-image: url("../../assets/images/courseManage/add0.png");
-                  }
-
-                  .btnText {
-                    color: #ffffff;
-                  }
-                }
-              }
+            .btnText {
+              font-size: 14px;
+              font-weight: 400;
+              color: #ffffff;
+              line-height: 36px;
+              margin-left: 5px;
             }
 
-            /**
-            .btn3 {
-              width: 130px;
-              height: 40px;
-              border: 1px solid #4ea6ff;
-              background-color: #4ea6ff;
-              border-radius: 8px;
-              display: flex;
-              align-items: center;
-              justify-content: center;
-              flex-shrink: 0;
+            .btn2 {
+              margin-right: 0px;
+
+              .img2 {
+                width: 17px;
+                height: 18px;
+                background-image: url(../../assets/images/coursewareManage/export1.png);
+              }
+            }
+          }
+
+          .btn3 {
+            .search {
+              width: 17px;
+              height: 18px;
+              background-image: url("../../assets/images/courseManage/add0.png");
+            }
+
+            .btnText {
+              color: #ffffff;
+            }
+          }
+        }
+      }
+
+      /**
+      .btn3 {
+        width: 130px;
+        height: 40px;
+        border: 1px solid #4ea6ff;
+        background-color: #4ea6ff;
+        border-radius: 8px;
+        display: flex;
+        align-items: center;
+        justify-content: center;
+        flex-shrink: 0;
+        cursor: pointer;
+
+        .btnText {
+          font-size: 14px;
+          font-weight: 400;
+          line-height: 40px;
+        }
+
+        .btn3 {
+          .add {
+            width: 17px;
+            height: 18px;
+            background-image: url("@/assets/images/coursewareManage/add0.png");
+            background-size: 100% 100%;
+            margin-right: 6px;
+          }
+        }
+      } */
+
+      .notable {
+        width: 100%;
+        height: 100%;
+
+        .notablebox {
+          width: 412px;
+          height: 212px;
+          background: linear-gradient(180deg, #fef3dd 0%, #fffaf0 100%);
+          border-radius: 10px;
+          display: flex;
+          justify-content: center;
+          text-align: center;
+          margin: 77px auto 109px auto;
+          position: relative;
+
+          .smallleft {
+            position: absolute;
+            top: 18px;
+            left: 0px;
+            width: 8px;
+            height: 21px;
+            border-radius: 0px 4px 4px 0px;
+            background-color: #ffb64e;
+          }
+
+          .smallright {
+            position: absolute;
+            bottom: 18px;
+            right: 0px;
+            width: 8px;
+            height: 21px;
+            border-radius: 4px 0px 0px 4px;
+            background-color: #ffb64e;
+          }
+
+          .boxbody {
+            .boximg {
+              width: 72px;
+              height: 72px;
+              margin: 32px auto 20px auto;
+              background-image: url(@/assets/images/coursewareManage/nostate.png);
+              background-size: 100% 100%;
+            }
+
+            .boxtitle {
+              margin-bottom: 4px;
+            }
+          }
+        }
+      }
+
+      .tableBox {
+        position: relative;
+        padding-bottom: 80px;
+
+        .classify {
+          margin-left: 10px !important;
+          padding-left: 9px !important;
+        }
+
+        .ant-checkbox-wrapper {
+          align-items: center;
+          margin-top: -2px;
+        }
+
+        .ant-table-selection-column {
+          padding: 0px !important;
+          padding-left: 60px !important;
+        }
+
+        .ant-table-thead > tr > th {
+          background-color: #eff4fc !important;
+        }
+
+        th.h {
+          background-color: #eff4fc !important;
+        }
+
+        .ant-table-tbody
+          > tr:hover:not(.ant-table-expanded-row):not(
+            .ant-table-row-selected
+          )
+          > td {
+          background: #f6f9fd;
+        }
+
+        .operation {
+          display: flex;
+          justify-content: right;
+
+          .fb {
+            display: flex;
+            margin-right: 20px;
+
+            .jc {
+              color: #4ea6ff;
+              font-size: 14px;
+              margin-left: 20px;
+              white-space: nowrap;
               cursor: pointer;
-
-              .btnText {
-                font-size: 14px;
-                font-weight: 400;
-                line-height: 40px;
-              }
-
-              .btn3 {
-                .add {
-                  width: 17px;
-                  height: 18px;
-                  background-image: url("@/assets/images/coursewareManage/add0.png");
-                  background-size: 100% 100%;
-                  margin-right: 6px;
-                }
-              }
-            } */
-
-            .notable {
-              width: 100%;
-              height: 100%;
-
-              .notablebox {
-                width: 412px;
-                height: 212px;
-                background: linear-gradient(180deg, #fef3dd 0%, #fffaf0 100%);
-                border-radius: 10px;
-                display: flex;
-                justify-content: center;
-                text-align: center;
-                margin: 77px auto 109px auto;
-                position: relative;
-
-                .smallleft {
-                  position: absolute;
-                  top: 18px;
-                  left: 0px;
-                  width: 8px;
-                  height: 21px;
-                  border-radius: 0px 4px 4px 0px;
-                  background-color: #ffb64e;
-                }
-
-                .smallright {
-                  position: absolute;
-                  bottom: 18px;
-                  right: 0px;
-                  width: 8px;
-                  height: 21px;
-                  border-radius: 4px 0px 0px 4px;
-                  background-color: #ffb64e;
-                }
-
-                .boxbody {
-                  .boximg {
-                    width: 72px;
-                    height: 72px;
-                    margin: 32px auto 20px auto;
-                    background-image: url(@/assets/images/coursewareManage/nostate.png);
-                    background-size: 100% 100%;
-                  }
-
-                  .boxtitle {
-                    margin-bottom: 4px;
-                  }
-                }
-              }
             }
+          }
+        }
 
-            .tableBox {
-              position: relative;
-              padding-bottom: 80px;
-
-              .classify {
-                margin-left: 10px !important;
-                padding-left: 9px !important;
-              }
-
-              .ant-checkbox-wrapper {
-                align-items: center;
-                margin-top: -2px;
-              }
-
-              .ant-table-selection-column {
-                padding: 0px !important;
-                padding-left: 60px !important;
-              }
-
-              .ant-table-thead > tr > th {
-                background-color: #eff4fc !important;
-              }
-
-              th.h {
-                background-color: #eff4fc !important;
-              }
-
-              .ant-table-tbody
-                > tr:hover:not(.ant-table-expanded-row):not(
-                  .ant-table-row-selected
-                )
-                > td {
-                background: #f6f9fd;
-              }
-
-              .operation {
-                display: flex;
-                justify-content: right;
-
-                .fb {
-                  display: flex;
-                  margin-right: 20px;
-
-                  .jc {
-                    color: #4ea6ff;
-                    font-size: 14px;
-                    margin-left: 20px;
-                    white-space: nowrap;
-                    cursor: pointer;
-                  }
-                }
-              }
-
-              .tableBox {
-                .pa {
-                  left: 0;
-                  width: 100%;
-                  // height: 20px;
-                  // background-color: red;
-                  display: flex;
-                  justify-content: center;
-                  position: absolute;
-                  bottom: 20px;
-                }
-              }
-            }
+        .tableBox {
+          .pa {
+            left: 0;
+            width: 100%;
+            // height: 20px;
+            // background-color: red;
+            display: flex;
+            justify-content: center;
+            position: absolute;
+            bottom: 20px;
           }
         }
       }
@@ -7486,8 +7631,9 @@ function onFocusEnd(){
               }
 
               .stmm_i5 {
-                display: flex;
-                justify-content: space-between;
+                // display: flex;
+                // justify-content: space-between;
+                // margin-right: 6px;
               }
 
               .stmm_i6 {