Merge branch 'master' of https://github.com/shanghohui-Company/SolarPower
This commit is contained in:
b110212000
commit
488fad1250
@ -67,7 +67,7 @@
|
||||
</div>
|
||||
</div>
|
||||
<div class="pr-3">
|
||||
<button type="button" class="btn btn-secondary waves-effect waves-themed" onclick="GetAnalysisInverter()">查詢</button>
|
||||
<button type="button" class="btn btn-secondary waves-effect waves-themed " id="btn-analysis-inverter" onclick="GetAnalysisInverter()">查詢</button>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
@ -476,7 +476,7 @@
|
||||
$.each(inverterCollapse[key][powerStationkey], function (index, inverter) {
|
||||
str += '<li class="list-group-item pr-0 d-flex justify-content-start">' +
|
||||
'<div class=""><input type="checkbox" class="mr-2" name="selectedInverterId[]" data-power-station-id="' + inverter.powerStationId + '" value="' + inverter.inverterId + '">' + '</div>' +
|
||||
'<a href="javascript:void(0)"><i class="fal fa-server"></i> ' + inverter.inverterName + '</a>' +
|
||||
'<a href="javascript:void(0)">' + inverter.inverterName + '</a>' +
|
||||
'</li>';
|
||||
});
|
||||
str += '</ul>';
|
||||
@ -567,9 +567,17 @@
|
||||
InverterIdInfos: selected_inverter
|
||||
}
|
||||
|
||||
if (selected_inverter.length <= 0) {
|
||||
toast_warning("請至少選擇一逆變器設備");
|
||||
return;
|
||||
}
|
||||
|
||||
$("#btn-analysis-inverter").html('<span class="spinner-border spinner-border-sm" role="status" aria-hidden="true"></span>').attr("disabled", true);
|
||||
|
||||
$.post(url, send_data, function (rel) {
|
||||
if (rel.code != "0000") {
|
||||
toast_error(rel.msg);
|
||||
$("#btn-analysis-inverter").html('查詢').attr("disabled", false);
|
||||
return;
|
||||
}
|
||||
|
||||
@ -582,6 +590,7 @@
|
||||
});
|
||||
|
||||
ReloadHighCharts();
|
||||
$("#btn-analysis-inverter").html('查詢').attr("disabled", false);
|
||||
}, 'json');
|
||||
}
|
||||
|
||||
|
||||
@ -110,14 +110,14 @@
|
||||
<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" id="total_kwh">0.00</span></p>
|
||||
</div>
|
||||
<div class="d-flex justify-content-between">
|
||||
<p>今日發電量</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">0.00</span></p>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
@if (ViewBag.myUser.Role.Auths.Contains("ShowMoney"))
|
||||
@ -128,14 +128,14 @@
|
||||
<div class="ml-auto">NTD</div>
|
||||
</div>
|
||||
<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">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">0.00</span></p>
|
||||
</div>
|
||||
<div class="d-flex justify-content-between">
|
||||
<p id="money-card-subtitle-total">總發金額</p>
|
||||
<p><span class="color-info-700" id="total_money">0.00</span></p>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
}
|
||||
@ -145,14 +145,14 @@
|
||||
<div class="ml-auto">hr</div>
|
||||
</div>
|
||||
<div class="card-body">
|
||||
<div class="d-flex justify-content-between">
|
||||
<p>平均有效日照時數</p>
|
||||
<p><span class="color-info-700" id="total_kwhkwp">0.00</span></p>
|
||||
</div>
|
||||
<div class="d-flex justify-content-between">
|
||||
<p>今日有效日照時數 </p>
|
||||
<p><span class="color-info-700" id="today_kwhkwp">0.00</span></p>
|
||||
</div>
|
||||
<div class="d-flex justify-content-between">
|
||||
<p>平均有效日照時數</p>
|
||||
<p><span class="color-info-700" id="total_kwhkwp">0.00</span></p>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
<div class="card">
|
||||
@ -161,14 +161,14 @@
|
||||
<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" id="total_PR">0.00</span></p>
|
||||
</div>
|
||||
<div class="d-flex justify-content-between">
|
||||
<p>今日PR值</p>
|
||||
<p><span class="color-info-700" id="today_PR">0.00</span></p>
|
||||
</div>
|
||||
<div class="d-flex justify-content-between">
|
||||
<p>平均 PR 值</p>
|
||||
<p><span class="color-info-700" id="total_PR">0.00</span></p>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
@ -178,14 +178,14 @@
|
||||
<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" id="total_carbon">0.00</span></p>
|
||||
</div>
|
||||
<div class="d-flex justify-content-between">
|
||||
<p>今日減碳量</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">0.00</span></p>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
@ -490,7 +490,7 @@
|
||||
'<ul class="list-group list-group-flush">';
|
||||
$.each(deviceCollapse[key][powerStationkey], function (index, device) {
|
||||
var device_icon = "";
|
||||
switch (device.deviceType) {
|
||||
@*switch (device.deviceType) {
|
||||
case "PWS": //電站總覽
|
||||
device_icon = '<i class="fal fa-charging-station"></i>';
|
||||
break;
|
||||
@ -515,12 +515,12 @@
|
||||
case 'EMM': //環境濕度計
|
||||
device_icon = '<i class="fal fa-tint"></i>';
|
||||
break;
|
||||
}
|
||||
}*@
|
||||
str += '<li class="list-group-item pr-0 d-flex justify-content-start">' +
|
||||
'<div class="mr-3">' +
|
||||
'<input type="checkbox" class="" name="selectedDeviceId[]" data-power-station-id="' + device.powerStationId + '" data-type="' + device.deviceType + '" value="' + device.deviceId + '">' +
|
||||
'</div>' +
|
||||
'<a href="javascript:void(0)">' + device_icon + ' ' + device.deviceName + '</a>' +
|
||||
'<a href="javascript:void(0)">' + device_icon + device.deviceName + '</a>' +
|
||||
'</li>';
|
||||
});
|
||||
str += '</ul>';
|
||||
|
||||
@ -24,7 +24,7 @@
|
||||
<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>累積發電量</p>
|
||||
<p><span class="color-info-700 fs-xl font-weight-bold" id="total_kwh">0.00</span></p>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
Loading…
Reference in New Issue
Block a user