From b5aa906326b1376f16eb9e419210d4afb0ca04b8 Mon Sep 17 00:00:00 2001
From: yujialong <479214531@qq.com>
Date: Thu, 9 Jan 2025 13:52:01 +0800
Subject: [PATCH] fix

---
 src/components/Sidebar.vue          |  2 +-
 src/views/Home.vue                  |  4 ++--
 src/views/course/content/index.vue  |  4 ++--
 src/views/course/content/source.vue |  2 +-
 src/views/course/detail.vue         |  6 +++---
 src/views/match/add/set.vue         | 12 +++++++++++-
 src/views/serve/Configure.vue       |  2 +-
 src/views/serve/projectList.vue     |  6 +++---
 8 files changed, 24 insertions(+), 14 deletions(-)

diff --git a/src/components/Sidebar.vue b/src/components/Sidebar.vue
index 2e67211..27662d2 100644
--- a/src/components/Sidebar.vue
+++ b/src/components/Sidebar.vue
@@ -152,7 +152,7 @@ export default {
   max-width: 200px;
   height: calc(100vh - 116px);
   overflow: auto;
-  transition: .5s;
+  // transition: .5s;
   transform: translateX(-200px);
 
   &.show {
diff --git a/src/views/Home.vue b/src/views/Home.vue
index b1db9c3..59bf5dd 100644
--- a/src/views/Home.vue
+++ b/src/views/Home.vue
@@ -80,8 +80,8 @@ export default {
     width: calc(100vw - 208px);
     padding: 20px;
     box-sizing: border-box;
-    -webkit-transition: left 0.3s ease-in-out;
-    transition: left 0.3s ease-in-out;
+    // -webkit-transition: left 0.3s ease-in-out;
+    // transition: left 0.3s ease-in-out;
   }
 
   .sidebar:not(.show) {
diff --git a/src/views/course/content/index.vue b/src/views/course/content/index.vue
index d80090c..65f055f 100644
--- a/src/views/course/content/index.vue
+++ b/src/views/course/content/index.vue
@@ -405,7 +405,7 @@ export default {
       }
     },
     handleRemove () {
-      Oss.del(this.fileUrl)
+      // Oss.del(this.fileUrl)
       this.fileUrl = ''
     },
     transferType (ext) {
@@ -772,7 +772,7 @@ export default {
         type: "warning"
       }).then(() => {
         this.$del(`${this.api.deleteSubsection}/${row.id}`).then(res => {
-          row.fileUrl && Oss.del(row.fileUrl)
+          // row.fileUrl && Oss.del(row.fileUrl)
           this.$message.success("删除成功")
           this.getData()
         }).catch(res => { })
diff --git a/src/views/course/content/source.vue b/src/views/course/content/source.vue
index c858418..8ae1a1c 100644
--- a/src/views/course/content/source.vue
+++ b/src/views/course/content/source.vue
@@ -174,7 +174,6 @@ export default {
   methods: {
     // 初始化
     init () {
-      this.getCourse()
       this.checked = []
       this.curType = '全部'
       this.sourceType = [
@@ -187,6 +186,7 @@ export default {
       this.sourceType.forEach(e => {
         e.check = false
       })
+      this.getCourse()
     },
     // 课程列表
     async getCourse () {
diff --git a/src/views/course/detail.vue b/src/views/course/detail.vue
index 5edce43..404d703 100644
--- a/src/views/course/detail.vue
+++ b/src/views/course/detail.vue
@@ -215,7 +215,7 @@
       </div>
       <div v-if="step !== 4" class="btns">
         <el-button v-if="step === 2 || step === 3" type="primary" @click="prev">上一步</el-button>
-        <el-button v-if="step < 3" type="primary" @click="save(1)">下一步</el-button>
+        <el-button v-if="step < 3" type="primary" @click="save(1)">保存并下一步</el-button>
         <el-button type="primary" @click="save()">保存</el-button>
         <el-button @click="back">返回</el-button>
       </div>
@@ -934,7 +934,7 @@ export default {
               cid: this.cid,
               systemIdByAssessment: list
             })
-            this.step = 4
+            this.back()
           } finally {
             this.submiting = false
             load.close()
@@ -944,7 +944,7 @@ export default {
     },
     // 跳转步骤
     toStep (i) {
-      this.step = i
+      if (!this.isAdd || (this.cid && i < this.step)) this.step = i
     },
     // 返回上一页
     back () {
diff --git a/src/views/match/add/set.vue b/src/views/match/add/set.vue
index 4b93b0d..9347db2 100644
--- a/src/views/match/add/set.vue
+++ b/src/views/match/add/set.vue
@@ -372,7 +372,17 @@ export default {
         form,
         curStep
       })
-      this.$router.push(`/projectList?systemId=${this.mallIds[1]}&show=1&name=${this.$refs.cur.getCheckedNodes()[0].label}`)
+      let { systemId } = this
+      let name
+      if (systemId) {
+        const cur = this.services.find(e => e.systemId === systemId)
+        if (cur) name = cur.systemName
+      }
+      if (!this.courseSystem && this.mallIds.length > 1) {
+        systemId = this.mallIds[1]
+        name = this.$refs.cur.getCheckedNodes()[0].label
+      }
+      this.$router.push(`/projectList?systemId=${systemId}&custom=1&name=${name}`)
     },
     // 时间选择回调
     timeChange (val) {
diff --git a/src/views/serve/Configure.vue b/src/views/serve/Configure.vue
index 414c9e6..1fb7db4 100644
--- a/src/views/serve/Configure.vue
+++ b/src/views/serve/Configure.vue
@@ -170,7 +170,7 @@ export default {
     },
     getIntoProject (row) {
       this.setReferrer()
-      this.$router.push(`/projectList?systemId=${row.systemId}&show=1&name=${row.systemName}`)
+      this.$router.push(`/projectList?systemId=${row.systemId}&name=${row.systemName}`)
     },
     getIntoJudgement (row) {
       this.setReferrer()
diff --git a/src/views/serve/projectList.vue b/src/views/serve/projectList.vue
index 4446ab5..9d2dafb 100644
--- a/src/views/serve/projectList.vue
+++ b/src/views/serve/projectList.vue
@@ -1,6 +1,6 @@
 <template>
   <div>
-    <el-card v-if="showBack" shadow="hover" class="mgb20">
+    <el-card shadow="hover" class="mgb20">
       <el-page-header :content="'实验项目管理 / ' + titleName" @back="back"></el-page-header>
     </el-card>
 
@@ -128,7 +128,7 @@ import qs from 'qs'
 export default {
   data () {
     return {
-      showBack: Boolean(this.$route.query.show),
+      fromCustom: Boolean(this.$route.query.custom), // 从竞赛的自定义项目进来的
       systemId: this.$route.query.systemId,
       titleName: this.$route.query.name,
       form: {
@@ -368,7 +368,7 @@ export default {
       }).catch(err => { })
     },
     back () { // 返回
-      this.$router.push(this.$store.state.referrer || '/configure')
+      this.fromCustom ? this.$router.back() : this.$router.push(this.$store.state.referrer || '/configure')
     }
   }
 };