fix: dashboard 공지사항 제목 색상 fix

.env.local

@@ -3,4 +3,4 @@ REACT_APP_MODE=local
 REACT_APP_VERSION = v0.0.1
 REACT_APP_API_URL=http://localhost:8090
 #REACT_APP_API_URL=http://211.119.124.73:8090
-REACT_APP_SERVER_TIMEOUT=6000
+REACT_APP_SERVER_TIMEOUT=60000

.env.production

@@ -4,4 +4,4 @@ REACT_APP_VERSION = v0.0.1
 #REACT_APP_API_URL=http://localhost:8090
 #REACT_APP_API_URL=http://211.119.124.9:8090
 REACT_APP_API_URL=http://211.119.124.107:8090
-REACT_APP_SERVER_TIMEOUT=6000
+REACT_APP_SERVER_TIMEOUT=60000

src/apis/judge.js

@@ -18,7 +18,8 @@ import {
   GET_JUDGE_LIST,
   SAVE_JUDGE_RESULT,
   SAVE_ADMIN_JUDGE_STDS,
-  GET_DASHBOARD
+  GET_DASHBOARD,
+  GET_PARKING_IMAGE
 } from 'commons/ApiUrl';
 import { setRowId } from './common';
 import FileSaver from 'file-saver';
@@ -209,7 +210,7 @@ async function judgeImgList(res, scCode, fieldCnt, fieldName, dataGb, methodName
   return arrRtn;
 }
 
-export async function findImages(row) {
+export async function findJudgeImages(row) {
   const dataGb = row?.msDatagb;
   const scCode = row?.msMaincode;
 
@@ -234,3 +235,33 @@ export async function saveJudgeResult(params) {
   // eslint-disable-next-line no-return-await
   return await axios.post(SAVE_JUDGE_RESULT, params);
 }
+
+export async function findParkingImages(row) {
+  const dataGb = row?.msDatagb;
+  const scCode = row?.msMaincode;
+
+  // const res = await findJudge(scCode);
+  // if (res.success) {
+  //   const [frecadImgs, contadImgs, picadImgs] = await Promise.all([
+  //     judgeImgList(res, scCode, 5, 'scFrecad', dataGb, 'getScFrecad'),
+  //     judgeImgList(res, scCode, 9, 'scContad', dataGb, 'getScContad'),
+  //     judgeImgList(res, scCode, 5, 'scPicad', dataGb, 'getScPicad')
+  //   ]);
+  //
+  //   return {
+  //     arrFrecadImg: frecadImgs,
+  //     arrContadImg: contadImgs,
+  //     arrPicadImg: picadImgs
+  //   };
+  //
+  // }
+  // return res;
+
+  const res = await axios.get(GET_PARKING_IMAGE + row?.rcMaincode);
+
+  return {
+    arrFrecadImg: [],
+    arrContadImg: [],
+    arrPicadImg: []
+  };
+}

src/commons/ApiUrl.js

@@ -44,6 +44,7 @@ export const SAVE_ADMIN_JUDGE_STDS = '/api/v2/ctgy/admin/judge';
 
 export const GET_JUDGE_LIST = '/api/v2/ctgy/judge';
 export const SAVE_JUDGE_RESULT = '/api/v2/ctgy/judge';
+export const GET_PARKING_IMAGE = '/api/v2/ctgy/parking/judge/';
 
 export const GET_JUDGE_FILE_DOWNLOAD = '/api/v2/ctgy/cmm/download/judge';
 

src/views/biz/judge/ParkingJudgeByUserReview.jsx

@@ -18,6 +18,8 @@ import ProcessParkingJudge from './ProcessParkingJudge';
 import useAuth from 'hooks/useAuth';
 import Button from '@mui/material/Button';
 import { useAlert } from 'react-alert';
+import PropTypes from 'prop-types';
+import JudgeByUserReview from './JudgeByUserReview';
 
 const ParkingJudgeByUserReview = () => {
   const { user } = useAuth();
@@ -31,7 +33,7 @@ const ParkingJudgeByUserReview = () => {
   });
   const [open, setOpen] = useState(false);
   const [title, setTitle] = useState('');
-  const [rowDatas] = useState([]);
+  const [rowDatas, setRowDatas] = useState([]);
   const [minSdate, setMinSdate] = useState('');
   const [maxEdate, setMaxEdate] = useState('');
   const [minSeq, setMinSeq] = useState(0);
@@ -55,18 +57,18 @@ const ParkingJudgeByUserReview = () => {
   }, []);
 
   const onJudge = () => {
-    // setRowDatas(rowsState?.rows);
+    setRowDatas(rowsState?.rows);
-    // setTitle(`주정차 의견진술 심의 결정`);
+    setTitle(`주정차 의견진술 심의 결정`);
-    // setOpen(true);
+    setOpen(true);
-    alert('적용예정');
+    // alert('적용예정');
   };
 
   const processJudge = useCallback(
     (row) => () => {
-      // setRowDatas([row]);
+      setRowDatas([row]);
-      // setTitle(`주정차 의견진술 심의 결정`);
+      setTitle(`주정차 의견진술 심의 결정`);
-      // setOpen(true);
+      setOpen(true);
-      alert('적용예정');
+      // alert('적용예정');
     },
     []
   );

src/views/biz/judge/ProcessJudge.jsx

@@ -2,7 +2,7 @@ import { useEffect, useRef, useState } from 'react';
 import PropTypes from 'prop-types';
 
 import { Button, Divider, FormControl, Grid, ImageList, InputLabel, MenuItem, Select, TextField } from '@mui/material';
-import { findImages, saveJudgeResult } from 'apis/judge';
+import { findJudgeImages, saveJudgeResult } from 'apis/judge';
 import { SkipNext, SkipPrevious, Save } from '@mui/icons-material';
 import ImgItem from '../../cmm/ImgItem';
 import NumberFormat from 'react-number-format';
@@ -20,7 +20,7 @@ const ProcessJudge = (props) => {
   const [selectedImg, setSelectedImg] = useState({});
 
   const getImgList = (row) => {
-    findImages(row).then((res) => {
+    findJudgeImages(row).then((res) => {
       const { arrFrecadImg, arrContadImg, arrPicadImg } = res;
       setFrecadImgs(arrFrecadImg);
       setContadImgs(arrContadImg);
@@ -53,7 +53,12 @@ const ProcessJudge = (props) => {
       showAlert.show('결정사유는 필수 입력해야 합니다.');
       return;
     }
-    saveJudgeResult({ msuCode: curDataRef.current.msuCode, msuResult: selectedResult, msuReason: reason }).then((res) => {
+    saveJudgeResult({
+      msuCode: curDataRef.current.msuCode,
+      msuUserid: rowDatas[pageRef.current].msuUserid,
+      msuResult: selectedResult,
+      msuReason: reason
+    }).then((res) => {
       if (res?.success) {
         curDataRef.current.msuResult = selectedResult;
         curDataRef.current.msuReason = reason;
@@ -137,11 +142,11 @@ const ProcessJudge = (props) => {
               label="위반일자"
               format="####-##-##"
               fullWidth
-              value={rowDatas[pageRef.current].scWdate}
+              value={rowDatas[pageRef.current].msWdate}
             />
           </Grid>
           <Grid item xs={6}>
-            <TextField size="small" required disabled label="위반장소" fullWidth value={rowDatas[pageRef.current].scPos} />
+            <TextField size="small" required disabled label="위반장소" fullWidth value={rowDatas[pageRef.current].msPos} />
           </Grid>
           <Grid item xs={2}>
             <FormControl fullWidth>

src/views/biz/judge/ProcessParkingJudge.jsx

@@ -2,7 +2,7 @@ import { useEffect, useRef, useState } from 'react';
 import PropTypes from 'prop-types';
 
 import { Button, Divider, FormControl, Grid, ImageList, InputLabel, MenuItem, Select, TextField } from '@mui/material';
-import { findImages, saveJudgeResult } from 'apis/judge';
+import { findJudgeImages, findParkingImages, saveJudgeResult } from 'apis/judge';
 import { SkipNext, SkipPrevious, Save } from '@mui/icons-material';
 import ImgItem from '../../cmm/ImgItem';
 import NumberFormat from 'react-number-format';
@@ -20,7 +20,7 @@ const ProcessParkingJudge = (props) => {
   const [selectedImg, setSelectedImg] = useState({});
 
   const getImgList = (row) => {
-    findImages(row).then((res) => {
+    findParkingImages(row).then((res) => {
       const { arrFrecadImg, arrContadImg, arrPicadImg } = res;
       setFrecadImgs(arrFrecadImg);
       setContadImgs(arrContadImg);
@@ -136,11 +136,11 @@ const ProcessParkingJudge = (props) => {
               label="위반일자"
               format="####-##-##"
               fullWidth
-              value={rowDatas[pageRef.current].scWdate}
+              value={rowDatas[pageRef.current].msWdate}
             />
           </Grid>
           <Grid item xs={6}>
-            <TextField size="small" required disabled label="위반장소" fullWidth value={rowDatas[pageRef.current].scPos} />
+            <TextField size="small" required disabled label="위반장소" fullWidth value={rowDatas[pageRef.current].msPos} />
           </Grid>
           <Grid item xs={2}>
             <FormControl fullWidth>

src/views/biz/user/UserManager.jsx

@@ -104,8 +104,8 @@ const UserManager = () => {
       align: 'center',
       width: 80,
       valueFormatter: (params) => (params.value === '0' ? '비활성' : '활성')
-    },
+    }
-    { headerName: '구청코드', headerAlign: 'center', field: 'gu', align: 'right' }
+    // { headerName: '구청코드', headerAlign: 'center', field: 'gu', align: 'right' }
   ];
   // 리스트 조회
   const search = useCallback(() => {

src/views/biz/user/UserManagerForm.jsx

@@ -96,6 +96,7 @@ const UserManagementForm = (props) => {
           <Grid item sm={5.9}>
             <TextField
               size="small"
+              disabled={!create}
               required
               label="비밀번호"
               type="password"