diff --git a/.env b/.env
index b8afca1f..4f5c0444 100644
--- a/.env
+++ b/.env
@@ -3,7 +3,7 @@ VUE_APP_BASE=/manage
 # api项目基础url
 VUE_APP_BASE_API=/manageApi
 #文件路径
-VUE_APP_FILE_PATH=/file/
+VUE_APP_FILE_PATH=/upload/
 # 代理url 本地调试，不可以用在其他地方
 VUE_APP_PROXY_URL=http://111.231.196.214/manageApi
 # 登录url
@@ -16,10 +16,11 @@ VUE_APP_OUTPUT_DIR=./dist
 # iframe嵌套url
 VUE_APP_IFRAME_URL=https://u-pre.boe.com/pc/iframe
 # 学员端路由
-VUE_APP_IFRAME_STUDENT_URL=https://u-pre.boe.com/pc/loading
+VUE_APP_IFRAME_STUDENT_URL=https://u-pre.boe.com/pc/loadingVUE_APP_BOE_API_URLVUE_APP_BOE_API_URL
 
 # 课程二维码
 VUE_APP_COURSE_STUDY=https://u-pre.boe.com/pc/course/studyindex?id=
 # 导入学员模板
-VUE_APP_UP_LOAD_HOMEWORK_TEMPLATE=导入作业成绩 模板-1673450632417.xlsx
-VUE_APP_UP_LOAD_STUDENT_TEMPLATE=导入学员模版-1673452888323.xlsx
+VUE_APP_UP_LOAD_HOMEWORK_TEMPLATE=导入作业成绩模板-1673511599785.xlsx
+# 导入作业成绩学员模板
+VUE_APP_UP_LOAD_STUDENT_TEMPLATE=导入学员模版-1673511636808.xlsx
diff --git a/.env.alpine b/.env.alpine
index 07a433c1..90011908 100644
--- a/.env.alpine
+++ b/.env.alpine
@@ -1,2 +1,3 @@
 NODE_ENV=alpine
 VUE_APP_OUTPUT_DIR=./docker/dist
+VUE_APP_FILE_PATH=/file/
diff --git a/.env.boe b/.env.boe
index 3bafe80c..4b824494 100644
--- a/.env.boe
+++ b/.env.boe
@@ -7,3 +7,7 @@ VUE_APP_LOGIN_URL=https://u-pre.boe.com/web
 VUE_APP_BOE_API_URL=https://u-pre.boe.com
 
 
+# 导入学员模板
+VUE_APP_UP_LOAD_HOMEWORK_TEMPLATE=导入作业成绩模板-1673516508029.xlsx
+# 导入作业成绩学员模板
+VUE_APP_UP_LOAD_STUDENT_TEMPLATE=导入学员模版-1673516483342.xlsx
\ No newline at end of file
diff --git a/src/App.vue b/src/App.vue
index ad2ec813..4ba1c1e5 100644
--- a/src/App.vue
+++ b/src/App.vue
@@ -19,9 +19,9 @@
 	</div>
 </template>
 <script>
-import { computed, defineComponent, ref } from "vue";
+import { computed, defineComponent, ref, onMounted } from "vue";
 import { useRouter, useRoute } from "vue-router";
-import { useStore } from "vuex";
+import { useStore, createStore } from "vuex";
 import NavLeft from "@/components/NavLeft";
 import NavTop from "@/components/NavTop";
 import OpenPages from "@/components/OpenPages";
@@ -44,7 +44,7 @@ export default defineComponent({
 		const store = useStore();
 		const isLogin = ref(false);
 		// console.log("router", router.getRoutes(), route);
-		console.log("版本2.0.5------------");
+		console.log("版本2.0.6------------");
 		const routes = computed(() => {
 			return router.getRoutes().filter((e) => e.meta?.isLink);
 		});
@@ -71,6 +71,31 @@ export default defineComponent({
 			getOrgTree();
 		}
 
+		// 监听关闭浏览器
+		let time1 = ref(0);
+		let time2 = ref(0);
+
+		//添加监听事件
+		function beforeunloadHandler() {
+			time1.value = new Date().getTime();
+			// e.returnValue = '关闭提示'; 
+		}
+
+		function unloadHandler() {
+			time2.value = new Date().getTime() - time1.value;
+			if(time2.value<=5){
+				store.replaceState(createStore({state: {openpages:null}}).state);
+				localStorage.removeItem("openpages");
+			}
+		}
+		
+
+		onMounted(()=>{
+			window.addEventListener('beforeunload', e => beforeunloadHandler(e));
+			window.addEventListener('unload', e => unloadHandler(e));
+		})
+
+
 		async function getMemberInfo() {
 			const list = localStorage.getItem("memberInitInfo");
 			if (list) {
@@ -124,7 +149,7 @@ export default defineComponent({
 			name: currentRouteName,
 			zhCN,
 		};
-	},
+	}
 });
 </script>
 <style lang="scss">
diff --git a/src/assets/images/leveladd/reset.png b/src/assets/images/leveladd/reset.png
new file mode 100644
index 00000000..6dc4a01a
Binary files /dev/null and b/src/assets/images/leveladd/reset.png differ
diff --git a/src/components/NavTop.vue b/src/components/NavTop.vue
index 3eca704c..27df740c 100644
--- a/src/components/NavTop.vue
+++ b/src/components/NavTop.vue
@@ -63,12 +63,16 @@ import DownLoad from "../components/drawers/DownLoad";
 import * as api from "../api/index1";
 import { studentUrl } from "../api/method";
 import router from "@/router";
+import { useStore, createStore } from "vuex";
+
 export default {
   name: "NavTop",
   components: {
     DownLoad,
   },
   setup() {
+    const store = useStore();
+
     const state = reactive({
       selectRole: "管理员",
       username: "",
@@ -120,6 +124,9 @@ export default {
     getUser();
 
     const logOut = () => {
+      
+      store.replaceState(createStore({state: {openpages:null}}).state);
+
       localStorage.removeItem("faceclassPic");
       localStorage.removeItem("faceclassClass");
       localStorage.removeItem("faceclassScene");
@@ -138,7 +145,12 @@ export default {
       localStorage.removeItem("projectId");
       localStorage.removeItem("projectTemplateId");
       localStorage.removeItem("orgtreeList");
-      process.env.NODE_ENV === 'development' ? router.push({path: 'login'}) : (window.location.href = process.env.VUE_APP_LOGIN_URL)
+      process.env.NODE_ENV === 'development' ?  router.push({path: '/learningpath'}) : (window.location.href = process.env.VUE_APP_LOGIN_URL)
+      if(process.env.NODE_ENV === 'development'){
+        setTimeout(() => {
+          window.location.reload();
+        }, 3000);
+      }
     };
     return {
       ...toRefs(state),
diff --git a/src/components/OpenPages.vue b/src/components/OpenPages.vue
index b683f706..8098f4a3 100644
--- a/src/components/OpenPages.vue
+++ b/src/components/OpenPages.vue
@@ -51,23 +51,22 @@ export default {
     const store = useStore();
     const $router = useRouter();
     const state = reactive({
-      //openList: store.state.openpages,
+      openList: store.state.openpages,
     });
 
     const closePage = (value) => {
       console.log("点击关闭页面", value, state.openList);
-   
+
       state.openList.map((item, key) => {
         if (item.href === value.href) {
           if (state.openList.length === 1) {
             if (state.openList[0].href !== "/learningpath") {
               state.openList.splice(key, 1);
               $router.push({ path: "/learningpath" });
-            }else{
+            } else {
               message.destroy();
               return message.warning("至少保留一个页面");
             }
-           
           } else {
             if (value.active) {
               if (key === state.openList.length - 1) {
@@ -92,7 +91,7 @@ export default {
 <style lang="scss">
 .openPages {
   width: 100%;
-  // height: 50px;
+  height: 50px;
   display: flex;
   background-color: rgba(255, 255, 255, 1);
   box-shadow: 0px 8px 8px 0px rgba(118, 136, 166, 0.1);
@@ -117,7 +116,6 @@ export default {
   .close {
     width: 50px;
     height: 50px;
-  
 
     position: absolute;
     display: flex;
diff --git a/src/components/TwoDimensionalCode.vue b/src/components/TwoDimensionalCode.vue
index 83ee580a..3ac92224 100644
--- a/src/components/TwoDimensionalCode.vue
+++ b/src/components/TwoDimensionalCode.vue
@@ -25,7 +25,7 @@
                 {{ codeInfo.name ? codeInfo.name : "" }}
               </div>
               <qrcode-vue
-                :value="codeInfo.url ? codeInfo.url : ''"
+                :value="codeInfo.url.startsWith('/')?(domain+codeInfo.url):codeInfo.url"
                 :size="qrcodeSize"
                 style="width: 200px; height: 200px"
               ></qrcode-vue>
@@ -34,12 +34,12 @@
           <div class="codeUrl" :style="{ display: showUrl ? 'flex' : 'none' }">
             <div class="codeUrlLink">链接</div>
             <a-input
-              :value="codeInfo.url ? codeInfo.url : ''"
+              :value="codeInfo.url.startsWith('/')?(domain+codeInfo.url):codeInfo.url"
               disabled
               class="codeUrlInp"
             />
             <a-input
-              :value="codeInfo.url ? codeInfo.url : ''"
+              :value="codeInfo.url.startsWith('/')?(domain+codeInfo.url):codeInfo.url"
               id="courseUrl"
               class="codeUrlInp"
               style="position: absolute; opacity: 0; z-index: -1"
@@ -104,6 +104,7 @@ export default {
       codeInfo: {},
       courseUrl: "https://www.baidu.com/",
       showUrl: false,
+      domain: location.protocol+'//'+location.host
     });
 
     //下载二维码图片
@@ -147,7 +148,7 @@ export default {
       // 	selection.removeRange(range); // 移除选中的元素
 
       var input = document.createElement("input"); // 创建input对象
-      input.value = state.codeInfo.url ? state.codeInfo.url : ""; // 设置复制内容
+      input.value = state.codeInfo.url.startsWith('/')?(state.domain+state.codeInfo.url):state.codeInfo.url; // 设置复制内容
       document.body.appendChild(input); // 添加临时实例
       input.select(); // 选择实例内容
       document.execCommand("Copy"); // 执行复制
diff --git a/src/components/common/FJUpload.vue b/src/components/common/FJUpload.vue
index d5d3c265..a9f9bffc 100644
--- a/src/components/common/FJUpload.vue
+++ b/src/components/common/FJUpload.vue
@@ -20,7 +20,11 @@
         <div class="file_detail">
           <div class="file_name">
             <span style="color: #6f6f6f;width:200px;display:block;overflow:hidden;white-space:nowrap;text-overflow:ellipsis;">
-              {{ item.name.indexOf('-')!==-1?item.name.slice(0,item.name.indexOf('-')) + item.name.slice(item.name.indexOf('.')) :item.name }}
+              {{ 
+                item.name.indexOf('http')!==-1?
+                item.name.slice(item.name.lastIndexOf('/') + 1)
+                :item.name.indexOf('-')!==-1?item.name.slice(0,item.name.indexOf('-')) + item.name.slice(item.name.indexOf('.')) :item.name 
+              }}
             </span>
           </div>
           <!--          <div class="file_size">-->
diff --git a/src/components/drawers/AddActive.vue b/src/components/drawers/AddActive.vue
index fc0bcc0c..976c579b 100644
--- a/src/components/drawers/AddActive.vue
+++ b/src/components/drawers/AddActive.vue
@@ -31,14 +31,13 @@
             <div class="btnbox">
               <a-input
                 v-model:value="inputV1"
-                style="width: 400px; height: 40px; border-radius: 8px;"
+                style="width: 400px; height: 40px; border-radius: 8px"
                 placeholder="请输入活动名称"
                 maxlength="20"
               />
             </div>
           </div>
-        
-       
+
           <div class="main_item">
             <div class="signbox">
               <div class="sign">
@@ -51,10 +50,11 @@
             </div>
             <div class="btnbox">
               <a-range-picker
-              :disabled-date="disabledDate" :disabled-time="disabledRangeTime" 
-                              :show-time="{ format: 'HH:mm' }"
+                :disabled-date="disabledDate"
+                :disabled-time="disabledRangeTime"
+                :show-time="{ format: 'HH:mm' }"
                 format="YYYY-MM-DD HH:mm"
-                style="width: 400px; height: 40px; border-radius: 8px;"
+                style="width: 400px; height: 40px; border-radius: 8px"
                 v-model:value="time"
                 :placeholder="['      开始时间', '        结束时间']"
               />
@@ -74,7 +74,7 @@
               <a-input-number
                 :min="0"
                 :precision="0"
-                style="width: 400px; height: 40px; border-radius: 8px;"
+                style="width: 400px; height: 40px; border-radius: 8px"
                 v-model:value="inputV2"
               />
               <span style="color: #999999; margin-left: 8px">分钟</span>
@@ -93,7 +93,7 @@
             <div class="btnbox">
               <a-input
                 v-model:value="inputV3"
-                style="width: 400px; height: 40px; border-radius: 8px;"
+                style="width: 400px; height: 40px; border-radius: 8px"
                 placeholder="请输入活动地点"
                 maxlength="100"
               />
@@ -109,13 +109,14 @@
               </div>
               <span style="margin-right: 3px">活动公告：</span>
             </div>
-            <div class="textarea" >
+            <div class="textarea">
               <a-textarea
                 v-model:value="textV1"
                 placeholder="请输入活动公告"
                 allow-clear
                 :rows="6"
-                show-count :maxlength="200"
+                show-count
+                :maxlength="200"
               />
             </div>
           </div>
@@ -129,7 +130,8 @@
                 placeholder="请输入活动说明"
                 allow-clear
                 :rows="6"
-                show-count :maxlength="200"
+                show-count
+                :maxlength="200"
               />
             </div>
           </div>
@@ -158,7 +160,9 @@
                     "
                     v-model:value="inputV4"
                   />
-                  <span style="color: #999999; margin-left: 8px">分钟允许签到</span>
+                  <span style="color: #999999; margin-left: 8px"
+                    >分钟允许签到</span
+                  >
                 </div>
                 <div class="timerbox">
                   <span>活动开始后：</span>
@@ -174,7 +178,9 @@
                     "
                     v-model:value="inputV5"
                   />
-                  <span style="color: #999999; margin-left: 8px">分钟允许签到</span>
+                  <span style="color: #999999; margin-left: 8px"
+                    >分钟允许签到</span
+                  >
                 </div>
               </div>
               <!-- <div class="qdqtbox">
@@ -214,7 +220,7 @@
                 <a-radio v-model:checked="checked" :value="1" @click="cloradio1"
                   >仅签到
                 </a-radio>-->
-                <!-- <a-radio v-model:checked="checked" :value="2" @click="cloradio1"
+          <!-- <a-radio v-model:checked="checked" :value="2" @click="cloradio1"
                 >签到、签退全部完成
                 </a-radio
                 > 
@@ -222,15 +228,12 @@
             </div>
           </div>-->
 
-          <div class="main_item" style="height:40px;">
+          <div class="main_item" style="height: 40px">
             <div class="signbox">
               <span style="margin-right: 3px"></span>
             </div>
-            <div class="btnbox">
-           
-            </div>
+            <div class="btnbox"></div>
           </div>
-          
         </div>
       </div>
       <div class="main_btns">
@@ -318,7 +321,7 @@ export default {
       textV2: "",
       radioV1: "",
       time: "",
-      isClick: false
+      isClick: false,
     });
     const closeDrawer = () => {
       ctx.emit("update:addactiveVisible", false);
@@ -357,7 +360,8 @@ export default {
       api
         .getActivity(props.EditActiveId)
         .then((res) => {
-          //更新讨论信息
+          console.log("获取活动信息", res);
+          //获取活动信息
           state.inputV1 = res.data.data.activityName;
           state.textV1 = res.data.data.activityNotice;
           state.textV2 = res.data.data.activityExplain;
@@ -387,7 +391,7 @@ export default {
     };
     const updateTask = async (res) => {
       if (props.isLevel == 1) {
-        if(!props.isactive){
+        if (!props.isactive) {
           message.destroy();
           return message.warning("请先选中关卡");
         }
@@ -466,11 +470,11 @@ export default {
         return message.warning("请输入活动地址");
       }
 
-      if(state.isClick){
-          message.destroy();
-          message.error('请勿频繁点击')
-          return
-        }
+      if (state.isClick) {
+        message.destroy();
+        message.error("请勿频繁点击");
+        return;
+      }
       state.isClick = true;
 
       let obj = {
@@ -483,11 +487,12 @@ export default {
         activityNotice: state.textV1, //活动公告
         activityStartTime: dayjs(state.time[0]).format("YYYY-MM-DD HH:mm"), //活动开始时间
         activityTag: "", //活动逻辑删除标识
-        afterSignIn: state.inputV5, //活动开始后多少分钟签到
-        beforeSignIn: state.inputV4, //活动开始前多少分钟签到
+        afterSignIn: state.inputV5 ? state.inputV5 : 0, //活动开始后多少分钟签到
+        beforeSignIn: state.inputV4 ? state.inputV4 : 0, //活动开始前多少分钟签到
         signOutTime: state.inputV6, //签退开始时间
         standardSettings: state.radioV1, //标准设置
       };
+      console.log("obj", obj);
       if (props.edit) {
         //更新编辑活动信息
         api
@@ -526,28 +531,28 @@ export default {
     };
 
     const range = (start, end) => {
-			const result = [];
+      const result = [];
 
-			for (let i = start; i < end; i++) {
-				result.push(i);
-			}
+      for (let i = start; i < end; i++) {
+        result.push(i);
+      }
 
-			return result;
-		};
-      	const disabledDate = (current) => {
-			// Can not select days before today and today
-			console.log('1111', dayjs().endOf('day'))
-			return current && current < dayjs().startOf('day');
-		};
+      return result;
+    };
+    const disabledDate = (current) => {
+      // Can not select days before today and today
+      console.log("1111", dayjs().endOf("day"));
+      return current && current < dayjs().startOf("day");
+    };
+
+    const disabledDateTime = () => {
+      return {
+        disabledHours: () => range(0, 24).splice(4, 20),
+        disabledMinutes: () => range(30, 60),
+        disabledSeconds: () => [55, 56],
+      };
+    };
 
-		const disabledDateTime = () => {
-			return {
-				disabledHours: () => range(0, 24).splice(4, 20),
-				disabledMinutes: () => range(30, 60),
-				disabledSeconds: () => [55, 56],
-			};
-		};
-    
     return {
       ...toRefs(state),
       afterVisibleChange,
@@ -556,9 +561,7 @@ export default {
       cloradio1,
       updateActivityInfo,
       disabledDateTime,
-      disabledDate
-      
-      
+      disabledDate,
     };
   },
 };
@@ -701,7 +704,6 @@ export default {
             }
 
             .setbox {
-            
               flex-wrap: wrap;
               margin-top: 10px;
               margin-bottom: 24px;
diff --git a/src/components/drawers/AddLevelImportStu.vue b/src/components/drawers/AddLevelImportStu.vue
index 68425c9e..49f3d6c0 100644
--- a/src/components/drawers/AddLevelImportStu.vue
+++ b/src/components/drawers/AddLevelImportStu.vue
@@ -18,7 +18,7 @@
       <div class="main">
         <div class="minatitl">
           <div class="up1">请下载</div>
-          <a class="up2" :href="template" target="_blank" style="cursor: pointer">模板</a>
+          <a class="up2" :href="locationHref + template" target="_blank" style="cursor: pointer">模板</a>
           <div class="up1">，按要求填写数据并导入</div>
         </div>
         <div class="upload">
@@ -221,7 +221,11 @@ export default {
   setup(props, ctx) {
     const store = useStore();
     const state = reactive({
-      template: process.env.VUE_APP_FILE_PATH + process.env.VUE_APP_UP_LOAD_STUDENT_TEMPLATE,
+      locationHref:
+        location.href.indexOf("http://") !== -1
+          ? "http://111.231.196.214:12016/"
+          : location.href.slice(0, location.href.indexOf("/m")) + "/upload/",
+      template: process.env.VUE_APP_UP_LOAD_STUDENT_TEMPLATE,
       importStudent:
         process.env.VUE_APP_BASE_API + "/admin/student/importStudent",
       timers: "", // 定时器，用于清空定时器使用
diff --git a/src/components/drawers/AddLive.vue b/src/components/drawers/AddLive.vue
index 7f66403e..bd04ce35 100644
--- a/src/components/drawers/AddLive.vue
+++ b/src/components/drawers/AddLive.vue
@@ -71,7 +71,8 @@
             <div class="btnbox">
               <a-range-picker
                 :show-time="{ format: 'HH:mm' }"
-                :disabled-date="disabledDate" :disabled-time="disabledRangeTime" 
+                :disabled-date="disabledDate"
+                :disabled-time="disabledRangeTime"
                 style="width: 400px; height: 40px; border-radius: 8px"
                 v-model:value="time"
                 format="YYYY/MM/DD HH:mm"
@@ -486,7 +487,7 @@ export default {
       switchC2: false,
       assessmentVisible: false,
       assessmentName: "",
-      isClick: false
+      isClick: false,
     });
     const closeDrawer = () => {
       ctx.emit("update:addliveVisible", false);
@@ -701,11 +702,11 @@ export default {
         message.destroy();
         return message.warning("请输入直播公告");
       }
-      if(state.isClick){
-          message.destroy();
-          message.error('请勿频繁点击')
-          return
-        }
+      if (state.isClick) {
+        message.destroy();
+        message.error("请勿频繁点击");
+        return;
+      }
       state.isClick = true;
 
       const regular = /^[+]{0,1}(\d+)$/;
@@ -722,8 +723,8 @@ export default {
         "Y-M-D h:m"
       );
       state.obj = {
-        afterSignIn: state.inputV6,
-        beforeSignIn: state.inputV7,
+        afterSignIn: state.inputV6 ? state.inputV6 : 0,
+        beforeSignIn: state.inputV7 ? state.inputV7 : 0,
         assessmentId:
           state.assessmentId == null || state.assessmentId == ""
             ? 0
@@ -888,27 +889,27 @@ export default {
       state.isEvaluate = "0";
     };
     const range = (start, end) => {
-			const result = [];
+      const result = [];
 
-			for (let i = start; i < end; i++) {
-				result.push(i);
-			}
+      for (let i = start; i < end; i++) {
+        result.push(i);
+      }
 
-			return result;
-		};
-      	const disabledDate = (current) => {
-			// Can not select days before today and today
-			console.log('1111', dayjs().endOf('day'))
-			return current && current < dayjs().startOf('day');
-		};
+      return result;
+    };
+    const disabledDate = (current) => {
+      // Can not select days before today and today
+      console.log("1111", dayjs().endOf("day"));
+      return current && current < dayjs().startOf("day");
+    };
 
-		const disabledDateTime = () => {
-			return {
-				disabledHours: () => range(0, 24).splice(4, 20),
-				disabledMinutes: () => range(30, 60),
-				disabledSeconds: () => [55, 56],
-			};
-		};
+    const disabledDateTime = () => {
+      return {
+        disabledHours: () => range(0, 24).splice(4, 20),
+        disabledMinutes: () => range(30, 60),
+        disabledSeconds: () => [55, 56],
+      };
+    };
     return {
       ...toRefs(state),
       afterVisibleChange,
@@ -927,7 +928,7 @@ export default {
       showAssessment,
       removePG,
       disabledDateTime,
-      disabledDate
+      disabledDate,
     };
   },
 };
diff --git a/src/components/drawers/ExportScore.vue b/src/components/drawers/ExportScore.vue
index 4ee59150..2a367630 100644
--- a/src/components/drawers/ExportScore.vue
+++ b/src/components/drawers/ExportScore.vue
@@ -6,7 +6,6 @@
     placement="right"
     width="700px"
     @after-visible-change="afterVisibleChange"
-    :zIndex="1000"
   >
     <div class="drawerMain">
       <div class="header">
@@ -20,7 +19,9 @@
       <div class="main">
         <div class="minatitl">
           <div class="up1">请下载</div>
-          <div class="up2" @click="downTemplate" style="cursor:pointer">模板</div>
+          <div class="up2" @click="downTemplate" style="cursor: pointer">
+            模板
+          </div>
           <div class="up1">，按要求填写数据并导入</div>
         </div>
         <div class="upload">
@@ -218,7 +219,7 @@ export default {
     const state = reactive({
       fileType: ["xls", "xlsx"],
       importHomeWork:
-        process.env.VUE_APP_BASE_API + "admin/student/importHomeWork",
+        process.env.VUE_APP_BASE_API + "/admin/student/importHomeWork",
       uploadpercent: -1,
       uploadErr: false, //上传失败
       addLoading: false,
@@ -226,10 +227,6 @@ export default {
       succNum: 0, //成功数据数
       errNum: 0, //失败数据数
       downloadErrUrl: null, //下载失败数据
-      locationHref:
-        location.href.indexOf("http://") !== -1
-          ? "http://111.231.196.214:12016/"
-          : location.href.slice(0, location.href.indexOf("/m")) + "/upload/",
       userId: store.state.userInfo.id,
       userName: store.state.userInfo.realName,
       fileName: "",
@@ -350,13 +347,15 @@ export default {
     };
     // 下载失败数据
     const downloadEeeorData = () => {
-      console.log(state.locationHref + state.downloadErrUrl);
       if (state.downloadErrUrl !== "") {
         window.open(process.env.VUE_APP_FILE_PATH + state.downloadErrUrl);
       }
     };
-    function downTemplate(){
-      window.open(process.env.VUE_APP_FILE_PATH + process.env.VUE_APP_UP_LOAD_HOMEWORK_TEMPLATE)
+    function downTemplate() {
+      window.open(
+        process.env.VUE_APP_FILE_PATH +
+          process.env.VUE_APP_UP_LOAD_HOMEWORK_TEMPLATE
+      );
     }
 
     return {
diff --git a/src/components/drawers/project/ProjectFaceStu.vue b/src/components/drawers/project/ProjectFaceStu.vue
index 1f3db7e2..49e56635 100644
--- a/src/components/drawers/project/ProjectFaceStu.vue
+++ b/src/components/drawers/project/ProjectFaceStu.vue
@@ -109,7 +109,7 @@
             <div class="wz">导出数据</div>
           </div>
         </div>
-       <!-- <div class="line">
+        <!-- <div class="line">
           <div class="inline">
             <div class="left">
               <div class="img"></div>
@@ -173,7 +173,7 @@
           />
         </div> -->
       </div>
-        <!--
+      <!--
       <div class="btnn">
         <button class="btn1" @click="closeDrawer">取消</button>
         <button class="btn2" @click="closeDrawer">确定</button>
@@ -431,10 +431,10 @@ export default {
         title: "【签到】二维码",
         name: props.projectTaskInfo?.name,
         url:
-          process.env.VUE_APP_BOE_API_URL +
+          process.env.VUE_APP_BASE_API +
           `/admin/student/studentSign?taskId=${
             props.projectTaskInfo.projectTaskId
-          }&type=${1}`,
+          }&taskType=${props.projectTaskInfo.type}&type=${1}`,
       };
       console.log("codeInfo", state.codeInfo);
       state.codeIndex = 0;
@@ -869,7 +869,9 @@ export default {
           process.env.VUE_APP_BASE_API
         }/admin/student/exportTaskStudent?currentStageId=${
           props.projectTaskInfo.stageId
-        }&type=${1}&pid=${props.projectTaskInfo.projectId}&taskType=2&thirdType=2`
+        }&type=${1}&pid=${
+          props.projectTaskInfo.projectId
+        }&taskType=2&thirdType=2`
       );
       // api
       //   .exportTaskStudent({
diff --git a/src/components/drawers/router/RouterFaceStu.vue b/src/components/drawers/router/RouterFaceStu.vue
index dc86540f..0723232f 100644
--- a/src/components/drawers/router/RouterFaceStu.vue
+++ b/src/components/drawers/router/RouterFaceStu.vue
@@ -167,7 +167,7 @@
           />
         </div> -->
       </div>
-        <!--
+      <!--
       <div class="btnn">
         <button class="btn1" @click="closeDrawer">取消</button>
         <button class="btn2" @click="closeDrawer">确定</button>
@@ -846,10 +846,10 @@ export default {
         title: "【签到】二维码",
         name: props.datasource?.name,
         url:
-          process.env.VUE_APP_BOE_API_URL +
+          process.env.VUE_APP_BASE_API +
           `/admin/student/studentSign?taskId=${
             props.datasource.routerTaskId
-          }&type=${2}`,
+          }&taskType=${props.datasource.type}&type=${2}`,
       };
       console.log("codeInfo", state.codeInfo);
       state.codeIndex = 0;
diff --git a/src/components/drawers/router/RouterFaceTeachManage.vue b/src/components/drawers/router/RouterFaceTeachManage.vue
index 2e5a40fd..9d9c85de 100644
--- a/src/components/drawers/router/RouterFaceTeachManage.vue
+++ b/src/components/drawers/router/RouterFaceTeachManage.vue
@@ -624,7 +624,7 @@ export default {
         `${
           process.env.VUE_APP_BASE_API}/admin/student/exportTaskStudent?currentStageId=${
           props.datasource.chapterId
-        }&type=${2}&pid=${props.datasource.routerId}&taskType=${1}`
+        }&type=${2}&pid=${props.datasource.routerId}&taskType=${2}`
       );
       // api
       //   .exportTaskStudent({
diff --git a/src/components/student/CommonStudent.vue b/src/components/student/CommonStudent.vue
index d65ec181..894b2f23 100644
--- a/src/components/student/CommonStudent.vue
+++ b/src/components/student/CommonStudent.vue
@@ -341,7 +341,7 @@
   </a-modal>
  -->
   <a-modal
-    style="padding: 0"
+    :style="{padding: 0,position: relative,right: - (screenWidth/2 - 660) + 'px',}"
     :closable="true"
     :visible="stageVisible"
     :footer="null"
@@ -560,6 +560,7 @@ const stuSelectKeys = ref([]);
 const orgSelectKeys = ref([]);
 const auditSelectKeys = ref([]);
 const screenHeight = ref(document.body.clientHeight);
+const screenWidth = ref(document.body.clientWidth);
 const stuRowSelection = computed(() => ({
   columnWidth: 20,
   selectedRowKeys: stuSelectKeys.value,
diff --git a/src/components/student/TableStudent.vue b/src/components/student/TableStudent.vue
index 3caf3865..7b847b60 100644
--- a/src/components/student/TableStudent.vue
+++ b/src/components/student/TableStudent.vue
@@ -14,7 +14,7 @@
           />
         </a-form-item>
       </a-col>
-     <!-- <a-col v-if="type === 1">
+      <!-- <a-col v-if="type === 1">
         <a-form-item title="小组名称：">
           <a-input
             class="cus-input"
@@ -50,7 +50,11 @@
         </a-form-item>
       </a-col>
       <a-col>
-        <a-button class="cus-btn" style="width: 100px" @click="getStuList">
+        <a-button
+          class="cus-btn"
+          style="background: #4ea6ff; color: #fff; width: 100px"
+          @click="getStuList"
+        >
           <template #icon>
             <img
               style="margin-right: 10px"
@@ -60,8 +64,13 @@
         </a-button>
       </a-col>
       <a-col :span="2">
-        <a-button class="cus-btn white" style="width: 100px" @click="reset"
-          >重置
+        <a-button class="cus-btn white" style="width: 100px" @click="reset">
+          <template #icon>
+            <img
+              style="margin-right: 10px"
+              src="../../assets/images/leveladd/reset.png"
+          /></template>
+          重置
         </a-button>
       </a-col>
     </a-row>
@@ -78,7 +87,7 @@
           @finash="submitCall"
           :stage="stage"
         >
-          <a-button class="cus-btn">
+          <a-button class="cus-btn" style="background: #4ea6ff; color: #fff">
             <template #icon
               ><img
                 style="margin-right: 10px"
@@ -146,9 +155,10 @@
               <div class="btn4_tit" @click="showEScoreModal">
                 <span>批量录入成绩</span>
               </div>
-              <div class="btn4_op1" @click="updateStatus(1)">
+              <!--2023-1-12 隐藏 后面放开 -->
+              <!-- <div class="btn4_op1" @click="updateStatus(1)">
                 <span>批量结业</span>
-              </div>
+              </div> -->
               <div class="btn4_op2" @click="updateStatus(0)">
                 <span>批量通过</span>
               </div>
@@ -506,7 +516,8 @@ function exportTaskStu() {
   console.log("props.datasource", props.datasource);
   window.open(
     `${
-      process.env.VUE_APP_BASE_API}/admin/student/exportTaskStudent?type=${1}&pid=${props.id}&taskType=0`
+      process.env.VUE_APP_BASE_API
+    }/admin/student/exportTaskStudent?type=${1}&pid=${props.id}&taskType=0`
   );
 }
 
@@ -682,15 +693,13 @@ const exportHomeWorkShow = () => {
     taskType: 0,
     type: 3,
   };
-  api
-    .exportHomeWork(obj)
-    .then((res) => {
-      console.log("导出作业", res.data.data);
-      //message.destroy();
-     // message.success("导出作业成功");
-      exportHomeWorkV.value = true;
-      downloadUrl.value = res.data.data;
-    })
+  api.exportHomeWork(obj).then((res) => {
+    console.log("导出作业", res.data.data);
+    //message.destroy();
+    // message.success("导出作业成功");
+    exportHomeWorkV.value = true;
+    downloadUrl.value = res.data.data;
+  });
 };
 // //导出作业
 // const exportHomeWork = () => {
@@ -704,7 +713,8 @@ const exportHomeWorkShow = () => {
 const exportStu = () => {
   window.open(
     `${
-      process.env.VUE_APP_BASE_API}/admin/student/exportTaskStudent?type=${3}&pid=${props.id}&thirdType=2`
+      process.env.VUE_APP_BASE_API
+    }/admin/student/exportTaskStudent?type=${3}&pid=${props.id}&thirdType=2`
   );
 };
 
diff --git a/src/views/DownLoad.vue b/src/views/DownLoad.vue
index b242b371..2507bdb2 100644
--- a/src/views/DownLoad.vue
+++ b/src/views/DownLoad.vue
@@ -124,7 +124,6 @@ export default {
       total: 0,
       capacity: 0,
       countCMB: 0,
-      locationHref: location.href.indexOf('http://') !== -1 ? 'http://111.231.196.214:12016/' : location.href.slice(0, location.href.indexOf('/m')) + '/upload/'
     });
 
     function getData() {
@@ -180,7 +179,7 @@ export default {
     // 下载文件
     function downLoadFile(data) {
       console.log(data)
-      window.open(state.locationHref + data.url)
+      window.open(process.env.VUE_APP_FILE_PATH + data.url)
     }
     // 删除文件
     function removeFile(data) {
diff --git a/src/views/courselibrary/CoursewareManage.vue b/src/views/courselibrary/CoursewareManage.vue
index 8c921fd0..7afdf2ed 100644
--- a/src/views/courselibrary/CoursewareManage.vue
+++ b/src/views/courselibrary/CoursewareManage.vue
@@ -1659,7 +1659,7 @@
       :footer="null"
       :closable="false"
       wrapClassName="modalStyle stusmanageModal"
-      width="80%"
+      width="90%"
       @cancel="sm_exit"
     >
       <div class="modalHeader">
@@ -2030,7 +2030,11 @@
             <div class="qrm_btn btn1" @click="rg_exit">
               <div class="btnText">取消</div>
             </div>
-            <div class="qrm_btn btn2" @click="handleJoin">
+            <div
+              class="qrm_btn btn2"
+              style="background-color: #4ea6ff; color: #ffffff"
+              @click="handleJoin"
+            >
               <div class="btnText">确定</div>
             </div>
           </div>
@@ -3067,7 +3071,8 @@ export default defineComponent({
           dataIndex: "evastatus",
           key: "8",
           align: "center",
-          customRender: ({record}) => record.assessmentStatus ? '已评估' : '未评估'
+          customRender: ({ record }) =>
+            record.assessmentStatus ? "已评估" : "未评估",
         },
         {
           title: "作业成绩",
@@ -3118,14 +3123,15 @@ export default defineComponent({
           key: "8",
           align: "center",
         },
-        {
-          title: "结业状态",
-          width: "15%",
-          dataIndex: "completionStatus",
-          key: "8",
-          align: "center",
-          customRender: ({ record }) => <div>{{1:'结业'}[record.completionStatus] || '-'}</div>,
-        },
+        // 2023-1-12 隐藏 后面放开
+        // {
+        //   title: "结业状态",
+        //   width: "15%",
+        //   dataIndex: "completionStatus",
+        //   key: "8",
+        //   align: "center",
+        //   customRender: ({ record }) => <div>{{1:'结业'}[record.completionStatus] || '-'}</div>,
+        // },
       ],
       shipType: 1,
       addLoading: false,
@@ -4755,7 +4761,7 @@ export default defineComponent({
     };
 
     const handleJoin = async () => {
-      state.lrcj_inputV1 || message.error("请输入成绩")
+      state.lrcj_inputV1 || message.error("请输入成绩");
       if (state.rg_hs) {
         if (state.piliang) {
           api1.updateStudent({
@@ -5548,7 +5554,7 @@ export default defineComponent({
         url:
           type == 1
             ? process.env.VUE_APP_COURSE_STUDY + record.offcourseId
-            : process.env.VUE_APP_BOE_API_URL +
+            : process.env.VUE_APP_BASE_API +
               `/admin/student/studentSign?taskId=${
                 record.offcoursePlanId
               }&type=${3}`,
@@ -5840,8 +5846,6 @@ export default defineComponent({
       }
 
       .btn1 {
-        
-
         .search {
           background-image: url("../../assets/images/courseManage/search0.png");
         }
@@ -5850,7 +5854,7 @@ export default defineComponent({
           color: #ffffff;
         }
       }
-/** 
+      /** 
       .btn1:active {
         background: #0982ff;
       }
@@ -5894,11 +5898,7 @@ export default defineComponent({
         }
       }
 
-   
-
       .btn3 {
-
-
         .search {
           width: 17px;
           height: 18px;
@@ -5909,7 +5909,6 @@ export default defineComponent({
           color: #ffffff;
         }
       }
-     
     }
   }
 
@@ -6951,7 +6950,7 @@ export default defineComponent({
                     }
                   }
 
-                  .btn2{
+                  .btn2 {
                     background: rgba(64, 158, 255, 1);
 
                     .search {
@@ -7571,9 +7570,7 @@ export default defineComponent({
                 }
               }
 
-              .btn1{
-               
-
+              .btn1 {
                 .search {
                   background-image: url("../../assets/images/courseManage/search0.png");
                 }
@@ -7582,7 +7579,7 @@ export default defineComponent({
                   color: #ffffff;
                 }
               }
-/** 
+              /** 
               .btn1:active {
                 background: #0982ff;
               }
@@ -7624,19 +7621,15 @@ export default defineComponent({
                     margin-left: 5px;
                   }
                   .btn2 {
-                  margin-right: 0px;
+                    margin-right: 0px;
 
-                  .img2 {
-                    width: 17px;
-                    height: 18px;
-                    background-image: url(../../assets/images/coursewareManage/export1.png);
+                    .img2 {
+                      width: 17px;
+                      height: 18px;
+                      background-image: url(../../assets/images/coursewareManage/export1.png);
+                    }
                   }
                 }
-                }
-
-             
-
-             
               }
             }
 
@@ -7793,7 +7786,7 @@ export default defineComponent({
 
 .stusmanageModal {
   .ant-modal {
-    max-width: 1700px;
+    max-width: 1800px;
     .ant-modal-content {
       // width:1358px !important;
       .ant-modal-body {
diff --git a/src/views/learningpath/LevelAdd.vue b/src/views/learningpath/LevelAdd.vue
index f434f414..0b8be830 100644
--- a/src/views/learningpath/LevelAdd.vue
+++ b/src/views/learningpath/LevelAdd.vue
@@ -51,7 +51,7 @@
           <!-- 概览（无数据） -->
           <div :style="{ display: 'block' }">
             <div class="onerow">
-              <div class="taskmain">快速创建项目详情</div>
+              <div class="taskmain">快速创建路径图详情</div>
             </div>
             <div class="second">
               <div @click="totask">
@@ -536,9 +536,8 @@
           <div class="split"></div>
 
           <a-tabs>
-
-
-            <a-tab-pane key="1" tab="基本信息">
+            <!-- 2023-1-12 隐藏 后面放开 -->
+            <!-- <a-tab-pane key="1" tab="基本信息">
               <div class="sametab">
                 <div class="Gcon">
                   <div class="pad"></div>
@@ -634,8 +633,7 @@
                   </div>
                 </div>
               </div>
-            </a-tab-pane>
-
+            </a-tab-pane> -->
 
             <a-tab-pane key="2" tab="共享文档">
               <div class="sametab">
@@ -668,7 +666,13 @@
                         >
                         <img
                           src="@/assets/images/basicinfo/cloud.png"
-                          style="cursor: pointer; width: 24px; height: 24px; margin-left: 8px;margin-bottom: 3px;"
+                          style="
+                            cursor: pointer;
+                            width: 24px;
+                            height: 24px;
+                            margin-left: 8px;
+                            margin-bottom: 3px;
+                          "
                           alt=""
                         />
                       </a-upload>
@@ -694,7 +698,6 @@
                         "
                         class="docListStyle"
                       >
-                      
                         <!-- <img
                           src="@/assets/images/basicinfo/download.png"
                           style="
@@ -705,26 +708,74 @@
                           "
                           alt=""
                         /> -->
-                        <img v-if="
-                              item.name.indexOf('jpg') !== -1 ||
-                              item.name.indexOf('jpeg') !== -1 ||
-                              item.name.indexOf('png') !== -1
-                            " 
-                            style="width: 27px;height: 32px;margin-right: 40px;"
-                            src="@/assets/images/coursewareManage/pngpic.png" />
+                        <img
+                          v-if="
+                            item.name.indexOf('jpg') !== -1 ||
+                            item.name.indexOf('jpeg') !== -1 ||
+                            item.name.indexOf('png') !== -1
+                          "
+                          style="width: 27px; height: 32px; margin-right: 40px"
+                          src="@/assets/images/coursewareManage/pngpic.png"
+                        />
                         <div v-else>
-                          <img v-if="item.name.indexOf('doc') !== -1"  style="width: 27px;height: 32px;margin-right: 40px;" src="@/assets/images/coursewareManage/docpic.png" />
+                          <img
+                            v-if="item.name.indexOf('doc') !== -1"
+                            style="
+                              width: 27px;
+                              height: 32px;
+                              margin-right: 40px;
+                            "
+                            src="@/assets/images/coursewareManage/docpic.png"
+                          />
                           <div v-else>
-                            <img v-if="item.name.indexOf('xls') !== -1"  style="width: 27px;height: 32px;margin-right: 40px;" src="@/assets/images/coursewareManage/xlspic.png" />
+                            <img
+                              v-if="item.name.indexOf('xls') !== -1"
+                              style="
+                                width: 27px;
+                                height: 32px;
+                                margin-right: 40px;
+                              "
+                              src="@/assets/images/coursewareManage/xlspic.png"
+                            />
                             <div v-else>
-                              <img v-if="item.name.indexOf('ppt') !== -1"  style="width: 27px;height: 32px;margin-right: 40px;" src="@/assets/images/coursewareManage/pptpic.png" />
+                              <img
+                                v-if="item.name.indexOf('ppt') !== -1"
+                                style="
+                                  width: 27px;
+                                  height: 32px;
+                                  margin-right: 40px;
+                                "
+                                src="@/assets/images/coursewareManage/pptpic.png"
+                              />
                               <div v-else>
-                                <img v-if="item.name.indexOf('pdf') !== -1"  style="width: 27px;height: 32px;margin-right: 40px;" src="@/assets/images/coursewareManage/pdfpic.png" />
+                                <img
+                                  v-if="item.name.indexOf('pdf') !== -1"
+                                  style="
+                                    width: 27px;
+                                    height: 32px;
+                                    margin-right: 40px;
+                                  "
+                                  src="@/assets/images/coursewareManage/pdfpic.png"
+                                />
                                 <div v-else>
-                                  <img v-if="item.name.indexOf('zip') !== -1"
-                                    style="width: 27px;height: 32px;margin-right: 40px;"
-                                    src="@/assets/images/coursewareManage/zippic.png" />
-                                  <img v-else  style="width: 27px;height: 32px;margin-right: 40px;" src="@/assets/images/coursewareManage/docpic.png" />
+                                  <img
+                                    v-if="item.name.indexOf('zip') !== -1"
+                                    style="
+                                      width: 27px;
+                                      height: 32px;
+                                      margin-right: 40px;
+                                    "
+                                    src="@/assets/images/coursewareManage/zippic.png"
+                                  />
+                                  <img
+                                    v-else
+                                    style="
+                                      width: 27px;
+                                      height: 32px;
+                                      margin-right: 40px;
+                                    "
+                                    src="@/assets/images/coursewareManage/docpic.png"
+                                  />
                                 </div>
                               </div>
                             </div>
@@ -742,7 +793,11 @@
                           :title="item.name"
                           >{{ item.name }}</span
                         >
-                        <a :href="item.response?item.response.data:''" style="margin-left: 5px">下载</a>
+                        <a
+                          :href="item.response ? item.response.data : ''"
+                          style="margin-left: 5px"
+                          >下载</a
+                        >
                         <span
                           style="color: #4ea6ff; cursor: pointer"
                           @click="deFile(item.uid)"
@@ -756,7 +811,6 @@
             </a-tab-pane>
           </a-tabs>
         </a-tab-pane>
-  
       </a-tabs>
 
       <a-modal
@@ -1428,7 +1482,10 @@ export default {
       evaluationLevelName: "",
 
       facestudent: "",
-      locationHref: location.href.indexOf('http://') !== -1 ? 'http://111.231.196.214:12016/' : location.href.slice(0, location.href.indexOf('/m')) + '/upload/'
+      locationHref:
+        location.href.indexOf("http://") !== -1
+          ? "http://111.231.196.214:12016/"
+          : location.href.slice(0, location.href.indexOf("/m")) + "/upload/",
     });
 
     const levelList = reactive({
@@ -2048,7 +2105,7 @@ export default {
         .then((res) => {
           console.log("router-list", res);
           state.fileList = JSON.parse(res.data.data.routerInfo.attach);
-          console.log('asdasdasd-------->',state.fileList)
+          console.log("asdasdasd-------->", state.fileList);
           state.docChecked =
             res.data.data.routerInfo.attachSwitch == 1 ? true : false;
           if (res.data.data.routerInfo.status == 1) {
diff --git a/src/views/learningpath/LevelAddDetail.vue b/src/views/learningpath/LevelAddDetail.vue
index 7cafbf82..f6426dd1 100644
--- a/src/views/learningpath/LevelAddDetail.vue
+++ b/src/views/learningpath/LevelAddDetail.vue
@@ -689,7 +689,13 @@
                       </div>
                     </div>
                     <div style="width: 87px; text-align: center">
-                      {{ element.cretime ? element.cretime + "分钟" : "-" }}
+                      <!-- {{ element.cretime ? element.cretime + "分钟" : "-" }} -->
+                        {{
+														element.cretime
+															? 
+															element.type==1? Math.ceil(Number(element.cretime)/60) + "分钟" : element.cretime + "分钟"
+															: "-"
+												}}
                     </div>
                     <div
                       style="
diff --git a/src/views/projectcenter/ProjectManage.vue b/src/views/projectcenter/ProjectManage.vue
index c754afae..c47725c3 100644
--- a/src/views/projectcenter/ProjectManage.vue
+++ b/src/views/projectcenter/ProjectManage.vue
@@ -6,41 +6,41 @@
       <div class="filterItems">
         <div class="select">
           <a-input
-              v-model:value="searchParam.name"
-              style="width: 270px; height: 40px; border-radius: 8px"
-              placeholder="请输入项目名称"
-              allowClear
-              showSearch
+            v-model:value="searchParam.name"
+            style="width: 270px; height: 40px; border-radius: 8px"
+            placeholder="请输入项目名称"
+            allowClear
+            showSearch
           >
           </a-input>
         </div>
         <div class="select">
           <a-input
-              v-model:value="searchParam.manager"
-              style="width: 270px; height: 40px; border-radius: 8px"
-              placeholder="请输入项目经理"
-              allowClear
-              showSearch
+            v-model:value="searchParam.manager"
+            style="width: 270px; height: 40px; border-radius: 8px"
+            placeholder="请输入项目经理"
+            allowClear
+            showSearch
           >
           </a-input>
         </div>
         <div class="select">
           <a-input
-              v-model:value="searchParam.createName"
-              style="width: 270px; height: 40px; border-radius: 8px"
-              placeholder="请输入项目创建人"
-              allowClear
-              showSearch
+            v-model:value="searchParam.createName"
+            style="width: 270px; height: 40px; border-radius: 8px"
+            placeholder="请输入项目创建人"
+            allowClear
+            showSearch
           >
           </a-input>
         </div>
         <div class="select">
           <a-select
-              v-model:value="searchParam.searchStatus"
-              style="width: 270px"
-              placeholder="请选择状态"
-              :options="sProjectStateList"
-              allowClear
+            v-model:value="searchParam.searchStatus"
+            style="width: 270px"
+            placeholder="请选择状态"
+            :options="sProjectStateList"
+            allowClear
           ></a-select>
         </div>
         <div class="select addTimeBox">
@@ -55,8 +55,13 @@
               :placeholder="['      开始时间', '        结束时间']"
 
           />-->
-          <a-range-picker v-model:value="searchParam.valueDate" style="width: 420px" format="YYYY-MM-DD" separator="至"
-								:placeholder="['      开始时间', '        结束时间']" />
+          <a-range-picker
+            v-model:value="searchParam.valueDate"
+            style="width: 420px"
+            format="YYYY-MM-DD"
+            separator="至"
+            :placeholder="['      开始时间', '        结束时间']"
+          />
         </div>
         <div style="display: flex; margin-bottom: 20px">
           <div class="btnn btn1" @click="searchSubmit">
@@ -80,26 +85,26 @@
     <!-- 表格 -->
     <div class="tableBox">
       <a-table
-          :columns="columns"
-          :data-source="tableData"
-          :loading="tableLoading"
-          :scroll="{ x: 700 }"
-          @expand="expandTable"
-          :pagination="false"
+        :columns="columns"
+        :data-source="tableData"
+        :loading="tableLoading"
+        :scroll="{ x: 700 }"
+        @expand="expandTable"
+        :pagination="false"
       >
       </a-table>
       <div class="tableBox">
         <div class="pa">
           <a-pagination
-              v-if="tableDataTotal > 10"
-              :showSizeChanger="false"
-              showQuickJumper="true"
-              hideOnSinglePage="true"
-              :pageSize="pageSize"
-              v-model:current="searchParam.pageNo"
-              :total="tableDataTotal"
-              class="pagination"
-              @change="changePagination"
+            v-if="tableDataTotal > 10"
+            :showSizeChanger="false"
+            showQuickJumper="true"
+            hideOnSinglePage="true"
+            :pageSize="pageSize"
+            v-model:current="searchParam.pageNo"
+            :total="tableDataTotal"
+            class="pagination"
+            @change="changePagination"
           />
         </div>
       </div>
@@ -108,18 +113,18 @@
     <!-- 无项目 -->
     <div class="tableBox" style="display: none">
       <div
-          class="taskbox"
-          @click="showModal1"
-          style="background: linear-gradient(180deg, #ddeaff, #f0f8fe)"
+        class="taskbox"
+        @click="showModal1"
+        style="background: linear-gradient(180deg, #ddeaff, #f0f8fe)"
       >
         <div class="leftt">
-          <img src="../../assets/images/taskpage/left2.png"/>
+          <img src="../../assets/images/taskpage/left2.png" />
         </div>
         <div class="photo">
-          <img src="../../assets/images/projectadd/nopro.png"/>
+          <img src="../../assets/images/projectadd/nopro.png" />
         </div>
         <div class="rightt">
-          <img src="../../assets/images/taskpage/right2.png"/>
+          <img src="../../assets/images/taskpage/right2.png" />
         </div>
         <div class="centerbox" style="color: rgba(78, 166, 255, 1)">
           创建项目
@@ -130,18 +135,18 @@
     <!-- 创建多层项目弹窗 -->
     <div>
       <a-modal
-          v-model:visible="doublepro"
-          :title="null"
-          @ok="closeModal2"
-          :footer="null"
-          :closable="false"
-          wrapClassName="doublepro"
-          width="624px"
-          height="476px"
+        v-model:visible="doublepro"
+        :title="null"
+        @ok="closeModal2"
+        :footer="null"
+        :closable="false"
+        wrapClassName="doublepro"
+        width="624px"
+        height="476px"
       >
         <div
-            class="modalHeader"
-            style="
+          class="modalHeader"
+          style="
             width: 100%;
             height: 68px;
             display: flex;
@@ -151,50 +156,50 @@
         >
           <div class="headerLeft" style="margin-left: 32px">
             <span class="headerLeftText" style="font-size: 16px"
-            >{{ projectInfo.projectId ? "编辑" : "创建" }}多层项目</span
+              >{{ projectInfo.projectId ? "编辑" : "创建" }}多层项目</span
             >
           </div>
           <div style="cursor: pointer; margin-right: 32px" @click="closeModal2">
             <img
-                style="width: 22px; height: 22px"
-                src="../../assets/images/basicinfo/close22.png"
+              style="width: 22px; height: 22px"
+              src="../../assets/images/basicinfo/close22.png"
             />
           </div>
         </div>
         <div class="modalMain">
           <div
-              style="margin-left: 40px; margin-top: 40px; width: 78%"
-              v-if="projectInfo.parentName"
+            style="margin-left: 40px; margin-top: 40px; width: 78%"
+            v-if="projectInfo.parentName"
           >
             <span style="color: #000000; font-size: 14px">项目归属：</span>
             <span style="color: #999999; font-size: 14px; margin-left: 10px">{{
-                projectInfo.parentName
-              }}</span>
+              projectInfo.parentName
+            }}</span>
           </div>
           <div class="name">
             <div class="star" style="margin-top: -4px">
               <img
-                  style="width: 10px; height: 10px"
-                  src="../../assets/images/basicinfo/asterisk.png"
+                style="width: 10px; height: 10px"
+                src="../../assets/images/basicinfo/asterisk.png"
               />
             </div>
             <div class="inname">项目名称:</div>
             <div class="in pro">
               <NameInput
-                  placeholder="请输入项目名称"
-                  v-model:value="projectInfo.name"
-                  v-model:validate="projectInfo.validate"
-                  :maxlength="30"
-                  show-count
-                  :id="projectInfo.projectId"
+                placeholder="请输入项目名称"
+                v-model:value="projectInfo.name"
+                v-model:validate="projectInfo.validate"
+                :maxlength="30"
+                show-count
+                :id="projectInfo.projectId"
               ></NameInput>
             </div>
           </div>
           <div class="name">
             <div class="star" style="margin-top: -4px">
               <img
-                  style="width: 10px; height: 10px"
-                  src="../../assets/images/basicinfo/asterisk.png"
+                style="width: 10px; height: 10px"
+                src="../../assets/images/basicinfo/asterisk.png"
               />
             </div>
             <div class="inname">培训分类:</div>
@@ -205,40 +210,40 @@
           <div class="name">
             <div class="star" style="margin-top: -4px">
               <img
-                  style="width: 10px; height: 10px"
-                  src="../../assets/images/basicinfo/asterisk.png"
+                style="width: 10px; height: 10px"
+                src="../../assets/images/basicinfo/asterisk.png"
               />
             </div>
             <div class="inname">项目经理:</div>
             <div class="in">
               <ProjectManager
-                  v-model:value="projectInfo.managerId"
-                  v-model:name="projectInfo.manager"
-                  @onChange="managerChange"
-                  mode="multiple"
+                v-model:value="projectInfo.managerId"
+                v-model:name="projectInfo.manager"
+                @onChange="managerChange"
+                mode="multiple"
               ></ProjectManager>
             </div>
           </div>
           <div class="name">
             <div class="star" style="margin-top: -4px">
               <img
-                  style="width: 10px; height: 10px"
-                  src="../../assets/images/basicinfo/asterisk.png"
+                style="width: 10px; height: 10px"
+                src="../../assets/images/basicinfo/asterisk.png"
               />
             </div>
             <div class="inname">资源归属:</div>
             <div class="in select">
               <OrgClass
-                  v-model:value="projectInfo.sourceBelongId"
-                  v-model:name="projectInfo.sourceBelongName"
-                  v-model:fullName="projectInfo.sourceBelongFullName"
+                v-model:value="projectInfo.sourceBelongId"
+                v-model:name="projectInfo.sourceBelongName"
+                v-model:fullName="projectInfo.sourceBelongFullName"
               ></OrgClass>
             </div>
           </div>
           <div class="pubtn">
             <a-button class="pubtn1" @click="closeModal2">取消</a-button>
             <a-button class="pubtn2" @click="createStoreyProject"
-            >确定
+              >确定
             </a-button>
           </div>
         </div>
@@ -247,18 +252,18 @@
     <!-- 创建多层项目弹窗 -->
     <div>
       <a-modal
-          v-model:visible="sonproject"
-          :title="null"
-          @ok="closeModal"
-          :footer="null"
-          :closable="false"
-          wrapClassName="sonproject"
-          width="764px"
-          height="356px"
+        v-model:visible="sonproject"
+        :title="null"
+        @ok="closeModal"
+        :footer="null"
+        :closable="false"
+        wrapClassName="sonproject"
+        width="764px"
+        height="356px"
       >
         <div
-            class="modalHeader"
-            style="
+          class="modalHeader"
+          style="
             width: 100%;
             height: 68px;
             display: flex;
@@ -268,53 +273,53 @@
         >
           <div class="headerLeft" style="margin-left: 32px">
             <span class="headerLeftText" style="font-size: 16px"
-            >请选择项目类别1</span
+              >请选择项目类别1</span
             >
           </div>
           <div style="cursor: pointer; margin-right: 32px" @click="closeModal">
             <img
-                style="width: 22px; height: 22px"
-                src="../../assets/images/basicinfo/close22.png"
+              style="width: 22px; height: 22px"
+              src="../../assets/images/basicinfo/close22.png"
             />
           </div>
         </div>
         <div class="modalMain">
           <div
-              @click="createChildProject"
-              class="taskbox"
-              style="
+            @click="createChildProject"
+            class="taskbox"
+            style="
               margin-right: 24px;
               background: linear-gradient(180deg, #ddeaff 0%, #f0f8fe 100%);
             "
           >
             <div class="leftt">
-              <img src="../../assets/images/taskpage/left2.png"/>
+              <img src="../../assets/images/taskpage/left2.png" />
             </div>
             <div class="photo">
-              <img src="../../assets/images/taskpage/picture4.png"/>
+              <img src="../../assets/images/taskpage/picture4.png" />
             </div>
             <div class="rightt">
-              <img src="../../assets/images/taskpage/right2.png"/>
+              <img src="../../assets/images/taskpage/right2.png" />
             </div>
             <div class="centerbox" style="color: rgba(78, 166, 255, 1)">
               单层子项目
             </div>
           </div>
           <div
-              class="taskbox"
-              @click="showModal3"
-              style="
+            class="taskbox"
+            @click="showModal3"
+            style="
               background: linear-gradient(180deg, #fef3dd 0%, #fffaf0 100%);
             "
           >
             <div class="leftt">
-              <img src="../../assets/images/taskpage/left1.png"/>
+              <img src="../../assets/images/taskpage/left1.png" />
             </div>
             <div class="photo">
-              <img src="../../assets/images/taskpage/picture5.png"/>
+              <img src="../../assets/images/taskpage/picture5.png" />
             </div>
             <div class="rightt">
-              <img src="../../assets/images/taskpage/right1.png"/>
+              <img src="../../assets/images/taskpage/right1.png" />
             </div>
             <div class="centerbox" style="color: rgba(255, 182, 78, 1)">
               多层子项目
@@ -328,18 +333,18 @@
     <div>
       <div>
         <a-modal
-            v-model:visible="estabish"
-            :title="null"
-            @ok="closeModal1"
-            :footer="null"
-            :closable="false"
-            wrapClassName="estabish"
-            width="638px"
-            height="468px"
+          v-model:visible="estabish"
+          :title="null"
+          @ok="closeModal1"
+          :footer="null"
+          :closable="false"
+          wrapClassName="estabish"
+          width="638px"
+          height="468px"
         >
           <div
-              class="modalHeader"
-              style="
+            class="modalHeader"
+            style="
               width: 100%;
               height: 68px;
               display: flex;
@@ -349,39 +354,39 @@
           >
             <div class="headerLeft" style="margin-left: 32px">
               <span class="headerLeftText" style="font-size: 16px"
-              >请选择项目类别</span
+                >请选择项目类别</span
               >
             </div>
             <div
-                style="cursor: pointer; margin-right: 32px"
-                @click="closeModal1"
+              style="cursor: pointer; margin-right: 32px"
+              @click="closeModal1"
             >
               <img
-                  style="width: 22px; height: 22px"
-                  src="../../assets/images/basicinfo/close22.png"
+                style="width: 22px; height: 22px"
+                src="../../assets/images/basicinfo/close22.png"
               />
             </div>
           </div>
           <div class="modalMain">
             <router-link
-                :to="`/projectadd?parentId=${
+              :to="`/projectadd?parentId=${
                 projectInfo.parentId || ''
               }&parentName=${projectInfo.parentName || ''}`"
             >
               <div
-                  class="taskbox"
-                  style="
+                class="taskbox"
+                style="
                   background: linear-gradient(180deg, #ddeaff 0%, #f0f8fe 100%);
                 "
               >
                 <div class="leftt">
-                  <img src="../../assets/images/taskpage/left2.png"/>
+                  <img src="../../assets/images/taskpage/left2.png" />
                 </div>
                 <div class="photo">
-                  <img src="../../assets/images/taskpage/picture6.png"/>
+                  <img src="../../assets/images/taskpage/picture6.png" />
                 </div>
                 <div class="rightt">
-                  <img src="../../assets/images/taskpage/right2.png"/>
+                  <img src="../../assets/images/taskpage/right2.png" />
                 </div>
                 <div class="centerbox" style="color: rgba(78, 166, 255, 1)">
                   单层{{ projectInfo.parentId ? "子" : "" }}项目
@@ -392,21 +397,21 @@
               </div>
             </router-link>
             <div
-                class="taskbox"
-                @click="showModal2"
-                style="
+              class="taskbox"
+              @click="showModal2"
+              style="
                 margin-bottom: 40px;
                 background: linear-gradient(180deg, #e5f6ec 0%, #eef9f3 100%);
               "
             >
               <div class="leftt">
-                <img src="../../assets/images/taskpage/left3.png"/>
+                <img src="../../assets/images/taskpage/left3.png" />
               </div>
               <div class="photo">
-                <img src="../../assets/images/taskpage/picture7.png"/>
+                <img src="../../assets/images/taskpage/picture7.png" />
               </div>
               <div class="rightt">
-                <img src="../../assets/images/taskpage/right3.png"/>
+                <img src="../../assets/images/taskpage/right3.png" />
               </div>
               <div class="centerbox1" style="color: rgba(93, 201, 136, 1)">
                 多层{{ projectInfo.parentId ? "子" : "" }}项目
@@ -414,8 +419,8 @@
               <div class="centermain1">
                 {{
                   projectInfo.parentId
-                      ? "可创建班级，通过班级填写基础信息并创建任务"
-                      : "包含子项目，分为多层子项目和单层子项目，多层子项目可创建班级，通过班级填写基础信息并创建任务"
+                    ? "可创建班级，通过班级填写基础信息并创建任务"
+                    : "包含子项目，分为多层子项目和单层子项目，多层子项目可创建班级，通过班级填写基础信息并创建任务"
                 }}
               </div>
             </div>
@@ -427,11 +432,11 @@
     <!-- 编辑多层项目弹窗 - end -->
     <!-- 复制路径弹窗 -->
     <a-modal
-        v-model:visible="copyModal"
-        :footer="null"
-        :closable="closeCopy"
-        wrapClassName="CopyModal"
-        centered="true"
+      v-model:visible="copyModal"
+      :footer="null"
+      :closable="closeCopy"
+      wrapClassName="CopyModal"
+      centered="true"
     >
       <div class="delete">
         <div class="del_header"></div>
@@ -457,11 +462,11 @@
     </a-modal>
     <!-- 结束项目弹窗 -->
     <a-modal
-        v-model:visible="stopModal"
-        :footer="null"
-        :closable="closeStop"
-        wrapClassName="CopyModal"
-        centered="true"
+      v-model:visible="stopModal"
+      :footer="null"
+      :closable="closeStop"
+      wrapClassName="CopyModal"
+      centered="true"
     >
       <div class="delete">
         <div class="del_header"></div>
@@ -490,11 +495,11 @@
     </a-modal>
     <!-- 删除项目弹窗 -->
     <a-modal
-        v-model:visible="deleteModal"
-        :footer="null"
-        :closable="closeDelete"
-        wrapClassName="CopyModal"
-        centered="true"
+      v-model:visible="deleteModal"
+      :footer="null"
+      :closable="closeDelete"
+      wrapClassName="CopyModal"
+      centered="true"
     >
       <div class="delete">
         <div class="del_header"></div>
@@ -520,11 +525,11 @@
     </a-modal>
     <!-- 存为模版弹窗 -->
     <a-modal
-        v-model:visible="startModal"
-        :footer="null"
-        :closable="closeStart"
-        wrapClassName="CopyModal"
-        centered="true"
+      v-model:visible="startModal"
+      :footer="null"
+      :closable="closeStart"
+      wrapClassName="CopyModal"
+      centered="true"
     >
       <div class="delete">
         <div class="del_header"></div>
@@ -550,17 +555,17 @@
     </a-modal>
     <!-- 发布弹窗 -->
     <a-modal
-        v-model:visible="projectPub"
-        :title="null"
-        :footer="null"
-        :closable="false"
-        wrapClassName="projectPub"
-        width="679px"
-        height="437px"
+      v-model:visible="projectPub"
+      :title="null"
+      :footer="null"
+      :closable="false"
+      wrapClassName="projectPub"
+      width="679px"
+      height="437px"
     >
       <div
-          class="modalHeader"
-          style="
+        class="modalHeader"
+        style="
           width: 100%;
           height: 68px;
           display: flex;
@@ -570,21 +575,21 @@
       >
         <div class="headerLeft" style="margin-left: 32px">
           <span style="width: 15px; height: 15px"
-          ><img src="../../assets/images/taskpage/pub.png"
+            ><img src="../../assets/images/taskpage/pub.png"
           /></span>
           <span
-              class="headerLeftText"
-              style="font-size: 16px; margin-left: 10px"
-          >项目发布</span
+            class="headerLeftText"
+            style="font-size: 16px; margin-left: 10px"
+            >项目发布</span
           >
         </div>
         <div
-            style="cursor: pointer; margin-right: 32px"
-            @click="closeProjectPub"
+          style="cursor: pointer; margin-right: 32px"
+          @click="closeProjectPub"
         >
           <img
-              style="width: 22px; height: 22px"
-              src="../../assets/images/basicinfo/close22.png"
+            style="width: 22px; height: 22px"
+            src="../../assets/images/basicinfo/close22.png"
           />
         </div>
       </div>
@@ -625,19 +630,19 @@
       </div>
       <!--  加载动画 -->
       <div
-          class="aeLoading"
-          :style="{ display: projectPubLoading ? 'flex' : 'none' }"
+        class="aeLoading"
+        :style="{ display: projectPubLoading ? 'flex' : 'none' }"
       >
-        <a-spin :spinning="projectPubLoading"/>
+        <a-spin :spinning="projectPubLoading" />
       </div>
     </a-modal>
     <!-- 撤回路径弹窗 -->
     <a-modal
-        v-model:visible="backModal"
-        :footer="null"
-        :closable="closeBack"
-        wrapClassName="CopyModal"
-        centered="true"
+      v-model:visible="backModal"
+      :footer="null"
+      :closable="closeBack"
+      wrapClassName="CopyModal"
+      centered="true"
     >
       <div class="delete">
         <div class="del_header"></div>
@@ -664,11 +669,11 @@
     </a-modal>
     <!--    撤回结束弹窗-->
     <a-modal
-        v-model:visible="backFinashModal"
-        :footer="null"
-        :closable="closeBack"
-        wrapClassName="CopyModal"
-        centered="true"
+      v-model:visible="backFinashModal"
+      :footer="null"
+      :closable="closeBack"
+      wrapClassName="CopyModal"
+      centered="true"
     >
       <div class="delete">
         <div class="del_header"></div>
@@ -724,11 +729,11 @@
     <!--    </a-modal>-->
     <!-- 项目提交审核弹窗 -->
     <a-modal
-        v-model:visible="reviewModal"
-        :footer="null"
-        :closable="false"
-        wrapClassName="CopyModal"
-        centered="true"
+      v-model:visible="reviewModal"
+      :footer="null"
+      :closable="false"
+      wrapClassName="CopyModal"
+      centered="true"
     >
       <div class="delete">
         <div class="del_header"></div>
@@ -755,11 +760,11 @@
     </a-modal>
     <!-- 项目撤回审核弹窗 -->
     <a-modal
-        v-model:visible="recallReviewModal"
-        :footer="null"
-        :closable="false"
-        wrapClassName="CopyModal"
-        centered="true"
+      v-model:visible="recallReviewModal"
+      :footer="null"
+      :closable="false"
+      wrapClassName="CopyModal"
+      centered="true"
     >
       <div class="delete">
         <div class="del_header"></div>
@@ -786,53 +791,53 @@
     </a-modal>
     <!-- 授权名单抽屉 -->
     <proj-power-list
-        v-model:ProjPvisible="ProjPvisible"
-        :selectProjectId="selectProjectId"
-        classify="project"
+      v-model:ProjPvisible="ProjPvisible"
+      :selectProjectId="selectProjectId"
+      classify="project"
     />
     <!-- 归属权抽屉 -->
     <proj-owner-ship
-        v-model:ProjOwnervisible="ProjOwnervisible"
-        :selectProjectId="selectProjectId"
-        classify="project"
+      v-model:ProjOwnervisible="ProjOwnervisible"
+      :selectProjectId="selectProjectId"
+      classify="project"
     />
     <!-- 查看权抽屉 -->
     <proj-check-ship
-        v-model:ProjCheckvisible="ProjCheckvisible"
-        :selectProjectId="selectProjectId"
-        v-model:addAuthList="addAuthList"
-        :authClassify="authClassify"
-        classify="project"
+      v-model:ProjCheckvisible="ProjCheckvisible"
+      :selectProjectId="selectProjectId"
+      v-model:addAuthList="addAuthList"
+      :authClassify="authClassify"
+      classify="project"
     />
     <!-- 管理权抽屉 -->
     <proj-check-ship
-        v-model:ProjCheckvisible="ProjCheckvisible"
-        :selectProjectId="selectProjectId"
-        v-model:addAuthList="addAuthList"
-        :authClassify="authClassify"
-        classify="project"
+      v-model:ProjCheckvisible="ProjCheckvisible"
+      :selectProjectId="selectProjectId"
+      v-model:addAuthList="addAuthList"
+      :authClassify="authClassify"
+      classify="project"
     />
   </div>
 </template>
 <script>
-import {reactive, toRefs, ref, watch} from "vue";
-import {message, Modal} from "ant-design-vue";
-import {useRouter} from "vue-router";
+import { reactive, toRefs, ref, watch } from "vue";
+import { message, Modal } from "ant-design-vue";
+import { useRouter } from "vue-router";
 import ProjOwnerShip from "../../components/drawers/ProjectOwn";
 import ProjPowerList from "../../components/drawers/ProjPowerList";
 import ProjCheckShip from "../../components/drawers/ProjCheckPower";
 import * as api from "../../api/index";
 import * as api1 from "../../api/index1";
-import {storage} from "../../api/storage";
+import { storage } from "../../api/storage";
 import ProjectManager from "@/components/project/ProjectManagerNew";
 // import ProjectClass from "@/components/project/ProjectClass";
 import TrainClass from "@/components/project/TrainClass";
 import OrgClass from "@/components/project/OrgClass";
 import dayjs from "dayjs";
 import * as moment from "moment";
-import {changeOwnership} from "@/api/method";
+import { changeOwnership } from "@/api/method";
 import NameInput from "@/components/project/NameInput";
-import {validateName} from "@/api/index1";
+import { validateName } from "@/api/index1";
 //import { toDate } from "../../api/method";
 
 export default {
@@ -850,7 +855,7 @@ export default {
   },
   setup() {
     const state = reactive({
-      tableLoading:false,
+      tableLoading: false,
       projectName: null,
       selectTime: null,
       sonproject: false,
@@ -923,12 +928,12 @@ export default {
     // 数据接入 - start -
     const router = useRouter();
     const sProjectStateList = ref([
-      {value: 0, label: "草稿"},
-      {value: 1, label: "进行中"},
-      {value: 2, label: "已结束"},
+      { value: 0, label: "草稿" },
+      { value: 1, label: "进行中" },
+      { value: 2, label: "已结束" },
     ]);
     const searchReset = () => {
-      state.searchParam = {pageNo: 1, pageSize: 10};
+      state.searchParam = { pageNo: 1, pageSize: 10 };
       getTableDate();
     };
     const searchSubmit = () => {
@@ -993,9 +998,9 @@ export default {
         message.success("创建成功");
         state.currentPage = 1;
         state.projectInfo.projectId ||
-        changeOwnership("project", res.data.data.projectId, [
-          {id: res.data.data.createId, name: res.data.data.createName},
-        ]);
+          changeOwnership("project", res.data.data.projectId, [
+            { id: res.data.data.createId, name: res.data.data.createName },
+          ]);
         getTableDate();
       });
     };
@@ -1050,13 +1055,15 @@ export default {
         state.projectTasks = res.data.data.tasks;
       });
       //获取学员总数
-      api.projectStudentCount({
-        pid: object.projectId,
-        type: 1
-      }).then((res) => {
-        state.projectStudentsNum = res.data.data
-        state.projectPubLoading = false;
-      })
+      api
+        .projectStudentCount({
+          pid: object.projectId,
+          type: 1,
+        })
+        .then((res) => {
+          state.projectStudentsNum = res.data.data;
+          state.projectPubLoading = false;
+        });
       //获取阶段及任务总数
     };
     //确认发布项目
@@ -1100,17 +1107,17 @@ export default {
         type: -4,
       };
       api
-          .handleProject(obj)
-          .then((res) => {
-            console.log("撤回成功", res);
-            message.destroy();
-            message.success("撤回成功");
-            state.backModal = false;
-            getTableDate();
-          })
-          .catch((err) => {
-            console.log("撤回失败", err);
-          });
+        .handleProject(obj)
+        .then((res) => {
+          console.log("撤回成功", res);
+          message.destroy();
+          message.success("撤回成功");
+          state.backModal = false;
+          getTableDate();
+        })
+        .catch((err) => {
+          console.log("撤回失败", err);
+        });
     };
     //确认撤回结束
     const reFinashedProject = () => {
@@ -1119,17 +1126,17 @@ export default {
         type: -6,
       };
       api
-          .handleProject(obj)
-          .then((res) => {
-            console.log("撤回成功", res);
-            message.destroy();
-            message.success("撤回成功");
-            state.backFinashModal = false;
-            getTableDate();
-          })
-          .catch((err) => {
-            console.log("撤回失败", err);
-          });
+        .handleProject(obj)
+        .then((res) => {
+          console.log("撤回成功", res);
+          message.destroy();
+          message.success("撤回成功");
+          state.backFinashModal = false;
+          getTableDate();
+        })
+        .catch((err) => {
+          console.log("撤回失败", err);
+        });
     };
     //关闭撤回弹窗
     const closeBackModal = () => {
@@ -1150,17 +1157,17 @@ export default {
         type: -1,
       };
       api
-          .handleProject(obj)
-          .then((res) => {
-            console.log("结束成功", res);
-            message.destroy();
-            message.success("已结束");
-            state.stopModal = false;
-            getTableDate();
-          })
-          .catch((err) => {
-            console.log("结束失败", err);
-          });
+        .handleProject(obj)
+        .then((res) => {
+          console.log("结束成功", res);
+          message.destroy();
+          message.success("已结束");
+          state.stopModal = false;
+          getTableDate();
+        })
+        .catch((err) => {
+          console.log("结束失败", err);
+        });
     };
     //关闭结束弹窗
     const closeStopModal = () => {
@@ -1178,17 +1185,17 @@ export default {
         type: -2,
       };
       api
-          .handleProject(obj)
-          .then((res) => {
-            console.log("删除成功", res);
-            message.destroy();
-            message.success("删除成功");
-            state.deleteModal = false;
-            getTableDate();
-          })
-          .catch((err) => {
-            console.log("删除失败", err);
-          });
+        .handleProject(obj)
+        .then((res) => {
+          console.log("删除成功", res);
+          message.destroy();
+          message.success("删除成功");
+          state.deleteModal = false;
+          getTableDate();
+        })
+        .catch((err) => {
+          console.log("删除失败", err);
+        });
     };
     //关闭删除弹窗
     const closeDeleteModal = () => {
@@ -1212,7 +1219,7 @@ export default {
           message.success("模版保存成功");
           return;
         }
-        Modal.error({title: res.data.msg});
+        Modal.error({ title: res.data.msg });
       });
     };
     //关闭存为模版弹窗
@@ -1230,11 +1237,13 @@ export default {
     };
     //确认复制
     const copyProject = () => {
-      state.tableLoading = true
-      api.handleProject({
-        projectId: state.copyProjectId,
-        type: 2,
-      }).then(() => getTableDate())
+      state.tableLoading = true;
+      api
+        .handleProject({
+          projectId: state.copyProjectId,
+          type: 2,
+        })
+        .then(() => getTableDate());
       message.success("复制成功");
       state.copyModal = false;
     };
@@ -1251,17 +1260,17 @@ export default {
       };
       console.log("提交审核obj", obj);
       api
-          .handleProject(obj)
-          .then((res) => {
-            console.log("提交成功", res);
-            message.destroy();
-            message.success("提交成功");
-            state.reviewModal = false;
-            getTableDate();
-          })
-          .catch((err) => {
-            console.log("提交失败", err);
-          });
+        .handleProject(obj)
+        .then((res) => {
+          console.log("提交成功", res);
+          message.destroy();
+          message.success("提交成功");
+          state.reviewModal = false;
+          getTableDate();
+        })
+        .catch((err) => {
+          console.log("提交失败", err);
+        });
     };
     //关闭提交审核弹窗
     const closeReviewModal = () => {
@@ -1280,17 +1289,17 @@ export default {
       };
       console.log("撤回成功obj", obj);
       api
-          .handleProject(obj)
-          .then((res) => {
-            console.log("撤回成功", res);
-            message.destroy();
-            message.success("撤回成功");
-            state.recallReviewModal = false;
-            getTableDate();
-          })
-          .catch((err) => {
-            console.log("撤回成功", err);
-          });
+        .handleProject(obj)
+        .then((res) => {
+          console.log("撤回成功", res);
+          message.destroy();
+          message.success("撤回成功");
+          state.recallReviewModal = false;
+          getTableDate();
+        })
+        .catch((err) => {
+          console.log("撤回成功", err);
+        });
     };
     //关闭提交审核弹窗
     const closeRecallReviewModal = () => {
@@ -1333,18 +1342,18 @@ export default {
         align: "center",
         customRender: (value) => {
           return (
-              <div>
-                {value.record.type === 3
-                    ? {
-                  0: () => "草稿",
-                  1: () => "草稿",
-                  2: () => "草稿",
-                  3: () => "进行中",
-                  "-1": () => "已结束",
-                  "-5": () => "草稿",
-                }[value.record.status + ""]() || ""
-                    : "-"}
-              </div>
+            <div>
+              {value.record.type === 3
+                ? {
+                    0: () => "草稿",
+                    1: () => "草稿",
+                    2: () => "草稿",
+                    3: () => "进行中",
+                    "-1": () => "已结束",
+                    "-5": () => "草稿",
+                  }[value.record.status + ""]() || ""
+                : "-"}
+            </div>
           );
         },
       },
@@ -1365,19 +1374,19 @@ export default {
         align: "center",
         customRender: (value) => {
           return (
-              <div>
-                {value.record.type === 3
-                    ? {
-                  0: "未审核",
-                  1: "审核中",
-                  2: "已审核",
-                  3: "已审核",
-                  4: "已审核",
-                  "-1": "已审核",
-                  "-5": "拒绝",
-                }[value.record.status + ""] || ""
-                    : "-"}
-              </div>
+            <div>
+              {value.record.type === 3
+                ? {
+                    0: "未审核",
+                    1: "审核中",
+                    2: "已审核",
+                    3: "已审核",
+                    4: "已审核",
+                    "-1": "已审核",
+                    "-5": "拒绝",
+                  }[value.record.status + ""] || ""
+                : "-"}
+            </div>
           );
         },
       },
@@ -1398,93 +1407,111 @@ export default {
         customRender: (value) => {
           // console.log("value", value.record.type, value.record.status);
           return (
-              <div className="operation">
-                {value.record.status === 0 ||  value.record.status ===2 || value.record.status === -5 ? (
-                    <span
-                        onClick={() => {
-                          if (value.record.type === 1 || value.record.type === 2) {
-                            state.doublepro = true;
-                            state.projectInfo = value.record;
-                          } else {
-                            console.log(value.record);
-                            router.push({
-                              path: "/projectadd",
-                              query: {
-                                projectId: value.record.projectId,
-                                parentId: value.record.parentId,
-                                parentName: value.record.parentName,
-                              },
-                            });
-                          }
-                        }}
-                        style="cursor:pointer;"
-                        className="operation1"
-                    >
+            <div className="operation">
+              {value.record.status === 0 ||
+              value.record.status === 2 ||
+              value.record.status === -5 ? (
+                <span
+                  onClick={() => {
+                    if (value.record.type === 1 || value.record.type === 2) {
+                      state.doublepro = true;
+                      state.projectInfo = value.record;
+                    } else {
+                      console.log(value.record);
+                      router.push({
+                        path: "/projectadd",
+                        query: {
+                          projectId: value.record.projectId,
+                          parentId: value.record.parentId,
+                          parentName: value.record.parentName,
+                        },
+                      });
+                    }
+                  }}
+                  style="cursor:pointer;"
+                  className="operation1"
+                >
                   编辑
                 </span>
-                ) : (
-                    ""
-                )}
-                {value.record.status === 0 && value.record.type === 3 ? (
-                    <span
-                        onClick={() => {
-                          showReviewModal(value.record.projectId);
-                        }}
-                        style="cursor:pointer"
-                        class="operation3"
-                    >
+              ) : (
+                ""
+              )}
+              {value.record.status === 0 && value.record.type === 3 ? (
+                <span
+                  onClick={() => {
+                    showReviewModal(value.record.projectId);
+                  }}
+                  style="cursor:pointer"
+                  class="operation3"
+                >
                   提交审核
                 </span>
-                ) : (
-                    ""
-                )}
-                {value.record.status === 1 && value.record.type === 3 ? (
-                    <span
-                        onClick={() => {
-                          showRecallReviewModal(value.record.projectId);
-                        }}
-                        style="cursor:pointer"
-                        class="operation3"
-                    >
+              ) : (
+                ""
+              )}
+              {value.record.status === 1 && value.record.type === 3 ? (
+                <span
+                  onClick={() => {
+                    showRecallReviewModal(value.record.projectId);
+                  }}
+                  style="cursor:pointer"
+                  class="operation3"
+                >
                   撤回审核
                 </span>
-                ) : (
-                    ""
-                )}
-                {value.record.status === 2 && value.record.type === 3 ? (
-                    <span
-                        onClick={() => {
-                          let time =
-                              value.record.beginTime + "-" + value.record.endTime;
-                          let obj = {
-                            projectId: value.record.projectId,
-                            name: value.record.name,
-                            time: time,
-                          };
-                          showProjectPub(obj);
-                        }}
-                        style="cursor:pointer"
-                        class="operation3"
-                    >
+              ) : (
+                ""
+              )}
+              {value.record.status === 2 && value.record.type === 3 ? (
+                <span
+                  onClick={() => {
+                    let time =
+                      value.record.beginTime + "-" + value.record.endTime;
+                    let obj = {
+                      projectId: value.record.projectId,
+                      name: value.record.name,
+                      time: time,
+                    };
+                    showProjectPub(obj);
+                  }}
+                  style="cursor:pointer"
+                  class="operation3"
+                >
                   发布
                 </span>
-                ) : (
-                    ""
-                )}
-                {value.record.status === 3 && value.record.type === 3 ? (
-                    <span
-                        onClick={() => {
-                          showBackModal(value.record.projectId);
-                        }}
-                        style="cursor:pointer"
-                        class="operation3"
-                    >
+              ) : (
+                ""
+              )}
+              {value.record.status === 3 && value.record.type === 3 ? (
+                <div
+                  onClick={() => {
+                    router.push({
+                      path: "/taskpage",
+                      query: { projectId: value.record.projectId },
+                    });
+                    storage.set("projectId", value.record.projectId);
+                  }}
+                >
+                  管理
+                </div>
+              ) : (
+                ""
+              )}
+              {value.record.status === 3 && value.record.type === 3 ? (
+                <span
+                  onClick={() => {
+                    showBackModal(value.record.projectId);
+                  }}
+                  style="cursor:pointer"
+                  class="operation3"
+                >
                   撤回发布
                 </span>
-                ) : (
-                    ""
-                )}
-                {/**
+              ) : (
+                ""
+              )}
+
+              {/**
                  //<!-- 2022-12-10注释 后面放开 -->
                  <div className="tableSelect">
                  <a-select
@@ -1534,168 +1561,171 @@ export default {
                  </a-select>
                  </div>
                  */}
-                {value.record.type === 1 ? (
-                    <span
-                        className="operation3"
-                        style="cursor: pointer"
-                        onClick={() => {
-                          state.projectInfo = {
-                            parentName: value.record.name,
-                            parentId: value.record.projectId,
-                            name: '',
-                            sourceBelongId: value.record.sourceBelongId,
-                            sourceBelongName: value.record.sourceBelongName,
-                            manager: value.record.manager,
-                            managerId: value.record.managerId,
-                            systemId: value.record.systemId,
-                            type: 2,
-                          };
-                          state.estabish = true;
-                        }}
-                    >
+              {value.record.type === 1 ? (
+                <span
+                  className="operation3"
+                  style="cursor: pointer"
+                  onClick={() => {
+                    state.projectInfo = {
+                      parentName: value.record.name,
+                      parentId: value.record.projectId,
+                      name: "",
+                      sourceBelongId: value.record.sourceBelongId,
+                      sourceBelongName: value.record.sourceBelongName,
+                      manager: value.record.manager,
+                      managerId: value.record.managerId,
+                      systemId: value.record.systemId,
+                      type: 2,
+                    };
+                    state.estabish = true;
+                  }}
+                >
                   创建子项目
                 </span>
-                ) : (
-                    ""
-                )}
-                {value.record.type === 2 ? (
-                    <span
-                        className="operation3"
-                        style="cursor: pointer"
-                        onClick={() => {
-                          router.push({
-                            path: "/projectadd",
-                            query: {
-                              parentId: value.record.projectId,
-                              parentName:
-                                  value.record.parentName + "——" + value.record.name,
-                              ptojectType: 3,
-                            },
-                          });
-                        }}
-                    >
+              ) : (
+                ""
+              )}
+              {value.record.type === 2 ? (
+                <span
+                  className="operation3"
+                  style="cursor: pointer"
+                  onClick={() => {
+                    router.push({
+                      path: "/projectadd",
+                      query: {
+                        parentId: value.record.projectId,
+                        parentName:
+                          value.record.parentName + "——" + value.record.name,
+                        ptojectType: 3,
+                      },
+                    });
+                  }}
+                >
                   创建班级
                 </span>
-                ) : (
-                    ""
-                )}
-                <div className="tableSelect">
-                  <a-select
-                      style="width: 50px"
-                      value="更多"
-                      // options={state.projectNameList}
-                      dropdownClassName="tabledropdown"
-                  >
-                    <a-select-option value="复制" label="复制">
+              ) : (
+                ""
+              )}
+              <div className="tableSelect">
+                <a-select
+                  style="width: 50px"
+                  value="更多"
+                  // options={state.projectNameList}
+                  dropdownClassName="tabledropdown"
+                >
+                  <a-select-option value="复制" label="复制">
+                    <div
+                      onClick={() => {
+                        showCopyModal(value.record.projectId);
+                      }}
+                    >
+                      复制
+                    </div>
+                  </a-select-option>
+                  {value.record.status !== 3 ? (
+                    <a-select-option value="删除" label="删除">
                       <div
-                          onClick={() => {
-                            showCopyModal(value.record.projectId);
-                          }}
-                      >
-                        复制
-                      </div>
-                    </a-select-option>
-                    {value.record.status!==3 ? <a-select-option value="删除" label="删除">
-                      <div
-                          onClick={() => {
-                            showDeleteModal(value.record.projectId);
-                          }}
+                        onClick={() => {
+                          showDeleteModal(value.record.projectId);
+                        }}
                       >
                         删除
                       </div>
-                    </a-select-option>:''}
-                    {value.record.type === 3 ? (
-                        <a-select-option value="存为模版" label="存为模版">
-                          <div
-                              onClick={() => {
-                                showStartModal(value.record.projectId);
-                              }}
-                          >
-                            存为模版
-                          </div>
-                        </a-select-option>
-                    ) : (
-                        ""
-                    )}
-                    {value.record.status === 3 && value.record.type === 3 ? (
-                        <a-select-option value="结束" label="结束">
-                          <div
-                              onClick={() => {
-                                showStopModal(value.record.projectId);
-                              }}
-                          >
-                            结束
-                          </div>
-                        </a-select-option>
-                    ) : (
-                        ""
-                    )}
+                    </a-select-option>
+                  ) : (
+                    ""
+                  )}
+                  {value.record.type === 3 ? (
+                    <a-select-option value="存为模版" label="存为模版">
+                      <div
+                        onClick={() => {
+                          showStartModal(value.record.projectId);
+                        }}
+                      >
+                        存为模版
+                      </div>
+                    </a-select-option>
+                  ) : (
+                    ""
+                  )}
+                  {value.record.status === 3 && value.record.type === 3 ? (
+                    <a-select-option value="结束" label="结束">
+                      <div
+                        onClick={() => {
+                          showStopModal(value.record.projectId);
+                        }}
+                      >
+                        结束
+                      </div>
+                    </a-select-option>
+                  ) : (
+                    ""
+                  )}
 
-                    {value.record.status === -1 && value.record.type === 3 ? (
-                        <a-select-option value="撤回" label="撤回">
-                          <div
-                              onClick={() => {
-                                showBackFinashModal(value.record.projectId);
-                              }}
-                          >
-                            撤回
-                          </div>
-                        </a-select-option>
-                    ) : (
-                        ""
-                    )}
-                    {value.record.type === 3 ? (
-                        <a-select-option value="基础信息" label="基础信息">
-                          <div
-                              onClick={() => {
-                                router.push({
-                                  path: "/taskpage",
-                                  query: {projectId: value.record.projectId},
-                                });
-                                storage.set("projectId", value.record.projectId);
-                              }}
-                          >
-                            基础信息
-                          </div>
-                        </a-select-option>
-                    ) : (
-                        ""
-                    )}
-                  </a-select>
-                </div>
+                  {value.record.status === -1 && value.record.type === 3 ? (
+                    <a-select-option value="撤回" label="撤回">
+                      <div
+                        onClick={() => {
+                          showBackFinashModal(value.record.projectId);
+                        }}
+                      >
+                        撤回
+                      </div>
+                    </a-select-option>
+                  ) : (
+                    ""
+                  )}
+                  {value.record.status !== 3 && value.record.type === 3 ? (
+                    <a-select-option value="基础信息" label="基础信息">
+                      <div
+                        onClick={() => {
+                          router.push({
+                            path: "/taskpage",
+                            query: { projectId: value.record.projectId },
+                          });
+                          storage.set("projectId", value.record.projectId);
+                        }}
+                      >
+                        基础信息
+                      </div>
+                    </a-select-option>
+                  ) : (
+                    ""
+                  )}
+                </a-select>
               </div>
+            </div>
           );
         },
       },
     ]);
-    const getTableDate = () =>{
-      state.tableLoading = true
-      api.getProjectList({
-        ...state.searchParam,
-        beginTime:
+    const getTableDate = () => {
+      state.tableLoading = true;
+      api
+        .getProjectList({
+          ...state.searchParam,
+          beginTime:
             state.searchParam.valueDate &&
             state.searchParam.valueDate.length === 2
-                ? dayjs(state.searchParam.valueDate[0]).format("YYYY-MM-DD")
-
-                : "",
-        endTime:
+              ? dayjs(state.searchParam.valueDate[0]).format("YYYY-MM-DD")
+              : "",
+          endTime:
             state.searchParam.valueDate &&
             state.searchParam.valueDate.length === 2
-                ? dayjs(state.searchParam.valueDate[1]).format("YYYY-MM-DD")
-                : "",
-      })
-          .then((res) => {
-            // console.log("搜索", res, state.searchParam);
-            state.tableDataTotal = Number(res.data.data.total);
-            state.tableLoading = false
-            const data = res.data.data.rows;
-            initDataSublist("", data);
-            console.log(data);
-            tableData.value = data;
-            console.log("tableData", tableData);
-          });
-    }
-
+              ? dayjs(state.searchParam.valueDate[1]).format("YYYY-MM-DD")
+              : "",
+        })
+        .then((res) => {
+          // console.log("搜索", res, state.searchParam);
+          state.tableDataTotal = Number(res.data.data.total);
+          state.tableLoading = false;
+          const data = res.data.data.rows;
+          initDataSublist("", data);
+          console.log(data);
+          tableData.value = data;
+          console.log("tableData", tableData);
+        });
+    };
 
     function initDataSublist(parentName, data) {
       if (data && data.length) {
@@ -1703,8 +1733,8 @@ export default {
           e.parentName = parentName;
           e.key = e.projectId;
           initDataSublist(
-              (parentName ? parentName + "——" : "") + e.name,
-              e.subList
+            (parentName ? parentName + "——" : "") + e.name,
+            e.subList
           );
           e.subList && e.subList.length && (e.children = e.subList);
         });
@@ -1766,39 +1796,39 @@ export default {
     };
     //添加权限
     watch(
-        () => state.addAuthList,
-        (res) => {
-          console.log("res", res, state.addAuthList);
-          let obj = {
-            type: 2,
-            tag:
-                state.authClassify === 1 ? 3 : state.authClassify === 2 ? 4 : null,
-            opt: 3,
-            deptList: res[1],
-            groupList: res[2],
-            refId: state.selectProjectId,
-            pageNo: 20,
-            pageSize: 1,
-            studentList: res[0],
-            keyWord: "",
-          };
-          console.log("obj", obj);
-          api1
-              .optionAuthPerm(obj)
-              .then((res) => {
-                console.log("添加授权成功", res);
-                message.success("添加授权成功");
-              })
-              .catch((err) => {
-                console.log("添加授权失败", err);
-              });
-        }
+      () => state.addAuthList,
+      (res) => {
+        console.log("res", res, state.addAuthList);
+        let obj = {
+          type: 2,
+          tag:
+            state.authClassify === 1 ? 3 : state.authClassify === 2 ? 4 : null,
+          opt: 3,
+          deptList: res[1],
+          groupList: res[2],
+          refId: state.selectProjectId,
+          pageNo: 20,
+          pageSize: 1,
+          studentList: res[0],
+          keyWord: "",
+        };
+        console.log("obj", obj);
+        api1
+          .optionAuthPerm(obj)
+          .then((res) => {
+            console.log("添加授权成功", res);
+            message.success("添加授权成功");
+          })
+          .catch((err) => {
+            console.log("添加授权失败", err);
+          });
+      }
     );
 
-    function managerChange(e, l, d, t,orgName) {
-      state.projectInfo.sourceBelongId = d
-      state.projectInfo.sourceBelongName = t
-      state.projectInfo.sourceBelongFullName = orgName
+    function managerChange(e, l, d, t, orgName) {
+      state.projectInfo.sourceBelongId = d;
+      state.projectInfo.sourceBelongName = t;
+      state.projectInfo.sourceBelongFullName = orgName;
     }
 
     return {
@@ -1862,7 +1892,7 @@ export default {
       okReminderModal,
     };
   },
-  };
+};
 </script>
 <style lang="scss">
 .projectManage {
@@ -2148,9 +2178,9 @@ export default {
     .ant-modal-body {
       .modalHeader {
         background: linear-gradient(
-                0deg,
-                rgba(78, 166, 255, 0) 0%,
-                rgba(78, 166, 255, 0.2) 100%
+          0deg,
+          rgba(78, 166, 255, 0) 0%,
+          rgba(78, 166, 255, 0.2) 100%
         );
       }
 
@@ -2246,9 +2276,9 @@ export default {
     .ant-modal-body {
       .modalHeader {
         background: linear-gradient(
-                0deg,
-                rgba(78, 166, 255, 0) 0%,
-                rgba(78, 166, 255, 0.2) 100%
+          0deg,
+          rgba(78, 166, 255, 0) 0%,
+          rgba(78, 166, 255, 0.2) 100%
         );
       }
 
@@ -2345,9 +2375,9 @@ export default {
 
       .modalHeader {
         background: linear-gradient(
-                0deg,
-                rgba(78, 166, 255, 0) 0%,
-                rgba(78, 166, 255, 0.2) 100%
+          0deg,
+          rgba(78, 166, 255, 0) 0%,
+          rgba(78, 166, 255, 0.2) 100%
         );
       }
 
@@ -2411,9 +2441,9 @@ export default {
 
       .modalHeader {
         background: linear-gradient(
-                0deg,
-                rgba(78, 166, 255, 0) 0%,
-                rgba(78, 166, 255, 0.2) 100%
+          0deg,
+          rgba(78, 166, 255, 0) 0%,
+          rgba(78, 166, 255, 0.2) 100%
         );
       }
 
@@ -2522,8 +2552,8 @@ export default {
             width: calc(100%);
             height: 68px;
             background: linear-gradient(
-                    rgba(78, 166, 255, 0.2) 0%,
-                    rgba(78, 166, 255, 0) 100%
+              rgba(78, 166, 255, 0.2) 0%,
+              rgba(78, 166, 255, 0) 100%
             );
           }
 
@@ -2624,8 +2654,8 @@ export default {
 
       .modalHeader {
         background: linear-gradient(
-                rgba(78, 166, 255, 0.2) 0%,
-                rgba(78, 166, 255, 0) 100%
+          rgba(78, 166, 255, 0.2) 0%,
+          rgba(78, 166, 255, 0) 100%
         );
       }
 
@@ -2664,9 +2694,9 @@ export default {
             width: 280px;
             height: 110px;
             background: linear-gradient(
-                    180deg,
-                    rgba(254, 243, 221, 1),
-                    rgba(255, 250, 240, 1)
+              180deg,
+              rgba(254, 243, 221, 1),
+              rgba(255, 250, 240, 1)
             );
             border-radius: 10px;
             margin-right: 7px;
@@ -2690,9 +2720,9 @@ export default {
             width: 280px;
             height: 110px;
             background: linear-gradient(
-                    180deg,
-                    rgba(221, 234, 255, 1),
-                    rgba(240, 248, 254, 1)
+              180deg,
+              rgba(221, 234, 255, 1),
+              rgba(240, 248, 254, 1)
             );
             border-radius: 10px;
 
diff --git a/src/views/projectcenter/TaskAdd.vue b/src/views/projectcenter/TaskAdd.vue
index f9374909..588c6fa8 100644
--- a/src/views/projectcenter/TaskAdd.vue
+++ b/src/views/projectcenter/TaskAdd.vue
@@ -495,7 +495,8 @@
 											<div style="width: 87px; text-align: center">
 												{{
 														element.cretime
-															? element.cretime + "分钟"
+															? 
+															element.type==1? Math.ceil(Number(element.cretime)/60) + "分钟" : element.cretime + "分钟"
 															: "-"
 												}}
 											</div>
diff --git a/src/views/projectcenter/TaskPage.vue b/src/views/projectcenter/TaskPage.vue
index c7c5b6ff..f432d019 100644
--- a/src/views/projectcenter/TaskPage.vue
+++ b/src/views/projectcenter/TaskPage.vue
@@ -2498,8 +2498,7 @@ export default {
       commonLevelName: "",
       evaltype: "",
       evalData: "",
-      facestudent: "",
-      locationHref: location.href.indexOf('http://') !== -1 ? 'http://111.231.196.214:12016/' : location.href.slice(0, location.href.indexOf('/m')) + '/upload/'
+      facestudent: ""
     });
 
     const levelList = reactive({
diff --git a/src/views/research/ResearchManage.vue b/src/views/research/ResearchManage.vue
index 20ead7d9..4ba0c4f6 100644
--- a/src/views/research/ResearchManage.vue
+++ b/src/views/research/ResearchManage.vue
@@ -599,6 +599,7 @@ export default {
     const handleNext = async() => {
       if (!state.assessmentId) {
         if (!state.assessmentName) {
+          message.destroy();
           message.error("请输入评估名称");
           return false;
         }
@@ -620,6 +621,11 @@ export default {
         router.push("/researchadd");
         handleCancel();
       } else {
+        if (!state.assessmentName) {
+          message.destroy();
+          message.error("请输入评估名称");
+          return false;
+        }
         editAssessmentName({
           assessmentId: state.assessmentId,
           assessmentName: state.assessmentName,