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:
b110212000 2021-09-22 14:22:50 +08:00
commit ffdad5ce96
4 changed files with 19 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
SolarPower/Controllers/UserController.cs
View File

@ -382,9 +382,12 @@ namespace SolarPower.Controllers
} }
#endregion #endregion
var website_url = await powerStationRepository.GetOneVariableByName("WebSiteUrl");
var sendSubject = "新增帳號成功"; var sendSubject = "新增帳號成功";
var sendContent = $"您的新密碼為：{random_password}"; var sendContent = $@"您的新密碼為：{random_password}
<br>立即前往：<a href='{website_url}' target='_blank'>{website_url}</a>";
List<string> recipientEmails = new List<string>() List<string> recipientEmails = new List<string>()
{ {

3
SolarPower/DBSchema/solar_power_schema.sql
View File

@ -2212,6 +2212,9 @@ ALTER TABLE `power_station_exception`
CHANGE COLUMN `UpperLimit` `UpperLimit` DECIMAL(10,2) NULL DEFAULT NULL COMMENT '上限值' AFTER `Type`, CHANGE COLUMN `UpperLimit` `UpperLimit` DECIMAL(10,2) NULL DEFAULT NULL COMMENT '上限值' AFTER `Type`,
CHANGE COLUMN `LowerLimit` `LowerLimit` DECIMAL(10,2) NULL DEFAULT NULL COMMENT '下限值' AFTER `UpperLimit`; CHANGE COLUMN `LowerLimit` `LowerLimit` DECIMAL(10,2) NULL DEFAULT NULL COMMENT '下限值' AFTER `UpperLimit`;
-- 新增太陽能電站網址
INSERT INTO `solar_power_test`.`variable` (`Name`, `Value`, `Remark`) VALUES ('WebSiteUrl', 'http://green.fic.com.tw/', '太陽能電站管理系統網址');
/*!40101 SET SQL_MODE=IFNULL(@OLD_SQL_MODE, '') */; /*!40101 SET SQL_MODE=IFNULL(@OLD_SQL_MODE, '') */;
/*!40014 SET FOREIGN_KEY_CHECKS=IFNULL(@OLD_FOREIGN_KEY_CHECKS, 1) */; /*!40014 SET FOREIGN_KEY_CHECKS=IFNULL(@OLD_FOREIGN_KEY_CHECKS, 1) */;
/*!40101 SET CHARACTER_SET_CLIENT=@OLD_CHARACTER_SET_CLIENT */; /*!40101 SET CHARACTER_SET_CLIENT=@OLD_CHARACTER_SET_CLIENT */;

4
SolarPower/Views/AnalysisStationInfo/Index.cshtml
View File

@ -124,10 +124,10 @@
var PWS_compare_col = [ var PWS_compare_col = [
{ key: "KWH", title: "發電量", default: true }, { key: "KWH", title: "發電量", default: true },
{ key: "Irradiance", title: "日照度", default: false }, { key: "Irradiance", title: "日照度", default: false },
{ key: "KWHKWP", title: "發電小時", default: false }, { key: "KWHKWP", title: "有效日照時數", default: false },
{ key: "PR", title: "PR %", default: false }, { key: "PR", title: "PR %", default: false },
{ key: "Temperature", title: "模組溫度", default: false }, { key: "Temperature", title: "模組溫度", default: false },
{ key: "SolarHour", title: "日照小時", default: false } { key: "SolarHour", title: "日照小時", default: false },
] ]
var PWR_compare_col = [ var PWR_compare_col = [
{ key: "OUTPUT_KWH", title: "輸出發電量(kWh)", default: true }, { key: "OUTPUT_KWH", title: "輸出發電量(kWh)", default: true },

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

@ -1186,7 +1186,7 @@
//#region 產生檔案html //#region 產生檔案html
function CreateRecordFileBox(dom, value, show_del_btn) { function CreateRecordFileBox(dom, value, show_del_btn) {
var str = ""; var str = "";
str += '<div class="col-auto px-0 py-2 mx-2">'; str += '<div class="col-2 px-0 py-2 mx-2">';
var split = value.fileName.split("."); var split = value.fileName.split(".");
var excel_format = ["xls", "xlsx"]; var excel_format = ["xls", "xlsx"];
var word_format = ["doc", "docx"]; var word_format = ["doc", "docx"];
@ -2184,8 +2184,16 @@
legend: { legend: {
display: true, display: true,
position: 'bottom' position: 'bottom'
},
scales: {
yAxes: [{
scaleLabel: {
display: true,
labelString: '發電量(kWh)'
}
}]
} }
} },
}); });
//#endregion //#endregion