網頁排版: 手機版本Dashboard畫面優化;查詢功能: 新增清空下方列以及等待圖示

This commit is contained in:
wanling040@gmail.com 2022-08-01 03:02:46 +08:00
parent 112fb2ca0f
commit ad5386ca7f
16 changed files with 422 additions and 389 deletions

View File

@ -10,9 +10,8 @@
<div class="container-fluid"> <div class="container-fluid">
<div class="row flex-nowrap wrapper"> <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-auto pr-0 collapse border-right sidebar vh-100 overflow-auto">
<div class="list-group border-0 card text-center text-md-left" id="sidebar" style="width: 90%">
<div class="list-group border-0 card text-center text-md-left" id="sidebar">
<div class="border bg-light rounded-top"> <div class="border bg-light rounded-top">
<div class="form-group p-2 m-0 rounded-top"> <div class="form-group p-2 m-0 rounded-top">
@ -48,7 +47,7 @@
<div id="panel-5" class="panel"> <div id="panel-5" class="panel">
<div class="panel-container show"> <div class="panel-container show">
<div class="panel-content"> <div class="panel-content">
<div class="mb-5 d-flex justify-content-start"> <div class="row mb-5 d-flex align-items-top px-3">
<div class="pr-3"> <div class="pr-3">
<div class="btn-group btn-group-md"> <div class="btn-group btn-group-md">
<button type="button" class="btn btn-success waves-effect waves-themed btn-change-searchType" id="Group0" onclick="changeType(0,this)">日</button> <button type="button" class="btn btn-success waves-effect waves-themed btn-change-searchType" id="Group0" onclick="changeType(0,this)">日</button>
@ -568,7 +567,6 @@
} }
function GetAnalysisInverter() { function GetAnalysisInverter() {
showLoading();
var date; var date;
if (searchType != 1) { if (searchType != 1) {
date = $('#DateGet').val(); date = $('#DateGet').val();
@ -590,10 +588,9 @@
} }
$("#btn-analysis-inverter").html('<span class="spinner-border spinner-border-sm" role="status" aria-hidden="true"></span>').attr("disabled", true); $("#btn-analysis-inverter").html('<span class="spinner-border spinner-border-sm" role="status" aria-hidden="true"></span>').attr("disabled", true);
$('#container').hide();
$.post(url, send_data, function (rel) { $.post(url, send_data, function (rel) {
if (rel.code != "0000") { if (rel.code != "0000") {
hideLoading();
toast_error(rel.msg); toast_error(rel.msg);
$("#btn-analysis-inverter").html('查詢').attr("disabled", false); $("#btn-analysis-inverter").html('查詢').attr("disabled", false);
return; return;
@ -609,7 +606,7 @@
ReloadHighCharts(); ReloadHighCharts();
$("#btn-analysis-inverter").html('查詢').attr("disabled", false); $("#btn-analysis-inverter").html('查詢').attr("disabled", false);
hideLoading(); $('#container').show();
}, 'json'); }, 'json');
} }

View File

@ -12,10 +12,8 @@
<div class="container-fluid"> <div class="container-fluid">
<div class="row flex-nowrap wrapper"> <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-auto pr-0 collapse border-right sidebar vh-100 overflow-auto">
<div class="list-group border-0 card text-center text-md-left" id="sidebar" style="width: 90%">
<div class="list-group border-0 card text-center text-md-left" id="sidebar">
<div class="border bg-light rounded-top"> <div class="border bg-light rounded-top">
<div class="form-group p-2 m-0 rounded-top"> <div class="form-group p-2 m-0 rounded-top">
<input type="text" class="form-control form-control-lg shadow-inset-2 m-0" id="js_list_accordion_filter" placeholder=""> <input type="text" class="form-control form-control-lg shadow-inset-2 m-0" id="js_list_accordion_filter" placeholder="">
@ -76,9 +74,8 @@
<div class="frame-wrap"> <div class="frame-wrap">
<div class="row mb-5"> <div class="row mb-5">
<div class="card-columns"> <div class="card-group">
<div class="col card px-0 mx-2 my-2" style="min-width: 16rem; max-width: 16rem;">
<div class="card">
<div class="card-header bg-fusion-25 pr-3 d-flex align-items-center flex-wrap"> <div class="card-header bg-fusion-25 pr-3 d-flex align-items-center flex-wrap">
<h4 class="mb-0 font-weight-bold"><span class="fal fa-bolt mr-1"></span> 發電量</h4> <h4 class="mb-0 font-weight-bold"><span class="fal fa-bolt mr-1"></span> 發電量</h4>
<div class="ml-auto">kW h</div> <div class="ml-auto">kW h</div>
@ -96,7 +93,7 @@
</div> </div>
@if (ViewBag.myUser.Role.Auths.Contains("ShowMoney")) @if (ViewBag.myUser.Role.Auths.Contains("ShowMoney"))
{ {
<div class="card"> <div class="col card px-0 mx-2 my-2" style="min-width: 16rem; max-width: 16rem;">
<div class="card-header bg-fusion-25 pr-3 d-flex align-items-center flex-wrap"> <div class="card-header bg-fusion-25 pr-3 d-flex align-items-center flex-wrap">
<h4 class="mb-0 font-weight-bold"><span class="fal fa-dollar-sign mr-1"></span> <span id="money-card-title">發電金額</span></h4> <h4 class="mb-0 font-weight-bold"><span class="fal fa-dollar-sign mr-1"></span> <span id="money-card-title">發電金額</span></h4>
<div class="ml-auto">NTD</div> <div class="ml-auto">NTD</div>
@ -115,7 +112,7 @@
} }
else else
{ {
<div class="card"> <div class="col card px-0 mx-2 my-2" style="min-width: 16rem; max-width: 16rem;">
<div class="card-header bg-fusion-25 pr-3 d-flex align-items-center flex-wrap"> <div class="card-header bg-fusion-25 pr-3 d-flex align-items-center flex-wrap">
<h4 class="mb-0 font-weight-bold"><span class="fal fa-sun mr-1"></span> 日照度</h4> <h4 class="mb-0 font-weight-bold"><span class="fal fa-sun mr-1"></span> 日照度</h4>
<div class="ml-auto">W/m<sup>2</sup></div> <div class="ml-auto">W/m<sup>2</sup></div>
@ -132,7 +129,7 @@
</div> </div>
</div> </div>
} }
<div class="card"> <div class="col card px-0 mx-2 my-2" style="min-width: 16rem; max-width: 16rem;">
<div class="card-header bg-fusion-25 pr-3 d-flex align-items-center flex-wrap"> <div class="card-header bg-fusion-25 pr-3 d-flex align-items-center flex-wrap">
<h4 class="mb-0 font-weight-bold"><span class="fal fa-bolt mr-1"></span> PR值</h4> <h4 class="mb-0 font-weight-bold"><span class="fal fa-bolt mr-1"></span> PR值</h4>
<div class="ml-auto">%</div> <div class="ml-auto">%</div>
@ -148,7 +145,7 @@
</div> </div>
</div> </div>
</div> </div>
<div class="card"> <div class="col card px-0 mx-2 my-2" style="min-width: 16rem; max-width: 16rem;">
<div class="card-header bg-fusion-25 pr-3 d-flex align-items-center flex-wrap"> <div class="card-header bg-fusion-25 pr-3 d-flex align-items-center flex-wrap">
<h4 class="mb-0 font-weight-bold"><span class="fal fa-sun mr-1"></span>日均發電度數</h4> <h4 class="mb-0 font-weight-bold"><span class="fal fa-sun mr-1"></span>日均發電度數</h4>
<div class="ml-auto">hr</div> <div class="ml-auto">hr</div>
@ -164,7 +161,7 @@
</div> </div>
</div> </div>
</div> </div>
<div class="card"> <div class="col card px-0 mx-2 my-2" style="min-width: 16rem; max-width: 16rem;">
<div class="card-header bg-fusion-25 pr-3 d-flex align-items-center flex-wrap"> <div class="card-header bg-fusion-25 pr-3 d-flex align-items-center flex-wrap">
<h4 class="mb-0 font-weight-bold"><span class="fal fa-cow mr-1"></span> 減碳量</h4> <h4 class="mb-0 font-weight-bold"><span class="fal fa-cow mr-1"></span> 減碳量</h4>
<div class="ml-auto">kG</div> <div class="ml-auto">kG</div>
@ -424,6 +421,22 @@
}); });
//#endregion //#endregion
function emptyCard() {
$('#today_money').html('0');
$('#total_money').html('0');
$('#today_kwh').html('0.00');
$('#total_kwh').html('0.00');
$('#today_irradiance').html('0.00');
$('#total_irradiance').html('0.00');
$('#today_PR').html('0.00');
$('#total_PR').html('0.00');
$('#today_kwhkwp').html('0.00');
$('#total_kwhkwp').html('0.00');
$('#today_carbon').html('0.00');
$('#total_carbon').html('0.00');
$('#station-convas-div').empty();
}
//#region 5張卡片值 //#region 5張卡片值
function GetStationsCard() { function GetStationsCard() {
var send_data = { var send_data = {
@ -431,6 +444,7 @@
timerange: timerange, timerange: timerange,
seacrhType: searchType seacrhType: searchType
} }
emptyCard();
showLoading(); showLoading();
var Nurl = "/AnalysisStationCombine/GetStationsCard"; var Nurl = "/AnalysisStationCombine/GetStationsCard";
$.post(Nurl, send_data, function (rel) { $.post(Nurl, send_data, function (rel) {

View File

@ -10,9 +10,8 @@
<div class="container-fluid"> <div class="container-fluid">
<div class="row flex-nowrap wrapper"> <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-auto pr-0 collapse border-right sidebar vh-100 overflow-auto">
<div class="list-group border-0 card text-center text-md-left" id="sidebar" style="width: 90%">
<div class="list-group border-0 card text-center text-md-left" id="sidebar">
<div class="border bg-light rounded-top"> <div class="border bg-light rounded-top">
<div class="form-group p-2 m-0 rounded-top"> <div class="form-group p-2 m-0 rounded-top">
@ -48,7 +47,7 @@
<div id="panel-5" class="panel"> <div id="panel-5" class="panel">
<div class="panel-container show"> <div class="panel-container show">
<div class="panel-content"> <div class="panel-content">
<div class="mb-5 d-flex justify-content-start"> <div class="row mb-5 d-flex align-items-top px-3">
<div class="pr-3"> <div class="pr-3">
<div class="btn-group btn-group-md"> <div class="btn-group btn-group-md">
<button type="button" class="btn btn-success waves-effect waves-themed btn-change-searchType" id="Group0" onclick="changeType(0,this)">日</button> <button type="button" class="btn btn-success waves-effect waves-themed btn-change-searchType" id="Group0" onclick="changeType(0,this)">日</button>
@ -82,7 +81,7 @@
<div class="pr-3"> <div class="pr-3">
<div class="btn-group" id="js-demo-nesting" role="group" aria-label="Button group with nested dropdown"> <div class="btn-group" id="js-demo-nesting" role="group" aria-label="Button group with nested dropdown">
<div class="btn-group" role="group"> <div class="btn-group" role="group">
<button type="button" class="btn btn-secondary dropdown-toggle" data-toggle="dropdown">選擇比較欄位</button> <button type="button" class="btn btn-secondary dropdown-toggle" data-toggle="dropdown" id="chooseToCompareBtn">選擇比較欄位</button>
<ul class="dropdown-menu" id="compare-dropdown-menu" style="width:10vw;overflow-x:hidden; max-height:50vh"> <ul class="dropdown-menu" id="compare-dropdown-menu" style="width:10vw;overflow-x:hidden; max-height:50vh">
</ul> </ul>
</div> </div>
@ -598,7 +597,7 @@
//在剛開始就在 sensor_type_detail 資料表中 取得ItemName //在剛開始就在 sensor_type_detail 資料表中 取得ItemName
//#region //#region
function GetItemInfo(itemId) { function GetItemInfo(itemId) {
showLoading(); $("#chooseToCompareBtn").html('<span class="spinner-border spinner-border-sm" role="status" aria-hidden="true"></span>').attr("disabled", true);
//sensor_type_detail_dictionary = {''} //sensor_type_detail_dictionary = {''}
//my_dict = { 'first_name': 'eddie', 'last_name': 'kao', 'age': 30 } //my_dict = { 'first_name': 'eddie', 'last_name': 'kao', 'age': 30 }
@ -610,19 +609,19 @@
$.post(url, send_data, function (rel) { $.post(url, send_data, function (rel) {
if (rel.code == "9999") { if (rel.code == "9999") {
hideLoading(); $("#chooseToCompareBtn").html('選擇比較欄位').attr("disabled", false);
toast_error(rel.msg); toast_error(rel.msg);
return; return;
} }
else if (rel.code == "9998") { else if (rel.code == "9998") {
hideLoading(); $("#chooseToCompareBtn").html('選擇比較欄位').attr("disabled", false);
toast_error(rel.msg); toast_error(rel.msg);
return; return;
} }
var nowCompare_col = [{ key: rel.data.itemEName, title: rel.data.itemName, default: true }]; var nowCompare_col = [{ key: rel.data.itemEName, title: rel.data.itemName, default: true }];
PushSpecifyCurrentCompareCol(nowCompare_col); PushSpecifyCurrentCompareCol(nowCompare_col);
ChangeCompareSelectOption(); ChangeCompareSelectOption();
hideLoading(); $("#chooseToCompareBtn").html('選擇比較欄位').attr("disabled", false);
}, 'json'); }, 'json');
} }
//#endregion //#endregion
@ -685,7 +684,6 @@
} }
function GetAnalysisStationInfo() { function GetAnalysisStationInfo() {
showLoading();
var date; var date;
if (searchType != 1) { if (searchType != 1) {
date = $('#DateGet').val(); date = $('#DateGet').val();
@ -707,10 +705,9 @@
} }
$("#btn-analysis-stationinfo").html('<span class="spinner-border spinner-border-sm" role="status" aria-hidden="true"></span>').attr("disabled", true); $("#btn-analysis-stationinfo").html('<span class="spinner-border spinner-border-sm" role="status" aria-hidden="true"></span>').attr("disabled", true);
$('#container').hide();
$.post(url, send_data, function (rel) { $.post(url, send_data, function (rel) {
if (rel.code != "0000") { if (rel.code != "0000") {
hideLoading();
toast_error(rel.msg); toast_error(rel.msg);
return; return;
} }
@ -727,7 +724,8 @@
ReloadHighCharts() ReloadHighCharts()
$("#btn-analysis-stationinfo").html('查詢').attr("disabled", false); $("#btn-analysis-stationinfo").html('查詢').attr("disabled", false);
hideLoading(); $('#container').show();
}, 'json'); }, 'json');
} }

View File

@ -12,9 +12,8 @@
<div class="container-fluid"> <div class="container-fluid">
<div class="row flex-nowrap wrapper"> <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-auto pr-0 collapse border-right sidebar vh-100 overflow-auto">
<div class="list-group border-0 card text-center text-md-left" id="sidebar" style="width: 90%">
<div class="list-group border-0 card text-center text-md-left" id="sidebar">
<div class="border bg-light rounded-top"> <div class="border bg-light rounded-top">
<div class="form-group p-2 m-0 rounded-top"> <div class="form-group p-2 m-0 rounded-top">
@ -138,7 +137,7 @@
<div id="panel-5" class="panel"> <div id="panel-5" class="panel">
<div class="panel-container show"> <div class="panel-container show">
<div class="panel-content"> <div class="panel-content">
<div class="mb-3 d-flex justify-content-start"> <div class="row mb-5 d-flex align-items-top px-3">
<div class="pr-3"> <div class="pr-3">
<div class="btn-group btn-group-md"> <div class="btn-group btn-group-md">
<button type="button" class="btn btn-success waves-effect waves-themed btn-change-searchType" id="Group0" onclick="changeType(0,this)">60天內</button> <button type="button" class="btn btn-success waves-effect waves-themed btn-change-searchType" id="Group0" onclick="changeType(0,this)">60天內</button>
@ -189,7 +188,6 @@
</tr> </tr>
</thead> </thead>
<tbody id="totbody"> <tbody id="totbody">
</tbody> </tbody>
</table> </table>
</div> </div>
@ -260,21 +258,21 @@
var selected_id; var selected_id;
var RecordTable; var RecordTable;
//#region Date-Picker //#region Date-Picker
datepicker = $('#DateGettext').daterangepicker({ datepicker = $('#DateGettext').daterangepicker({
autoUpdateInput: false, autoUpdateInput: false,
locale: { format: 'YYYY/MM/DD' }, locale: { format: 'YYYY/MM/DD' },
opens: 'left' opens: 'left'
}); });
$('#DateGettext').on('apply.daterangepicker', function (ev, picker) { $('#DateGettext').on('apply.daterangepicker', function (ev, picker) {
$(this).val(picker.startDate.format('YYYY/MM/DD') + ' - ' + picker.endDate.format('YYYY/MM/DD')); $(this).val(picker.startDate.format('YYYY/MM/DD') + ' - ' + picker.endDate.format('YYYY/MM/DD'));
$(this).trigger('change'); $(this).trigger('change');
}); });
$('#DateGettext').on('cancel.daterangepicker', function (ev, picker) { $('#DateGettext').on('cancel.daterangepicker', function (ev, picker) {
$(this).val(''); $(this).val('');
$(this).trigger('change'); $(this).trigger('change');
}); });
//#endregion //#endregion
function showLoading() { function showLoading() {
@ -511,8 +509,7 @@
$("#Record-modal").modal(); $("#Record-modal").modal();
} }
function SaveSoldMoney() function SaveSoldMoney() {
{
if ($("#Record-form").valid()) { if ($("#Record-form").valid()) {
showLoading(); showLoading();
var url = "/ElectricitySoldRecord/SaveSoldMoney"; var url = "/ElectricitySoldRecord/SaveSoldMoney";
@ -558,7 +555,7 @@
"data": "id" "data": "id"
}, { }, {
"data": "powerStationName" "data": "powerStationName"
},{ }, {
"data": "month" "data": "month"
}, { }, {
"data": "startAt" "data": "startAt"
@ -606,8 +603,8 @@
"type": "POST", "type": "POST",
"data": function (d) { "data": function (d) {
d.stationId = selecterd_powerstationId, d.stationId = selecterd_powerstationId,
d.time = timerange, d.time = timerange,
d.searchType = searchType d.searchType = searchType
}, },
"dataSrc": function (rel) { "dataSrc": function (rel) {
hideLoading(); hideLoading();
@ -634,7 +631,7 @@
function Searchform() { function Searchform() {
$("#wait").show(); $("#wait").show();
/* console.log(selecterd_powerstationId);*/ /* console.log(selecterd_powerstationId);*/
if (searchType == 0 || searchType == 1) { if (searchType == 0 || searchType == 1) {
timerange = $('#DateGettext').val(); timerange = $('#DateGettext').val();
} }

View File

@ -54,13 +54,15 @@
</div> </div>
</div> </div>
<div class="row mb-5 d-flex align-items-top "> <div class="row mb-5 d-flex align-items-top px-3">
<div class="col-1 p-0"> <div class="pr-3">
<button type="button" class="btn btn-secondary waves-effect waves-themed" onclick="Allpowerstation()">全選</button> <button type="button" class="btn btn-secondary waves-effect waves-themed" onclick="Allpowerstation()">全選</button>
</div> </div>
<div class="col-11"> <div class="pr-3">
<div class="row frame-wrap" id="CheckPowerStation"> <div class="col-11">
<div class="row frame-wrap" id="CheckPowerStation">
</div>
</div> </div>
</div> </div>
</div> </div>
@ -630,14 +632,14 @@
powerids = []; powerids = [];
$.each(rel.data, function (index, val) { $.each(rel.data, function (index, val) {
if ($.inArray(parseInt(val.cityId), ids) > -1) { if ($.inArray(parseInt(val.cityId), ids) > -1) {
$('#CheckPowerStation').append("<div class='col-2 mb-2 custom-control custom-checkbox custom-control-inline' id='station_" + val.id + "' > "); $('#CheckPowerStation').append("<div class='col-2 mb-2 custom-control custom-checkbox custom-control-inline' style='min-width:180px;' id='station_" + val.id + "' > ");
$('#station_' + val.id).append("<input type='checkbox' class='custom-control-input'name='check_power_station[]' id='check_" + val.id + "' value='" + val.id + "' checked>"); $('#station_' + val.id).append("<input type='checkbox' class='custom-control-input'name='check_power_station[]' id='check_" + val.id + "' value='" + val.id + "' checked>");
$('#station_' + val.id).append("<label class='custom-control-label' for='check_" + val.id + "'>" + val.name + "</label>"); $('#station_' + val.id).append("<label class='custom-control-label' style='white-space:nowrap;' for='check_" + val.id + "'>" + val.name + "</label>");
powerids.push(String(val.id)); powerids.push(String(val.id));
} else { } else {
$('#CheckPowerStation').append("<div class='col-2 mb-2 custom-control custom-checkbox custom-control-inline' id='station_" + val.id + "' > "); $('#CheckPowerStation').append("<div class='col-2 mb-2 custom-control custom-checkbox custom-control-inline' style='min-width:180px;' id='station_" + val.id + "' > ");
$('#station_' + val.id).append("<input type='checkbox' class='custom-control-input'name='check_power_station[]' id='check_" + val.id + "' value='" + val.id + "' >"); $('#station_' + val.id).append("<input type='checkbox' class='custom-control-input'name='check_power_station[]' id='check_" + val.id + "' value='" + val.id + "' >");
$('#station_' + val.id).append("<label class='custom-control-label' for='check_" + val.id + "'>" + val.name + "</label>"); $('#station_' + val.id).append("<label class='custom-control-label' style='white-space:nowrap;' for='check_" + val.id + "'>" + val.name + "</label>");
if ($.inArray(parseInt(val.id), powerids) > -1) { if ($.inArray(parseInt(val.id), powerids) > -1) {
powerids.splice($.inArray(parseInt(val.id), powerids), 1); powerids.splice($.inArray(parseInt(val.id), powerids), 1);

View File

@ -15,9 +15,10 @@
<div class="spinner-border" role="status" style="width: 3rem; height: 3rem; display:none;" id="loading"></div> <div class="spinner-border" role="status" style="width: 3rem; height: 3rem; display:none;" id="loading"></div>
</div> </div>
<div class="row mb-5"> @*<div class="row mb-5">*@
<div class="card-columns"> <div class="row mb-5" style="display: flex; justify-content: center;">
<div class="card"> <div class="card-group">
<div class="col card px-0 mx-2 my-2" style="min-width: 16rem; max-width: 16rem;">
<div class="card-header bg-fusion-25 py-2 pr-3 d-flex align-items-center flex-wrap"> <div class="card-header bg-fusion-25 py-2 pr-3 d-flex align-items-center flex-wrap">
<h4 class="mb-0 font-weight-bold"><span class="fal fa-bolt mr-1"></span> 發電量</h4> <h4 class="mb-0 font-weight-bold"><span class="fal fa-bolt mr-1"></span> 發電量</h4>
<div class="ml-auto">kW h</div> <div class="ml-auto">kW h</div>
@ -33,7 +34,7 @@
</div> </div>
</div> </div>
</div> </div>
<div class="card"> <div class="col card px-0 mx-2 my-2" style="min-width: 16rem; max-width: 16rem;">
<div class="card-header bg-fusion-25 py-2 pr-3 d-flex align-items-center flex-wrap"> <div class="card-header bg-fusion-25 py-2 pr-3 d-flex align-items-center flex-wrap">
<h4 class="mb-0 font-weight-bold"><span class="fal fa-sun mr-1"></span> 日照度</h4> <h4 class="mb-0 font-weight-bold"><span class="fal fa-sun mr-1"></span> 日照度</h4>
<div class="ml-auto">W/m<sup>2</sup></div> <div class="ml-auto">W/m<sup>2</sup></div>
@ -49,7 +50,7 @@
</div> </div>
</div> </div>
</div> </div>
<div class="card"> <div class="col card px-0 mx-2 my-2" style="min-width: 16rem; max-width: 16rem;">
<div class="card-header bg-fusion-25 py-2 pr-3 d-flex align-items-center flex-wrap"> <div class="card-header bg-fusion-25 py-2 pr-3 d-flex align-items-center flex-wrap">
<h4 class="mb-0 font-weight-bold"><span class="fal fa-bolt mr-1"></span> PR值</h4> <h4 class="mb-0 font-weight-bold"><span class="fal fa-bolt mr-1"></span> PR值</h4>
<div class="ml-auto">%</div> <div class="ml-auto">%</div>
@ -65,7 +66,7 @@
</div> </div>
</div> </div>
</div> </div>
<div class="card"> <div class="col card px-0 mx-2 my-2" style="min-width: 16rem; max-width: 16rem;">
<div class="card-header bg-fusion-25 py-2 pr-3 d-flex align-items-center flex-wrap"> <div class="card-header bg-fusion-25 py-2 pr-3 d-flex align-items-center flex-wrap">
<h4 class="mb-0 font-weight-bold"><span class="fal fa-sun mr-1"></span>日均發電度數</h4> <h4 class="mb-0 font-weight-bold"><span class="fal fa-sun mr-1"></span>日均發電度數</h4>
<div class="ml-auto">hr</div> <div class="ml-auto">hr</div>
@ -81,7 +82,7 @@
</div> </div>
</div> </div>
</div> </div>
<div class="card"> <div class="col card px-0 mx-2 my-2" style="min-width: 16rem; max-width: 16rem;">
<div class="card-header bg-fusion-25 py-2 pr-3 d-flex align-items-center flex-wrap"> <div class="card-header bg-fusion-25 py-2 pr-3 d-flex align-items-center flex-wrap">
<h4 class="mb-0 font-weight-bold"><span class="fal fa-cow mr-1"></span> 減碳量</h4> <h4 class="mb-0 font-weight-bold"><span class="fal fa-cow mr-1"></span> 減碳量</h4>
<div class="ml-auto">kG</div> <div class="ml-auto">kG</div>
@ -97,49 +98,90 @@
</div> </div>
</div> </div>
</div> </div>
@if (ViewBag.myUser.Role.Auths.Contains("ShowMoney"))
{
<div class="col card px-0 mx-2 my-2" style="min-width: 16rem; max-width: 16rem;">
<div class="card-header bg-fusion-25 py-2 pr-3 d-flex align-items-center flex-wrap">
<h4 class="mb-0 font-weight-bold"><span class="fal fa-bolt mr-1"></span> 自建躉售</h4>
<div class="ml-auto">NTD</div>
</div>
<div class="card-body">
<div class="d-flex justify-content-between">
<p>今日發電金額</p>
<p><span class="color-info-700 fs-xl font-weight-bold" id="today_kwh_money_by_myself">0.00</span></p>
</div>
</div>
</div>
<div class="col card px-0 mx-2 my-2" style="min-width: 16rem; max-width: 16rem;">
<div class="card-header bg-fusion-25 py-2 pr-3 d-flex align-items-center flex-wrap">
<h4 class="mb-0 font-weight-bold"><span class="fal fa-bolt mr-1"></span> 租建躉售</h4>
<div class="ml-auto">NTD</div>
</div>
<div class="card-body">
<div class="d-flex justify-content-between">
<p>今日發電金額</p>
<p><span class="color-info-700 fs-xl font-weight-bold" id="today_kwh_money_from_tenant">0.00</span></p>
</div>
</div>
</div>
<div class="col card px-0 mx-2 my-2" style="min-width: 16rem; max-width: 16rem;">
<div class="card-header bg-fusion-25 py-2 pr-3 d-flex align-items-center flex-wrap">
<h4 class="mb-0 font-weight-bold"><span class="fal fa-bolt mr-1"></span> 自發自用</h4>
<div class="ml-auto">NTD</div>
</div>
<div class="card-body">
<div class="d-flex justify-content-between">
<p>今日省電金額</p>
<p><span class="color-info-700 fs-xl font-weight-bold" id="today_kwh_money_save_power">0.00</span></p>
</div>
</div>
</div>
}
</div> </div>
</div>
<div class="row">
@if (ViewBag.myUser.Role.Auths.Contains("ShowMoney")) @*<div class="card-group">
{ @if (ViewBag.myUser.Role.Auths.Contains("ShowMoney"))
<div class="card"> {
<div class="card-header bg-fusion-25 py-2 pr-3 d-flex align-items-center flex-wrap"> <div class="card" style="min-width: 16rem; max-width: 16rem;">
<h4 class="mb-0 font-weight-bold"><span class="fal fa-bolt mr-1"></span> 自建躉售</h4> <div class="card-header bg-fusion-25 py-2 pr-3 d-flex align-items-center flex-wrap">
<div class="ml-auto">NTD</div> <h4 class="mb-0 font-weight-bold"><span class="fal fa-bolt mr-1"></span> 自建躉售</h4>
</div> <div class="ml-auto">NTD</div>
<div class="card-body"> </div>
<div class="d-flex justify-content-between"> <div class="card-body">
<p>今日發電金額</p> <div class="d-flex justify-content-between">
<p><span class="color-info-700 fs-xl font-weight-bold" id="today_kwh_money_by_myself">0.00</span></p> <p>今日發電金額</p>
<p><span class="color-info-700 fs-xl font-weight-bold" id="today_kwh_money_by_myself">0.00</span></p>
</div>
</div> </div>
</div> </div>
</div> <div class="card" style="min-width: 16rem; max-width: 16rem;">
<div class="card"> <div class="card-header bg-fusion-25 py-2 pr-3 d-flex align-items-center flex-wrap">
<div class="card-header bg-fusion-25 py-2 pr-3 d-flex align-items-center flex-wrap"> <h4 class="mb-0 font-weight-bold"><span class="fal fa-bolt mr-1"></span> 租建躉售</h4>
<h4 class="mb-0 font-weight-bold"><span class="fal fa-bolt mr-1"></span> 租建躉售</h4> <div class="ml-auto">NTD</div>
<div class="ml-auto">NTD</div> </div>
</div> <div class="card-body">
<div class="card-body"> <div class="d-flex justify-content-between">
<div class="d-flex justify-content-between"> <p>今日發電金額</p>
<p>今日發電金額</p> <p><span class="color-info-700 fs-xl font-weight-bold" id="today_kwh_money_from_tenant">0.00</span></p>
<p><span class="color-info-700 fs-xl font-weight-bold" id="today_kwh_money_from_tenant">0.00</span></p> </div>
</div> </div>
</div> </div>
</div> <div class="card" style="min-width: 16rem; max-width: 16rem;">
<div class="card"> <div class="card-header bg-fusion-25 py-2 pr-3 d-flex align-items-center flex-wrap">
<div class="card-header bg-fusion-25 py-2 pr-3 d-flex align-items-center flex-wrap"> <h4 class="mb-0 font-weight-bold"><span class="fal fa-bolt mr-1"></span> 自發自用</h4>
<h4 class="mb-0 font-weight-bold"><span class="fal fa-bolt mr-1"></span> 自發自用</h4> <div class="ml-auto">NTD</div>
<div class="ml-auto">NTD</div> </div>
</div> <div class="card-body">
<div class="card-body"> <div class="d-flex justify-content-between">
<div class="d-flex justify-content-between"> <p>今日省電金額</p>
<p>今日省電金額</p> <p><span class="color-info-700 fs-xl font-weight-bold" id="today_kwh_money_save_power">0.00</span></p>
<p><span class="color-info-700 fs-xl font-weight-bold" id="today_kwh_money_save_power">0.00</span></p> </div>
</div> </div>
</div> </div>
</div> }
} </div>*@
<div class="col-md-8 col-sm-12"> <div class="col-md-8 col-sm-12">
<div id="panel-1" class="panel"> <div id="panel-1" class="panel">
<div class="panel-hdr"> <div class="panel-hdr">
@ -154,31 +196,32 @@
</div> </div>
</div> </div>
</div> </div>
<div class="col-md-4 col-sm-12">
<div class="row">
<div class="col-xl-6 mb-4">
<div class="card">
<div class="card-header bg-fusion-25 py-2 pr-3 d-flex align-items-center flex-wrap">
<h4 class="mb-0 font-weight-bold"><span class="fal fa-bolt mr-1"></span> 電站總數</h4>
</div>
<div class="card-body" style="min-height: 148px;">
<p class="text-center display-3"><span class="color-info-700 font-weight-bold" id="total_power_station_count">0</span></p>
<p class="text-right mb-0">廠</p>
</div>
</div>
</div>
<div class="col-xl-6 mb-4"> <div class="col-md-4 col-sm-12">
<div class="card"> <div class="card-group">
<div class="card-header bg-fusion-25 py-2 pr-3 d-flex align-items-center flex-wrap"> @*<div class="col-xl-6 mb-4">*@
<h4 class="mb-0 font-weight-bold"><span class="fal fa-bolt mr-1"></span> 總裝置容量</h4> <div class="col card px-0 mx-2 my-2" style="min-width: 14rem; max-width: 14rem;">
</div> <div class="card-header bg-fusion-25 py-2 pr-3 d-flex align-items-center flex-wrap">
<div class="card-body" style="min-height: 148px;"> <h4 class="mb-0 font-weight-bold"><span class="fal fa-bolt mr-1"></span> 電站總數</h4>
<p class="text-center display-3"><span class="color-info-700 font-weight-bold" id="total_capacity">0.00</span></p> </div>
<p class="text-right mb-0">MWp</p> <div class="card-body" style="min-height: 148px;">
</div> <p class="text-center display-3"><span class="color-info-700 font-weight-bold" id="total_power_station_count">0</span></p>
<p class="text-right mb-0">廠</p>
</div> </div>
</div> </div>
@*</div>*@
@*<div class="col-xl-6 mb-4">*@
<div class="col card px-0 mx-2 my-2" style="min-width: 14rem; max-width: 14rem;">
<div class="card-header bg-fusion-25 py-2 pr-3 d-flex align-items-center flex-wrap">
<h4 class="mb-0 font-weight-bold"><span class="fal fa-bolt mr-1"></span> 總裝置容量</h4>
</div>
<div class="card-body" style="min-height: 148px;">
<p class="text-center display-3"><span class="color-info-700 font-weight-bold" id="total_capacity">0.00</span></p>
<p class="text-right mb-0">MWp</p>
</div>
</div>
@*</div>*@
<div class="col-xl-12"> <div class="col-xl-12">
<div id="panel-1" class="panel"> <div id="panel-1" class="panel">
<div class="panel-hdr"> <div class="panel-hdr">
@ -203,8 +246,8 @@
</div> </div>
</div> </div>
</div> </div>
</div>
</div>
<div class="row"> <div class="row">
<div class="col-xl-12"> <div class="col-xl-12">
<div id="map" style="width: 100%; height:60vh"></div> <div id="map" style="width: 100%; height:60vh"></div>
@ -212,13 +255,13 @@
</div> </div>
@section Scripts{ @section Scripts{
@*<script src="http://maps.google.com/maps/api/js?sensor=false" type="text/javascript"></script>*@ @*<script src="http://maps.google.com/maps/api/js?sensor=false" type="text/javascript"></script>*@
<script src="https://maps.googleapis.com/maps/api/js?key=AIzaSyBF-NZ6zKpzthzB8cgFYVfAWPu_ZhSFR1c&callback=initMap" async></script> <script src="https://maps.googleapis.com/maps/api/js?key=AIzaSyBF-NZ6zKpzthzB8cgFYVfAWPu_ZhSFR1c&callback=initMap" async></script>
<script src="https://unpkg.com/@@googlemaps/markerclustererplus/dist/index.min.js"></script> <script src="https://unpkg.com/@@googlemaps/markerclustererplus/dist/index.min.js"></script>
<script> <script>
var capacityTable; var capacityTable;
var mapOverview; var mapOverview;
var locations = []; var locations = [];
@ -409,5 +452,5 @@
"https://developers.google.com/maps/documentation/javascript/examples/markerclusterer/m", "https://developers.google.com/maps/documentation/javascript/examples/markerclusterer/m",
}); });
} }
</script> </script>
} }

View File

@ -12,9 +12,8 @@
<div class="container-fluid"> <div class="container-fluid">
<div class="row flex-nowrap wrapper"> <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-auto pr-0 collapse border-right sidebar vh-100 overflow-auto">
<div class="list-group border-0 card text-center text-md-left" id="sidebar" style="width: 90%">
<div class="list-group border-0 card text-center text-md-left" id="sidebar">
<div class="border bg-light rounded-top"> <div class="border bg-light rounded-top">
<div class="form-group p-2 m-0 rounded-top"> <div class="form-group p-2 m-0 rounded-top">
@ -187,7 +186,7 @@
<div id="panel-5" class="panel"> <div id="panel-5" class="panel">
<div class="panel-container show"> <div class="panel-container show">
<div class="panel-content"> <div class="panel-content">
<div class="mb-3 d-flex justify-content-start"> <div class="row mb-5 d-flex align-items-top px-3">
<div class="pr-3"> <div class="pr-3">
<div class="btn-group btn-group-md"> <div class="btn-group btn-group-md">
<button type="button" class="btn btn-success waves-effect waves-themed btn-change-searchType" id="Group0" onclick="changeType(0,this)">日</button> <button type="button" class="btn btn-success waves-effect waves-themed btn-change-searchType" id="Group0" onclick="changeType(0,this)">日</button>
@ -209,10 +208,10 @@
</div> </div>
</div> </div>
<div class="pr-3"> <div class="pr-3">
<button type="button" class="btn btn-primary waves-effect waves-themed" onclick="submit()">查詢</button> <button type="button" class="btn btn-primary waves-effect waves-themed" onclick="submit()" id=" submitBtn">查詢</button>
</div> </div>
</div> </div>
<div class="mb-3 d-flex justify-content-start"> <div class="row mb-5 d-flex align-items-top px-3">
<div class="pr-3"> <div class="pr-3">
<div class="btn-group btn-group-md"> <div class="btn-group btn-group-md">
<button type="button" class="btn btn-success waves-effect waves-themed btn-form-type" onclick="ChangeForm(99, this)">全部</button> <button type="button" class="btn btn-success waves-effect waves-themed btn-form-type" onclick="ChangeForm(99, this)">全部</button>
@ -586,7 +585,6 @@
checkType : CheckType, checkType : CheckType,
powerstationIds: selecterd_station powerstationIds: selecterd_station
}; };
showLoading();
NoticeDataTable = $("#NoticeTable").DataTable({ NoticeDataTable = $("#NoticeTable").DataTable({
"pageLength": 10, "pageLength": 10,
"paging": true, "paging": true,
@ -644,15 +642,16 @@
d.info = info d.info = info
}, },
"dataSrc": function (rel) { "dataSrc": function (rel) {
hideLoading();
if (rel.data.code == "9999") { if (rel.data.code == "9999") {
toast_error(rel.data.msg); toast_error(rel.data.msg);
$("#submitBtn").html('查詢').attr("disabled", false);
return; return;
} }
data = rel.data.data; data = rel.data.data;
if (data == null || data.length == 0) { if (data == null || data.length == 0) {
this.data = []; this.data = [];
} }
$("#submitBtn").html('查詢').attr("disabled", false);
return data; return data;
} }
}, },
@ -665,7 +664,7 @@
function submit() { function submit() {
console.log(selecterd_station); console.log(selecterd_station);
$("#submitBtn").html('<span class="spinner-border spinner-border-sm" role="status" aria-hidden="true"></span>').attr("disabled", true);
info = info =
{ {
timeType: searchType, timeType: searchType,

View File

@ -55,17 +55,18 @@
</div> </div>
<div class="row mb-5 d-flex align-items-top px-3"> <div class="row mb-5 d-flex align-items-top px-3">
<div class="col-1 p-0"> <div class="pr-3">
<button type="button" class="btn btn-secondary waves-effect waves-themed" onclick="Allpowerstation()">全選</button> <button type="button" class="btn btn-secondary waves-effect waves-themed" onclick="Allpowerstation()">全選</button>
</div> </div>
<div class="col-11"> <div class="pr-3">
<div class="row frame-wrap" id="CheckPowerStation"> <div class="col-11">
<div class="row frame-wrap" id="CheckPowerStation">
</div>
</div> </div>
</div> </div>
</div> </div>
<div class="row d-flex justify-content-end px-3"> <div class="row d-flex justify-content-end px-3" style="max-height: 20px;">
<button type="button" class="btn btn-info waves-effect waves-themed mb-3 mr-2" onClick="saveToExcel();"> <button type="button" class="btn btn-info waves-effect waves-themed mb-3 mr-2" onClick="saveToExcel();">
<span class="fal fa-file-excel mr-1"></span> <span class="fal fa-file-excel mr-1"></span>
匯出 匯出
@ -574,14 +575,14 @@
}); });
if ($.inArray(parseInt(val.cityId), ids) > -1) { if ($.inArray(parseInt(val.cityId), ids) > -1) {
$('#CheckPowerStation').append("<div class='col-2 mb-2 custom-control custom-checkbox custom-control-inline' id='station_" + val.id + "' > "); $('#CheckPowerStation').append("<div class='col-2 mb-2 custom-control custom-checkbox custom-control-inline' style='min-width:180px;' id='station_" + val.id + "' > ");
$('#station_' + val.id).append("<input type='checkbox' class='custom-control-input' name='check_power_station[]' id='check_" + val.id + "' value='" + val.id + "' checked>"); $('#station_' + val.id).append("<input type='checkbox' class='custom-control-input' name='check_power_station[]' id='check_" + val.id + "' value='" + val.id + "' checked>");
$('#station_' + val.id).append("<label class='custom-control-label' for='check_" + val.id + "'>" + val.name + "</label>"); $('#station_' + val.id).append("<label class='custom-control-label' style='white-space:nowrap;' for='check_" + val.id + "'>" + val.name + "</label>");
powerids.push(String(val.id)); powerids.push(String(val.id));
} else { } else {
$('#CheckPowerStation').append("<div class='col-2 mb-2 custom-control custom-checkbox custom-control-inline' id='station_" + val.id + "' > "); $('#CheckPowerStation').append("<div class='col-2 mb-2 custom-control custom-checkbox custom-control-inline' style='min-width:180px;' id='station_" + val.id + "' > ");
$('#station_' + val.id).append("<input type='checkbox' class='custom-control-input' name='check_power_station[]' id='check_" + val.id + "' value='" + val.id + "' >"); $('#station_' + val.id).append("<input type='checkbox' class='custom-control-input' name='check_power_station[]' id='check_" + val.id + "' value='" + val.id + "' >");
$('#station_' + val.id).append("<label class='custom-control-label' for='check_" + val.id + "'>" + val.name + "</label>"); $('#station_' + val.id).append("<label class='custom-control-label' style='white-space:nowrap;' for='check_" + val.id + "'>" + val.name + "</label>");
if ($.inArray(parseInt(val.id), powerids) > -1) { if ($.inArray(parseInt(val.id), powerids) > -1) {
powerids.splice($.inArray(parseInt(val.id), powerids), 1); powerids.splice($.inArray(parseInt(val.id), powerids), 1);

View File

@ -69,17 +69,18 @@
</div> </div>
<div class="row mb-5 d-flex align-items-top px-3"> <div class="row mb-5 d-flex align-items-top px-3">
<div class="col-1 p-0"> <div class="pr-3">
<button type="button" class="btn btn-secondary waves-effect waves-themed" onclick="Allpowerstation()">全選</button> <button type="button" class="btn btn-secondary waves-effect waves-themed" onclick="Allpowerstation()">全選</button>
</div> </div>
<div class="col-11"> <div class="pr-3">
<div class="row frame-wrap" id="CheckPowerStation"> <div class="col-11">
<div class="row frame-wrap" id="CheckPowerStation">
</div>
</div> </div>
</div> </div>
</div> </div>
<div class="row d-flex justify-content-end px-3"> <div class="row d-flex justify-content-end px-3" style=" max-height: 20px;">
<button type="button" class="btn btn-info waves-effect waves-themed mb-3 mr-2" onclick="ExportExcel()"> <button type="button" class="btn btn-info waves-effect waves-themed mb-3 mr-2" onclick="ExportExcel()">
<span class="fal fa-file-excel mr-1"></span> <span class="fal fa-file-excel mr-1"></span>
匯出 匯出
@ -660,14 +661,14 @@
$.each(rel.data, function (index, val) { $.each(rel.data, function (index, val) {
if ($.inArray(parseInt(val.cityId), ids) > -1) { if ($.inArray(parseInt(val.cityId), ids) > -1) {
$('#CheckPowerStation').append("<div class='col-2 mb-2 custom-control custom-checkbox custom-control-inline' id='station_" + val.id + "' > "); $('#CheckPowerStation').append("<div class='col-2 mb-2 custom-control custom-checkbox custom-control-inline' style='min-width:180px;' id='station_" + val.id + "' > ");
$('#station_' + val.id).append("<input type='checkbox' class='custom-control-input' name='check_power_station[]' id='check_" + val.id + "' value='" + val.id + "' checked>"); $('#station_' + val.id).append("<input type='checkbox' class='custom-control-input' name='check_power_station[]' id='check_" + val.id + "' value='" + val.id + "' checked>");
$('#station_' + val.id).append("<label class='custom-control-label' for='check_" + val.id + "'>" + val.name + "</label>"); $('#station_' + val.id).append("<label class='custom-control-label' style='white-space:nowrap;' for='check_" + val.id + "'>" + val.name + "</label>");
powerids.push(String(val.id)); powerids.push(String(val.id));
} else { } else {
$('#CheckPowerStation').append("<div class='col-2 mb-2 custom-control custom-checkbox custom-control-inline' id='station_" + val.id + "' > "); $('#CheckPowerStation').append("<div class='col-2 mb-2 custom-control custom-checkbox custom-control-inline' style='min-width:180px;' id='station_" + val.id + "' > ");
$('#station_' + val.id).append("<input type='checkbox' class='custom-control-input' name='check_power_station[]' id='check_" + val.id + "' value='" + val.id + "' >"); $('#station_' + val.id).append("<input type='checkbox' class='custom-control-input' name='check_power_station[]' id='check_" + val.id + "' value='" + val.id + "' >");
$('#station_' + val.id).append("<label class='custom-control-label' for='check_" + val.id + "'>" + val.name + "</label>"); $('#station_' + val.id).append("<label class='custom-control-label' style='white-space:nowrap;' for='check_" + val.id + "'>" + val.name + "</label>");
if ($.inArray(parseInt(val.id), powerids) > -1) { if ($.inArray(parseInt(val.id), powerids) > -1) {
powerids.splice($.inArray(parseInt(val.id), powerids), 1); powerids.splice($.inArray(parseInt(val.id), powerids), 1);

View File

@ -12,9 +12,8 @@
<div class="container-fluid"> <div class="container-fluid">
<div class="row flex-nowrap wrapper"> <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-auto pr-0 collapse border-right sidebar vh-100 overflow-auto">
<div class="list-group border-0 card text-center text-md-left" id="sidebar" style="width: 90%">
<div class="list-group border-0 card text-center text-md-left" id="sidebar">
<div class="border bg-light rounded-top"> <div class="border bg-light rounded-top">
<div class="form-group p-2 m-0 rounded-top"> <div class="form-group p-2 m-0 rounded-top">
@ -189,7 +188,7 @@
<div id="panel-5" class="panel"> <div id="panel-5" class="panel">
<div class="panel-container show"> <div class="panel-container show">
<div class="panel-content"> <div class="panel-content">
<div class="mb-3 d-flex justify-content-start"> <div class="row mb-5 d-flex align-items-top px-3">
<div class="pr-3"> <div class="pr-3">
<div class="btn-group btn-group-md"> <div class="btn-group btn-group-md">
<button type="button" class="btn btn-secondary waves-effect waves-themed btn-change-searchType" onclick="changeType(0, this)" id="firstclick">月</button> <button type="button" class="btn btn-secondary waves-effect waves-themed btn-change-searchType" onclick="changeType(0, this)" id="firstclick">月</button>
@ -206,7 +205,7 @@
</div> </div>
</div> </div>
<div class="pr-3"> <div class="pr-3">
<button type="button" class="btn btn-primary waves-effect waves-themed ml-1" onclick="Search()">查詢</button> <button type="button" class="btn btn-primary waves-effect waves-themed ml-1" onclick="Search()" id="searchBtn">查詢</button>
</div> </div>
</div> </div>
<div class="mb-3 d-flex justify-content-start"> <div class="mb-3 d-flex justify-content-start">
@ -527,7 +526,11 @@
function Search() { function Search() {
showLoading(); $("#searchBtn").html('<span class="spinner-border spinner-border-sm" role="status" aria-hidden="true"></span>').attr("disabled", true);
$('#history-kWh-convas-div').hide();
$('#totalbody').empty();
$('#asbody').empty();
var url = "/PowerGeneration/GetGenerationList" var url = "/PowerGeneration/GetGenerationList"
var send_data = { var send_data = {
PowerstationId: nowpowerstation, PowerstationId: nowpowerstation,
@ -536,7 +539,7 @@
} }
$.post(url, send_data, function (rel) { $.post(url, send_data, function (rel) {
if (rel.code != "0000") { if (rel.code != "0000") {
hideLoading(); $("#searchBtn").html('查詢').attr("disabled", false);
toast_error(rel.msg); toast_error(rel.msg);
return; return;
} }
@ -552,8 +555,6 @@
var listcba = new Array(0); var listcba = new Array(0);
var listactual = new Array(0); var listactual = new Array(0);
var listreal = new Array(0); var listreal = new Array(0);
$('#totalbody').empty();
$('#asbody').empty();
if (rel.data.length == 0) if (rel.data.length == 0)
@ -685,8 +686,8 @@
} }
}); });
$("#searchBtn").html('查詢').attr("disabled", false);
hideLoading(); $('#history-kWh-convas-div').show();
}); });
} }

View File

@ -17,9 +17,8 @@
</ol> </ol>
<div class="container-fluid"> <div class="container-fluid">
<div class="row flex-nowrap wrapper"> <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-auto pr-0 collapse border-right sidebar vh-100 overflow-auto">
<div class="list-group border-0 card text-center text-md-left" id="sidebar" style="width: 100%">
<div class="list-group border-0 card text-center text-md-left" id="sidebar">
<div class="border bg-light rounded-top"> <div class="border bg-light rounded-top">
<div class="accordion accordion-hover accordion-clean js-list-filter" id="js_list_accordion"> <div class="accordion accordion-hover accordion-clean js-list-filter" id="js_list_accordion">
@ -114,57 +113,57 @@
</div> </div>
</div> </div>
<div id="templateAreaTab" hidden="hidden"> <div id="templateAreaTab" hidden="hidden">
<ul> <ul>
<li class="nav-item"> <li class="nav-item">
<a class="nav-link fs-lg px-4" data-toggle="tab" href="#tab-newtaipei" role="tab"> <a class="nav-link fs-lg px-4" data-toggle="tab" href="#tab-newtaipei" role="tab">
<span id="areaName" class="hidden-sm-down ml-1">新北市</span> <span id="solarCount" class="badge bg-primary-500 ml-2">4</span> <span id="areaName" class="hidden-sm-down ml-1">新北市</span> <span id="solarCount" class="badge bg-primary-500 ml-2">4</span>
</a> </a>
</li> </li>
</ul> </ul>
</div> </div>
<div id="templateArea" hidden="hidden"> <div id="templateArea" hidden="hidden">
<div class="tab-pane" id="tab-name" role="tabpanel" aria-labelledby="tab-name"> <div class="tab-pane" id="tab-name" role="tabpanel" aria-labelledby="tab-name">
@*<div class="row mb-5 d-flex justify-content-end"> @*<div class="row mb-5 d-flex justify-content-end">
<div class="col-6 text-right"> <div class="col-6 text-right">
<a href="javascript:TableDisplay();" class="btn btn-secondary btn-icon waves-effect waves-themed mr-1" style="width: 47px;"><span class="fal fa-list fa-2x mt-2"></span></a> <a href="javascript:TableDisplay();" class="btn btn-secondary btn-icon waves-effect waves-themed mr-1" style="width: 47px;"><span class="fal fa-list fa-2x mt-2"></span></a>
<a href="javascript:CardDisplay();" class="btn btn-secondary btn-icon waves-effect waves-themed mr-1" style="width: 47px;"><span class="fal fa-grip-horizontal fa-2x mt-2"></span></a> <a href="javascript:CardDisplay();" class="btn btn-secondary btn-icon waves-effect waves-themed mr-1" style="width: 47px;"><span class="fal fa-grip-horizontal fa-2x mt-2"></span></a>
</div> </div>
</div>*@ </div>*@
<div class="row solarCard" id="solarCard"> <div class="row solarCard" id="solarCard">
</div> </div>
<div class="TableArea"> <div class="TableArea">
<table id="solarTable" class="table table-bordered table-hover m-0 text-center"> <table id="solarTable" class="table table-bordered table-hover m-0 text-center">
<thead class="thead-themed"> <thead class="thead-themed">
<tr> <tr>
<th>電站名稱</th> <th>電站名稱</th>
<th>裝置容量(kWp)</th> <th>裝置容量(kWp)</th>
<th>逆變器數量</th> <th>逆變器數量</th>
<th>台電掛錶日</th> <th>台電掛錶日</th>
<th>狀態</th> <th>狀態</th>
<th>功能</th> <th>功能</th>
</tr> </tr>
</thead> </thead>
<tbody> <tbody>
@*<tr> @*<tr>
<th scope="row">PEP-NTP001-PYR-01</th> <th scope="row">PEP-NTP001-PYR-01</th>
<td>日照計01</td> <td>日照計01</td>
<td>日照計</td> <td>日照計</td>
<td>ADTEK</td> <td>ADTEK</td>
<td>CS1</td> <td>CS1</td>
<td></td> <td></td>
<td>CS1</td> <td>CS1</td>
<td></td> <td></td>
<td></td> <td></td>
<td> <td>
<button type="button" class="btn btn-primary btn-pills waves-effect waves-themed">修改</button> <button type="button" class="btn btn-primary btn-pills waves-effect waves-themed">修改</button>
</td> </td>
</tr>*@ </tr>*@
</tbody> </tbody>
</table> </table>
</div> </div>
</div> </div>
</div> </div>

View File

@ -33,20 +33,20 @@
</div> </div>
</div> </div>
<div class="row mb-3 d-flex align-items-top px-3"> <div class="row mb-3 d-flex align-items-top px-3">
<div class="col-1 p-0"> <div class="pr-3">
<button type="button" class="btn btn-secondary waves-effect waves-themed" data-checked="true" id="status-all-check">全選</button> <button type="button" class="btn btn-secondary waves-effect waves-themed" data-checked="true" id="status-all-check">全選</button>
</div> </div>
<div class="col-11 p-2"> <div class="pr-3">
<div class="row frame-wrap" id="CheckStatus"> <div class="col-auto px-3" id="CheckStatus">
<div class="col-2 mb-2 custom-control custom-checkbox d-flex align-content-center"> <div class="mb-3 custom-checkbox align-content-center">
<input type="checkbox" class="custom-control-input" name="powerStationStatus[]" id="Status_1" value="1" checked> <input type="checkbox" class="custom-control-input" name="powerStationStatus[]" id="Status_1" value="1" checked>
<label class="custom-control-label" for="Status_1">設備正常 <i class="btn btn-success btn-sm btn-icon rounded-circle waves-effect waves-themed fal fa-check"></i></label> <label class="custom-control-label" for="Status_1">設備正常 <i class="btn btn-success btn-sm btn-icon rounded-circle waves-effect waves-themed fal fa-check"></i></label>
</div> </div>
<div class=" col-2 mb-2 custom-control custom-checkbox align-content-center"> <div class="mb-3 custom-checkbox align-content-center">
<input type="checkbox" class="custom-control-input" name="powerStationStatus[]" id="Status_2" value="2" checked> <input type="checkbox" class="custom-control-input" name="powerStationStatus[]" id="Status_2" value="2" checked>
<label class="custom-control-label" for="Status_2">設備異常 <i class="btn btn-warning btn-sm btn-icon rounded-circle waves-effect waves-themed fal fa-exclamation"></i></label> <label class="custom-control-label" for="Status_2">設備異常 <i class="btn btn-warning btn-sm btn-icon rounded-circle waves-effect waves-themed fal fa-exclamation"></i></label>
</div> </div>
<div class="col-2 mb-2 custom-control custom-checkbox align-content-center"> <div class="mb-3 custom-checkbox align-content-center">
<input type="checkbox" class="custom-control-input" name="powerStationStatus[]" id="Status_3" value="3" checked> <input type="checkbox" class="custom-control-input" name="powerStationStatus[]" id="Status_3" value="3" checked>
<label class="custom-control-label" for="Status_3">設備斷線 <i class="btn btn-danger btn-sm btn-icon rounded-circle waves-effect waves-themed fal fa-horizontal-rule"></i></label> <label class="custom-control-label" for="Status_3">設備斷線 <i class="btn btn-danger btn-sm btn-icon rounded-circle waves-effect waves-themed fal fa-horizontal-rule"></i></label>
</div> </div>
@ -75,88 +75,88 @@
</div> </div>
</div> </div>
<div class="row mb-5 px-3"> <div class="row mb-5 px-3">
<div class="card-group">
<div class="col card px-0 mx-2"> <div class="col card px-0 mx-2 my-2" style="min-width: 16rem; max-width: 16rem;">
<div class="card-header bg-fusion-25 py-2 pr-3 d-flex align-items-center flex-wrap"> <div class="card-header bg-fusion-25 py-2 pr-3 d-flex align-items-center flex-wrap">
<h4 class="mb-0 font-weight-bold"><span class="fal fa-bolt mr-1"></span> 發電量</h4> <h4 class="mb-0 font-weight-bold"><span class="fal fa-bolt mr-1"></span> 發電量</h4>
<div class="ml-auto">kW h</div> <div class="ml-auto">kW h</div>
</div>
<div class="card-body">
<div class="d-flex justify-content-between">
<p>今日發電量</p>
<p><span class="color-info-700 fs-xl font-weight-bold" id="today_kwh">0.00</span></p>
</div> </div>
<div class="d-flex justify-content-between"> <div class="card-body">
<p>累積發電量</p> <div class="d-flex justify-content-between">
<p><span class="color-info-700 fs-xl font-weight-bold" id="total_kwh">0.00</span></p> <p>今日發電量</p>
<p><span class="color-info-700 fs-xl font-weight-bold" id="today_kwh">0.00</span></p>
</div>
<div class="d-flex justify-content-between">
<p>累積發電量</p>
<p><span class="color-info-700 fs-xl font-weight-bold" id="total_kwh">0.00</span></p>
</div>
</div>
</div>
<div class="col card px-0 mx-2" style="min-width: 16rem; max-width: 16rem;">
<div class="card-header bg-fusion-25 py-2 pr-3 d-flex align-items-center flex-wrap">
<h4 class="mb-0 font-weight-bold"><span class="fal fa-sun mr-1"></span> 日照度</h4>
<div class="ml-auto">W/㎡</div>
</div>
<div class="card-body">
<div class="d-flex justify-content-between">
<p>今日日照量</p>
<p><span class="color-info-700 fs-xl font-weight-bold" id="today_irradiance">0.00</span></p>
</div>
<div class="d-flex justify-content-between">
<p>日平均累積日照度(30天)</p>
<p><span class="color-info-700 fs-xl font-weight-bold" id="avg_irradiance">0.00</span></p>
</div>
</div>
</div>
<div class="col card px-0 mx-2" style="min-width: 16rem; max-width: 16rem;">
<div class="card-header bg-fusion-25 py-2 pr-3 d-flex align-items-center flex-wrap">
<h4 class="mb-0 font-weight-bold"><span class="fal fa-bolt mr-1"></span> PR值</h4>
<div class="ml-auto">%</div>
</div>
<div class="card-body">
<div class="d-flex justify-content-between">
<p>今日 PR 值</p>
<p><span class="color-info-700 fs-xl font-weight-bold" 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 fs-xl font-weight-bold" id="avg_PR">0.00</span></p>
</div>
</div>
</div>
<div class="col card px-0 mx-2" style="min-width: 16rem; max-width: 16rem;">
<div class="card-header bg-fusion-25 py-2 pr-3 d-flex align-items-center flex-wrap">
<h4 class="mb-0 font-weight-bold"><span class="fal fa-sun mr-1"></span>日均發電度數</h4>
<div class="ml-auto">hr</div>
</div>
<div class="card-body">
<div class="d-flex justify-content-between">
<p>日均發電度數(kwh/kwp)</p>
<p><span class="color-info-700 fs-xl font-weight-bold" id="today_kwhkwp">0.00</span></p>
</div>
<div class="d-flex justify-content-between">
<p>日均發電度數(30天)</p>
<p><span class="color-info-700 fs-xl font-weight-bold" id="avg_kwhkwp">0.00</span></p>
</div>
</div>
</div>
<div class="col card px-0 mx-2" style="min-width: 16rem; max-width: 16rem;">
<div class="card-header bg-fusion-25 py-2 pr-3 d-flex align-items-center flex-wrap">
<h4 class="mb-0 font-weight-bold"><span class="fal fa-bolt mr-1"></span> 減碳量</h4>
<div class="ml-auto">kG</div>
</div>
<div class="card-body">
<div class="d-flex justify-content-between">
<p>今日減碳量</p>
<p><span class="color-info-700 fs-xl font-weight-bold" id="today_carbon">0.00</span></p>
</div>
<div class="d-flex justify-content-between">
<p>累積減碳量</p>
<p><span class="color-info-700 fs-xl font-weight-bold" id="total_carbon">0.00</span></p>
</div>
</div> </div>
</div> </div>
</div> </div>
<div class="col card px-0 mx-2">
<div class="card-header bg-fusion-25 py-2 pr-3 d-flex align-items-center flex-wrap">
<h4 class="mb-0 font-weight-bold"><span class="fal fa-sun mr-1"></span> 日照度</h4>
<div class="ml-auto">W/㎡</div>
</div>
<div class="card-body">
<div class="d-flex justify-content-between">
<p>今日日照量</p>
<p><span class="color-info-700 fs-xl font-weight-bold" id="today_irradiance">0.00</span></p>
</div>
<div class="d-flex justify-content-between">
<p>日平均累積日照度(30天)</p>
<p><span class="color-info-700 fs-xl font-weight-bold" id="avg_irradiance">0.00</span></p>
</div>
</div>
</div>
<div class="col card px-0 mx-2">
<div class="card-header bg-fusion-25 py-2 pr-3 d-flex align-items-center flex-wrap">
<h4 class="mb-0 font-weight-bold"><span class="fal fa-bolt mr-1"></span> PR值</h4>
<div class="ml-auto">%</div>
</div>
<div class="card-body">
<div class="d-flex justify-content-between">
<p>今日 PR 值</p>
<p><span class="color-info-700 fs-xl font-weight-bold" 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 fs-xl font-weight-bold" id="avg_PR">0.00</span></p>
</div>
</div>
</div>
<div class="col card px-0 mx-2">
<div class="card-header bg-fusion-25 py-2 pr-3 d-flex align-items-center flex-wrap">
<h4 class="mb-0 font-weight-bold"><span class="fal fa-sun mr-1"></span>日均發電度數</h4>
<div class="ml-auto">hr</div>
</div>
<div class="card-body">
<div class="d-flex justify-content-between">
<p>日均發電度數(kwh/kwp)</p>
<p><span class="color-info-700 fs-xl font-weight-bold" id="today_kwhkwp">0.00</span></p>
</div>
<div class="d-flex justify-content-between">
<p>日均發電度數(30天)</p>
<p><span class="color-info-700 fs-xl font-weight-bold" id="avg_kwhkwp">0.00</span></p>
</div>
</div>
</div>
<div class="col card px-0 mx-2">
<div class="card-header bg-fusion-25 py-2 pr-3 d-flex align-items-center flex-wrap">
<h4 class="mb-0 font-weight-bold"><span class="fal fa-bolt mr-1"></span> 減碳量</h4>
<div class="ml-auto">kG</div>
</div>
<div class="card-body">
<div class="d-flex justify-content-between">
<p>今日減碳量</p>
<p><span class="color-info-700 fs-xl font-weight-bold" id="today_carbon">0.00</span></p>
</div>
<div class="d-flex justify-content-between">
<p>累積減碳量</p>
<p><span class="color-info-700 fs-xl font-weight-bold" id="total_carbon">0.00</span></p>
</div>
</div>
</div>
</div> </div>
<div class="p-3"> <div class="p-3">
<div class="row mb-5 d-flex justify-content-between"> <div class="row mb-5 d-flex justify-content-between">

View File

@ -1,28 +1,30 @@
@*<div class="row mb-5 d-flex justify-content-start"> @*<div class="row mb-5 d-flex justify-content-start">
<div class="col-1"> <div class="col-1">
<button type="button" class="btn btn-secondary waves-effect waves-themed" onclick="SelectAllInvert()">全選</button> <button type="button" class="btn btn-secondary waves-effect waves-themed" onclick="SelectAllInvert()">全選</button>
</div>
<div class="col-11">
<div class="row frame-wrap" id="CheckInverter">
</div> </div>
</div> <div class="col-11">
</div>*@ <div class="row frame-wrap" id="CheckInverter">
<div class="row mb-5 d-flex justify-content-start">
<div class="col-2 btn-group"> </div>
</div>
</div>*@
<div class="row mb-5 justify-content-start d-flex flex-wrap">
<div class="btn-group mr-2">
<button type="button" class="btn btn-secondary waves-effect waves-themed" onclick="ChangeInverterDateToday()">今天</button> <button type="button" class="btn btn-secondary waves-effect waves-themed" onclick="ChangeInverterDateToday()">今天</button>
<button type="button" class="btn btn-secondary waves-effect waves-themed" onclick="ChangeInverterDateYesterday()">昨天</button> <button type="button" class="btn btn-secondary waves-effect waves-themed" onclick="ChangeInverterDateYesterday()">昨天</button>
</div> </div>
<div class="col-4"> </div>
<div class="form-group"> <div class="row mb-5 justify-content-start d-flex flex-wrap" style="width:40%;">
<div class="col-sm-8">
<div class="form-group row d-flex flex-wrap">
<input class="form-control" id="inverter-selected-heatmap-date" type="date"> <input class="form-control" id="inverter-selected-heatmap-date" type="date">
</div> </div>
</div> </div>
<div class="col-4"> <div class="col-sm-4">
<button type="button" class="btn btn-success waves-effect waves-themed" onclick="LoadInvertAnalysisHeatMap()">查詢</button> <button type="button" class="btn btn-success waves-effect waves-themed" onclick="LoadInvertAnalysisHeatMap()">查詢</button>
</div> </div>
</div> </div>
<div class="row mb-5 d-flex justify-content-start" id="InverterResult"> <div class="row mb-5 d-flex flex-wrap justify-content-start" id="InverterResult">
<div class="col-12"> <div class="col-12">
<figure class="highcharts-figure"> <figure class="highcharts-figure">
<div id="container"></div> <div id="container"></div>
@ -30,32 +32,32 @@
</figure> </figure>
</div> </div>
</div> </div>
<div class="row mb-5 d-flex justify-content-start"> <div class="row mb-5 justify-content-start d-flex flex-wrap">
<div class="col-12"> <div class="btn-group mr-2">
<div class="row mb-2"> <button type="button" class="btn btn-success waves-effect waves-themed btn-change-inverter-kwhbar" onclick="ChangeInverterkwhBarDaily(this)">日</button>
<div class="col-4 btn-group"> <button type="button" class="btn btn-secondary waves-effect waves-themed btn-change-inverter-kwhbar" onclick="ChangeInverterkwhBarMonthly(this)">月</button>
<button type="button" class="btn btn-success waves-effect waves-themed btn-change-inverter-kwhbar" onclick="ChangeInverterkwhBarDaily(this)">日</button> <button type="button" class="btn btn-secondary waves-effect waves-themed btn-change-inverter-kwhbar" onclick="ChangeInverterkwhBarQuaryerly(this)">季</button>
<button type="button" class="btn btn-secondary waves-effect waves-themed btn-change-inverter-kwhbar" onclick="ChangeInverterkwhBarMonthly(this)">月</button> <button type="button" class="btn btn-secondary waves-effect waves-themed btn-change-inverter-kwhbar" onclick="ChangeInverterkwhBarAnnual(this)">年</button>
<button type="button" class="btn btn-secondary waves-effect waves-themed btn-change-inverter-kwhbar" onclick="ChangeInverterkwhBarQuaryerly(this)">季</button> </div>
<button type="button" class="btn btn-secondary waves-effect waves-themed btn-change-inverter-kwhbar" onclick="ChangeInverterkwhBarAnnual(this)">年</button> </div>
</div> <div class="row mb-5 justify-content-start d-flex flex-wrap" style="width:40%;">
<div class="col-4"> <div class="col-sm-8">
<div class="form-group row"> <div class="form-group row d-flex flex-wrap">
<input class="form-control col" id="inverter-selected-kwhbar-date" type="date"> <input class="form-control col" id="inverter-selected-kwhbar-date" type="date">
<select class="form-control col" id="inverter-selected-kwhbar-quaryerly" style="display: none"> <select class="form-control col" id="inverter-selected-kwhbar-quaryerly" style="display: none">
<option value="0">1 ~ 3 月</option> <option value="0">1 ~ 3 月</option>
<option value="1">4 ~ 6 月</option> <option value="1">4 ~ 6 月</option>
<option value="2">7 ~ 9 月</option> <option value="2">7 ~ 9 月</option>
<option value="3">9 ~ 12 月</option> <option value="3">9 ~ 12 月</option>
</select> </select>
</div> </div>
</div> </div>
<div class="col-4"> <div class="col-sm-4">
<button type="button" class="btn btn-success waves-effect waves-themed" onclick="LoadInvertAnalysiskwhBar()">查詢</button> <button type="button" class="btn btn-success waves-effect waves-themed" onclick="LoadInvertAnalysiskwhBar()">查詢</button>
</div> </div>
</div> </div>
<div id="inverter-kWh-convas-div"> <div class="row mb-5 justify-content-start d-flex flex-wrap">
<canvas id="inverter-kWh"></canvas> <div id="inverter-kWh-convas-div">
</div> <canvas id="inverter-kWh"></canvas>
</div> </div>
</div> </div>

View File

@ -2,8 +2,8 @@
<div class="tree w-100"> <div class="tree w-100">
<ul> <ul>
<li class=" w-100"> <li class=" w-100">
<div class="mx-auto" style="width: 20%;"> <div class="mx-auto" style="width: 100%; display: flex; justify-content: center; align-items: center;">
<div class="card border m-auto m-lg-0" id="Invertercard"> <div class="card border m-auto m-lg-0" id="Invertercard" style="min-width: 16rem; max-width: 16rem;">
<div> <img src="img/card-backgrounds/cover-3-lg.png" class="card-img-top" alt="..."> </div> <div> <img src="img/card-backgrounds/cover-3-lg.png" class="card-img-top" alt="..."> </div>
<div class="card-body d-flex justify-content-between pb-0 px-2"> <div class="card-body d-flex justify-content-between pb-0 px-2">
<h4 class="font-weight-bold" style="line-height: 27px;" id="Invertercard-Name">新竹巨城站</h4> <h4 class="font-weight-bold" style="line-height: 27px;" id="Invertercard-Name">新竹巨城站</h4>

View File

@ -1,6 +1,6 @@
<div class="row mb-5"> <div class="row mb-5" style="display: flex; justify-content: center;">
<div class="card-columns"> <div class="card-group">
<div class="card"> <div class="col card px-0 mx-2 my-2" style="min-width: 16rem; max-width: 16rem;">
<div class="card-header bg-fusion-25 py-2 pr-3 d-flex align-items-center flex-wrap"> <div class="card-header bg-fusion-25 py-2 pr-3 d-flex align-items-center flex-wrap">
<h4 class="mb-0 font-weight-bold"><span class="fal fa-bolt mr-1"></span> 發電量</h4> <h4 class="mb-0 font-weight-bold"><span class="fal fa-bolt mr-1"></span> 發電量</h4>
<div class="ml-auto">kW h</div> <div class="ml-auto">kW h</div>
@ -16,7 +16,7 @@
</div> </div>
</div> </div>
</div> </div>
<div class="card money-card"> <div class="col card money-card px-0 mx-2 my-2" style="min-width: 16rem; max-width: 16rem;">
<div class="card-header bg-fusion-25 py-2 pr-3 d-flex align-items-center flex-wrap"> <div class="card-header bg-fusion-25 py-2 pr-3 d-flex align-items-center flex-wrap">
<h4 class="mb-0 font-weight-bold"><span class="fal fa-dollar-sign mr-1"></span> <span id="money-card-title">發電金額</span></h4> <h4 class="mb-0 font-weight-bold"><span class="fal fa-dollar-sign mr-1"></span> <span id="money-card-title">發電金額</span></h4>
<div class="ml-auto">NTD</div> <div class="ml-auto">NTD</div>
@ -32,7 +32,7 @@
</div> </div>
</div> </div>
</div> </div>
<div class="card irradiance-card"> <div class="col card irradiance-card px-0 mx-2 my-2" style="min-width: 16rem; max-width: 16rem;">
<div class="card-header bg-fusion-25 py-2 pr-3 d-flex align-items-center flex-wrap"> <div class="card-header bg-fusion-25 py-2 pr-3 d-flex align-items-center flex-wrap">
<h4 class="mb-0 font-weight-bold"><span class="fal fa-sun mr-1"></span> 日照度</h4> <h4 class="mb-0 font-weight-bold"><span class="fal fa-sun mr-1"></span> 日照度</h4>
<div class="ml-auto">W/m<sup>2</sup></div> <div class="ml-auto">W/m<sup>2</sup></div>
@ -48,7 +48,7 @@
</div> </div>
</div> </div>
</div> </div>
<div class="card"> <div class="col card px-0 mx-2 my-2" style="min-width: 16rem; max-width: 16rem;">
<div class="card-header bg-fusion-25 py-2 pr-3 d-flex align-items-center flex-wrap"> <div class="card-header bg-fusion-25 py-2 pr-3 d-flex align-items-center flex-wrap">
<h4 class="mb-0 font-weight-bold"><span class="fal fa-bolt mr-1"></span> PR值</h4> <h4 class="mb-0 font-weight-bold"><span class="fal fa-bolt mr-1"></span> PR值</h4>
<div class="ml-auto">%</div> <div class="ml-auto">%</div>
@ -64,7 +64,7 @@
</div> </div>
</div> </div>
</div> </div>
<div class="card"> <div class="col card px-0 mx-2 my-2" style="min-width: 16rem; max-width: 16rem;">
<div class="card-header bg-fusion-25 py-2 pr-3 d-flex align-items-center flex-wrap"> <div class="card-header bg-fusion-25 py-2 pr-3 d-flex align-items-center flex-wrap">
<h4 class="mb-0 font-weight-bold"><span class="fal fa-sun mr-1"></span>日均發電度數</h4> <h4 class="mb-0 font-weight-bold"><span class="fal fa-sun mr-1"></span>日均發電度數</h4>
<div class="ml-auto">hr</div> <div class="ml-auto">hr</div>
@ -80,7 +80,7 @@
</div> </div>
</div> </div>
</div> </div>
<div class="card"> <div class="col card px-0 mx-2 my-2" style="min-width: 16rem; max-width: 16rem;">
<div class="card-header bg-fusion-25 py-2 pr-3 d-flex align-items-center flex-wrap"> <div class="card-header bg-fusion-25 py-2 pr-3 d-flex align-items-center flex-wrap">
<h4 class="mb-0 font-weight-bold"><span class="fal fa-cow mr-1"></span> 減碳量</h4> <h4 class="mb-0 font-weight-bold"><span class="fal fa-cow mr-1"></span> 減碳量</h4>
<div class="ml-auto">kG</div> <div class="ml-auto">kG</div>

View File

@ -12,9 +12,8 @@
<div class="container-fluid"> <div class="container-fluid">
<div class="row flex-nowrap wrapper"> <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-auto pr-0 collapse border-right sidebar vh-100 overflow-auto">
<div class="list-group border-0 card text-center text-md-left" id="sidebar" style="width: 90%">
<div class="list-group border-0 card text-center text-md-left" id="sidebar">
<div class="border bg-light rounded-top"> <div class="border bg-light rounded-top">
<div class="form-group p-2 m-0 rounded-top"> <div class="form-group p-2 m-0 rounded-top">
@ -23,7 +22,7 @@
<div id="js_list_accordion" class="accordion accordion-hover accordion-clean js-list-filter"> <div id="js_list_accordion" class="accordion accordion-hover accordion-clean js-list-filter">
<div class="card border-top-left-radius-0 border-top-right-radius-0"> <div class="card border-top-left-radius-0 border-top-right-radius-0">
<div class="card-header"> <div class="card-header">
<a href="javascript:void(0);" class="card-title collapsed" data-toggle="collapse" data-target="#js_list_accordion-a" aria-expanded="true" data-filter-tags="settings" > <a href="javascript:void(0);" class="card-title collapsed" data-toggle="collapse" data-target="#js_list_accordion-a" aria-expanded="true" data-filter-tags="settings">
<i class="fal fa-globe width-2 fs-xl"></i> <i class="fal fa-globe width-2 fs-xl"></i>
新北市 新北市
<span class="ml-auto"> <span class="ml-auto">
@ -189,7 +188,7 @@
<div id="panel-5" class="panel"> <div id="panel-5" class="panel">
<div class="panel-container show"> <div class="panel-container show">
<div class="panel-content"> <div class="panel-content">
<div class="mb-3 d-flex justify-content-start"> <div class="row mb-5 d-flex align-items-top px-3">
<div class="pr-3"> <div class="pr-3">
<div class="btn-group btn-group-md"> <div class="btn-group btn-group-md">
<button type="button" class="btn btn-success waves-effect waves-themed btn-change-searchType" id="Group0" onclick="changeType(0,this)">日</button> <button type="button" class="btn btn-success waves-effect waves-themed btn-change-searchType" id="Group0" onclick="changeType(0,this)">日</button>
@ -298,11 +297,11 @@
<div> <div>
<form id="report" name="report" method="post"> <form id="report" name="report" method="post">
<input type="hidden" id="post" name="post"/> <input type="hidden" id="post" name="post" />
</form> </form>
</div> </div>
</main> </main>
</div> </div>
</div> </div>
@ -759,11 +758,9 @@
break; break;
} }
showLoading();
var url = "/StationReport/GetTableHead"; var url = "/StationReport/GetTableHead";
$.post(url, send_data, function (rel) { $.post(url, send_data, function (rel) {
if (rel.code != "0000") { if (rel.code != "0000") {
hideLoading();
toast_warning(rel.msg); toast_warning(rel.msg);
switch (form) { switch (form) {
@ -916,7 +913,6 @@
//綜合比較 //綜合比較
maxtableinfobody(rel.data.showMoney); maxtableinfobody(rel.data.showMoney);
} }
hideLoading();
}, 'json'); }, 'json');
} }
@ -945,7 +941,6 @@
FormType: form, FormType: form,
PowerStation: nowpowerstation PowerStation: nowpowerstation
} }
showLoading();
var url = "/StationReport/GetForm"; var url = "/StationReport/GetForm";
$.post(url, send_data, function (rel) { $.post(url, send_data, function (rel) {
@ -995,7 +990,6 @@
} }
if (rel.code != "0000") { if (rel.code != "0000") {
hideLoading();
if (rel.code == "9985") { if (rel.code == "9985") {
toast_warning(rel.msg); toast_warning(rel.msg);
} else { } else {
@ -1188,11 +1182,9 @@
PowerstationId: nowpowerstation PowerstationId: nowpowerstation
} }
$('#HireTableBody').empty(); $('#HireTableBody').empty();
showLoading();
var posturl = "/StationReport/GetHireInfo"; var posturl = "/StationReport/GetHireInfo";
$.post(posturl, dataTosent, function (rel) { $.post(posturl, dataTosent, function (rel) {
if (rel.code != "0000") { if (rel.code != "0000") {
hideLoading();
toast_error(rel.data.msg); toast_error(rel.data.msg);
return; return;
} }
@ -1315,11 +1307,9 @@
PowerstationId: nowpowerstation PowerstationId: nowpowerstation
} }
$('#HireTableBody').empty(); $('#HireTableBody').empty();
showLoading();
var posturl = "/StationReport/GetHireInfo"; var posturl = "/StationReport/GetHireInfo";
$.post(posturl, dataTosent, function (rel) { $.post(posturl, dataTosent, function (rel) {
if (rel.code != "0000") { if (rel.code != "0000") {
hideLoading();
toast_error(rel.data.msg); toast_error(rel.data.msg);
return; return;
} }
@ -1451,11 +1441,9 @@
PowerstationId: nowpowerstation PowerstationId: nowpowerstation
} }
$('#HireTableBody').empty(); $('#HireTableBody').empty();
showLoading();
var posturl = "/StationReport/GetHireInfo"; var posturl = "/StationReport/GetHireInfo";
$.post(posturl, dataTosent, function (rel) { $.post(posturl, dataTosent, function (rel) {
if (rel.code != "0000") { if (rel.code != "0000") {
hideLoading();
toast_error(rel.data.msg); toast_error(rel.data.msg);
return; return;
} }
@ -1485,7 +1473,6 @@
$('#all').show(); $('#all').show();
nowform = form; nowform = form;
hideLoading();
}, 'json'); }, 'json');
} }
@ -1498,14 +1485,12 @@
PowerStation: selecterd_invert PowerStation: selecterd_invert
} }
if (send_data.FormType != null && send_data.PowerStation.length != 0 && send_data.FormType != 2) { if (send_data.FormType != null && send_data.PowerStation.length != 0 && send_data.FormType != 2) {
showLoading();
$.post("/StationReport/CheckExcel", send_data, function (rel) { $.post("/StationReport/CheckExcel", send_data, function (rel) {
if (rel.code == "0000") { if (rel.code == "0000") {
//window.location = "/StationReport/ExportExcel?post=" + JSON.stringify(send_data); //window.location = "/StationReport/ExportExcel?post=" + JSON.stringify(send_data);
$("#post").val(JSON.stringify(send_data)); $("#post").val(JSON.stringify(send_data));
document.report.action = "StationReport/ExportExcel"; document.report.action = "StationReport/ExportExcel";
document.report.submit(); document.report.submit();
hideLoading();
return; return;
} }
else else
@ -1520,7 +1505,6 @@
icon: 'warning', icon: 'warning',
html: text, html: text,
}); });
hideLoading();
} }
}, 'json'); }, 'json');
} }
@ -1545,7 +1529,6 @@
FormType: 2, FormType: 2,
PowerStation: selecterd_invert PowerStation: selecterd_invert
} }
showLoading();
var url = "/StationReport/GetMaxForm"; var url = "/StationReport/GetMaxForm";
var StrInfoBody = ""; var StrInfoBody = "";
var CityArray = []; var CityArray = [];
@ -1556,7 +1539,6 @@
var kwp = 0; var kwp = 0;
$.post(url, send_data, function (rel) { $.post(url, send_data, function (rel) {
if (rel.code != "0000") { if (rel.code != "0000") {
hideLoading();
toast_warning(rel.msg); toast_warning(rel.msg);
return; return;
} }
@ -1697,7 +1679,6 @@
nowform = 2; nowform = 2;
$('#all').show(); $('#all').show();
hideLoading();
}) })
} }
@ -1709,7 +1690,6 @@
Sitedb: db, Sitedb: db,
PowerstationId: id PowerstationId: id
} }
showLoading();
var posturl = "/StationReport/GetHireInfo"; var posturl = "/StationReport/GetHireInfo";
$.ajax({ $.ajax({
url: posturl, url: posturl,
@ -1722,7 +1702,6 @@
$.each(response.data, function (index, value) { $.each(response.data, function (index, value) {
hirerate += Number(value.leaseRate); hirerate += Number(value.leaseRate);
}) })
hideLoading();
} }
}); });
return hirerate; return hirerate;