diff --git a/package-lock.json b/package-lock.json
index ca82914f9b263257d9e81d1b6e0d09c5ce927b28..cb8962c7073ce59b9381d3b6f5a99769fe41b8f7 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -10665,11 +10665,6 @@
       "integrity": "sha1-HuO8mhbsv1EYvjNLsV+cRvgvWCU=",
       "dev": true
     },
-    "vuex": {
-      "version": "3.1.2",
-      "resolved": "https://registry.npm.taobao.org/vuex/download/vuex-3.1.2.tgz",
-      "integrity": "sha1-ooY/QAWqc/JYflXD+t8/AfacfU0="
-    },
     "warning": {
       "version": "4.0.3",
       "resolved": "https://registry.npm.taobao.org/warning/download/warning-4.0.3.tgz",
diff --git a/package.json b/package.json
index 3cb2b85a30e41e6b31cf26e8f2e2f99f02f47196..d4f20a89f83c4fdc3e856737f6a638254c5f1908 100644
--- a/package.json
+++ b/package.json
@@ -14,8 +14,7 @@
     "dingtalk-jsapi": "^2.9.14",
     "nprogress": "^0.2.0",
     "vue": "^2.6.11",
-    "vue-router": "^3.1.5",
-    "vuex": "^3.1.2"
+    "vue-router": "^3.1.5"
   },
   "devDependencies": {
     "@vue/cli-plugin-babel": "~4.2.0",
diff --git a/src/components/common/page/MyPage.vue b/src/components/common/page/MyPage.vue
index e91fe7652e2d1313c9ce177a317aa3042cbcc2f3..99316a3caff2e7b21df63bc8dc6e6fc878e7f98b 100644
--- a/src/components/common/page/MyPage.vue
+++ b/src/components/common/page/MyPage.vue
@@ -2,6 +2,7 @@
     <div class="page">
         <a-pagination showQuickJumper
                       showSizeChanger
+                      :pageSizeOptions="pageSizeOptions"
                       :showTotal="total => `总数 ${total} 条`"
                       :defaultCurrent="1"
                       :total="total"
diff --git a/src/components/common/sideMenu/SideMenu.vue b/src/components/common/sideMenu/SideMenu.vue
index 9a9f92735830dbad5072da7a0882b2bc18595d07..8931e606aeccd1a9d5d7e1221993ae1c6c664081 100644
--- a/src/components/common/sideMenu/SideMenu.vue
+++ b/src/components/common/sideMenu/SideMenu.vue
@@ -44,11 +44,20 @@
         computed: {
             openMenuItem() {
                 let obj = this.menuList.find(item => item.hasOwnProperty('children'))
-                return [obj.children[0].key]
+                if(obj){
+                  return [obj.children[0].key]
+                }else{
+                  return [this.menuList[0].key]
+                }
+
             },
             openMenu() {
                 let obj = this.menuList.find(item => item.hasOwnProperty('children'))
-                return [obj.key]
+                if(obj){
+                  return [obj.key]
+                }else{
+                  return []
+                }
             }
         }
     }
diff --git a/src/components/modal/modalPermission/EditTree.vue b/src/components/modal/modalPermission/EditTree.vue
index afc243a9f3abb11ad305384949176bb98aeefc1e..f914cd6ff2edc6a28f76bd0500cc8846dd096a31 100644
--- a/src/components/modal/modalPermission/EditTree.vue
+++ b/src/components/modal/modalPermission/EditTree.vue
@@ -66,7 +66,7 @@
       }
     },
     created(){
-      console.log(this.name)
+
     },
   }
 </script>
@@ -74,6 +74,6 @@
 <style scoped>
     .operation{
         display: flex;
-        justify-content: space-around;
+        justify-content: space-evenly;
     }
 </style>
\ No newline at end of file
diff --git a/src/components/modal/modalPermission/NewGroup.vue b/src/components/modal/modalPermission/NewGroup.vue
index 02e70f89c05efc77c96ec08c0bf4912acc4a5887..161bcfca6118d917b8638a9cda7d46a95ce697ba 100644
--- a/src/components/modal/modalPermission/NewGroup.vue
+++ b/src/components/modal/modalPermission/NewGroup.vue
@@ -61,6 +61,6 @@
 <style scoped>
 .operation{
     display: flex;
-    justify-content: space-around;
+    justify-content: space-between;
 }
 </style>
\ No newline at end of file
diff --git a/src/components/modal/modalPermission/newRole.vue b/src/components/modal/modalPermission/newRole.vue
new file mode 100644
index 0000000000000000000000000000000000000000..9f6444de3a801ee8550233f3c949e7e19ead5be5
--- /dev/null
+++ b/src/components/modal/modalPermission/newRole.vue
@@ -0,0 +1,88 @@
+<template>
+    <div>
+        <a-drawer title="新建分组"
+                  :visible="visible"
+                  width="400"
+                  @close="handleCancel">
+            <a-form :form="form"  @submit="handleOk">
+                <a-form-item label="角色组" :label-col="{span:6}" :wrapperCol="{span:14}">
+                    <a-select
+                               v-decorator="[ 'group',
+                    { rules: [{ required: true, message: '角色组不能为空' }] }]"
+                            placeholder="请选择">
+                        <a-select-option v-for="item in group"
+                                :value="item">{{item}}</a-select-option>
+                    </a-select>
+                </a-form-item>
+                <a-form-item label="角色名"
+                             :label-col="{span:6}" :wrapperCol="{span:14}">
+                    <a-input  v-decorator="[
+                        'name',
+                        { rules: [{ required: true, message: '分组名不能为空!' }]}]"/>
+                </a-form-item>
+                <a-form-item>
+                    <div class="operation">
+                        <div>
+                            <a-button @click="handleCancel">取消</a-button>
+                        </div>
+                        <div>
+                            <a-button type="primary" @click="handleOk">确定</a-button>
+                        </div>
+                    </div>
+                </a-form-item>
+            </a-form>
+        </a-drawer>
+    </div>
+</template>
+
+<script>
+  export default {
+    name: "newRole",
+    props: {
+      visible: {
+        type: Boolean,
+        default: false
+      },
+      group:{
+        type: Array,
+        default(){
+          return []
+        }
+      }
+    },
+    data(){
+      return{
+        form: this.$form.createForm(this),
+      }
+    },
+    methods: {
+      handleOk(e) {
+        e.preventDefault();
+        this.form.validateFieldsAndScroll((err, values) => {
+          if (!err) {
+
+            this.$emit('newrole',values)
+            this.form.resetFields()
+          }
+        });
+      },
+      handleCancel(e) {
+        this.$emit('newrolecancel')
+        this.form.resetFields()
+      },
+    },
+  }
+</script>
+
+<style scoped>
+    .operation{
+        height: 60px;
+        display: flex;
+        align-items: center;
+        justify-content: flex-end;
+        border-top: 1px solid #f5f5f5;
+    }
+    .operation>div{
+        margin-left: 10px;
+    }
+</style>
\ No newline at end of file
diff --git a/src/main.js b/src/main.js
index 539b0e6985322feb51510594b70f0be3f97f2a13..76666ad5d98a63f9f298c804b501d729ec401e84 100644
--- a/src/main.js
+++ b/src/main.js
@@ -1,7 +1,6 @@
 import Vue from 'vue'
 import App from './App.vue'
 import router from './router'
-import store from './store'
 
 import Antd from 'ant-design-vue';
 import 'ant-design-vue/dist/antd.css'
@@ -15,6 +14,5 @@ Vue.use(Antd);
 
 new Vue({
   router,
-  store,
   render: h => h(App)
 }).$mount('#app')
diff --git a/src/netWork/login.js b/src/netWork/login.js
index 6912920059cf9924de6cd50601007d6e1e79e777..25bfb9ce36366add685738f059cad50e96d67328 100644
--- a/src/netWork/login.js
+++ b/src/netWork/login.js
@@ -15,7 +15,7 @@ export function login(code,corpId) {
 }
 export function getUserData() {
     return  request({
-        url:'/api-user/users/current',
+        url:'/api-user/users/getCurrentUserDto',
         method:'get'
     })
 }
\ No newline at end of file
diff --git a/src/netWork/organ.js b/src/netWork/organ.js
index e5400122933f421eeb22f71bafdc5416f0cdda16..f0c772eff39843f548386641d1e5598d2d6353f1 100644
--- a/src/netWork/organ.js
+++ b/src/netWork/organ.js
@@ -1,10 +1,10 @@
 import {request} from "./request";
-export function getRootOrgan(corpId) {
+export function getRootOrgan(orgId ) {
     return  request({
-        url:'/api-user/dept/findRootDeptByParentId',
+        url:'/api-user/dept/findRootDeptByOrgId',
         method:'get',
         params:{
-            corpId
+          orgId
         }
     })
 }
diff --git a/src/netWork/request.js b/src/netWork/request.js
index af164a79c049bd615045dd59e0ee1d10bea54249..a70f95da23c63e622f2aed1ed234d19bfd4b96df 100644
--- a/src/netWork/request.js
+++ b/src/netWork/request.js
@@ -1,7 +1,6 @@
 import axios from 'axios'
 import NProgress from 'nprogress'
 import 'nprogress/nprogress.css'
-import store from '../store'
 import router from "../router";
 export function request(config) {
     const  instance = axios.create({
@@ -11,11 +10,15 @@ export function request(config) {
     instance.interceptors.request.use(
         config => {
             NProgress.start() // 设置加载进度条(开始..)
-            let token = store.getters.getAssToken
+          if(config.url === '/api-oauth/oauth/openId/token'){
+                return config
+          }else{
+            let token = localStorage.getItem('assToken')
             if (token) {
-                config.headers.Authorization = 'Bearer '+token;
+              config.headers.Authorization = 'Bearer '+token;
             }
             return config
+          }
         },
         error => {
             return Promise.reject(error)
@@ -25,23 +28,23 @@ export function request(config) {
         NProgress.done()
         return res.data
     },error => {
-      if (error.response.status === 401) {
-          router.replace({
-             name:'notFind',
-            params:{
-               name:'notauth'
-            }
-          })
-      }else{
-        router.replace({
-          name:'notFind',
-        })
-      }
+      // if (error.response.status === 401) {
+      //     router.replace({
+      //        name:'notFind',
+      //       params:{
+      //          name:'notauth'
+      //       }
+      //     })
+      // }else{
+      //   router.replace({
+      //     name:'notFind',
+      //   })
+      // }
           console.log(error)
               NProgress.done()
-              // router.push({
-              //   name:'notFind'
-              // })
+              router.push({
+                name:'notFind'
+              })
     })
 
     return instance(config)
diff --git a/src/router/index.js b/src/router/index.js
index b0d0a9d338906a6d32f8d7223adf4cbcac8015a2..702aa93b110d4a962f43a2e78e81882f6afb1708 100644
--- a/src/router/index.js
+++ b/src/router/index.js
@@ -1,7 +1,10 @@
 import Vue from 'vue'
 import VueRouter from 'vue-router'
 import Loading from "../views/loading/Loading";
-
+const routerPush = VueRouter.prototype.push
+VueRouter.prototype.push = function push(location) {
+  return routerPush.call(this, location).catch(error=> error)
+}
 Vue.use(VueRouter)
 
 const routes = [
diff --git a/src/store/index.js b/src/store/index.js
deleted file mode 100644
index ac47855bb98ba13f6ab268ff4c3d4dce70222c2c..0000000000000000000000000000000000000000
--- a/src/store/index.js
+++ /dev/null
@@ -1,48 +0,0 @@
-import Vue from 'vue'
-import Vuex from 'vuex'
-
-Vue.use(Vuex)
-
-export default new Vuex.Store({
-  state: {
-    user:{},
-    tokens:{
-      assToken:'',
-      refToken:''
-    },
-    cropId:''
-  },
-  getters:{
-    getCropId(state){
-      return state.cropId
-    },
-    getAssToken(state){
-      return state.tokens.assToken
-    },
-    getOrganId(state){
-      return state.user.sysOrganization.id
-    }
-  },
-  mutations: {
-    setCropId(state,id){
-      state.cropId = id
-    },
-    setAssToken(state,token){
-      state.tokens.assToken = token
-    },
-    setUser(state,user){
-      state.user = user
-    }
-  },
-  actions: {
-    computerID(context,id){
-      /*
-      *
-      *
-      *
-      * */
-    }
-  },
-  modules: {
-  }
-})
diff --git a/src/views/config/Config.vue b/src/views/config/Config.vue
index 9e3f3565ab18e3883562b51b0b3bb646d91effd4..e64b65cad8f8394f4b5d0c523333a245508cf915 100644
--- a/src/views/config/Config.vue
+++ b/src/views/config/Config.vue
@@ -20,25 +20,31 @@
                                 key: '/config/organ',
                                 title: '组织管理'
                             },
-                          {
-                            key: '/config/role',
-                            title: '角色管理'
-                          },
-                          {
-                            key: '/config/permission',
-                            title: '权限管理'
-                          },
+
                             {
                                 key: '/config/apply',
                                 title: '应用管理'
                             },
-                          {
-                            key: '/config/addressBook',
-                            title: '家校通讯录'
-                          }
-
                         ]
-                    }
+                    },
+                  {
+                    key:'2',
+                    title:'后台管理',
+                    children: [
+                      {
+                        key: '/config/role',
+                        title: '部门管理'
+                      },
+                      {
+                        key: '/config/permission',
+                        title: '权限管理'
+                      },
+                      {
+                        key: '/config/addressBook',
+                        title: '家校通讯录'
+                      }
+                    ]
+                  }
                 ]
             }
         },
diff --git a/src/views/config/apply/ConApply.vue b/src/views/config/apply/ConApply.vue
index c310f971df5ce380f2424cd8492078772853260e..ad7f3f32cd87e8eef571afb493faa17df4578b28 100644
--- a/src/views/config/apply/ConApply.vue
+++ b/src/views/config/apply/ConApply.vue
@@ -3,7 +3,7 @@
         <div class="container">
             <div class="top">
                 <span>应用名称：</span>
-                <a-input placeholder="请输入应用名称" style="width:20%"/>
+                <a-input placeholder="请输入应用名称" style="width:210px"/>
                 <a-button type="primary" class="query">查询</a-button>
                 <a-button class="reset">重置</a-button>
             </div>
@@ -117,10 +117,9 @@
        padding-right: 24px;
     }
     .top{
-        height: 70px;
-        line-height: 70px;
+        height: 60px;
+        line-height: 60px;
         .border-btm();
-        
     }
     .query{
         margin-left:3%;
diff --git a/src/views/config/organ/ConOrgan.vue b/src/views/config/organ/ConOrgan.vue
index c13148313edc015da1504bfe4966aa8dfaa2878a..14ef4c04597a62142e5895eddb9c31a736d806cc 100644
--- a/src/views/config/organ/ConOrgan.vue
+++ b/src/views/config/organ/ConOrgan.vue
@@ -110,9 +110,11 @@
 
       }
     },
+
     created(){
       // this.getTabData(0,10)
     },
+
     computed: {
       rowSelection() {
         const {selectedRowKeys} = this;
diff --git a/src/views/config/organ/children/QueryHead.vue b/src/views/config/organ/children/QueryHead.vue
index 425945bb6cfc12ecc3a67989423aa0a43fba784e..eb4ae3f61e64dc05c9692fb6aa211e7749181f36 100644
--- a/src/views/config/organ/children/QueryHead.vue
+++ b/src/views/config/organ/children/QueryHead.vue
@@ -3,13 +3,12 @@
         <a-form layout="inline" :form="form">
             <a-form-item label="组织名称">
                 <a-input v-model="orgName"
+                         style="width: 210px"
                         placeholder="请输入" />
             </a-form-item>
-            <a-form-item>
+            <a-form-item class="operation">
                 <a-button type="primary" @click="query">查询</a-button>
-            </a-form-item>
-            <a-form-item>
-                <a-button @click="reset">重置</a-button>
+                <a-button @click="reset" class="reset">重置</a-button>
             </a-form-item>
         </a-form>
     </div>
@@ -41,5 +40,11 @@
     display: flex;
     align-items: center;
     .border-btm();
+    .operation{
+        margin-left: 15px;
+        .reset{
+            margin-left: 10px;
+        }
+    }
 }
 </style>
\ No newline at end of file
diff --git a/src/views/config/permission/Permission.vue b/src/views/config/permission/Permission.vue
index bca31a48697e9d31129bcbc9d712ee1af32791ee..0e2851c2d01455471817c63271c17d0cb3cffce1 100644
--- a/src/views/config/permission/Permission.vue
+++ b/src/views/config/permission/Permission.vue
@@ -3,7 +3,7 @@
         <div class="permission-content">
             <div class="role">
                 <div class="role-operate">
-                    <div>新增角色</div>
+                    <div @click="newRoleVisible = true">新增角色</div>
                     <div @click="newGroupVisible = true">新建分组</div>
                 </div>
                 <div class="tree">
@@ -11,206 +11,147 @@
                             :treeData="groupData"
                             showIcon
                             :replaceFields="{children:'roles', title:'name',key:'key'}"
-                            :defaultExpandedKeys="['0']"
+                            :defaultExpandedKeys="['0-0']"
+                            :defaultSelectedKeys="['0-0']"
                             @select="selectTree"
                     >
-                        <a-icon slot="dingding" type="dingding" />
+                        <a-icon slot="dingding" type="dingding"/>
                     </a-tree>
-
-                </div>
-            </div>
-            <div class="tab">
-                <div class="edit">{{user.name}}
-                    <a-button v-if="user.allow"
-                            @click="editTreeVisible=true">编辑</a-button></div>
-                <div class="tab-box">
-                    <a-tabs defaultActiveKey="1"
-                            size="small"
-                            :tabBarStyle="{'border-bottom':'none'}"
-                            @change="callback">
-                        <a-tab-pane tab="应用权限" key="1">
-                            <tab-one :exe-data="exeData" @change="change"/>
-                        </a-tab-pane>
-                        <a-tab-pane tab="数据范围" key="2">
-                            <tab-two :data-scope="dataScope" @rediochange="redioChange"/>
-                        </a-tab-pane>
-                        <a-tab-pane tab="角色成员" key="3" forceRender>
-                            <tab-three :tab-data="tabData"/>
-                        </a-tab-pane>
-                    </a-tabs>
                 </div>
             </div>
+            <admin v-if="true"/>
+            <other-user v-else :user="user"
+                        @update="updateTree"
+                        @delgroup="delGroup"/>
             <new-group :visible="newGroupVisible" @newgroup="newGroup"
                        @newgroupcancel="newGroupCancel"/>
-            <edit-tree :visible="editTreeVisible"
-                       :name="user.name"
-                       @update="updateTree"
-                       @updatecancel="updateCancel"
-                        @del="treeDel"/>
+            <new-role :visible="newRoleVisible"
+                      :group="newGroupData"
+                      @newrole="newRole"
+                      @newrolecancel="newRoleCancel"/>
         </div>
     </my-layout>
 </template>
 
 <script>
-    import MyLayout from "components/common/layout/MyLayout";
-    import TabOne from "./tab/TabOne";
-    import TabTwo from "./tab/TabTwo";
-    import TabThree from "./tab/TabThree";
-    import NewGroup from "components/modal/modalPermission/NewGroup";
-    import EditTree from "components/modal/modalPermission/EditTree";
-    import {getAllgroup,newGroup} from "netWork/configPer";
+  import MyLayout from "components/common/layout/MyLayout";
+  import NewGroup from "components/modal/modalPermission/NewGroup";
+  import newRole from "components/modal/modalPermission/newRole";
+
+  import admin from "./children/admin";
+  import childAdmin from "./children/childAdmin";
+  import OtherUser from "./children/OtherUser";
+
+  import {getAllgroup, newGroup} from "netWork/configPer";
 
-    const tabData = [{
-        key: '1',
-        name: 'John Brown',
-        dep: '德育处',
-        tel: '13131313',
-    }, {
-        key: '2',
-        name: 'John Brown',
-        dep: '德育处',
-        tel: '13131313'
-    }, {
-        key: '3',
-        name: 'John Brown',
-        dep: '主任',
-        tel: '13131313'
-    }, {
-        key: '4',
-        name: 'John Brown',
-        dep: '德育处',
-        tel: '13131313'
-    }, {
-        key: '5',
-        name: 'John Brown',
-        dep: '德育处',
-        tel: '13131313'
+
+  export default {
+    name: "Permission",
+    components: {
+      NewGroup,
+      newRole,
+      MyLayout,
+      admin,
+      childAdmin,
+      OtherUser
     },
-        {
-            key: '6',
-            name: 'John Brown',
-            dep: '德育处',
-            tel: '13131313'
-        }
-    ];
-    export default {
-        name: "Permission",
-        components: {
-          NewGroup,
-            MyLayout,
-            TabOne,
-            TabTwo,
-            TabThree,
-            EditTree
-        },
-        data() {
-            return {
-              id:'',
-              user:{},
-              groupData: [],
-              exeData: ['学习成绩', '后台管理'],
-              checkedList: [],
-              dataScope: [{
-                    value: '全部组织',
-                    key: 1
-                }, {
-                    value: '部门及部门以下',
-                    key: 2
-                }, {
-                    value: '仅个人',
-                    key: 3
-                }],
-                tabData,
-                newGroupVisible:false,
-                editTreeVisible:false,
-                index:NaN
-            }
+    data() {
+      return {
+        id: '',
+        user:{
+          name:'11'
         },
-        methods: {
-          getAllGroupData(){
-            // console.log(this.$store.getters.getCropId)
-            getAllgroup(this.id).then(res=>{
-              console.log(res)
-              if(res.resp_code === 0){
-               this.groupData = res.datas.map((item,index)=>{
-                  item.key = index
-                 item.slots={icon: 'dingding',}
-                  if(item.roles && item.roles.length>0){
-                    item.roles=item.roles.map((list,j)=>{
-                          list.key = `${index}-${j}`
-                         list.slots={icon: 'dingding',}
-                            return list
-                        })
-                  }
-                  return item
+        groupData: [],
+        newGroupVisible: false,
+        newRoleVisible:false,
+        index: NaN
+      }
+    },
+    methods: {
+      getAllGroupData() {
+        getAllgroup(this.id).then(res => {
+          console.log(res)
+          if (res.resp_code === 0) {
+            this.groupData = res.datas.map((item, index) => {
+              item.key = index
+              item.slots = {icon: 'dingding',}
+              if (item.roles && item.roles.length > 0) {
+                item.roles = item.roles.map((list, j) => {
+                  list.key = `${index}-${j}`
+                  list.slots = {icon: 'dingding',}
+                  return list
                 })
-                console.log(this.groupData)
-              }
-            })
-          },
-          callback() {
-
-          },
-          change(arr) {
-                console.log(arr)
-          },
-          redioChange(val) {
-                console.log(val)
-            },
-          //选择树节点
-          selectTree(selectedKeys,e){
-            this.user = e.node.dataRef
-            this.index = parseInt(selectedKeys)
-          },
-          //新建分组
-          newGroup(name){
-              this.newGroupVisible = false
-            newGroup(this.id,name,'').then(res=>{
-              console.log(res)
-              if(res.resp_code === 0){
-                    res.datas.key =this.groupData.length
-                    res.datas.slots={icon: 'dingding',}
-                    this.groupData.push(res.datas)
-              }else if(res.resp_code === 1){
-                    this.$message.error(res.resp_msg)
               }
+              return item
             })
-          },
-          newGroupCancel(){
-            this.newGroupVisible = false
-          },
-          //更新分组
-          updateTree(name){
-            this.editTreeVisible = false
-            newGroup(this.id,name,this.user.id).then(res=>{
-              console.log(res)
-              if(res.resp_code===0){
-                res.datas.key = this.index
-                res.datas.slots={icon: 'dingding',}
-                this.groupData.splice(this.index,1,res.datas)
-                this.user = res.datas
-              }
-            })
-          },
-          updateCancel(){
-            this.editTreeVisible = false
-          },
-          treeDel(){
+          }
+        })
+      },
+      //选择树节点
+      selectTree(selectedKeys, e) {
+        this.user = e.node.dataRef
+        this.index = parseInt(selectedKeys)
+      },
+      //新建分组
+      newGroup(name) {
+        this.newGroupVisible = false
+        newGroup(this.id, name, '').then(res => {
+          if (res.resp_code === 0) {
+            res.datas.key = this.groupData.length
+            res.datas.slots = {icon: 'dingding',}
+            this.groupData.push(res.datas)
+          } else if (res.resp_code === 1) {
+            this.$message.error(res.resp_msg)
+          }
+        })
+      },
+      newGroupCancel() {
+        this.newGroupVisible = false
+      },
+      //更新分组
+      updateTree(name) {
+        newGroup(this.id, name, this.user.id).then(res => {
+          console.log(res)
+          if (res.resp_code === 0) {
+            res.datas.key = this.index
+            res.datas.slots = {icon: 'dingding',}
+            this.groupData.splice(this.index, 1, res.datas)
+            this.user = res.datas
+          }
+        })
+      },
+      delGroup() {
 
-          },
+      },
 
-        },
-      created(){
-          this.id = this.$store.getters.getCropId
-        this.getAllGroupData()
+      //新建角色
+      newRole(value){
+        console.log(value)
+        this.newRoleVisible = false
       },
-        computed: {}
+      newRoleCancel(){
+        this.newRoleVisible = false
+      }
+
+    },
+    created() {
+      this.id = localStorage.getItem('cropId')
+      // this.getAllGroupData()
+    },
+    computed: {
+      newGroupData(){
+       return this.groupData.map(item=>{
+          if(item.allow){
+            return item
+          }
+        })
+      }
     }
+  }
 </script>
 
 <style scoped>
     .permission-content {
-        /*border-radius: 4px;*/
         display: flex;
         height: 100%;
     }
@@ -218,6 +159,7 @@
     .role {
         width: 302px;
         height: 100%;
+        flex-shrink: 0;
         padding: 15px 25px 0 25px;
         background-color: #fff;
         position: relative;
@@ -252,35 +194,13 @@
         cursor: pointer;
     }
 
-    .tab {
-        flex: 1;
-        height: 100%;
-        background-color: #fff;
-        padding: 0 22px;
-        position: relative;
-        overflow: auto;
-    }
-    .edit{
-        border-bottom: 1px solid #f5f5f5;
-    }
-    .tab >>> .ant-tabs-nav:before {
-        content: '';
-        position: absolute;
-        top: 34px;
-        left: 0;
-        width: 328px;
-        height: 2px;
-        background-color: #D7D7D7;
-    }
 
-    .tab-box {
-        width: 100%;
-        /*height: 100%;*/
-    }
-    .tree >>> .ant-tree-node-content-wrapper-open .ant-tree-iconEle{
+
+    .tree >>> .ant-tree-node-content-wrapper-open .ant-tree-iconEle {
         color: #29a1f7;
     }
-    .tree >>> .ant-tree-treenode-selected .ant-tree-iconEle{
+
+    .tree >>> .ant-tree-treenode-selected .ant-tree-iconEle {
         color: #29a1f7;
     }
 </style>
\ No newline at end of file
diff --git a/src/views/config/permission/children/OtherUser.vue b/src/views/config/permission/children/OtherUser.vue
new file mode 100644
index 0000000000000000000000000000000000000000..f08559358c529fb99d67774e3c39729070f1dfde
--- /dev/null
+++ b/src/views/config/permission/children/OtherUser.vue
@@ -0,0 +1,164 @@
+<template>
+    <div class="tab">
+        <div class="edit">
+            <span class="name">{{user.name}}</span>
+            <a-button
+                    type="primary"
+                    size="small"
+                    ghost
+                    @click="editTreeVisible=true">编辑
+            </a-button>
+        </div>
+        <div class="tab-box">
+            <a-tabs defaultActiveKey="1"
+                    size="small"
+                    :tabBarStyle="{'border-bottom':'none'}">
+                <a-tab-pane tab="应用权限" key="1">
+                    <tab-one :exe-data="exeData" @change="change"/>
+                </a-tab-pane>
+                <a-tab-pane tab="数据范围" key="2">
+                    <tab-two :data-scope="dataScope" @rediochange="redioChange"/>
+                </a-tab-pane>
+                <a-tab-pane tab="角色成员" key="3" forceRender>
+                    <tab-three :tab-data="tabData"/>
+                </a-tab-pane>
+            </a-tabs>
+        </div>
+        <edit-tree :visible="editTreeVisible"
+                   :name="user.name"
+                   @update="updateTree"
+                   @updatecancel="updateCancel"
+                   @del="treeDel"/>
+    </div>
+</template>
+
+<script>
+    import TabOne from "../tab/TabOne";
+    import TabTwo from "../tab/TabTwo";
+    import TabThree from "../tab/TabThree";
+    import EditTree from "components/modal/modalPermission/EditTree";
+
+    const tabData = [{
+      key: '1',
+      name: 'John Brown',
+      dep: '德育处',
+      tel: '13131313',
+    }, {
+      key: '2',
+      name: 'John Brown',
+      dep: '德育处',
+      tel: '13131313'
+    }, {
+      key: '3',
+      name: 'John Brown',
+      dep: '主任',
+      tel: '13131313'
+    }, {
+      key: '4',
+      name: 'John Brown',
+      dep: '德育处',
+      tel: '13131313'
+    }, {
+      key: '5',
+      name: 'John Brown',
+      dep: '德育处',
+      tel: '13131313'
+    },
+      {
+        key: '6',
+        name: 'John Brown',
+        dep: '德育处',
+        tel: '13131313'
+      }
+    ];
+  export default {
+    name: "OtherUser",
+    components:{
+      TabOne,
+      TabTwo,
+      TabThree,
+      EditTree
+    },
+    props:{
+      user:{
+        type:Object,
+        default(){
+          return {}
+        }
+      }
+    },
+    data(){
+      return{
+        exeData: ['学习成绩', '后台管理'],
+        checkedList: [],
+        dataScope: [{
+          value: '全部组织',
+          key: 1
+        }, {
+          value: '部门及部门以下',
+          key: 2
+        }, {
+          value: '仅个人',
+          key: 3
+        }],
+        tabData,
+        editTreeVisible: false,
+      }
+    },
+    methods:{
+      change(arr) {
+        console.log(arr)
+      },
+      redioChange(val) {
+        console.log(val)
+      },
+      //更新分组
+      updateTree(name){
+        this.$emit('update',name)
+        this.editTreeVisible = false
+      },
+      updateCancel(){
+        this.editTreeVisible = false
+      },
+      treeDel(){
+        this.$emit('delgroup')
+        this.editTreeVisible = false
+      }
+    }
+  }
+</script>
+
+<style scoped>
+    .tab {
+        flex: 1;
+        height: 100%;
+        background-color: #fff;
+        padding: 0 22px;
+        position: relative;
+        overflow: auto;
+    }
+
+    .edit {
+        height: 50px;
+        line-height: 50px;
+        border-bottom: 1px solid #f5f5f5;
+    }
+    .name{
+        padding: 0 10px;
+    }
+
+    .tab >>> .ant-tabs-nav:before {
+        content: '';
+        position: absolute;
+        top: 34px;
+        left: 0;
+        width: 328px;
+        height: 2px;
+        background-color: #D7D7D7;
+    }
+
+    .tab-box {
+        width: 100%;
+        /*height: 100%;*/
+    }
+</style>
\ No newline at end of file
diff --git a/src/views/config/permission/children/admin.vue b/src/views/config/permission/children/admin.vue
new file mode 100644
index 0000000000000000000000000000000000000000..65af947f16c0d464f2fc5b5d434a896d4b300c2e
--- /dev/null
+++ b/src/views/config/permission/children/admin.vue
@@ -0,0 +1,143 @@
+<template>
+    <div class="admin">
+        <div class="info">系统管理员拥有所有功能权限，可查看全部数据</div>
+        <div>
+            <div class="title"><span>成员管理</span></div>
+            <div class="menber">
+                <div class="menber-item" :class="{isChoose:index===currIndex}"
+                     v-for="(item,index) in adminData" :key="index"
+                     @click="chooseBox(index)">
+                    <a-popconfirm
+                            title="你确定要删除该子管理的权限吗？"
+                            @confirm="confirm"
+                            @cancel="cancel"
+                            okText="确定"
+                            cancelText="取消"
+                    >
+                        <div v-if="index===currIndex" class="icon-del">
+                            <a-icon type="delete" />
+                        </div>
+                    </a-popconfirm>
+                    <div class="user-img">
+                        <a-avatar src="https://zos.alipayobjects.com/rmsportal/ODTLcjxAfvqbxHnVXCYX.png" />
+                    </div>
+                    <div class="user-info">
+                        <span>陈志阳</span>
+                        <span>研发部</span>
+                    </div>
+                </div>
+                <div class="add-menber"><a-icon type="plus" />添加成员</div>
+            </div>
+        </div>
+    </div>
+</template>
+
+<script>
+  export default {
+    name: "admin",
+    data(){
+      return{
+        isChoose:false,
+        adminData:[
+          {
+            name:'陈志阳',
+            title:'主管理员'
+          },
+          {
+            name:'陈志阳',
+            title:'主管理员'
+          },
+          {
+            name:'陈志阳',
+            title:'主管理员'
+          },
+          {
+            name:'陈志阳',
+            title:'主管理员'
+          }
+
+        ],
+        currIndex:-1
+      }
+    },
+    methods:{
+      chooseBox(index){
+        this.currIndex = index
+      },
+      confirm(e) {
+        console.log(e);
+      },
+      cancel(e) {
+        console.log(e);
+      },
+    }
+  }
+</script>
+
+<style scoped>
+    .admin{
+        padding-left: 10px;
+    }
+.title{
+    height: 40px;
+    line-height: 40px;
+}
+.title>span{
+    padding: 0 5px;
+    border-left: 4px solid #29a1f7;
+}
+.info{
+    height: 30px;
+    line-height: 30px;
+}
+    .menber{
+        display: flex;
+        flex-flow: row wrap;
+    }
+    .menber-item{
+        display: flex;
+        align-items: center;
+        width: 180px;
+        height: 60px;
+        background-color: #e1edff;
+        padding-left: 10px;
+        margin: 10px;
+        position: relative;
+        cursor: pointer;
+    }
+    .isChoose{
+        border: 1px dashed #999999;
+    }
+    .icon-del{
+        width: 25px;
+        height: 25px;
+        border-radius: 50%;
+        text-align: center;
+        line-height: 25px;
+        position: absolute;
+        top: -15px;
+        right: 5px;
+        color: #fff;
+        background-color: #e24223;
+    }
+    .user-info{
+        margin-left: 10px;
+        display: flex;
+        flex-flow: column nowrap;
+        justify-content: center;
+    }
+    .user-info>span:last-child{
+        font-size: 12px;
+        color: #999999;
+    }
+    .add-menber{
+        cursor: pointer;
+        display: flex;
+        align-items: center;
+        width: 180px;
+        height: 60px;
+        background-color: #e1edff;
+        justify-content: center;
+        margin: 10px;
+    }
+</style>
\ No newline at end of file
diff --git a/src/views/config/permission/children/childAdmin.vue b/src/views/config/permission/children/childAdmin.vue
new file mode 100644
index 0000000000000000000000000000000000000000..fc9ae6c440a750353f999cd0d0baaff4e3d4d5f2
--- /dev/null
+++ b/src/views/config/permission/children/childAdmin.vue
@@ -0,0 +1,17 @@
+<template>
+    <div>
+        <div>
+            设置哪些成员可以创建应用
+        </div>
+    </div>
+</template>
+
+<script>
+  export default {
+    name: "childAdmin"
+  }
+</script>
+
+<style scoped>
+
+</style>
\ No newline at end of file
diff --git a/src/views/config/role/Role.vue b/src/views/config/role/Role.vue
index 9add99e174652e81d817184d40fb477a90dd26b1..3091d0f4f44b793df4b71f4d2effc072238f7416 100644
--- a/src/views/config/role/Role.vue
+++ b/src/views/config/role/Role.vue
@@ -1,5 +1,5 @@
 <template>
-    <my-layout title="角色管理">
+    <my-layout title="部门管理">
         <div class="organ-content">
             <div class="search">
                 <div class="tree-box">
@@ -11,10 +11,7 @@
             <div class="organ-tab">
                 <div class="handle">
                     <div>
-                        <a-button type="primary" icon="plus" @click="addMenber">添加成员</a-button>
-                    </div>
-                    <div>
-                        <a-button type="danger" class="del">批量删除</a-button>
+                        <a-input-search placeholder="请输入" @search="onSearch" enterButton />
                     </div>
                     <div>
                         <a-button type="primary">手机同步钉钉组织架构</a-button>
@@ -25,7 +22,7 @@
                              :pagination="false"
                              :dataSource="data">
                         <span slot="action" slot-scope="text, record">
-                            <a href="javascript:;" @click="roleVisible=true">角色授权</a>
+                            <a href="javascript:;" @click="scope">角色授权</a>
                         </span>
                     </a-table>
                     <my-page :total="data.length" @size="size" @page="page"/>
@@ -120,24 +117,16 @@
         },
         data() {
             return {
-                searchValue: '',
-                visible:false,
-                roleVisible:false,
                 treeData: [],
-                root:{
-                    title:'',
-                    key : '0',
-                    isLeaf:false,
-                    id:''
-                },
+                root:{key : '0'},
                 data,
                 columns,
+              organId:''
             }
         },
         methods: {
             getRoot(){
-                getRootOrgan(this.$store.getters.getOrganId).then(res=>{
-                    console.log(res)
+                getRootOrgan(this.organId).then(res=>{
                     if(res){
                         this.root.title = res.name
                         this.root.isLeaf = res.leaf
@@ -154,7 +143,6 @@
                         return
                     }
                     getChildrenOrgan(treeNode.$options.propsData.dataRef.id).then(res=>{
-                        console.log(res)
                          treeNode.dataRef.children = res.map((item,index)=>{
                             item.key = `${treeNode.eventKey}-${index}`
                             return item
@@ -164,10 +152,8 @@
                     })
                 })
             },
-            onExpand(expandedKeys) {
-                console.log(expandedKeys)
-                // this.expandedKeys = expandedKeys
-                // this.autoExpandParent = false
+          onSearch(value) {
+                console.log(value)
             },
             //分页
             size(size) {
@@ -176,46 +162,14 @@
             page(page){
                 console.log(page)
             },
-            //添加
-            addMenber(){
-                this.visible = true
-                console.log('111')
-            },
-            //取消
-            cancel(flag){
-                this.visible = flag
-            },
-            //授权
-            scopeOk(flag){
-                this.roleVisible = flag
-            },
-            cancelScope(flag){
-                this.roleVisible = flag
+          //授权
+            scope(){
             },
-            //添加
-            addOrgan(flag){
-                this.visible = flag
-            }
         },
         created(){
+            this.organId = JSON.parse(localStorage.getItem('user')).sysOrganization.id
             this.getRoot()
         },
-        computed: {
-            rowSelection() {
-                const {selectedRowKeys} = this;
-                return {
-                    onChange: (selectedRowKeys, selectedRows) => {
-                        console.log(`selectedRowKeys: ${selectedRowKeys}`, 'selectedRows: ', selectedRows);
-                    },
-                    getCheckboxProps: record => ({
-                        props: {
-                            disabled: record.name === 'Disabled User', // Column configuration not to be checked
-                            name: record.name,
-                        }
-                    }),
-                }
-            }
-        },
     }
 </script>
 
@@ -224,7 +178,6 @@
         display: flex;
         height: 100%;
     }
-
     .search {
         width: 302px;
         padding: 35px 30px 0 40px;
@@ -246,7 +199,7 @@
         height: 70px;
         padding-right: 32px;
         display: flex;
-        justify-content: flex-end;
+        justify-content: space-between;
         align-items: center;
     }
 
diff --git a/src/views/loading/Loading.vue b/src/views/loading/Loading.vue
index 941faeb4a864fdf56ec5b56c5f0dc8355a8b85be..7d39143f03357319f384a6a475ddac41e4f7eb25 100644
--- a/src/views/loading/Loading.vue
+++ b/src/views/loading/Loading.vue
@@ -11,7 +11,7 @@
           return{
               id:'',
               spin:true,
-              title:'加载用户信息中...'
+              title:'登录中...'
           }
         },
         methods:{
@@ -22,20 +22,20 @@
                        this.getCode(result.code,this.id)
                   },
                   onFail : err=> {
-                      this.$message.error('请求失败,重试');
+                      this.$message.error('访问出错了');
                   }
                 })
           },
             getCode(code,id){
-                login(code,id).then(res=>{
-                  console.log(res)
+                login(code,id)
+                  .then(res=>{
                     let data = res.datas
                     if(res.resp_code === 0){
+                      this.title='加载用户信息中...'
                       localStorage.setItem('assToken',data.access_token)
                         getUserData().then(res=>{
-                            console.log(res)
                             if(res.resp_code === 0){
-                              localStorage.setItem('user',res.datas)
+                              localStorage.setItem('user',JSON.stringify(res.datas))
                                 this.$router.replace({
                                     name:'conOrgan'
                                 })
@@ -46,21 +46,21 @@
                     }else{
                         this.$message.error(res.resp_msg);
                     }
-                }).catch(err=>{
+                })
+                  .catch(err=>{
                     this.$message.error('请求失败,请稍后重试');
                 })
             }
         },
         created() {
             this.id = this.$route.query.corpid
-          localStorage.setItem('cropId',this.id)
-            this.$store.commit('setCropId',this.id)
-            this.signIn()
-            // setTimeout(()=>{
-            //     this.$router.replace({
-            //         name:'conOrgan'
-            //     })
-            // },500)
+            localStorage.setItem('cropId',this.id)
+            // this.signIn()
+            setTimeout(()=>{
+                this.$router.replace({
+                    name:'conOrgan'
+                })
+            },500)
         }
     }
 </script>