diff --git a/apps/accounts/templates/accounts/gather_account_report.html b/apps/accounts/templates/accounts/gather_account_report.html index 32a781f8d..adea1f47f 100644 --- a/apps/accounts/templates/accounts/gather_account_report.html +++ b/apps/accounts/templates/accounts/gather_account_report.html @@ -24,7 +24,7 @@

- 密码清单 + 账号发现

@@ -34,33 +34,35 @@
- {% comment %} 摘要部分 {% endcomment %}

- {% comment %} {% trans 'New found accounts' %}: {% endcomment %} - summary 1 + {% trans 'The following is a summary of the account check tasks. Please review and handle them' %}

- {% trans 'New found accounts' %}: - 100 + {% trans 'Task name' %}: + {{ execution.automation.name }}

- {% trans 'New found accounts' %}: - 100 + {% trans 'Date start' %}: + {{ execution.date_start | date:"Y/m/d H:i:s" }}

- {% trans 'New found accounts' %}: - 100 + {% trans 'Date end' %}: + {{ execution.date_finished | date:"Y/m/d H:i:s" }}

- {% trans 'New found accounts' %}: - 100 + {% trans 'Time using' %}: + {{ execution.duration }}s

-
-
+

+ {% trans 'Assets count' %}: + {{ summary.total_assets }}s +

+
+

{% comment %} {% trans 'New found accounts' %}: {% endcomment %} @@ -114,7 +116,7 @@

{% if summary.lost_accounts %} - +
@@ -137,53 +139,6 @@ {% endif %} - -
-

- {% trans 'The following is a summary of the account check tasks. Please review and handle them' %} -

-
{% trans 'No.' %}
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
{% trans 'Task Summary' %}:
{% trans 'Task name' %}:{{ execution.automation.name }}
{% trans 'Date start' %}:{{ execution.date_start | date:"Y/m/d H:i:s" }}
{% trans 'Date end' %}:{{ execution.date_finished | date:"Y/m/d H:i:s" }}
{% trans 'Time using' %}:{{ execution.duration }}s
{% trans 'Assets count' %}:{{ summary.total_assets }}
{% trans 'Asset success count' %}:{{ summary.ok_assets }}
{% trans 'Asset failed count' %}:{{ summary.fail_assets }}
{% trans 'Asset not support count' %}:{{ summary.error_assets }}
-
@@ -193,11 +148,21 @@ var myChart = echarts.init(document.getElementById('main')); var option = { - tooltip: {}, + tooltip: { + trigger: 'item' + }, + legend: { + left: 'right', + orient: 'vertical' + }, series: [{ type: 'pie', - radius: ['50%', '70%'], + radius: ['40%', '70%'], avoidLabelOverlap: false, + padAngle: 5, + itemStyle: { + borderRadius: 10 + }, label: { show: false, position: 'center' @@ -205,17 +170,10 @@ labelLine: { show: false }, - emphasis: { - label: { - show: true, - fontSize: '13', - fontWeight: 'bold' - } - }, data: [ - { value: {{ summary.ok_assets | default:10 }}, name: '{% trans "Asset success count" %}' }, - { value: {{ summary.fail_assets | default:10 }}, name: '{% trans "Asset failed count" %}' }, - { value: {{ summary.error_assets | default:10 }}, name: '{% trans "Asset not support count" %}' } + { value: {{ summary.ok_assets | default:0 }}, name: '{% trans "Asset success count" %}' }, + { value: {{ summary.fail_assets | default:1 }}, name: '{% trans "Asset failed count" %}' }, + { value: {{ summary.error_assets | default:1 }}, name: '{% trans "Asset not support count" %}' } ] }] }; @@ -269,7 +227,7 @@ .info-section .info { margin: unset; - font-size: 2rem; + font-size: 1.6rem; } .info-section .time { @@ -299,12 +257,11 @@ border-radius: 8px; height: 350px; box-shadow: 0 1px 3px rgba(0, 0, 0, 0.1); - transition: all 0.3s ease; } - .main-section .synopsis-section .synopsis-item:hover { - box-shadow: 0 4px 6px rgba(0, 0, 0, 0.1); - transform: translateY(-2px); + .main-section .synopsis-section .synopsis-item h3 { + font-weight: 500; + font-size: 1.5rem; } .main-section .synopsis-section .synopsis-item .synopsis-item-content { @@ -314,7 +271,6 @@ align-items: flex-start; margin-top: 1rem; height: 100%; - font-size: 1.5rem; cursor: pointer; } @@ -323,7 +279,11 @@ width: 100%; line-height: 1; gap: 2rem; - font-weight: 500; + font-size: 14px; + } + + .main-section .synopsis-section .synopsis-item .synopsis-item-content p .item-label { + width: 10rem; } .main-section .synopsis-section .synopsis-item .synopsis-item-content span { @@ -356,7 +316,6 @@ background: #fff; border: 1px solid #e0e0e0; border-radius: 8px; - {% comment %} box-shadow: 0 1px 3px rgba(0, 0, 0, 0.1); {% endcomment %} } .main-section .tabel-execution-section { @@ -408,14 +367,20 @@ background: #f6f6f6; color: #495057; padding: 0.75rem; + font-size: 1.5rem; border-bottom: 2px solid #e0e0e0; } .custom-table td { padding: 0.75rem; + font-size: 14px; border-bottom: 1px solid #e0e0e0; } + .custom-table tr:nth-child(even) { + background-color: #f6f6f6; + } + .custom-table tr:last-child td { border-bottom: none; }