增加求和采集和细节修改

This commit is contained in:
2026-07-14 14:24:21 +08:00
parent 42c319877c
commit ccc041604a
12 changed files with 1438 additions and 108 deletions

View File

@@ -30,6 +30,8 @@ function switchTab(tabName) {
loadGenerateConfigs();
} else if (tabName === 'history') {
loadHistory();
} else if (tabName === 'sum-data') {
loadSumData();
}
}

View File

@@ -1,3 +1,6 @@
// 当前配置列表缓存(用于乐观更新)
let currentConfigList = [];
// 加载配置列表
async function loadConfigs() {
try {
@@ -5,7 +8,8 @@ async function loadConfigs() {
const result = await response.json();
if (result.success) {
renderConfigList(result.data);
currentConfigList = result.data;
renderConfigList(currentConfigList);
} else {
alert('加载配置失败:' + result.message);
}
@@ -23,7 +27,10 @@ function renderConfigList(configs) {
return;
}
tbody.innerHTML = configs.map(config => `
tbody.innerHTML = configs.map((config, index) => {
const isFirst = index === 0;
const isLast = index === configs.length - 1;
return `
<tr>
<td>${config.config_name}</td>
<td>${config.split_type === 'company_id' ? '按企业 ID' : config.split_type === 'user_id' ? '按用户 ID' : '按场站 ID'}</td>
@@ -41,11 +48,11 @@ function renderConfigList(configs) {
<button class="btn btn-sm btn-primary" onclick="editConfig(${config.id})">编辑</button>
<button class="btn btn-sm btn-success" onclick="copyConfig(${config.id})">复制</button>
<button class="btn btn-sm btn-danger" onclick="deleteConfig(${config.id})">删除</button>
<button class="btn btn-sm" onclick="moveConfig(${config.id}, 'up')">↑</button>
<button class="btn btn-sm" onclick="moveConfig(${config.id}, 'down')">↓</button>
<button class="btn btn-sm" onclick="moveConfig(${config.id}, 'up')" ${isFirst ? 'disabled style="opacity:0.4;cursor:not-allowed;"' : ''}>↑</button>
<button class="btn btn-sm" onclick="moveConfig(${config.id}, 'down')" ${isLast ? 'disabled style="opacity:0.4;cursor:not-allowed;"' : ''}>↓</button>
</td>
</tr>
`).join('');
`}).join('');
}
function showCreateModal() {
@@ -776,6 +783,21 @@ async function toggleConfig(configId) {
// 移动配置
async function moveConfig(configId, direction) {
// 找到当前配置索引
const currentIndex = currentConfigList.findIndex(c => c.id === configId);
if (currentIndex === -1) return;
// 边界检查
const targetIndex = direction === 'up' ? currentIndex - 1 : currentIndex + 1;
if (targetIndex < 0 || targetIndex >= currentConfigList.length) return;
// 乐观更新:先在前端交换,立即刷新UI
const temp = currentConfigList[currentIndex];
currentConfigList[currentIndex] = currentConfigList[targetIndex];
currentConfigList[targetIndex] = temp;
renderConfigList(currentConfigList);
// 异步同步到后端
try {
const response = await fetch(`/api/config/${configId}/move`, {
method: 'POST',
@@ -784,12 +806,28 @@ async function moveConfig(configId, direction) {
});
const result = await response.json();
if (result.success) {
loadConfigs();
} else {
if (!result.success) {
// 失败了就回滚
const rollbackIndex = currentConfigList.findIndex(c => c.id === configId);
const rollbackTarget = direction === 'up' ? rollbackIndex + 1 : rollbackIndex - 1;
if (rollbackTarget >= 0 && rollbackTarget < currentConfigList.length) {
const temp = currentConfigList[rollbackIndex];
currentConfigList[rollbackIndex] = currentConfigList[rollbackTarget];
currentConfigList[rollbackTarget] = temp;
renderConfigList(currentConfigList);
}
alert('移动失败: ' + result.message);
}
} catch (error) {
// 网络错误也回滚
const rollbackIndex = currentConfigList.findIndex(c => c.id === configId);
const rollbackTarget = direction === 'up' ? rollbackIndex + 1 : rollbackIndex - 1;
if (rollbackTarget >= 0 && rollbackTarget < currentConfigList.length) {
const temp = currentConfigList[rollbackIndex];
currentConfigList[rollbackIndex] = currentConfigList[rollbackTarget];
currentConfigList[rollbackTarget] = temp;
renderConfigList(currentConfigList);
}
alert('移动失败: ' + error.message);
}
}

View File

@@ -0,0 +1,527 @@
// 求和数据管理
let sumDataCurrentPage = 1;
let sumDataPageSize = 10;
let editingSumDataId = null;
let sumDataGroupedList = [];
let sumDataDynamicFields = [];
// 分组并渲染求和数据列表
function renderSumDataList(rawList) {
const tbody = document.getElementById('sum-data-list');
const totalColCount = 7 + (rawList ? 0 : 0) + 3; // 占位,后面重新计算
if (!rawList || rawList.length === 0) {
// 清空动态表头
const chargeTh = document.getElementById('th-charge-degree');
const totalOrdersTh = document.getElementById('th-total-orders');
let nextSibling = chargeTh.nextElementSibling;
while (nextSibling && nextSibling !== totalOrdersTh) {
const toRemove = nextSibling;
nextSibling = nextSibling.nextElementSibling;
toRemove.remove();
}
tbody.innerHTML = '<tr><td colspan="10" class="empty">暂无数据</td></tr>';
return;
}
// 收集所有动态求和字段(除了充电电量 charge_degree)
const fieldMap = {};
rawList.forEach(item => {
const key = item.sum_field_key;
if (key && key !== 'charge_degree' && !fieldMap[key]) {
fieldMap[key] = item.sum_field_name || key;
}
});
// 排序:峰平谷按顺序
const fieldOrder = ['sharp_electricity', 'peak_electricity', 'flat_electricity', 'valley_electricity'];
sumDataDynamicFields = Object.keys(fieldMap).sort((a, b) => {
const idxA = fieldOrder.indexOf(a);
const idxB = fieldOrder.indexOf(b);
if (idxA >= 0 && idxB >= 0) return idxA - idxB;
if (idxA >= 0) return -1;
if (idxB >= 0) return 1;
return a.localeCompare(b);
});
// 渲染动态列表头(在充电电量列之后插入)
const chargeTh = document.getElementById('th-charge-degree');
const totalOrdersTh = document.getElementById('th-total-orders');
// 先移除旧的动态 th(充电电量和订单数之间的)
let nextSibling = chargeTh.nextElementSibling;
while (nextSibling && nextSibling !== totalOrdersTh) {
const toRemove = nextSibling;
nextSibling = nextSibling.nextElementSibling;
toRemove.remove();
}
// 插入新的动态 th
sumDataDynamicFields.forEach(key => {
const name = fieldMap[key];
const th = document.createElement('th');
th.style.minWidth = '110px';
th.textContent = name;
totalOrdersTh.before(th);
});
// 按 报表日期 + 配置ID + 拆分值 分组
const groupMap = {};
rawList.forEach(item => {
const groupKey = `${item.report_date}_${item.config_id}_${item.split_value}`;
if (!groupMap[groupKey]) {
groupMap[groupKey] = {
report_date: item.report_date,
config_id: item.config_id,
config_name: item.config_name,
split_type: item.split_type,
split_value: item.split_value,
split_name: item.split_name,
total_orders: item.total_orders || 0,
data_source: item.data_source,
remark: item.remark || '',
fields: {},
ids: []
};
}
groupMap[groupKey].fields[item.sum_field_key] = {
value: item.sum_value,
id: item.id,
name: item.sum_field_name
};
groupMap[groupKey].ids.push(item.id);
// 取最新的备注和数据来源
if (item.remark) groupMap[groupKey].remark = item.remark;
if (item.data_source === 'manual') groupMap[groupKey].data_source = 'manual';
});
sumDataGroupedList = Object.values(groupMap).sort((a, b) => {
if (a.report_date !== b.report_date) return b.report_date.localeCompare(a.report_date);
return (a.config_name || '').localeCompare(b.config_name || '');
});
// 分页处理
const total = sumDataGroupedList.length;
const start = (sumDataCurrentPage - 1) * sumDataPageSize;
const pageData = sumDataGroupedList.slice(start, start + sumDataPageSize);
const totalColSpan = 9 + sumDataDynamicFields.length; // 复选+日期+配置+拆分值+充电电量+动态列+订单数+来源+备注+操作
if (pageData.length === 0) {
tbody.innerHTML = `<tr><td colspan="${totalColSpan}" class="empty">暂无数据</td></tr>`;
renderSumDataPagination(total);
return;
}
tbody.innerHTML = pageData.map(group => {
const chargeDegree = group.fields['charge_degree'];
const chargeValue = chargeDegree && chargeDegree.value !== null && chargeDegree.value !== undefined
? Number(chargeDegree.value).toFixed(3) : '-';
const dataSource = group.data_source === 'auto' ? '自动采集' : '手动编辑';
const dataSourceClass = group.data_source === 'auto' ? 'status-active' : 'status-inactive';
const remark = group.remark || '-';
const dynamicCells = sumDataDynamicFields.map(key => {
const field = group.fields[key];
const val = field && field.value !== null && field.value !== undefined
? Number(field.value).toFixed(3) : '-';
return `<td>${val}</td>`;
}).join('');
const firstId = chargeDegree ? chargeDegree.id : (group.ids[0] || 0);
return `
<tr>
<td><input type="checkbox" class="sum-data-checkbox" value="${group.ids.join(',')}"></td>
<td>${group.report_date || '-'}</td>
<td>${group.config_name || '-'}</td>
<td title="${group.split_name || ''}">${group.split_name || group.split_value || '-'}</td>
<td style="background: #f8fafc; font-weight: 600; color: #1d4ed8;">${chargeValue}</td>
${dynamicCells}
<td>${group.total_orders || 0}</td>
<td><span class="status-badge ${dataSourceClass}">${dataSource}</span></td>
<td title="${remark}" style="max-width: 200px; overflow: hidden; text-overflow: ellipsis; white-space: nowrap;">${remark}</td>
<td>
<button class="btn btn-sm btn-primary" onclick='showEditSumDataGroup(${JSON.stringify(group.ids)})'>编辑</button>
<button class="btn btn-sm btn-danger" onclick='deleteSumDataGroup(${JSON.stringify(group.ids)})'>删除</button>
</td>
</tr>
`;
}).join('');
renderSumDataPagination(total);
}
// 渲染分页
function renderSumDataPagination(total) {
const pagination = document.getElementById('sum-data-pagination');
const totalPages = Math.ceil(total / sumDataPageSize);
if (totalPages <= 1) {
pagination.innerHTML = '';
return;
}
let html = '';
if (sumDataCurrentPage > 1) {
html += `<button class="btn btn-sm" onclick="loadSumData(${sumDataCurrentPage - 1})">上一页</button>`;
}
html += `<span class="page-info">第 ${sumDataCurrentPage} / ${totalPages} 页,共 ${total} 条</span>`;
if (sumDataCurrentPage < totalPages) {
html += `<button class="btn btn-sm" onclick="loadSumData(${sumDataCurrentPage + 1})">下一页</button>`;
}
pagination.innerHTML = html;
}
// 加载求和数据
async function loadSumData(page = 1) {
sumDataCurrentPage = page;
const reportDate = document.getElementById('sum-data-report-date').value;
const configName = document.getElementById('sum-data-config-name').value;
const dataSource = document.getElementById('sum-data-source').value;
try {
const response = await fetch(`/api/sum-data?page=1&page_size=5000&report_date=${encodeURIComponent(reportDate)}&config_name=${encodeURIComponent(configName)}&data_source=${encodeURIComponent(dataSource)}`);
const result = await response.json();
if (result.success) {
renderSumDataList(result.data.list || []);
} else {
document.getElementById('sum-data-list').innerHTML = '<tr><td colspan="12" class="empty">加载失败: ' + (result.message || '未知错误') + '</td></tr>';
}
} catch (error) {
document.getElementById('sum-data-list').innerHTML = '<tr><td colspan="12" class="empty">加载失败: ' + error.message + '</td></tr>';
}
}
// 清除查询
function clearSumDataQuery() {
document.getElementById('sum-data-report-date').value = '';
document.getElementById('sum-data-config-name').value = '';
document.getElementById('sum-data-source').value = '';
loadSumData(1);
}
// 全选/取消全选
function toggleSelectAllSumData() {
const checked = document.getElementById('select-all-sum-data').checked;
document.querySelectorAll('.sum-data-checkbox').forEach(cb => {
cb.checked = checked;
});
}
// 从历史记录采集
async function collectSumDataFromHistory() {
if (!confirm('确定要从所有成功的历史记录中重新采集求和数据吗?\n(会先清除旧的自动采集数据)')) return;
try {
const response = await fetch('/api/sum-data/collect', {
method: 'POST',
headers: { 'Content-Type': 'application/json' }
});
const result = await response.json();
if (result.success) {
alert(result.message);
loadSumData(1);
} else {
alert('采集失败: ' + (result.message || '未知错误'));
}
} catch (error) {
alert('采集失败: ' + error.message);
}
}
// 显示添加模态框
function showAddSumDataModal() {
editingSumDataId = null;
document.getElementById('sum-data-modal-title').textContent = '手动添加求和数据';
document.getElementById('sum-data-id').value = '';
document.getElementById('sum-data-report-date-input').value = '';
document.getElementById('sum-data-config-name-input').value = '';
document.getElementById('sum-data-split-type-input').value = 'company_id';
document.getElementById('sum-data-split-value-input').value = '';
document.getElementById('sum-data-split-name-input').value = '';
document.getElementById('sum-data-field-key-input').value = '';
document.getElementById('sum-data-field-name-input').value = '';
document.getElementById('sum-data-value-input').value = '';
document.getElementById('sum-data-total-orders-input').value = 0;
document.getElementById('sum-data-remark-input').value = '';
document.getElementById('sum-data-modal').classList.add('active');
}
// 显示编辑分组模态框
let editingGroupIds = [];
let editingGroupData = null;
async function showEditSumDataGroup(ids) {
try {
// 获取所有选中的记录详情
const response = await fetch(`/api/sum-data?page=1&page_size=5000`);
const result = await response.json();
if (!result.success) {
alert('加载详情失败');
return;
}
const allList = result.data.list || [];
const groupItems = allList.filter(item => ids.includes(item.id));
if (groupItems.length === 0) {
alert('未找到该记录');
return;
}
editingGroupIds = ids;
editingGroupData = groupItems;
// 找到充电电量那条作为主记录
const chargeItem = groupItems.find(i => i.sum_field_key === 'charge_degree') || groupItems[0];
document.getElementById('sum-data-modal-title').textContent = '编辑求和数据';
document.getElementById('sum-data-id').value = chargeItem.id;
document.getElementById('sum-data-report-date-input').value = chargeItem.report_date || '';
document.getElementById('sum-data-config-name-input').value = chargeItem.config_name || '';
document.getElementById('sum-data-split-type-input').value = chargeItem.split_type || 'company_id';
document.getElementById('sum-data-split-value-input').value = chargeItem.split_value || '';
document.getElementById('sum-data-split-name-input').value = chargeItem.split_name || '';
// 动态生成字段输入区域
renderEditGroupFields(groupItems);
document.getElementById('sum-data-total-orders-input').value = chargeItem.total_orders || 0;
document.getElementById('sum-data-remark-input').value = '';
document.getElementById('sum-data-modal').classList.add('active');
} catch (error) {
alert('加载详情失败: ' + error.message);
}
}
// 渲染编辑分组时的动态字段输入
function renderEditGroupFields(items) {
const fieldKeyInput = document.getElementById('sum-data-field-key-input');
const fieldNameInput = document.getElementById('sum-data-field-name-input');
const valueInput = document.getElementById('sum-data-value-input');
// 先构造动态字段区域
let fieldsHtml = '<div style="margin-bottom: 15px;"><label style="display: block; margin-bottom: 8px; font-weight: 600;">求和字段值:</label>';
fieldsHtml += '<div style="display: grid; grid-template-columns: 1fr 1fr; gap: 10px;">';
// 先放充电电量
const chargeItem = items.find(i => i.sum_field_key === 'charge_degree');
if (chargeItem) {
fieldsHtml += `
<div class="form-group" style="margin-bottom: 0;">
<label>${chargeItem.sum_field_name || chargeItem.sum_field_key} (必选):</label>
<input type="number" step="0.001" class="form-control"
data-field-key="${chargeItem.sum_field_key}"
data-field-name="${chargeItem.sum_field_name || chargeItem.sum_field_key}"
data-field-id="${chargeItem.id}"
value="${chargeItem.sum_value || 0}">
</div>
`;
}
// 再放其他字段
items.filter(i => i.sum_field_key !== 'charge_degree').forEach(item => {
fieldsHtml += `
<div class="form-group" style="margin-bottom: 0;">
<label>${item.sum_field_name || item.sum_field_key}:</label>
<input type="number" step="0.001" class="form-control"
data-field-key="${item.sum_field_key}"
data-field-name="${item.sum_field_name || item.sum_field_key}"
data-field-id="${item.id}"
value="${item.sum_value || 0}">
</div>
`;
});
fieldsHtml += '</div></div>';
// 替换掉原来的单字段输入
fieldKeyInput.parentElement.style.display = 'none';
fieldNameInput.parentElement.style.display = 'none';
valueInput.parentElement.style.display = 'none';
// 插入到订单数前面
const totalOrdersGroup = document.getElementById('sum-data-total-orders-input').parentElement;
// 检查是否已经有动态区域了
let dynamicArea = document.getElementById('sum-data-dynamic-fields');
if (!dynamicArea) {
dynamicArea = document.createElement('div');
dynamicArea.id = 'sum-data-dynamic-fields';
totalOrdersGroup.parentElement.insertBefore(dynamicArea, totalOrdersGroup);
}
dynamicArea.innerHTML = fieldsHtml;
}
// 保存求和数据(支持分组编辑)
async function saveSumData() {
const remark = document.getElementById('sum-data-remark-input').value;
// 编辑时修改原因为必填
if (editingGroupIds && editingGroupIds.length > 0 && !remark.trim()) {
alert('请填写修改原因');
return;
}
const totalOrders = document.getElementById('sum-data-total-orders-input').value;
try {
// 分组编辑模式
if (editingGroupIds && editingGroupIds.length > 0) {
// 读取动态字段值
const fieldInputs = document.querySelectorAll('#sum-data-dynamic-fields input[data-field-key]');
let successCount = 0;
for (const input of fieldInputs) {
const fieldId = input.getAttribute('data-field-id');
const fieldValue = input.value;
const response = await fetch(`/api/sum-data/${fieldId}`, {
method: 'PUT',
headers: { 'Content-Type': 'application/json' },
body: JSON.stringify({
sum_value: fieldValue,
total_orders: totalOrders,
remark: remark
})
});
const result = await response.json();
if (result.success) successCount++;
}
if (successCount > 0) {
alert(`更新成功(${successCount} 个字段)`);
closeSumDataModal();
loadSumData(sumDataCurrentPage);
} else {
alert('更新失败');
}
return;
}
// 单条新增模式
const data = {
report_date: document.getElementById('sum-data-report-date-input').value,
config_name: document.getElementById('sum-data-config-name-input').value,
split_type: document.getElementById('sum-data-split-type-input').value,
split_value: document.getElementById('sum-data-split-value-input').value,
split_name: document.getElementById('sum-data-split-name-input').value,
sum_field_key: document.getElementById('sum-data-field-key-input').value,
sum_field_name: document.getElementById('sum-data-field-name-input').value,
sum_value: document.getElementById('sum-data-value-input').value,
total_orders: totalOrders,
remark: remark
};
if (!data.report_date) {
alert('请选择报表日期');
return;
}
if (!data.sum_field_key) {
alert('请输入求和字段键名');
return;
}
if (data.sum_value === '' || data.sum_value === null) {
alert('请输入求和值');
return;
}
const response = await fetch('/api/sum-data', {
method: 'POST',
headers: { 'Content-Type': 'application/json' },
body: JSON.stringify(data)
});
const result = await response.json();
if (result.success) {
alert('添加成功');
closeSumDataModal();
loadSumData(sumDataCurrentPage);
} else {
alert('保存失败: ' + (result.message || '未知错误'));
}
} catch (error) {
alert('保存失败: ' + error.message);
}
}
// 关闭模态框
function closeSumDataModal() {
document.getElementById('sum-data-modal').classList.remove('active');
editingGroupIds = [];
editingGroupData = null;
// 恢复单字段输入的显示
document.querySelector('#sum-data-field-key-input').parentElement.style.display = '';
document.querySelector('#sum-data-field-name-input').parentElement.style.display = '';
document.querySelector('#sum-data-value-input').parentElement.style.display = '';
const dynamicArea = document.getElementById('sum-data-dynamic-fields');
if (dynamicArea) dynamicArea.innerHTML = '';
}
// 删除单条(分组)
async function deleteSumDataGroup(ids) {
if (!confirm(`确定要删除这组求和数据吗?(共 ${ids.length} 条字段记录)`)) return;
try {
let success = true;
for (const id of ids) {
const response = await fetch(`/api/sum-data/${id}`, { method: 'DELETE' });
const result = await response.json();
if (!result.success) success = false;
}
if (success) {
alert('删除成功');
loadSumData(sumDataCurrentPage);
} else {
alert('部分删除失败');
}
} catch (error) {
alert('删除失败: ' + error.message);
}
}
// 兼容旧函数名
function deleteSumData(id) {
deleteSumDataGroup([id]);
}
// 批量删除
async function batchDeleteSumData() {
const checkboxes = document.querySelectorAll('.sum-data-checkbox:checked');
if (checkboxes.length === 0) {
alert('请选择要删除的记录');
return;
}
const ids = [];
checkboxes.forEach(cb => {
const val = cb.value;
if (val.indexOf(',') >= 0) {
val.split(',').forEach(id => ids.push(parseInt(id)));
} else {
ids.push(parseInt(val));
}
});
if (!confirm(`确定要删除选中的 ${ids.length} 条求和数据吗?`)) return;
try {
const response = await fetch('/api/sum-data/batch-delete', {
method: 'POST',
headers: { 'Content-Type': 'application/json' },
body: JSON.stringify({ ids: ids })
});
const result = await response.json();
if (result.success) {
alert('删除成功');
loadSumData(sumDataCurrentPage);
} else {
alert('删除失败: ' + (result.message || '未知错误'));
}
} catch (error) {
alert('删除失败: ' + error.message);
}
}