diff --git a/src/App.vue b/src/App.vue
index f1c4b1d6..1a6dcc13 100644
--- a/src/App.vue
+++ b/src/App.vue
@@ -34,7 +34,7 @@ import {USER_PERMISSION, VALIDATE_TOKEN} from "@/api/apis";
 const store = useStore();
 const isLogin = ref(false);
 
-console.log("版本3.3.1------------");
+console.log("版本3.3.2------------");
 
 
 // 监听关闭浏览器
diff --git a/src/api/config.js b/src/api/config.js
index dc624903..a8b7f4dd 100644
--- a/src/api/config.js
+++ b/src/api/config.js
@@ -9,6 +9,8 @@
 import {message} from "ant-design-vue";
 import axios from "axios";
 import router from "@/router";
+import {REFRESH_TOKEN_API} from "@/api/ThirdApi";
+import {boeRequest} from "@/api/request";
 // import { getCookie } from '../api/method'
 // const Qs = require("qs");
 
@@ -57,13 +59,15 @@ http.interceptors.response.use(
             return response;
         }
         if (code === 1000) {
-            (process.env.NODE_ENV === 'development' || process.env.NODE_ENV === 'alpine') ? 
-            router.push({path: 'login', query: { returnUrl: router.currentRoute.value.fullPath }}) : 
-            (window.location.href = process.env.VUE_APP_LOGIN_URL + encodeURIComponent(window.location.protocol + process.env.VUE_APP_BOE_API_URL + process.env.VUE_APP_BASE + router.currentRoute.value.fullPath))
+            window.location.href = process.env.VUE_APP_LOGIN_URL + encodeURIComponent(window.location.protocol + process.env.VUE_APP_BOE_API_URL + process.env.VUE_APP_BASE + router.currentRoute.value.fullPath)
             // TODO token过期后退出登录 清空当前用户标记 - 为了刷新页面使用
             localStorage.removeItem('refreshPage')
             return Promise.reject(response);
         }
+        if (code === 1001) {
+            window.location.href = process.env.VUE_APP_LOGIN_URL + encodeURIComponent(window.location.protocol + process.env.VUE_APP_BOE_API_URL + process.env.VUE_APP_BASE + router.currentRoute.value.fullPath)
+            return Promise.reject(response);
+        }
         show ? message.error(msg):message.error('系统接口数据异常，请联系管理员');
         console.log("api %o", msg);
         return Promise.reject(response);
diff --git a/src/api/index.js b/src/api/index.js
index f3f684d2..215b7666 100644
--- a/src/api/index.js
+++ b/src/api/index.js
@@ -53,7 +53,6 @@ export const getProjectList = (obj) => http.post('/admin/project/list', obj)
 
 // 获取项目详情信息（包含阶段及任务列表）
 export const getProjectDetail = (obj) => http.get('/admin/project/detail', {params: obj})
-export const getDraftTask = (obj) => http.get('/admin/project/detailDraft', { params: obj })
 //发布项目
 export const releaseProject = (obj) => http.post('/admin/project/publish', obj)
 //获取项目学员
diff --git a/src/api/index1.js b/src/api/index1.js
index fd519e53..ac32f578 100644
--- a/src/api/index1.js
+++ b/src/api/index1.js
@@ -133,7 +133,7 @@ export const getStuList = (obj) => http.post('/admin/orgStruct/getStudentRef', o
 //获取用户登录
 export const getUser = () => http.post('/admin/CheckUser/login', { withCredentials: true })
 //公共信息---------------------------------------------------
-export const courseData =(obj)=> http.post("/admin/offcourse/allPlanList",obj);
+
 //添加项目学员
 export const addStudentProject = (obj) => http.post('/admin/project/addStudent', obj)
 //添加课程学员
@@ -178,7 +178,6 @@ export const exportHomeWork = (obj) => http.get('/admin/student/exportHomeWork',
 export const exportHomeWorkTemplate = (obj) => http.get('/admin/student/exportHomeWorkTemplate', { params: obj })
 //签到
 export const attendanceSign = (obj) => http.post('/stu/task/attendance/sign', obj)
-export const attendanceSignAll = (obj) => http.post('/stu/task/all/sign', obj)
 //请假
 export const attendanceLeave = (obj) => http.post('/stu/task/attendance/leave', obj)
 
diff --git a/src/api/request.js b/src/api/request.js
index 2efe7524..1d1e30f8 100644
--- a/src/api/request.js
+++ b/src/api/request.js
@@ -495,9 +495,7 @@ export async function request(_url, params) {
       return res;
     }
     if (res.code === 1000 || res.code === 1002) {
-      (process.env.NODE_ENV === 'development' || process.env.NODE_ENV === 'alpine') ?
-        router.push({path: 'login', query: { returnUrl: router.currentRoute.value.fullPath }}) :
-        (window.location.href = process.env.VUE_APP_LOGIN_URL + encodeURIComponent(window.location.protocol + process.env.VUE_APP_BOE_API_URL + process.env.VUE_APP_BASE + router.currentRoute.value.fullPath))
+      window.location.href = process.env.VUE_APP_LOGIN_URL + encodeURIComponent(window.location.protocol + process.env.VUE_APP_BOE_API_URL + process.env.VUE_APP_BASE + router.currentRoute.value.fullPath)
       localStorage.removeItem('refreshPage')
       return Promise.reject(res);
     }else if(res.code=== 1001){
diff --git a/src/assets/scss/common.scss b/src/assets/scss/common.scss
index 95df1ef7..6d09f7d9 100644
--- a/src/assets/scss/common.scss
+++ b/src/assets/scss/common.scss
@@ -374,234 +374,6 @@ textarea {
     }
 
   }
-  .drawerMain {
-		.header {
-			height: 73px;
-			border-bottom: 1px solid #e8e8e8;
-			display: flex;
-			justify-content: space-between;
-			align-items: center;
-
-			.headerTitle {
-				font-size: 18px;
-				font-weight: 600;
-				color: #333333;
-				line-height: 25px;
-				margin-left: 24px;
-			}
-		}
-
-		.contentMain {
-			.main_items {
-				display: flex;
-
-				margin-bottom: 12px;
-				margin-top: 32px;
-				flex-wrap: wrap;
-
-				.mi_ipts {
-					display: flex;
-					margin-bottom: 20px;
-
-					.mii_ipt {
-						display: flex;
-						align-items: center;
-						margin-right: 24px;
-
-						.ipt_name {
-							white-space: nowrap;
-						}
-					}
-				}
-
-				.mi_btns {
-					display: flex;
-					margin-left: 38px;
-					margin-bottom: 20px;
-					cursor: pointer;
-
-					.btn {
-						padding: 0px 26px 0px 26px;
-						height: 38px;
-						border-radius: 8px;
-						border: 1px solid rgba(64, 158, 255, 1);
-						display: flex;
-						align-items: center;
-						justify-content: center;
-						margin-left: 14px;
-						flex-shrink: 0;
-
-						.search {
-							background-size: 100%;
-						}
-
-						.btnText {
-							font-size: 14px;
-							font-weight: 400;
-							line-height: 36px;
-							margin-left: 5px;
-						}
-					}
-
-					.btn1 {
-						background: rgb(64, 158, 255);
-
-						.search {
-							width: 15px;
-							height: 17px;
-							background-image: url("@/assets/images/coursewareManage/search0.png");
-						}
-
-						.btnText {
-							color: rgb(255, 255, 255);
-						}
-					}
-
-					.btn2 {
-						background: rgb(255, 255, 255);
-
-						.search {
-							width: 15px;
-							height: 17px;
-							background-image: url("@/assets/images/coursewareManage/reset1.png");
-						}
-
-						.btnText {
-							color: rgb(64, 158, 255);
-						}
-					}
-
-					.btn1:hover {
-						background: rgb(255, 255, 255);
-
-						.search {
-							background-image: url("@/assets/images/courseManage/search1.png");
-						}
-
-						.btnText {
-							color: #4ea6ff;
-						}
-					}
-
-					.btn2:hover {
-						background: rgba(64, 158, 255, 1);
-
-						.search {
-							background-image: url("@/assets/images/courseManage/reset0.png");
-						}
-
-						.btnText {
-							color: #ffffff;
-						}
-					}
-				}
-			}
-
-			.main_notice {
-				display: flex;
-				justify-content: space-between;
-				align-items: center;
-				margin-bottom: 32px;
-				height: 40px;
-				background-color: #e9f6fe;
-
-				.mntc_left {
-					display: flex;
-					align-items: center;
-
-					.title {
-						color: rgba(0, 0, 0, 0.65);
-						margin-right: 17px;
-					}
-
-					.data {
-						color: #4ea6ff;
-					}
-
-					.notice_icon {
-						width: 14px;
-						height: 14px;
-						margin-right: 9px;
-						margin-left: 9px;
-						background-image: url(@/assets/images/coursewareManage/gan.png);
-						background-size: 100% 100%;
-					}
-				}
-
-				.mntc_right {
-					cursor: pointer;
-				}
-			}
-		}
-
-		.main_table {
-			position: relative;
-			padding-bottom: 80px;
-
-			.ant-checkbox-wrapper {
-				align-items: center;
-				margin-top: -2px;
-			}
-
-			.ant-table-selection-column {
-				padding: 0px !important;
-				padding-left: 5px !important;
-			}
-
-			.ant-table-thead>tr>th {
-				background-color: rgba(239, 244, 252, 1);
-			}
-
-			th.h {
-				background-color: #eff4fc !important;
-			}
-
-			.ant-table-tbody>tr:hover:not(.ant-table-expanded-row):not(.ant-table-row-selected)>td {
-				background: #f6f9fd;
-			}
-
-			.pa {
-				left: 0;
-				width: 100%;
-				display: flex;
-				justify-content: center;
-				position: absolute;
-				bottom: 20px;
-			}
-		}
-
-		.main_btns {
-			height: 72px;
-			width: 100%;
-			bottom: 0;
-			left: 0;
-			display: flex;
-			align-items: center;
-			justify-content: center;
-			box-shadow: 0px 1px 35px 0px rgba(118, 136, 166, 0.16);
-
-			.btn1 {
-				width: 100px;
-				height: 40px;
-				border: 1px solid #4ea6ff;
-				border-radius: 8px;
-				color: #4ea6ff;
-				background-color: #fff;
-				cursor: pointer;
-			}
-
-			.btn2 {
-				cursor: pointer;
-				width: 100px;
-				height: 40px;
-				background: #4ea6ff;
-				border-radius: 8px;
-				border: 0;
-				margin-left: 15px;
-				color: #fff;
-			}
-		}
-	}
 }
 
 //抽屉--------------------------------------------------------
diff --git a/src/components/NavTop.vue b/src/components/NavTop.vue
index c6f27b51..345f6d7f 100644
--- a/src/components/NavTop.vue
+++ b/src/components/NavTop.vue
@@ -90,7 +90,7 @@ const logOut = async () => {
   store.replaceState(createStore({state: {openpages: []}}).state);
   localStorage.clear();
   sessionStorage.clear();
-  (process.env.NODE_ENV === 'development' || process.env.NODE_ENV === 'alpine') ? router.push({path: '/login'}) : (window.location.href = window.location.protocol + process.env.VUE_APP_LOGIN_URL)
+  window.location.href = window.location.protocol + process.env.VUE_APP_LOGIN_URL
 };
 </script>
 <style scoped lang="scss">
diff --git a/src/components/TwoDimensionalCode.vue b/src/components/TwoDimensionalCode.vue
index 20b1dbe0..4000fa25 100644
--- a/src/components/TwoDimensionalCode.vue
+++ b/src/components/TwoDimensionalCode.vue
@@ -21,16 +21,8 @@
           </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">
-                  开课：{{ codeInfo.name ? codeInfo.name : "" }}
-                </div>
-                <div v-if="codeInfo.teacherName" class="codename">
-                  讲师：{{ codeInfo.teacherName ? codeInfo.teacherName : "" }}
-                </div>
+              <div class="codename">
+                {{ codeInfo.name ? codeInfo.name : "" }}
               </div>
               <qrcode-vue
                 :value="codeInfo.url.startsWith('/')?(`${domain+codeInfo.url}&t=10`):`${codeInfo.url}&t=10`"
@@ -171,7 +163,6 @@ export default {
         title: "",
         name: "",
         url: "",
-        teacherName: "",
       };
       state.codeInfo = Object.assign(obj, props.codeInfo);
       console.log("codeInfo22222", state.codeInfo, props.index, props.type);
@@ -250,10 +241,6 @@ export default {
               display: flex;
               flex-direction: column;
               align-items: center;
-              .qrm_body_item{
-                width: 100%;
-                margin-left: 270px;
-              }
               .codename {
                 font-size: 18px;
                 font-weight: 400;
@@ -262,10 +249,6 @@ export default {
                 margin-bottom: 20px;
                 margin-left: 20px;
                 margin-right: 20px;
-                overflow: hidden;
-                white-space: nowrap;
-                text-overflow: ellipsis;
-                max-width: 300px;
               }
             }
             .codeUrl {
diff --git a/src/components/common/QrCode.vue b/src/components/common/QrCode.vue
index 240ac42e..513a885c 100644
--- a/src/components/common/QrCode.vue
+++ b/src/components/common/QrCode.vue
@@ -18,11 +18,7 @@
         </div>
         <div class="downloadCode" style="">
           <div class="qrm_body">
-            <div class="qrm_body_info">
-              <div class="codename" v-if="courseName">项目：{{ courseName }}</div>
-              <div class="codename">开课：{{ name }}</div>
-              <div class="codename" v-if="createName">讲师：{{ createName }}</div>
-            </div>
+            <div class="codename">{{ name }}</div>
             <QrcodeVue :value="url" :size="size" style="width: 200px; height: 200px"></QrcodeVue>
           </div>
         </div>
@@ -69,8 +65,6 @@ const props = defineProps({
     default: 800
   },
   name: String,
-  createName: String,
-  courseName: String,
   title: {
     type: String,
     default: "二维码"
@@ -168,23 +162,15 @@ function copyUrl() {
       display: flex;
       flex-direction: column;
       align-items: center;
-      .qrm_body_info{
-        width: 100%;
-        margin-left: 278px;
-      }
+
       .codename {
         font-size: 18px;
         font-weight: 400;
         color: #333333;
         line-height: 25px;
-        margin-bottom: 5px;
+        margin-bottom: 20px;
         margin-left: 20px;
         margin-right: 20px;
-        text-align: left;
-        overflow: hidden;
-        white-space: nowrap;
-        text-overflow: ellipsis;
-        max-width: 300px;
       }
     }
 
diff --git a/src/components/drawers/AddOpenCourse.vue b/src/components/drawers/AddOpenCourse.vue
index 3dcdad39..81c6b68b 100644
--- a/src/components/drawers/AddOpenCourse.vue
+++ b/src/components/drawers/AddOpenCourse.vue
@@ -148,7 +148,7 @@
                 @blur="onBlurStart"
                 @focus="onFocusStart"
                 @select="onDateSelect"
-                :open.sync="openStart"
+                :open="openStart"
                 @ok="onOkStart"
                 ref="datePicker"
               />
@@ -174,7 +174,7 @@
           </div>
 
           <div class="cstm_items" style="align-items: baseline;">
-            <div class="signbox">
+            <div class="signbox" style="position: relative;top: -5px;">
               <div class="sign">
                 <img
                   src="@/assets/images/coursewareManage/asterisk.png"
@@ -194,8 +194,8 @@
                 <a-input-number :min="0"  @change="inputWeightChange(index)"  v-model:value="item.weight" placeholder="%"/>
                 <span style="margin-top: 10px;width: 34px;">权重</span>
                 <div style="display: flex;">
-                  <a-button shape="circle" class="btn-circle btn-add" @click="inputAdd">+</a-button>
-                  <a-button shape="circle" class="btn-circle" @click="inputRemove(index)" :disabled="formData.offteachers.length == 1">-</a-button>
+                  <a-button v-if="index===0" shape="circle" class="btn-circle btn-add" @click="inputAdd">+</a-button>
+                  <a-button shape="circle" class="btn-circle" @click="inputRemove(index)" :disabled="formData.offteachers.length == 1"><template #icon><delete-outlined class="custom-icon"/></template></a-button>
                 </div>
               </div>
 
@@ -437,6 +437,7 @@ import { validateName } from "@/api/index1";
 import moment from 'moment';
 import * as api from "../../api/indexTaskadd";
 import {useRoute} from "vue-router";
+import { DeleteOutlined } from '@ant-design/icons-vue';
 const props = defineProps({
   type: Number,
 });
@@ -655,8 +656,8 @@ function timeChange(timeStr) {
 function onDateSelect(date) {
   const month = String(date.$M+1).padStart(2, '0')
   const day = String(date.$D).padStart(2, '0')
-  const hour = String(date.$D).padStart(2, '0')
-  const minute = String(date.$D).padStart(2, '0')
+  const hour = String(date.$H).padStart(2, '0')
+  const minute = String(date.$m).padStart(2, '0')
   dateTime.value[0]=date.$y+'-'+month+'-'+day+' '+hour+':'+minute
 }
 const openStart = ref(false)
@@ -693,8 +694,8 @@ function onBlurEnd(e){
 function onDateEnd(date) {
     const month = String(date.$M+1).padStart(2, '0')
     const day = String(date.$D).padStart(2, '0')
-    const hour = String(date.$D).padStart(2, '0')
-    const minute = String(date.$D).padStart(2, '0')
+    const hour = String(date.$H).padStart(2, '0')
+    const minute = String(date.$m).padStart(2, '0')
     dateTime.value[1]=date.$y+'-'+month+'-'+day+' '+hour+':'+minute
   }
 function onFocusEnd(){
@@ -740,8 +741,9 @@ const confirm = async()=>{
     projectInfo.value = res.data.data
   });
   request(PROJECT_DETAIL_MODIFY, { ...projectInfo.value });
-  projectInfo.value.projectInfo.status=3
-  request(PROJECT_RELEASE, {projectId: route.query.projectId})
+  if(projectInfo.value.projectInfo.status==3){
+    request(PROJECT_RELEASE, {projectId: route.query.projectId})
+  }
   emit('call-parent-method');
 }
 
@@ -753,7 +755,7 @@ const createNewCourse = () => {
     draftTaskId: params.value.draftTaskId,
     name:courseName.value
   });
-  dateTime.value = [moment().format('YYYY-MM-DD HH:mm'),moment().format('YYYY-MM-DD HH:mm')];
+  dateTime.value = [moment().format('YYYY-MM-DD HH:mm'),''];
   validated.value = 0;
   onceName.value = "";
   formData.value.offteachers = [
@@ -858,8 +860,9 @@ async function coursePlanConfirm() {
     projectInfo.value = res.data.data
   });
   request(PROJECT_DETAIL_MODIFY, { ...projectInfo.value });
-  projectInfo.value.projectInfo.status=3
-  request(PROJECT_RELEASE, {projectId: route.query.projectId})
+  if(projectInfo.value.projectInfo.status==3){
+    request(PROJECT_RELEASE, {projectId: route.query.projectId})
+  }
   emit('call-parent-method');
   handleCancelStu();
   tableRef.value.fetch();
@@ -914,6 +917,11 @@ const changevalue = (e) => {
 const logT = () => {
   formData.value.examInfo = {};
 };
+const removePG = () => {
+      formData.value.assessmentId = null;
+      formData.value.assessmentName = "";
+      // state.isEvaluate = "0";
+    };
 
 defineExpose({ openDrawer });
 </script>
@@ -1378,6 +1386,7 @@ defineExpose({ openDrawer });
           border-radius: 8px !important;
           border: 1px solid #C7CBD2 !important;
           margin: 0 10px 0 10px;
+          padding-top: 3px;
         }
       }
       .btn-add{
@@ -1387,6 +1396,12 @@ defineExpose({ openDrawer });
         text-align: center;
         line-height: 100%;
         margin-top: 5px;
+        .custom-icon{
+          font-size: 20px;
+          svg{
+            margin: auto;
+          }
+        }
         span{
           width: 100%;
           height: 100%;
diff --git a/src/components/drawers/router/RouterCommonManage.vue b/src/components/drawers/router/RouterCommonManage.vue
index 98ccbd28..c11fea4e 100644
--- a/src/components/drawers/router/RouterCommonManage.vue
+++ b/src/components/drawers/router/RouterCommonManage.vue
@@ -310,7 +310,7 @@ export default {
           customRender: (text) => {
             return (
               <div class="racona">
-                <span> {text.record.lastStudyTime?text.record.lastStudyTime:"-"}</span>
+                 <span> {text.record.lastStudyTime && text.record.finishStatus == 1 ?text.record.lastStudyTime:"-"}</span>
               </div>
             );
           },
diff --git a/src/components/drawers/router/RouterFaceStu.vue b/src/components/drawers/router/RouterFaceStu.vue
index d33fdb3c..41d0b782 100644
--- a/src/components/drawers/router/RouterFaceStu.vue
+++ b/src/components/drawers/router/RouterFaceStu.vue
@@ -439,23 +439,87 @@ function resetStudentPage() {
 
 //二维码
 const qrcodeVisible = () => {
-  qrCode({
-    title: "【开课】二维码",
-    name: openCourseName.value?openCourseName.value:data.value[0]?.name,
-    // url: `${location.protocol}//${location.host}${process.env.VUE_APP_BASE_API}/admin/student/studentSign?taskId=${props.datasource.id}&taskType=${props.datasource.type}&type=${props.type}`,
-    url: `${location.protocol}//${location.host}${process.env.VUE_APP_BASE_API}/stu/project/redirectDetail?courseId=${data.value[coursePlanIndex.value]?.id}`,
-  });
+  // const startName = openCourseName.value?openCourseName.value:data.value[0]?.name
+  // if(data.value){
+  //   qrCode({
+  //     title: "【开课】二维码",
+  //     name: startName,
+  //     // url: `${location.protocol}//${location.host}${process.env.VUE_APP_BASE_API}/admin/student/studentSign?taskId=${props.datasource.id}&taskType=${props.datasource.type}&type=${props.type}`,
+  //     url: `${location.protocol}//${location.host}${process.env.VUE_APP_BASE_API}/stu/project/redirectDetail?courseId=${data.value[coursePlanIndex.value]?.id}`,
+  //   });
+  // }else{
+  //   const errorMessage = `二维码生成失败，请联系运维人员 ，参数{ name ： ${startName}，url：${data.value[coursePlanIndex.value]?.id}}`
+  //   message.error(errorMessage);
+  // }
+  let startName;
+  if (openCourseName.value) {
+    startName = openCourseName.value;
+  } else if (Array.isArray(data.value) && data.value.length > 0 && data.value[0]?.name) {
+    startName = data.value[0].name;
+  } else {
+    const errorMessage = '二维码生成失败，请联系运维人员 ，参数{ name ： 课程名称未找到，url：未指定}'
+    message.error(errorMessage);
+    return;
+  }
+  let courseId;
+  if (Array.isArray(data.value) && coursePlanIndex.value !== undefined && data.value[coursePlanIndex.value]?.id) {
+    courseId = data.value[coursePlanIndex.value].id;
+  } else {
+    const errorMessage = `二维码生成失败，请联系运维人员 ，参数{ name ： ${startName}，url：未找到}`;
+    message.error(errorMessage);
+    return;
+  }
+  if (courseId && startName) {
+    qrCode({
+      title: "【开课】二维码",
+      name: startName,
+      url: `${location.protocol}//${location.host}${process.env.VUE_APP_BASE_API}/stu/project/redirectDetail?courseId=${courseId}`,
+    });
+  }
 };
 // 签到二维码
 const qrcodeVisibleSign = () => {
-  qrCode({
-    title: "【签到】二维码",
-    courseName: props.courseName + '项目',
-    createName: data.value[coursePlanIndex.value].offteachers.map(teacher => teacher.teacherName).join(', '),
-    name: openCourseName.value?openCourseName.value:data.value[coursePlanIndex.value]?.name + '课程签到',
-    // url: `${location.protocol}//${location.host}${process.env.VUE_APP_BASE_API}/admin/student/studentSign?taskId=${props.datasource.id}&taskType=${props.datasource.type}&type=${props.type}`,
-    url: `${location.protocol}//${location.host}${process.env.VUE_APP_BASE_API}/admin/student/studentSign?taskId=${data.value[coursePlanIndex.value]?.id}&taskType=${2}&type=${3}`,
-  });
+  // const signName = openCourseName.value?openCourseName.value:data.value[coursePlanIndex.value]?.name
+  // if(data.value){
+  //   qrCode({
+  //     title: "【签到】二维码",
+  //     courseName: props.courseName + '项目',
+  //     createName: data.value[coursePlanIndex.value].offteachers.map(teacher => teacher.teacherName).join(', '),
+  //     name: signName + '课程签到',
+  //     // url: `${location.protocol}//${location.host}${process.env.VUE_APP_BASE_API}/admin/student/studentSign?taskId=${props.datasource.id}&taskType=${props.datasource.type}&type=${props.type}`,
+  //     url: `${location.protocol}//${location.host}${process.env.VUE_APP_BASE_API}/admin/student/studentSign?taskId=${data.value[coursePlanIndex.value]?.id}&taskType=${2}&type=${3}`,
+  //   });
+  // }else{
+  //   const errorMessage = `二维码生成失败，请联系运维人员 ，参数{ name ： ${signName}，url：${data.value[coursePlanIndex.value]?.id}}`
+  //   message.error(errorMessage);
+  // }
+  let signName;
+  if (openCourseName.value) {
+    signName = openCourseName.value;
+  } else if (Array.isArray(data.value) && data.value.length > 0 && coursePlanIndex.value !== undefined && data.value[coursePlanIndex.value]?.name) {
+    signName = data.value[coursePlanIndex.value].name;
+  } else {
+    const errorMessage = '二维码生成失败，请联系运维人员 ，参数{ name ： 签到课程名称未找到，url：未指定}'
+    message.error(errorMessage);
+    return;
+  }
+  let taskId;
+  if (Array.isArray(data.value) && data.value.length > 0 && coursePlanIndex.value !== undefined && data.value[coursePlanIndex.value]?.id) {
+    taskId = data.value[coursePlanIndex.value].id;
+  } else {
+    const errorMessage = `二维码生成失败，请联系运维人员 ，参数{ name ： ${signName}，url：未找到}`;
+    message.error(errorMessage);
+    return;
+  }
+  if (taskId && signName) {
+    qrCode({
+      title: "【签到】二维码",
+      courseName: props.courseName + '项目',
+      createName: data.value[coursePlanIndex.value].offteachers.map(teacher => teacher.teacherName).join(', '),
+      name: signName + '课程签到',
+      url: `${location.protocol}//${location.host}${process.env.VUE_APP_BASE_API}/admin/student/studentSign?taskId=${taskId}&taskType=${2}&type=${3}`,
+    });
+  }
 };
 const qrcodeAssement = () =>{
     qrCode({
diff --git a/src/components/project/NameInput.vue b/src/components/project/NameInput.vue
index c4e0f18f..12159b8a 100644
--- a/src/components/project/NameInput.vue
+++ b/src/components/project/NameInput.vue
@@ -85,7 +85,7 @@ watch(props, () => {
     isExistName.value = true;
   }
   modelV.value.value = props.value;
-});
+},{immediate: true});
 
 watch(() => modelV.value.value, () => {
   emit("update:validated", 1);
diff --git a/src/components/student/OnlineClassModelStudent.vue b/src/components/student/OnlineClassModelStudent.vue
index e3c967ab..f33b0595 100644
--- a/src/components/student/OnlineClassModelStudent.vue
+++ b/src/components/student/OnlineClassModelStudent.vue
@@ -288,6 +288,7 @@ const openDrawer = (raw) => {
 
 const changePagination = (page) => {
   searchParams.value.pageNo = page;
+  searchStu();
 };
 
 function del(id) {
diff --git a/src/views/courselibrary/CoursewareManage.vue b/src/views/courselibrary/CoursewareManage.vue
index 24faab05..e3490823 100644
--- a/src/views/courselibrary/CoursewareManage.vue
+++ b/src/views/courselibrary/CoursewareManage.vue
@@ -1015,7 +1015,7 @@
             </div>
           </div>
           <div class="cstm_items" style="align-items: baseline;">
-            <div class="signbox">
+            <div class="signbox" style="position: relative;top: -5px">
               <div class="sign">
                 <img
                   src="@/assets/images/coursewareManage/asterisk.png"
@@ -1040,8 +1040,8 @@
                 <a-input-number :min="0" @change="inputWeightChange(index)"  v-model:value="item.weight" placeholder="%"/>
                 <span style="margin-top: 10px;width: 34px;">权重</span>
                 <div style="display: flex;">
-                  <a-button shape="circle" class="btn-circle btn-add" @click="inputAdd">+</a-button>
-                  <a-button shape="circle" class="btn-circle" @click="inputRemove(index)" :disabled="offteachers.length == 1">-</a-button>
+                  <a-button v-if="index===0" shape="circle" class="btn-circle btn-add" @click="inputAdd">+</a-button>
+                  <a-button shape="circle" class="btn-circle" @click="inputRemove(index)" :disabled="offteachers.length == 1"><delete-outlined class="custom-icon"/></a-button>
                 </div>
               </div>
             </div>
@@ -1814,6 +1814,7 @@ 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';
 
 //列表表格
 
@@ -2236,6 +2237,7 @@ export default defineComponent({
     // },
     addOnlineCourse,
     TwoDimensionalCode,
+    DeleteOutlined
   },
   setup() {
     const CourseModalRef = ref(null);
@@ -2898,8 +2900,8 @@ export default defineComponent({
   function onDateSelect(date) {
     const month = String(date.$M+1).padStart(2, '0')
     const day = String(date.$D).padStart(2, '0')
-    const hour = String(date.$D).padStart(2, '0')
-    const minute = String(date.$D).padStart(2, '0')
+    const hour = String(date.$H).padStart(2, '0')
+    const minute = String(date.$m).padStart(2, '0')
     state.xjkkinputV3[0]=date.$y+'-'+month+'-'+day+' '+hour+':'+minute
   }
   const openStart = ref(false)
@@ -2927,8 +2929,8 @@ function onFocusStart(){
 function onDateEnd(date) {
     const month = String(date.$M+1).padStart(2, '0')
     const day = String(date.$D).padStart(2, '0')
-    const hour = String(date.$D).padStart(2, '0')
-    const minute = String(date.$D).padStart(2, '0')
+    const hour = String(date.$H).padStart(2, '0')
+    const minute = String(date.$m).padStart(2, '0')
     state.xjkkinputV3[1]=date.$y+'-'+month+'-'+day+' '+hour+':'+minute
   }
   const openEnd = ref(false)
@@ -3812,7 +3814,7 @@ function onFocusEnd(){
         teacherName: "",
         weight: '',
       }]
-      state.xjkkinputV3 = [moment().format('YYYY-MM-DD HH:mm'),moment().format('YYYY-MM-DD HH:mm')]
+      state.xjkkinputV3 = [moment().format('YYYY-MM-DD HH:mm'),'']
       state.cstm_hs = true;
     };
     const handleCancelStu = () => {
@@ -5761,6 +5763,7 @@ function onFocusEnd(){
           border-radius: 8px !important;
           border: 1px solid #C7CBD2 !important;
           margin: 0 10px 0 10px;
+          padding-top: 3px;
         }
         .btn-add{
           margin: 0 10px 0 10px;
@@ -5769,6 +5772,12 @@ function onFocusEnd(){
           text-align: center;
           line-height: 100%;
           margin-top: 5px;
+          .custom-icon{
+            font-size: 20px;
+            svg{
+              margin: auto;
+            }
+          }
           span{
             width: 100%;
             height: 100%;
diff --git a/src/views/examine/CourseReviewedN.vue b/src/views/examine/CourseReviewedN.vue
index 24d1929c..23945bff 100644
--- a/src/views/examine/CourseReviewedN.vue
+++ b/src/views/examine/CourseReviewedN.vue
@@ -404,14 +404,15 @@ export default {
 								<span
 									style="cursor:pointer;color:#387DF7"
 									onClick={() => {
-										showAudit(
+										{/* showAudit(
 											value.record.createrId,
 											value.record.creater,
 											value.record.offId,
 											value.record.type,
 											value.record.id,
 											value.record.courseId
-										);
+										); */}
+										window.open(window.location.protocol + process.env.VUE_APP_BOE_API_URL + '/pc/examine/notapproved','notapproved')
 									}}
 								>
 									审核
@@ -435,14 +436,14 @@ export default {
 									</span>
 									:''
 								}
-								&nbsp;
+								{/* &nbsp;
 								<span
 									onClick={() => {
 										getFaceDetail(value.record.offId);
 									}}
 									style="cursor:pointer;color:#387DF7">
 									预览
-								</span>
+								</span> */}
 							</div>
 						);
 					},
diff --git a/src/views/learningpath/LevelAddDetail.vue b/src/views/learningpath/LevelAddDetail.vue
index 5a2f0e9c..afa75947 100644
--- a/src/views/learningpath/LevelAddDetail.vue
+++ b/src/views/learningpath/LevelAddDetail.vue
@@ -564,15 +564,7 @@ const closeChangeModal = () => {
 };
 
 //暂存
-const currentTaskList = computed(() => {
-      return routerInfo.value?.chapterList[activeIndex.value]?.draftTaskList.length;
-    });
-watch(currentTaskList, (oldValue,newValue) => {
-      request(ROUTER_DETAIL_MODIFY, routerInfo.value)
-      getDetail()
-});
 const temporaryStorage = async () => {
-  console.log(routerInfo.value,'routerInfo.value')
   confirmLoading.value = true;
   await request(ROUTER_DETAIL_MODIFY, routerInfo.value);
   await getDetail();
diff --git a/src/views/projectcenter/LibraryAdd.vue b/src/views/projectcenter/LibraryAdd.vue
index 3331a5c9..13493338 100644
--- a/src/views/projectcenter/LibraryAdd.vue
+++ b/src/views/projectcenter/LibraryAdd.vue
@@ -572,16 +572,6 @@
                       >
                     </div>
                   </div>
-                  <div class="set_content">
-                    <div class="setc_name"><span>积分排行榜</span></div>
-                    <div class="setc_main">
-                      <a-radio v-model:checked="projectInfo.rankFlag" :disabled="true"
-                      ><span style="color: #333333"
-                      >是否显示积分</span
-                      ></a-radio
-                      >
-                    </div>
-                  </div>
                   <div class="set_content" v-if="projectInfo.remark ">
                     <div class="setc_name"><span>项目说明：</span></div>
                     <div class="setc_main">
@@ -1215,7 +1205,6 @@ export default defineComponent({
           systemId: state.projectInfo.systemId,
           boeFlag: state.projectInfo.boeFlag ? 1 : 0,
           courseSyncFlag: state.projectInfo.courseSyncFlag ? 1 : 0,
-          rankFlag: state.projectInfo.rankFlag ? 1 : 0,
           notice: state.projectInfo.notice,
           noticeFlag: state.projectInfo.noticeFlag,
           projectTemplateId: projectId,
@@ -1237,7 +1226,6 @@ export default defineComponent({
             systemId: state.projectInfo.systemId,
             boeFlag: state.projectInfo.boeFlag ? 1 : 0,
             courseSyncFlag: state.projectInfo.courseSyncFlag ? 1 : 0,
-            rankFlag: state.projectInfo.rankFlag ? 1 : 0,
             notice: state.projectInfo.notice,
             noticeFlag: state.projectInfo.noticeFlag,
             projectTemplateId: projectId,
diff --git a/src/views/projectcenter/ProjectAdd.vue b/src/views/projectcenter/ProjectAdd.vue
index cf96826d..406f6842 100644
--- a/src/views/projectcenter/ProjectAdd.vue
+++ b/src/views/projectcenter/ProjectAdd.vue
@@ -164,22 +164,6 @@
             </a-checkbox>
           </div>
         </div>
-        <div class="name name2">
-          <div class="namebox">
-            <div class="inname">积分排行榜</div>
-          </div>
-          <div class="in ggysxz">
-            <a-checkbox v-model:checked="rankFlag">
-              <span style="
-                    width: 100%;
-                    color: rgba(109, 117, 132, 1);
-                    font-size: 14px;
-                  ">
-                是否显示积分
-              </span>
-            </a-checkbox>
-          </div>
-        </div>
         <div class="name name2">
           <div class="namebox">
             <div class="inname" style="margin-top: 13px">项目说明</div>
@@ -301,7 +285,6 @@ export default {
       },
       classifyList5: [],
       courseSyncFlag: true,
-      rankFlag:false,
       auditDescription: "",
       ptojectType: "",
       changeCondition: false,
@@ -357,7 +340,6 @@ export default {
             state.projectInfo.endTime,
           ];
           state.courseSyncFlag = !!state.projectInfo.courseSyncFlag;
-          state.rankFlag = !!state.projectInfo.rankFlag;
           if (Number(state.projectInfo.status) === -5) {
             let obj = {
               project_id: state.projectInfo.id,
@@ -497,7 +479,6 @@ export default {
       }
       state.projectInfo.type = 3;
       state.projectInfo.courseSyncFlag = state.courseSyncFlag ? 1 : 0;
-      state.projectInfo.rankFlag = state.rankFlag ? 1 : 0;
       api.createProject(state.projectInfo).then((res) => {
         state.loading = false;
         message.destroy();
diff --git a/src/views/projectcenter/SonProject.vue b/src/views/projectcenter/SonProject.vue
index 7550906d..cf9b4329 100644
--- a/src/views/projectcenter/SonProject.vue
+++ b/src/views/projectcenter/SonProject.vue
@@ -227,25 +227,6 @@
             >
           </div>
         </div>
-        <div class="name name2">
-          <div class="namebox">
-            <div class="inname">积分排行榜</div>
-          </div>
-          <div class="in">
-            <a-checkbox
-              v-model:checked="rankFlag"
-              :disabled="viewDetail ? true : false"
-              ><span
-                style="
-                  width: 100%;
-                  color: rgba(109, 117, 132, 1);
-                  font-size: 14px;
-                " 
-                >是否显示积分</span
-              ></a-checkbox
-            >
-          </div>
-        </div>
         <div class="name name2">
           <div class="namebox">
             <div class="inname" style="margin-top: 13px">项目说明</div>
@@ -384,7 +365,6 @@ export default {
       pageSize1: 10, //项目经理
       projectInfo: {},
       courseSyncFlag: false,
-      rankFlag:false,
       learnBgMore: false,
       projectPic: [],
       loading: false,
@@ -424,7 +404,6 @@ export default {
               state.projectInfo.endTime,
             ];
             state.courseSyncFlag = !!state.projectInfo.courseSyncFlag;
-            state.rankFlag = !!state.projectInfo.rankFlag
           });
     }
 
@@ -494,7 +473,6 @@ export default {
         return message.warning("项目名称重复，请重新填写");
       }
       state.projectInfo.courseSyncFlag = state.courseSyncFlag ? 1 : 0;
-      state.projectInfo.rankFlag = state.rankFlag ? 1 : 0;
       api.createProject(state.projectInfo).then(() => {
         state.loading = false;
         message.destroy();
diff --git a/src/views/projectcenter/TaskAdd.vue b/src/views/projectcenter/TaskAdd.vue
index bf7da452..f028a0c9 100644
--- a/src/views/projectcenter/TaskAdd.vue
+++ b/src/views/projectcenter/TaskAdd.vue
@@ -609,14 +609,6 @@ const selectRowAll = () => {
 };
 
 //暂存
-const currentTaskList = computed(() => {
-      return projectInfo.value?.stageList[activeIndex.value]?.taskDraftDtoList.length;
-    });
-watch(currentTaskList, (oldValue,newValue) => {
-      request(PROJECT_DETAIL_MODIFY, projectInfo.value)
-      // request(PROJECT_RELEASE, {projectId: route.query.projectId})
-      getTask()
-});
 const temporaryStorage = async () => {
   confirmLoading.value = true
   await request(PROJECT_DETAIL_MODIFY, projectInfo.value)
@@ -631,8 +623,6 @@ const submitStorage = async () => {
       content: '该项目已经发布，修改后如未点击暂存当前操作未保存数据将丢失，确认保存?',
       ok: async () => {
         confirmLoading.value = true
-        request(PROJECT_DETAIL_MODIFY, projectInfo.value)
-        await getTask()
         await request(PROJECT_RELEASE, {projectId: route.query.projectId})
         message.success("保存成功");
         confirmLoading.value = false;
diff --git a/src/views/projectcenter/TaskPage.vue b/src/views/projectcenter/TaskPage.vue
index b0405a83..55573546 100644
--- a/src/views/projectcenter/TaskPage.vue
+++ b/src/views/projectcenter/TaskPage.vue
@@ -999,7 +999,7 @@
             </a-tab-pane>
           </a-tabs>
         </a-tab-pane>
-        <a-tab-pane key="5" tab="项目积分">
+        <a-tab-pane key="5" tab="项目积分" v-if="rankFlag">
           <ProjectScore
             v-if="activeKey == '5'"
             :permissions="permissions"
@@ -2479,7 +2479,7 @@ export default {
             name: qrCodeItems.value[0].name+'课程签到',
             createName:qrCodeItems.value[0].offteachers.map(teacher => teacher.teacherName).join(', ')||qrCodeItems.value[0].teacher,
             url: `${location.protocol}//${location.host}${process.env.VUE_APP_BASE_API}/admin/student/studentSign?taskId=${qrCodeItems.value[0].id}&taskType=${2}&type=${3}`,
-            });
+          });
         }
         if(qrCodeItems.value.length==0){
           message.info("暂无签到二维码")
@@ -2491,13 +2491,18 @@ export default {
       const teacher = qrCodeItems.value[key].teacher;
       const id = qrCodeItems.value[key].id;
       const offteachers = qrCodeItems.value[key].offteachers.map(teacher => teacher.teacherName).join(', ');
-      qrCode({
-        title: "【签到】二维码",
-        courseName: state.name+'项目',
-        name: name+'课程签到',
-        createName:offteachers||teacher,
-        url: `${location.protocol}//${location.host}${process.env.VUE_APP_BASE_API}/admin/student/studentSign?taskId=${id}&taskType=${2}&type=${3}`,
+      if(qrCodeItems.value[key]){
+        qrCode({
+          title: "【签到】二维码",
+          courseName: state.name+'项目',
+          name: name+'课程签到',
+          createName:offteachers||teacher,
+          url: `${location.protocol}//${location.host}${process.env.VUE_APP_BASE_API}/admin/student/studentSign?taskId=${id}&taskType=${2}&type=${3}`,
         });
+      }else{
+        const errorMessage = `二维码生成失败，请联系运维人员 ，参数{ name ： ${name}，url：${id}}`
+        message.error(errorMessage);
+      }
     }
     const qrCodeItemspg = ref([]);
     const visibleEwmpg = ref({});
diff --git a/src/views/report/Curriculum.vue b/src/views/report/Curriculum.vue
index 45075dca..4e4ea0cb 100644
--- a/src/views/report/Curriculum.vue
+++ b/src/views/report/Curriculum.vue
@@ -543,7 +543,13 @@ export default {
           },
         }).then(
           (res) => {
-            downLoad(res.data, "课程详细信息.xlsx");
+            console.log(res)
+            console.log(res.data.status)
+            if(res.data.status && res.data.status == 600){
+              message.error(res.data.message);
+            }else{
+              downLoad(res.data, "课程详细信息.xlsx");
+            }
           },
           (err) => {
             message.error(err);
diff --git a/src/views/report/Examination.vue b/src/views/report/Examination.vue
index 64ad47b9..34ba1d47 100644
--- a/src/views/report/Examination.vue
+++ b/src/views/report/Examination.vue
@@ -155,7 +155,7 @@ export default {
           },
         }).then(
           (res) => {
-            downLoad(res.data, "考试.xlsx");
+            downLoad(res.data, "考试列表信息.xlsx");
           },
           (err) => {
             message.error(err);
@@ -403,7 +403,7 @@ export default {
           },
         }).then(
           (res) => {
-            downLoad(res.data, "考试详情.xlsx");
+            downLoad(res.data, "考试详细信息.xlsx");
           },
           (err) => {
             message.error(err);
@@ -427,7 +427,7 @@ export default {
           },
         }).then(
           (res) => {
-            downLoad(res.data, "考试详情.xlsx");
+            downLoad(res.data, "考试详细信息.xlsx");
           },
           (err) => {
             message.error(err);
diff --git a/src/views/report/Learningpathmap.vue b/src/views/report/Learningpathmap.vue
index 478d8cde..c2d5af25 100644
--- a/src/views/report/Learningpathmap.vue
+++ b/src/views/report/Learningpathmap.vue
@@ -242,7 +242,7 @@ export default {
         ellipsis: true,
         key: "boeRouterInfoName",
         align: "center",
-        width: 120,
+        width: 240,
       },
       {
         title: "归属组织",
@@ -250,7 +250,7 @@ export default {
         ellipsis: true,
         key: "organizationName",
         align: "center",
-        width: 120,
+        width: 240,
       },
       {
         title: "关卡数",
@@ -258,7 +258,7 @@ export default {
         ellipsis: true,
         key: "levelTotal",
         align: "center",
-        width: 120,
+        width: 90,
       },
       {
         title: "任务数",
@@ -266,7 +266,7 @@ export default {
         ellipsis: true,
         key: "taskTotal",
         align: "center",
-        width: 120,
+        width: 90,
       },
       {
         title: "学习人数",
@@ -274,7 +274,7 @@ export default {
         ellipsis: true,
         key: "learnerNumber",
         align: "center",
-        width: 120,
+        width: 90,
       },
       {
         title: "参与人数",
@@ -282,7 +282,7 @@ export default {
         ellipsis: true,
         key: "participantsTotal",
         align: "center",
-        width: 120,
+        width: 90,
       },
       {
         title: "参与率",
@@ -290,7 +290,7 @@ export default {
         ellipsis: true,
         key: "participantsRate",
         align: "center",
-        width: 120,
+        width: 90,
       },
       {
         title: "完成人数",
@@ -298,7 +298,7 @@ export default {
         ellipsis: true,
         key: "completionNumber",
         align: "center",
-        width: 120,
+        width: 90,
       },
       {
         title: "完成率",
@@ -306,7 +306,7 @@ export default {
         ellipsis: true,
         key: "completedRate",
         align: "center",
-        width: 120,
+        width: 90,
       },
       {
         title: "发布时间",
@@ -375,7 +375,7 @@ export default {
           token: Cookies.get("token"),
         },
       }).then((res) => {
-        downLoad(res.data, "历史学习数据.xlsx");
+        downLoad(res.data, "路径图历史学习数据.xlsx");
       });
     };
     // 导出当前数据
@@ -389,7 +389,7 @@ export default {
           token: Cookies.get("token"),
         },
       }).then((res) => {
-        downLoad(res.data, "当前学习数据.xlsx");
+        downLoad(res.data, "路径图当前学习数据.xlsx");
       });
     };
     //table 分页事件
@@ -445,7 +445,7 @@ export default {
             token: Cookies.get("token"),
           },
         }).then((res) => {
-          downLoad(res.data, "详细信息.xlsx");
+          downLoad(res.data, "学习路径图详细信息.xlsx");
         }),
           (err) => {
             message.error(err);
@@ -468,7 +468,12 @@ export default {
             token: Cookies.get("token"),
           },
         }).then((res) => {
-          downLoad(res.data, "详细信息.xlsx");
+          if(res.data.status && res.data.status == 600){
+            message.error(res.data.status)
+          }else{
+            downLoad(res.data, "学习路径图详细信息.xlsx");
+          }
+          
         }),
           (err) => {
             message.error(err);
@@ -487,7 +492,7 @@ export default {
             token: Cookies.get("token"),
           },
         }).then((res) => {
-          downLoad(res.data, "学习路径图信息.xlsx");
+          downLoad(res.data, "学习路径图列表信息.xlsx");
         }),
           (err) => {
             message.error(err);
diff --git a/src/views/report/Operational.vue b/src/views/report/Operational.vue
index e7afb448..922be08a 100644
--- a/src/views/report/Operational.vue
+++ b/src/views/report/Operational.vue
@@ -349,7 +349,8 @@ export default {
         one: "学习人数",
         two: "总学习时长",
         three: "人均学习时长",
-      }
+      },
+      topChartData:[],
     });
     const surfaceRef = ref(null);
     const surface1Ref = ref(null);
@@ -372,9 +373,87 @@ export default {
         state.limitCheckedList = event;
         // modalChange();
         if (state.towParmasn.dateType == 2) {
-          twoMonthChange(state.towParmasn.time);
+          // twoMonthChange(state.towParmasn.time);
+
+          const xData = [];
+          const avgDuration = [];
+          const count = [];
+          const duration = [];
+          state.topChartData.forEach((item) => {
+            xData.push(item.day);
+            avgDuration.push(item.avgDuration);
+            count.push(item.count);
+            duration.push(item.duration);
+          });
+          option.value.xAxis.data = xData;
+          // 右侧坐标轴数据
+          // option.value.series[0].data = count;
+          // //左侧坐标轴数据
+          // option.value.series[1].data = avgDuration;
+          // option.value.series[2].data = duration;
+          option.value.series[0].data = [];
+          option.value.series[1].data = [];
+          option.value.series[2].data = [];
+          console.log("checkedList:",state.checkedList);
+          console.log("666 duration:",duration);
+          for(let i=0;i<state.checkedList.length;i++){
+            if(state.checkedList[i]=="学习人数" || state.checkedList[i]=="总阅读人数" || state.checkedList[i]=="总查看人数"){
+              option.value.series[0].data = count;
+              option.value.series[0].name = state.checkedList[i];
+            }
+            if(state.checkedList[i]=="人均学习时长" || state.checkedList[i]=="人均阅读时长" || state.checkedList[i]=="总回答人数"){
+              option.value.series[1].data = avgDuration;
+              option.value.series[1].yAxisIndex = i;
+              option.value.series[1].name = state.checkedList[i];
+            }
+            if(state.checkedList[i]=="总学习时长" || state.checkedList[i]=="总阅读时长" || state.checkedList[i]=="总提问人数"){
+              option.value.series[2].data = duration;
+              option.value.series[2].yAxisIndex = i;
+              option.value.series[2].name = state.checkedList[i];
+            }
+          }
+          console.log("123:",option.value.series)
+          createEcharts2();
         } else if (state.towParmasn.dateType == 1) {
-          twoDatChange(state.towParmasn.day);
+          // twoDatChange(state.towParmasn.day);
+
+          const xData = [];
+          const avgDuration = [];
+          const count = [];
+          const duration = [];
+          state.topChartData.forEach((item) => {
+            xData.push(item.day);
+            avgDuration.push(item.avgDuration);
+            count.push(item.count);
+            duration.push(item.duration);
+          });
+          option.value.xAxis.data = xData;
+          // 右侧坐标轴数据
+          // option.value.series[0].data = count;
+          // //左侧坐标轴数据
+          // option.value.series[1].data = avgDuration;
+          // option.value.series[2].data = duration;
+          option.value.series[0].data = [];
+          option.value.series[1].data = [];
+          option.value.series[2].data = [];
+          console.log("checkedList:",state.checkedList);
+          for(let i=0;i<state.checkedList.length;i++){
+            if(state.checkedList[i]=="学习人数" || state.checkedList[i]=="总阅读人数" || state.checkedList[i]=="总查看人数"){
+              option.value.series[0].data = count;
+              option.value.series[0].name = state.checkedList[i];
+            }
+            if(state.checkedList[i]=="人均学习时长" || state.checkedList[i]=="人均阅读时长" || state.checkedList[i]=="总回答人数"){
+              option.value.series[1].data = avgDuration;
+              option.value.series[1].yAxisIndex = i;
+              option.value.series[1].name = state.checkedList[i];
+            }
+            if(state.checkedList[i]=="总学习时长" || state.checkedList[i]=="总阅读时长" || state.checkedList[i]=="总提问人数"){
+              option.value.series[2].data = duration;
+              option.value.series[2].yAxisIndex = i;
+              option.value.series[2].name = state.checkedList[i];
+            }
+          }
+          createEcharts2();
         }
       }
     };
@@ -542,7 +621,7 @@ export default {
             .format("YYYY-MM-DD 00:00:01");
           const dayEnd = dayjs(state.towParmasn.day[1])
             .endOf("day")
-            .format("YYYY-MM-DD hh:mm:ss");
+            .format("YYYY-MM-DD 23:59:59");
           axios({
             method: "post",
             url: "/report/boeu/studyData/exportDetailAll",
@@ -574,7 +653,7 @@ export default {
         } else {
           const monthEnd = dayjs(state.towParmasn.time[1])
             .endOf("month")
-            .format("YYYY-MM-DD hh:mm:ss");
+            .format("YYYY-MM-DD 23:59:59");
           axios({
             method: "post",
             url: "/report/boeu/studyData/exportDetailAll",
@@ -698,6 +777,7 @@ export default {
           type: state.towParmasn.type,
         });
         if (res) {
+          state.topChartData = res?.data?.result;
           if (
             state.towParmasn.type == 4 ||
             state.towParmasn.type == 5 ||
@@ -799,6 +879,7 @@ export default {
           type: state.towParmasn.type,
         });
         if (res) {
+          state.topChartData = res?.data?.result;
           if (
             state.towParmasn.type == 4 ||
             state.towParmasn.type == 5 ||
@@ -888,7 +969,7 @@ export default {
       if (e?.length > 0) {
         const monthEnd = dayjs(e[1])
           .endOf("month")
-          .format("YYYY-MM-DD hh:mm:ss");
+          .format("YYYY-MM-DD 23:59:59");
         const res = await api.dataStatisticsSelectV1({
           startTime: dayjs(e[0]).format("YYYY-MM-01 00:00:01"),
           endTime: monthEnd,
@@ -924,7 +1005,7 @@ export default {
         const dayStart = dayjs(e[0])
           .startOf("day")
           .format("YYYY-MM-DD 00:00:01");
-        const dayEnd = dayjs(e[1]).endOf("day").format("YYYY-MM-DD hh:mm:ss");
+        const dayEnd = dayjs(e[1]).endOf("day").format("YYYY-MM-DD 23:59:59");
         const res = await api.dataStatisticsSelectV1({
           startTime: dayStart,
           endTime: dayEnd,
@@ -973,7 +1054,7 @@ export default {
             .format("YYYY-MM-DD 00:00:01");
           const dayEnd = dayjs(state.threeDay[1])
             .endOf("day")
-            .format("YYYY-MM-DD hh:mm:ss");
+            .format("YYYY-MM-DD 23:59:59");
           axios({
             method: "post",
             url: "/report/data/statistics/export/v1",
@@ -1001,7 +1082,7 @@ export default {
         } else {
           const monthEnd = dayjs(state.threeTime[1])
             .endOf("month")
-            .format("YYYY-MM-DD hh:mm:ss");
+            .format("YYYY-MM-DD 23:59:59");
           axios({
             method: "post",
             url: "/report/data/statistics/export/v1",
@@ -1039,7 +1120,7 @@ export default {
       if (e?.length > 0) {
         const monthEnd = dayjs(e[1])
           .endOf("month")
-          .format("YYYY-MM-DD hh:mm:ss");
+          .format("YYYY-MM-DD 23:59:59");
         const res = await api.dataStatisticsSelectV2({
           startTime: dayjs(e[0]).format("YYYY-MM-01 00:00:01"),
           endTime: monthEnd,
@@ -1075,7 +1156,7 @@ export default {
         const dayStart = dayjs(e[0])
           .startOf("day")
           .format("YYYY-MM-DD 00:00:01");
-        const dayEnd = dayjs(e[1]).endOf("day").format("YYYY-MM-DD hh:mm:ss");
+        const dayEnd = dayjs(e[1]).endOf("day").format("YYYY-MM-DD 23:59:59");
         const res = await api.dataStatisticsSelectV2({
           startTime: dayStart,
           endTime: dayEnd,
@@ -1117,7 +1198,7 @@ export default {
             .format("YYYY-MM-DD 00:00:01");
           const dayEnd = dayjs(state.forDay[1])
             .endOf("day")
-            .format("YYYY-MM-DD hh:mm:ss");
+            .format("YYYY-MM-DD 23:59:59");
           axios({
             method: "post",
             url: "/report/data/statistics/export/v2",
@@ -1145,7 +1226,7 @@ export default {
         } else {
           const monthEnd = dayjs(state.forTime[1])
             .endOf("month")
-            .format("YYYY-MM-DD hh:mm:ss");
+            .format("YYYY-MM-DD 23:59:59");
           axios({
             method: "post",
             url: "/report/data/statistics/export/v2",
@@ -1551,7 +1632,8 @@ export default {
       // const monthEnd = dayjs(new Date()).endOf("year").format("YYYY-MM");
       var year = dayjs(new Date()).year();
       var month = dayjs(new Date()).month()+1;
-      console.log("initTime year:",year,"month:",month);
+      var day = dayjs(new Date()).date();
+      console.log("initTime year:",year,"month:",month,"day:",day);
       var year1 = year;
       var month1 = parseInt(month) - 5;
       if(month1<=0){
@@ -1565,9 +1647,9 @@ export default {
       state.threeTime = [dayjs(start), dayjs(monthEnd)];
       state.forTime = [dayjs(start), dayjs(monthEnd)];
       state.towParmasn.time = [dayjs(start), dayjs(monthEnd)];
-      state.towParmasn.day = [dayjs( year + "-" + month + "-" + "01" ), dayjs(monthEnd)];
-      state.threeDay = [dayjs( year + "-" + month + "-" + "01" ), dayjs(monthEnd)];
-      state.forDay = [dayjs( year + "-" + month + "-" + "01" ), dayjs(monthEnd)];
+      state.towParmasn.day = [dayjs( year + "-" + month + "-" + day ), dayjs( year + "-" + month + "-" + day )];
+      state.threeDay = [dayjs( year + "-" + month + "-" + day ), dayjs( year + "-" + month + "-" + day )];
+      state.forDay = [dayjs( year + "-" + month + "-" + day ), dayjs( year + "-" + month + "-" + day )];
       leftMonthChange([dayjs(start), dayjs(monthEnd)]);
       rightMonthChange([dayjs(start), dayjs(monthEnd)]);
       twoMonthChange([dayjs(start), dayjs(monthEnd)]);
diff --git a/src/views/report/Overvoew.vue b/src/views/report/Overvoew.vue
index d0a59108..ca05f7d0 100644
--- a/src/views/report/Overvoew.vue
+++ b/src/views/report/Overvoew.vue
@@ -1257,7 +1257,7 @@ export default {
             align: "center",
           },
           {
-            title: "学习时长(分钟)",
+            title: "学习时长",
             dataIndex: "studyTime",
             ellipsis: true,
             key: "studyTime",
@@ -1304,14 +1304,14 @@ export default {
             width: 120,
             align: "center",
           },
-          {
-            title: "状态",
-            dataIndex: "publishStatus",
-            ellipsis: true,
-            key: "publishStatus",
-            width: 120,
-            align: "center",
-          },
+          // {
+          //   title: "状态",
+          //   dataIndex: "publishStatus",
+          //   ellipsis: true,
+          //   key: "publishStatus",
+          //   width: 120,
+          //   align: "center",
+          // },
           {
             title: "启用状态",
             dataIndex: "enabled",
@@ -1359,7 +1359,7 @@ export default {
             fixed: "left",
           },
           {
-            title: "授课时长（小时）",
+            title: "授课时长（分钟）",
             dataIndex: "teachingLength",
             ellipsis: true,
             key: "teachingLength",
diff --git a/src/views/report/ReportExamination.vue b/src/views/report/ReportExamination.vue
index 76282c9a..5cff23cf 100644
--- a/src/views/report/ReportExamination.vue
+++ b/src/views/report/ReportExamination.vue
@@ -436,7 +436,7 @@ export default {
           token: Cookies.get("token"),
         },
       }).then((res) => {
-        downLoad(res.data, "考试详细数据.xlsx");
+        downLoad(res.data, "考试详细信息.xlsx");
       });
     };
     //table 分页事件
diff --git a/src/views/report/ReportProject.vue b/src/views/report/ReportProject.vue
index 7df9b9ce..67aa4507 100644
--- a/src/views/report/ReportProject.vue
+++ b/src/views/report/ReportProject.vue
@@ -220,7 +220,7 @@ export default {
               token: Cookies.get("token"),
             },
           }).then((res) => {
-            downLoad(res.data, "项目.xlsx");
+            downLoad(res.data, "项目列表.xlsx");
           });
       } else {
         const params = {};
@@ -293,7 +293,12 @@ export default {
           },
         }).then(
           (res) => {
-            downLoad(res.data, "项目详情.xlsx");
+            if(res.data.status && res.data.status == 600){
+              message.error(res.data.message);
+            }else{
+              downLoad(res.data, "项目详情.xlsx");
+            }
+            
           },
           (err) => {
             message.error(err);
@@ -412,7 +417,7 @@ export default {
         title: "项目名称",
         dataIndex: "projectName",
         key: "projectName",
-        width: 120,
+        width: 240,
         ellipsis: true,
         align: "left",
         fixed: "left",
@@ -422,7 +427,7 @@ export default {
         dataIndex: "sourceBelongName",
         ellipsis: true,
         key: "sourceBelongName",
-        width: 120,
+        width: 240,
         align: "center",
         fixed: "left",
       },
@@ -440,7 +445,7 @@ export default {
         dataIndex: "stageTotal",
         ellipsis: true,
         key: "stageTotal",
-        width: 120,
+        width: 90,
         align: "center",
       },
       {
@@ -448,7 +453,15 @@ export default {
         dataIndex: "taskTotal",
         ellipsis: true,
         key: "taskTotal",
-        width: 120,
+        width: 90,
+        align: "center",
+      },
+      {
+        title: "总人数",
+        dataIndex: "participantsTotal",
+        ellipsis: true,
+        key: "participantsTotal",
+        width: 90,
         align: "center",
       },
       {
@@ -456,15 +469,7 @@ export default {
         dataIndex: "startLearnerTotal",
         ellipsis: true,
         key: "startLearnerTotal",
-        width: 120,
-        align: "center",
-      },
-      {
-        title: "参与人数",
-        dataIndex: "participantsTotal",
-        ellipsis: true,
-        key: "participantsTotal",
-        width: 120,
+        width: 90,
         align: "center",
       },
       {
@@ -472,7 +477,7 @@ export default {
         dataIndex: "participantsRate",
         ellipsis: true,
         key: "participantsRate",
-        width: 120,
+        width: 90,
         align: "center",
       },
       {
@@ -480,7 +485,7 @@ export default {
         dataIndex: "peopleCompletedTotal",
         ellipsis: true,
         key: "peopleCompletedTotal",
-        width: 120,
+        width: 90,
         align: "center",
       },
       {
@@ -553,7 +558,7 @@ export default {
           token: Cookies.get("token"),
         },
       }).then((res) => {
-        downLoad(res.data, "项目详情.xlsx");
+        downLoad(res.data, "项目学习记录.xlsx");
       });
     };
     onMounted(() => {