Browse Source

管理后台-路由配置

panyong 4 năm trước cách đây
mục cha
commit
3ab6ffd592

+ 1 - 3
htmldev/manage/src/components/_dialog/modPassword.vue

@@ -39,16 +39,14 @@ export default {
       this.$refs.form.validate(async valid => {
         if (valid) {
           const data = await this.$fetch('/api/auth/user/set_me_password', this.form)
-          if (data.code == 200) {
+          if (data.code === 200) {
             await this.$store.dispatch('user/logout')
             this.$router.push(`/login`)
           }
         } else {
           console.log('error submit!!')
-          return false
         }
       })
-
     }
   },
   watch: {

+ 1 - 1
htmldev/manage/src/components/upload/index.vue

@@ -9,7 +9,7 @@
       name="imgFile"
       :on-success="handleAvatarSuccess"
       :before-upload="beforeAvatarUpload">
-      <img v-if="imageUrl" :src="imageUrl" class="avatar">
+      <img v-if="imageUrl" :src="imageUrl" alt="" class="avatar">
       <i v-else class="el-icon-plus avatar-uploader-icon"></i>
     </el-upload>
   </div>

+ 1 - 2
htmldev/manage/src/directive/permission/index.js

@@ -1,12 +1,11 @@
 import permission from './permission'
-// eslint-disable-next-line func-names
 const install = function (Vue) {
   Vue.directive('permission', permission)
 }
 
 if (window.Vue) {
   window.permission = permission
-  Vue.use(install) // eslint-disable-line
+  Vue.use(install)
 }
 
 permission.install = install

+ 0 - 2
htmldev/manage/src/directive/permission/permission.js

@@ -7,9 +7,7 @@ export default {
     // console.log('permissionList---', permissions)
     const hasPermission = permissions.includes(value)
     if (!hasPermission) {
-      // eslint-disable-next-line no-unused-expressions
       if (el.parentNode) {
-        console.log(el)
         el.parentNode.removeChild(el)
       } else {
         el.innerHTML = ''

+ 2 - 14
htmldev/manage/src/store/getters.js

@@ -12,24 +12,12 @@ const getters = {
   name: state => state.user.name,
   // projectArr: state => state.user.projectArr,
   projectArr: state => {
-    if (state.common.projectArr.length == 0) {
+    if (state.common.projectArr.length === 0) {
       store.dispatch('common/setProjectArr')
     }
     return state.common.projectArr
   },
   departmentArr: state => state.common.departmentArr,
-  roleArr: state => state.common.roleArr,
-  // departmentArr: state => {
-  //   if (state.common.departmentArr.length == 0) {
-  //     store.dispatch('common/setDepartmentArr')
-  //   }
-  //   return state.common.departmentArr
-  // },
-  // roleArr: state => {
-  //   if (state.common.roleArr.length == 0) {
-  //     store.dispatch('common/setRoleArr')
-  //   }
-  //   return state.common.roleArr
-  // }
+  roleArr: state => state.common.roleArr
 }
 export default getters

+ 3 - 3
htmldev/manage/src/store/modules/common.js

@@ -23,19 +23,19 @@ const actions = {
   async setProjectArr ({ commit }) {
     if (!getToken()) return
     const data = await fetch('/api/auth/project/get_list', {}, 'get')
-    if (data.code == 200) {
+    if (data.code === 200) {
       commit('SET_PROJECTARR', data.data)
     }
   },
   async setDepartmentArr ({ commit }) {
     const data = await fetch('/api/auth/department/get_department_list', {}, 'get')
-    if (data.code == 200) {
+    if (data.code === 200) {
       commit('SET_DEPARTMENTARR', data.data)
     }
   },
   async setRoleArr ({ commit }) {
     const data = await fetch('/api/auth/role/get_role_list', {}, 'get')
-    if (data.code == 200) {
+    if (data.code === 200) {
       commit('SET_ROLEARR', data.data)
     }
   }

+ 0 - 22
htmldev/manage/src/store/modules/permission.js

@@ -1,18 +1,5 @@
 import { constantRoutes, asyncRoutes } from '@/router'
 
-// function hetAllRoleChecked(roles) {
-//     let res = []
-//     roles.forEach(role => {
-//         if (role.checked) {
-//             res.push(role.value)
-//         }
-//         if (role.data && role.data.length > 0) {
-//             res = res.concat(hetAllRoleChecked(role.data))
-//         }
-//     })
-//     return res
-// }
-
 /**
  * Use meta.role to determine if the current user has permission
  * @param roles
@@ -20,7 +7,6 @@ import { constantRoutes, asyncRoutes } from '@/router'
  */
 function hasPermission (roles, route) {
   if (route.meta && route.meta.roleValue) {
-    // return roles.some(role => route.meta.roleValue.includes(role))
     return roles.includes(route.meta.roleValue)
   } else {
     return true
@@ -34,7 +20,6 @@ function hasPermission (roles, route) {
  */
 export function filterAsyncRoutes (routes, roles) {
   const res = []
-  // let roleIds = hetAllRoleChecked(roles)
   let roleIds = roles
   routes.forEach(route => {
     const tmp = { ...route }
@@ -67,17 +52,10 @@ const actions = {
   async generateRoutes ({ commit }, roles) {
     return new Promise(resolve => {
       let accessedRoutes
-      // accessedRoutes = asyncRoutes
       accessedRoutes = filterAsyncRoutes(asyncRoutes, roles.user_rules)
-      // accessedRoutes = [...accessedRoutes, {
-      //     path: '/',
-      //     redirect: accessedRoutes[0].path
-      // }]
-      console.log({ accessedRoutes })
       commit('SET_ROUTES', accessedRoutes)
 
       // 把所有roleId放在一个数组里
-      // let pageRoleArray = hetAllRoleChecked(roles.user_rules)
       let pageRoleArray = roles.user_rules
       commit('SET_PAGE_ROLE_ARRAY', pageRoleArray)
 

+ 0 - 1
htmldev/manage/src/store/modules/settings.js

@@ -11,7 +11,6 @@ const state = {
 
 const mutations = {
   CHANGE_SETTING: (state, { key, value }) => {
-    // eslint-disable-next-line no-prototype-builtins
     if (state.hasOwnProperty(key)) {
       state[key] = value
     }

+ 0 - 8
htmldev/manage/src/store/modules/user.js

@@ -53,14 +53,6 @@ const actions = {
       dispatch('tagsView/delAllViews', null, { root: true })
 
       resolve()
-      // logout(state.token).then(() => {
-      //   removeToken() // must remove  token  first
-      //   resetRouter()
-      //   commit('RESET_STATE')
-      //   resolve()
-      // }).catch(error => {
-      //   reject(error)
-      // })
     })
   },
 

+ 0 - 12
htmldev/manage/src/utils/enum.js

@@ -1,12 +0,0 @@
-export const user_agent = {
-  1: '主站用户',
-  2: '开通分站',
-  3: '开通api',
-  4: '分站用户'
-
-}
-
-export const budget_type = {
-  1: 'ceshi1',
-  2: 'ceshi2'
-}

+ 0 - 9
htmldev/manage/src/utils/main-config.js

@@ -1,11 +1,2 @@
-import Vue from 'vue'
-
 import './filter'
-
 import './rules'
-
-import * as enums from './enum'
-
-Object.keys(enums).forEach(key => {
-  Vue.prototype[key] = enums[key]
-})

+ 1 - 3
htmldev/manage/vue.config.js

@@ -54,9 +54,7 @@ module.exports = {
   css: {
     loaderOptions: {
       sass: {
-        prependData: `
-          @import "@/styles/var.scss";
-        `
+        prependData: `@import "@/styles/var.scss";`
       }
     }
   },