hank.chen/FIC_Solar
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'master' of https://github.com/shanghohui-Company/SolarPower

Browse Source
This commit is contained in:
Kai 2021-08-25 14:59:54 +08:00
commit c7a3fc3302
5 changed files with 30 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
SolarPower/Views/AnalysisStationCombine/Index.cshtml
View File

@ -120,23 +120,25 @@
</div>
</div>
</div>
<div class="card">
<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>
<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>
@if (ViewBag.myUser.Role.Auths.Contains("ShowMoney"))
{
<div class="card">
<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>
<div class="ml-auto">NTD</div>
</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 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>
</div>
</div>
</div>
}
<div class="card">
<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>

7
SolarPower/Views/Operation/OperationRecord.cshtml
View File

@ -97,6 +97,7 @@
<th>本次作業預計</th>
<th>檔案</th>
<th>完成時間</th>
<th>創建時間</th>
@if (ViewBag.myUser.Role.Layer != (int)RoleLayerEnum.CompanyUser)
{
<th>功能</th>
@ -390,7 +391,7 @@
"info": true,
"autoWidth": false,
"responsive": true,
@*"order": [[5, "desc"]],*@
"order": [[10, "desc"]],
"columns": [{
"data": "powerStationName"
}, {
@ -409,6 +410,8 @@
"data": "recodeFiles"
}, {
"data": "finishTime"
},{
"data": "createdAt"
}, {
"data": null,
"defaultContent": '<button class="btn btn-danger del-btn">刪除</button>'
@ -1144,11 +1147,9 @@
function Search() {
Searchtype = true;
AllidsType = false;
AllpoweridsType = false;
Allcity2();
//operationRecodeTable.ajax.reload();
}
</script>
}

6
SolarPower/Views/PowerGeneration/Index.cshtml
View File

@ -271,7 +271,11 @@
<th class="bg-info-100" style="width: 6.66%">總售電收入(NT$)</th>
<th class="bg-success-100" style="width: 6.66%">總發電量(度數)</th>
<th class="bg-success-100" style="width: 6.66%">總售電收入(NT$)</th>
<th class="bg-primary-50" colspan="5">平均發電度數明細<br>(/kW/日)</th>
<th class="bg-primary-50" style="width: 6.66%">CBA每KW平均發電度數</th>
<th class="bg-primary-50" style="width: 6.66%">監控系統每KW平均發電度數</th>
<th class="bg-primary-50" style="width: 6.66%">每KW平均發電度數比較(CBA vs 監控系統)</th>
<th class="bg-primary-50" style="width: 6.66%">實際售電收入每KW品駿發電度數</th>
<th class="bg-primary-50" style="width: 6.66%">每KW平均發電度數比較(CBA vs 實際售電收入)</th>
</tr>
</thead>
<tbody id="asbody">

3
SolarPower/Views/StationOverview/StationOverviewInfo.cshtml
View File

@ -827,6 +827,7 @@
"info": true,
"autoWidth": false,
"responsive": true,
"order": [[9, "desc"]],
"columns": [{
"data": "powerStationName"
}, {
@ -845,6 +846,8 @@
"data": "recodeFiles"
}, {
"data": "finishTime"
}, {
"data": "createdAt"
}],
"columnDefs": [{
'targets': 7,

1
SolarPower/Views/StationOverview/_OperationRecord.cshtml
View File

@ -36,6 +36,7 @@
<th>本次作業預計</th>
<th>照片</th>
<th>完成時間</th>
<th>創建時間</th>
</tr>
</thead>
<tbody>