完成角色删除和权限编辑

applications/views/admin/power.py

@@ -1,6 +1,8 @@
 from flask import Blueprint, render_template, request, jsonify
 from flask_login import login_required
-from applications.service.admin.power import get_power_dict, select_parent, save_power, remove_power, get_power_by_id
+from applications.service.admin.power import get_power_dict, select_parent, save_power, remove_power, get_power_by_id, \
+    update_power
+
 
 admin_power = Blueprint('adminPower', __name__, url_prefix='/admin/power')
 
@@ -53,17 +55,23 @@ def remove(id):
     else:
         return jsonify(success=False, msg="删除失败")
 
+
 # 权限编辑
 @admin_power.route('/edit/<int:id>', methods=['GET', 'POST'])
 def edit(id):
     power = get_power_by_id(id)
-    return render_template('admin/power/edit.html',power=power)
+    icon = str(power.icon).split()
+    if len(icon) == 2:
+        icon = icon[1]
+    else:
+        icon = None
+    return render_template('admin/power/edit.html', power=power, icon=icon)
 
 
 # 权限更新
 @admin_power.route('/update', methods=['PUT'])
 def update():
-    res = update_role(request.json)
+    res = update_power(request.json)
     if not res:
         return jsonify(success=False, msg="更新角色失败")
     return jsonify(success=True, msg="更新角色成功")

applications/views/admin/role.py

@@ -2,7 +2,7 @@ from flask import Blueprint, render_template, request, jsonify
 from flask_login import login_required
 
 from applications.service.admin.role import get_role_data_dict, add_role, get_role_power, update_role_power, \
-    get_role_by_id, update_role
+    get_role_by_id, update_role, remove_role
 
 admin_role = Blueprint('adminRole', __name__, url_prefix='/admin/role')
 
@@ -98,6 +98,14 @@ def update():
         return jsonify(success=False, msg="更新角色失败")
     return jsonify(success=True, msg="更新角色成功")
 
+
+@admin_role.route('/remove/<int:id>', methods=['DELETE'])
+def remove(id):
+    res = remove_role(id)
+    if not res:
+        return jsonify(success=False, msg="角色删除失败")
+    return jsonify(success=True, msg="角色删除成功")
+
 # 批量删除
 # @admin_user.route('/batchRemove', methods=['GET', 'POST'])
 # @login_required