1. 修改左邊選單

This commit is contained in:
Kai 2021-08-25 14:58:37 +08:00
parent 79cacfe612
commit d426b77361
7 changed files with 42 additions and 41 deletions

View File

@ -6,7 +6,7 @@
<div class="container-fluid">
<div class="row flex-nowrap wrapper">
<div class="col-md-2 col-1 pl-0 pr-0 collapse width border-right sidebar vh-100 overflow-auto">
<div class="col-md-2 col-1 pl-0 pr-0 collapse width border-right sidebar vh-100 overflow-auto">
<div class="list-group border-0 card text-center text-md-left" id="sidebar">

View File

@ -10,7 +10,7 @@
<div class="container-fluid">
<div class="row flex-nowrap wrapper">
<div class="col-md-2 col-1 pl-0 pr-0 collapse width border-right sidebar vh-100">
<div class="col-md-2 col-1 pl-0 pr-0 collapse width border-right sidebar vh-100 overflow-auto">
<div class="list-group border-0 card text-center text-md-left" id="sidebar">
@ -212,10 +212,7 @@
</div>
</div>
</div>
</div>
</div>
</div>
</div>

View File

@ -8,7 +8,7 @@
<div class="container-fluid">
<div class="row flex-nowrap wrapper">
<div class="col-md-2 col-1 pl-0 pr-0 collapse width border-right sidebar vh-100">
<div class="col-md-2 col-1 pl-0 pr-0 collapse width border-right sidebar vh-100 overflow-auto">
<div class="list-group border-0 card text-center text-md-left" id="sidebar">

View File

@ -8,7 +8,7 @@
<div class="container-fluid">
<div class="row flex-nowrap wrapper">
<div class="col-md-2 col-1 pl-0 pr-0 collapse width border-right sidebar vh-100">
<div class="col-md-2 col-1 pl-0 pr-0 collapse width border-right sidebar vh-100 overflow-auto">
<div class="list-group border-0 card text-center text-md-left" id="sidebar">

View File

@ -8,7 +8,7 @@
<div class="container-fluid">
<div class="row flex-nowrap wrapper">
<div class="col-md-2 col-1 pl-0 pr-0 collapse width border-right sidebar vh-100">
<div class="col-md-2 col-1 pl-0 pr-0 collapse width border-right sidebar vh-100 overflow-auto">
<div class="list-group border-0 card text-center text-md-left" id="sidebar">

View File

@ -8,11 +8,11 @@
<div class="card-body">
<div class="d-flex justify-content-between">
<p>今日發電量</p>
<p><span class="color-info-700" id="today_kwh">126,161.72</span></p>
<p><span class="color-info-700" id="today_kwh">0.00</span></p>
</div>
<div class="d-flex justify-content-between">
<p>累積發電量</p>
<p><span class="color-info-700" id="total_kwh">4,069.73</span></p>
<p><span class="color-info-700" id="total_kwh">0.00</span></p>
</div>
</div>
</div>
@ -24,11 +24,11 @@
<div class="card-body">
<div class="d-flex justify-content-between">
<p id="money-card-subtitle-total">總發金額</p>
<p><span class="color-info-700" id="total_money">126,161.72</span></p>
<p><span class="color-info-700" id="total_money">0.00</span></p>
</div>
<div class="d-flex justify-content-between">
<p id="money-card-subtitle-avg">平均發電金額</p>
<p><span class="color-info-700" id="today_money">4,069.73</span></p>
<p><span class="color-info-700" id="today_money">0.00</span></p>
</div>
</div>
</div>
@ -40,11 +40,11 @@
<div class="card-body">
<div class="d-flex justify-content-between">
<p>即時平均日照度</p>
<p><span class="color-info-700" id="today_irradiance">126,161.72</span></p>
<p><span class="color-info-700" id="today_irradiance">0.00</span></p>
</div>
<div class="d-flex justify-content-between">
<p>平均日照度(30天)</p>
<p><span class="color-info-700" id="avg_irradiance">4,069.73</span></p>
<p><span class="color-info-700" id="avg_irradiance">0.00</span></p>
</div>
</div>
</div>
@ -56,11 +56,11 @@
<div class="card-body">
<div class="d-flex justify-content-between">
<p>即時平均 PR 值</p>
<p><span class="color-info-700" id="today_PR">119.04</span></p>
<p><span class="color-info-700" id="today_PR">0.00</span></p>
</div>
<div class="d-flex justify-content-between">
<p>平均 PR 值(30天)</p>
<p><span class="color-info-700" id="avg_PR">3.84</span></p>
<p><span class="color-info-700" id="avg_PR">0.00</span></p>
</div>
</div>
</div>
@ -72,11 +72,11 @@
<div class="card-body">
<div class="d-flex justify-content-between">
<p>即時平均有效日照時數</p>
<p><span class="color-info-700" id="today_kwhkwp">140.39</span></p>
<p><span class="color-info-700" id="today_kwhkwp">0.00</span></p>
</div>
<div class="d-flex justify-content-between">
<p>平均有效日照時數(30天)</p>
<p><span class="color-info-700" id="avg_kwhkwp">4.53</span></p>
<p><span class="color-info-700" id="avg_kwhkwp">0.00</span></p>
</div>
</div>
</div>
@ -88,11 +88,11 @@
<div class="card-body">
<div class="d-flex justify-content-between">
<p>今日減碳量</p>
<p><span class="color-info-700" id="today_carbon">6,091.78</span></p>
<p><span class="color-info-700" id="today_carbon">0.00</span></p>
</div>
<div class="d-flex justify-content-between">
<p>累積減碳量</p>
<p><span class="color-info-700" id="total_carbon">985.98</span></p>
<p><span class="color-info-700" id="total_carbon">0.00</span></p>
</div>
</div>
</div>

View File

@ -8,7 +8,7 @@
<div class="container-fluid">
<div class="row flex-nowrap wrapper">
<div class="col-md-2 col-1 pl-0 pr-0 collapse width border-right sidebar vh-100">
<div class="col-md-2 col-1 pl-0 pr-0 collapse width border-right sidebar vh-100 overflow-auto">
<div class="list-group border-0 card text-center text-md-left" id="sidebar">
@ -229,7 +229,7 @@
<div class="row mb-5">
<div class="col-xl-12">
<div class="card p-3 w-100 overflow-auto">
<div class="card p-3 w-100" id="overviewtable">
<table class="table m-0">
<thead id="tothead">
</thead>
@ -241,7 +241,7 @@
</div>
<div class="row mb-5">
<div class="col-xl-12">
<div class="card p-3 w-100 " id="hiretable">
<div class="card p-3 w-100" id="hiretable" style="overflow-x:auto">
<table class="table m-0">
<thead id="HireTableHead">
<tr>
@ -259,7 +259,7 @@
</div>
<div class="row mb-5">
<div class="col-xl-12">
<div class="card p-3 w-100 " id="maxtable">
<div class="card p-3 w-100 " id="maxtable" style="overflow-x:auto">
<table class="table m-0">
<thead>
<tr>
@ -276,7 +276,7 @@
</div>
<div class="row mb-5">
<div class="col-xl-12">
<div class="card p-3 w-100 overflow-auto">
<div class="card p-3 w-100" id="detailtable" style="overflow-x:auto">
<table class="table m-0">
<thead id="TableHead">
</thead>
@ -305,11 +305,11 @@
$(function () {
//#region 預設初始值
var a = $('#collapse').trigger("click");
//document.getElementById("collapse").click();
$('.overflow-auto').hide();
$('#collapse').trigger("click");
$('#overviewtable').hide();
$('#maxtable').hide();
$('#hiretable').hide();
$('#detailtable').hide();
$('#DateGet').val(new Date().toISOString().substring(0, 10));
document.getElementById("DateGettextdiv").style.display = "none";//隱藏
$('#DateGet').attr('style', 'width:205px');
@ -488,11 +488,11 @@
$.each(selecterd_invert, function (index, inverter) {
if (inverter.value == nowpowerstation)
{
stri += '<button type="button" class="btn btn-success waves-effect waves-themed ml-2 mb-2 btn-station" id="' + inverter.value + '" onclick="selectPowerStation(' + inverter.value + ',this) ">' + inverter.name + '</button>';
stri += '<button type="button" class="btn btn-success waves-effect waves-themed ml-2 mb-2 btn-station" id="' + inverter.value + '" onclick="selectPowerStation(' + inverter.value + ',this) ">' + inverter.name + '</button>';
}
else
{
stri += '<button type="button" class="btn btn-outline-success waves-effect waves-themed ml-2 mb-2 btn-station" id="' + inverter.value + '" onclick="selectPowerStation(' + inverter.value + ',this) ">' + inverter.name + '</button>';
stri += '<button type="button" class="btn btn-outline-success waves-effect waves-themed ml-2 mb-2 btn-station" id="' + inverter.value + '" onclick="selectPowerStation(' + inverter.value + ',this) ">' + inverter.name + '</button>';
}
})
$('#selectOneStation').append(stri);
@ -542,14 +542,14 @@
selecterd_invert.push(getstation);
} else {
var a = selecterd_invert.filter(function (n, i) {
if (n.name === getstation.name && n.value === getstation.value) {
if (nowpowerstation == getstation.value) {
nowpowerstation = null;
}
selecterd_invert.splice(i, 1);
}
});
}
AddButtonWithStation();
@ -645,8 +645,8 @@
}
});
$("#js_list_accordion .collapse").collapse('show');
}, 'json');
}
//#endregion
@ -938,7 +938,9 @@
haveinvertName = [];
}
$('.overflow-auto').show();
$('#overviewtable').show();
$('#detailtable').show();
nowform = form;
}, 'json');
}
@ -1007,7 +1009,7 @@
}
else
{
var npush = true;
var npush = true;
CityArray.filter(function (n, i) {
if (n.city == data.cityName) {
n.kwp += cityinfo.kwp;
@ -1032,11 +1034,11 @@
if (showmoney == 1) {
StrInfoBody += "<td>" + data.todayMoney.toFixed(2) + "</td>";
StrInfoBody += "<td>" + (data.todayMoney * hirerate * 0.01).toFixed(2)+ "</td>";
StrInfoBody += "<td>" + (data.todayMoney * hirerate * 0.01).toFixed(2)+ "</td>";
StrInfoBody += "<td>" + data.todayMoney.toFixed(2) + "</td>";
StrInfoBody += "<td>" + data.todayMoney.toFixed(2) + "</td>";
}
StrInfoBody += "</tr>";
@ -1079,7 +1081,9 @@
$('#maxtableBody').append(CityInfoBody);
$('#maxtable').show();
$('.overflow-auto').show();
$('#overviewtable').show();
$('#detailtable').show();
nowform = 2;
})
}
@ -1106,7 +1110,7 @@
})
}
});
return hirerate;
return hirerate;
}
</script>