权限分配优化

longkex · Dec 6, 2019 · 08ae9cd · 08ae9cd
1 parent 4a5438d
commit 08ae9cd
Show file tree

Hide file tree

Showing 8 changed files with 375 additions and 233 deletions.
diff --git a/.idea/workspace.xml b/.idea/workspace.xml
diff --git a/rbac/forms/__pycache__/role.cpython-37.pyc b/rbac/forms/__pycache__/role.cpython-37.pyc
diff --git a/rbac/forms/role.py b/rbac/forms/role.py
@@ -11,5 +11,5 @@ class Meta:
 
         # 调用bootCSS  给加上class=''即可  自定义样式！
         widgets = {
-            'title': forms.TextInput(attrs={'class': 'form-control'})
+            'title': forms.TextInput(attrs={'class': 'layui-input'})
         }
diff --git a/rbac/templates/layout.html b/rbac/templates/layout.html
@@ -26,13 +26,16 @@
         }
 
         .pg-body {
-            overflow: hidden;
+            height: calc(100vh - 60px);
         }
 
         .left-menu {
             float: left;
-            min-height: 100%;
+            width: 200px;
+            height: 100%;
+            overflow: auto;
         }
+
         .layui-header a {
             text-decoration: none;
         }
@@ -42,20 +45,18 @@
         }
 
         .pg-body, .left-menu, .left-tree {
-            {#height: 100%;#}
+        {#height: 100%;#} background-color: #272a33;
         }
 
         .pg-body > .right-body {
+            box-sizing: border-box;
             background-color: #f2f2f2;
             float: left;
-            width: calc(100% - 202px);
-            {#position: absolute;#}
-            {#left: 200px;#}
-            {#right: 0;#}
-            {#top: 60px;#}
-            border: 1px solid #ddd;
+            height: 100%;
+            width: calc(100% - 200px);
+        {#position: absolute;#} border: 1px solid #ddd;
             font-size: 14px;
-            {#min-width: 755px;#}
+            overflow: auto;
         }
 
         .layui-card-one {
@@ -116,14 +117,16 @@
     <div class="left-menu">
         <div class="menu-body">
             {% multi_menu request %}
-         </div>
+        </div>
     </div>
     <!--右侧-->
     <div class="right-body">
         <div class="layui-card-one">
             {% breadcrumb request %}
         </div>
-        {% block content %} {% endblock %}
+        <div class="right-t-body">
+            {% block content %} {% endblock %}
+        </div>
     </div>
 </div>
 <script src="{% static 'js/jquery-3.3.1.min.js' %} "></script>

diff --git a/rbac/templates/rbac/distribute_permissions.html b/rbac/templates/rbac/distribute_permissions.html
diff --git a/rbac/templates/rbac/role_list.html b/rbac/templates/rbac/role_list.html
@@ -3,43 +3,44 @@
 
 
 {% block content %}
-
-    <div class="luffy-container">
-        <div class="btn-group" style="margin: 5px 0">
-            <!--因为rbac的urls有上级urls所以 ，反向生成url的方法如下-->
-            <a class="btn btn-default" href="{% url 'rbac:role_add' %}">  <!--反向生成url-->
-                <i class="fa fa-plus-square" aria-hidden="true"></i> 添加角色
-            </a>
-
-
+    <div class="layui-row">
+        <div class="layui-card layui-col-md6" style="margin: 20px">
+            <div class="layui-card-header">角色管理
+                <div style="float: right;">
+                    <!--因为rbac的urls有上级urls所以 ，反向生成url的方法如下-->
+                    <a class="layui-btn layui-btn-sm" href="{% url 'rbac:role_add' %}">  <!--反向生成url-->
+                        <i class="fa fa-plus-square" aria-hidden="true"></i> 添加角色
+                    </a>
+                </div>
+            </div>
+            <div class="layui-card-body" style="padding: 0">
+                <table class="layui-table" style="margin: 0;">
+                    <thead>
+                    <tr style="background-color: #00968817">
+                        <th>ID</th>
+                        <th>名称</th>
+                        <th>选项</th>
+                    </tr>
+                    </thead>
+                    <tbody>
+                    {% for row in roles %}
+                        <tr>
+                            <td>{{ row.id }}</td>
+                            <td>{{ row.title }}</td>
+                            <td>
+                                <a style="color: #333333;" href="{% url 'rbac:role_edit' pk=row.id %}">
+                                    <!--反向取url 带参数pk-->
+                                    <i class="fa fa-edit" aria-hidden="true"></i></a>
+
+                                <a style="color: #d9534f;" href="{% url 'rbac:role_del' pk=row.id %}"><i
+                                        class="fa fa-trash-o"></i></a>
+                            </td>
+                        </tr>
+                    {% endfor %}
+                    </tbody>
+                </table>
+            </div>
         </div>
-        <table class="table table-bordered table-hover">
-            <thead>
-            <tr>
-                <th>ID</th>
-                <th>名称</th>
-                <th>选项</th>
-
-
-            </tr>
-            </thead>
-            <tbody>
-            {% for row in roles %}
-                <tr>
-                    <td>{{ row.id }}</td>
-                    <td>{{ row.title }}</td>
-                    <td>
-                        <a style="color: #333333;" href="{% url 'rbac:role_edit' pk=row.id %}">  <!--反向取url 带参数pk-->
-                            <i class="fa fa-edit" aria-hidden="true"></i></a>
-
-                        <a style="color: #d9534f;" href="{% url 'rbac:role_del' pk=row.id %}"><i
-                                class="fa fa-trash-o"></i></a>
-                    </td>
-                </tr>
-            {% endfor %}
-            </tbody>
-        </table>
     </div>
 
-
 {% endblock %}
diff --git a/rbac/views/__pycache__/menu.cpython-37.pyc b/rbac/views/__pycache__/menu.cpython-37.pyc
diff --git a/rbac/views/menu.py b/rbac/views/menu.py
@@ -368,6 +368,7 @@ def distribute_permissions(request):
     :param request:
     :return:
     """
+    print(request.POST)
     # 取业务中的用户表(因为设计成了可插拔式)
     user_model_class = import_string(settings.RBAC_USER_MODEL_CLASS)