合并代码

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"
@@ -761,6 +763,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 +773,7 @@
                   </div>
                 </div>
               </div>
+              
             </div>
             <!-- 无数据样式 -->
             <div class="notable" v-if="tableData6.length === 0">
@@ -788,12 +793,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 +806,12 @@
                 <template #action="{ record, column }">
                     <div class="operation">
                       <div class="fb">
+                        <div class="jc" @click="qrcodeVisible(record, 3)" v-if="checkPer(permissions,createId)">
+                          评估码
+                        </div>
                         <!--新加 签到 -->
                         <div class="jc" @click="qrcodeVisible(record, 2)" v-if="checkPer(permissions,createId)">
-                          签到
+                          签到码
                         </div>
 
                         <div
@@ -884,7 +892,7 @@
           </div>
         </div>
       </div>
-    </a-modal>
+    </a-drawer>
     <!--开课页面 -->
     <!--新建开课页面 -->
     <a-modal
@@ -1989,7 +1997,7 @@ const columns6 = [
     title: "教师名称",
     dataIndex: "teacher",
     key: "teacher",
-    width: "8%",
+    width: "24%",
     align: "center",
     ellipsis: true,
     customRender: ({ record }) => {
@@ -2048,16 +2056,33 @@ const columns6 = [
     width: 100,
     align: "center",
     ellipsis: true,
+    customRender: ({ text }) => {
+      return(
+      <div style="display:flex;justify-content:center;align-items:center;">
+        <span>{text || '0'}</span>
+        <div>xixi</div>
+      </div>
+      )
+    },
+  },
+  {
+    title: "评分",
+    dataIndex: "studentCnt",
+    key: "studentCnt",
+    width: 100,
+    align: "center",
+    ellipsis: true,
     customRender: ({ text }) => {
       return text ? text : "0";
     },
   },
   {
     title: "操作",
-    width: 200,
+    width: 300,
     dataIndex: "operation",
     key: "operation",
     align: "center",
+    fixed: "right",
     slots: { customRender: "action" },
   },
 ];
@@ -3820,7 +3845,7 @@ function onFocusEnd(){
     const stm_exit = () => {
       state.stm_hs = false;
       handleCancelStu();
-      handleRestTable();
+      // handleRestTable();
     };
     const createkk = () => {
       state.xjkkinputV1 = state.newCourseName
@@ -5108,19 +5133,19 @@ function onFocusEnd(){
       state.codevisible = true;
       let teacherNames = record.offteachers?.filter(teacher => teacher.teacherName !== null).map(teacher => teacher.teacherName);
       state.codeInfo = {
-        title: type == 1 ? "【课程】二维码" : "【签到】二维码",
-        name: record.name ? record.name+'签到' : "",
+        title: type == 1 ? "【课程】二维码" : type == 2 ? "【签到】二维码" : "【评估】二维码",
+        name: record.name ? record.name + type == 2 ?'签到' : '评估' : "",
         teacherName: teacherNames.length > 0 ? 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}`
       };
       console.log("codeInfo", state.codeInfo, record);
       state.codeIndex = 0;
@@ -5286,6 +5311,9 @@ function onFocusEnd(){
 });
 </script>
 <style lang="scss">
+.ant-drawer-body{
+  padding: 0;
+}
 .ant-table-cell-fix-right {
   width: 250px !important;
 }
@@ -7026,15 +7054,12 @@ function onFocusEnd(){
 }
 
 .schtimeModal {
-  .ant-modal {
-    .ant-modal-content {
-      // width:1358px !important;
-      .ant-modal-body {
   .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;
@@ -7409,9 +7434,6 @@ function onFocusEnd(){
       }
     }
   }
-      }
-    }
-  }
 }
 
 .stusmanageModal {