From 016d0cab8ca6de6d44589a4589cd778044823477 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=BC=A0=E7=8E=89=E5=9D=A1?= <zhangyupo@yunjiazheng.com>
Date: Thu, 8 Mar 2018 11:08:27 +0800
Subject: [PATCH] =?UTF-8?q?A=20=E9=A6=96=E9=A1=B5=20=E6=96=B0=E5=A2=9E?=
 =?UTF-8?q?=E9=A6=96=E9=A1=B5=E6=9D=83=E9=99=90=E6=8E=A7=E5=88=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 spug_api/apps/home/homes.py                   |  1 +
 spug_api/libs/sql/permissions.sql             | 35 ++++++++++---------
 .../src/components/account/Permission.vue     |  9 ++++-
 spug_web/src/config/menu.js                   |  2 +-
 4 files changed, 29 insertions(+), 18 deletions(-)

diff --git a/spug_api/apps/home/homes.py b/spug_api/apps/home/homes.py
index 8ef85d2..6b8729e 100644
--- a/spug_api/apps/home/homes.py
+++ b/spug_api/apps/home/homes.py
@@ -11,6 +11,7 @@ blueprint = Blueprint(__name__, __name__)
 
 
 @blueprint.route('/', methods=['GET'])
+@require_permission('home_view')
 def get():
     user_total = User.query.count()
     host_total = Host.query.count()
diff --git a/spug_api/libs/sql/permissions.sql b/spug_api/libs/sql/permissions.sql
index c2e1be1..1873e7e 100644
--- a/spug_api/libs/sql/permissions.sql
+++ b/spug_api/libs/sql/permissions.sql
@@ -1,3 +1,6 @@
+-- 首页查看
+INSERT INTO account_permissions (id, name, `desc`) VALUES (100, 'home_view', '首页查看');
+
 -- 用户管理 -> 用户列表
 INSERT INTO account_permissions (id, name, `desc`) VALUES (101, 'account_user_view', '获取用户列表');
 INSERT INTO account_permissions (id, name, `desc`) VALUES (102, 'account_user_add', '添加用户');
@@ -30,7 +33,6 @@ INSERT INTO account_permissions (id, name, `desc`) VALUES (309, 'assets_host_exe
 INSERT INTO account_permissions (id, name, `desc`) VALUES (310, 'assets_host_exec_tpl_edit', '编辑模板');
 INSERT INTO account_permissions (id, name, `desc`) VALUES (311, 'assets_host_exec_tpl_del', '删除模板');
 
-
 -- 应用发布 -> 应用列表
 INSERT INTO account_permissions (id, name, `desc`) VALUES (401, 'publish_app_view', '获取应用列表');
 INSERT INTO account_permissions (id, name, `desc`) VALUES (402, 'publish_app_add', '添加应用');
@@ -63,21 +65,6 @@ INSERT INTO account_permissions (id, name, `desc`) VALUES (606, 'publish_image_v
 INSERT INTO account_permissions (id, name, `desc`) VALUES (607, 'publish_image_var_edit', '镜像设置 - 编辑');
 INSERT INTO account_permissions (id, name, `desc`) VALUES (608, 'publish_image_var_del', '镜像设置 - 删除');
 
--- 应用发布 -> 菜单管理
-INSERT INTO account_permissions (id, name, `desc`) VALUES (1101, 'publish_menu_view', '自定义菜单 - 查看');
-INSERT INTO account_permissions (id, name, `desc`) VALUES (1102, 'publish_menu_add', '自定义菜单 - 添加');
-INSERT INTO account_permissions (id, name, `desc`) VALUES (1103, 'publish_menu_edit', '自定义菜单 - 编辑');
-INSERT INTO account_permissions (id, name, `desc`) VALUES (1104, 'publish_menu_del', '自定义菜单 - 删除');
-INSERT INTO account_permissions (id, name, `desc`) VALUES (1105, 'publish_menu_rel_view', '关联配置 - 查看');
-INSERT INTO account_permissions (id, name, `desc`) VALUES (1106, 'publish_menu_rel_edit', '关联配置 - 编辑');
-
--- 应用发布 -> 字段管理
-INSERT INTO account_permissions (id, name, `desc`) VALUES (1201, 'publish_field_view', '自定义字段 - 查看');
-INSERT INTO account_permissions (id, name, `desc`) VALUES (1202, 'publish_field_add', '自定义字段 - 添加');
-INSERT INTO account_permissions (id, name, `desc`) VALUES (1203, 'publish_field_edit', '自定义字段 - 编辑');
-INSERT INTO account_permissions (id, name, `desc`) VALUES (1204, 'publish_field_del', '自定义字段 - 删除');
-INSERT INTO account_permissions (id, name, `desc`) VALUES (1205, 'publish_field_rel_view', '关联配置 - 查看');
-INSERT INTO account_permissions (id, name, `desc`) VALUES (1206, 'publish_field_rel_edit', '关联配置 - 编辑');
 
 -- 配置管理 -> 环境管理
 INSERT INTO account_permissions (id, name, `desc`) VALUES (701, 'config_environment_view', '获取环境列表');
@@ -110,3 +97,19 @@ INSERT INTO account_permissions (id, name, `desc`) VALUES (1002, 'job_task_add',
 INSERT INTO account_permissions (id, name, `desc`) VALUES (1003, 'job_task_edit', '编辑任务');
 INSERT INTO account_permissions (id, name, `desc`) VALUES (1004, 'job_task_del', '删除任务');
 INSERT INTO account_permissions (id, name, `desc`) VALUES (1005, 'job_task_log', '任务日志');
+
+-- 应用发布 -> 菜单管理
+INSERT INTO account_permissions (id, name, `desc`) VALUES (1101, 'publish_menu_view', '自定义菜单 - 查看');
+INSERT INTO account_permissions (id, name, `desc`) VALUES (1102, 'publish_menu_add', '自定义菜单 - 添加');
+INSERT INTO account_permissions (id, name, `desc`) VALUES (1103, 'publish_menu_edit', '自定义菜单 - 编辑');
+INSERT INTO account_permissions (id, name, `desc`) VALUES (1104, 'publish_menu_del', '自定义菜单 - 删除');
+INSERT INTO account_permissions (id, name, `desc`) VALUES (1105, 'publish_menu_rel_view', '关联配置 - 查看');
+INSERT INTO account_permissions (id, name, `desc`) VALUES (1106, 'publish_menu_rel_edit', '关联配置 - 编辑');
+
+-- 应用发布 -> 字段管理
+INSERT INTO account_permissions (id, name, `desc`) VALUES (1201, 'publish_field_view', '自定义字段 - 查看');
+INSERT INTO account_permissions (id, name, `desc`) VALUES (1202, 'publish_field_add', '自定义字段 - 添加');
+INSERT INTO account_permissions (id, name, `desc`) VALUES (1203, 'publish_field_edit', '自定义字段 - 编辑');
+INSERT INTO account_permissions (id, name, `desc`) VALUES (1204, 'publish_field_del', '自定义字段 - 删除');
+INSERT INTO account_permissions (id, name, `desc`) VALUES (1205, 'publish_field_rel_view', '关联配置 - 查看');
+INSERT INTO account_permissions (id, name, `desc`) VALUES (1206, 'publish_field_rel_edit', '关联配置 - 编辑');
\ No newline at end of file
diff --git a/spug_web/src/components/account/Permission.vue b/spug_web/src/components/account/Permission.vue
index 8bd0dcb..e7d0200 100644
--- a/spug_web/src/components/account/Permission.vue
+++ b/spug_web/src/components/account/Permission.vue
@@ -2,6 +2,13 @@
     <el-dialog :title="role.name + '- 权限管理'" :visible.sync="visible" @close="$emit('close')" width="80%"
                :close-on-click-modal="false">
         <table v-if="codes !== undefined" class="role_table">
+            <tr class="el-table__row">
+                <td rowspan="1">首页</td>
+                <td rowspan="1">首页</td>
+                <tag-td :item="codes['home_view']"></tag-td>
+                <td></td>
+                <td></td>
+            </tr>
             <tr class="el-table__row">
                 <td rowspan="4">用户管理</td>
                 <td rowspan="2">用户列表</td>
@@ -44,7 +51,7 @@
                 <tag-td :item="codes['assets_host_exec_tpl_view']"></tag-td>
             </tr>
             <tr>
-                 <tag-td :item="codes['assets_host_exec_tpl_add']"></tag-td>
+                <tag-td :item="codes['assets_host_exec_tpl_add']"></tag-td>
                 <tag-td :item="codes['assets_host_exec_tpl_edit']"></tag-td>
                 <tag-td :item="codes['assets_host_exec_tpl_del']"></tag-td>
             </tr>
diff --git a/spug_web/src/config/menu.js b/spug_web/src/config/menu.js
index 517dde6..069139b 100644
--- a/spug_web/src/config/menu.js
+++ b/spug_web/src/config/menu.js
@@ -1,7 +1,7 @@
 let menu = {
     menus: [
         {
-            key: '/home', desc: '首页', icon: 'fa fa-home'
+            key: '/home', desc: '首页', icon: 'fa fa-home', permission: 'home_view',
         },
         {
             key: '1', desc: '用户管理', icon: 'fa fa-address-card', permission: 'account_user_view|account_role_view', subs: [