3 Commits

Author SHA1 Message Date
cnbugs 96023431fc feat: 新增超级管理员重置用户密码功能
- 用户列表页 /users/:支持按用户名/姓名/邮箱搜索、按状态筛选、分页
- 重置密码页 /users/<id>/password/:仅超级管理员可访问
- 复用 Django 密码校验器(一致性、长度、相似度、常见/纯数字密码)
- 管理员重置自身密码时保持登录会话不失效
- settings 补充 AUTH_PASSWORD_VALIDATORS 配置
2026-10-15 18:59:34 +08:00
cnbugs a07b390995 fix: 修复资产编辑无法保存的bug
- 恢复Asset模型STATUS_CHOICES定义,状态字段使用下拉选择而非文本输入
- 修复status默认值从中文'在用'改为英文key'in_use',与数据库存储一致
- 编辑表单新增资产面值(asset_value)字段
- excel_utils适配字段类型变更(DecimalField→CharField, DateField→CharField等)
2026-05-26 16:48:01 +08:00
cnbugs 2eac2d867e fix: 修复导入ID重复覆盖逻辑、Excel列顺序对齐及UI优化 2026-04-29 13:48:29 +08:00
13 changed files with 484 additions and 139 deletions
+21 -5
View File
@@ -9,8 +9,9 @@
- **分类管理** — 自定义设备分类(服务器、网络设备、存储设备等) - **分类管理** — 自定义设备分类(服务器、网络设备、存储设备等)
- **变更追踪** — 资产信息修改自动记录变更历史 - **变更追踪** — 资产信息修改自动记录变更历史
- **Excel 导入导出** — 批量导入(分类不存在自动创建)、筛选导出、模板下载 - **Excel 导入导出** — 批量导入(分类不存在自动创建)、筛选导出、模板下载
- **多维度搜索** — 按编号/名称/部门/使用人/位置搜索,按分类/状态/位置筛选 - **多维度搜索** — 按编号/名称/部门/维护人/位置搜索,按分类/状态/位置筛选
- **质保提醒** — 已过保/即将过保状态标识 - **质保提醒** — 已过保/即将过保状态标识
- **用户管理** — 超级管理员可查看用户列表、搜索筛选、为任意用户重置密码(密码强度校验,重置自身不掉登录)
- **用户认证** — 登录/退出,管理员权限控制 - **用户认证** — 登录/退出,管理员权限控制
- **深色主题** — 护眼深色 UI,适合长时间使用 - **深色主题** — 护眼深色 UI,适合长时间使用
@@ -40,7 +41,7 @@
| 设备位置 | 机房/机柜/U位 | | 设备位置 | 机房/机柜/U位 |
| 负责人 | 设备负责人 | | 负责人 | 设备负责人 |
| 使用部门 | 使用部门 | | 使用部门 | 使用部门 |
| 使用人 | 实际使用人 | | 维护人 | 实际使用人 |
| 采购日期 | 采购时间 | | 采购日期 | 采购时间 |
| 质保到期 | 质保截止日期 | | 质保到期 | 质保截止日期 |
| 备注 | 补充说明 | | 备注 | 补充说明 |
@@ -120,9 +121,19 @@ DATABASES = {
| DJANGO_DEBUG | False | 调试模式 | | DJANGO_DEBUG | False | 调试模式 |
| DJANGO_SECRET_KEY | your-secret-key... | Django 密钥 | | DJANGO_SECRET_KEY | your-secret-key... | Django 密钥 |
## 👥 用户管理
- 超级管理员登录后,导航栏可见 **用户管理** 入口(路径 `/users/`)
- 支持按用户名 / 姓名 / 邮箱搜索,按账号状态(正常/已禁用)筛选
- 点击"重置密码"可为任意用户设置新密码:
- 两次密码必须一致
- 应用 Django 密码强度校验(最少 8 位、不能与用户信息过于相似、不能是常见/纯数字密码)
- 管理员重置自己的密码后当前登录不会失效
- 该功能仅 **超级管理员(is_superuser)** 可访问,其他用户访问会被拒绝
## 📊 Excel 导入格式 ## 📊 Excel 导入格式
| 资产编号 | 设备名称 | 分类 | 品牌 | 型号 | 资产面值 | 序列号 | 状态 | IP地址 | BMC地址 | 设备位置 | 负责人 | 使用部门 | 使用人 | 采购日期 | 质保到期 | 备注 | | 资产编号 | 设备名称 | 分类 | 品牌 | 型号 | 资产面值 | 序列号 | 状态 | IP地址 | BMC地址 | 设备位置 | 负责人 | 使用部门 | 维护人 | 采购日期 | 质保到期 | 备注 |
|----------|---------|------|------|------|---------|--------|------|--------|---------|---------|--------|---------|--------|---------|---------|------| |----------|---------|------|------|------|---------|--------|------|--------|---------|---------|--------|---------|--------|---------|---------|------|
- 分类不存在时自动创建 - 分类不存在时自动创建
@@ -137,7 +148,7 @@ asset-management/
├── assetapp/ # 主应用 ├── assetapp/ # 主应用
│ ├── models.py # 数据模型 │ ├── models.py # 数据模型
│ ├── views.py # 视图逻辑 │ ├── views.py # 视图逻辑
│ ├── forms.py # 表单定义 │ ├── forms.py # 表单定义(含管理员重置密码表单)
│ ├── excel_utils.py # Excel 导入导出工具 │ ├── excel_utils.py # Excel 导入导出工具
│ ├── urls.py # URL 路由 │ ├── urls.py # URL 路由
│ ├── management/commands/ # 管理命令 │ ├── management/commands/ # 管理命令
@@ -147,7 +158,7 @@ asset-management/
│ ├── settings.py │ ├── settings.py
│ ├── urls.py │ ├── urls.py
│ └── wsgi.py │ └── wsgi.py
├── templates/assetapp/ # HTML 模板 ├── templates/assetapp/ # HTML 模板(含 user_list / user_password_reset)
├── static/css/ # 静态资源 ├── static/css/ # 静态资源
├── docker-compose.yml # Docker 编排 ├── docker-compose.yml # Docker 编排
├── Dockerfile # 容器构建 ├── Dockerfile # 容器构建
@@ -158,6 +169,11 @@ asset-management/
## 📝 版本历史 ## 📝 版本历史
### v1.1.0
- 新增用户管理:超级管理员可查看用户列表、搜索筛选、重置任意用户密码
- 补充密码强度校验配置
### v1.0.0 ### v1.0.0
- 资产增删改查 - 资产增删改查
+66 -68
View File
@@ -6,9 +6,12 @@ from django.utils import timezone
from .models import Category from .models import Category
# Excel列定义 # Excel列定义(顺序与资产列表一致)
EXPORT_COLUMNS = [ EXPORT_COLUMNS = [
('id', 'ID', 8), ('id', 'ID', 8),
('location', '机房', 20),
('cabinet', '机柜', 10),
('cabinet_position', '机柜位置', 10),
('asset_number', '资产编号', 18), ('asset_number', '资产编号', 18),
('name', '设备名称', 20), ('name', '设备名称', 20),
('category', '设备分类', 12), ('category', '设备分类', 12),
@@ -16,21 +19,18 @@ EXPORT_COLUMNS = [
('model', '型号', 20), ('model', '型号', 20),
('asset_value', '资产面值', 12), ('asset_value', '资产面值', 12),
('serial_number', '序列号', 25), ('serial_number', '序列号', 25),
('location', '机房', 20),
('cabinet', '机柜', 10),
('cabinet_position', '机柜位置', 10),
('bmc_address', 'BMC地址', 16), ('bmc_address', 'BMC地址', 16),
('ip_address', 'IP地址', 16), ('ip_address', 'IP地址', 16),
('gpu_type', '显卡类型', 15), ('gpu_type', '显卡类型', 15),
('gpu_count', '卡数', 6), ('gpu_count', '卡数', 6),
('responsible_person', '负责人', 10),
('department', '使用部门', 15),
('user', '维护人', 10),
('business_type', '业务类型', 15),
('status', '状态', 8),
('purchase_date', '采购日期', 12), ('purchase_date', '采购日期', 12),
('warranty_expire', '质保到期', 12), ('warranty_expire', '质保到期', 12),
('supplier', '供应商', 15), ('supplier', '供应商', 15),
('responsible_person', '负责人', 10),
('department', '使用部门', 15),
('user', '使用人', 10),
('business_type', '业务类型', 15),
('status', '状态', 8),
('remark', '备注', 30), ('remark', '备注', 30),
] ]
@@ -106,12 +106,13 @@ def generate_import_template():
cell.border = THIN_BORDER cell.border = THIN_BORDER
ws.column_dimensions[get_column_letter(col_idx)].width = width ws.column_dimensions[get_column_letter(col_idx)].width = width
# 示例数据行 # 示例数据行(顺序与EXPORT_COLUMNS一致)
example_data = [ example_data = [
'1', 'IT-2024-0001', '测试服务器', '服务器', 'Dell', 'PowerEdge R740', '1', '3楼机房A区', 'A01', 'U10-U15', 'IT-2024-0001', '测试服务器',
'50000.00', 'ABC123456', '3楼机房A区', 'A01', 'U10-U15', '192.168.1.200', '服务器', 'Dell', 'PowerEdge R740', '50000.00', 'ABC123456',
'192.168.1.100', 'NVIDIA A100', '8', '2024-01-15', '2027-01-15', '戴尔科技', '192.168.1.200', '192.168.1.100', 'NVIDIA A100', '8', '张三',
'张三', '研发部', '李四', 'AI训练', '在用', '测试备注' '研发部', '李四', 'AI训练', '在用', '2024-01-15', '2027-01-15',
'戴尔科技', '测试备注'
] ]
for col_idx, value in enumerate(example_data, 1): for col_idx, value in enumerate(example_data, 1):
cell = ws.cell(row=2, column=col_idx, value=value) cell = ws.cell(row=2, column=col_idx, value=value)
@@ -172,41 +173,26 @@ def import_assets_from_excel(ws, category_map, operator=None):
# 处理状态 # 处理状态
status = STATUS_MAP_REVERSE.get(data.get('status', '在用'), 'in_use') status = STATUS_MAP_REVERSE.get(data.get('status', '在用'), 'in_use')
# 处理日期 # 处理日期 - 直接存字符串
from datetime import datetime as dt purchase_date = data.get('purchase_date', '').strip() or ''
purchase_date = None warranty_expire = data.get('warranty_expire', '').strip() or ''
warranty_expire = None
if data.get('purchase_date'):
try:
purchase_date = dt.strptime(data['purchase_date'], '%Y-%m-%d').date()
except ValueError:
pass
if data.get('warranty_expire'):
try:
warranty_expire = dt.strptime(data['warranty_expire'], '%Y-%m-%d').date()
except ValueError:
pass
# 处理IP # 处理IP
bmc_address = data.get('bmc_address') or None bmc_address = data.get('bmc_address', '').strip() or ''
ip_address = data.get('ip_address') or None ip_address = data.get('ip_address', '').strip() or ''
# 处理资产面值 # 资产面值 - 直接存字符串
from decimal import Decimal, InvalidOperation asset_value = data.get('asset_value', '').strip() or ''
asset_value = None
if data.get('asset_value'):
try:
asset_value = Decimal(str(data['asset_value']).replace(',', ''))
except (InvalidOperation, ValueError):
pass
# 处理ID - 如果提供了ID且已存在,则更新该记录 # 处理ID - 如果提供了ID且已存在,则更新该记录
import_id = data.get('id', '').strip() import_id = data.get('id', '').strip()
asset = None asset = None
is_update = False is_update = False
if import_id: if import_id and import_id.isdigit():
try: try:
asset = Asset.objects.get(id=int(import_id)) id_val = int(import_id) if str(import_id).strip().isdigit() else None
if id_val:
asset = Asset.objects.get(id=id_val)
is_update = True is_update = True
except (Asset.DoesNotExist, ValueError): except (Asset.DoesNotExist, ValueError):
asset = None asset = None
@@ -227,7 +213,7 @@ def import_assets_from_excel(ws, category_map, operator=None):
asset.ip_address = ip_address asset.ip_address = ip_address
asset.gpu_type = data.get('gpu_type', '') asset.gpu_type = data.get('gpu_type', '')
gpu_count_str = data.get('gpu_count', '').strip() gpu_count_str = data.get('gpu_count', '').strip()
asset.gpu_count = int(gpu_count_str) if gpu_count_str else None asset.gpu_count = gpu_count_str if gpu_count_str else ''
asset.purchase_date = purchase_date asset.purchase_date = purchase_date
asset.warranty_expire = warranty_expire asset.warranty_expire = warranty_expire
asset.supplier = data.get('supplier', '') asset.supplier = data.get('supplier', '')
@@ -249,33 +235,45 @@ def import_assets_from_excel(ws, category_map, operator=None):
else: else:
# 创建新记录 # 创建新记录
gpu_count_str = data.get('gpu_count', '').strip() gpu_count_str = data.get('gpu_count', '').strip()
gpu_count = int(gpu_count_str) if gpu_count_str else None gpu_count = gpu_count_str if gpu_count_str else ''
asset = Asset.objects.create(
asset_number=asset_number, # 创建参数
name=data.get('name', ''), create_kwargs = {
category=category, 'asset_number': asset_number,
brand=data.get('brand', ''), 'name': data.get('name', ''),
model=data.get('model', ''), 'category': category,
asset_value=asset_value, 'brand': data.get('brand', ''),
serial_number=data.get('serial_number', ''), 'model': data.get('model', ''),
location=data.get('location', ''), 'asset_value': asset_value,
cabinet=data.get('cabinet', ''), 'serial_number': data.get('serial_number', ''),
cabinet_position=data.get('cabinet_position', ''), 'location': data.get('location', ''),
bmc_address=bmc_address, 'cabinet': data.get('cabinet', ''),
ip_address=ip_address, 'cabinet_position': data.get('cabinet_position', ''),
gpu_type=data.get('gpu_type', ''), 'bmc_address': bmc_address,
gpu_count=gpu_count, 'ip_address': ip_address,
purchase_date=purchase_date, 'gpu_type': data.get('gpu_type', ''),
warranty_expire=warranty_expire, 'gpu_count': gpu_count,
supplier=data.get('supplier', ''), 'purchase_date': purchase_date,
responsible_person=data.get('responsible_person', ''), 'warranty_expire': warranty_expire,
department=data.get('department', ''), 'supplier': data.get('supplier', ''),
user=data.get('user', ''), 'responsible_person': data.get('responsible_person', ''),
business_type=data.get('business_type', ''), 'department': data.get('department', ''),
status=status, 'user': data.get('user', ''),
remark=data.get('remark', ''), 'business_type': data.get('business_type', ''),
created_by=operator, 'status': status,
) 'remark': data.get('remark', ''),
'created_by': operator,
}
# 如果Excel提供了ID,使用该ID创建
if import_id and import_id.isdigit():
try:
if str(import_id).strip().isdigit():
create_kwargs['id'] = int(import_id)
except ValueError:
pass
asset = Asset.objects.create(**create_kwargs)
AssetChangeLog.objects.create( AssetChangeLog.objects.create(
asset=asset, asset=asset,
+37
View File
@@ -1,4 +1,5 @@
from django import forms from django import forms
from django.contrib.auth.password_validation import password_validators_help_text_html, validate_password
from .models import Asset, Category from .models import Asset, Category
@@ -33,3 +34,39 @@ class CategoryForm(forms.ModelForm):
class Meta: class Meta:
model = Category model = Category
fields = ['name', 'description'] fields = ['name', 'description']
class AdminPasswordResetForm(forms.Form):
"""管理员重置指定用户密码的表单"""
new_password1 = forms.CharField(
label='新密码',
widget=forms.PasswordInput(attrs={'class': 'form-control', 'autocomplete': 'new-password'}),
help_text=password_validators_help_text_html(),
)
new_password2 = forms.CharField(
label='确认新密码',
widget=forms.PasswordInput(attrs={'class': 'form-control', 'autocomplete': 'new-password'}),
)
def __init__(self, *args, target_user=None, **kwargs):
self.target_user = target_user
super().__init__(*args, **kwargs)
def clean(self):
cleaned_data = super().clean()
password1 = cleaned_data.get('new_password1')
password2 = cleaned_data.get('new_password2')
if password1 and password2 and password1 != password2:
raise forms.ValidationError('两次输入的密码不一致')
if password1 and self.target_user is not None:
validate_password(password1, self.target_user)
return cleaned_data
def save(self):
self.target_user.set_password(self.cleaned_data['new_password1'])
self.target_user.save(update_fields=['password'])
return self.target_user
+49 -40
View File
@@ -21,6 +21,41 @@ class Category(models.Model):
class Asset(models.Model): class Asset(models.Model):
"""硬件资产""" """硬件资产"""
# 基本信息
asset_number = models.CharField('资产编号', max_length=50, db_index=True)
name = models.CharField('设备名称', max_length=100)
category = models.ForeignKey(Category, on_delete=models.PROTECT, verbose_name='设备分类', related_name='assets')
# 硬件信息
brand = models.CharField('品牌', max_length=200, blank=True, default='')
model = models.CharField('型号', max_length=200, blank=True, default='')
asset_value = models.CharField('资产面值', max_length=50, blank=True, default='')
serial_number = models.CharField('序列号', max_length=200, blank=True, default='', db_index=True)
# 位置信息
location = models.CharField('机房', max_length=200, blank=True, default='', help_text='楼层/房间/区域')
cabinet = models.CharField('机柜', max_length=200, blank=True, default='')
cabinet_position = models.CharField('机柜位置', max_length=200, blank=True, default='', help_text='U位')
# 网络信息
bmc_address = models.CharField('BMC地址', max_length=200, blank=True, default='')
ip_address = models.CharField('IP地址', max_length=200, blank=True, default='')
# 显卡信息
has_gpu = models.CharField('是否带卡', max_length=50, blank=True, default='')
gpu_type = models.CharField('显卡类型', max_length=200, blank=True, default='')
gpu_count = models.CharField('卡数', max_length=50, blank=True, default='')
# 采购与质保
purchase_date = models.CharField('采购日期', max_length=50, blank=True, default='')
warranty_expire = models.CharField('质保到期', max_length=50, blank=True, default='')
supplier = models.CharField('供应商', max_length=200, blank=True, default='')
# 管理信息
responsible_person = models.CharField('负责人', max_length=200, blank=True, default='')
department = models.CharField('使用部门', max_length=200, blank=True, default='')
user = models.CharField('维护人', max_length=200, blank=True, default='')
business_type = models.CharField('业务类型', max_length=200, blank=True, default='')
STATUS_CHOICES = [ STATUS_CHOICES = [
('in_use', '在用'), ('in_use', '在用'),
('idle', '闲置'), ('idle', '闲置'),
@@ -28,43 +63,8 @@ class Asset(models.Model):
('scrapped', '已报废'), ('scrapped', '已报废'),
] ]
# 基本信息 status = models.CharField('状态', max_length=50, choices=STATUS_CHOICES, default='in_use')
asset_number = models.CharField('资产编号', max_length=50, db_index=True) remark = models.CharField('备注', max_length=500, blank=True, default='')
name = models.CharField('设备名称', max_length=100)
category = models.ForeignKey(Category, on_delete=models.PROTECT, verbose_name='设备分类', related_name='assets')
# 硬件信息
brand = models.CharField('品牌', max_length=50, blank=True, default='')
model = models.CharField('型号', max_length=100, blank=True, default='')
asset_value = models.DecimalField('资产面值', max_digits=12, decimal_places=2, blank=True, null=True)
serial_number = models.CharField('序列号', max_length=100, blank=True, default='', db_index=True)
# 位置信息
location = models.CharField('机房', max_length=200, blank=True, default='', help_text='楼层/房间/区域')
cabinet = models.CharField('机柜', max_length=50, blank=True, default='')
cabinet_position = models.CharField('机柜位置', max_length=50, blank=True, default='', help_text='U位')
# 网络信息
bmc_address = models.GenericIPAddressField('BMC地址', blank=True, null=True)
ip_address = models.GenericIPAddressField('IP地址', blank=True, null=True)
# 显卡信息
has_gpu = models.CharField('是否带卡', max_length=20, blank=True, default='')
gpu_type = models.CharField('显卡类型', max_length=100, blank=True, default='')
gpu_count = models.IntegerField('卡数', blank=True, null=True)
# 采购与质保
purchase_date = models.DateField('采购日期', blank=True, null=True)
warranty_expire = models.DateField('质保到期', blank=True, null=True)
supplier = models.CharField('供应商', max_length=100, blank=True, default='')
# 管理信息
responsible_person = models.CharField('负责人', max_length=50, blank=True, default='')
department = models.CharField('使用部门', max_length=100, blank=True, default='')
user = models.CharField('使用人', max_length=50, blank=True, default='')
business_type = models.CharField('业务类型', max_length=100, blank=True, default='')
status = models.CharField('状态', max_length=20, choices=STATUS_CHOICES, default='in_use')
remark = models.TextField('备注', blank=True, default='')
# 系统字段 # 系统字段
created_by = models.ForeignKey(User, on_delete=models.SET_NULL, null=True, blank=True, verbose_name='创建人') created_by = models.ForeignKey(User, on_delete=models.SET_NULL, null=True, blank=True, verbose_name='创建人')
@@ -82,14 +82,23 @@ class Asset(models.Model):
@property @property
def is_expired(self): def is_expired(self):
if self.warranty_expire: if self.warranty_expire:
return self.warranty_expire < date.today() try:
from datetime import datetime
expire_date = datetime.strptime(self.warranty_expire, '%Y-%m-%d').date()
return expire_date < date.today()
except (ValueError, TypeError):
return False
return False return False
@property @property
def is_expiring_soon(self): def is_expiring_soon(self):
if self.warranty_expire: if self.warranty_expire:
from datetime import timedelta try:
return date.today() <= self.warranty_expire <= date.today() + timedelta(days=30) from datetime import datetime, timedelta
expire_date = datetime.strptime(self.warranty_expire, '%Y-%m-%d').date()
return date.today() <= expire_date <= date.today() + timedelta(days=30)
except (ValueError, TypeError):
return False
return False return False
+4
View File
@@ -29,4 +29,8 @@ urlpatterns = [
path('categories/create/', views.category_create, name='category_create'), path('categories/create/', views.category_create, name='category_create'),
path('categories/<int:pk>/edit/', views.category_update, name='category_update'), path('categories/<int:pk>/edit/', views.category_update, name='category_update'),
path('categories/<int:pk>/delete/', views.category_delete, name='category_delete'), path('categories/<int:pk>/delete/', views.category_delete, name='category_delete'),
# 用户管理(仅超级管理员)
path('users/', views.user_list, name='user_list'),
path('users/<int:pk>/password/', views.admin_password_reset, name='admin_password_reset'),
] ]
+87 -11
View File
@@ -1,6 +1,7 @@
from django.shortcuts import render, redirect, get_object_or_404 from django.shortcuts import render, redirect, get_object_or_404
from django.contrib.auth.decorators import login_required from django.contrib.auth.decorators import login_required, user_passes_test
from django.contrib.auth import authenticate, login, logout from django.contrib.auth import authenticate, login, logout, update_session_auth_hash
from django.contrib.auth.models import User
from django.contrib import messages from django.contrib import messages
from django.http import HttpResponse, JsonResponse from django.http import HttpResponse, JsonResponse
from django.db.models import Count, Q from django.db.models import Count, Q
@@ -11,7 +12,7 @@ from io import BytesIO
from datetime import date, timedelta from datetime import date, timedelta
from .models import Asset, Category, AssetChangeLog from .models import Asset, Category, AssetChangeLog
from .forms import AssetForm, AssetImportForm, CategoryForm from .forms import AssetForm, AssetImportForm, CategoryForm, AdminPasswordResetForm
from .excel_utils import ( from .excel_utils import (
export_assets_to_excel, generate_import_template, export_assets_to_excel, generate_import_template,
import_assets_from_excel, STATUS_MAP, import_assets_from_excel, STATUS_MAP,
@@ -88,7 +89,7 @@ def dashboard(request):
def asset_list(request): def asset_list(request):
queryset = Asset.objects.select_related('category') queryset = Asset.objects.select_related('category')
# 搜索 # 搜索(模糊搜索所有字段)
search = request.GET.get('search', '').strip() search = request.GET.get('search', '').strip()
if search: if search:
queryset = queryset.filter( queryset = queryset.filter(
@@ -96,12 +97,18 @@ def asset_list(request):
Q(name__icontains=search) | Q(name__icontains=search) |
Q(serial_number__icontains=search) | Q(serial_number__icontains=search) |
Q(ip_address__icontains=search) | Q(ip_address__icontains=search) |
Q(bmc_address__icontains=search) |
Q(brand__icontains=search) | Q(brand__icontains=search) |
Q(model__icontains=search) | Q(model__icontains=search) |
Q(location__icontains=search) | Q(location__icontains=search) |
Q(cabinet__icontains=search) |
Q(cabinet_position__icontains=search) |
Q(responsible_person__icontains=search) | Q(responsible_person__icontains=search) |
Q(department__icontains=search) | Q(department__icontains=search) |
Q(user__icontains=search) Q(user__icontains=search) |
Q(business_type__icontains=search) |
Q(gpu_type__icontains=search) |
Q(gpu_count__icontains=search)
) )
# 筛选 # 筛选
@@ -113,9 +120,13 @@ def asset_list(request):
if status: if status:
queryset = queryset.filter(status=status) queryset = queryset.filter(status=status)
location = request.GET.get('location') cabinet = request.GET.get('cabinet')
if location: if cabinet:
queryset = queryset.filter(location__icontains=location) queryset = queryset.filter(cabinet__icontains=cabinet)
business_type = request.GET.get('business_type')
if business_type:
queryset = queryset.filter(business_type=business_type)
# 排序 # 排序
sort = request.GET.get('sort', 'id') sort = request.GET.get('sort', 'id')
@@ -132,7 +143,16 @@ def asset_list(request):
page_obj = paginator.get_page(page_number) page_obj = paginator.get_page(page_number)
categories = Category.objects.all() categories = Category.objects.all()
locations = Asset.objects.values_list('location', flat=True).exclude(location='').distinct() cabinets = sorted(set(
Asset.objects.values_list('cabinet', flat=True)
.exclude(cabinet='')
.exclude(cabinet=None)
))
business_types = sorted(set(
Asset.objects.values_list('business_type', flat=True)
.exclude(business_type='')
.exclude(business_type=None)
))
context = { context = {
'page_obj': page_obj, 'page_obj': page_obj,
@@ -140,8 +160,10 @@ def asset_list(request):
'categories': categories, 'categories': categories,
'current_category': category_id, 'current_category': category_id,
'current_status': status, 'current_status': status,
'current_location': location, 'current_cabinet': cabinet,
'locations': locations, 'current_business_type': business_type,
'cabinets': cabinets,
'business_types': business_types,
'status_map': STATUS_MAP, 'status_map': STATUS_MAP,
'sort': sort, 'sort': sort,
} }
@@ -416,3 +438,57 @@ def category_delete(request, pk):
return redirect('category_list') return redirect('category_list')
return render(request, 'assetapp/category_confirm_delete.html', {'category': category}) return render(request, 'assetapp/category_confirm_delete.html', {'category': category})
# ─── 用户管理(仅超级管理员) ───────────────────────
superuser_required = user_passes_test(lambda u: u.is_authenticated and u.is_superuser)
@superuser_required
def user_list(request):
users = User.objects.order_by('id')
keyword = request.GET.get('search', '').strip()
if keyword:
users = users.filter(
Q(username__icontains=keyword) |
Q(first_name__icontains=keyword) |
Q(email__icontains=keyword)
)
is_active = request.GET.get('is_active')
if is_active in ('1', '0'):
users = users.filter(is_active=(is_active == '1'))
paginator = Paginator(users, 20)
page_obj = paginator.get_page(request.GET.get('page', 1))
context = {
'page_obj': page_obj,
'search': keyword,
'current_is_active': is_active,
}
return render(request, 'assetapp/user_list.html', context)
@superuser_required
def admin_password_reset(request, pk):
target_user = get_object_or_404(User, pk=pk)
if request.method == 'POST':
form = AdminPasswordResetForm(request.POST, target_user=target_user)
if form.is_valid():
form.save()
# 如果管理员重置的是自己的密码,保持当前登录会话不失效
if request.user.pk == target_user.pk:
update_session_auth_hash(request, target_user)
messages.success(request, f'用户 "{target_user.username}" 的密码已重置')
return redirect('user_list')
else:
form = AdminPasswordResetForm(target_user=target_user)
context = {'form': form, 'target_user': target_user}
return render(request, 'assetapp/user_password_reset.html', context)
+9
View File
@@ -76,6 +76,15 @@ LOGIN_URL = '/login/'
LOGIN_REDIRECT_URL = '/' LOGIN_REDIRECT_URL = '/'
LOGOUT_REDIRECT_URL = '/login/' LOGOUT_REDIRECT_URL = '/login/'
# Password validation
AUTH_PASSWORD_VALIDATORS = [
{'NAME': 'django.contrib.auth.password_validation.UserAttributeSimilarityValidator'},
{'NAME': 'django.contrib.auth.password_validation.MinimumLengthValidator',
'OPTIONS': {'min_length': 8}},
{'NAME': 'django.contrib.auth.password_validation.CommonPasswordValidator'},
{'NAME': 'django.contrib.auth.password_validation.NumericPasswordValidator'},
]
# Static files # Static files
STATIC_URL = '/static/' STATIC_URL = '/static/'
STATICFILES_DIRS = [BASE_DIR / 'static'] STATICFILES_DIRS = [BASE_DIR / 'static']
+1 -1
View File
@@ -61,7 +61,7 @@
<tr><td class="text-muted">卡数</td><td>{{ asset.gpu_count|default:"-" }}</td></tr> <tr><td class="text-muted">卡数</td><td>{{ asset.gpu_count|default:"-" }}</td></tr>
<tr><td class="text-muted">负责人</td><td>{{ asset.responsible_person|default:"-" }}</td></tr> <tr><td class="text-muted">负责人</td><td>{{ asset.responsible_person|default:"-" }}</td></tr>
<tr><td class="text-muted">使用部门</td><td>{{ asset.department|default:"-" }}</td></tr> <tr><td class="text-muted">使用部门</td><td>{{ asset.department|default:"-" }}</td></tr>
<tr><td class="text-muted">使用人</td><td>{{ asset.user|default:"-" }}</td></tr> <tr><td class="text-muted">维护人</td><td>{{ asset.user|default:"-" }}</td></tr>
<tr><td class="text-muted">业务类型</td><td>{{ asset.business_type|default:"-" }}</td></tr> <tr><td class="text-muted">业务类型</td><td>{{ asset.business_type|default:"-" }}</td></tr>
<tr><td class="text-muted">状态</td> <tr><td class="text-muted">状态</td>
<td><span class="badge <td><span class="badge
+6 -2
View File
@@ -37,14 +37,18 @@
{{ form.category }} {{ form.category }}
</div> </div>
<div class="row"> <div class="row">
<div class="col-md-6 mb-3"> <div class="col-md-4 mb-3">
<label class="form-label text-muted">{{ form.brand.label }}</label> <label class="form-label text-muted">{{ form.brand.label }}</label>
{{ form.brand }} {{ form.brand }}
</div> </div>
<div class="col-md-6 mb-3"> <div class="col-md-4 mb-3">
<label class="form-label text-muted">{{ form.model.label }}</label> <label class="form-label text-muted">{{ form.model.label }}</label>
{{ form.model }} {{ form.model }}
</div> </div>
<div class="col-md-4 mb-3">
<label class="form-label text-muted">{{ form.asset_value.label }}</label>
{{ form.asset_value }}
</div>
</div> </div>
<div class="mb-3"> <div class="mb-3">
<label class="form-label text-muted">{{ form.serial_number.label }}</label> <label class="form-label text-muted">{{ form.serial_number.label }}</label>
+21 -12
View File
@@ -22,10 +22,10 @@
<div class="card card-dark mb-3"> <div class="card card-dark mb-3">
<div class="card-body"> <div class="card-body">
<form method="get" class="row g-2 align-items-end"> <form method="get" class="row g-2 align-items-end">
<div class="col-md-4"> <div class="col-md-3">
<label class="form-label text-muted small">搜索</label> <label class="form-label text-muted small">搜索</label>
<input type="text" name="search" class="form-control form-control-sm" <input type="text" name="search" class="form-control form-control-sm"
placeholder="编号/名称/序列号/IP/品牌/型号/位置/负责人/部门/使用人" value="{{ search }}"> placeholder="编号/名称/序列号/IP/BMC/品牌/型号/机柜/负责人/部门/维护人/业务类型..." value="{{ search }}">
</div> </div>
<div class="col-md-2"> <div class="col-md-2">
<label class="form-label text-muted small">分类</label> <label class="form-label text-muted small">分类</label>
@@ -46,16 +46,25 @@
</select> </select>
</div> </div>
<div class="col-md-2"> <div class="col-md-2">
<label class="form-label text-muted small">位置</label> <label class="form-label text-muted small">机柜</label>
<select name="location" class="form-select form-select-sm"> <select name="cabinet" class="form-select form-select-sm">
<option value="">全部位置</option> <option value="">全部机柜</option>
{% for loc in locations %} {% for cab in cabinets %}
<option value="{{ loc }}" {% if current_location == loc %}selected{% endif %}>{{ loc }}</option> <option value="{{ cab }}" {% if current_cabinet == cab %}selected{% endif %}>{{ cab }}</option>
{% endfor %} {% endfor %}
</select> </select>
</div> </div>
<div class="col-md-2"> <div class="col-md-2">
<button type="submit" class="btn btn-primary btn-sm me-1"><i class="bi bi-search"></i> 搜索</button> <label class="form-label text-muted small">业务类型</label>
<select name="business_type" class="form-select form-select-sm">
<option value="">全部业务</option>
{% for bt in business_types %}
<option value="{{ bt }}" {% if current_business_type == bt %}selected{% endif %}>{{ bt }}</option>
{% endfor %}
</select>
</div>
<div class="col-md-1">
<button type="submit" class="btn btn-primary btn-sm me-1"><i class="bi bi-search"></i></button>
<a href="{% url 'asset_list' %}" class="btn btn-outline-secondary btn-sm"><i class="bi bi-arrow-counterclockwise"></i></a> <a href="{% url 'asset_list' %}" class="btn btn-outline-secondary btn-sm"><i class="bi bi-arrow-counterclockwise"></i></a>
</div> </div>
</form> </form>
@@ -84,7 +93,7 @@
<th>卡数</th> <th>卡数</th>
<th style="width:60px">负责人</th> <th style="width:60px">负责人</th>
<th>使用部门</th> <th>使用部门</th>
<th style="width:60px">使用人</th> <th style="width:60px">维护人</th>
<th>业务类型</th> <th>业务类型</th>
<th>状态</th> <th>状态</th>
<th>操作</th> <th>操作</th>
@@ -145,19 +154,19 @@
<nav class="mt-3"> <nav class="mt-3">
<ul class="pagination pagination-sm justify-content-center"> <ul class="pagination pagination-sm justify-content-center">
{% if page_obj.has_previous %} {% if page_obj.has_previous %}
<li class="page-item"><a class="page-link" href="?page={{ page_obj.previous_page_number }}{% if search %}&search={{ search }}{% endif %}{% if current_category %}&category={{ current_category }}{% endif %}{% if current_status %}&status={{ current_status }}{% endif %}{% if current_location %}&location={{ current_location }}{% endif %}"><i class="bi bi-chevron-left"></i></a></li> <li class="page-item"><a class="page-link" href="?page={{ page_obj.previous_page_number }}{% if search %}&search={{ search }}{% endif %}{% if current_category %}&category={{ current_category }}{% endif %}{% if current_status %}&status={{ current_status }}{% endif %}{% if current_cabinet %}&cabinet={{ current_cabinet }}{% endif %}{% if current_business_type %}&business_type={{ current_business_type }}{% endif %}"><i class="bi bi-chevron-left"></i></a></li>
{% endif %} {% endif %}
{% for num in page_obj.paginator.page_range %} {% for num in page_obj.paginator.page_range %}
{% if page_obj.number == num %} {% if page_obj.number == num %}
<li class="page-item active"><span class="page-link">{{ num }}</span></li> <li class="page-item active"><span class="page-link">{{ num }}</span></li>
{% elif num > page_obj.number|add:'-3' and num < page_obj.number|add:'3' %} {% elif num > page_obj.number|add:'-3' and num < page_obj.number|add:'3' %}
<li class="page-item"><a class="page-link" href="?page={{ num }}{% if search %}&search={{ search }}{% endif %}{% if current_category %}&category={{ current_category }}{% endif %}{% if current_status %}&status={{ current_status }}{% endif %}{% if current_location %}&location={{ current_location }}{% endif %}">{{ num }}</a></li> <li class="page-item"><a class="page-link" href="?page={{ num }}{% if search %}&search={{ search }}{% endif %}{% if current_category %}&category={{ current_category }}{% endif %}{% if current_status %}&status={{ current_status }}{% endif %}{% if current_cabinet %}&cabinet={{ current_cabinet }}{% endif %}{% if current_business_type %}&business_type={{ current_business_type }}{% endif %}">{{ num }}</a></li>
{% endif %} {% endif %}
{% endfor %} {% endfor %}
{% if page_obj.has_next %} {% if page_obj.has_next %}
<li class="page-item"><a class="page-link" href="?page={{ page_obj.next_page_number }}{% if search %}&search={{ search }}{% endif %}{% if current_category %}&category={{ current_category }}{% endif %}{% if current_status %}&status={{ current_status }}{% endif %}{% if current_location %}&location={{ current_location }}{% endif %}"><i class="bi bi-chevron-right"></i></a></li> <li class="page-item"><a class="page-link" href="?page={{ page_obj.next_page_number }}{% if search %}&search={{ search }}{% endif %}{% if current_category %}&category={{ current_category }}{% endif %}{% if current_status %}&status={{ current_status }}{% endif %}{% if current_cabinet %}&cabinet={{ current_cabinet }}{% endif %}{% if current_business_type %}&business_type={{ current_business_type }}{% endif %}"><i class="bi bi-chevron-right"></i></a></li>
{% endif %} {% endif %}
</ul> </ul>
</nav> </nav>
+7
View File
@@ -43,6 +43,13 @@
<i class="bi bi-clock-history me-1"></i>变更记录 <i class="bi bi-clock-history me-1"></i>变更记录
</a> </a>
</li> </li>
{% if user.is_superuser %}
<li class="nav-item">
<a class="nav-link {% if request.resolver_match.url_name == 'user_list' %}active{% endif %}" href="{% url 'user_list' %}">
<i class="bi bi-people me-1"></i>用户管理
</a>
</li>
{% endif %}
<li class="nav-item dropdown"> <li class="nav-item dropdown">
<a class="nav-link dropdown-toggle" href="#" role="button" data-bs-toggle="dropdown"> <a class="nav-link dropdown-toggle" href="#" role="button" data-bs-toggle="dropdown">
<i class="bi bi-file-earmark-spreadsheet me-1"></i>导入导出 <i class="bi bi-file-earmark-spreadsheet me-1"></i>导入导出
+113
View File
@@ -0,0 +1,113 @@
{% extends "assetapp/base.html" %}
{% block title %}用户管理{% endblock %}
{% block content %}
<div class="d-flex justify-content-between align-items-center mb-4">
<h4 class="mb-0"><i class="bi bi-people me-2"></i>用户管理</h4>
</div>
<div class="card card-dark mb-3">
<div class="card-body py-3">
<form method="get" class="row g-2 align-items-center">
<div class="col-md-4">
<div class="input-group input-group-sm">
<span class="input-group-text"><i class="bi bi-search"></i></span>
<input type="text" name="search" value="{{ search }}" class="form-control"
placeholder="搜索用户名 / 姓名 / 邮箱">
</div>
</div>
<div class="col-md-3">
<select name="is_active" class="form-select form-select-sm">
<option value="">全部状态</option>
<option value="1" {% if current_is_active == '1' %}selected{% endif %}>正常</option>
<option value="0" {% if current_is_active == '0' %}selected{% endif %}>已禁用</option>
</select>
</div>
<div class="col-md-2">
<button type="submit" class="btn btn-primary btn-sm w-100">
<i class="bi bi-funnel me-1"></i>筛选
</button>
</div>
</form>
</div>
</div>
<div class="card card-dark">
<div class="card-body p-0">
<div class="table-responsive">
<table class="table table-dark table-hover mb-0 align-middle">
<thead>
<tr>
<th>ID</th>
<th>用户名</th>
<th>姓名</th>
<th>邮箱</th>
<th>角色</th>
<th>状态</th>
<th>最后登录</th>
<th>加入时间</th>
<th>操作</th>
</tr>
</thead>
<tbody>
{% for u in page_obj %}
<tr>
<td>{{ u.id }}</td>
<td><strong>{{ u.username }}</strong></td>
<td>{{ u.first_name|default:"-" }}</td>
<td>{{ u.email|default:"-" }}</td>
<td>
{% if u.is_superuser %}
<span class="badge bg-danger">超级管理员</span>
{% elif u.is_staff %}
<span class="badge bg-info">管理员</span>
{% else %}
<span class="badge bg-secondary">普通用户</span>
{% endif %}
</td>
<td>
{% if u.is_active %}
<span class="badge bg-success">正常</span>
{% else %}
<span class="badge bg-secondary">已禁用</span>
{% endif %}
</td>
<td>{{ u.last_login|date:"Y-m-d H:i"|default:"-" }}</td>
<td>{{ u.date_joined|date:"Y-m-d" }}</td>
<td>
<a href="{% url 'admin_password_reset' u.pk %}"
class="btn btn-outline-warning btn-xs" title="重置密码">
<i class="bi bi-key"></i> 重置密码
</a>
</td>
</tr>
{% empty %}
<tr><td colspan="9" class="text-center text-muted py-4">暂无用户</td></tr>
{% endfor %}
</tbody>
</table>
</div>
</div>
</div>
{% if page_obj.paginator.num_pages > 1 %}
<nav class="mt-3">
<ul class="pagination pagination-sm justify-content-center">
{% if page_obj.has_previous %}
<li class="page-item">
<a class="page-link" href="?page={{ page_obj.previous_page_number }}&search={{ search }}&is_active={{ current_is_active }}">上一页</a>
</li>
{% endif %}
<li class="page-item active">
<span class="page-link">{{ page_obj.number }} / {{ page_obj.paginator.num_pages }}</span>
</li>
{% if page_obj.has_next %}
<li class="page-item">
<a class="page-link" href="?page={{ page_obj.next_page_number }}&search={{ search }}&is_active={{ current_is_active }}">下一页</a>
</li>
{% endif %}
</ul>
</nav>
{% endif %}
{% endblock %}
@@ -0,0 +1,63 @@
{% extends "assetapp/base.html" %}
{% block title %}重置密码 - {{ target_user.username }}{% endblock %}
{% block content %}
<div class="d-flex align-items-center mb-4">
<a href="{% url 'user_list' %}" class="btn btn-outline-secondary btn-sm me-3">
<i class="bi bi-arrow-left"></i> 返回
</a>
<h4 class="mb-0">
<i class="bi bi-key me-2"></i>重置密码 - {{ target_user.username }}
</h4>
</div>
<div class="row justify-content-center">
<div class="col-md-6">
<div class="card card-dark">
<div class="card-body">
<div class="alert alert-warning py-2 small">
<i class="bi bi-exclamation-triangle me-1"></i>
您正在为用户 <strong>{{ target_user.username }}</strong> 设置新密码,设置后该用户需使用新密码登录。
</div>
<form method="post">
{% csrf_token %}
{% if form.non_field_errors %}
<div class="alert alert-danger py-2 small">{{ form.non_field_errors }}</div>
{% endif %}
<div class="mb-3">
<label class="form-label text-muted" for="{{ form.new_password1.id_for_label }}">
新密码 <span class="text-danger">*</span>
</label>
{{ form.new_password1 }}
{% if form.new_password1.help_text %}
<div class="form-text text-muted">{{ form.new_password1.help_text|safe }}</div>
{% endif %}
{% if form.new_password1.errors %}
<div class="text-danger small mt-1">{{ form.new_password1.errors }}</div>
{% endif %}
</div>
<div class="mb-3">
<label class="form-label text-muted" for="{{ form.new_password2.id_for_label }}">
确认新密码 <span class="text-danger">*</span>
</label>
{{ form.new_password2 }}
{% if form.new_password2.errors %}
<div class="text-danger small mt-1">{{ form.new_password2.errors }}</div>
{% endif %}
</div>
<button type="submit" class="btn btn-warning">
<i class="bi bi-check-circle me-1"></i>确认重置
</button>
<a href="{% url 'user_list' %}" class="btn btn-outline-secondary ms-2">取消</a>
</form>
</div>
</div>
</div>
</div>
{% endblock %}