xit-front
/
xit-opst-fo
20
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix: 심사자 심사화면 적용

Browse Source
main
minuk926 3 years ago
parent b8b54b72cb
commit ed10d9bf2a
6 changed files with 174 additions and 168 deletions
Show Stats Download Patch File Download Diff File

16
src/apis/judge.js
Unescape Escape View File

@ -179,14 +179,14 @@ async function judgeImgList(res, scCode, fieldCnt, fieldName, dataGb, methodName
// eslint-disable-next-line no-await-in-loop
await judgeImgDownload({ scDatagb: dataGb, scCode, methodName: `${methodName}${idx}` }, alert).then((r) => {
if (r.size > 0) {
arrRtn.push(URL.createObjectURL(r));
arrRtn.push({ imgName: res?.data[`${fieldName}${idx}`], url: URL.createObjectURL(r) });
} else {
arrRtn.push('/images/noFile.png');
arrRtn.push({ imgName: res?.data[`${fieldName}${idx}`], url: '/images/noFile.png' });
}
// else
}); // .then((r) => {
} else {
arrRtn.push('/images/noImage.png');
arrRtn.push({ imgName: '', url: '/images/noImage.png' });
}
}
return arrRtn;
@ -198,16 +198,16 @@ export async function findImages(row, alert) {
const res = await findJudge(scCode);
if (res.success) {
const [picadImgs, frecadImgs, contadImgs] = await Promise.all([
judgeImgList(res, scCode, 5, 'scPicad', dataGb, 'getScPicad', alert),
const [frecadImgs, contadImgs, picadImgs] = await Promise.all([
judgeImgList(res, scCode, 5, 'scFrecad', dataGb, 'getScFrecad', alert),
judgeImgList(res, scCode, 9, 'scContad', dataGb, 'getScContad', alert)
judgeImgList(res, scCode, 9, 'scContad', dataGb, 'getScContad', alert),
judgeImgList(res, scCode, 5, 'scPicad', dataGb, 'getScPicad', alert)
]);
return {
arrPicadImg: picadImgs,
arrFrecadImg: frecadImgs,
arrContadImg: contadImgs
arrContadImg: contadImgs,
arrPicadImg: picadImgs
};
}
return res;

100
src/views/biz/judge/ProcessJudge.jsx
Unescape Escape View File

@ -1,43 +1,29 @@
import { useEffect, useRef, useState } from 'react';
import PropTypes from 'prop-types';
import ReactPDF, { PDFViewer, Page, Text, View, Document, StyleSheet } from '@react-pdf/renderer';
import { Button, CardMedia, Divider, FormControl, Grid, InputLabel, MenuItem, Select, TextField } from '@mui/material';
import { Button, Divider, FormControl, Grid, ImageList, InputLabel, MenuItem, Select, TextField } from '@mui/material';
import { findImages, saveJudgeResult } from 'apis/judge';
import { SkipNext, SkipPrevious, Save } from '@mui/icons-material';
import BasicDocument from './BasicDocument';
// Create styles
const styles = StyleSheet.create({
page: {
flexDirection: 'row',
backgroundColor: '#E4E4E4'
},
section: {
margin: 10,
padding: 10,
flexGrow: 1
}
});
import ImgItem from '../../cmm/ImgItem';
const ProcessJudge = (props) => {
const { rowDatas, setOpen, showAlert } = props;
const pageRef = useRef(0);
const totalPageRef = useRef(0);
const curDataRef = useRef({});
const [picadImgs, setPicadImgs] = useState([]);
const [frecadImgs, setFrecadImgs] = useState([]);
const [contadImgs, setContadImgs] = useState([]);
const [picadImgs, setPicadImgs] = useState([]);
const [reason, setReason] = useState();
const [selectedResult, setSelectedResult] = useState();
const [selectedImg, setSelectedImg] = useState({});
const getImgList = (row) => {
findImages(row, showAlert).then((res) => {
const { arrPicadImg, arrFrecadImg, arrContadImg } = res;
setPicadImgs(arrPicadImg);
const { arrFrecadImg, arrContadImg, arrPicadImg } = res;
setFrecadImgs(arrFrecadImg);
setContadImgs(arrContadImg);
setPicadImgs(arrPicadImg);
});
};
@ -71,11 +57,13 @@ const ProcessJudge = (props) => {
setOpen(false);
};
const printPdf = () => {
alert('적용예정');
// ReactPDF.render(<BasicDocument />, `${__dirname}/example.pdf`);
// ReactPDF.renderToStream(<BasicDocument />);
// ReactPDF.PDFViewer(<BasicDocument />);
const viewImage = (imgInfo) => () => {
if (imgInfo.url === '/images/noFile.png') {
showAlert.show(`업로드 파일[${imgInfo.imgName}]을 찾을수 없습니다`);
} else {
setSelectedImg(imgInfo);
}
// viewImages(imgName, url);
};
useEffect(() => {
@ -91,52 +79,33 @@ const ProcessJudge = (props) => {
<>
<Grid container spacing={1}>
<Grid item xs={6.5}>
<Grid container spacing={1}>
{picadImgs?.map((img, idx) => (
<Grid item xs={3} key={idx}>
<CardMedia
component="img"
sx={{
height: 150
}}
src={img}
/>
</Grid>
))}
</Grid>
<Grid container m={1} />
<Grid container spacing={1}>
<ImageList cols={4}>
{frecadImgs?.map((img, idx) => (
<Grid item xs={3} key={idx}>
<CardMedia
component="img"
sx={{
height: 150
}}
src={img}
/>
</Grid>
<ImgItem idx={idx} title={`진술서${idx + 1}`} imgInfo={img} onViewImage={viewImage} />
))}
</Grid>
<Grid container m={1} />
<Grid container spacing={1}>
</ImageList>
<ImageList cols={4}>
{contadImgs?.map((img, idx) => (
<Grid item xs={3} key={idx}>
<CardMedia
component="img"
sx={{
height: 150
}}
src={img}
/>
</Grid>
<ImgItem idx={idx} title={`첨부파일${idx + 1}`} imgInfo={img} onViewImage={viewImage} />
))}
</Grid>
</ImageList>
<ImageList cols={4}>
{picadImgs?.map((img, idx) => (
<ImgItem idx={idx} title={`단속사진${idx + 1}`} imgInfo={img} onViewImage={viewImage} />
))}
</ImageList>
</Grid>
<Grid item xs={5.5}>
<Grid container spacing={1}>
<Grid item xs={12}>
<BasicDocument />
{selectedImg && (
<img
src={selectedImg.url}
srcSet={`${selectedImg.url}?w=400&h=400&fit=crop&auto=format&dpr=2 2x`}
alt={selectedImg.imgName}
loading="lazy"
/>
)}
</Grid>
</Grid>
</Grid>
@ -221,11 +190,6 @@ const ProcessJudge = (props) => {
심의처리
</Button>
</Grid>
<Grid item>
<Button variant="contained" color="primary" size="small" onClick={printPdf}>
PDF
</Button>
</Grid>
<Grid item>
<Button variant="contained" color="primary" size="small" onClick={handleClose}>
닫기

73
src/views/biz/judge/ProcessParkingJudge.jsx
Unescape Escape View File

@ -1,9 +1,10 @@
import { useEffect, useRef, useState } from 'react';
import PropTypes from 'prop-types';
import { Button, CardMedia, Divider, FormControl, Grid, InputLabel, MenuItem, Select, TextField } from '@mui/material';
import { Button, CardMedia, Divider, FormControl, Grid, ImageList, InputLabel, MenuItem, Select, TextField } from '@mui/material';
import { findImages, saveJudgeResult } from 'apis/judge';
import { SkipNext, SkipPrevious, Save } from '@mui/icons-material';
import ImgItem from '../../cmm/ImgItem';
const ProcessParkingJudge = (props) => {
const { rowDatas, setOpen, showAlert } = props;
@ -15,13 +16,14 @@ const ProcessParkingJudge = (props) => {
const [contadImgs, setContadImgs] = useState([]);
const [reason, setReason] = useState();
const [selectedResult, setSelectedResult] = useState();
const [selectedImg, setSelectedImg] = useState({});
const getImgList = (row) => {
findImages(row, showAlert).then((res) => {
const { arrPicadImg, arrFrecadImg, arrContadImg } = res;
setPicadImgs(arrPicadImg);
const { arrFrecadImg, arrContadImg, arrPicadImg } = res;
setFrecadImgs(arrFrecadImg);
setContadImgs(arrContadImg);
setPicadImgs(arrPicadImg);
});
};
@ -55,6 +57,15 @@ const ProcessParkingJudge = (props) => {
setOpen(false);
};
const viewImage = (imgInfo) => () => {
if (imgInfo.url === '/images/noFile.png') {
showAlert.show(`업로드 파일[${imgInfo.imgName}]을 찾을수 없습니다`);
} else {
setSelectedImg(imgInfo);
}
// viewImages(imgName, url);
};
useEffect(() => {
pageRef.current = 0;
totalPageRef.current = rowDatas.length - 1;
@ -67,45 +78,36 @@ const ProcessParkingJudge = (props) => {
return (
<>
<Grid container spacing={1}>
<Grid item xs={6.5}>
<ImageList cols={4}>
{frecadImgs?.map((img, idx) => (
<ImgItem idx={idx} title={`진술서${idx + 1}`} imgInfo={img} onViewImage={viewImage} />
))}
</ImageList>
<ImageList cols={4}>
{contadImgs?.map((img, idx) => (
<ImgItem idx={idx} title={`첨부파일${idx + 1}`} imgInfo={img} onViewImage={viewImage} />
))}
</ImageList>
<ImageList cols={4}>
{picadImgs?.map((img, idx) => (
<Grid item xs={3} key={idx}>
<CardMedia
component="img"
sx={{
height: 150
}}
src={img}
/>
</Grid>
<ImgItem idx={idx} title={`단속사진${idx + 1}`} imgInfo={img} onViewImage={viewImage} />
))}
</ImageList>
</Grid>
<Grid container m={1} />
<Grid item xs={5.5}>
<Grid container spacing={1}>
{frecadImgs?.map((img, idx) => (
<Grid item xs={3} key={idx}>
<CardMedia
component="img"
sx={{
height: 150
}}
src={img}
<Grid item xs={12}>
{selectedImg && (
<img
src={selectedImg.url}
srcSet={`${selectedImg.url}?w=400&h=400&fit=crop&auto=format&dpr=2 2x`}
alt={selectedImg.imgName}
loading="lazy"
/>
)}
</Grid>
))}
</Grid>
<Grid container m={1} />
<Grid container spacing={1}>
{contadImgs?.map((img, idx) => (
<Grid item xs={3} key={idx}>
<CardMedia
component="img"
sx={{
height: 150
}}
src={img}
/>
</Grid>
))}
</Grid>
<Grid container m={1}>
<Grid item xs={12}>
@ -160,6 +162,7 @@ const ProcessParkingJudge = (props) => {
/>
</Grid>
</Grid>
</Grid>
<Grid container spacing={1} m={0.5}>
<Grid item xs={12}>
<Divider />

39
src/views/cmm/ImgItem.js
Unescape Escape View File

@ -0,0 +1,39 @@
import { IconButton, ImageListItem, ImageListItemBar } from '@mui/material';
import { Info } from '@mui/icons-material';
import PropTypes from 'prop-types';
const ImgItem = ({ idx, title, imgInfo, onViewImage }) => (
<ImageListItem key={idx}>
<img
src={imgInfo.url}
// srcSet={`${item.img}?w=164&h=164&fit=crop&auto=format&dpr=2 2x`}
alt={imgInfo.imgName}
loading="lazy"
/>
{imgInfo.imgName && (
<ImageListItemBar
title={title}
subtitle={imgInfo.imgName}
actionIcon={
<IconButton
sx={{ color: 'rgba(255, 255, 255, 0.54)' }}
aria-label={`info about ${imgInfo.imgName}`}
onClick={onViewImage(imgInfo)}
>
<Info />
</IconButton>
}
/>
)}
{!imgInfo.imgName && <ImageListItemBar title={title} />}
</ImageListItem>
);
ImgItem.propTypes = {
idx: PropTypes.number.isRequired,
title: PropTypes.string.isRequired,
imgInfo: PropTypes.object.isRequired,
onViewImage: PropTypes.func.isRequired
};
export default ImgItem;

2
src/views/pages/authentication/auth-forms/AuthForgotPassword.js
Unescape Escape View File

@ -73,7 +73,7 @@ const AuthForgotPassword = ({ ...others }) => {
<OutlinedInput
id="outlined-adornment-email-forgot"
type="email"
value={values.email}
value={values.email || ''}
name="email"
onBlur={handleBlur}
onChange={handleChange}

4
src/views/pages/authentication/auth-forms/AuthRegister.js
Unescape Escape View File

@ -199,7 +199,7 @@ const FirebaseRegister = ({ ...others }) => {
<OutlinedInput
id="outlined-adornment-email-register"
type="email"
value={values.email}
value={values.email || ''}
name="email"
onBlur={handleBlur}
onChange={handleChange}
@ -217,7 +217,7 @@ const FirebaseRegister = ({ ...others }) => {
<OutlinedInput
id="outlined-adornment-password-register"
type={showPassword ? 'text' : 'password'}
value={values.password}
value={values.password || ''}
name="password"
label="Password"
onBlur={handleBlur}

Write Preview
Loading…
Cancel
Save