diff --git a/applications/models/__init__.py b/applications/models/__init__.py index 8a2d422..bf969f3 100644 --- a/applications/models/__init__.py +++ b/applications/models/__init__.py @@ -1,5 +1,4 @@ -from applications.models.company import Dept, DeptSchema, User, UserSchema -from .dict_models import DictType, DictData, DictTypeSchema, DictDataSchema +from applications.models.company import Dept, DeptSchema, User from .log import AdminLog, LogSchema from applications.models.file.photo import Photo, PhotoSchema from applications.models.rights.power import Power, PowerSchema diff --git a/applications/models/company/__init__.py b/applications/models/company/__init__.py index 57d4357..8174058 100644 --- a/applications/models/company/__init__.py +++ b/applications/models/company/__init__.py @@ -1,2 +1,2 @@ from .dept import Dept, DeptSchema -from .users import User, UserSchema +from .users import User diff --git a/applications/models/company/users.py b/applications/models/company/users.py index 62c7635..9c34587 100644 --- a/applications/models/company/users.py +++ b/applications/models/company/users.py @@ -27,20 +27,3 @@ class User(db.Model, UserMixin): def validate_password(self, password): return check_password_hash(self.password_hash, password) - -# 用户models的序列化类 -class UserSchema(ma.Schema): - id = fields.Integer() - username = fields.Str() - realname = fields.Str() - enable = fields.Integer() - create_at = fields.DateTime() - update_at = fields.DateTime() - dept = fields.Method("get_dept") - - def get_dept(self, obj): - from applications.models import Dept - if obj.dept_id != None: - return Dept.query.filter_by(id=obj.dept_id).first().dept_name - else: - return None diff --git a/applications/models/dict_models.py b/applications/models/dict_models.py deleted file mode 100644 index 29da3c0..0000000 --- a/applications/models/dict_models.py +++ /dev/null @@ -1,47 +0,0 @@ -import datetime - -from applications.extensions import db, ma -from marshmallow import fields - - -class DictType(db.Model): - __tablename__ = 'admin_dict_type' - id = db.Column(db.Integer, primary_key=True) - type_name = db.Column(db.String(255), comment='字典类型名称') - type_code = db.Column(db.String(255), comment='字典类型标识') - description = db.Column(db.String(255), comment='字典类型描述') - enable = db.Column(db.Integer, comment='是否开启') - create_time = db.Column(db.DateTime, default=datetime.datetime.now, comment='创建时间') - update_time = db.Column(db.DateTime, default=datetime.datetime.now, onupdate=datetime.datetime.now, comment='更新时间') - - -class DictData(db.Model): - __tablename__ = 'admin_dict_data' - id = db.Column(db.Integer, primary_key=True) - data_label = db.Column(db.String(255), comment='字典类型名称') - data_value = db.Column(db.String(255), comment='字典类型标识') - type_code = db.Column(db.String(255), comment='字典类型描述') - is_default = db.Column(db.Integer, comment='是否默认') - enable = db.Column(db.Integer, comment='是否开启') - remark = db.Column(db.String(255), comment='备注') - create_time = db.Column(db.DateTime, default=datetime.datetime.now, comment='创建时间') - update_time = db.Column(db.DateTime, default=datetime.datetime.now, onupdate=datetime.datetime.now, comment='更新时间') - - -class DictTypeSchema(ma.Schema): # 序列化类 - id = fields.Str(attribute="id") - typeName = fields.Str(attribute="type_name") - typeCode = fields.Str(attribute="type_code") - description = fields.Str(attribute="description") - createTime = fields.Str(attribute="create_time") - updateName = fields.Str(attribute="update_time") - remark = fields.Str() - enable = fields.Str() - - -class DictDataSchema(ma.Schema): # 序列化类 - dataId = fields.Str(attribute="id") - dataLabel = fields.Str(attribute="data_label") - dataValue = fields.Str(attribute="data_value") - remark = fields.Str() - enable = fields.Str() diff --git a/applications/templates/admin/monitor.html b/applications/templates/admin/monitor.html deleted file mode 100644 index 29dd4dc..0000000 --- a/applications/templates/admin/monitor.html +++ /dev/null @@ -1,408 +0,0 @@ - - - - 首页 - {% include 'admin/common/header.html' %} - - - -
-
-
-
-
-
- 主机信息 -
-
-
-
-
-
核心数
-
{{ cpu_count }}
-
-
-
-
-
空闲率
-
-
-
-
-
-
等待率
-
-
-
-
-
-
使用率
-
{{ cpus_percent }}%
-
-
-
-
-
-
-
-
-
- 内存监控 -
-
-
-
-
-
空闲内存
-
{{ memory_free }}M
-
-
-
-
-
最大内存
-
{{ memory_total }}M
-
-
-
-
-
已用内存
-
{{ memory_used }}M
-
-
-
-
-
内存使用
-
{{ memory_usage }}%
-
-
-
-
-
-
-
-
-
主机监控
-
-
-
-
-
-
-
-
-
-
-
-
磁盘信息
-
-
    - {% for i in disk_partitions_list %} -
  • -

    {{ i.device }}

    -

    {{ i.fstype }}

    - 磁盘大小 {{ i.total }}M   - 空闲大小 {{ i.free }}M   -
    -
    - 已经使用 {{ i.used }}M   - 使用概率 {{ i.percent }}% -
    - 详情 -
    • - {% endfor %} -
-
-
-
-
主机信息
-
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
属性值
名称{{ hostname }}
系统{{ system_version }}
开机时间{{ boot_time }}
运行时长{{ up_time_format }}
python版本{{ python_version }}
-
-
-
-
-{% include 'admin/common/footer.html' %} - - - \ No newline at end of file diff --git a/applications/templates/admin/role/add.html b/applications/templates/admin/role/add.html index 0dfb365..2e64121 100644 --- a/applications/templates/admin/role/add.html +++ b/applications/templates/admin/role/add.html @@ -66,7 +66,7 @@ form.on('submit(role-save)', function (data) { $.ajax({ - url: '/admin/role/save', + url: '/admin/role/add', data: JSON.stringify(data.field), dataType: 'json', contentType: 'application/json', diff --git a/applications/templates/admin/role/edit.html b/applications/templates/admin/role/edit.html index ff29109..2ed6a41 100644 --- a/applications/templates/admin/role/edit.html +++ b/applications/templates/admin/role/edit.html @@ -32,9 +32,9 @@
- -
@@ -78,7 +78,7 @@ form.on('submit(role-update)', function (data) { $.ajax({ - url: '/admin/role/update', + url: '/admin/role/edit/' + data.field.roleId, data: JSON.stringify(data.field), dataType: 'json', contentType: 'application/json', @@ -96,6 +96,7 @@ }) return false }) + }) })