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

1. 修改登入圖片路徑

Browse Source
This commit is contained in:
Kai 2021-09-08 18:36:32 +08:00
parent 1cb05ab374
commit 72c247e2c8
4 changed files with 3 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
SolarPower/Controllers/MyBaseController.cs
View File

@ -98,7 +98,7 @@ namespace SolarPower.Controllers
} }
else else
{ {
myUser.Company.Logo = Path.Combine("upload", "company_logo", myUser.Company.Logo); myUser.Company.Logo = "/" + Path.Combine("upload", "company_logo", myUser.Company.Logo);
} }
} }
else else

6
SolarPower/Quartz/Jobs/CalcAvgPowerStationJob.cs
View File

@ -1032,11 +1032,5 @@ namespace SolarPower.Quartz.Jobs
} }
} }
} }
public IEnumerable<DateTime> EachDay(DateTime from, DateTime thru)
{
for (var day = from.Date; day.Date <= thru.Date; day = day.AddDays(1))
yield return day;
}
} }
} }

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

@ -76,7 +76,7 @@ namespace SolarPower.Repository.Implement
{ {
var sql = $@"SELECT p.*,ps.Name FROM power_station_operation_personnel p var sql = $@"SELECT p.*,ps.Name FROM power_station_operation_personnel p
LEFT JOIN power_station ps ON p.PowerStationId = ps.Id LEFT JOIN power_station ps ON p.PowerStationId = ps.Id
WHERE p.UserId = {Userid} AND p.Deleted = 0 "; WHERE p.UserId = {Userid} AND p.Deleted = 0 and ps.Deleted = 0 and ps.Status = 1";
result = (await conn.QueryAsync<OperationPersonnel>(sql)).ToList(); result = (await conn.QueryAsync<OperationPersonnel>(sql)).ToList();

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

@ -30,7 +30,7 @@
<div class="blankpage-form-field"> <div class="blankpage-form-field">
<div class="page-logo m-0 w-100 align-items-center justify-content-center rounded border-bottom-left-radius-0 border-bottom-right-radius-0 px-4"> <div class="page-logo m-0 w-100 align-items-center justify-content-center rounded border-bottom-left-radius-0 border-bottom-right-radius-0 px-4">
<div class="page-logo-link press-scale-down d-flex align-items-center"> <div class="page-logo-link press-scale-down d-flex align-items-center">
<img src="img/logo.png" alt="SmartAdmin WebApp" aria-roledescription="logo"> <img src="/img/logo.png" alt="SmartAdmin WebApp" aria-roledescription="logo">
<span class="page-logo-text mr-1">太陽能電站管理系統</span> <span class="page-logo-text mr-1">太陽能電站管理系統</span>
</div> </div>
</div> </div>