From f454a5900f130e457de3566e537420f3de383067 Mon Sep 17 00:00:00 2001 From: thkim Date: Fri, 22 Mar 2024 13:33:58 +0900 Subject: [PATCH] =?UTF-8?q?build:=20https=20=EC=A7=80=EC=9B=90=ED=95=98?= =?UTF-8?q?=EB=8F=84=EB=A1=9D=20=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../components/progress/LoadingProgress.jsx | 2 - .../src/config/index.js | 2 +- .../pages/admin/committee/ProgressStatus.jsx | 44 ++-- .../admin/committee/ProgressStatus/Edit.jsx | 9 +- .../ReferenceCodePopupDialog.jsx | 65 ++++++ .../ReferenceCodePopupDialogCotents.jsx | 191 ++++++++++++++++++ .../ReferenceCodePopupDialogCotentsHeader.jsx | 29 +++ ...eferenceCodePopupDialogCotentsListItem.jsx | 125 ++++++++++++ .../ReferenceCodePopupInput.jsx | 34 ++++ .../src/pages/admin/contents/PopUp.jsx | 14 +- .../pages/admin/contents/StandardResearch.jsx | 6 +- .../resources/application-prod.properties | 2 +- 12 files changed, 500 insertions(+), 23 deletions(-) create mode 100644 egovframe-template-simple-react-contribution/src/pages/admin/committee/ProgressStatus/ReferenceCodePopupDialog.jsx create mode 100644 egovframe-template-simple-react-contribution/src/pages/admin/committee/ProgressStatus/ReferenceCodePopupDialogCotents.jsx create mode 100644 egovframe-template-simple-react-contribution/src/pages/admin/committee/ProgressStatus/ReferenceCodePopupDialogCotentsHeader.jsx create mode 100644 egovframe-template-simple-react-contribution/src/pages/admin/committee/ProgressStatus/ReferenceCodePopupDialogCotentsListItem.jsx create mode 100644 egovframe-template-simple-react-contribution/src/pages/admin/committee/ProgressStatus/ReferenceCodePopupInput.jsx diff --git a/egovframe-template-simple-react-contribution/src/components/progress/LoadingProgress.jsx b/egovframe-template-simple-react-contribution/src/components/progress/LoadingProgress.jsx index f3b9e51..87ceddc 100644 --- a/egovframe-template-simple-react-contribution/src/components/progress/LoadingProgress.jsx +++ b/egovframe-template-simple-react-contribution/src/components/progress/LoadingProgress.jsx @@ -41,8 +41,6 @@ SimpleDialog.propTypes = { }; export default function LoadingProgress({open, setOpen}) { - - return (
수정 삭제
+ +
{/* */} - {listItem.length === 0 && + {typeof listItem === 'undefined' && +

+ } + {listItem && listItem.length === 0 &&

검색된 결과가 없습니다.

- } - {listItem.map((it)=>( + } + {listItem && listItem.map((it)=>(
{it.number}
{it.drftTypeNm}
-
{it.categoryNm}
{it.title}
+
{it.categoryNm}
{it.title}
{it.orgNm}
진행단계표시
{it.regDate}
@@ -199,6 +217,8 @@ function ProgressStatus(props) {
))}
+ + {/* */} diff --git a/egovframe-template-simple-react-contribution/src/pages/admin/committee/ProgressStatus/Edit.jsx b/egovframe-template-simple-react-contribution/src/pages/admin/committee/ProgressStatus/Edit.jsx index 0b2e2d4..1cc4804 100644 --- a/egovframe-template-simple-react-contribution/src/pages/admin/committee/ProgressStatus/Edit.jsx +++ b/egovframe-template-simple-react-contribution/src/pages/admin/committee/ProgressStatus/Edit.jsx @@ -8,6 +8,9 @@ import CODE from 'constants/code'; import { default as EgovLeftNav } from 'components/leftmenu/EgovLeftNavAdmin'; +import ReferenceCodePopupInput from './ReferenceCodePopupInput'; + + import styled from "styled-components"; import { makeStyles } from "@mui/styles"; @@ -376,9 +379,9 @@ function ProgressStatusEdit(props) {
필수
- setRequestItems({ ...requestItems, categoryId: e.target.value })} +
diff --git a/egovframe-template-simple-react-contribution/src/pages/admin/committee/ProgressStatus/ReferenceCodePopupDialog.jsx b/egovframe-template-simple-react-contribution/src/pages/admin/committee/ProgressStatus/ReferenceCodePopupDialog.jsx new file mode 100644 index 0000000..1325abd --- /dev/null +++ b/egovframe-template-simple-react-contribution/src/pages/admin/committee/ProgressStatus/ReferenceCodePopupDialog.jsx @@ -0,0 +1,65 @@ +import * as React from 'react'; +import PropTypes from 'prop-types'; +import Box from '@mui/material/Box'; +import { Dialog, DialogContent, makeStyles, Theme, Typography } from "@material-ui/core"; + +import ReferenceCodePopupDialogCotents from './ReferenceCodePopupDialogCotents'; + +const useStyles = makeStyles((theme) => ({ + backDrop: { + backdropFilter: "blur(3px)", + backgroundColor:'rgba(0,0,30,0.4)' + }, +})); + +function SimpleDialog(props) { + + const classes = useStyles(); + + const { onClose, open } = props; + + + const handleClose = () => { + onClose(); + }; + + return ( + + + + + + + + ); +} + +SimpleDialog.propTypes = { + onClose: PropTypes.func.isRequired, + open: PropTypes.bool.isRequired, +}; + +export default function ReferenceCodePopupDialog({open, setOpen}) { + + const handleClose = () => { + setOpen(false); + }; + + return ( +
+ +
+ ); +} \ No newline at end of file diff --git a/egovframe-template-simple-react-contribution/src/pages/admin/committee/ProgressStatus/ReferenceCodePopupDialogCotents.jsx b/egovframe-template-simple-react-contribution/src/pages/admin/committee/ProgressStatus/ReferenceCodePopupDialogCotents.jsx new file mode 100644 index 0000000..47499b4 --- /dev/null +++ b/egovframe-template-simple-react-contribution/src/pages/admin/committee/ProgressStatus/ReferenceCodePopupDialogCotents.jsx @@ -0,0 +1,191 @@ +import * as React from 'react'; +import Box from '@mui/material/Box'; +import { styled, ThemeProvider, createTheme } from '@mui/material/styles'; +import List from '@mui/material/List'; +import ListItemButton from '@mui/material/ListItemButton'; +import ListItemText from '@mui/material/ListItemText'; +import Paper from '@mui/material/Paper'; + +import ListSubheader from '@mui/material/ListSubheader'; + +import ReferenceCodePopupDialogCotentsHeader from './ReferenceCodePopupDialogCotentsHeader'; +import ReferenceCodePopupDialogCotentsListItem from './ReferenceCodePopupDialogCotentsListItem'; + + + + +const data = [ + { + codeTitle: "KDS 10 00 00", + codeName: '설계기준', + depth: 1, + children: [ + { + codeTitle: "KDS 10 10 00", + codeName: '공통편', + depth: 2, + children: [ + { + codeTitle: "KDS 10 10 00", + codeName: '공통편', + depth: 3, + children: [ + { + codeTitle: "KDS 10 00 00", + codeName: '공통 설계기준', + depth: 4, + children: [ + ] + }, + { + codeTitle: "KDS 10 20 00", + codeName: '지반 설계 기준', + depth: 4, + children: [ + ] + }, + { + codeTitle: "KDS 12 00 00", + codeName: '건설측량 설계기준', + depth: 4, + children: [ + ] + }, + { + codeTitle: "KDS 14 00 00", + codeName: '구조 설계기준', + depth: 4, + children: [ + ] + }, + { + codeTitle: "KDS 17 00 00", + codeName: '내진 설계기준', + depth: 4, + children: [ + ] + }, + ] + }, + { + codeTitle: "KDS 10 20 00", + codeName: '시설물편', + depth: 3, + children: [ + ] + }, + ] + }, + { + codeTitle: "KDS 10 20 00", + codeName: '시설물편', + depth: 2, + children: [ + ] + }, + ] + }, + { codeTitle: "KCS 20 00 00", codeName: '표준시방서', depth: 1, }, + { codeTitle: "SMCS 40 00 00", codeName: '서울시 전문시방서', depth: 1, }, + { codeTitle: "EXCS 50 00 00", codeName: '고속도로공사 전문시방서', depth: 1, }, + { codeTitle: "KRCCS 60 00 00", codeName: '농업생산기반시설 전문시방서', depth: 1, }, +]; + + +const FireNav = styled(List)({ + '& .MuiListItemButton-root': { + paddingLeft: 0, + paddingRight: 0, + background: '#fafafa', + }, + '& .MuiListItemIcon-root': { + minWidth: 0, + marginRight: 16, + }, + '& .MuiSvgIcon-root': { + fontSize: 20, + }, +}); + +const ItemHeader = styled('div')(({ theme }) => ({ + padding: theme.spacing(1), + borderRadius: '4px', + textAlign: 'center', +})); + +const Item = styled('div')(({ theme }) => ({ + padding: theme.spacing(1), + borderRadius: '4px', + textAlign: 'center', +})); + +export default function ReferenceCodePopupDialogCotents() { + const [open, setOpen] = React.useState(true); + + const [selectedValue, setSelectedValue] = React.useState('a'); + + const handleChange = (event) => { + setSelectedValue(event.target.value); + }; + + + + return ( + + + + + + + + + + + + } + > + + + + + + + + + + ); +} diff --git a/egovframe-template-simple-react-contribution/src/pages/admin/committee/ProgressStatus/ReferenceCodePopupDialogCotentsHeader.jsx b/egovframe-template-simple-react-contribution/src/pages/admin/committee/ProgressStatus/ReferenceCodePopupDialogCotentsHeader.jsx new file mode 100644 index 0000000..b220690 --- /dev/null +++ b/egovframe-template-simple-react-contribution/src/pages/admin/committee/ProgressStatus/ReferenceCodePopupDialogCotentsHeader.jsx @@ -0,0 +1,29 @@ +import * as React from 'react'; +import Box from '@mui/material/Box'; +import { styled, } from '@mui/material/styles'; + + + +const ItemHeader = styled('div')(({ theme }) => ({ + padding: theme.spacing(1), + borderRadius: '4px', + textAlign: 'left', +})); + +export default function ReferenceCodePopupDialogCotentsHeader() { + + return ( + + 문서번호 + 코드명 + 선택 + + ); +} diff --git a/egovframe-template-simple-react-contribution/src/pages/admin/committee/ProgressStatus/ReferenceCodePopupDialogCotentsListItem.jsx b/egovframe-template-simple-react-contribution/src/pages/admin/committee/ProgressStatus/ReferenceCodePopupDialogCotentsListItem.jsx new file mode 100644 index 0000000..f67f73e --- /dev/null +++ b/egovframe-template-simple-react-contribution/src/pages/admin/committee/ProgressStatus/ReferenceCodePopupDialogCotentsListItem.jsx @@ -0,0 +1,125 @@ +import * as React from 'react'; +import List from '@mui/material/List'; +import ListItem from '@mui/material/ListItem'; +import ListItemButton from '@mui/material/ListItemButton'; +import Divider from '@mui/material/Divider'; + +import Box from '@mui/material/Box'; +import Collapse from '@mui/material/Collapse'; + + + +import { styled } from '@mui/material/styles'; + + +const Item = styled('div')(({ theme }) => ({ + padding: theme.spacing(1), + borderRadius: '4px', + textAlign: 'left', +})); + + +const ItemComponent = (props) => { + const {item, index} = props; + + + const [open, setOpen] = React.useState(false); + + const handleClick = () => { + setOpen(!open); + }; + + return ( + + + + + + {item.codeTitle} + {item.codeName} + + + + + + + { + item.children && + item.children.map(function(item, index) { + //
item.codeTitle
+ console.log('thkim 2024-03-21 11:29 %o', item); + return ( + + ); + }) + } + + + ); +}; + +const ItemComponentChild = (props) => { + const {open, item} = props; + + return ( + + + + + {item.codeTitle} + {item.codeName} + + + + + + + + ); +}; + + +export default function ReferenceCodePopupDialogCotentsListItem(props) { + const {codeTitle, codeName, data} = props; + const [selectedValue, setSelectedValue] = React.useState('a'); + + const handleChange = (event) => { + setSelectedValue(event.target.value); + }; + + + + + //data + + return ( + + { + data && + data.map(function(item, index) { + //
item.codeTitle
+ console.log('thkim 2024-03-21 11:29 %o', item); + return ( + + ); + }) + } + + ); +} diff --git a/egovframe-template-simple-react-contribution/src/pages/admin/committee/ProgressStatus/ReferenceCodePopupInput.jsx b/egovframe-template-simple-react-contribution/src/pages/admin/committee/ProgressStatus/ReferenceCodePopupInput.jsx new file mode 100644 index 0000000..6cca02e --- /dev/null +++ b/egovframe-template-simple-react-contribution/src/pages/admin/committee/ProgressStatus/ReferenceCodePopupInput.jsx @@ -0,0 +1,34 @@ +import React, { useState, useEffect } from 'react'; +import ReferenceCodePopupDialog from './ReferenceCodePopupDialog' + + +import styled from "styled-components"; +const StyledDiv = styled.div` + input { + background: #fafafa; + cursor: pointer; + } +`; + + +function ReferenceCodePopupInput(props) { + const {requestItems,setRequestItems} = props; + + const [open, setOpen] = useState(false); + + return ( + + setRequestItems({ ...requestItems, categoryId: e.target.value })} + onClick={(e) => { + setOpen(true); + }} + /> + + + ); +} + +export default ReferenceCodePopupInput; \ No newline at end of file diff --git a/egovframe-template-simple-react-contribution/src/pages/admin/contents/PopUp.jsx b/egovframe-template-simple-react-contribution/src/pages/admin/contents/PopUp.jsx index b85476f..eb151e9 100644 --- a/egovframe-template-simple-react-contribution/src/pages/admin/contents/PopUp.jsx +++ b/egovframe-template-simple-react-contribution/src/pages/admin/contents/PopUp.jsx @@ -19,9 +19,17 @@ const StyledDiv = styled.div` .head > span:nth-child(3) { width: 180px; } - .result .list_item > div:nth-child(3) { - width: 180px; + .result .list_item { + & > div { + &:nth-child(3) { + width: 180px; + } + } + .title { + color: #001574; + } } + } .board-bot { @@ -162,7 +170,7 @@ function PopUp(props) { {listPopup && listPopup.map((it)=>(
{it.number}
-
{it.popupTitle}
+
{it.popupTitle}
{it.startDate} ~ {it.endDate}
{it.useYn === 'Y' ? onChangeActivationSwitch(e, it.seq)} defaultChecked /> : onChangeActivationSwitch(e, it.seq)} {...label} />}
diff --git a/egovframe-template-simple-react-contribution/src/pages/admin/contents/StandardResearch.jsx b/egovframe-template-simple-react-contribution/src/pages/admin/contents/StandardResearch.jsx index df5d913..b88e497 100644 --- a/egovframe-template-simple-react-contribution/src/pages/admin/contents/StandardResearch.jsx +++ b/egovframe-template-simple-react-contribution/src/pages/admin/contents/StandardResearch.jsx @@ -31,6 +31,10 @@ const StyledDiv = styled.div` width: 200px; } } + + .title { + color: #001574; + } } @@ -176,7 +180,7 @@ function StandardResearch(props) { {list && list.map((it)=>(
{it.number}
-
{it.title}
+
{it.title}
{it.researchStartDate} ~ {it.researchEndDate}
{it.director}
diff --git a/kcsc-back-end/src/main/resources/application-prod.properties b/kcsc-back-end/src/main/resources/application-prod.properties index 9756184..f83f0aa 100644 --- a/kcsc-back-end/src/main/resources/application-prod.properties +++ b/kcsc-back-end/src/main/resources/application-prod.properties @@ -1,6 +1,6 @@ # Access-Control-Allow-Origin -Globals.Allow.Origin = http://118.219.150.34:50680/ +Globals.Allow.Origin = https://back.dbnt.co.kr server.port=50688