Update: （步骤备份）更新 Pear Admin 框架版本与 Pear Admin Layui 一致，尝试重写页面

applications/view/system/passport.py

@@ -84,5 +84,8 @@ def login_post():
 @login_required
 def logout():
     logout_user()
-    session.pop('permissions')
+
+    if 'permissions' in session:
+        session.pop('permissions')
+
     return success_api(msg="注销成功")

applications/view/system/rights.py

@@ -43,6 +43,8 @@ def configs():
         "keepState": True,
         # 是否开启 Tab 记忆
         "session": True,
+        # 预加载
+        "preload": False,
         # 最大可打开的选项卡数量
         "max": 30,
         "index": {
@@ -117,11 +119,13 @@ def menu():
                 # 当前节点添加子节点
                 _dict['children'] = copy.deepcopy(menu_dict[_dict['id']])
                 _dict['children'].sort(key=lambda item: item['sort'])
+                # 为每个子菜单添加 "openType": "_component"
+                for child in _dict['children']:
+                    child['openType'] = '_component'
                 # 删除子节点
                 del menu_dict[_dict['id']]
 
             if _dict['parent_id'] not in menu_dict:
-
                 menu_dict[_dict['parent_id']] = [_dict]
             else:
                 menu_dict[_dict['parent_id']].append(_dict)
@@ -138,6 +142,9 @@ def menu():
                 # 当前节点添加子节点
                 _dict['children'] = copy.deepcopy(menu_dict[_dict['id']])
                 _dict['children'].sort(key=lambda item: item['sort'])
+                # 为每个子菜单添加 "openType": "_component"
+                for child in _dict['children']:
+                    child['openType'] = '_component'
                 # 删除子节点
                 del menu_dict[_dict['id']]
 
@@ -151,4 +158,4 @@ def menu():
 @bp.get('/welcome')
 @login_required
 def welcome():
-    return render_template('system/console/console.html')
+    return render_template('system/analysis/main.html')

applications/view/system/user.py

@@ -57,9 +57,7 @@ def data():
         } for user, dept in query.items],
         count=query.total)
 
-    # 用户增加
-
-
+# 用户增加
 @bp.get('/add')
 @authorize("system:user:add", log=True)
 def add():
@@ -75,6 +73,7 @@ def save():
     username = str_escape(req_json.get('username'))
     real_name = str_escape(req_json.get('realName'))
     password = str_escape(req_json.get('password'))
+    dept_id = str_escape(req_json.get('deptId'))
     role_ids = a.split(',')
 
     if not username or not real_name or not password:
@@ -82,12 +81,14 @@ def save():
 
     if bool(User.query.filter_by(username=username).count()):
         return fail_api(msg="用户已经存在")
-    user = User(username=username, realname=real_name,enable=1)
+
+    user = User(username=username, realname=real_name, enable=1, dept_id=dept_id)
     user.set_password(password)
     db.session.add(user)
     roles = Role.query.filter(Role.id.in_(role_ids)).all()
     for r in roles:
         user.role.append(r)
+
     db.session.commit()
     return success_api(msg="增加成功")
 
@@ -196,7 +197,7 @@ def edit_password_put():
     if res_json.get("newPassword") == '':
         return fail_api("新密码不得为空")
     if res_json.get("newPassword") != res_json.get("confirmPassword"):
-        return fail_api("俩次密码不一样")
+        return fail_api("两次密码不一样")
     user = current_user
     is_right = user.validate_password(res_json.get("oldPassword"))
     if not is_right: