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

修復bug

Browse Source
This commit is contained in:
b110212000 2021-10-13 10:18:01 +08:00
parent e3441a76f7
commit be00cb0bc9
5 changed files with 10 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
SolarPower/Controllers/OperationController.cs
View File

@ -643,7 +643,7 @@ namespace SolarPower.Controllers
OperationRecordPersonnel operationRecordPersonnel = new OperationRecordPersonnel(); OperationRecordPersonnel operationRecordPersonnel = new OperationRecordPersonnel();
operationRecordPersonnel.OperationRecordId = id; operationRecordPersonnel.OperationRecordId = id;
operationRecordPersonnel.UserId = op; operationRecordPersonnel.UserId = op;
operationRecordPersonnel.CreatedBy = myUser.Id;
insertOperationRecordPersonnels.Add(operationRecordPersonnel); insertOperationRecordPersonnels.Add(operationRecordPersonnel);
} }
@ -651,6 +651,7 @@ namespace SolarPower.Controllers
{ {
"OperationRecordId", "OperationRecordId",
"UserId", "UserId",
"CreatedBy"
}; };
await operationRepository.AddOperationRecordPersonnelAsync(insertOperationRecordPersonnels, operationRecordPersonnelProperties); await operationRepository.AddOperationRecordPersonnelAsync(insertOperationRecordPersonnels, operationRecordPersonnelProperties);

2
SolarPower/Repository/Implement/ElectricitySoldRecordRepository.cs
View File

@ -122,7 +122,7 @@ namespace SolarPower.Repository.Implement
var sql = @$"SELECT aa.StartAt,aa.EndAt,aa.Kwh actualkwh,aa.Money actualMoney,SUM(pd.TODAYKWH) realKWH,SUM(pd.MONEY) realMoney,ps.Estimate_kwh CBAkwh,ps.EstimateEfficacy CBAeff ,ps.GeneratingCapacity capacity ,ps.PowerRate rate var sql = @$"SELECT aa.StartAt,aa.EndAt,aa.Kwh actualkwh,aa.Money actualMoney,SUM(pd.TODAYKWH) realKWH,SUM(pd.MONEY) realMoney,ps.Estimate_kwh CBAkwh,ps.EstimateEfficacy CBAeff ,ps.GeneratingCapacity capacity ,ps.PowerRate rate
FROM power_station_history_day pd FROM power_station_history_day pd
LEFT JOIN ( SELECT er.* FROM electricity_sold_record er WHERE {sqlwhere} AND er.Deleted = 0 ) aa LEFT JOIN ( SELECT er.* FROM electricity_sold_record er WHERE {sqlwhere} AND er.Deleted = 0 AND er.PowerstationId = {info.PowerstationId}) aa
ON aa.PowerstationId = pd.PowerStationId ON aa.PowerstationId = pd.PowerStationId
LEFT JOIN power_station ps ON ps.Id = pd.PowerStationId LEFT JOIN power_station ps ON ps.Id = pd.PowerStationId
WHERE pd.TIMESTAMP BETWEEN aa.StartAt AND aa.EndAt AND ps.Id = {info.PowerstationId} GROUP BY aa.Id"; WHERE pd.TIMESTAMP BETWEEN aa.StartAt AND aa.EndAt AND ps.Id = {info.PowerstationId} GROUP BY aa.Id";

2
SolarPower/Views/PowerStation/_UploadImage.cshtml
View File

@ -41,7 +41,7 @@
<div class="card-title font-weight-bold">單線圖</div> <div class="card-title font-weight-bold">單線圖</div>
<div class="text-right"> <div class="text-right">
<a href="javascript:;" class="btn btn-sm btn-success ml-auto waves-effect waves-themed" id="upload-station-single-line"> <a href="javascript:;" class="btn btn-sm btn-success ml-auto waves-effect waves-themed" id="upload-station-single-line">
<span class="fal fa-plus mr-1"></span> 上傳圖片 <span class="fal fa-plus mr-1"></span> 上傳檔案
</a> </a>
</div> </div>
</div> </div>

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

@ -319,7 +319,7 @@
labels: chartToday.labels, labels: chartToday.labels,
datasets: [{ datasets: [{
type: 'bar', type: 'bar',
label: '輸出功率', label: '發電量',
yAxisID: 'A', yAxisID: 'A',
backgroundColor: 'rgb(103, 180, 172)', backgroundColor: 'rgb(103, 180, 172)',
order: 3, order: 3,
@ -411,7 +411,7 @@
labels: chart7day.labels, labels: chart7day.labels,
datasets: [{ datasets: [{
type: 'bar', type: 'bar',
label: '輸出功率', label: '發電量',
yAxisID: 'A', yAxisID: 'A',
backgroundColor: 'rgb(103, 180, 172)', backgroundColor: 'rgb(103, 180, 172)',
order: 3, order: 3,
@ -503,7 +503,7 @@
labels: chartMonth.labels, labels: chartMonth.labels,
datasets: [{ datasets: [{
type: 'bar', type: 'bar',
label: '輸出功率', label: '發電量',
yAxisID: 'A', yAxisID: 'A',
backgroundColor: 'rgb(103, 180, 172)', backgroundColor: 'rgb(103, 180, 172)',
order: 3, order: 3,
@ -595,7 +595,7 @@
labels: chartYear.labels, labels: chartYear.labels,
datasets: [{ datasets: [{
type: 'bar', type: 'bar',
label: '輸出功率', label: '發電量',
yAxisID: 'A', yAxisID: 'A',
backgroundColor: 'rgb(103, 180, 172)', backgroundColor: 'rgb(103, 180, 172)',
order: 2, order: 2,
@ -2010,7 +2010,7 @@
}, },
title: { title: {
text: '逆變器單日kWhkWp' text: '各逆變器當日有效日照時數'
}, },
xAxis: { xAxis: {
categories: HeatMap.xAxis, categories: HeatMap.xAxis,

2
SolarPower/Views/StationOverview/_Exception.cshtml
View File

@ -131,7 +131,7 @@
<div class="row mb-3"> <div class="row mb-3">
<div class="col-lg-12"> <div class="col-lg-12">
<div class="form-group"> <div class="form-group">
<label class="form-label" for="notice_textarea_modal_exc">巡檢注意事項</label> <label class="form-label" for="notice_textarea_modal_exc">項目內容</label>
<textarea class="form-control" id="notice_textarea_modal_exc" rows="5"></textarea> <textarea class="form-control" id="notice_textarea_modal_exc" rows="5"></textarea>
</div> </div>
</div> </div>