修复用户管理部门树显示，回退sqlalchemy引用，修复头像修改

applications/extensions/init_sqlalchemy.py

@@ -2,8 +2,7 @@ import datetime
 import os
 
 from flask import Flask, request
-from flask_sqlalchemy import SQLAlchemy
+from flask_sqlalchemy import SQLAlchemy, BaseQuery
-from flask_sqlalchemy.query import Query as BaseQuery
 from flask_marshmallow import Marshmallow
 from marshmallow import fields
 from marshmallow.validate import (

templates/system/user/edit.html

@@ -71,48 +71,48 @@
 </form>
 {% include 'system/common/footer.html' %}
 <script>
-  layui.use(['form', 'jquery', 'dtree'], function () {
+    layui.use(['form', 'jquery', 'dtree'], function () {
-    let form = layui.form
+        let form = layui.form
-    let $ = layui.jquery
+        let $ = layui.jquery
-    let dtree = layui.dtree
+        let dtree = layui.dtree
 
-    dtree.renderSelect({
+        dtree.renderSelect({
-      elem: '#selectParent',
+            elem: '#selectParent',
-      url: '/system/dept/tree',
+            url: '/system/dept/tree',
-      method: 'get',
+            method: 'get',
-      selectInputName: { nodeId: 'deptId', context: 'deptName' },
+            selectInputName: {nodeId: 'deptId', context: 'deptName'},
-      skin: 'layui',
+            skin: 'layui',
-      dataFormat: 'list',
+            dataFormat: 'list',
-      response: { treeId: 'deptId', parentId: 'parentId', title: 'deptName' },
+            response: {treeId: 'id', parentId: 'parent_id', title: 'dept_name'},
-      selectInitVal: "{{ user.dept_id }}"
+            selectInitVal: "{{ user.dept_id }}"
-    })
+        })
-    form.on('submit(user-update)', function (data) {
+        form.on('submit(user-update)', function (data) {
-      let roleIds = ''
+            let roleIds = ''
-      $('input[type=checkbox]:checked').each(function () {
+            $('input[type=checkbox]:checked').each(function () {
-        roleIds += $(this).val() + ','
+                roleIds += $(this).val() + ','
-      })
-      roleIds = roleIds.substr(0, roleIds.length - 1)
-      data.field.roleIds = roleIds
-      $.ajax({
-        url: '/system/user/update',
-        data: JSON.stringify(data.field),
-        dataType: 'json',
-        contentType: 'application/json',
-        type: 'put',
-        success: function (result) {
-          if (result.success) {
-            layer.msg(result.msg, { icon: 1, time: 1000 }, function () {
-              parent.layer.close(parent.layer.getFrameIndex(window.name))//关闭当前页
-              parent.layui.table.reload('user-table')
             })
-          } else {
+            roleIds = roleIds.substr(0, roleIds.length - 1)
-            layer.msg(result.msg, { icon: 2, time: 1000 })
+            data.field.roleIds = roleIds
-          }
+            $.ajax({
-        }
+                url: '/system/user/update',
-      })
+                data: JSON.stringify(data.field),
-      return false
+                dataType: 'json',
+                contentType: 'application/json',
+                type: 'put',
+                success: function (result) {
+                    if (result.success) {
+                        layer.msg(result.msg, {icon: 1, time: 1000}, function () {
+                            parent.layer.close(parent.layer.getFrameIndex(window.name))//关闭当前页
+                            parent.layui.table.reload('user-table')
+                        })
+                    } else {
+                        layer.msg(result.msg, {icon: 2, time: 1000})
+                    }
+                }
+            })
+            return false
+        })
     })
-  })
 </script>
 </body>
 </html>

templates/system/user/profile.html

@@ -65,7 +65,7 @@
         formData.append('fileToken', timeStamp)
         $.ajax({
           method: 'post',
-          url: '/admin/file/upload', //用于文件上传的服务器端请求地址
+          url: '/system/file/upload', //用于文件上传的服务器端请求地址
           data: formData,
           processData: false,
           contentType: false,