Smart/smartEnergyView-frontend
2
0
Fork 0
Code Issues 7 Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'telemetry' into 'dev'

Browse Source 
Telemetry

See merge request kluppsoftware/smart-energia-web!115
This commit is contained in:
José Corte 2022-07-19 22:12:18 +00:00
commit 72f02b3035
10 changed files with 100 additions and 118 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/components/graph/ChartView.ts
View File

@ -1,7 +1,7 @@
import styled from "styled-components" import styled from "styled-components"
export const ChartView = styled.div` export const ChartView = styled.div`
min-width: 90%; width: 100%!important;
div{ div{
/* margin-top: 10px; */ /* margin-top: 10px; */

2
src/components/graph/costIndicatorChart/index.tsx
View File

@ -63,7 +63,7 @@ export default function CostIndicatorChart({ title, data1, data2, label, subtitl
dataArr.map(data => { dataArr.map(data => {
sum += data; sum += data;
}); });
const result = `${(parseFloat(value)/10).toLocaleString('pt-br').slice(0, 4)}` const result = `${parseInt((parseInt(value)/10).toLocaleString('pt-br'))}`
return value==null? null : result return value==null? null : result
}, },

2
src/components/graph/grossMensalChart/GrossMensalChart.tsx
View File

@ -103,7 +103,7 @@ export default function GrossMensalChart({ title, data1, data2, label, subtitle,
{ {
type: 'bar', type: 'bar',
label: 'Consolidado', label: 'Consolidado',
data: data1.map(value => value?.economia_acumulada), data: data1.map(value => !value.dad_estimado? value?.economia_acumulada : null),
backgroundColor: '#255488' backgroundColor: '#255488'
}, },
{ {

2
src/components/sidebar/Sidebar.tsx
View File

@ -129,7 +129,7 @@ export default function Sidebar() {
<Link href='/telemetria'><li className={router.pathname=='/telemetria'? 'actualPath' : null}><Image src='/assets/sidebar/telemetryIcon.svg' width={25} height={25} />{'Telemetria'}</li></Link> <Link href='/telemetria'><li className={router.pathname=='/telemetria'? 'actualPath' : null}><Image src='/assets/sidebar/telemetryIcon.svg' width={25} height={25} />{'Telemetria'}</li></Link>
<Link href='/resumoOperacao'><li className={router.pathname=='/resumoOperacao'? 'actualPath' : null} ><Image src='/assets/sidebar/summaryOperationsIcon.svg' width={25} height={25} />{'Resumo de Op. '}</li></Link> <Link href='/resumoOperacao'><li className={router.pathname=='/resumoOperacao'? 'actualPath' : null} ><Image src='/assets/sidebar/summaryOperationsIcon.svg' width={25} height={25} />{'Resumo de Op. '}</li></Link>
<Link href='/news'><li className={router.pathname=='/news'? 'actualPath' : null}><Image src='/assets/sidebar/newsIcon.svg' width={25} height={25} />{'Notícias'}</li></Link> <Link href='/news'><li className={router.pathname=='/news'? 'actualPath' : null}><Image src='/assets/sidebar/newsIcon.svg' width={25} height={25} />{'Notícias'}</li></Link>
<Link href='/pld'><li onClick={() => setPldDrawer(!pldDrawer)} className={router.pathname=='/pld'? 'actualPath' : null}><Image src='/assets/sidebar/newsIcon.svg' width={25} height={25} />{'PLD >'}</li></Link> <Link href='/pld'><li onClick={() => setPldDrawer(!pldDrawer)} className={router.pathname=='/pld'? 'actualPath' : null}><Image src='/assets/sidebar/newsIcon.svg' width={25} height={25} />{'PLD'}</li></Link>
{/* <div className='pldDrawer drawer'> {/* <div className='pldDrawer drawer'>
<Link href='/pld'><li onClick={() => setPldMenu(0)} className={pldMenu==0? 'actualPathDrawer' : null}>PLD Histórico</li></Link> <Link href='/pld'><li onClick={() => setPldMenu(0)} className={pldMenu==0? 'actualPathDrawer' : null}>PLD Histórico</li></Link>
<Link href='/pld'><li onClick={() => setPldMenu(1)} className={pldMenu===1? 'actualPathDrawer' : null}>Valores Diários</li></Link> <Link href='/pld'><li onClick={() => setPldMenu(1)} className={pldMenu===1? 'actualPathDrawer' : null}>Valores Diários</li></Link>

4
src/pages/news/index.tsx
View File

@ -14,13 +14,14 @@ import { Button, NewsView } from '../../styles/layouts/news/NewsView'
export default function aboutUs({userName, news}: any) { export default function aboutUs({userName, news}: any) {
return ( return (
<NewsView> <main style={{display: 'flex', flexDirection: 'column'}}>
<Head> <Head>
<title>Smart Energia - Noticias</title> <title>Smart Energia - Noticias</title>
</Head> </Head>
<Header name={userName}> <Header name={userName}>
<PageTitle title='Notícias' subtitle='Tudo de importante no setor de energia'/> <PageTitle title='Notícias' subtitle='Tudo de importante no setor de energia'/>
</Header> </Header>
<NewsView>
{/* <Banner title='Notícias' subtitle='Tudo de importante no setor de energia' imgSource='/assets/banners/newsBanner.webp'/> */} {/* <Banner title='Notícias' subtitle='Tudo de importante no setor de energia' imgSource='/assets/banners/newsBanner.webp'/> */}
{ {
@ -50,6 +51,7 @@ export default function aboutUs({userName, news}: any) {
target={"_blank"} target={"_blank"}
rel={"noreferrer"}><BasicButton title='Noticias Atualizadas' onClick={() => console.log()}/></a> rel={"noreferrer"}><BasicButton title='Noticias Atualizadas' onClick={() => console.log()}/></a>
</NewsView> </NewsView>
</main>
) )
} }

4
src/pages/pld/index.tsx
View File

@ -372,7 +372,7 @@ export default function pld({tableData, userName, clientMonth}: pldInterface) {
{/* grafico de grafico por seleção de data (mês) (diario)*/} {/* grafico de grafico por seleção de data (mês) (diario)*/}
<RenderIf isTrue={pldMenu===1}> <RenderIf isTrue={pldMenu===1}>
<PldGraphView> <PldGraphView>
<section className='toolsbar'> <section className='toolsbar2'>
<FormControl sx={{ <FormControl sx={{
width: '320px' width: '320px'
}}> }}>
@ -441,7 +441,7 @@ export default function pld({tableData, userName, clientMonth}: pldInterface) {
inputFormat="dd/MM/yyyy" inputFormat="dd/MM/yyyy"
value={date} value={date}
onChange={handleChangeDate} onChange={handleChangeDate}
renderInput={(params) => <TextField {...params}/>} renderInput={(params) => <TextField {...params} style={{minWidth: '320px'}}/>}
/> />
</div> </div>
</LocalizationProvider> </LocalizationProvider>

20
src/styles/globals.ts
View File

@ -40,8 +40,12 @@ export const GlobalStyle = createGlobalStyle`
box-sizing: border-box; box-sizing: border-box;
} }
.datePicker { .datePicker {
.MuiOutlinedInput-input, .MuiInputBase-input, .MuiInputBase-inputAdornedEnd, .css-nxo287-MuiInputBase-input-MuiOutlinedInput-input {
padding: 0 0 0 15px;
width: 100%;
height: 63px!important;
}
.css-1u3bzj6-MuiFormControl-root-MuiTextField-root, .css-1u3bzj6-MuiFormControl-root-MuiTextField-root,
.css-o9k5xi-MuiInputBase-root-MuiOutlinedInput-root, .css-o9k5xi-MuiInputBase-root-MuiOutlinedInput-root,
.css-o9k5xi-MuiInputBase-root-MuiOutlinedInput-root, .css-o9k5xi-MuiInputBase-root-MuiOutlinedInput-root,
@ -54,8 +58,8 @@ export const GlobalStyle = createGlobalStyle`
.css-nxo287-MuiInputBase-input-MuiOutlinedInput-input{ .css-nxo287-MuiInputBase-input-MuiOutlinedInput-input{
/* background-color: red; */ /* background-color: red; */
/* position: relative; */ /* position: relative; */
width: 100%; /* width: 100%;
height:68px; height:63px; */
} }
.MuiFormControl-root, .MuiFormControl-root,
@ -76,7 +80,7 @@ export const GlobalStyle = createGlobalStyle`
.MuiOutlinedInput-input, .MuiOutlinedInput-input,
.MuiInputBase-input .MuiInputBase-inputAdornedEnd, .MuiInputBase-input .MuiInputBase-inputAdornedEnd,
.css-nxo287-MuiInputBase-input-MuiOutlinedInput-input { .css-nxo287-MuiInputBase-input-MuiOutlinedInput-input {
padding-top: 6px; /* padding-top: 6px; */
} }
.MuiButtonBase-root, .MuiButtonBase-root,
@ -84,8 +88,8 @@ export const GlobalStyle = createGlobalStyle`
.MuiIconButton-edgeEnd, .MuiIconButton-edgeEnd,
.MuiIconButton-sizeMedium, .MuiIconButton-sizeMedium,
.css-1yq5fb3-MuiButtonBase-root-MuiIconButton-root { .css-1yq5fb3-MuiButtonBase-root-MuiIconButton-root {
width: 30px; /* width: 30px;
height: 30px; height: 30px; */
} }
} }
@ -97,7 +101,7 @@ export const GlobalStyle = createGlobalStyle`
.MuiFormLabel-colorPrimary, .MuiFormLabel-colorPrimary,
.MuiFormLabel-filled, .MuiFormLabel-filled,
.css-1sumxir-MuiFormLabel-root-MuiInputLabel-root { .css-1sumxir-MuiFormLabel-root-MuiInputLabel-root {
color: rgba(0, 0, 0, 0.6); /* color: rgba(0, 0, 0, 0.6);
font-family: "Roboto","Helvetica","Arial",sans-serif; font-family: "Roboto","Helvetica","Arial",sans-serif;
font-weight: 400; font-weight: 400;
font-size: 1rem; font-size: 1rem;
@ -115,6 +119,6 @@ export const GlobalStyle = createGlobalStyle`
left: 0; left: 0;
user-select: none; user-select: none;
z-index: 1; z-index: 1;
pointer-events: auto; pointer-events: auto; */
} }
`; `;

6
src/styles/layouts/Telemetria/TelemetriaView.ts
View File

@ -176,6 +176,8 @@ export const TelemetriaView = styled.main`
input { input {
width: 15rem; width: 15rem;
height: 63px!important;
font-family: -apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Oxygen, Ubuntu, Cantarell, 'Open Sans', 'Helvetica Neue', sans-serif; font-family: -apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Oxygen, Ubuntu, Cantarell, 'Open Sans', 'Helvetica Neue', sans-serif;
font-weight: 400; font-weight: 400;
@ -373,7 +375,7 @@ export const Uploads = styled.div`
`; `;
export const TableHeader = styled.div` export const TableHeader = styled.div`
width: 100%; width: 90%;
display: flex; display: flex;
align-items: center; align-items: center;
@ -391,7 +393,7 @@ export const ChartFilters = styled.section`
align-self: flex-start; align-self: flex-start;
width: 100%; width: 90%;
margin-top: 20px; margin-top: 20px;

44
src/styles/layouts/pld/PldView.ts
View File

@ -442,24 +442,28 @@ export const PldGraphView = styled.main`
.toolsbar { .toolsbar {
display: flex; display: flex;
justify-content: center; justify-content: center;
align-items: flex-start!important; align-items: flex-start;
align-self: flex-start; align-self: flex-start;
flex-direction: row; flex-direction: row;
flex-wrap: nowrap; flex-wrap: nowrap;
width: 90%!important;
padding-left: 25px;
} }
.toolsbar2 { .toolsbar2 {
display: flex; display: flex;
justify-content: flex-start; justify-content: flex-start;
align-items: flex-start!important; align-items: flex-start!important;
flex-direction: column; min-width: 320px;
/* margin-bottom: 9px; */ padding-left: 25px;
/* transform: translateY(-8px); */ width: 100%;
p { p {
margin: 0; margin: 0;
@ -468,9 +472,7 @@ export const PldGraphView = styled.main`
input { input {
width: 16.6rem; width: 16.6rem;
height: 3.5rem; height: 63px;
/* padding: 14px; */
font-family: -apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Oxygen, Ubuntu, Cantarell, 'Open Sans', 'Helvetica Neue', sans-serif; font-family: -apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Oxygen, Ubuntu, Cantarell, 'Open Sans', 'Helvetica Neue', sans-serif;
font-weight: 400; font-weight: 400;
@ -480,34 +482,6 @@ export const PldGraphView = styled.main`
background-color: #F9F9F9; background-color: #F9F9F9;
} }
section {
display: flex;
align-items: center;
flex-wrap: wrap;
:first-child {
justify-content: flex-start;
align-items: center;
}
:nth-child(2) {
margin-top: 50px;
margin-bottom: 50px;
justify-content: space-evenly;
}
width: 100%;
}
footer {
label {
cursor: pointer;
margin: 20px;
}
}
` `
export const GoBack = styled.label` export const GoBack = styled.label`