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

local merge

Browse Source
This commit is contained in:
Ubuntu 2022-08-25 21:41:24 +00:00
commit 887105b081
3 changed files with 16 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
src/pages/index.tsx
View File

@ -182,15 +182,14 @@ export default function Home() {
/*export const getServerSideProps: GetServerSideProps = async (ctx) => { /*export const getServerSideProps: GetServerSideProps = async (ctx) => {
const { ['@smartAuth-token']: token } = parseCookies(ctx) const { ['@smartAuth-token']: token } = parseCookies(ctx)
if (token) { // if (token) {
return { // return {
redirect: { // redirect: {
destination: '/dashboard', // destination: '/dashboard',
permanent: false // permanent: false
} // }
} // }
} // }
return { return {
props: {} props: {}
}; };

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

@ -395,14 +395,11 @@ export default function pld({tableData, userName, clientMonth}: pldInterface) {
<MenuItem value={'0'}>Nenhum</MenuItem> <MenuItem value={'0'}>Nenhum</MenuItem>
{ {
clientMonth.sort((a, b) => { clientMonth.sort((a, b) => {
if (parseFloat(a.mes_ref.slice(0, 2)) < parseFloat(b.mes_ref.slice(0, 2))) if (a.mes_ref.split('/')[0] < b.mes_ref.split('/')[0]) return 1
if (parseFloat(a.mes_ref.slice(3, 7)) > parseFloat(b.mes_ref.slice(3, 7))) return -1 if (a.mes_ref.split('/')[0] > b.mes_ref.split('/')[0]) return -1
else return 1 }).sort((a, b) => {
if (parseFloat(a.mes_ref.slice(0, 2)) > parseFloat(b.mes_ref.slice(0, 2))) if (a.mes_ref.split('/')[1] < b.mes_ref.split('/')[1]) return 1
if (parseFloat(a.mes_ref.slice(3, 7)) < parseFloat(b.mes_ref.slice(3, 7))) return 1 if (a.mes_ref.split('/')[1] > b.mes_ref.split('/')[1]) return -1
else return -1
return 0
}).map((data, index) => { }).map((data, index) => {
return <MenuItem key={index} value={data.mes_ref}>{data.mes_ref}</MenuItem> return <MenuItem key={index} value={data.mes_ref}>{data.mes_ref}</MenuItem>
}) })

6
src/pages/telemetria/index.tsx
View File

@ -94,7 +94,7 @@ export default function Telemetria({userName, clients}: any) {
row.push(cols[j].innerText); row.push(cols[j].innerText);
} }
data.push(row.join(",")); data.push(row.join(";"));
} }
downloadCSVFile(data.join("\n"), filename); downloadCSVFile(data.join("\n"), filename);
@ -383,8 +383,8 @@ export default function Telemetria({userName, clients}: any) {
</MenuItem> </MenuItem>
<MenuItem value="5_min">5 minutos</MenuItem> <MenuItem value="5_min">5 minutos</MenuItem>
<MenuItem value="15_min">15 minutos</MenuItem> <MenuItem value="15_min">15 minutos</MenuItem>
{/* <MenuItem value="1_hora">1 hora</MenuItem> <MenuItem value="1_hora">1 hora</MenuItem>
<MenuItem value="1_dia">1 dia</MenuItem> {/* <MenuItem value="1_dia">1 dia</MenuItem>
<MenuItem value="1_mes">1 mês</MenuItem> */} <MenuItem value="1_mes">1 mês</MenuItem> */}
</Select> </Select>
</FormControl> </FormControl>