完成部门管理，增加.flaskenv配置，抽基本js和css作为引入模板

applications/views/admin/__init__.py

@@ -1,3 +1,4 @@
+from applications.views.admin.dept import admin_dept
 from applications.views.admin.index import admin_index
 from applications.views.admin.user import admin_user
 from applications.views.admin.file import admin_file
@@ -6,14 +7,10 @@ from applications.views.admin.admin_log import admin_log
 from applications.views.admin.power import admin_power
 from applications.views.admin.role import admin_role
 from applications.views.admin.dict import admin_dict
-"""
-   初始化蓝图
-
-   """
 
 
+# 初始化蓝图
 def init_adminViews(app):
-
     app.register_blueprint(admin_index)
     app.register_blueprint(admin_user)
     app.register_blueprint(admin_file)
@@ -22,4 +19,4 @@ def init_adminViews(app):
     app.register_blueprint(admin_power)
     app.register_blueprint(admin_role)
     app.register_blueprint(admin_dict)
-
+    app.register_blueprint(admin_dept)

applications/views/admin/dept.py

@@ -0,0 +1,101 @@
+from flask import Blueprint, render_template, request, jsonify
+from applications.service.admin import dept as dept_curd
+from applications.service.common.response import table_api, success_api, fail_api
+from applications.service.route_auth import authorize_and_log, authorize
+
+admin_dept = Blueprint('adminDept', __name__, url_prefix='/admin/dept')
+
+
+@admin_dept.route('/')
+@authorize_and_log("admin:dept:main")
+def main():
+    return render_template('admin/dept/main.html')
+
+
+@admin_dept.route('/data')
+@authorize_and_log("admin:dept:main")
+def data():
+    power_data = dept_curd.get_dept_dict()
+    res = {
+        "data": power_data
+    }
+    return jsonify(res)
+
+
+@admin_dept.route('/add')
+@authorize_and_log("admin:dept:add")
+def add():
+    return render_template('admin/dept/add.html')
+
+
+@admin_dept.route('/tree')
+@authorize_and_log("admin:dept:main")
+def tree():
+    power_data = dept_curd.get_dept_dict()
+    res = {
+        "status": {"code": 200, "message": "默认"},
+        "data": power_data
+
+    }
+    return jsonify(res)
+
+
+@admin_dept.route('/save', methods=['POST'])
+@authorize_and_log("admin:dept:edit")
+def save():
+    req = request.json
+    dept_curd.save_dept(req)
+    return success_api(msg="成功")
+
+
+@admin_dept.route('/edit', methods=['GET', 'POST'])
+@authorize_and_log("admin:dept:edit")
+def edit():
+    id = request.args.get("deptId")
+    dept = dept_curd.get_dept_by_id(id)
+    return render_template('admin/dept/edit.html', dept=dept)
+
+
+# 启用
+@admin_dept.route('/enable', methods=['PUT'])
+@authorize_and_log("admin:dept:edit")
+def enable():
+    id = request.json.get('deptId')
+    if id:
+        res = dept_curd.enable_status(id)
+        if not res:
+            return fail_api(msg="出错啦")
+        return success_api(msg="启用成功")
+    return fail_api(msg="数据错误")
+
+
+# 禁用
+@admin_dept.route('/disable', methods=['PUT'])
+@authorize_and_log("admin:dept:edit")
+def disenable():
+    id = request.json.get('deptId')
+    if id:
+        res = dept_curd.disable_status(id)
+        if not res:
+            return fail_api(msg="出错啦")
+        return success_api(msg="禁用成功")
+    return fail_api(msg="数据错误")
+
+
+@admin_dept.route('/update', methods=['PUT'])
+@authorize_and_log("admin:dept:edit")
+def update():
+    res = dept_curd.update_dept(request.json)
+    if not res:
+        return fail_api(msg="更新失败")
+    return success_api(msg="更新成功")
+
+
+@admin_dept.route('/remove/<int:id>', methods=['DELETE'])
+@authorize_and_log("admin:dept:remove")
+def remove(id):
+    res = dept_curd.remove_dept(id)
+    if res:
+        return success_api(msg="删除成功")
+    else:
+        return fail_api(msg="删除失败")

applications/views/admin/power.py

@@ -73,7 +73,7 @@ def update():
     return success_api(msg="更新权限成功")
 
 
-# 启用用户
+# 启用权限
 @admin_power.route('/enable', methods=['PUT'])
 @authorize_and_log("admin:power:edit")
 def enable():
@@ -83,11 +83,11 @@ def enable():
         res = enable_status(id)
         if not res:
             return fail_api(msg="出错啦")
-        return success_api(msg="启动成功")
+        return success_api(msg="启用成功")
     return fail_api(msg="数据错误")
 
 
-# 禁用用户
+# 禁用权限
 @admin_power.route('/disable', methods=['PUT'])
 @authorize_and_log("admin:power:edit")
 def disenable():

applications/views/admin/user.py

@@ -26,12 +26,13 @@ def data():
     limit = request.args.get('limit', type=int)
     realName = request.args.get('realName', type=str)
     username = request.args.get('username', type=str)
+    deptId = request.args.get('deptId', type=int)
     filters = {}
     if realName:
         filters["realname"] = ('%' + realName + '%')
     if username:
         filters["username"] = ('%' + username + '%')
-    user_data, count = get_user_data_dict(page=page, limit=limit, filters=filters)
+    user_data, count = get_user_data_dict(page=page, limit=limit, filters=filters,deptId=deptId)
     return table_api(data=user_data, count=count)
 
 
@@ -96,8 +97,9 @@ def update():
     id = req_json.get("userId")
     username = req_json.get('username')
     realName = req_json.get('realName')
+    deptId = req_json.get('deptId')
     role_ids = a.split(',')
-    update_user(id, username, realName)
+    update_user(id, username, realName,deptId)
     update_user_role(id, role_ids)
     return success_api(msg="更新成功")
 
@@ -158,7 +160,6 @@ def edit_password_put():
 @authorize_and_log("admin:user:edit")
 def enable():
     id = request.json.get('userId')
-    print(id)
     if id:
         res = enable_status(id)
         if not res: