diff --git a/src/components/graph/grossAnualChart/GrossAnualChart.tsx b/src/components/graph/grossAnualChart/GrossAnualChart.tsx index c8dadb4..0d974ba 100644 --- a/src/components/graph/grossAnualChart/GrossAnualChart.tsx +++ b/src/components/graph/grossAnualChart/GrossAnualChart.tsx @@ -78,7 +78,7 @@ export function GrossAnualChart({ title, subtitle, dataProps, label, dataset, ba display: true, color: '#255488', anchor: "end", - offset: -60, + offset: !miniature? -60 : -30, align: "start", font: { size: !miniature? 22 : 10, diff --git a/src/pages/economy/index.tsx b/src/pages/economy/index.tsx index a3bdd42..6b4d1dd 100644 --- a/src/pages/economy/index.tsx +++ b/src/pages/economy/index.tsx @@ -35,6 +35,7 @@ import GrossMensalChart from '../../components/graph/grossMensalChart/GrossMensa import { CativoXLivreChart } from '../../components/graph/cativoXLivreChart'; import { ConsumoEstimado } from '../../services/consumoEstimado'; import CostIndicatorChart from '../../components/graph/costIndicatorChart'; +import { EconomyView } from '../../styles/layouts/economy/economy'; export default function economy({userName, anual, years, brutaMensal, yearsBrutaMensal, catLiv, clients, indicatorCost}: any) { const {economyMenu, setEconomyMenu} = useContext(MenuContext) @@ -86,7 +87,7 @@ export default function economy({userName, anual, years, brutaMensal, yearsBruta }, [unity]) return ( -
+ Smart Energia - PLD @@ -182,7 +183,7 @@ export default function economy({userName, anual, years, brutaMensal, yearsBruta /> -
+ ) } diff --git a/src/pages/resumoOperacao/index.tsx b/src/pages/resumoOperacao/index.tsx index 5a006b8..1bce8fc 100644 --- a/src/pages/resumoOperacao/index.tsx +++ b/src/pages/resumoOperacao/index.tsx @@ -190,7 +190,7 @@ export default function ResumoOperacao({tableData, clients, userName, clientMont if (value.mes.slice(4,7) != '2020') return {value.mes} - {value.cod_smart_unidade} + {value.unidade} {value.operacao} {value.contraparte} {parseFloat(value.montante_nf).toLocaleString('pt-br')} diff --git a/src/styles/layouts/economy/economy.ts b/src/styles/layouts/economy/economy.ts new file mode 100644 index 0000000..a3fd2df --- /dev/null +++ b/src/styles/layouts/economy/economy.ts @@ -0,0 +1,5 @@ +import styled from 'styled-components' + +export const EconomyView = styled.main` + +`