内网版本功能删减及动态路由功能加入

src/App.vue

@@ -7,7 +7,9 @@
 <script>
 
 export default {
-  name: 'App'
+  name: 'App',
+  mounted() {
+  }
 }
 </script>
 

src/main.js

@@ -4,10 +4,11 @@ import router from './router'
 import ElementUI from 'element-ui'
 import 'element-ui/lib/theme-chalk/index.css'
 import './assets/styles/index.scss'
+import { initDynamicRoutes } from './utils/createRoutes'
 
 var axios = require('axios')
-axios.defaults.baseURL = 'http://47.101.207.123:8080/gateway-server'
-// axios.defaults.baseURL = 'http://192.168.137.1:9252'
+// axios.defaults.baseURL = 'http://47.101.207.123:8080/gateway-server'
+axios.defaults.baseURL = 'https://192.168.113.229/gateway-server'
 axios.defaults.headers.post['Content-Type'] = 'application/x-www-form-urlencoded'
 axios.interceptors.response.use(
   response => {
@@ -21,6 +22,8 @@ axios.interceptors.response.use(
 Vue.config.productionTip = false
 Vue.use(ElementUI, {size: 'mini'})
 
+initDynamicRoutes()
+
 new Vue({
   render: h => h(App),
   router,

src/router/index.js

@@ -2,146 +2,160 @@ import Vue from 'vue'
 import Router from 'vue-router'
 import AppIndex from '../views/home/AppIndex'
 import RouterView from '../views/home/RouterView'
-import {vaildJWT} from "../utils/service/jwt";
-import {getCookie, setCookie} from "../utils/service/cookie";
+import {vaildJWT, GetUserAuthority} from "../utils/service/jwt";
+import {getCookie, setCookie, deleteCookie} from "../utils/service/cookie";
 
 Vue.use(Router)
 
-const defaultRouter = new Router({
-  routes: [
-    {
-      path: '/index',
-      name: 'AppIndex',
-      component: AppIndex,
-      children: [
-        {
-          path: '/home',
-          name: 'Home',
-          component: () => import('../views/homePage/Index'),
-          meta: { title: '首页', icon: 'icon-menu icon-home', menuKey: "sy" },
-        },
-        {
-          path: '/userManage',
-          name: 'UserManage',
-          component: RouterView,
-          meta: { title: '用户管理', icon: 'icon-menu icon-yhgl', menuKey: "yhgl" },
-          children: [
-            {
-              path: 'userList',
-              name: 'UserList',
-              component: () => import('../views/userManage/UserList'),
-              meta: { title: '用户列表', menuKey: "yhlb" },
-            },
-            {
-              path: 'userListDetail/:id',
-              name: 'UserListDetail',
-              component: () => import('../views/userManage/UserListDetail'),
-              meta: { menuKey: "yhlb" },
-              hidden: true
-            },
-            {
-              path: 'userListEdit/:id',
-              name: 'UserListEdit',
-              component: () => import('../views/userManage/UserListDetail'),
-              meta: { menuKey: "yhlb" },
-              hidden: true
-            },
-            {
-              path: 'userListAdd',
-              name: 'UserListAdd',
-              component: () => import('../views/userManage/UserListDetail'),
-              meta: { menuKey: "yhlb" },
-              hidden: true
-            },
-            {
-              path: 'userApproval',
-              name: 'UserApproval',
-              component: () => import('../views/userManage/UserApproval'),
-              meta: { title: '用户审批', menuKey: "yhsp" },
-              hidden: true
-            },
-            {
-              path: 'authManage',
-              name: 'AuthManage',
-              component: () => import('../views/userManage/AuthManage'),
-              meta: { title: '权限管理', menuKey: "qxgl" },
-            },
-            {
-              path: 'authManageAdd',
-              name: 'AuthManageAdd',
-              component: () => import('../views/userManage/AuthManageEdit'),
-              meta: { menuKey: "qxgl" },
-              hidden: true
-            },
-            {
-              path: 'authManageDetail/:id',
-              name: 'AuthManageDetail',
-              component: () => import('../views/userManage/AuthManageEdit'),
-              meta: { menuKey: "qxgl" },
-              hidden: true
-            },
-            {
-              path: 'authManageEdit/:id',
-              name: 'AuthManageEdit',
-              component: () => import('../views/userManage/AuthManageEdit'),
-              meta: { menuKey: "qxgl" },
-              hidden: true
-            }
-          ]
-        },
-        {
-          path: '/logManage',
-          name: 'LogManage',
-          component: RouterView,
-          meta: { title: '日志管理', icon: 'icon-menu icon-rzgl', menuKey: "rzgl" },
-          children: [
-            {
-              path: 'userLoginLogs',
-              name: 'UserLoginLogs',
-              component: () => import('../views/logManage/UserLoginLogs'),
-              meta: { title: '用户登录日志', menuKey: "yhdlrz" },
-            },
-            {
-              path: 'sysOperationLog',
-              name: 'SysOperationLog',
-              component: () => import('../views/logManage/SysOperationLog'),
-              meta: { title: '系统操作日志', menuKey: "xtczrz" },
-            }
-          ]
-        },
-        {
-          path: '/sysConfigs',
-          name: 'SysConfigs',
-          component: RouterView,
-          meta: { title: '系统设置', icon: 'icon-menu icon-xtsz', menuKey: "xtsz" },
-          children: [
-            {
-              path: 'orgConfig',
-              name: 'OrgConfig',
-              component: () => import('../views/sysConfigs/OrgConfig'),
-              meta: { title: '单位设置', menuKey: "dwsz" },
-            },
-          ]
-        }
-      ]
-    },
-    {
-      path: '/',
-      redirect: '/home',
-    }
-  ]
+export const defaultRoutes = [
+  {
+    path: '/index',
+    name: 'AppIndex',
+    component: AppIndex,
+    children: [
+      {
+        path: '/home',
+        name: 'Home',
+        component: () => import('../views/homePage/Index'),
+        meta: { title: '首页', icon: 'icon-menu icon-home', menuKey: "sy" },
+      },
+      {
+        path: '/userManage',
+        name: 'UserManage',
+        component: RouterView,
+        meta: { title: '用户管理', icon: 'icon-menu icon-yhgl', menuKey: "yhgl" },
+        children: [
+          {
+            path: 'userList',
+            name: 'UserList',
+            component: () => import('../views/userManage/UserList'),
+            meta: { title: '用户列表', menuKey: "yhlb" },
+          },
+          {
+            path: 'userListDetail/:id',
+            name: 'UserListDetail',
+            component: () => import('../views/userManage/UserListDetail'),
+            meta: { menuKey: "yhlb" },
+            hidden: true
+          },
+          {
+            path: 'userListEdit/:id',
+            name: 'UserListEdit',
+            component: () => import('../views/userManage/UserListDetail'),
+            meta: { menuKey: "yhlb" },
+            hidden: true
+          },
+          {
+            path: 'userListAdd',
+            name: 'UserListAdd',
+            component: () => import('../views/userManage/UserListDetail'),
+            meta: { menuKey: "yhlb" },
+            hidden: true
+          },
+          {
+            path: 'userApproval',
+            name: 'UserApproval',
+            component: () => import('../views/userManage/UserApproval'),
+            meta: { title: '用户审批', menuKey: "yhsp" },
+            hidden: true
+          },
+          {
+            path: 'authManage',
+            name: 'AuthManage',
+            component: () => import('../views/userManage/AuthManage'),
+            meta: { title: '权限管理', menuKey: "qxgl" },
+          },
+          {
+            path: 'authManageAdd',
+            name: 'AuthManageAdd',
+            component: () => import('../views/userManage/AuthManageEdit'),
+            meta: { menuKey: "qxgl" },
+            hidden: true
+          },
+          {
+            path: 'authManageDetail/:id',
+            name: 'AuthManageDetail',
+            component: () => import('../views/userManage/AuthManageEdit'),
+            meta: { menuKey: "qxgl" },
+            hidden: true
+          },
+          {
+            path: 'authManageEdit/:id',
+            name: 'AuthManageEdit',
+            component: () => import('../views/userManage/AuthManageEdit'),
+            meta: { menuKey: "qxgl" },
+            hidden: true
+          }
+        ]
+      },
+      {
+        path: '/logManage',
+        name: 'LogManage',
+        component: RouterView,
+        meta: { title: '日志管理', icon: 'icon-menu icon-rzgl', menuKey: "rzgl" },
+        children: [
+          {
+            path: 'userLoginLogs',
+            name: 'UserLoginLogs',
+            component: () => import('../views/logManage/UserLoginLogs'),
+            meta: { title: '用户登录日志', menuKey: "yhdlrz" },
+          },
+          {
+            path: 'sysOperationLog',
+            name: 'SysOperationLog',
+            component: () => import('../views/logManage/SysOperationLog'),
+            meta: { title: '系统操作日志', menuKey: "xtczrz" },
+          }
+        ]
+      },
+      /* {
+        path: '/sysConfigs',
+        name: 'SysConfigs',
+        component: RouterView,
+        meta: { title: '系统设置', icon: 'icon-menu icon-xtsz', menuKey: "xtsz" },
+        children: [
+          {
+            path: 'orgConfig',
+            name: 'OrgConfig',
+            component: () => import('../views/sysConfigs/OrgConfig'),
+            meta: { title: '单位设置', menuKey: "dwsz" },
+          },
+        ]
+      } */
+    ]
+  },
+  {
+    path: '/',
+    redirect: '/home',
+  }
+]
+
+
+const createRouter = () => new Router({
+  scrollBehavior: () => ({ y: 0 }),
+  routes: []
 })
 
-defaultRouter.beforeEach((to, from, next) => {
-  // console.log("to:", to, "from:", from)
+const router = createRouter()
+
+export function resetRouter() {
+  const newRouter = createRouter()
+  router.matcher = newRouter.matcher // reset router
+}
+
+router.beforeEach((to, from, next) => {
   vaildJWT(getCookie("m_token")).then(res=>{
     if (res.code==="200") {
-      setCookie('name', res.data.name, 1)
+      if(getCookie('name')==='') {
+        setCookie('name', res.data.name, 1)
+      }
       next()
     }else {
-
+      deleteCookie('m_token')
+      deleteCookie('name')
+      deleteCookie('authority')
       window.open(
-        `http://47.101.207.123:8080/platform-rk/#/login?url=http://47.101.207.123:8080/user_authentication/#/home`,
+        `https://192.168.113.229/platform-entrance/#/login?url=https://192.168.113.229/user_authentication/#/home`,
         "_self",
         "",
         true
@@ -149,8 +163,11 @@ defaultRouter.beforeEach((to, from, next) => {
       // location.href = "http://47.101.207.123:8080/platform-rk/#/login?url=http://47.101.207.123:8080/user_authentication/#/home"
     }
   },error=>{
+    deleteCookie('m_token')
+    deleteCookie('name')
+    deleteCookie('authority')
      window.open(
-      `http://47.101.207.123:8080/platform-rk/#/login?url=http://47.101.207.123:8080/user_authentication/#/home`,
+      `https://192.168.113.229/platform-entrance/#/login?url=https://192.168.113.229/user_authentication/#/home`,
       "_self",
       "",
       true
@@ -160,4 +177,4 @@ defaultRouter.beforeEach((to, from, next) => {
   // next()
 })
 
-export default defaultRouter
+export default router

src/utils/createRoutes.js

@@ -0,0 +1,63 @@
+import router, {defaultRoutes, resetRouter} from '../router'
+import {getCookie, setCookie} from "./service/cookie";
+import {GetUserAuthority} from "./service/jwt";
+
+// 生成返回的用户权限页面的路由名称组成的数组
+function initauthorityNameArr(authority,retArr) {
+  for (let i = authority.length - 1; i>=0; i--) {
+    retArr.push(authority[i].routeName)
+    if (authority[i].children && authority[i].children.length!=0) {
+      initauthorityNameArr(authority[i].children,retArr)
+    }
+  }
+  return retArr
+}
+
+// 生成用户权限对应路由
+function selectRoutes(routes, names) {
+  for (let i = routes.length - 1; i>=0; i--) {
+    let isExist = false
+    for (let j=0;j<names.length;j++) {
+      if (routes[i].name == names[j]) {
+        isExist = true
+        if (routes[i].children != null) {
+          routes[i].children = selectRoutes(routes[i].children,names)
+        }
+        break
+      }
+    }
+    if (!isExist) {
+      routes.splice(i,1)
+    }
+  }
+  return routes
+}
+
+const initDynamicRoutesFunc = () => {
+  let [...defRoutes] = defaultRoutes
+  let authorityNameArr = initauthorityNameArr(JSON.parse(getCookie('authority'))[0].children,[])
+  let selectedRoutes = selectRoutes(defRoutes[0].children, authorityNameArr)
+  defRoutes[0].children = selectedRoutes
+  resetRouter()
+  router.options.routes = defRoutes
+  router.addRoutes(defRoutes)
+  console.log('router:',router)
+}
+
+export const initDynamicRoutes = () => {
+  if(getCookie('authority')==='') {
+    GetUserAuthority().then(res => {
+      if(res.code == 200) {
+        let auth = res.data.authority.filter(i => {
+          return i.authorityName === '用户认证管理'
+        })
+        setCookie('authority',JSON.stringify(auth), 1)
+        initDynamicRoutesFunc()
+        router.push({path: '/'})
+      }
+    })
+  }else {
+    initDynamicRoutesFunc()
+  }
+  
+}

src/utils/service/jwt.js

@@ -15,3 +15,10 @@ export function Logout() {
   }
   return axios.post('/user/logOut', qs.stringify(data))
 }
+
+export function GetUserAuthority() {
+  let data = {
+    token: getCookie('m_token')
+  }
+  return axios.post('user/getUserAuthority', qs.stringify(data))
+}

src/utils/service/user.js

@@ -27,10 +27,10 @@ export function GetUserInfoById(userId) {
 
 export function UpdateUserRole(formInLine) {
   let data = {
-    contact: formInLine.contact,
-    name: formInLine.name,
+    // contact: formInLine.contact,
+    // name: formInLine.name,
     roleArr: JSON.stringify(formInLine.roleArr),
-    unitId: formInLine.unitId,
+    // unitId: formInLine.unitId,
     userId: formInLine.userId,
   }
   return axios.post('user/updateUserRole', qs.stringify(data))

src/views/home/AppIndex.vue

@@ -96,6 +96,8 @@
           Logout().then(res => {
             if(res.code == 200) {
               deleteCookie('m_token')
+              deleteCookie('name')
+              deleteCookie('authority')
               window.location.reload()
             }
           })

src/views/userManage/UserList.vue

@@ -27,7 +27,7 @@
             <div class="form-button">
               <el-button type="primary" size="small" @click="handleQuery">查询</el-button>
               <!-- <el-button type="primary" size="small">账号同步</el-button> -->
-              <el-button type="primary" size="small" @click="toAdd">新增</el-button>
+              <!-- <el-button type="primary" size="small" @click="toAdd">新增</el-button> -->
             </div>
           </el-form>
         </el-card>
@@ -44,12 +44,13 @@
                 <el-table-column prop="lastName" label="姓名" min-width="50"/>
                 <el-table-column prop="departmentName" label="组织机构" min-width="100"/>
                 <el-table-column prop="mobile" label="联系电话" min-width="80"/>
-                <el-table-column fixed="right" label="操作" min-width="140">
+                <!-- <el-table-column fixed="right" label="操作" min-width="140"> -->
+                <el-table-column fixed="right" label="操作" min-width="80">
                   <template slot-scope="scope">
                     <el-button @click="toDetail(scope.row)" type="text">查看</el-button>
                     <el-button @click="toEdit(scope.row)" type="text">编辑</el-button>
-                    <el-button @click="handleDelete(scope.row)" type="text">删除</el-button>
-                    <el-button @click="handleReset(scope.row)" type="text">重置密码</el-button>
+                    <!-- <el-button @click="handleDelete(scope.row)" type="text">删除</el-button> -->
+                    <!-- <el-button @click="handleReset(scope.row)" type="text">重置密码</el-button> -->
                   </template>
                 </el-table-column>
               </el-table>
@@ -152,7 +153,7 @@
         this.currentPage = 1
         this.getList()
       },
-      handleDelete(row) {
+      /* handleDelete(row) {
         this.$confirm('确认删除该用户?', '提示', {
           confirmButtonText: '确定',
           cancelButtonText: '取消',
@@ -182,12 +183,12 @@
         }).catch(() => {
           this.$message({type: 'info', message: '已取消重置'})
         })
-      },
-      toAdd() {
+      }, */
+      /* toAdd() {
         this.$router.push({
           name: "UserListAdd"
         })
-      }
+      } */
     },
     created() {
       this.getTreeData()

src/views/userManage/UserListDetail.vue

@@ -27,14 +27,14 @@
         <el-row>
           <el-col :span="12" :offset="6">
             <el-form-item label="姓名" prop="name">
-              <el-input v-model="form.name" :disabled="pageType==='detail'"/>
+              <el-input v-model="form.name" :disabled="pageType==='detail'||pageType==='edit'"/>
             </el-form-item>
           </el-col>
         </el-row>
         <el-row>
           <el-col :span="12" :offset="6">
             <el-form-item label="组织机构" prop="unitId">
-              <el-select v-model="form.unitId" placeholder="请选择" filterable :disabled="pageType==='detail'">
+              <el-select v-model="form.unitId" placeholder="请选择" filterable :disabled="pageType==='detail'||pageType==='edit'">
                 <el-option v-for="item in departmentArr" :key="item.id" :label="item.name" :value="item.id"/>
               </el-select>
             </el-form-item>
@@ -43,7 +43,7 @@
         <el-row>
           <el-col :span="12" :offset="6">
             <el-form-item label="联系电话">
-              <el-input v-model="form.contact" :disabled="pageType==='detail'"/>
+              <el-input v-model="form.contact" :disabled="pageType==='detail'||pageType==='edit'"/>
             </el-form-item>
           </el-col>
         </el-row>