diff --git a/src/lang/en/system/role.js b/src/lang/en/system/role.js
index 698bc42..93a809c 100644
--- a/src/lang/en/system/role.js
+++ b/src/lang/en/system/role.js
@@ -4,6 +4,7 @@ export default {
   status: 'Status',
   remark: 'Role Description',
   permit: 'Permit',
+  exporPermit: 'Export Permit',
 
   statusEnable: 'Enabled',
   statusDisable: 'Disabled',
diff --git a/src/lang/zh/system/role.js b/src/lang/zh/system/role.js
index ebfa143..e6e37c1 100644
--- a/src/lang/zh/system/role.js
+++ b/src/lang/zh/system/role.js
@@ -4,6 +4,7 @@ export default {
   status: '状态',
   remark: '备注',
   permit: '权限',
+  exporPermit: '导出权限',
 
   statusEnable: '启用',
   statusDisable: '禁用',
diff --git a/src/views/system/dept/index.vue b/src/views/system/dept/index.vue
index f9d72d4..1186da7 100644
--- a/src/views/system/dept/index.vue
+++ b/src/views/system/dept/index.vue
@@ -59,8 +59,8 @@
       <el-table-column prop="deptName" :label="$t('page.system.dept.name')"></el-table-column>
       <el-table-column prop="abbr" :label="$t('page.system.dept.abbr')"></el-table-column>
 
-      <el-table-column prop="jc" label="简称" width="150" v-if="id==1 || id==2"></el-table-column>
-      <el-table-column prop="showInSubject" label="是否在学科显示" width="200" v-if="id==1 || id==2">
+      <el-table-column prop="jc" label="简称" width="150" v-if="id==2"></el-table-column>
+      <el-table-column prop="showInSubject" label="是否在学科显示" width="200" v-if="id==2">
         <template slot-scope="scope">
           <span v-if="scope.row.showInSubject===1">否</span>
           <span v-if="scope.row.showInSubject===10">是</span>
@@ -145,12 +145,12 @@
             </el-form-item>
           </el-col>
 
-          <el-col :span="24" v-if="id==1 || id==2">
+          <el-col :span="24" v-if="id==2">
             <el-form-item label="简称：" prop="jc">
               <el-input v-model="form.jc" :placeholder="$t('form.placeholderInput')" :readonly="readonly" />
             </el-form-item>
           </el-col>
-          <el-col :span="24" v-if="id==1 || id==2">
+          <el-col :span="24" v-if="id==2">
             <el-form-item label="是否在学科显示" prop="showInSubject">
               <el-radio-group v-model="form.showInSubject" :disabled="readonly">
                 <el-radio :label="1">否</el-radio>
diff --git a/src/views/system/role/index.vue b/src/views/system/role/index.vue
index 9c03ea9..d4f19c4 100644
--- a/src/views/system/role/index.vue
+++ b/src/views/system/role/index.vue
@@ -10,7 +10,7 @@
           @keyup.enter.native="handleQuery"
         />
       </el-form-item>
-      <el-form-item :label="$t('page.system.role.key')+'：'" prop="roleKey">
+      <el-form-item :label="$t('page.system.role.key')+'：'" prop="roleKey" v-if="id==2">
         <el-input
           v-model="queryParams.roleKey"
           :placeholder="$t('form.placeholderInput')"
@@ -68,6 +68,17 @@
           v-hasPermi="['system:role:export']"
         >{{$t('form.export')}}</el-button>
       </el-col>
+
+      <el-col :span="1.5">
+        <el-button
+          type="warning"
+          plain
+          icon="el-icon-download"
+         
+          @click="handleExportPermit"
+          v-hasPermi="['system:role:export']"
+        >{{$t('page.system.role.exporPermit')}}</el-button>
+      </el-col>
       <!-- <el-col :span="1.5">
         <el-button
           type="success"
@@ -98,7 +109,7 @@
       <!-- <el-table-column type="selection" width="55" align="center" /> -->
       <!-- <el-table-column label="角色编号" prop="roleId" width="120" /> -->
       <el-table-column :label="$t('page.system.role.name')" prop="roleName" :show-overflow-tooltip="true" width="250" />
-      <el-table-column :label="$t('page.system.role.key')" prop="roleKey" :show-overflow-tooltip="true" width="250" />
+      <el-table-column :label="$t('page.system.role.key')" prop="roleKey" :show-overflow-tooltip="true" width="250" v-if="id==2" />
       <el-table-column :label="$t('page.system.role.remark')" prop="remark" :show-overflow-tooltip="true" />
       <!-- <el-table-column label="显示顺序" prop="roleSort" width="100" /> -->
       <el-table-column :label="$t('page.system.role.status')" prop="status" :show-overflow-tooltip="true" width="150">
@@ -204,7 +215,7 @@
         <el-form-item :label="$t('page.system.role.name')+'：'" prop="roleName">
           <el-input v-model="form.roleName" :placeholder="$t('form.placeholderInput')" :readonly="readonly" />
         </el-form-item>
-        <el-form-item prop="roleKey">
+        <el-form-item prop="roleKey" v-if="id==2">
           <span slot="label">
             <!-- <el-tooltip content="控制器中定义的权限字符，如：@PreAuthorize(`@ss.hasRole('admin')`)" placement="top">
               <i class="el-icon-question"></i>
@@ -315,6 +326,7 @@
 </template>
 
 <script>
+import { mapGetters } from 'vuex'
 import { listRole, getRole, delRole, addRole, updateRole, dataScope, changeRoleStatus, deptTreeSelect,allocatedUserList,authUserSetAll } from "@/api/system/role"
 import { treeselect as menuTreeselect, roleMenuTreeselect } from "@/api/system/menu"
 import Sign from '@/views/business/study/comp/sign.vue'
@@ -323,6 +335,11 @@ export default {
   name: "Role",
   dicts: ['sys_normal_disable'],
   components:{Sign},
+  computed: {
+    ...mapGetters([
+      'id'
+    ]),
+  },
   data() {
     return {
       // 遮罩层
@@ -735,7 +752,12 @@ export default {
         ...this.queryParams
       }, `role_${new Date().getTime()}.xlsx`)
     },
-
+    handleExportPermit() {
+      this.saveSimpleLog({name:'',nameEn:'',jcmc:'角色权限导出',jcmcEn:'Role Permit Export'})
+      this.download('system/role/exportMenu', {
+        ...this.queryParams
+      }, `rolePermit_${new Date().getTime()}.xlsx`)
+    },
     transfer(row){
       allocatedUserList({roleId:row.roleId}).then(response => {
           let list = []
diff --git a/src/views/system/user/index.vue b/src/views/system/user/index.vue
index f0c0bfa..9898a20 100644
--- a/src/views/system/user/index.vue
+++ b/src/views/system/user/index.vue
@@ -119,8 +119,8 @@
                     v-hasPermi="['system:user:roleChange']"
                   >{{$t('page.system.user.history')}}</el-button>
                   
-                  <el-button type="text" @click="handleDelete(scope.row)" v-hasPermi="['system:user:remove']">删除</el-button>
-                  <el-dropdown @command="(command) => handleCommand(command, scope.row)" v-hasPermi="['system:user:resetPwd', 'system:user:edit']">
+                  <el-button v-if="id==2" type="text" @click="handleDelete(scope.row)" v-hasPermi="['system:user:remove']">删除</el-button>
+                  <el-dropdown v-if="id==2" @command="(command) => handleCommand(command, scope.row)" v-hasPermi="['system:user:resetPwd', 'system:user:edit']">
                     <el-button type="text" icon="el-icon-d-arrow-right">更多</el-button>
                     <el-dropdown-menu slot="dropdown">
                       <el-dropdown-item command="handleResetPwd" icon="el-icon-key" v-hasPermi="['system:user:resetPwd']">重置密码</el-dropdown-item>
@@ -291,6 +291,7 @@
 </template>
 
 <script>
+import { mapGetters } from 'vuex'
 import { listUser, getUser, delUser, addUser, updateUser, resetUserPwd, changeUserStatus, deptTreeSelect,roleChangeList,checkExist } from "@/api/system/user"
 import { getToken } from "@/utils/auth"
 import Treeselect from "@riophae/vue-treeselect"
@@ -303,6 +304,11 @@ export default {
   name: "User",
   dicts: ['sys_normal_disable', 'sys_user_sex'],
   components: { Treeselect, Splitpanes, Pane,Sign },
+  computed: {
+    ...mapGetters([
+      'id'
+    ]),
+  },
   data() {
     return {
       // 遮罩层