Merge branch 'administativePages' into 'dev'

update Chart

See merge request kluppsoftware/smart-energia-web!67
This commit is contained in:
Alex Da Silva Santos 2022-06-17 21:07:34 +00:00
commit ce59afc095
4 changed files with 6 additions and 4 deletions

View File

@ -65,6 +65,7 @@ export default function Dashboard({grossAnualGraph, grossAnualYears, grossMensal
<GraphCard title='Indicador de Custo' subtitle='Valores em R$/ MWh'> <GraphCard title='Indicador de Custo' subtitle='Valores em R$/ MWh'>
<Chart title='Indicador de Custo' subtitle='(Valores em R$/MWh)' data1={dataEconomiaIndicador.data1} data2={dataEconomiaIndicador.data2} label={dataEconomiaIndicador.labels} barLabel/> <Chart title='Indicador de Custo' subtitle='(Valores em R$/MWh)' data1={dataEconomiaIndicador.data1} data2={dataEconomiaIndicador.data2} label={dataEconomiaIndicador.labels} barLabel/>
</GraphCard> </GraphCard>
</section> </section>
<button onClick={() => { <button onClick={() => {

View File

@ -38,7 +38,7 @@ export const getServerSideProps: GetServerSideProps = async (ctx) => {
await apiClient.get('/faq').then(res => { await apiClient.get('/faq').then(res => {
faqData = res.data faqData = res.data.data
}).catch(res => { }).catch(res => {
// console.log(res) // console.log(res)
}) })

View File

@ -38,9 +38,10 @@ export const getServerSideProps: GetServerSideProps = async (ctx) => {
let notificationData = []; let notificationData = [];
await apiClient.get('/notification').then(res => { await apiClient.get('/notification').then(res => {
notificationData = res.data console.log(res)
notificationData = res.data.data
}).catch(res => { }).catch(res => {
// console.log(res) console.log(res)
}) })
if (!token) { if (!token) {

View File

@ -263,7 +263,7 @@ export default function pld({tableData, graphByHourData, graphByMonthData}: pldI
<MenuItem value={'29'}>29</MenuItem> <MenuItem value={'29'}>29</MenuItem>
<MenuItem value={'30'}>30</MenuItem> <MenuItem value={'30'}>30</MenuItem>
</Select> </Select>
<BasicButton title='Download (csv)' onClick={() => console.log()}/>
</section> </section>
<LineBarChart <LineBarChart
data1={dataByDay} data3={dataByDay} data1={dataByDay} data3={dataByDay}