From 2683e1214c51f49db3aa525e569c501156084c09 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E4=B8=8D=E8=83=9C=E8=88=9F?= <1650473152@com>
Date: Tue, 14 Nov 2023 19:44:38 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E7=94=A8=E6=88=B7=E7=AE=A1?=
 =?UTF-8?q?=E7=90=86=E9=83=A8=E9=97=A8=E6=A0=91=E6=98=BE=E7=A4=BA=EF=BC=8C?=
 =?UTF-8?q?=E5=9B=9E=E9=80=80sqlalchemy=E5=BC=95=E7=94=A8=EF=BC=8C?=
 =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E5=A4=B4=E5=83=8F=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 applications/extensions/init_sqlalchemy.py |  3 +-
 templates/system/user/edit.html            | 78 +++++++++++-----------
 templates/system/user/profile.html         |  2 +-
 3 files changed, 41 insertions(+), 42 deletions(-)

diff --git a/applications/extensions/init_sqlalchemy.py b/applications/extensions/init_sqlalchemy.py
index d128c22..c0aff14 100644
--- a/applications/extensions/init_sqlalchemy.py
+++ b/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.query import Query as BaseQuery
+from flask_sqlalchemy import SQLAlchemy, BaseQuery
 from flask_marshmallow import Marshmallow
 from marshmallow import fields
 from marshmallow.validate import (
diff --git a/templates/system/user/edit.html b/templates/system/user/edit.html
index 32f8542..8fbea3a 100644
--- a/templates/system/user/edit.html
+++ b/templates/system/user/edit.html
@@ -71,48 +71,48 @@
 </form>
 {% include 'system/common/footer.html' %}
 <script>
-  layui.use(['form', 'jquery', 'dtree'], function () {
-    let form = layui.form
-    let $ = layui.jquery
-    let dtree = layui.dtree
+    layui.use(['form', 'jquery', 'dtree'], function () {
+        let form = layui.form
+        let $ = layui.jquery
+        let dtree = layui.dtree
 
-    dtree.renderSelect({
-      elem: '#selectParent',
-      url: '/system/dept/tree',
-      method: 'get',
-      selectInputName: { nodeId: 'deptId', context: 'deptName' },
-      skin: 'layui',
-      dataFormat: 'list',
-      response: { treeId: 'deptId', parentId: 'parentId', title: 'deptName' },
-      selectInitVal: "{{ user.dept_id }}"
-    })
-    form.on('submit(user-update)', function (data) {
-      let roleIds = ''
-      $('input[type=checkbox]:checked').each(function () {
-        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')
+        dtree.renderSelect({
+            elem: '#selectParent',
+            url: '/system/dept/tree',
+            method: 'get',
+            selectInputName: {nodeId: 'deptId', context: 'deptName'},
+            skin: 'layui',
+            dataFormat: 'list',
+            response: {treeId: 'id', parentId: 'parent_id', title: 'dept_name'},
+            selectInitVal: "{{ user.dept_id }}"
+        })
+        form.on('submit(user-update)', function (data) {
+            let roleIds = ''
+            $('input[type=checkbox]:checked').each(function () {
+                roleIds += $(this).val() + ','
             })
-          } else {
-            layer.msg(result.msg, { icon: 2, time: 1000 })
-          }
-        }
-      })
-      return false
+            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 {
+                        layer.msg(result.msg, {icon: 2, time: 1000})
+                    }
+                }
+            })
+            return false
+        })
     })
-  })
 </script>
 </body>
 </html>
\ No newline at end of file
diff --git a/templates/system/user/profile.html b/templates/system/user/profile.html
index 62550bf..9480420 100644
--- a/templates/system/user/profile.html
+++ b/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,