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

衝突合併

Browse Source
This commit is contained in:
b110212000 2021-09-14 18:25:31 +08:00
commit d749b72952
4 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
SolarPower/Views/ExceptionRecord/Index.cshtml
View File

@ -579,7 +579,7 @@
powerids.push(classid[1]);
}
else {
powerids.remove(classid[1]);
powerids.splice($.inArray(classid[1], powerids), 1);
}
ExceptionTable.ajax.reload();
})

5
SolarPower/Views/Operation/Index.cshtml
View File

@ -580,10 +580,11 @@
var classid = clickid.split("_");
var job = document.getElementById(clickid);
if (job.checked == true) {
powerids.push(classid[1]); }
powerids.push(classid[1]);
}
else
{
powerids.remove(classid[1]);
powerids.splice($.inArray(classid[1], powerids), 1);
}
OperationPlanTable.ajax.reload();
})

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

@ -924,7 +924,7 @@
powerids.push(classid[1]);
}
else {
powerids.remove(classid[1]);
powerids.splice($.inArray(classid[1], powerids), 1);
}
if (status == 2) {
operationRecordTable.column(10).visible(true);

4
SolarPower/Views/StationOverview/_InverterInfo.cshtml
View File

@ -4,7 +4,7 @@
<li class=" w-100">
<div class="mx-auto" style="width: 20%;">
<div class="card border m-auto m-lg-0" id="Invertercard">
<img src="img/card-backgrounds/cover-3-lg.png" class="card-img-top" alt="...">
<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">
<h4 class="font-weight-bold" style="line-height: 27px;" id="Invertercard-Name"> <a href="javascript:void(0);" class="btn btn-success btn-sm btn-icon rounded-circle waves-effect waves-themed"> <i class="fal fa-check"></i> </a> 新竹巨城站</h4>
<p class="card-text"><i class="fal fa-cloud-sun-rain fa-2x" id="Invertercard-weathericon"></i></p>
@ -22,7 +22,7 @@
<p class="color-info-700 font-weight-bold" id="Invertercard-type">自建躉售</p>
</div>
<div class=" d-flex justify-content-between">
<p>Pr值</p>
<p>PR值</p>
<p><span class="color-info-700 font-weight-bold" id="Invertercard-pr">90</span> %</p>
<p class="small" id="Invertercard-date">17:50:36</p>
</div>