diff --git a/SolarPower/Controllers/UserController.cs b/SolarPower/Controllers/UserController.cs index 834c68e..d45e22d 100644 --- a/SolarPower/Controllers/UserController.cs +++ b/SolarPower/Controllers/UserController.cs @@ -382,9 +382,12 @@ namespace SolarPower.Controllers } #endregion + var website_url = await powerStationRepository.GetOneVariableByName("WebSiteUrl"); + var sendSubject = "新增帳號成功"; - var sendContent = $"您的新密碼為:{random_password}"; + var sendContent = $@"您的新密碼為:{random_password} +
立即前往:{website_url}"; List recipientEmails = new List() { diff --git a/SolarPower/DBSchema/solar_power_schema.sql b/SolarPower/DBSchema/solar_power_schema.sql index bb17a7d..ffb25d7 100644 --- a/SolarPower/DBSchema/solar_power_schema.sql +++ b/SolarPower/DBSchema/solar_power_schema.sql @@ -2212,6 +2212,9 @@ ALTER TABLE `power_station_exception` 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`; +-- 新增太陽能電站網址 +INSERT INTO `solar_power_test`.`variable` (`Name`, `Value`, `Remark`) VALUES ('WebSiteUrl', 'http://green.fic.com.tw/', '太陽能電站管理系統網址'); + /*!40101 SET SQL_MODE=IFNULL(@OLD_SQL_MODE, '') */; /*!40014 SET FOREIGN_KEY_CHECKS=IFNULL(@OLD_FOREIGN_KEY_CHECKS, 1) */; /*!40101 SET CHARACTER_SET_CLIENT=@OLD_CHARACTER_SET_CLIENT */; diff --git a/SolarPower/Views/AnalysisStationInfo/Index.cshtml b/SolarPower/Views/AnalysisStationInfo/Index.cshtml index e00674a..4cc50c0 100644 --- a/SolarPower/Views/AnalysisStationInfo/Index.cshtml +++ b/SolarPower/Views/AnalysisStationInfo/Index.cshtml @@ -124,10 +124,10 @@ var PWS_compare_col = [ { key: "KWH", title: "發電量", default: true }, { key: "Irradiance", title: "日照度", default: false }, - { key: "KWHKWP", title: "發電小時", default: false }, + { key: "KWHKWP", title: "有效日照時數", default: false }, { key: "PR", title: "PR %", default: false }, { key: "Temperature", title: "模組溫度", default: false }, - { key: "SolarHour", title: "日照小時", default: false } + { key: "SolarHour", title: "日照小時", default: false }, ] var PWR_compare_col = [ { key: "OUTPUT_KWH", title: "輸出發電量(kWh)", default: true }, diff --git a/SolarPower/Views/StationOverview/StationOverviewInfo.cshtml b/SolarPower/Views/StationOverview/StationOverviewInfo.cshtml index 606634d..fa2fff2 100644 --- a/SolarPower/Views/StationOverview/StationOverviewInfo.cshtml +++ b/SolarPower/Views/StationOverview/StationOverviewInfo.cshtml @@ -1186,7 +1186,7 @@ //#region 產生檔案html function CreateRecordFileBox(dom, value, show_del_btn) { var str = ""; - str += '
'; + str += '
'; var split = value.fileName.split("."); var excel_format = ["xls", "xlsx"]; var word_format = ["doc", "docx"]; @@ -2184,8 +2184,16 @@ legend: { display: true, position: 'bottom' + }, + scales: { + yAxes: [{ + scaleLabel: { + display: true, + labelString: '發電量(kWh)' + } + }] } - } + }, }); //#endregion