From 118456018835e71f328cfb0e15bc71ff32dae736 Mon Sep 17 00:00:00 2001
From: wyx <51903@qq.com>
Date: Fri, 17 Mar 2023 15:25:34 +0800
Subject: [PATCH 1/4] =?UTF-8?q?fix:=E9=A1=B5=E9=9D=A2=E6=9D=83=E9=99=90?=
 =?UTF-8?q?=E5=88=B7=E6=96=B0=E5=88=A4=E6=96=AD=E6=98=BE=E7=A4=BA=E9=97=AE?=
 =?UTF-8?q?=E9=A2=98=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/config.js   | 2 ++
 src/router/index.js | 6 ++++++
 2 files changed, 8 insertions(+)

diff --git a/src/api/config.js b/src/api/config.js
index d2d9e197..0130bcf3 100644
--- a/src/api/config.js
+++ b/src/api/config.js
@@ -61,6 +61,8 @@ http.interceptors.response.use(
             (process.env.NODE_ENV === 'development' || process.env.NODE_ENV === 'alpine') ? 
             router.push({path: 'login', query: { returnUrl: router.currentRoute.value.fullPath }}) : 
             (window.location.href = process.env.VUE_APP_LOGIN_URL + encodeURIComponent(window.location.protocol + process.env.VUE_APP_BOE_API_URL + process.env.VUE_APP_BASE + router.currentRoute.value.fullPath))
+            // TODO token过期后退出登录 清空当前用户标记 - 为了刷新页面使用
+            localStorage.removeItem('refreshPage')
             return Promise.reject(response);
         }
         show && message.error(msg);
diff --git a/src/router/index.js b/src/router/index.js
index d7a2556a..d5c57254 100644
--- a/src/router/index.js
+++ b/src/router/index.js
@@ -33,9 +33,15 @@ const timers = setInterval(() => {
 	if(pathArr.length!==0){
 		// 刷新界面是否重新执行
 		if(pathArr.indexOf(currentPath)==-1){
+			if(localStorage.getItem("refreshPage") == "jumpverify"){
+				clearInterval(timers)
+				return
+			}
 			clearInterval(timers)
 			router.push({path: pathArr[0]})
+			localStorage.setItem("refreshPage", "jumpverify")
 		}else{
+			localStorage.setItem("refreshPage", "jumpverify")
 			clearInterval(timers)
 		}
 	}

From d95509628d2271d9c3e5cca4a9e5010899600b6d Mon Sep 17 00:00:00 2001
From: lixg <lixg@dongwu-inc.com>
Date: Fri, 17 Mar 2023 15:33:49 +0800
Subject: [PATCH 2/4] =?UTF-8?q?feat:=E4=BF=AE=E6=94=B9=E9=A1=B9=E7=9B=AE?=
 =?UTF-8?q?=E4=BB=BB=E5=8A=A1=E4=BA=8C=E7=BB=B4=E7=A0=81=E4=BC=A0=E5=8F=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/learningpath/LevelAdd.vue | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/src/views/learningpath/LevelAdd.vue b/src/views/learningpath/LevelAdd.vue
index f5afa204..04f72421 100644
--- a/src/views/learningpath/LevelAdd.vue
+++ b/src/views/learningpath/LevelAdd.vue
@@ -2834,7 +2834,13 @@ export default {
           window.location.protocol +
           process.env.VUE_APP_H5 +
           "/projectdetails?type=2&projectId=" +
-          item.courseId;
+          item.courseId +
+          "&id=" +
+          item.id +
+          "&chapterOrStageId=" +
+          item.chapterId +
+          "&type=2&infoId=" +
+          state.routerId;
       }
       state.codevisible = true;
       let obj = {

From 7858a8a500b402544cef5b1285791e4e09523be7 Mon Sep 17 00:00:00 2001
From: wyx <51903@qq.com>
Date: Fri, 17 Mar 2023 15:58:00 +0800
Subject: [PATCH 3/4] =?UTF-8?q?style:=E4=BF=AE=E6=94=B9=E5=BC=80=E8=AF=BE?=
 =?UTF-8?q?=E6=A0=B7=E5=BC=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/drawers/AddOpenCourse.vue | 37 ++++++++++++++----------
 1 file changed, 21 insertions(+), 16 deletions(-)

diff --git a/src/components/drawers/AddOpenCourse.vue b/src/components/drawers/AddOpenCourse.vue
index 8b7cad30..86dd3a93 100644
--- a/src/components/drawers/AddOpenCourse.vue
+++ b/src/components/drawers/AddOpenCourse.vue
@@ -122,10 +122,10 @@
               <a-input
                 v-model:value="formData.address"
                 maxlength="50"
-                style="width: 440px; height: 40px; border-radius: 8px"
+                style="width: 88%; height: 40px; border-radius: 8px"
                 placeholder="请输入详细地点"
               />
-              <div class="inp_num" style="right: 164px">
+              <div class="inp_num" style="right: 90px">
                 <span style="color: #c7cbd2">{{ formData.address.length || 0 }}/50</span>
               </div>
             </div>
@@ -142,7 +142,7 @@
             </div>
             <div class="select fitems">
               <a-range-picker
-                style="width: 440px; height: 40px; border-radius: 8px"
+                style="width: 88%; height: 40px; border-radius: 8px"
                 :show-time="{ format: 'HH:mm' }"
                 :disabled-date="disabledDate"
                 format="YYYY-MM-DD HH:mm"
@@ -164,7 +164,7 @@
               </div>
               <span style="margin-right: 3px">授课教师</span>
             </div>
-            <div class="select" style="width: 440px">
+            <div class="select" style="width: 88%">
               <ProjectManager
                 v-model:value="formData.teacherId"
                 v-model:name="formData.teacher"
@@ -173,10 +173,10 @@
           </div>
           <div class="cstm_items">
             <div class="signbox">
-              <span style="margin-right: 3px">考勤设置：</span>
+              <span style="margin-right: 3px">考勤设置</span>
             </div>
-            <div style="display: flex; align-items: center">
-              <div style="margin-right: 10px">签到</div>
+            <div style="display: flex; align-items: center; width: 88%;">
+              <div style="margin-right: 24px;">签到</div>
               <div
                 style="display: flex; align-items: center; margin-right: 20px"
               >
@@ -217,7 +217,7 @@
             <div class="signbox">
               <span style="margin-right: 3px">报名设置</span>
             </div>
-            <div class="b_input">
+            <div class="b_input" style="width: 88%;">
               <CheckBox v-model:checked="formData.applyFlag"
                         :check-value="1"
                         :un-check-value="0">
@@ -226,11 +226,11 @@
             </div>
           </div>
 
-          <div class="cstm_items">
+          <div class="cstm_items" style="align-items: flex-start;">
             <div class="signbox">
               <span style="margin-right: 3px">现场参与</span>
             </div>
-            <div class="b_input">
+            <div class="b_input" style="width: 88%;display: flex;flex-direction: column;">
               <CheckBox v-model:checked="formData.projectSignFlag"
                         :check-value="1"
                         :un-check-value="0">
@@ -238,6 +238,7 @@
               </CheckBox>
               <CheckBox v-model:checked="formData.signFlag"
                         :check-value="1"
+                        style="margin-left: 0px;"
                         :un-check-value="0">
                 <span style="color: #6d7584">允许项目外人员临时到场参加</span>
               </CheckBox>
@@ -248,7 +249,7 @@
             <div class="signbox">
               <span style="margin-right: 3px">评估设置</span>
             </div>
-            <div class="b_input">
+            <div class="b_input" style="width: 88%;">
               <CheckBox v-model="formData.evalFlag" :checkValue="1" :un-checkValue="0">
                 <span style="color: #6d7584">是否需要评估</span>
               </CheckBox>
@@ -256,7 +257,7 @@
           </div>
           <div v-if="formData.evalFlag" class="cstm_items main_item">
             <div class="signbox"></div>
-            <div class="btnbox">
+            <div class="btnbox" style="display: flex;">
               <AssessmentList
                 v-model:assessmentName="formData.assessmentName"
                 v-model:assessmentId="formData.assessmentId"
@@ -280,7 +281,7 @@
 
           <div class="cstm_items main_item">
             <div class="signbox"></div>
-            <div class="btnbox">
+            <div class="btnbox" style="display: flex;">
               <add-homework v-model:info="formData.workInfo">
                 <button class="xkbtn" style="margin-bottom: 0; margin-top: 0">
                   配置作业
@@ -297,7 +298,7 @@
           </div>
           <div class="cstm_items main_item" style="margin-bottom: 0">
             <div class="signbox"></div>
-            <div class="btnbox">
+            <div class="btnbox" style="display: flex;">
               <add-test v-model:info="formData.examInfo">
                 <button class="xkbtn" style="margin-bottom: 0; margin-top: 0">
                   配置考试
@@ -358,8 +359,8 @@ import dialog from "@/utils/dialog";
 const props = defineProps({
   type: Number,
 });
-const openCourseVisible = ref(false);
-const offCourseNewVisiable = ref(false);
+const openCourseVisible = ref(true);
+const offCourseNewVisiable = ref(true);
 const tableRef = ref();
 
 const columns = ref([
@@ -576,6 +577,10 @@ defineExpose({ openDrawer });
   background-color: #fafafa !important;
 }
 
+.fitems {
+  width: 88%;
+}
+
 .sameModal {
   .ant-modal {
     width: 424px !important;

From 280fb6c279df84e6348f03c00193ac507e2221b7 Mon Sep 17 00:00:00 2001
From: wyx <51903@qq.com>
Date: Fri, 17 Mar 2023 15:58:25 +0800
Subject: [PATCH 4/4] =?UTF-8?q?style:=E4=BF=AE=E6=94=B9=E5=BC=80=E8=AF=BE?=
 =?UTF-8?q?=E6=A0=B7=E5=BC=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/drawers/AddOpenCourse.vue | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/components/drawers/AddOpenCourse.vue b/src/components/drawers/AddOpenCourse.vue
index 86dd3a93..1725fb54 100644
--- a/src/components/drawers/AddOpenCourse.vue
+++ b/src/components/drawers/AddOpenCourse.vue
@@ -359,8 +359,8 @@ import dialog from "@/utils/dialog";
 const props = defineProps({
   type: Number,
 });
-const openCourseVisible = ref(true);
-const offCourseNewVisiable = ref(true);
+const openCourseVisible = ref(false);
+const offCourseNewVisiable = ref(false);
 const tableRef = ref();
 
 const columns = ref([