fix: 若干bug

src/components/GlobalHeader/AvatarDropdown.vue

@@ -62,7 +62,8 @@ export default {
           // return new Promise((resolve, reject) => {
           //   setTimeout(Math.random() > 0.5 ? resolve : reject, 1500)
           // }).catch(() => console.log('Oops errors!'))
-          window.localStorage.removeItem('access_token')
+          window.localStorage.removeItem('access-token')
+          window.location.reload()
           this.$router.push({ path: '/user/login' })
           // this.$store.dispatch('Logout').then(() => {
           //   this.$router.push({ name: 'login' })

src/config/router.config.js

@@ -218,10 +218,10 @@ export const asyncRouterMap = [
         ]
       }
     ]
-  },
-  {
-    path: '*', redirect: '/404', hidden: true
   }
+  // {
+  //   path: '*', redirect: '/404', hidden: true
+  // }
 ]
 
 /**

src/layouts/BasicLayout.vue

@@ -44,6 +44,8 @@ import Ads from '@/components/Other/CarbonAds'
 import LogoSvg from '../assets/logo.svg?inline'
 // import logo1 from '../assets/logo-1.png'
 import { asyncRouterMap } from '@/config/router.config.js'
+import router from '@/router'
+
 export default {
   name: 'BasicLayout',
   components: {
@@ -90,22 +92,39 @@ export default {
   computed: {
     ...mapState({
       // 动态主路由
-      mainMenu: state => state.permission.addRouters
+      mainMenu: state => state.permission.addRouters,
+      routers: state => state.permission.routers
     })
   },
+  watch: {
+    // mainMenu: {
+    //   handler () {
+    //     console.log('红菊地址', this.mainMenu)
+
+    //     this.menus = this.mainMenu[0].children
+    //   },
+    //   deep: true
+    // }
+  },
   created () {
-    const routes = asyncRouterMap.find((item) => item.path === '/')
-    // const routes = this.mainMenu.find(item => item.path === '/')
-    this.menus = (routes && routes.children) || []
-    // 处理侧栏收起状态
-    this.$watch('collapsed', () => {
-      this.$store.commit(SIDEBAR_TYPE, this.collapsed)
-    })
-    this.$watch('isMobile', () => {
-      this.$store.commit(TOGGLE_MOBILE_TYPE, this.isMobile)
-    })
+
   },
   mounted () {
+    this.$nextTick(() => {
+      const routes = asyncRouterMap.find((item) => item.path === '/')
+        // const routes = this.mainMenu.find(item => item.path === '/')
+        console.log('奇怪的路由:', this.mainMenu[0].children)
+        // this.menus = this.mainMenu[0].children
+          this.menus = (routes && routes.children) || []
+          // 处理侧栏收起状态
+          this.$watch('collapsed', () => {
+            this.$store.commit(SIDEBAR_TYPE, this.collapsed)
+          })
+          this.$watch('isMobile', () => {
+            this.$store.commit(TOGGLE_MOBILE_TYPE, this.isMobile)
+          })
+    })
+
     const userAgent = navigator.userAgent
     if (userAgent.indexOf('Edge') > -1) {
       this.$nextTick(() => {

src/main.js

@@ -40,12 +40,12 @@ import 'echarts/lib/chart/funnel'
 import 'echarts/lib/chart/bar'
 import 'echarts/lib/chart/line'
 
-import { Timeline } from 'ant-design-vue'
+import { Timeline, FormModel } from 'ant-design-vue'
 Object.keys(filters).forEach(key => {
   Vue.filter(key, filters[key])
 })
 
-Vue.use(Timeline)
+Vue.use(Timeline).use(FormModel)
 
 Vue.component('vue-chart', vueECharts)
 Vue.component('Echarts', Echarts)

src/permission.js

@@ -32,10 +32,12 @@ router.beforeEach((to, from, next) => {
   if (storage.get(_token)) { // 如果存在token 需要进行权限分配
     if (store.getters.roles.length === 0) {
       store.dispatch('user/getRoleAuth').then(res => {
+        console.log('res:', res)
+
         store.dispatch('permission/GenerateRoutes', res).then(result => {
-          console.log(store.getters.addRouters, 'store.getters.addRouters')
+          console.log(router, result, 'store.getters.addRouters')
           router.addRoutes(store.getters.addRouters)
-          next()
+          next(store.getters.addRouters[0].children[0].redirect)
         })
       })
     }

src/store/getters.js

@@ -10,6 +10,7 @@ const getters = {
   roles: state => state.user.roles,
   userInfo: state => state.user.info,
   addRouters: state => state.permission.addRouters,
+  routers: state => state.permission.routers,
   multiTab: state => state.app.multiTab,
   orderList: state => state.role.orderList,
   courseList: state => state.course.courseList

src/store/modules/permission.js

@@ -69,11 +69,12 @@ const permission = {
     GenerateRoutes ({ commit }, data) {
       return new Promise(resolve => {
         // const { roles } = data
+        console.log('GenerateRoutesGenerateRoutesGenerateRoutes:', JSON.parse(JSON.stringify(asyncRouterMap)), data)
 
         const accessedRouters = filterAsyncRouter(asyncRouterMap, data)
 
         commit('SET_ROUTERS', accessedRouters)
-        resolve()
+        resolve(accessedRouters)
       })
     }
   }

src/store/modules/user.js

@@ -56,6 +56,7 @@ const user = {
     // 用户登录
     Login ({ commit, dispatch }, params) {
       return new Promise(async (resolve, reject) => {
+        commit('SET_ROLES', [])
         const { code, data } = await login(params)
         if (code === 0) {
           console.log(data)

src/views/eduAdmin/class/index.vue

@@ -15,9 +15,9 @@
           <a-button type="primary" v-if="key === '1'" v-action:3001001 @click="visible = true">新增课程</a-button>
         </template>
         <a-table :loading="loading" :columns="columns" :data-source="data" :pagination="{total, onChange: changePagination}">
-          <template slot="action">
+          <!-- <template slot="action">
             课程操作暂未开放
-          </template>
+          </template> -->
         </a-table>
       </a-card>
     </page-header-wrapper>

src/views/roleIng/staff/edit.vue

@@ -87,7 +87,7 @@
           </a-radio>
         </a-radio-group>
       </a-form-item>
-      <a-form-item label="所属部门" >
+      <!-- <a-form-item label="所属部门" >
         <a-tree-select
           v-model="formData.departmentLabel"
           @select="selectTreeNode"
@@ -99,10 +99,9 @@
           allow-clear
           :tree-data="treeData"
           tree-default-expand-all
-          :replaceFields="replaceFields"
         />
         <div style="opacity: 0.5; ">需先选择所属部门,再选择汇报对象</div>
-      </a-form-item>
+      </a-form-item> -->
 
       <a-form-item label="汇报对象" >
         <a-select
@@ -135,6 +134,10 @@ export default {
     type: {
       type: String,
       default: 'add' // add or edit
+    },
+    departmentId: {
+      type: String,
+      default: '' // add or edit
     }
   },
   computed: {
@@ -257,7 +260,7 @@ export default {
     async getDepart () {
       const { code, data } = await getDepart()
       if (code === 0) {
-        console.log(data)
+        console.log('treeData:', data)
         this.treeData = data
       }
     },
@@ -274,7 +277,7 @@ export default {
           if (!err) {
             const { label, phone } = values
             // Object.assign({}, this.formData, { label, phone })
-            const $par = Object.assign({}, this.formData, { label, phone })
+            const $par = Object.assign({}, this.formData, { label, phone, departmentId: this.departmentId, departmentLabel: this.treeData.find(item => item.id === this.departmentId).label })
             resolve($par)
           } else {
             resolve({ code: 500 })

src/views/roleIng/staff/staffAdmin.vue

@@ -59,7 +59,7 @@
       destroyOnClose
       :title="type === 'add' ? '新增员工' : '编辑员工信息'"
       @ok="handleOk">
-      <edit ref="editForm" :type="type"/>
+      <edit ref="editForm" :type="type" :departmentId="departmentId" />
     </a-modal>
   </div>
 
@@ -234,7 +234,7 @@ export default {
       const $par = await this.$refs.editForm.handleSubmit()
       if ($par.code === 500) return
 
-      const { code, data } = await postUser($par, this.type)
+      const { code, data } = await postUser({ ...$par, departmentId: this.departmentId }, this.type)
       if (code === 0) {
         console.log(data)
          data ? this.$message.success(this.type === 'edit' ? '编辑' : '新增成功') : this.$message.error(this.type === 'edit' ? '编辑失败' : '新增失败')