From f2b6fb204f2ccd4f8a0141964a3809357e54d911 Mon Sep 17 00:00:00 2001
From: yujialong <479214531@qq.com>
Date: Wed, 11 Dec 2024 18:40:44 +0800
Subject: [PATCH] fix

---
 src/components/Navbar.vue       |  2 --
 src/components/Sidebar.vue      | 16 +++++++---------
 src/views/Home.vue              |  8 +++++++-
 src/views/course/Curriculum.vue | 25 ++++++++++++-------------
 src/views/match/add/index.vue   | 14 +++++++-------
 src/views/match/list/index.vue  |  6 +++---
 src/views/parner/staff.vue      |  2 +-
 src/views/serve/Configure.vue   | 12 +++++++++---
 8 files changed, 46 insertions(+), 39 deletions(-)

diff --git a/src/components/Navbar.vue b/src/components/Navbar.vue
index cc66b04..d09c804 100644
--- a/src/components/Navbar.vue
+++ b/src/components/Navbar.vue
@@ -79,7 +79,6 @@ export default {
     }
   },
   mounted () {
-    // sessionStorage.getItem('sideBar') && this.handleSelect(sessionStorage.getItem('sideBar'))
     sessionStorage.getItem('token') && this.getPer() // 登录了才获取权限
   },
   methods: {
@@ -88,7 +87,6 @@ export default {
       this.$store.commit('setInfoTab', '1')
       this.$store.commit('setColumnId', '')
       this.$store.commit('setCompetitionCache', null)
-      sessionStorage.setItem('sideBar', index)
     },
     initMenu () {
       if (Setting.dynamicRoute) {
diff --git a/src/components/Sidebar.vue b/src/components/Sidebar.vue
index b131e0a..04f3d08 100644
--- a/src/components/Sidebar.vue
+++ b/src/components/Sidebar.vue
@@ -31,8 +31,10 @@
 
 <script>
 export default {
+  props: ['path'],
   data () {
     return {
+      active: '',
       menus: [
         {
           index: '1',
@@ -123,17 +125,14 @@ export default {
           ]
         },
       ],
-      onRoutes: this.$route.path
     };
   },
   watch: {
-    "$route.path": function (val) {
-      this.menuList.map(e => {
-        if (val.replace('/', '') === e.index) {
-          this.handleSelect(val.replace('/', ''))
-          this.$forceUpdate();
-        }
-      })
+    path: {
+      handler (val) {
+        this.active = val === '/configure' ? `/configure?id=${this.$route.query.id}` : val
+      },
+      immediate: true
     }
   },
   mounted () {
@@ -156,7 +155,6 @@ export default {
   transform: translateX(-200px);
 
   &.show {
-
     transform: translateX(0);
   }
 
diff --git a/src/views/Home.vue b/src/views/Home.vue
index 04a5f60..ff9b741 100644
--- a/src/views/Home.vue
+++ b/src/views/Home.vue
@@ -3,7 +3,7 @@
     <v-head></v-head>
     <Navbar></Navbar>
     <div class="layout">
-      <Sidebar :class="{ show: showSidebar }" />
+      <Sidebar :class="{ show: showSidebar }" :path.sync="path" />
       <div class="content-box">
         <transition name="move" mode="out-in">
           <router-view></router-view>
@@ -24,6 +24,7 @@ export default {
   data () {
     return {
       showSidebar: false,
+      path: '',
     };
   },
   components: {
@@ -34,6 +35,7 @@ export default {
   watch: {
     '$route.path': {
       handler (val) {
+        this.path = val
         // 是否显示左侧导航
         this.showSidebar = ['/configure', '/curriculum', '/information', '/shop', '/market', '/parnerOperation', '/parner', '/match', '/data', '/review', '/theoreticalCourse'].includes(val)
       },
@@ -83,5 +85,9 @@ export default {
     transition: left 0.3s ease-in-out;
     overflow: auto;
   }
+
+  .sidebar:not(.show) {
+    margin-left: -200px;
+  }
 }
 </style>
diff --git a/src/views/course/Curriculum.vue b/src/views/course/Curriculum.vue
index f5cdde5..5e5da92 100644
--- a/src/views/course/Curriculum.vue
+++ b/src/views/course/Curriculum.vue
@@ -67,29 +67,28 @@
       <el-table v-loading="loading" :data="courseData" class="table" ref="table" header-align="center"
         @selection-change="handleSelectionChange" :row-key="getRowKeys">
         <el-table-column type="selection" width="55" align="center" :reserve-selection="true"></el-table-column>
-        <el-table-column type="index" width="100" label="序号" align="center"></el-table-column>
+        <el-table-column type="index" width="70" label="序号" align="center"></el-table-column>
         <el-table-column prop="curriculumName" label="课程名称" align="center"></el-table-column>
-        <el-table-column prop="curriculumType" label="课程类型" align="center">
+        <el-table-column prop="curriculumType" label="课程类别" align="center">
           <template slot-scope="scope">
             <span class="ellipsis">{{ courseTypeStatus[scope.row.curriculumType] }}</span>
           </template>
         </el-table-column>
-        <el-table-column prop="userName" label="创建人" align="center"></el-table-column>
-        <el-table-column label="配置的实训应用" align="center">
+        <el-table-column prop="expectedCourse" label="预计课时" align="center"></el-table-column>
+        <el-table-column label="配置的系统" align="center">
           <template slot-scope="scope">
             <span class="ellipsis">{{ scope.row.sysName }}</span>
           </template>
         </el-table-column>
+        <el-table-column prop="curriculumName" label="内容资源" align="center"></el-table-column>
+        <el-table-column prop="curriculumName" label="练习项目" align="center"></el-table-column>
+        <el-table-column prop="curriculumName" label="考核项目" align="center"></el-table-column>
+        <el-table-column prop="curriculumName" label="状态" align="center"></el-table-column>
         <el-table-column prop="orderVolume" label="订单量" align="center"></el-table-column>
-        <el-table-column prop="expectedCourse" label="预计课时" align="center"></el-table-column>
-        <el-table-column label="上架/下架" align="center">
-          <template slot-scope="scope">
-            <el-switch v-model="scope.row.isShelves" :active-value="1" :inactive-value="0"
-              @change="changeSwitch($event, scope.row)" v-auth="'/curriculum:上下架'">
-            </el-switch>
-          </template>
-        </el-table-column>
-        <el-table-column label="操作" align="center">
+        <el-table-column prop="expectedCourse" label="创建时间" align="center"></el-table-column>
+        <el-table-column prop="expectedCourse" label="最近编辑时间" align="center"></el-table-column>
+        <el-table-column prop="userName" label="编辑人" align="center"></el-table-column>
+        <el-table-column label="操作" width="150" align="center">
           <template slot-scope="scope">
             <el-button type="text" @click="edit(scope.row)" v-auth>编辑</el-button>
             <el-button type="text" @click="config(scope.row)" v-auth>内容设置</el-button>
diff --git a/src/views/match/add/index.vue b/src/views/match/add/index.vue
index f74b8a9..240e798 100644
--- a/src/views/match/add/index.vue
+++ b/src/views/match/add/index.vue
@@ -298,28 +298,28 @@ export default {
   .active {
     .circle {
       color: #fff;
-      border-color: #459ffb;
-      background: #007eff;
+      border-color: #26499f;
+      background: #062c87;
     }
 
     .text {
-      color: #007eff;
+      color: #062c87;
     }
   }
 
   .done {
     .circle {
       color: #fff;
-      background: #9c86ff;
-      border-color: #bbacff;
+      background: #062c87;
+      border-color: #26499f;
 
       &:after {
-        background: #bbacff;
+        background: #062c87;
       }
     }
 
     .text {
-      color: #9178ff;
+      color: #062c87;
     }
   }
 
diff --git a/src/views/match/list/index.vue b/src/views/match/list/index.vue
index e150f86..6eb62c7 100644
--- a/src/views/match/list/index.vue
+++ b/src/views/match/list/index.vue
@@ -73,7 +73,7 @@
           {{ scope.$index + (page - 1) * pageSize + 1 }}
         </template>
       </el-table-column>
-      <el-table-column prop="competitionName" label="竞赛名称" align="center"></el-table-column>
+      <el-table-column prop="competitionName" min-width="160" label="竞赛名称" align="center"></el-table-column>
       <el-table-column prop="name" label="竞赛来源" width="90" align="center">
         <template slot-scope="scope">
           {{ sourceList.find(e => e.id === scope.row.platformSource).name }}
@@ -94,8 +94,8 @@
           {{ scope.row.competitionType ? '团队赛' : '个人赛' }}
         </template>
       </el-table-column>
-      <el-table-column prop="applicantNum" label="报名人数" align="center" width="100"></el-table-column>
-      <el-table-column prop="status" label="状态" align="center" width="80">
+      <el-table-column prop="applicantNum" label="报名人数" align="center" width="90"></el-table-column>
+      <el-table-column prop="status" label="状态" align="center" width="60">
         <template slot-scope="scope">
           {{ scope.row.publishStatus ? '已发布' : '未发布' }}
         </template>
diff --git a/src/views/parner/staff.vue b/src/views/parner/staff.vue
index 57b8318..2c951f8 100644
--- a/src/views/parner/staff.vue
+++ b/src/views/parner/staff.vue
@@ -100,7 +100,7 @@
           </el-table-column>
         </template>
         <el-table-column prop="loginNumber" label="登录次数" align="center" width="120"></el-table-column>
-        <el-table-column prop="lastLoginTime" label="上次登录时间" align="center" width="120"></el-table-column>
+        <el-table-column prop="lastLoginTime" label="上次登录时间" align="center" width="150"></el-table-column>
         <el-table-column label="操作" align="center" width="300">
           <template slot-scope="scope">
             <el-button v-if="!type" type="text" v-auth="'/parner:账号管理:重置密码'" @click="edit(scope.row)">编辑</el-button>
diff --git a/src/views/serve/Configure.vue b/src/views/serve/Configure.vue
index 2c0af20..414c9e6 100644
--- a/src/views/serve/Configure.vue
+++ b/src/views/serve/Configure.vue
@@ -87,7 +87,7 @@ import qs from 'qs'
 export default {
   data () {
     return {
-      id: this.$route.query.id || '',
+      id: '',
       userId: this.$store.state.userLoginId,
       token: btoa(sessionStorage.getItem('token')),
       form: {
@@ -114,15 +114,21 @@ export default {
       this.searchTimer = setTimeout(() => {
         this.initData();
       }, 500);
+    },
+    '$route.query': {
+      handler (val) {
+        this.id = this.$route.query.id || ''
+        this.getData()
+      },
+      immediate: true
     }
   },
   mounted () {
     const { query } = this.$route
     if (query.page) {
-      this.$router.push('/configure').catch(() => { })
+      this.$router.push(`/configure?id=${this.id}`).catch(() => { })
     }
 
-    this.getData();
   },
   methods: {
     initData () {