Merge branch 'dev' into 'feature/buttonGroup'

# Conflicts:
#   pages/resumoOperacao.tsx
This commit is contained in:
José Corte 2022-05-12 12:58:38 +00:00
commit 6187d42ea4
8 changed files with 200 additions and 68 deletions

44
pages/news.tsx Normal file
View File

@ -0,0 +1,44 @@
import React from 'react'
import Banner from '../src/components/banner/Banner'
import Header from '../src/components/header/Header'
import BasicButton from '../src/components/buttons/basicButton/BasicButton';
import { NewsView, Button } from '../styles/layouts/news/NewsView'
export default function aboutUs() {
return (
<NewsView>
<Header name='' />
<Banner title='Notícias' subtitle='Tudo de importante no setor de energia' imgSource='/assets/banners/news.png' />
<section>
<h2>19 Abril 2022</h2>
<strong>ANEEL APROVA REAJUSTE TARIFÁRIO ANUAL DA ENERGISA SERGIPE DE 16,46 % PARA O CONSUMIDOR RESIDENCIAL</strong>
<br />
<br />
<p>A Agência Nacional de Energia Elétrica (ANEEL) aprovou, nesta terça-feira (19/04) o reajuste tarifário anual da Energisa Sergipe Distribuidora de Energia S.A (ESE).
As novas tarifas da empresa, que atende cerca de e 825 mil unidades consumidoras no Sergipe, entram em vigor nesta sexta, 22/04, com reajuste de 16,46 % para
o consumidor residencial. <br />
Os itens que mais impactaram a correção foram os encargos setoriais, os custos de distribuição, a retirada dos componentes financeiros..</p>
<Button>
<fieldset>
<legend> <BasicButton title='Ver Mais...' /></legend>
</fieldset>
</Button>
<h2>19 Abril 2022</h2>
<strong>NEEL APROVA REAJUSTE MÉDIO DE 20,36% NA TARIFA DE ENERGIA NO RN</strong>
<br />
<br />
<p>A Agência Nacional de Energia Elétrica (ANEEL) aprovou, nesta terça-feira (19/04) o reajuste tarifário anual da Energisa Sergipe Distribuidora de Energia S.A (ESE).
As novas tarifas da empresa, que atende cerca de e 825 mil unidades consumidoras no Sergipe, entram em vigor nesta sexta, 22/04, com reajuste de 16,46 % para
o consumidor residencial. <br />
Os itens que mais impactaram a correção foram os encargos setoriais, os custos de distribuição, a retirada dos componentes financeiros..</p>
<Button>
<fieldset>
<legend> <BasicButton title='Ver Mais...' /></legend>
</fieldset>
</Button>
</section>
</NewsView>
)
}

View File

@ -1,4 +1,6 @@
import React from 'react'; import React from 'react';
import Header from '../src/components/header/Header';
import PageTitle from '../src/components/pageTitle/PageTitle';
import BasicButton from '../src/components/buttons/basicButton/BasicButton'; import BasicButton from '../src/components/buttons/basicButton/BasicButton';
import Header from '../src/components/header/Header'; import Header from '../src/components/header/Header';
import PageTitle from '../src/components/pageTitle/PageTitle'; import PageTitle from '../src/components/pageTitle/PageTitle';
@ -14,70 +16,73 @@ export default function ResumoOperacao() {
<h3>Seletor Mês</h3> <h3>Seletor Mês</h3>
<table className="tg"> <table className="tg">
<thead> <thead>
<tr> <tr>
<th className='tg-8oo6'>Unidade </th> <th className='tg-8oo6'>Unidade </th>
<th className='tg-8oo6'>Operação</th> <th className='tg-8oo6'>Operação</th>
<th className='tg-8oo6'>Montante (MWh)</th> <th className='tg-8oo6'>Montante (MWh)</th>
<th className='tg-8oo6'>Contraparte</th> <th className='tg-8oo6'>Contraparte</th>
<th className='tg-8oo6'>Preço(R$/MWh)</th> <th className='tg-8oo6'>Preço(R$/MWh)</th>
<th className='tg-8oo6'>ValorNF/Crédito(R$)</th> <th className='tg-8oo6'>ValorNF/Crédito(R$)</th>
</tr> </tr>
</thead> </thead>
<tbody> <tbody>
<tr> <tr>
<td className='tg-gceh'>Unidade - 9500130</td> <td className='tg-gceh'>Unidade - 9500130</td>
<td className='tg-uulg'>Compra</td> <td className='tg-uulg'>Compra</td>
<td className='tg-gceh'>122,269</td> <td className='tg-gceh'>122,269</td>
<td className='tg-gceh'>COPEL COM I5</td> <td className='tg-gceh'>COPEL COM I5</td>
<td className='tg-uulg'>234,67</td> <td className='tg-uulg'>234,67</td>
<td className='tg-gceh'>38.257,15</td> <td className='tg-gceh'>38.257,15</td>
</tr> </tr>
<tr> <tr>
<td className='tg-hq65'>Unidade - 9500130</td> <td className='tg-hq65'>Unidade - 9500130</td>
<td className='tg-0tzy'>Compra</td> <td className='tg-0tzy'>Compra</td>
<td className='tg-hq65'>110,348</td> <td className='tg-hq65'>110,348</td>
<td className='tg-hq65'>EMEWE I5</td> <td className='tg-hq65'>EMEWE I5</td>
<td className='tg-0tzy'>190,16</td> <td className='tg-0tzy'>190,16</td>
<td className='tg-hq65'>27.978,37</td> <td className='tg-hq65'>27.978,37</td>
</tr> </tr>
<tr> <tr>
<td className="tg-gceh">Unidade - 9500130</td> <td className="tg-gceh">Unidade - 9500130</td>
<td className="tg-uulg">Compra</td> <td className="tg-uulg">Compra</td>
<td className="tg-gceh">13,074</td> <td className="tg-gceh">13,074</td>
<td className="tg-gceh">PACTO COMERCIALIZADORA I5</td> <td className="tg-gceh">PACTO COMERCIALIZADORA I5</td>
<td className="tg-gceh">300,36</td> <td className="tg-gceh">300,36</td>
<td className="tg-gceh">5.235,88</td> <td className="tg-gceh">5.235,88</td>
</tr> </tr>
<tr> <tr>
<td className='tg-hq65'>Unidade - 9500130</td> <td className='tg-hq65'>Unidade - 9500130</td>
<td className='tg-0tzy'>Compra</td> <td className='tg-0tzy'>Compra</td>
<td className='tg-hq65'>133,117</td> <td className='tg-hq65'>133,117</td>
<td className='tg-hq65'>COPEL COM I5</td> <td className='tg-hq65'>COPEL COM I5</td>
<td className='tg-0tzy'>300,36</td> <td className='tg-0tzy'>300,36</td>
<td className='tg-hq65'>41.651,42</td> <td className='tg-hq65'>41.651,42</td>
</tr> </tr>
<tr> <tr>
<td className='tg-gceh'>Unidade - 9500130</td> <td className='tg-gceh'>Unidade - 9500130</td>
<td className='tg-uulg'>Compra</td> <td className='tg-uulg'>Compra</td>
<td className='tg-gceh'>120,138</td> <td className='tg-gceh'>120,138</td>
<td className='tg-gceh'>EMEWE I5</td> <td className='tg-gceh'>EMEWE I5</td>
<td className='tg-uulg'>234,67</td> <td className='tg-uulg'>234,67</td>
<td className='tg-gceh'>30.460,59</td> <td className='tg-gceh'>30.460,59</td>
</tr> </tr>
<tr> <tr>
<td className='tg-hq65'>Unidade - 9500130</td> <td className='tg-hq65'>Unidade - 9500130</td>
<td className='tg-0tzy'>Compra</td> <td className='tg-0tzy'>Compra</td>
<td className='tg-hq65'>14,897</td> <td className='tg-hq65'>14,897</td>
<td className='tg-hq65'>PACTO COMERCIALIZADORA I5</td> <td className='tg-hq65'>PACTO COMERCIALIZADORA I5</td>
<td className='tg-0tzy'>300,36</td> <td className='tg-0tzy'>300,36</td>
<td className='tg-hq65'>5.965,95</td> <td className='tg-hq65'>5.965,95</td>
</tr> </tr>
</tbody> </tbody>
</table> </table>
<BasicButton title='Baixar PDF' />
<BasicButton title='Enviar PDF' /> <Pagination>
<p>Mostando de 1 a 10 de 30 Entradas</p> <p>Mostrando 1 a 10 de 30 Entradas</p>
<p >Anterior <span className='number'>01</span> <span className='numberColor'>02 .. 05</span> <span className='number'>Proxima</span> </p>
</Pagination>
</TableView> </TableView>

View File

@ -23,7 +23,7 @@ export default function Telemetria() {
return( return(
<TelemetriaView> <TelemetriaView>
<Header name='' /> <Header name='' />
<Banner title ='Telemetria' subtitle='Dados Coletados do Sistema de Coleta de Dados de Energia - <Banner title ='Telemetria' subtitle='Dados Coletados do Sistema de Coleta de Dados de Energia -
SCDE da Câmara de Comercialização de Energia Elétrica - CCEE, SCDE da Câmara de Comercialização de Energia Elétrica - CCEE,
sendo que as quantidades aqui informadas são de responsabilidade do agente de medição sendo que as quantidades aqui informadas são de responsabilidade do agente de medição

Binary file not shown.

After

Width:  |  Height:  |  Size: 588 KiB

View File

@ -4,8 +4,9 @@ export const BasicButtonView = styled.button`
display: flex; display: flex;
justify-content: center; justify-content: center;
align-items: center; align-items: center;
margin-top: 10px;
width: 120px; width: 140px;
height: 45px; height: 45px;
cursor: pointer; cursor: pointer;
background: #254F7F; background: #254F7F;

0
src/txt.txt Normal file
View File

View File

@ -139,9 +139,25 @@ export const TableView = styled.div`
color: #254F7F; color: #254F7F;
} }
p{
margin-top: 4rem; .pagination{
}
`;
export const Pagination = styled.div`
display: flex;
justify-content: space-between;
align-items: center;
width: 100%;
.number{
color: #2E5581;
}
.numberColor{
color: #ABAFB3;
;
} }
`; `;

View File

@ -0,0 +1,66 @@
import styled from "styled-components";
export const NewsView = styled.main`
width: 100%;
p {
font-family: 'Poppins';
font-style: normal;
font-weight: 300;
font-size: 17px;
line-height: 26px;
}
h2{
color: #254F7F;
}
ul {
list-style: none;
li {
display: flex;
margin-bottom: 8px;
}
}
section {
article {
display: flex;
justify-content: flex-end;
align-items: center;
aside {
display: flex;
justify-content: center;
align-items: center;
width: fit-content;
flex-direction: column;
}
}
}`;
export const Button = styled.div`
display: flex;
justify-content: center;
fieldset {
border-top: 0.7px solid #E1E1E1;
border-bottom: none;
border-left: none;
border-right: none;
display: block;
text-align: center;
width: 100%;
}
fieldset legend {
padding: 25px 4px;
color: #ABB3BB;
font-size: 14px;
}
`;