huhao/ylt_diy
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

悠修复自定义实收金额和求和采集功能增强

Browse Source
This commit is contained in:
haoslm
2026-07-28 14:16:46 +08:00
parent e72acb58ec
commit 4a1b0f71c3
9 changed files with 454 additions and 39 deletions
Download Patch File Download Diff File Expand all files Collapse all files

40
templates/index.html
View File

@@ -183,6 +183,7 @@
<button class="btn btn-success" onclick="showAddSumDataModal()">手动添加</button>
<button class="btn btn-warning" onclick="collectSumDataFromHistory()">从历史采集</button>
<button class="btn btn-info" onclick="exportSumData()">导出</button>
<button class="btn btn-secondary" onclick="showSumDataConfigModal()">全局配置</button>
<button class="btn btn-danger" onclick="batchDeleteSumData()" style="margin-left: auto;">批量删除</button>
</div>
@@ -297,7 +298,24 @@
<input type="text" id="custom-service-fee-name" class="form-control" placeholder="留空则使用默认名称（如：自定义服务费(0.8元/kWh)）" style="width: 300px;" autocomplete="off">
</div>
<div class="form-group">
<label>
<input type="checkbox" id="show-custom-service-fee" class="inline-checkbox" onchange="onVirtualFieldToggle(this)">
在报表中显示自定义服务费字段
</label>
</div>
<div class="form-group">
<label>
<input type="checkbox" id="show-total-amount" class="inline-checkbox" onchange="onVirtualFieldToggle(this)">
在报表中显示实收总金额字段（实收电费+自定义服务费）
</label>
</div>
<div class="form-group">
<label>实收总金额表头名称：</label>
<input type="text" id="total-amount-name" class="form-control" placeholder="留空则使用默认名称（实收总金额）" style="width: 300px;" autocomplete="off">
</div>
<div class="form-group">
<label>分时段电量统计：</label>
@@ -326,6 +344,28 @@
</div>
</div>
<!-- 求和数据全局配置模态框 -->
<div id="sum-data-config-modal" class="modal">
<div class="modal-content" style="max-width: 500px;">
<div class="modal-header">
<h2>求和数据全局配置</h2>
<button class="close-btn" onclick="closeSumDataConfigModal()">&times;</button>
</div>
<div class="modal-body">
<div class="form-group">
<label>采集字段（勾选后将在求和数据页面显示和采集，充电电量始终采集）：</label>
<div id="sum-data-config-fields-list" style="border: 1px solid var(--border); border-radius: 6px; padding: 10px; min-height: 100px; max-height: 300px; overflow-y: auto;">
<div class="loading">加载中...</div>
</div>
</div>
</div>
<div class="modal-footer">
<button class="btn" onclick="closeSumDataConfigModal()">取消</button>
<button class="btn btn-primary" onclick="saveSumDataConfig()">保存</button>
</div>
</div>
</div>
<!-- 添加/编辑求和数据模态框 -->
<div id="sum-data-modal" class="modal">
<div class="modal-content" style="max-width: 600px;">