From e8b47a4e0e9a161b72289e4d2df85e2d0623d719 Mon Sep 17 00:00:00 2001
From: zxx <47968546@163.com>
Date: Wed, 21 Dec 2022 22:36:19 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=AD=A3=E4=B8=80=E4=BA=9B=E9=97=AE?=
 =?UTF-8?q?=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .env                                          |   2 +-
 src/layouts/footer/PageFooter.vue             |  14 +-
 src/layouts/header/HeaderAvatar.vue           |   2 +-
 src/pages/BaseAdmin/BaseAdmin/list.vue        |  66 +++++----
 src/pages/BaseAdmin/BaseRole/list.vue         |  63 ++++----
 src/pages/Middle/Base/BasePermission/edit.vue | 139 ++++++++++--------
 src/pages/Middle/Base/BasePermission/list.vue |   9 +-
 7 files changed, 175 insertions(+), 120 deletions(-)

diff --git a/.env b/.env
index a14f3b0..0679826 100644
--- a/.env
+++ b/.env
@@ -16,6 +16,6 @@ VUE_APP_LAYOUT_KEY=admin.layout
 VUE_APP_THEME_MODE_KEY=admin.theme.mode
 VUE_APP_THEME_COLOR_KEY=admin.theme.color
 VUE_APP_API_BASE_URL=http://zxx4.f3322.net:46000
-VUE_APP_USER_MODEL=AdminUser
+VUE_APP_USER_MODEL=BaseAdmin
 VUE_APP_BEID=1
 VUE_APP_PTYID=0
\ No newline at end of file
diff --git a/src/layouts/footer/PageFooter.vue b/src/layouts/footer/PageFooter.vue
index 38a3539..5e2edb3 100644
--- a/src/layouts/footer/PageFooter.vue
+++ b/src/layouts/footer/PageFooter.vue
@@ -1,9 +1,8 @@
 <template>
   <div class="footer">
-
     <div class="copyright">
-      <a-icon type="copyright" />{{project.copyright}} <br />
-      <a-icon type="copyright"  />{{project.en_copyright}} <br />
+      <a-icon type="copyright" />{{ Project.copyright }} <br />
+      <a-icon type="copyright"  />{{ Project.en_copyright }} <br />
       
     </div>
   </div>
@@ -15,11 +14,16 @@ export default {
   name: 'PageFooter',
   data() {
     return {
-      project: localStorage.getItem(process.env.VUE_APP_PROJECT_KEY)
+      Project: [],
     }
   },
-
+  created() { // 页面创建完成
+  },
   
+  mounted() { // 页面挂载完成
+    this.Project = JSON.parse(localStorage.getItem(process.env.VUE_APP_PROJECT_KEY))
+  },
+
 }
 </script>
 
diff --git a/src/layouts/header/HeaderAvatar.vue b/src/layouts/header/HeaderAvatar.vue
index 8c9cb09..819f916 100644
--- a/src/layouts/header/HeaderAvatar.vue
+++ b/src/layouts/header/HeaderAvatar.vue
@@ -17,7 +17,7 @@
         </a-menu-item>
         <a-menu-item @click="adminRole"  v-if="!isMiddleAdmin()">
           <a-icon type="appstore" />
-          <span>权限管理</span>
+          <span>角色管理</span>
         </a-menu-item>
         <a-menu-item @click="showCompany" v-if="!isMiddleAdmin()">
           <a-icon type="compass" />
diff --git a/src/pages/BaseAdmin/BaseAdmin/list.vue b/src/pages/BaseAdmin/BaseAdmin/list.vue
index 57e3d0c..662f4aa 100644
--- a/src/pages/BaseAdmin/BaseAdmin/list.vue
+++ b/src/pages/BaseAdmin/BaseAdmin/list.vue
@@ -39,14 +39,16 @@
         </template>
         <template #op2="{ row }">
           <div class="oplinks2">
-            <a-button @click.stop="pageRole(row)">角色设置</a-button>
+            <a-button @click.stop="pageRole(row)">关联角色</a-button>
           </div>
         </template>
         <template #op3="{ row }">
           <div class="oplinks2">
-            <a-button @click.stop="pagePermission(row)">权限设置</a-button>
+            <a-button @click.stop="pagePermission(row)">设置</a-button>
           </div>
         </template>
+
+        
       </vxe-grid>
     </div>
 
@@ -69,7 +71,7 @@
         <span>设置权限</span>
       </template>
       <template #default>
-
+        <!-- 显示设置权限 -->
         <vxe-table show-overflow auto-resize height="500" row-id="id" ref="xPermissionTable" :data="permissionData"
           :tree-config="{ transform: true, expandAll: true }"
           :checkbox-config="{ reserve: true, highlight: true, trigger: 'row', labelField: 'nodeTitle' }">
@@ -183,13 +185,13 @@ export default {
         columns: [
           { type: 'checkbox', width: 50 },
           { type: 'seq', width: 50 },
-          { title: '操作', slots: { default: 'op' }, width: 120 },
-          { title: '角色设置', slots: { default: 'op2' }, width: 120 },
-          { title: '权限设置', slots: { default: 'op3' }, width: 120 },
-          { field: 'name', sortable: true, title: '名称' },
-          { field: 'nick_name', sortable: true, title: '昵称', showHeaderOverflow: true },
+          { field: 'realname', sortable: true, title: '名称' },
+          { field: 'nickname', sortable: true, title: '昵称', showHeaderOverflow: true },
           { field: 'email', sortable: true, title: 'email', showHeaderOverflow: true },
-          { field: 'mobile', sortable: true, title: '电话', showHeaderOverflow: true }
+          { field: 'mobile', sortable: true, title: '电话', showHeaderOverflow: true },
+          { title: '角色设置', slots: { default: 'op2' }, width: 120 },
+          { title: '自定义权限设置', slots: { default: 'op3' }, width: 120 },
+          { title: '操作', slots: { default: 'op' }, width: 120 }
         ]
       }
     };
@@ -388,20 +390,20 @@ export default {
         let customList = a.data.UserCustom || [];
         let adds = [];
         let removes = [];
-        customList.forEach(customItem => {
+        customList.forEach(customItem => { // 原来的
           if (rows.filter(row => row.permission_code == customItem.permission_code).length == 0) {
             removes.push(customItem.id);
           }
         });
-        rows.forEach(row => {
+        rows.forEach(row => { // 选中的
           if (customList.filter(customItem => row.permission_code == customItem.permission_code).length == 0) {
             adds.push(row.permission_code);
           }
         })
-        this.savePermission({ adds, removes });
+        this.savePermission({ adds, removes }); // 保存权限
       });
     },
-    roleDataInit() {
+    roleDataInit() { // 角色数据初始化
       this.$mk.post({
         url: this.actions.roleList,
         data: {
@@ -413,7 +415,7 @@ export default {
         this.$mk.error(a.data.msg);
       });
     },
-    permissionDataInit() {
+    permissionDataInit() { // 权限数据初始化
 
       this.$mk.post({
         url: this.actions.permissionList,
@@ -448,7 +450,9 @@ export default {
         this.$mk.error(a.data.msg);
       });
     },
-    pageRole(row) {
+
+
+    pageRole(row) { // 角色设置
       if (!row) {
         this.$mk.msg("请选择行");
         return;
@@ -477,22 +481,22 @@ export default {
       });
 
     },
-    pagePermission(row) {
+    pagePermission(row) { // 权限
       if (!row) {
         this.$mk.msg("请选择行");
         return;
       }
-      this.currentRow = row;
-      this.$mk.post({
+      this.currentRow = row; // 当前行
+      this.$mk.post({ // 获取用户权限列表
         url: this.actions.userPermissionList,
         data: {
           target_uid: row.uid
         }
-      }).then(a => {
+      }).then(a => { // 设置权限列表
         this.showPermission = true;
         let rows = [];
-       let uesrCustom = a.data.UserCustom || [];
-        this.permissionData.forEach(item => {
+       let uesrCustom = a.data.UserCustom || []; // 用户权限 等于 选中的
+        this.permissionData.forEach(item => { // 循环权限列表
           if (uesrCustom.filter(customerItem => item.permission_code == customerItem.permission_code).length) {
             rows.push(item);
           }
@@ -507,7 +511,7 @@ export default {
 
 
     },
-    pageDelete(row) {
+    pageDelete(row) { // 删除
 
 
       let rows = row ? [row] : this.$refs.xGrid.getCheckboxRecords();
@@ -541,7 +545,7 @@ export default {
 
 
     },
-    onSearch() {
+    onSearch() { // 查询
       this.$refs.xGrid.commitProxy('query')
     }
   },
@@ -551,14 +555,26 @@ export default {
   }
 };
 
+
+
+
+
 </script>
 <style scoped lang="less">
 .page-body {
-  padding: 10px 10px;
+  padding: 20px 20px;
   background: @base-bg-color;
 }
 
 .gridPanel {
   height: calc(100vh - 430px);
 }
-</style> 
\ No newline at end of file
+</style> 
+
+<style>
+.oplinks svg {
+  width: 22px;
+  height: 22px;
+  margin: 0 5px 0 0;
+}
+</style>
\ No newline at end of file
diff --git a/src/pages/BaseAdmin/BaseRole/list.vue b/src/pages/BaseAdmin/BaseRole/list.vue
index 80feaf9..c9cf9a3 100644
--- a/src/pages/BaseAdmin/BaseRole/list.vue
+++ b/src/pages/BaseAdmin/BaseRole/list.vue
@@ -7,25 +7,28 @@
 
 
     <!-- 搜索区 -->
-    <vxe-form :data="searchFormData" :items="searchFormItems" titleColon @submit="onSearch">
+    <!-- <vxe-form :data="searchFormData" :items="searchFormItems" titleColon @submit="onSearch">
       <template #date="{}">
-
         <a-form-item label="创建时间" :style="{ display: 'inline-block', width: 120 }">
         </a-form-item>
+        
         <a-form-item :style="{ display: 'inline-block', width: 'calc(100% - 120px )' }">
           <a-range-picker @change="onDateChange" />
         </a-form-item>
 
-
-
       </template>
-    </vxe-form>
+    </vxe-form> -->
 
+
+    <!-- 批量删除工具条 -->
     <vxe-toolbar ref="xToolbar" custom>
       <template #buttons>
         <a-button type="primary" icon="delete" @click="pageDelete()">批量删除</a-button>
       </template>
     </vxe-toolbar>
+
+
+
     <!-- 表格区 -->
     <div class="gridPanel">
       <vxe-grid ref='xGrid' v-bind="gridOptions">
@@ -75,28 +78,27 @@ export default {
     // 页面数据变量
     var pageData = {
 
-      keyName: 'id',
-      actions: {
-        getList: `${BASE_URL.BASE_URL}/BasePermission/v1/role/list`,
-        delete: `${BASE_URL.BASE_URL}/BasePermission/v1/role/batchDelete`,
+      keyName: 'id', //主键名称
+      actions: {  // 接口地址
+        getList: `${BASE_URL.BASE_URL}/BasePermission/v1/role/list`, // 获取列表
+        delete: `${BASE_URL.BASE_URL}/BasePermission/v1/role/batchDelete`, // 删除
 
-        permissionList: `${BASE_URL.BASE_URL}/BasePermission/v1/service/permission/list`, 
-        rolePermissionList: `${BASE_URL.BASE_URL}/BasePermission/v1/role/permission/list`, 
-        savePermission: `${BASE_URL.BASE_URL}/BasePermission/v1/role/permission/batchHandle`,
+        permissionList: `${BASE_URL.BASE_URL}/BasePermission/v1/service/permission/list`,  //权限列表
+        rolePermissionList: `${BASE_URL.BASE_URL}/BasePermission/v1/role/permission/list`,  //角色权限列表
+        savePermission: `${BASE_URL.BASE_URL}/BasePermission/v1/role/permission/batchHandle`, //保存角色权限
       },
 
-      permissionData: [],
+      permissionData: [], //权限数据
 
-      showPermission: false,
-      currentRow: null,
+      showPermission: false, //显示权限设置
+      currentRow: null, //当前行
 
-      start_time: 0,
-      end_time: 0,
+      start_time: 0, //开始时间
+      end_time: 0, //结束时间
 
       //搜索区
-      searchFormData: {
-        name: '',
-        nick_name: '',
+      searchFormData: {  // 搜索表单数据
+        name: '', //角色名称
       },
       searchRules: [
         { key: "name", mode: "like" },
@@ -110,8 +112,8 @@ export default {
           title: '左侧',
           span: 20,
           children: [
-            { field: 'name', title: '名称', span: 5, itemRender: { name: '$input', props: { placeholder: '请输入名称' } } },
-            { field: 'desc', title: '描述', span: 5, itemRender: { name: '$input', props: { placeholder: '请输入描述' } } },
+            { field: 'name', title: '角色名称', span: 5, itemRender: { name: '$input', props: { placeholder: '请输入名称' } } },
+            { field: 'desc', title: '角色描述', span: 5, itemRender: { name: '$input', props: { placeholder: '请输入描述' } } },
             { span: 8, slots: { default: 'date' } },
             { align: 'right', span: 4, itemRender: { name: '$buttons', children: [{ props: { type: 'submit', content: '搜索', status: 'primary' } }, 
             { props: { type: 'reset', content: '重置' } }] } }
@@ -158,10 +160,10 @@ export default {
         columns: [
           { type: 'checkbox', width: 50 },
           { type: 'seq', width: 50 },
-          { title: '操作', slots: { default: 'op' },width:120 },
+          { field: 'name', sortable: true, title: '角色' },
+          { field: 'desc', sortable: true, title: '角色描述', showHeaderOverflow: true } ,
           { title: '权限设置', slots: { default: 'op3' }, width: 120 },
-          { field: 'name', sortable: true, title: '名称' },
-          { field: 'desc', sortable: true, title: '描述', showHeaderOverflow: true } 
+          { title: '操作', slots: { default: 'op' },width:120 }
         ]
       }
     };
@@ -436,10 +438,17 @@ export default {
 </script>
 <style scoped lang="less">
 .page-body {
-  padding: 10px 10px;
+  padding: 20px 20px;
   background:  @base-bg-color;
 }
 .gridPanel{ 
   height: calc(100vh - 430px); 
 }
-</style> 
\ No newline at end of file
+</style> 
+<style>
+.oplinks svg {
+  width: 22px;
+  height: 22px;
+  margin: 0 5px 0 0;
+}
+</style>
\ No newline at end of file
diff --git a/src/pages/Middle/Base/BasePermission/edit.vue b/src/pages/Middle/Base/BasePermission/edit.vue
index 7106146..9ab2380 100644
--- a/src/pages/Middle/Base/BasePermission/edit.vue
+++ b/src/pages/Middle/Base/BasePermission/edit.vue
@@ -1,14 +1,23 @@
 <template>
   <div class="page-body">
-
-    <vxe-form :data="formOptions.data" ref="xForm" :title-width="formOptions.titleWidth"
-      :title-align="formOptions.titleAlign" :rules="formOptions.rules" :items="formOptions.items" titleColon>
+    <!-- 开始表单 -->
+    <!-- :data 表单数据 -->
+    <!-- :title-width 标题宽度 -->
+    <!-- :title-align 标题对齐方式 -->
+    <!-- :rules 表单验证规则 -->
+    <!-- :items 表单配置 -->
+    <!-- titleColon 标题后面是否带冒号 -->
+    <vxe-form :data="formOptions.data" ref="xForm" :title-width="formOptions.titleWidth" :title-align="formOptions.titleAlign" :rules="formOptions.rules" :items="formOptions.items" titleColon>
+      <!-- 自定义区域 -->
       <template #myregion="{}">
+        <!-- 搜索 -->
+        <!-- placeholder 占位符 -->
+        <!-- enter-button 是否显示搜索按钮 -->
         <a-input-search placeholder="input search text" enter-button />
       </template>
     </vxe-form>
 
-
+    <!-- 按钮 -->
     <div>
       <a-button type="primary" @click="ok">确定</a-button>
       <a-button @click="cancel">取消</a-button>
@@ -18,15 +27,15 @@
 </template>
 
 <script>
-import BASE_URL from '@/services/base/api.js';
+import BASE_URL from '@/services/base/api.js'; // 引入api
 
-export default {
+export default { 
   name: 'BasePermissionEdit',
 
-  props: {
-    pageMode: {
-      type: String,
-      default: "edit"
+  props: { // 页面参数
+    pageMode: { // 页面模式 add edit
+      type: String, // 类型
+      default: "edit" // 默认值
     },
     dataId: {
     }
@@ -38,35 +47,45 @@ export default {
     // 页面数据变量
     var pageData = {
 
-      actions: {
-        create: `${BASE_URL.BASE_URL}/BasePermission/v1/base/permission/create`,
-        update: `${BASE_URL.BASE_URL}/BasePermission/v1/base/permission/update`,
-        get: `${BASE_URL.BASE_URL}/BasePermission/v1/base/permission/detail`
+      actions: { // api
+        create: `${BASE_URL.BASE_URL}/BasePermission/v1/base/permission/create`, // 创建
+        update: `${BASE_URL.BASE_URL}/BasePermission/v1/base/permission/update`, // 更新
+        get: `${BASE_URL.BASE_URL}/BasePermission/v1/base/permission/detail` // 获取
       },
 
-      formOptions: {
-        data: {
+      formOptions: { // 表单配置
+        data: { // 表单默认数据
           "title": "",
           "service": "",
           "permission_code": "",
           "desc": ""
         },
 
-        titleWidth: 100,
-        titleAlign: 'right',
+        titleWidth: 100, // 标题宽度
+        titleAlign: 'right', // 标题对齐方式
 
-        rules: {
-          title: [
-            { required: true, message: '请输入权限名' }
+        rules: { // 表单验证规则
+          title: [ // 权限名
+            { required: true, message: '请输入权限名' } 
           ] 
         },
 
         items: [
           {
-            title: '左侧',
-            children: [
-              { field: 'title', title: '权限名', span: 24, itemRender: { name: '$input', props: { placeholder: '请输入权限名' } } },
-              { field: 'permission_code', title: '编号', span: 24, itemRender: { name: '$input', props: { placeholder: '请输入编号' } } },
+            title: '左侧', // 标题
+            children: [ 
+              { 
+                field: 'title',  // 字段名
+                title: '权限名',  // 标题
+                span: 24,  // 宽度
+                itemRender: {  // 渲染
+                  name: '$input',  // 组件名
+                  props: {  // 组件属性
+                    placeholder: '请输入权限名'  // 占位符
+                  } 
+                } 
+              },
+              { field: 'permission_code', title: '编号', span: 24, itemRender: { name: '$input', props: { placeholder: '请输入编码' } } },
               { field: 'service', title: 'service', span: 24, itemRender: { name: '$input', props: { placeholder: '请输入service' } } },
               { field: 'desc', title: '描述', span: 24, itemRender: { name: '$input', props: { placeholder: '请输入描述' } } }
             ]
@@ -75,22 +94,22 @@ export default {
       }
 
     };
-
+    // 合并默认配置
     pageData.formOptions = Object.assign(this.$mk.config.defaults.formOptions, pageData.formOptions);
-
+    // 返回数据
     return pageData;
   },
-  created() {
-    if (this.dataId) {
-      this.$mk.post({
-        url: this.actions.get,
-        loading: "加载中...",
-        data: {
-          id: this.dataId
+  created() { // 页面创建时
+    if (this.dataId) { // 如果有id
+      this.$mk.post({ // 获取数据
+        url: this.actions.get, // api
+        loading: "加载中...", // 加载提示
+        data: { // 参数
+          id: this.dataId // id
         }
-      }).then(a => {
-        this.formOptions.data = a.data.base_permission;
-      }).catch((a) => {
+      }).then(a => { // 成功
+        this.formOptions.data = a.data.base_permission; // 赋值
+      }).catch((a) => { // 失败
         this.$mk.error(a.data.msg);
       });
     }
@@ -103,43 +122,43 @@ export default {
     loadData() {
     },
 
-    ok() {
+    ok() { // 提交确定
 
-      let save = () => {
-        let action = this.pageMode == "add" ? this.actions.create : this.actions.update;
-        let postdata = this.pageMode == "add" ? Object.assign({ id: this.dataId }, this.formOptions.data) : Object.assign({}, this.formOptions.data);
+      let save = () => { // 保存
+        let action = this.pageMode == "add" ? this.actions.create : this.actions.update; // 如果是新增就是创建api，否则就是更新api
+        let postdata = this.pageMode == "add" ? Object.assign({ id: this.dataId }, this.formOptions.data) : Object.assign({}, this.formOptions.data); // 如果是新增就是创建api，否则就是更新api
  
-        this.$mk.post({
-          url: action,
-          loading: "保存中...",
-          data: postdata
-        }).then(() => {
-          this.$mk.success("保存成功");
-          this.$emit("callback", { success: true });
-        }).catch((a) => {
-          this.$mk.error(a.data.msg);
+        this.$mk.post({ // 提交
+          url: action, // api
+          loading: "保存中...", // 加载提示
+          data: postdata // 参数
+        }).then(() => { // 成功
+          this.$mk.success("保存成功"); // 提示
+          this.$emit("callback", { success: true }); // 回调
+        }).catch((a) => { // 失败
+          this.$mk.error(a.data.msg); // 提示
         });
       };
 
-      this.$refs.xForm.validate((a) => {
+      this.$refs.xForm.validate((a) => { // 验证
 
-        if (a) {
-          let count = 0;
-          for (let name in a) {
-            a[name];
-            count++;
+        if (a) { // 如果有错误
+          let count = 0; // 错误数量
+          for (let name in a) { // 遍历错误
+            a[name]; // 错误信息
+            count++; // 错误数量+1
           }
-          this.$mk.error(`存在${count}项错误，请检查`);
+          this.$mk.error(`存在${count}项错误，请检查`); // 提示
         } else {
-          save();
+          save(); // 保存
         }
       });
 
 
     },
 
-    cancel() {
-      this.$emit("callback", {});
+    cancel() { // 取消
+      this.$emit("callback", {}); // 回调
     }
   },
   // 监听属性
diff --git a/src/pages/Middle/Base/BasePermission/list.vue b/src/pages/Middle/Base/BasePermission/list.vue
index 2795703..57ab614 100644
--- a/src/pages/Middle/Base/BasePermission/list.vue
+++ b/src/pages/Middle/Base/BasePermission/list.vue
@@ -279,4 +279,11 @@ export default {
   padding: 30px ;
   background: @base-bg-color;
 }
-</style> 
\ No newline at end of file
+</style> 
+<style>
+.oplinks svg {
+  width: 22px;
+  height: 22px;
+  margin: 0 5px 0 0;
+}
+</style>
\ No newline at end of file