From 70f6d015944630d1525225d203694fe7b00a0da5 Mon Sep 17 00:00:00 2001
From: yuping <82253452@qq.com>
Date: Fri, 17 Feb 2023 16:12:01 +0800
Subject: [PATCH 1/2] =?UTF-8?q?--fix=20=E6=8E=92=E5=BA=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/learningpath/LevelAddDetail.vue | 26 +++++++++++++++++------
 src/views/projectcenter/TaskAdd.vue       | 21 +++++++++++++-----
 2 files changed, 36 insertions(+), 11 deletions(-)

diff --git a/src/views/learningpath/LevelAddDetail.vue b/src/views/learningpath/LevelAddDetail.vue
index 07f04af2..f1e07f2b 100644
--- a/src/views/learningpath/LevelAddDetail.vue
+++ b/src/views/learningpath/LevelAddDetail.vue
@@ -12,7 +12,8 @@
             <Draggable v-model="routerInfo.chapterList" chosenClass="chosen" ghostClass="ghost" forceFallback="true"
                        item-key="id" group="stage" animation="500">
               <template #item="{ element,index }">
-                <div class="items" v-if="!element.deleted" :class="activeIndex === index ? 'active' : ''" @click="changebgc(index)">
+                <div class="items" v-if="!element.deleted" :class="activeIndex === index ? 'active' : ''"
+                     @click="changebgc(index)">
                   <div class="items1">
                     <div class="boxs_left">
                       <a-popover placement="topLeft" trigger="click">
@@ -118,8 +119,10 @@
               <div class="select" style="margin-right:90px;">
                 <span>学习模式：</span>
                 <span
-                  style="border: 1px solid rgba(0, 0, 0, 0.25);width: 120px;height: 38px; border-radius: 10px;text-align: center;line-height: 38px;">
-                  {{ routerInfo.routerInfo.unlockMode == 1 ? '自由学习模式': routerInfo.routerInfo.unlockMode == 2 || routerInfo.routerInfo.unlockMode == 3 ? '闯关模式': '' }}
+                    style="border: 1px solid rgba(0, 0, 0, 0.25);width: 120px;height: 38px; border-radius: 10px;text-align: center;line-height: 38px;">
+                  {{
+                    routerInfo.routerInfo.unlockMode == 1 ? '自由学习模式' : routerInfo.routerInfo.unlockMode == 2 || routerInfo.routerInfo.unlockMode == 3 ? '闯关模式' : ''
+                  }}
                 </span>
                 <!-- <a-select v-model:value="routerInfo.routerInfo.unlockMode" ref="select" size="small"
                           style="width: 150px" disabled>
@@ -128,7 +131,8 @@
                   <a-select-option :value="3">闯关模式</a-select-option>
                 </a-select> -->
                 <unlock-mode :routerInfo="routerInfo.routerInfo" :types="types">
-                  <a-button type="primary" size="large" style="border-radius: 8px;margin-left: 24px;">切换模式</a-button>
+                  <a-button type="primary" size="large" style="border-radius: 8px;margin-left: 24px;">切换模式
+                  </a-button>
                 </unlock-mode>
               </div>
               <div class="line"></div>
@@ -444,7 +448,7 @@
   </div>
 </template>
 <script setup>
-import {computed, onMounted, onUnmounted, ref} from "vue";
+import {computed, onMounted, onUnmounted, ref, watch} from "vue";
 import {GetRouterDraftDetail, releaseRouter} from "@/api/indexTask";
 import {message} from "ant-design-vue";
 import {editTask} from "@/api/indexTaskadd";
@@ -484,6 +488,16 @@ const selectAll = computed(() => {
   }
   return 2
 })
+
+watch(() => routerInfo.value.chapterList, () => {
+  routerInfo.value.chapterList.forEach((t, i) => {
+    t.sort = i;
+    t.draftTaskList?.forEach((s, j) => {
+      s.sort = j
+    })
+  })
+}, {deep: true})
+
 const showModal = () => {
   modal.value = true;
 };
@@ -542,7 +556,7 @@ const closedeleteAll = () => {
   deleteAll.value = false
 };
 const subdeleteAll = () => {
-  routerInfo.value.chapterList[activeIndex.value].draftTaskList.filter(t => t.checked).forEach(t=>{
+  routerInfo.value.chapterList[activeIndex.value].draftTaskList.filter(t => t.checked).forEach(t => {
     t.checked = false;
     t.deleted = true;
   })
diff --git a/src/views/projectcenter/TaskAdd.vue b/src/views/projectcenter/TaskAdd.vue
index 3b01602a..32731600 100644
--- a/src/views/projectcenter/TaskAdd.vue
+++ b/src/views/projectcenter/TaskAdd.vue
@@ -16,7 +16,8 @@
             <Draggable v-model="projectInfo.stageList" chosenClass="chosen" ghostClass="ghost" forceFallback="true"
                        group="stage" animation="500">
               <template #item="{ element,index }">
-                <div class="items" v-if="element.id !=='0' && !element.deleted" :class="activeIndex === index ? 'active' : ''"
+                <div class="items" v-if="element.id !=='0' && !element.deleted"
+                     :class="activeIndex === index ? 'active' : ''"
                      @click="changeStageIndex(index)">
                   <div class="items1">
                     <div class="boxs_left">
@@ -180,7 +181,8 @@
                     操作
                   </div>
                 </div>
-                <Draggable v-model="projectInfo.stageList[activeIndex].taskDraftDtoList" chosenClass="chosen" ghostClass="ghost"
+                <Draggable v-model="projectInfo.stageList[activeIndex].taskDraftDtoList" chosenClass="chosen"
+                           ghostClass="ghost"
                            forceFallback="true" group="task" animation="500">
                   <template #item="{ element,index }">
                     <div style="
@@ -518,7 +520,7 @@
 </template>
 
 <script setup>
-import {computed, onMounted, onUnmounted, ref,} from "vue";
+import {computed, onMounted, onUnmounted, ref, watch,} from "vue";
 import {message} from "ant-design-vue";
 import * as api from "../../api/indexTaskadd";
 import UnlockMode from "../../components/drawers/UnlockMode.vue";
@@ -558,13 +560,22 @@ const selectAll = computed(() => {
   return 2
 })
 
+watch(() => projectInfo.value.stageList, () => {
+  projectInfo.value.stageList.forEach((t, i) => {
+    t.sort = i;
+    t.taskDraftDtoList?.forEach((s, j) => {s.sort = j})
+  })
+}, {deep: true})
+
 function changeStageIndex(index) {
   activeIndex.value = index
 }
 
 //获取任务列表
 const getTask = async () => {
-  await api.getDraftTask({projectId: route.query.projectId}).then((res) => {projectInfo.value = res.data.data});
+  await api.getDraftTask({projectId: route.query.projectId}).then((res) => {
+    projectInfo.value = res.data.data
+  });
 };
 
 const editTaskForType = (ele, index) => {
@@ -596,7 +607,7 @@ const moveTask = () => {
 };
 //批量删除
 const deleteTaskAll = () => {
-  projectInfo.value.stageList[activeIndex.value].taskDraftDtoList.filter(t => t.checked).forEach(t=>{
+  projectInfo.value.stageList[activeIndex.value].taskDraftDtoList.filter(t => t.checked).forEach(t => {
     t.checked = false;
     t.deleted = true;
   })

From b1dde8f3a7e47ad9f38086093e52d71ee70b593f Mon Sep 17 00:00:00 2001
From: yuping <82253452@qq.com>
Date: Fri, 17 Feb 2023 16:23:14 +0800
Subject: [PATCH 2/2] =?UTF-8?q?--fix=20=E6=8E=92=E5=BA=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/learningpath/LevelAddDetail.vue | 2 +-
 src/views/projectcenter/TaskAdd.vue       | 6 ++++--
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/src/views/learningpath/LevelAddDetail.vue b/src/views/learningpath/LevelAddDetail.vue
index f1e07f2b..a3f76473 100644
--- a/src/views/learningpath/LevelAddDetail.vue
+++ b/src/views/learningpath/LevelAddDetail.vue
@@ -627,7 +627,7 @@ const temporaryStorage = async () => {
 
 const submitStorage = async () => {
   confirmLoading.value = true
-  await releaseRouter(routerId)
+  routerInfo.value.routerInfo.status === 1 ? await releaseRouter(routerId) : await request(ROUTER_DETAIL_MODIFY, routerInfo.value)
   message.success("关卡和任务数据已保存")
   confirmLoading.value = false
 };
diff --git a/src/views/projectcenter/TaskAdd.vue b/src/views/projectcenter/TaskAdd.vue
index 32731600..cf1f2400 100644
--- a/src/views/projectcenter/TaskAdd.vue
+++ b/src/views/projectcenter/TaskAdd.vue
@@ -563,7 +563,9 @@ const selectAll = computed(() => {
 watch(() => projectInfo.value.stageList, () => {
   projectInfo.value.stageList.forEach((t, i) => {
     t.sort = i;
-    t.taskDraftDtoList?.forEach((s, j) => {s.sort = j})
+    t.taskDraftDtoList?.forEach((s, j) => {
+      s.sort = j
+    })
   })
 }, {deep: true})
 
@@ -723,7 +725,7 @@ const temporaryStorage = async () => {
 //确定
 const submitStorage = async () => {
   confirmLoading.value = true
-  await request(PROJECT_RELEASE, {projectId: route.query.projectId})
+  projectInfo.value.projectInfo.status === 3 ? await request(PROJECT_RELEASE, {projectId: route.query.projectId}) : await request(PROJECT_DETAIL_MODIFY, projectInfo.value)
   message.success("阶段和任务数据已保存")
   confirmLoading.value = false
 };