From 0ab9cf600df54eef0ba1dd6323b090c56302eaef Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=88=98=E7=BF=94=E5=AE=87-=E6=97=85=E7=AE=A1=E5=AE=B6?=
 <153298343@qq.com>
Date: Thu, 8 Dec 2022 17:10:56 +0800
Subject: [PATCH] up

---
 src/api/common.js               |  31 +++
 src/api/system/role.js          |  12 +-
 src/store/modules/permission.js |  98 +++++---
 src/views/system/menu.vue       |  12 +-
 src/views/system/role.vue       | 394 +++++++++++++++++++-------------
 5 files changed, 353 insertions(+), 194 deletions(-)
 create mode 100644 src/api/common.js

diff --git a/src/api/common.js b/src/api/common.js
new file mode 100644
index 0000000..d4ab267
--- /dev/null
+++ b/src/api/common.js
@@ -0,0 +1,31 @@
+import request from '@/utils/request'
+
+
+
+
+
+export function listCommondepartment(params) {
+  return request({
+    url: '/api/admin/other/admin-department-list',
+    method: 'get',
+    params:params
+  })
+}
+
+
+export function listCommonuser(params) {
+  return request({
+    url: '/api/admin/other/admin-user-list',
+    method: 'get',
+    params:params
+  })
+}
+
+
+export function remoteStatistic(params) {
+  return request({
+    url: '/api/admin/other/remot-statistic',
+    method: 'get',
+    params:params
+  })
+}
diff --git a/src/api/system/role.js b/src/api/system/role.js
index bfa6f41..06da4c9 100644
--- a/src/api/system/role.js
+++ b/src/api/system/role.js
@@ -13,7 +13,8 @@ export function list() {
     url: '/api/admin/role',
     method: 'get'
   })
-}
+}
+
 export function del(data) {
   return request({
     url: '/api/admin/role/delete',
@@ -21,3 +22,12 @@ export function del(data) {
     data
   })
 }
+
+
+export function set(data) {
+  return request({
+    url: '/api/admin/admin/set-roles-many',
+    method: 'post',
+    data
+  })
+}
diff --git a/src/store/modules/permission.js b/src/store/modules/permission.js
index 36db0b6..06fd367 100644
--- a/src/store/modules/permission.js
+++ b/src/store/modules/permission.js
@@ -76,40 +76,70 @@ const componentHandler = (path) => {
   }
   return loadView(path)
 }
-
-export function generaMenu(routes, data) {
-  data.forEach(item => {
-    if (item.url === "/") {
-
-    } else {
-      const menu = {
-        path: pathHandler(item.url,item.id),
-        //(item.path === '#'||item.path == '' ? item.id + '_key' : item.path),
-        component: componentHandler(item.url),
-        //(item.path === '#'||item.path == ''  ? Layout : loadView(item.path)),
-        // hidden: true,
-        // hidden: true,
-        children: [],
-        name: 'menu_' + item.id,
-        meta: {
-          title: item.name,
-          id: item.id,
-          roles: ['admin'],
-
-          icon: item.icon
-        }
-      }
-      if (item.children) {
-        generaMenu(menu.children, item.children)
-      }
-      routes.push(menu)
-    }
-  })
-  routes.push({
-    path: '*',
-    redirect: '/404',
-    hidden: true
-  })
+
+/**
+ * 后台查询的菜单数据拼装成路由格式的数据
+ * @param routes
+ */
+export function generaMenu(routes, data) {
+  data.forEach(item => {
+    if (item.url === "/") {
+      routes.push({
+        path: '/',
+        component: Layout,
+        redirect: '/dashboard',
+        children: [{
+          path: 'dashboard',
+          name: '系统首页',
+          component: () => import('@/views/dashboard/index'),
+          meta: {
+            title: '系统首页',
+            icon: 'dashboard'
+          }
+        }]
+      })
+    } else if (item.url === "##") {
+       routes.push({
+         path: item.path,
+         component: Layout,
+         children: [{
+           path: item.path,
+           name: item.name,
+          component:  item.url === '#' ? Layout : loadView(item.path),
+           meta: {
+             title: item.name,
+             id: item.id,
+             roles: ['admin'],
+             icon: item.icon
+           }
+         }]
+       })
+    } else {
+      var path = item.url;
+      if (item.path != "null" && item.path != null && item.path != "") {
+        path = item.path
+      }
+      const menu = {
+        path: (path === '#' ? item.id + '_key' : path),
+        redirect: (item.children.length > 0 ? "noRedirect" : ""),
+        component: item.url === '#' ? Layout : loadView(item.url),
+        // hidden: true,
+        children: [],
+        name: 'menu_' + item.id,
+        meta: {
+          title: item.name,
+          id: item.id,
+          roles: ['admin'],
+
+          icon: item.icon
+        }
+      }
+      if (item.children) {
+        generaMenu(menu.children, item.children)
+      }
+      routes.push(menu)
+    }
+  })
 }
 
 const mutations = {
diff --git a/src/views/system/menu.vue b/src/views/system/menu.vue
index d708866..a9b68f1 100644
--- a/src/views/system/menu.vue
+++ b/src/views/system/menu.vue
@@ -23,6 +23,8 @@
           </el-table-column>
           <el-table-column prop="url" label="菜单路径" sortable>
           </el-table-column>
+          <el-table-column prop="path" label="路由" sortable>
+          </el-table-column>
           <el-table-column prop="icon" label="图标" sortable>
           </el-table-column>
           <el-table-column prop="api_prefix" label="API前缀" sortable>
@@ -65,6 +67,13 @@
             </el-form-item>
           </el-col>
         </el-row>
+        <el-row>
+          <el-col :span="18">
+            <el-form-item label="路由" prop="path">
+              <el-input v-model="form.path" autocomplete="off"></el-input>
+            </el-form-item>
+          </el-col>
+        </el-row>
 
         <el-row>
           <el-col :span="12">
@@ -178,7 +187,8 @@
           pname: "根菜单",
           api_prefix: "",
           auth_node_tagsArr: [],
-          auth_node_tags: ""
+          auth_node_tags: "",
+          path: ""
         },
         actionRules: {
           tag: [{
diff --git a/src/views/system/role.vue b/src/views/system/role.vue
index 0032094..cc44457 100644
--- a/src/views/system/role.vue
+++ b/src/views/system/role.vue
@@ -1,159 +1,237 @@
-<template>
-  <div class="container">
-    <!-- 查询配置 -->
-    <div>
-      <div ref="lxHeader">
-        <LxHeader icon="md-apps" text="角色权限" style="margin-bottom: 10px; border: 0px; margin-top: 15px">
-          <div slot="content"></div>
-          <slot>
-            <div>
-              <Input style="width: 200px; margin-right: 10px" v-model.number="searchFields.Name" placeholder="关键字搜索" />
-              <Button type="primary" @click="load" style="margin-left: 10px">查询</Button>
-              <Button type="primary" @click="edit()" style="margin-left: 10px">新增角色</Button>
-            </div>
-          </slot>
-        </LxHeader>
-      </div>
-
-      <div class="table-tree">
-        <el-table :data="tableData" class="v-table" border style="width: 100%">
-          <el-table-column type="index" align="center">
-          </el-table-column>
-          <el-table-column prop="name" label="角色名称" width="180">
-          </el-table-column>
-          <el-table-column prop="address" label="说明">
-          </el-table-column>
-          <el-table-column fixed="right" label="操作" width="300">
-            <template slot-scope="scope">
-              <Button ghost size="small" @click="edit(scope.row)" type="primary">编辑</Button>
-              <Button @click="del(scope.row)" type="error" ghost size="small" style="margin-left: 10px;">删除</Button>
-            </template>
-          </el-table-column>
-        </el-table>
-      </div>
-      <el-dialog title="角色编辑" :visible.sync="dialogFormVisible" width="30%">
-        <el-form :model="form" ref="form" :rules="rules" label-position="right" :label-width="formLabelWidth">
-
-          <el-form-item label="角色名称" prop="name">
-            <el-input v-model="form.name" autocomplete="off"></el-input>
-          </el-form-item>
-
-          <el-form-item label="排序">
-            <el-input v-model="form.sortnumber" autocomplete="off"></el-input>
-          </el-form-item>
-        </el-form>
-        <div slot="footer" class="dialog-footer">
-          <el-button @click="resetForm('form')">取 消</el-button>
-          <el-button type="primary" @click="submitForm('form')">确 定</el-button>
-        </div>
-      </el-dialog>
-    </div>
-  </div>
-</template>
-
-<script>
-  import LxHeader from "@/components/LxHeader/index.vue";
-  import {
-    save,
-    list,
-    del
-  } from "../../api/system/role.js";
-  export default {
-    components: {
-      LxHeader
-    },
-    created() {
-      this.load();
-    },
-    mounted() {},
-    data() {
-      return {
-        dialogFormVisible: false,
-        formLabelWidth: "120px",
-        form: {
-          name: "",
-          id: "",
-          sortnumber: "0"
-        },
-        rules: {
-          name: [{
-            required: true,
-            message: '请输入角色名称',
-            trigger: 'blur'
-          }],
-        },
-        tableHeight: 0,
-        //查询条件字段
-        searchFields: {
-          KeyWord: ""
-        },
-        tableData: []
-      }
-    },
-    methods: {
-      load() {
-        var that = this;
-        list().then(response => {
-          that.tableData = response;
-        }).catch(error => {
-          //reject(error)
-        })
-      },
-      edit(obj) {
-        if (obj) {
-          this.form.id = obj.id;
-          this.form.name = obj.name;
-        }
-        this.dialogFormVisible = true;
-      },
-      del(obj) {
-        var that = this;
-        if (obj) {
-          this.$Modal.confirm({
-            title: '确认要删除数据？',
-            onOk: () => {
-              del({
-                id: obj.id
-              }).then(response => {
-                this.$Message.success('操作成功');
-                that.load();
-              }).catch(error => {
-                console.log(error)
-                reject(error)
-              })
-            },
-            onCancel: () => {
-              //this.$Message.info('Clicked cancel');
-            }
-          });
-        }
-      },
-      submitForm(formName) {
-        var that = this;
-        this.$refs[formName].validate((valid) => {
-          if (valid) {
-            save(that.form).then(response => {
-              console.log(response)
-              this.$Message.success('操作成功');
-              that.load();
-              that.dialogFormVisible = false;
-            }).catch(error => {
-              reject(error)
-            })
-          } else {
-            this.$Message.error('数据校验失败');
-            return false;
-          }
-        });
-      },
-      resetForm(formName) {
-        var that = this;
-        this.$refs[formName].resetFields();
-        that.dialogFormVisible = false;
-      }
-    }
-  };
-</script>
-
-<style>
+<template>
+  <div class="container">
+    <!-- 查询配置 -->
+    <div style="padding: 0px 20px">
+      <div ref="lxHeader">
+        <LxHeader icon="md-apps" text="角色权限" style="margin-bottom: 10px; border: 0px; margin-top: 15px">
+          <div slot="content"></div>
+          <slot>
+            <div>
+              <Input style="width: 200px; margin-right: 10px" v-model.number="searchFields.Name" placeholder="关键字搜索" />
+              <Button type="primary" @click="load" style="margin-left: 10px">查询</Button>
+              <Button type="primary" @click="edit()" style="margin-left: 10px">新增角色</Button>
+            </div>
+          </slot>
+        </LxHeader>
+      </div>
+
+      <div class="table-tree">
+        <el-table :data="tableData" class="v-table" border style="width: 100%">
+          <el-table-column type="index" align="center">
+          </el-table-column>
+          <el-table-column prop="name" label="角色名称" width="180">
+          </el-table-column>
+          <el-table-column prop="address" label="说明">
+          </el-table-column>
+          <el-table-column fixed="right" label="操作" width="300">
+            <template slot-scope="scope">
+              <Button ghost size="small" @click="edit(scope.row)" type="primary">编辑</Button>
+              <Button ghost size="small" style="margin-left: 10px;" @click="set(scope.row)" type="primary">设置权限</Button>
+              <Button @click="del(scope.row)" type="error" ghost size="small" style="margin-left: 10px;">删除</Button>
+            </template>
+          </el-table-column>
+        </el-table>
+      </div>
+      <el-dialog title="角色编辑" :visible.sync="dialogFormVisible" width="30%">
+        <el-form :model="form" ref="form" :rules="rules" label-position="right" :label-width="formLabelWidth">
+
+          <el-form-item label="角色名称" prop="name">
+            <el-input v-model="form.name" autocomplete="off"></el-input>
+          </el-form-item>
+
+          <el-form-item label="排序">
+            <el-input v-model="form.sortnumber" autocomplete="off"></el-input>
+          </el-form-item>
+        </el-form>
+        <div slot="footer" class="dialog-footer">
+          <el-button @click="resetForm('form')">取 消</el-button>
+          <el-button type="primary" @click="submitForm('form')">确 定</el-button>
+        </div>
+      </el-dialog>
+
+      <el-dialog title="权限设置" :visible.sync="dialogSetVisible" width="60%">
+        <el-form label-position="right" :label-width="formLabelWidth">
+
+          <el-form-item label="角色名称" prop="name">
+            {{setForm.name}}
+          </el-form-item>
+          <el-form-item label="角色人员">
+            <el-transfer filterable :titles="['待选择', '已选择']" :props="{key: 'id',label: 'name'}"
+              :filter-method="filterMethod" :format="{ noChecked: '${total}',hasChecked: '${checked}/${total}' }"
+              filter-placeholder="请选择人员" v-model="setForm.ids" :data="userdata">
+            </el-transfer>
+          </el-form-item>
+        </el-form>
+        <div slot="footer" class="dialog-footer">
+          <el-button @click="dialogSetVisible=false">取 消</el-button>
+          <el-button type="primary" @click="submitSet()">确 定</el-button>
+        </div>
+      </el-dialog>
+
+    </div>
+  </div>
+</template>
+
+<script>
+  import LxHeader from "@/components/LxHeader/index.vue";
+  import {
+    save,
+    list,
+    del,
+    set
+  } from "../../api/system/role.js";
+
+  import {
+    listCommondepartment,
+    listCommonuser
+  } from "../../api/common.js"
+
+  export default {
+    components: {
+      LxHeader
+    },
+    created() {
+      this.load();
+
+    },
+    mounted() {},
+    data() {
+      return {
+        dialogSetVisible: false,
+        dialogFormVisible: false,
+        formLabelWidth: "120px",
+        form: {
+          name: "",
+          id: "",
+          sortnumber: "0"
+        },
+        userdata: [],
+        filterMethod(query, item) {
+          return item.name.indexOf(query) > -1;
+        },
+        rules: {
+          name: [{
+            required: true,
+            message: '请输入角色名称',
+            trigger: 'blur'
+          }],
+        },
+        tableHeight: 0,
+        //查询条件字段
+        searchFields: {
+          KeyWord: ""
+        },
+        tableData: [],
+        setForm: {
+          name: "",
+          ids: [],
+          role_id:""
+        }
+      }
+    },
+    methods: {
+      load() {
+        var that = this;
+        list().then(response => {
+          that.tableData = response;
+        }).catch(error => {
+          //reject(error)
+        })
+      },
+      loadUser() {
+        listCommonuser({
+          page_size: 999
+        }).
+        then((res) => {
+          this.userdata = res.data;
+        }).catch(error => {
+          console.log(error)
+        })
+      },
+      edit(obj) {
+        if (obj) {
+          this.form.id = obj.id;
+          this.form.name = obj.name;
+        }
+        this.dialogFormVisible = true;
+      },
+      set(obj) {
+        var that = this;
+        this.setForm.role_id = "";
+        this.setForm.ids = [];
+        this.setForm.name = obj.name;
+        this.setForm.role_id=obj.id;
+        if (obj.admin) {
+          for (var m of obj.admin) {
+            this.setForm.ids.push(m.id);
+          }
+        }
+        this.dialogSetVisible = true;
+        this.loadUser();
+      },
+      submitSet() {
+        let that = this;
+        if (that.setForm.ids.length == 0) {
+          this.$Message.error("请选择人员");
+          return false;
+        }
+
+        set(that.setForm).then(response => {
+          this.$Message.success('操作成功');
+          that.load();
+          that.dialogSetVisible = false;
+        }).catch(error => {
+          this.$Message.error(error);
+        })
+      },
+      del(obj) {
+        var that = this;
+        if (obj) {
+          this.$Modal.confirm({
+            title: '确认要删除数据？',
+            onOk: () => {
+              del({
+                id: obj.id
+              }).then(response => {
+                this.$Message.success('操作成功');
+                that.load();
+              }).catch(error => {
+                console.log(error)
+                reject(error)
+              })
+            },
+            onCancel: () => {
+              //this.$Message.info('Clicked cancel');
+            }
+          });
+        }
+      },
+      submitForm(formName) {
+        var that = this;
+        this.$refs[formName].validate((valid) => {
+          if (valid) {
+            save(that.form).then(response => {
+              console.log(response)
+              this.$Message.success('操作成功');
+              that.load();
+              that.dialogFormVisible = false;
+            }).catch(error => {
+              reject(error)
+            })
+          } else {
+            this.$Message.error('数据校验失败');
+            return false;
+          }
+        });
+      },
+      resetForm(formName) {
+        var that = this;
+        this.$refs[formName].resetFields();
+        that.dialogFormVisible = false;
+      }
+    }
+  };
+</script>
+
+<style>
 </style>