Merge branch 'master' of github.com:zogodo/zTC1

This commit is contained in:
2ndacc
2020-02-21 23:00:18 +08:00
2 changed files with 5426 additions and 5388 deletions

View File

@@ -150,14 +150,11 @@
</div> </div>
</div> </div>
<div class="page page1 demo-graphs mdl-shadow--2dp mdl-cell mdl-cell--8-col"> <div id="ct-chart-par" class="page page1 mdl-card__supporting-text mdl-shadow--2dp mdl-cell mdl-cell--8-col"
<div class="ct-chart ct-perfect-fourth"></div> style="height:300px;overflow-x:scroll;overflow-y:hidden;">
<svg fill="currentColor" viewBox="0 0 500 250" class="demo-graph"> <div id="ct-chart" class="ct-chart ct-perfect-fourth" style="height:280px;"></div>
<use xlink:href="#chart" />
</svg>
</div> </div>
<div class="page page2 demo-charts mdl-shadow--2dp mdl-cell mdl-cell--12-col mdl-grid"> <div class="page page2 demo-charts mdl-shadow--2dp mdl-cell mdl-cell--12-col mdl-grid">
<svg fill="currentColor" width="200px" height="200px" viewBox="0 0 1 1" class="demo-chart mdl-cell mdl-cell--4-col mdl-cell--3-col-desktop"> <svg fill="currentColor" width="200px" height="200px" viewBox="0 0 1 1" class="demo-chart mdl-cell mdl-cell--4-col mdl-cell--3-col-desktop">
<use xlink:href="#piechart" mask="url(#piemask)" /> <use xlink:href="#piechart" mask="url(#piemask)" />
@@ -308,6 +305,9 @@
alert(re.status); alert(re.status);
} }
var chart_par = document.getElementById("ct-chart-par");
chart_par.scrollTo(chart_par.scrollWidth, 0);
var data = { var data = {
series: [ series: [
[] []
@@ -315,6 +315,7 @@
}; };
var t = new Chartist.Line('.ct-chart', data, {showArea: true}); var t = new Chartist.Line('.ct-chart', data, {showArea: true});
var power_idx = 0; var power_idx = 0;
var chart_wth = 0;
function GetPowerRecord() { function GetPowerRecord() {
$.ajax({ $.ajax({
url: "/power", url: "/power",
@@ -324,10 +325,18 @@
re = re.replace(/'/g, '"'); re = re.replace(/'/g, '"');
var power = JSON.parse(re); var power = JSON.parse(re);
power_idx = power.idx + 1; power_idx = power.idx + 1;
power.powers.array.forEach(element => {
var x = chart_par.scrollWidth - chart_par.offsetWidth - chart_par.scrollLeft;
power.powers.forEach(element => {
data.series[0].push(element/10); data.series[0].push(element/10);
}); });
chart_wth += power.powers.length;
$("#ct-chart").width(chart_wth * 10);
t.update(data); t.update(data);
if (power.powers.length != 0 && x < 100) {
chart_par.scrollTo(chart_par.scrollWidth, 0);
}
window.setTimeout(GetPowerRecord, 3000); window.setTimeout(GetPowerRecord, 3000);
}, },
error: AjaxErr error: AjaxErr

File diff suppressed because it is too large Load Diff