feat: 新增软件资产(软资产)管理模块
- 新增 SoftwareCategory/SoftwareAsset/SoftwareChangeLog 模型与迁移0010 - 软资产CRUD:编号/名称/分类/供应商/版本/许可类型/授权数量/许可密钥/账号/费用/起止日期/负责人/部门/状态 - 许可类型:永久授权/订阅/开源免费/按需付费;状态:在用/闲置/已过期/已注销 - 到期提醒:已过期/即将到期(30天)自动标识 - Excel导入导出:模板下载、ID存在时更新、分类自动创建、空白行跳过、缺编号/名称报错 - 软件分类独立管理,分类下有资产时禁止删除 - 独立软件变更记录页;仪表盘增加软件统计卡片、软件分类统计、许可类型分布 - 导航栏改造:资产管理/分类管理/变更记录/导入导出下拉菜单 - 全流程15项功能验证通过(CRUD/导入导出/权限/仪表盘)
This commit is contained in:
@@ -6,12 +6,18 @@
|
||||
{% block content %}
|
||||
<div class="d-flex justify-content-between align-items-center mb-4">
|
||||
<h4 class="mb-0"><i class="bi bi-speedometer2 me-2"></i>仪表盘</h4>
|
||||
<a href="{% url 'asset_create' %}" class="btn btn-primary">
|
||||
<i class="bi bi-plus-circle me-1"></i>新增资产
|
||||
</a>
|
||||
<div>
|
||||
<a href="{% url 'software_create' %}" class="btn btn-outline-info me-2">
|
||||
<i class="bi bi-window-stack me-1"></i>新增软件资产
|
||||
</a>
|
||||
<a href="{% url 'asset_create' %}" class="btn btn-primary">
|
||||
<i class="bi bi-plus-circle me-1"></i>新增资产
|
||||
</a>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<!-- 统计卡片 -->
|
||||
<!-- 硬件统计卡片 -->
|
||||
<h6 class="text-muted mb-2"><i class="bi bi-hdd-rack me-1"></i>硬件资产</h6>
|
||||
<div class="row g-3 mb-4">
|
||||
<div class="col-md-3">
|
||||
<div class="stat-card stat-total">
|
||||
@@ -51,12 +57,53 @@
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<!-- 软件资产统计卡片 -->
|
||||
<h6 class="text-muted mb-2"><i class="bi bi-window-stack me-1"></i>软件资产</h6>
|
||||
<div class="row g-3 mb-4">
|
||||
<div class="col-md-3">
|
||||
<div class="stat-card stat-total">
|
||||
<div class="stat-icon"><i class="bi bi-window-stack"></i></div>
|
||||
<div class="stat-info">
|
||||
<div class="stat-value">{{ total_software }}</div>
|
||||
<div class="stat-label">软件总数</div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
<div class="col-md-3">
|
||||
<div class="stat-card stat-in-use">
|
||||
<div class="stat-icon"><i class="bi bi-check-circle"></i></div>
|
||||
<div class="stat-info">
|
||||
<div class="stat-value">{{ software_status_data.in_use|default:0 }}</div>
|
||||
<div class="stat-label">在用</div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
<div class="col-md-3">
|
||||
<div class="stat-card stat-warning">
|
||||
<div class="stat-icon"><i class="bi bi-exclamation-triangle"></i></div>
|
||||
<div class="stat-info">
|
||||
<div class="stat-value">{{ sw_expiring_soon }}</div>
|
||||
<div class="stat-label">即将到期(30天)</div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
<div class="col-md-3">
|
||||
<div class="stat-card stat-danger">
|
||||
<div class="stat-icon"><i class="bi bi-shield-exclamation"></i></div>
|
||||
<div class="stat-info">
|
||||
<div class="stat-value">{{ sw_expired }}</div>
|
||||
<div class="stat-label">已过期</div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div class="row g-3">
|
||||
<!-- 分类统计 -->
|
||||
<div class="col-md-6">
|
||||
<div class="card card-dark">
|
||||
<div class="col-md-3">
|
||||
<div class="card card-dark h-100">
|
||||
<div class="card-header">
|
||||
<i class="bi bi-pie-chart me-2"></i>分类统计
|
||||
<i class="bi bi-pie-chart me-2"></i>硬件分类统计
|
||||
</div>
|
||||
<div class="card-body">
|
||||
{% if category_stats %}
|
||||
@@ -64,7 +111,7 @@
|
||||
<div class="d-flex justify-content-between align-items-center py-2 border-bottom border-secondary">
|
||||
<span class="text-light">{{ item.category__name }}</span>
|
||||
<div class="d-flex align-items-center">
|
||||
<div class="progress me-2" style="width: 120px; height: 8px;">
|
||||
<div class="progress me-2" style="width: 80px; height: 8px;">
|
||||
{% widthratio item.count total_assets 100 as pct %}
|
||||
<div class="progress-bar bg-primary" style="width: {{ pct }}%"></div>
|
||||
</div>
|
||||
@@ -79,16 +126,43 @@
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<!-- 软件分类统计 -->
|
||||
<div class="col-md-3">
|
||||
<div class="card card-dark h-100">
|
||||
<div class="card-header">
|
||||
<i class="bi bi-bookmarks me-2"></i>软件分类统计
|
||||
</div>
|
||||
<div class="card-body">
|
||||
{% if software_category_stats %}
|
||||
{% for item in software_category_stats %}
|
||||
<div class="d-flex justify-content-between align-items-center py-2 border-bottom border-secondary">
|
||||
<span class="text-light">{{ item.category__name }}</span>
|
||||
<div class="d-flex align-items-center">
|
||||
<div class="progress me-2" style="width: 80px; height: 8px;">
|
||||
{% widthratio item.count total_software 100 as pct %}
|
||||
<div class="progress-bar bg-info" style="width: {{ pct }}%"></div>
|
||||
</div>
|
||||
<span class="badge bg-info">{{ item.count }}</span>
|
||||
</div>
|
||||
</div>
|
||||
{% endfor %}
|
||||
{% else %}
|
||||
<p class="text-muted text-center my-4">暂无数据</p>
|
||||
{% endif %}
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<!-- 状态分布 -->
|
||||
<div class="col-md-6">
|
||||
<div class="card card-dark">
|
||||
<div class="col-md-3">
|
||||
<div class="card card-dark h-100">
|
||||
<div class="card-header">
|
||||
<i class="bi bi-bar-chart me-2"></i>状态分布
|
||||
</div>
|
||||
<div class="card-body">
|
||||
{% for key, label in status_map.items %}
|
||||
<div class="d-flex justify-content-between align-items-center py-2 border-bottom border-secondary">
|
||||
<span class="text-light">{{ label }}</span>
|
||||
<span class="text-light"><i class="bi bi-hdd-rack me-1 text-muted small"></i>{{ label }}</span>
|
||||
<span class="badge
|
||||
{% if key == 'in_use' %}bg-success
|
||||
{% elif key == 'idle' %}bg-warning text-dark
|
||||
@@ -98,53 +172,146 @@
|
||||
</span>
|
||||
</div>
|
||||
{% endfor %}
|
||||
{% for key, label in software_status_map.items %}
|
||||
<div class="d-flex justify-content-between align-items-center py-2 border-bottom border-secondary">
|
||||
<span class="text-light"><i class="bi bi-window-stack me-1 text-muted small"></i>{{ label }}</span>
|
||||
<span class="badge
|
||||
{% if key == 'in_use' %}bg-success
|
||||
{% elif key == 'idle' %}bg-warning text-dark
|
||||
{% elif key == 'expired' %}bg-danger
|
||||
{% else %}bg-secondary{% endif %}">
|
||||
{{ software_status_data|get_item:key|default:0 }}
|
||||
</span>
|
||||
</div>
|
||||
{% endfor %}
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<!-- 软件许可类型分布 -->
|
||||
<div class="col-md-3">
|
||||
<div class="card card-dark h-100">
|
||||
<div class="card-header">
|
||||
<i class="bi bi-key me-2"></i>许可类型分布
|
||||
</div>
|
||||
<div class="card-body">
|
||||
<div class="d-flex justify-content-between align-items-center py-2 border-bottom border-secondary">
|
||||
<span class="text-light">永久授权</span>
|
||||
<span class="badge bg-primary">{{ software_license_data.permanent|default:0 }}</span>
|
||||
</div>
|
||||
<div class="d-flex justify-content-between align-items-center py-2 border-bottom border-secondary">
|
||||
<span class="text-light">订阅</span>
|
||||
<span class="badge bg-info">{{ software_license_data.subscription|default:0 }}</span>
|
||||
</div>
|
||||
<div class="d-flex justify-content-between align-items-center py-2 border-bottom border-secondary">
|
||||
<span class="text-light">开源免费</span>
|
||||
<span class="badge bg-secondary">{{ software_license_data.open_source|default:0 }}</span>
|
||||
</div>
|
||||
<div class="d-flex justify-content-between align-items-center py-2 border-bottom border-secondary">
|
||||
<span class="text-light">按需付费</span>
|
||||
<span class="badge bg-warning text-dark">{{ software_license_data.pay_as_you_go|default:0 }}</span>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<!-- 最近变更 -->
|
||||
<div class="card card-dark mt-3">
|
||||
<div class="card-header d-flex justify-content-between align-items-center">
|
||||
<span><i class="bi bi-clock-history me-2"></i>最近变更</span>
|
||||
<a href="{% url 'change_log_list' %}" class="btn btn-sm btn-outline-light">查看全部</a>
|
||||
<!-- 最近变更(硬件+软件合并展示) -->
|
||||
<div class="row g-3 mt-0">
|
||||
<div class="col-lg-6">
|
||||
<div class="card card-dark h-100">
|
||||
<div class="card-header d-flex justify-content-between align-items-center">
|
||||
<span><i class="bi bi-hdd-rack me-2"></i>硬件最近变更</span>
|
||||
<a href="{% url 'change_log_list' %}" class="btn btn-sm btn-outline-light">查看全部</a>
|
||||
</div>
|
||||
<div class="card-body p-0">
|
||||
<div class="table-responsive">
|
||||
<table class="table table-dark table-hover mb-0">
|
||||
<thead>
|
||||
<tr>
|
||||
<th>时间</th>
|
||||
<th>资产编号</th>
|
||||
<th>操作</th>
|
||||
<th>描述</th>
|
||||
<th>操作人</th>
|
||||
</tr>
|
||||
</thead>
|
||||
<tbody>
|
||||
{% for log in recent_changes %}
|
||||
<tr>
|
||||
<td>{{ log.created_at|date:"m-d H:i" }}</td>
|
||||
<td><a href="{% url 'asset_list' %}?search={{ log.asset_number }}" class="text-info">{{ log.asset_number }}</a></td>
|
||||
<td>
|
||||
<span class="badge
|
||||
{% if log.action == 'create' %}bg-success
|
||||
{% elif log.action == 'update' %}bg-primary
|
||||
{% elif log.action == 'delete' %}bg-danger
|
||||
{% elif log.action == 'import' %}bg-info
|
||||
{% elif log.action == 'export' %}bg-secondary
|
||||
{% else %}bg-warning{% endif %}">
|
||||
{{ log.get_action_display }}
|
||||
</span>
|
||||
</td>
|
||||
<td>{{ log.description|default:"-" }}</td>
|
||||
<td>{{ log.operator|default:"-" }}</td>
|
||||
</tr>
|
||||
{% empty %}
|
||||
<tr><td colspan="5" class="text-center text-light opacity-75 py-3">暂无变更记录</td></tr>
|
||||
{% endfor %}
|
||||
</tbody>
|
||||
</table>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
<div class="card-body p-0">
|
||||
<div class="table-responsive">
|
||||
<table class="table table-dark table-hover mb-0">
|
||||
<thead>
|
||||
<tr>
|
||||
<th>时间</th>
|
||||
<th>资产编号</th>
|
||||
<th>操作</th>
|
||||
<th>描述</th>
|
||||
<th>操作人</th>
|
||||
</tr>
|
||||
</thead>
|
||||
<tbody>
|
||||
{% for log in recent_changes %}
|
||||
<tr>
|
||||
<td>{{ log.created_at|date:"m-d H:i" }}</td>
|
||||
<td><a href="{% url 'asset_list' %}?search={{ log.asset_number }}" class="text-info">{{ log.asset_number }}</a></td>
|
||||
<td>
|
||||
<span class="badge
|
||||
{% if log.action == 'create' %}bg-success
|
||||
{% elif log.action == 'update' %}bg-primary
|
||||
{% elif log.action == 'delete' %}bg-danger
|
||||
{% elif log.action == 'import' %}bg-info
|
||||
{% elif log.action == 'export' %}bg-secondary
|
||||
{% else %}bg-warning{% endif %}">
|
||||
{{ log.get_action_display }}
|
||||
</span>
|
||||
</td>
|
||||
<td>{{ log.description|default:"-" }}</td>
|
||||
<td>{{ log.operator|default:"-" }}</td>
|
||||
</tr>
|
||||
{% empty %}
|
||||
<tr><td colspan="5" class="text-center text-light opacity-75 py-3">暂无变更记录</td></tr>
|
||||
{% endfor %}
|
||||
</tbody>
|
||||
</table>
|
||||
<div class="col-lg-6">
|
||||
<div class="card card-dark h-100">
|
||||
<div class="card-header d-flex justify-content-between align-items-center">
|
||||
<span><i class="bi bi-window-stack me-2"></i>软件最近变更</span>
|
||||
<a href="{% url 'software_changelog' %}" class="btn btn-sm btn-outline-light">查看全部</a>
|
||||
</div>
|
||||
<div class="card-body p-0">
|
||||
<div class="table-responsive">
|
||||
<table class="table table-dark table-hover mb-0">
|
||||
<thead>
|
||||
<tr>
|
||||
<th>时间</th>
|
||||
<th>资产编号</th>
|
||||
<th>操作</th>
|
||||
<th>描述</th>
|
||||
<th>操作人</th>
|
||||
</tr>
|
||||
</thead>
|
||||
<tbody>
|
||||
{% for log in recent_software_changes %}
|
||||
<tr>
|
||||
<td>{{ log.created_at|date:"m-d H:i" }}</td>
|
||||
<td>
|
||||
{% if log.software_asset %}
|
||||
<a href="{% url 'software_detail' log.software_asset.pk %}" class="text-info">{{ log.asset_number }}</a>
|
||||
{% else %}{{ log.asset_number }}{% endif %}
|
||||
</td>
|
||||
<td>
|
||||
<span class="badge
|
||||
{% if log.action == 'create' %}bg-success
|
||||
{% elif log.action == 'update' %}bg-primary
|
||||
{% elif log.action == 'delete' %}bg-danger
|
||||
{% elif log.action == 'import' %}bg-info
|
||||
{% elif log.action == 'export' %}bg-secondary
|
||||
{% else %}bg-warning{% endif %}">
|
||||
{{ log.get_action_display }}
|
||||
</span>
|
||||
</td>
|
||||
<td>{{ log.description|default:"-" }}</td>
|
||||
<td>{{ log.operator|default:"-" }}</td>
|
||||
</tr>
|
||||
{% empty %}
|
||||
<tr><td colspan="5" class="text-center text-light opacity-75 py-3">暂无变更记录</td></tr>
|
||||
{% endfor %}
|
||||
</tbody>
|
||||
</table>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
Reference in New Issue
Block a user