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-09-06 18:03:17 +08:00
commit 5d39b5fa73
2 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
SolarPower/Views/Shared/_Layout.cshtml
View File

@ -109,7 +109,7 @@
<aside class="page-sidebar">
<div class="page-logo">
<a href="#" class="page-logo-link press-scale-down">
<img src="~/img/logo.png" alt="SmartAdmin WebApp" aria-roledescription="logo"> <span class="page-logo-text mr-1"></span> <span class="position-absolute text-white opacity-50 small pos-top pos-right mr-2 mt-n2"></span>
<img src="@ViewBag.myUser.Company.Logo" alt="SmartAdmin WebApp" aria-roledescription="logo"> <span class="page-logo-text mr-1"></span> <span class="position-absolute text-white opacity-50 small pos-top pos-right mr-2 mt-n2"></span>
<!--<i class="fal fa-angle-down d-inline-block ml-1 fs-lg color-primary-300"></i>-->
</a>
</div>

14
SolarPower/Views/StationReport/Index.cshtml
View File

@ -195,8 +195,8 @@
</div>
</div>
<div class="pr-3" id="quickSearchOption">
<button type="button" class="btn btn-secondary waves-effect waves-themed btn-change-quickSearch1" onclick="quickSearch(0)">今天</button>
<button type="button" class="btn btn-secondary waves-effect waves-themed btn-change-quickSearch2" onclick="quickSearch(1)">昨天</button>
<button type="button" class="btn btn-secondary waves-effect waves-themed btn-change-quickSearch1" onclick="quickSearch(0)">昨天</button>
<button type="button" class="btn btn-secondary waves-effect waves-themed btn-change-quickSearch2" onclick="quickSearch(1)">前天</button>
</div>
<div class="pr-3">
<div class="btn-group" id="js-demo-nesting" role="group" aria-label="Button group with nested dropdown">
@ -310,7 +310,7 @@
$('#maxtable').hide();
$('#hiretable').hide();
$('#detailtable').hide();
$('#DateGet').val(new Date().toISOString().substring(0, 10));
$('#DateGet').val(new Date(new Date().setDate(new Date().getDate() - 1)).toISOString().substring(0, 10));
document.getElementById("DateGettextdiv").style.display = "none";//隱藏
$('#DateGet').attr('style', 'width:205px');
$('#DateGettext').attr('style', 'width:205px');
@ -336,8 +336,8 @@
$(e).removeClass("btn-secondary").addClass("btn-success");
switch (type) {
case 0: $('#DateGet').prop({ 'type': 'date' });
$(".btn-change-quickSearch1").html("今天");
$(".btn-change-quickSearch2").html("昨天");
$(".btn-change-quickSearch1").html("昨天");
$(".btn-change-quickSearch2").html("前天");
var today = new Date().toISOString().substring(0, 10);
$('#DateGet').val(today);
document.getElementById("monthbtn").disabled = true;//月報表鎖定
@ -416,10 +416,10 @@
switch (searchType) {
case 0:
if (day == 0) {
var today = new Date().toISOString().substring(0, 10);
var today = new Date(new Date().setDate(new Date().getDate() - 1)).toISOString().substring(0, 10);
$('#DateGet').val(today).trigger('change');
} else {
var dateLimit = new Date(new Date().setDate(new Date().getDate() - 1)).toISOString().substring(0, 10);
var dateLimit = new Date(new Date().setDate(new Date().getDate() - 2)).toISOString().substring(0, 10);
$('#DateGet').val(dateLimit).trigger('change');
}
break;