|
@@ -486,26 +486,61 @@ function showDistributionHistory(selectedRowData) {
|
|
|
const userRecords = data.data.license_record_to_user || [];
|
|
|
const emailRecords = data.data.license_record_to_emails || [];
|
|
|
|
|
|
+
|
|
|
+ userRecords.sort((a, b) => new Date(b.up_time) - new Date(a.up_time));
|
|
|
+ emailRecords.sort((a, b) => new Date(b.up_time) - new Date(a.up_time));
|
|
|
+
|
|
|
+
|
|
|
+ function groupBy(records, key) {
|
|
|
+ return records.reduce((result, record) => {
|
|
|
+ const date = new Date(record.up_time).toLocaleDateString();
|
|
|
+ if (!result[date]) {
|
|
|
+ result[date] = [];
|
|
|
+ }
|
|
|
+ result[date].push(record);
|
|
|
+ return result;
|
|
|
+ }, {});
|
|
|
+ }
|
|
|
+
|
|
|
+
|
|
|
+ const groupedUserRecords = groupBy(userRecords, 'up_time');
|
|
|
+ const groupedEmailRecords = groupBy(emailRecords, 'up_time');
|
|
|
+
|
|
|
|
|
|
- const userContent = userRecords.length > 0 ?
|
|
|
- userRecords.map(user => `
|
|
|
- <div class="distributionHistory-user">
|
|
|
- <div>用户名: ${user.user_account}</div>
|
|
|
- <div>唯一用户 ID: ${user.user_unique_id}</div>
|
|
|
- <div>更新时间: ${new Date(user.up_time).toLocaleString()}</div>
|
|
|
- </div>
|
|
|
- `).join('') :
|
|
|
- '<div class="distributionHistory-no-record">无用户记录</div>';
|
|
|
-
|
|
|
+ const userContent = Object.keys(groupedUserRecords).length > 0 ?
|
|
|
+ Object.keys(groupedUserRecords).map(date => {
|
|
|
+ const records = groupedUserRecords[date];
|
|
|
+ const recordContent = records.map(user => `
|
|
|
+ <div class="distributionHistoryModal-record">
|
|
|
+ <div>用户名: ${user.user_account}</div>
|
|
|
+ </div>
|
|
|
+ `).join('');
|
|
|
+ return `
|
|
|
+ <div class="distributionHistoryModal-group">
|
|
|
+ <div class="distributionHistoryModal-group-title">${date}</div>
|
|
|
+ ${recordContent}
|
|
|
+ </div>
|
|
|
+ `;
|
|
|
+ }).join('') :
|
|
|
+ '<div class="distributionHistoryModal-no-record">没有用户分发记录</div>';
|
|
|
+
|
|
|
|
|
|
- const emailContent = emailRecords.length > 0 ?
|
|
|
- emailRecords.map(email => `
|
|
|
- <div class="distributionHistory-email">
|
|
|
- <div>邮箱: ${email.emails}</div>
|
|
|
- <div>更新时间: ${new Date(email.up_time).toLocaleString()}</div>
|
|
|
- </div>
|
|
|
- `).join('') :
|
|
|
- '<div class="distributionHistory-no-record">无邮箱记录</div>';
|
|
|
+ const emailContent = Object.keys(groupedEmailRecords).length > 0 ?
|
|
|
+ Object.keys(groupedEmailRecords).map(date => {
|
|
|
+ const records = groupedEmailRecords[date];
|
|
|
+ const recordContent = records.map(email => `
|
|
|
+ <div class="distributionHistoryModal-record">
|
|
|
+ <div>邮箱: ${email.emails}</div>
|
|
|
+ </div>
|
|
|
+ `).join('');
|
|
|
+ return `
|
|
|
+ <div class="distributionHistoryModal-group">
|
|
|
+ <div class="distributionHistoryModal-group-title">${date}</div>
|
|
|
+ ${recordContent}
|
|
|
+ </div>
|
|
|
+ `;
|
|
|
+ }).join('') :
|
|
|
+ '<div class="distributionHistoryModal-no-record">没有邮箱分发记录</div>';
|
|
|
|
|
|
|
|
|
document.getElementById('distributionHistory-user-content').innerHTML = userContent;
|
|
@@ -534,6 +569,7 @@ function showDistributionHistory(selectedRowData) {
|
|
|
}
|
|
|
|
|
|
|
|
|
+
|
|
|
function formatDateTime(dateString) {
|
|
|
const date = new Date(dateString);
|
|
|
|