Bladeren bron

端口更改

lipengtao 6 jaren geleden
bovenliggende
commit
40930fa9cb
6 gewijzigde bestanden met toevoegingen van 12 en 30 verwijderingen
  1. 1 1
      config/dev.env.js
  2. 1 1
      config/index.js
  3. 0 5
      src/permission.js
  4. 2 4
      src/store/modules/permission.js
  5. 2 2
      src/store/modules/user.js
  6. 6 17
      src/views/nav/index.vue

+ 1 - 1
config/dev.env.js

@ -4,5 +4,5 @@ const prodEnv = require('./prod.env')
4 4
5 5
module.exports = merge(prodEnv, {
6 6
  NODE_ENV: '"development"',
7
  BASE_API: '"http://localhost:90"'
7
  BASE_API: '"http://localhost:98"'
8 8
})

+ 1 - 1
config/index.js

@ -12,7 +12,7 @@ module.exports = {
12 12
13 13
    // Various Dev Server settings
14 14
    host: 'localhost', // can be overwritten by process.env.HOST
15
    port: 9526, // can be overwritten by process.env.PORT, if port is in use, a free one will be determined
15
    port: 9555, // can be overwritten by process.env.PORT, if port is in use, a free one will be determined
16 16
    autoOpenBrowser: false,
17 17
    errorOverlay: true,
18 18
    notifyOnErrors: false,

+ 0 - 5
src/permission.js

@ -20,15 +20,12 @@ router.beforeEach((to, from, next) => {
20 20
  NProgress.start()
21 21
  if (getCookiesName()) {
22 22
    if (to.path === '/login') {
23
      console.log(222)
24 23
      next({ path: '/' })
25 24
      NProgress.done()
26 25
    } else {
27 26
      if (store.getters.roles.length === 0) { // 判断当前用户是否已拉取完user_info信息
28
        console.log(3333)
29 27
        store.dispatch('GetUserInfo').then(res => { // 拉取user_info
30 28
          const roles = [res.data.type.toString()]
31
          console.log(roles)
32 29
          store.dispatch('GenerateRoutes', { roles }).then(() => { // 根据roles权限生成可访问的路由表
33 30
            router.addRoutes(store.getters.addRouters) // 动态添加可访问路由表
34 31
            next({ ...to, replace: true })
@ -40,8 +37,6 @@ router.beforeEach((to, from, next) => {
40 37
          })
41 38
        })
42 39
      } else {
43
        console.log(store.getters.roles)
44
        console.log(to.meta.roles)
45 40
        if (hasPermission(store.getters.roles, to.meta.roles)) {
46 41
          next()
47 42
        }

+ 2 - 4
src/store/modules/permission.js

@ -40,16 +40,14 @@ const permission = {
40 40
    SET_ROUTERS: (state, routers) => {
41 41
      state.addRouters = routers
42 42
      state.routers = constantRouterMap.concat(routers)
43
      console.log(state.routers)
44 43
    }
45 44
  },
46 45
  actions: {
47 46
    GenerateRoutes({ commit }, data) {
48 47
      return new Promise(resolve => {
49
        // const { roles } = data
50
        const roles = ['2']
48
        const { roles } = data
49
        // const roles = ['2']
51 50
        const accessedRouters = filterAsyncRouter(asyncRouterMap, roles)
52
        console.log(accessedRouters)
53 51
        commit('SET_ROUTERS', accessedRouters)
54 52
        resolve()
55 53
      })

+ 2 - 2
src/store/modules/user.js

@ -67,8 +67,8 @@ const user = {
67 67
              if (dataS.active) {
68 68
                commit('SET_ACCOUNT', dataS.account)
69 69
                commit('SET_USERID', dataS.id)
70
                commit('SET_ROLES', ['2'])
71
                // commit('SET_ROLES', [dataS.type.toString()])
70
                // commit('SET_ROLES', ['2'])
71
                commit('SET_ROLES', [dataS.type.toString()])
72 72
                commit('SET_NAME', dataS.name)
73 73
              }
74 74
            }

+ 6 - 17
src/views/nav/index.vue

@ -4,24 +4,14 @@
4 4
  class="el-menu-demo"
5 5
  mode="horizontal"
6 6
  @select="handleSelect"
7
  background-color="green"
7
  background-color="#00cc66"
8 8
  text-color="#fff"
9 9
  active-text-color="#ffd04b">
10
   <router-link to='/show/home'>
11
    <el-menu-item index="1">首页</el-menu-item>
12
   </router-link>
13
   <router-link to='/show/medicalTreatment'>
14
    <el-menu-item index="2">协同诊疗</el-menu-item>
15
   </router-link>
16
   <router-link to='/show/intelligentJudgment'>
17
    <el-menu-item index="3">AI智能判断</el-menu-item>
18
   </router-link>
19
   <router-link to='/show/sharedDevice'>
20
    <el-menu-item index="4">共享器械</el-menu-item>
21
   </router-link>
22
   <router-link to='/show/hospital'> 
23
    <el-menu-item index="5">医院</el-menu-item>
24
   </router-link>
10
  <el-menu-item index="/show/home" router>首页</el-menu-item>     
11
  <el-menu-item index="/show/medicalTreatment" router>协同诊疗</el-menu-item>   
12
  <el-menu-item index="/show/intelligentJudgment" router>AI智能判断</el-menu-item>      
13
  <el-menu-item index="/show/sharedDevice" router>共享器械</el-menu-item>
14
  <el-menu-item index="/show/hospital" router>医院</el-menu-item>
25 15
</el-menu>
26 16
</template>
27 17
<script>
@ -34,7 +24,6 @@
34 24
    },
35 25
    methods: {
36 26
      handleSelect(key, keyPath) {
37
        console.log(key, keyPath)
38 27
      }
39 28
    }
40 29
  }