src/layouts/home/index.vue

@@ -3,10 +3,8 @@
     <v-head></v-head>
     <Navbar />
     <div class="layout">
-      <!-- <Sidebar :class="{ show: showSidebar }" :path.sync="path" /> -->
-
+      <Sidebar :class="{ show: showSidebar }" :path.sync="path" />
       <div class="content">
-        <el-page-header v-if="showSidebar" class="m-b-20" @back="back" :content="backName"></el-page-header>
         <transition name="move" mode="out-in">
           <router-view class="view"></router-view>
         </transition>
@@ -69,49 +67,6 @@ import { mapState, mapMutations, mapActions } from "vuex";
 import util from "@/libs/util";
 import Setting from "@/setting";
 
-const backList = [
-  {
-    path: '/assessment/list',
-    name: '考核管理',
-  },
-  {
-    path: '/achievement/list',
-    name: '成绩管理',
-  },
-  {
-    path: '/evaluation/list',
-    name: '测评管理',
-  },
-  {
-    path: '/course/list',
-    name: '精品课程管理',
-  },
-  {
-    path: '/review/list',
-    name: '评阅中心',
-  },
-  {
-    path: '/information/list',
-    name: '资讯管理',
-  },
-  {
-    path: '/project/list',
-    name: '项目管理',
-  },
-  {
-    path: '/resourse/list',
-    name: '资源库',
-  },
-  // {
-  //   path: '/exam/list',
-  //   name: '成绩管理',
-  // },
-  {
-    path: '/lesson/list',
-    name: '备课管理',
-  },
-]
-
 export default {
   components: {
     vHead,
@@ -122,7 +77,6 @@ export default {
   data () {
     return {
       showSidebar: false,
-      backName: '',
       path: '',
       logVisible: false,
       list: [],
@@ -167,9 +121,7 @@ export default {
       handler (val) {
         this.path = val
         // 是否显示左侧导航
-        const item = backList.find(e => e.path === val)
-        this.backName = item ? item.name : ''
-        this.showSidebar = item
+        this.showSidebar = ['/assessment/list', '/achievement/list', '/evaluation/list', '/course/list', '/review/list', '/information/list', '/project/list', '/resourse/list', '/exam/list', '/review/list', '/lesson/list', '/resourse/list'].includes(val)
       },
       immediate: true
     }
@@ -243,9 +195,6 @@ export default {
           setTimeout(this.logout, 1500);
         }
       }, 1000);
-    },
-    back() {
-      this.$router.push('/workbench/list')
     }
   }
 };
@@ -254,7 +203,6 @@ export default {
 .main {
   .layout {
     display: flex;
-    min-height: calc(100vh - 173px);
   }
 
   .sidebar:not(.show) {

src/layouts/sidebar/index.vue

@@ -98,7 +98,7 @@ export default {
     Setting.dynamicRoute && this.initTabs()
   },
   methods: {
-    async initTabs () {
+    initTabs () {
       const { btns } = this
       const tabs = this.defaultMenus
       btns.includes('/assessment/list') && this.menus.push(tabs[0])
@@ -109,11 +109,6 @@ export default {
       btns.includes('/information/list') && this.menus.push(tabs[5])
       btns.includes('/project/list') && this.menus.push(tabs[6])
       btns.includes('/resourse/list') && this.menus.push(tabs[7])
-
-
-      const { data } = await this.$get(this.api.logoDetail)
-      this.showLesson = data.schoolId === 901 || data.schoolId === 2845
-      data.schoolId === 901 && btns.includes('/lesson/list') && this.menus.push(tabs[8])
     },
     handleSelect (index) {
 

src/pages/achievement/list/index.vue

@@ -1,17 +1,18 @@
 <template>
   <div class="page">
     <div class="tabs">
-      <a class="item" v-for="(item, i) in tabs" :key="i" :class="{ active: item.id == active }"
-        @click="tabChange(item)">{{ item.name }}</a>
+      <a class="item" v-for="(item, index) in tabs" :key="index" :class="{ active: index == active }"
+        @click="tabChange(index)">{{ item }}</a>
     </div>
     <div class="page-content">
-      <Course v-if="active == 1" />
-      <Project v-if="active == 2 || active == 3" ref="project" />
+      <Course v-if="active == 'tab1'" />
+      <Project v-if="active == 'tab2' || active == 'tab3'" ref="project" />
     </div>
   </div>
 </template>
 
 <script>
+import Setting from "@/setting";
 import { mapState } from "vuex";
 import Course from "./course";
 import Project from "./project";
@@ -24,17 +25,12 @@ export default {
   },
   data () {
     return {
-      active: this.$route.query.tab || 2,
-      tabs: [
-        {
-          id: 1,
-          name: '课程维度'
-        },
-        {
-          id: 2,
-          name: '项目维度'
-        },
-      ]
+      active: this.$route.query.tab || "tab2", // 当前标签页
+      tabs: {
+        tab1: '课程维度',
+        tab2: '项目维度',
+        tab3: '我的课程',
+      },
     };
   },
   computed: {
@@ -44,26 +40,17 @@ export default {
   },
   mounted () {
     this.$store.commit('achievement/setRow', null)
-    this.getSchoolId()
+    // Setting.dynamicRoute && this.initTabs();
   },
   methods: {
-    // 查询schoolId，处理备课管理的展示
-    async getSchoolId () {
-      const { data } = await this.$get(this.api.logoDetail)
-      if (data.schoolId === 901 || data.schoolId === 2845) this.tabs.push({
-        id: 3,
-        name: '我的课程'
-      })
-      console.log("🚀 ~ getSchoolId ~ tabs:", this.tabs)
-    },
-    tabChange ({ id }) {
+    tabChange (i) {
       this.$router.push({
         path: 'list',
         query: {
-          tab: id
+          tab: i
         }
       })
-      this.active = id
+      this.active = i
 
       const el = this.$refs.project
       if (el && el.getCourse) {
@@ -71,6 +58,13 @@ export default {
         el.getCourse()
       }
     },
+    initTabs () {
+      const { btns } = this
+      const tab1 = btns.includes('/course/list:课程管理')
+      const tab2 = btns.includes('/course/list:分类管理')
+      tab1 || delete this.tabs.first
+      tab2 || delete this.tabs.second
+    }
   }
 };
 </script>

src/pages/achievement/list/project.vue

@@ -183,7 +183,7 @@ export default {
 
     // 获取课程
     async getCourse () {
-      if (this.$parent.active == 2) {
+      if (this.$parent.active === 'tab2') {
         const { data } = await this.$get(this.api.getSchoolEffectiveCourse)
         this.curs = data
         this.form.curriculumId = this.form.curriculumId || data[0].cid
@@ -210,7 +210,7 @@ export default {
         ...this.form,
         mallId: cur.mallId || '',
         systemId: cur.systemId || '',
-        courseType: this.$parent.active == 2 ? 0 : 1,
+        courseType: this.$parent.active === 'tab2' ? 0 : 1,
         pageNum: this.page,
         pageSize: this.pageSize,
       };

src/pages/match/manage/matchSignup.vue

@@ -57,7 +57,7 @@
       <el-table-column prop="username" :label="info.completeCompetitionSetup.competitionType ? '队长/成员' : '学生姓名'"
         min-width="140" align="center">
       </el-table-column>
-      <el-table-column prop="account" :label="info.completeCompetitionSetup.competitionType ? '队长/成员账号' : '账号'"
+      <el-table-column prop="workNumber" :label="info.completeCompetitionSetup.competitionType ? '队长/成员学号' : '学号'"
         min-width="140" align="center">
       </el-table-column>
       <el-table-column prop="phone" :label="info.completeCompetitionSetup.competitionType ? '队长/成员手机号' : '手机号'"

src/pages/station/list/index.vue

@@ -10,7 +10,7 @@
     </div>
     <div class="station">
       <div class="inner">
-        <div v-if="showTypes" class="tab">
+        <div class="tab">
           <a class="item" v-for="(item, i) in types" :key="i" :class="{ active: item.id === typeActive }"
             @click="tabChange(item)">{{ item.name }}</a>
         </div>
@@ -71,7 +71,6 @@ export default {
       typeActive: +this.$route.query.typeActive || 0,
       active: this.$route.query.active ? +this.$route.query.active : '',
       searchTimer: null,
-      showTypes: false,
       types: [
         {
           id: 0,
@@ -113,14 +112,8 @@ export default {
   },
   mounted () {
     this.getTab()
-    this.getSchoolId()
   },
   methods: {
-    // 查询schoolId，处理备课管理的展示
-    async getSchoolId () {
-      const { data } = await this.$get(this.api.logoDetail)
-      this.showTypes = data.schoolId === 901 || data.schoolId === 2845
-    },
     // 获取tab
     async getTab () {
       const res = await this.$get(this.api.getSchoolCourseAuthority)

src/pages/workbench/list/index.vue

@@ -45,7 +45,7 @@
           <img src="@/assets/img/workbench/9.png" alt="">
           <p class="name">理论考试系统</p>
         </div> -->
-        <div v-if="showLesson" class="app" v-auth="'/lesson/list'" @click="to('/lesson')">
+        <div class="app" v-auth="'/lesson/list'" @click="to('/lesson')">
           <img src="@/assets/img/workbench/10.png" alt="">
           <p class="name">备课管理</p>
         </div>
@@ -70,7 +70,6 @@ export default {
     return {
       matchPer: false,
       systems: [],
-      showLesson: false,
     };
   },
   computed: {
@@ -79,7 +78,7 @@ export default {
     ])
   },
   mounted () {
-    this.getSchoolId()
+
   },
   methods: {
     // 查询是否有购买赛事产品
@@ -87,11 +86,6 @@ export default {
       const { show } = await this.$get(this.api.getCustomerOrder)
       this.matchPer = show
     },
-    // 查询schoolId，处理备课管理的展示
-    async getSchoolId () {
-      const { data } = await this.$get(this.api.logoDetail)
-      this.showLesson = data.schoolId === 901 || data.schoolId === 2845
-    },
     to (path) {
       path === 'data' ? window.open('https://www.dataforward.cn/') : this.$router.push(path)
     },

src/router/modules/information.js

@@ -22,7 +22,7 @@ export default {
         {
             name: `${pre}addArticle`,
             path: `addArticle`,
-            component: () => import("@/pages/information/addarticle"),
+            component: () => import("@/pages/information/addArticle"),
             meta: { title: "新增文章" }
         }
     ]

vue.config.js

@@ -18,11 +18,11 @@ module.exports = {
   },
 	productionSourceMap: false,
 	chainWebpack: config => {
-		// config.module
-		// 	.rule("images")
-		// 	.use("image-webpack-loader")
-		// 	.loader("image-webpack-loader")
-		// 	.options({ bypassOnDebug: true })
-		// 	.end();
+		config.module
+			.rule("images")
+			.use("image-webpack-loader")
+			.loader("image-webpack-loader")
+			.options({ bypassOnDebug: true })
+			.end();
 	}
 }