From 69df7cddc6f0e497325f82a4ac012b9d4223987f Mon Sep 17 00:00:00 2001
From: wyx <51903@qq.com>
Date: Thu, 6 Apr 2023 20:01:42 +0800
Subject: [PATCH 1/3] =?UTF-8?q?fix:=E9=A1=B9=E7=9B=AE/=E5=AD=A6=E4=B9=A0?=
 =?UTF-8?q?=E8=B7=AF=E5=BE=84=E8=BF=94=E5=9B=9E=E8=B7=B3=E8=BD=AC=E6=8C=87?=
 =?UTF-8?q?=E7=82=B9tab=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/learningpath/LevelAdd.vue       | 7 ++++++-
 src/views/learningpath/LevelAddDetail.vue | 4 ++--
 src/views/projectcenter/TaskAdd.vue       | 4 ++--
 src/views/projectcenter/TaskPage.vue      | 4 ++++
 4 files changed, 14 insertions(+), 5 deletions(-)

diff --git a/src/views/learningpath/LevelAdd.vue b/src/views/learningpath/LevelAdd.vue
index d41e07dd..0ed36e39 100644
--- a/src/views/learningpath/LevelAdd.vue
+++ b/src/views/learningpath/LevelAdd.vue
@@ -1451,7 +1451,7 @@ export default {
       createId: null,
       permissions: "",
       hasTask: false,
-      stage: [],
+      stage: [], 
       statess: [],
       routerId: route.query.routerId
         ? route.query.routerId
@@ -2072,6 +2072,11 @@ export default {
     //学员管理------------------------------------------------
 
     onMounted(() => {
+      // 是否是从编辑跳转过来的
+      if(route.query.routerEdit==="true"){
+        state.activeKey = "2";
+      }
+
       state.addLoading = true;
       getOverview();
       myGetRouterDetail();
diff --git a/src/views/learningpath/LevelAddDetail.vue b/src/views/learningpath/LevelAddDetail.vue
index d98b4d2f..afa75947 100644
--- a/src/views/learningpath/LevelAddDetail.vue
+++ b/src/views/learningpath/LevelAddDetail.vue
@@ -129,7 +129,7 @@
                 </unlock-mode>
               </div>
               <div class="line"></div>
-              <router-link :to="{ path: '/leveladd', query:{ routerId: routerId } }">
+              <router-link :to="{ path: '/leveladd', query:{ routerId: routerId, routerEdit: true } }">
                 <div style="display: flex">
                   <img class="img2" style="margin-right: 22px" src="../../assets/images/leveladd/back.png"/>
                   <div class="return">返回</div>
@@ -335,7 +335,7 @@
       <div class="btnbox">
         <a-button class="btn btn1" @click="temporaryStorage" :loading="confirmLoading">暂存</a-button>
         <a-button class="btn btn1" @click="submitStorage" :loading="confirmLoading">确定</a-button>
-        <router-link :to="{ path: '/leveladd', query:{ routerId: routerId } }">
+        <router-link :to="{ path: '/leveladd', query:{ routerId: routerId, routerEdit: true } }">
           <!-- @click="cancelStorage" -->
           <a-button class="btn btn1" :loading="cancleLoading">取消</a-button>
         </router-link>
diff --git a/src/views/projectcenter/TaskAdd.vue b/src/views/projectcenter/TaskAdd.vue
index f4a16576..a6d08d79 100644
--- a/src/views/projectcenter/TaskAdd.vue
+++ b/src/views/projectcenter/TaskAdd.vue
@@ -88,7 +88,7 @@
                 </unlock-mode>
               </div>
               <div class="line"></div>
-              <router-link :to="{ path: `/taskpage`, query: { projectId: route.query.projectId } }">
+              <router-link :to="{ path: `/taskpage`, query: { projectId: route.query.projectId, routerEdit: true  } }">
                 <div style="display: flex">
                   <img class="img2" src="../../assets/images/leveladd/back.png"/>
                   <div class="return">返回</div>
@@ -289,7 +289,7 @@
       <div class="btnbox">
         <a-button class="btn btn1" @click="temporaryStorage" :loading="confirmLoading">暂存</a-button>
         <a-button class="btn btn1" @click="submitStorage" :loading="confirmLoading">确定</a-button>
-        <router-link :to="{ path: `/taskpage`, query: { projectId: route.query.projectId } }">
+        <router-link :to="{ path: `/taskpage`, query: { projectId: route.query.projectId, routerEdit: true } }">
           <!-- @click="cancelStorage" -->
           <a-button class="btn btn1" :loading="cancleLoading">取消</a-button>
         </router-link>
diff --git a/src/views/projectcenter/TaskPage.vue b/src/views/projectcenter/TaskPage.vue
index 600cf688..feb47a1c 100644
--- a/src/views/projectcenter/TaskPage.vue
+++ b/src/views/projectcenter/TaskPage.vue
@@ -4540,6 +4540,10 @@ export default {
       }
     );
     onMounted(() => {
+      // 是否是从编辑跳转过来的
+      if(route.query.routerEdit==="true"){
+        state.activeKey = "2";
+      }
       // getStu();
       getTaskList();
       getTaskInfo();

From 739a37664d2d9f4a285c59ec8e1b3be83d674055 Mon Sep 17 00:00:00 2001
From: wyx <51903@qq.com>
Date: Thu, 6 Apr 2023 20:47:14 +0800
Subject: [PATCH 2/3] =?UTF-8?q?fix:=E6=A8=A1=E6=9D=BF=E5=BA=93=E7=82=B9?=
 =?UTF-8?q?=E5=87=BB=E7=BC=96=E8=BE=91=E8=BF=94=E5=9B=9E=E6=8A=A5=E9=94=99?=
 =?UTF-8?q?=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/projectcenter/temTask.vue | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/src/views/projectcenter/temTask.vue b/src/views/projectcenter/temTask.vue
index 256e50f7..cdf48b86 100644
--- a/src/views/projectcenter/temTask.vue
+++ b/src/views/projectcenter/temTask.vue
@@ -86,7 +86,7 @@
               <!--                </unlock-mode>-->
               <!--              </div>-->
               <div class="line"></div>
-              <router-link :to="{ path: `/libraryAdd`, query: { projectId: route.query.projectId } }">
+              <router-link :to="{ path: `/libraryAdd`, query: { projectTemplateId: route.query.projectId } }">
                 <div style="display: flex">
                   <img class="img2" src="../../assets/images/leveladd/back.png" />
                   <div class="return">返回</div>
@@ -280,7 +280,10 @@
     <div class="footbtn">
       <div class="btnbox">
         <a-button class="btn btn1" @click="submitStorage" :loading="templateLoading">确定</a-button>
-        <a-button class="btn btn1" @click="cancelStorage" :loading="cancleLoading">取消</a-button>
+        <router-link :to="{ path: `/libraryAdd`, query: { projectTemplateId: route.query.projectId } }">
+          <!--  @click="cancelStorage" -->
+          <a-button class="btn btn1" :loading="cancleLoading">取消</a-button>
+        </router-link>
       </div>
     </div>
 

From 6c5dbd8a1b950d48604d79f11e826327d7d1b6f0 Mon Sep 17 00:00:00 2001
From: wyx <51903@qq.com>
Date: Thu, 6 Apr 2023 20:47:35 +0800
Subject: [PATCH 3/3] fix

---
 src/App.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/App.vue b/src/App.vue
index 7ea4bd5c..9fd5c888 100644
--- a/src/App.vue
+++ b/src/App.vue
@@ -34,7 +34,7 @@ import {USER_PERMISSION} from "@/api/ThirdApi";
 const store = useStore();
 const isLogin = ref(false);
 
-console.log("版本2.4.3------------");
+console.log("版本2.4.4------------");