GitHub/zTC1
1
0
Fork 0
mirror of https://github.com/oopuuu/zTC1.git synced 2025-12-15 06:28:14 +08:00
Code Issues Packages Projects Releases Wiki Activity

在后台增加显示昨日今日耗电量

Browse Source
This commit is contained in:
nhkefus
2025-03-19 12:34:53 +08:00
parent 52da5983b5
commit f41a20f8d0
3 changed files with 27 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
TC1/http_server/app_httpd.c
View File

@@ -243,7 +243,7 @@ static int HttpGetPowerInfo(httpd_request_t *req) {
user_config->socket_names[4],
user_config->socket_names[5]);
sprintf(power_info_json, POWER_INFO_JSON, sockets, power_record.idx, PW_NUM, p_count, powers,
up_time,user_config->power_led_enabled,RelayOut()?1:0,socket_names);
up_time,user_config->power_led_enabled,RelayOut()?1:0,socket_names,user_config->p_count_1_day_ago,user_config->p_count_2_days_ago);
send_http(power_info_json, strlen(power_info_json), exit, &err);
if (socket_names) free(socket_names);
exit:

2
TC1/http_server/app_httpd.h
View File

@@ -68,7 +68,7 @@
'socketNames':'%s'\
}"
#define POWER_INFO_JSON "{'sockets':'%s','idx':%d,'len':%d,'p_count':%ld,'powers':[%s],'up_time':'%s','led_enabled':%d,'total_switch_on':%d,'socketNames':'%s'}"
#define POWER_INFO_JSON "{'sockets':'%s','idx':%d,'len':%d,'p_count':%ld,'powers':[%s],'up_time':'%s','led_enabled':%d,'total_switch_on':%d,'socketNames':'%s','p_count_today':%ld,'p_count_yesterday':%ld}"
int AppHttpdStart(void);

41
TC1/http_server/web/index.html
View File

@@ -27,20 +27,20 @@
<div class="mdl-layout__header-row">
<span class="mdl-layout-title">TC1智能插座</span>
<div class="mdl-layout-spacer"></div>
<button class="mdl-button mdl-js-button mdl-js-ripple-effect mdl-button--icon"
id="hdrbtn">
<i class="material-icons">
<svg>
<use xlink:href="#icon-translate"/>
</svg>
</i>
</button>
<ul class="mdl-menu mdl-js-menu mdl-js-ripple-effect mdl-menu--bottom-right"
for="hdrbtn">
<li class="mdl-menu__item" onclick="ChangeLanguage('en')">English</li>
<li class="mdl-menu__item" onclick="ChangeLanguage('cn')">中文</li>
<li class="mdl-menu__item" onclick="ChangeLanguage('jp')">日本語</li>
</ul>
<!-- <button class="mdl-button mdl-js-button mdl-js-ripple-effect mdl-button&#45;&#45;icon"-->
<!-- id="hdrbtn">-->
<!-- <i class="material-icons">-->
<!-- <svg>-->
<!-- <use xlink:href="#icon-translate"/>-->
<!-- </svg>-->
<!-- </i>-->
<!-- </button>-->
<!-- <ul class="mdl-menu mdl-js-menu mdl-js-ripple-effect mdl-menu&#45;&#45;bottom-right"-->
<!-- for="hdrbtn">-->
<!-- <li class="mdl-menu__item" onclick="ChangeLanguage('en')">English</li>-->
<!-- <li class="mdl-menu__item" onclick="ChangeLanguage('cn')">中文</li>-->
<!-- <li class="mdl-menu__item" onclick="ChangeLanguage('jp')">日本語</li>-->
<!-- </ul>-->
<button onclick="reboot()"
class="mdl-button mdl-js-button mdl-js-ripple-effect mdl-button--icon"
id="rebootbtn">
@@ -270,8 +270,10 @@
style="height:315px;overflow-x:scroll;overflow-y:hidden;">
<table class="pw">
<tr>
<td>P: <span id="p" class="success">0</span> W</td>
<td>W: <span id="w" class="error">0</span> kW·h</td>
<td>当前功率: <span id="p" class="success">0</span> W</td>
<td>今日电量: <span id="w_t" class="error">0</span> kW·h</td>
<td>昨日电量: <span id="w_y" class="error">0</span> kW·h</td>
<td>总电量: <span id="w" class="error">0</span> kW·h</td>
</tr>
</table>
<div id="ct-chart" class="ct-chart ct-perfect-fourth"
@@ -1028,6 +1030,9 @@
var chart_wth = 0;
var p = document.getElementById("p");
var w = document.getElementById("w");
var w_t = document.getElementById("w_t");
var w_y = document.getElementById("w_y");
function GetPowerRecord() {
HttpPost("/power", function (re) {
re = re.replace(/'/g, '"');
@@ -1054,6 +1059,10 @@
var w_v = (17.1 * power.p_count) / 1000 / 36000;
w.innerHTML = w_v.toFixed(2);
var w_v_t = (17.1 * power.p_count_today) / 1000 / 36000;
w_t.innerHTML = w_v_t.toFixed(2);
var w_v_y = (17.1 * power.p_count_yesterday) / 1000 / 36000;
w_y.innerHTML = w_v_y.toFixed(2);
if (power.led_enabled == 1) {
switch_lables[0].MaterialSwitch.on();
} else {