Merge branch 'master' into Willy

This commit is contained in:
b110212000 2021-07-14 18:25:56 +08:00
commit 7291f4c59d
2 changed files with 7 additions and 1 deletions

View File

@ -269,6 +269,7 @@
yAxisID: 'A',
backgroundColor: color.primary._300,
borderColor: color.primary._500,
order: 2,
data: chartToday.powerDatas
}, {
type: 'line',
@ -282,7 +283,8 @@
pointRadius: 4,
pointHoverRadius: 5,
fill: false,
data: chartToday.irradianceDatas,
order: 1,
data: chartToday.irradianceDatas,
}]
},
options: {

View File

@ -22,6 +22,10 @@
"Root": "Aph7AzoiwAmmBHCfS1rqeQ==",
"Password": "8WMHBEWuT0XoAB4kzduQHA=="
},
"BackgroundServiceCron": {
"CalcPowerStationJob": "0 5 * * * ?",
"CalcAvgPowerStationJob": "0 0 2 * * ?"
},
"SMTPConfig": {
"Host": "smtp.gmail.com",
"Port": 25,