diff --git a/src/assets/a.png b/src/assets/a.png deleted file mode 100644 index 25c9ef1..0000000 Binary files a/src/assets/a.png and /dev/null differ diff --git a/src/assets/a.webp b/src/assets/a.webp index 14153b5..dfb469a 100644 Binary files a/src/assets/a.webp and b/src/assets/a.webp differ diff --git a/src/assets/b.png b/src/assets/b.png deleted file mode 100644 index 72cabd4..0000000 Binary files a/src/assets/b.png and /dev/null differ diff --git a/src/assets/b.webp b/src/assets/b.webp index eb8b6cf..527844b 100644 Binary files a/src/assets/b.webp and b/src/assets/b.webp differ diff --git a/src/assets/c.png b/src/assets/c.png deleted file mode 100644 index f830617..0000000 Binary files a/src/assets/c.png and /dev/null differ diff --git a/src/assets/c.webp b/src/assets/c.webp index d67d49a..6c48706 100644 Binary files a/src/assets/c.webp and b/src/assets/c.webp differ diff --git a/src/assets/d.png b/src/assets/d.png deleted file mode 100644 index cb48d2f..0000000 Binary files a/src/assets/d.png and /dev/null differ diff --git a/src/assets/d.webp b/src/assets/d.webp index 8240da5..a2702ce 100644 Binary files a/src/assets/d.webp and b/src/assets/d.webp differ diff --git a/src/assets/e.webp b/src/assets/e.webp new file mode 100644 index 0000000..07c0823 Binary files /dev/null and b/src/assets/e.webp differ diff --git a/src/assets/f.png b/src/assets/f.png deleted file mode 100644 index 8832ccf..0000000 Binary files a/src/assets/f.png and /dev/null differ diff --git a/src/assets/f.webp b/src/assets/f.webp deleted file mode 100644 index 883217c..0000000 Binary files a/src/assets/f.webp and /dev/null differ diff --git a/src/pages/ManagePage/StepSlope/components/table/TableToolbar.tsx b/src/pages/ManagePage/StepSlope/components/table/TableToolbar.tsx index 8808436..a476a0b 100644 --- a/src/pages/ManagePage/StepSlope/components/table/TableToolbar.tsx +++ b/src/pages/ManagePage/StepSlope/components/table/TableToolbar.tsx @@ -217,7 +217,7 @@ const GradeButton = () => { handleGradeSelect('B')}>B handleGradeSelect('C')}>C handleGradeSelect('D')}>D - handleGradeSelect('F')}>F + handleGradeSelect('E')}>E > ); diff --git a/src/pages/MapPage/BottomSheet.tsx b/src/pages/MapPage/BottomSheet.tsx index c2a04ca..62fa62f 100644 --- a/src/pages/MapPage/BottomSheet.tsx +++ b/src/pages/MapPage/BottomSheet.tsx @@ -90,7 +90,7 @@ const BottomSheet = () => { bCount: 0, cCount: 0, dCount: 0, - fCount: 0, + eCount: 0, }; for (let i = 0; i < slopes.length; i++) { @@ -109,8 +109,8 @@ const BottomSheet = () => { case 'D': counts.dCount++; break; - case 'F': - counts.fCount++; + case 'E': + counts.eCount++; break; } } @@ -145,7 +145,7 @@ const BottomSheet = () => { return ; } } else { - const { aCount, bCount, cCount, dCount, fCount } = + const { aCount, bCount, cCount, dCount, eCount } = countGrades(slopeData); return ( <> @@ -156,7 +156,7 @@ const BottomSheet = () => { B: bCount, C: cCount, D: dCount, - F: fCount, + E: eCount, }} /> diff --git a/src/pages/MapPage/components/InfoTable.tsx b/src/pages/MapPage/components/InfoTable.tsx index 0abb75b..60a53b4 100644 --- a/src/pages/MapPage/components/InfoTable.tsx +++ b/src/pages/MapPage/components/InfoTable.tsx @@ -16,39 +16,75 @@ const InfoTable = ({ selectItem }: InfotableProps) => { ? 'C' : selectItem.priority?.grade?.includes('D') ? 'D' - : 'F'; + : 'E'; + return ( {selectItem?.name || ''} - {selectItem?.managementNo || ''} + + {selectItem?.location?.province || ''} + {selectItem?.location?.city || ''} + {selectItem?.location?.district || ''} + {selectItem?.location?.address || ''} + {selectItem?.location?.mountainAddress === 'Y' ? '(산)' : ''} + × - 관리번호 - {selectItem?.managementNo || ''} + 관리주체명 + {selectItem?.inspections?.serialNumber || ''} + + + 주소 + + + {selectItem?.location?.province || ''} + {selectItem?.location?.city || ''} + {selectItem?.location?.district || ''} + {selectItem?.location?.address || ''} + + {selectItem?.location?.mainLotNumber + ? selectItem?.location?.subLotNumber + ? ` ${selectItem?.location?.mainLotNumber}-${selectItem?.location?.subLotNumber}` + : ` ${selectItem?.location?.mainLotNumber}` + : ''} + + + {selectItem?.location?.roadAddress + ? `(${selectItem?.location?.roadAddress})` + : ''} + + + + - 시행청명 - {selectItem?.management?.organization || ''} + 최고수직고 + {selectItem.priority.maxVerticalHeight} - 소관부서명 - {selectItem?.management?.department || ''} + 종단길이 + {selectItem.priority.longitudinalLength} - - 주소 - - {selectItem?.location?.province || ''} - {selectItem?.location?.city || ''} - {selectItem?.location?.district || ''} - {selectItem?.location?.address || ''} - - + + 평균경사 + {selectItem.priority.averageSlope} + + + + 점수 + {selectItem.priority.Score} + + + 등급 + {grade} + + {selectItem?.priority?.usage && ( @@ -64,40 +100,6 @@ const InfoTable = ({ selectItem }: InfotableProps) => { 비탈면유형 {selectItem.priority.slopeType} - - 등급 - {grade} - - - - - 시점 좌표 - - {selectItem?.location?.coordinates?.start?.coordinates?.[1] && - selectItem?.location?.coordinates?.start?.coordinates?.[0] - ? `위도: ${selectItem.location.coordinates.start.coordinates[1] - .toFixed(6) - .toString()}° - 경도: ${selectItem.location.coordinates.start.coordinates[0] - .toFixed(6) - .toString()}°` - : '좌표 정보 없음'} - - - - 종점 좌표 - - {selectItem?.location?.coordinates?.end?.coordinates?.[1] && - selectItem?.location?.coordinates?.end?.coordinates?.[0] - ? `위도: ${selectItem.location.coordinates.end.coordinates[1] - .toFixed(6) - .toString()}° - 경도: ${selectItem.location.coordinates.end.coordinates[0] - .toFixed(6) - .toString()}°` - : '좌표 정보 없음'} - - ); @@ -128,7 +130,7 @@ const Title = styled.div` font-weight: 600; `; -const Num = styled.div` +const UpperAddressValue = styled.div` font-size: 14px; color: #7e7e7e; `; @@ -167,7 +169,10 @@ const AddressWrapper = styled(InfoRow)` const AddressValue = styled(Value)` line-height: 1.4; `; - +const ValueColumn = styled.div` + display: flex; + flex-direction: column; +`; const GradeValue = styled(Value)<{ $grade: string }>` color: ${({ $grade, theme }) => { switch ($grade) { @@ -179,8 +184,8 @@ const GradeValue = styled(Value)<{ $grade: string }>` return theme.colors.grade.C; case 'D': return theme.colors.grade.D; - case 'F': - return theme.colors.grade.F; + case 'E': + return theme.colors.grade.E; default: return '#333'; } diff --git a/src/pages/MapPage/components/ListContainer.tsx b/src/pages/MapPage/components/ListContainer.tsx index fecab9e..0555adb 100644 --- a/src/pages/MapPage/components/ListContainer.tsx +++ b/src/pages/MapPage/components/ListContainer.tsx @@ -11,7 +11,7 @@ const ListContainer = ({ item, onClick }: ListProps) => { ? 'C' : item.priority?.grade.includes('D') ? 'D' - : 'F'; + : 'E'; return ( @@ -78,8 +78,8 @@ const GradeBackground = styled.div<{ $grade: string }>` return theme.colors.grade.C; case 'D': return theme.colors.grade.D; - case 'F': - return theme.colors.grade.F; + case 'E': + return theme.colors.grade.E; default: return '#333'; } diff --git a/src/pages/MapPage/components/SearchResult.tsx b/src/pages/MapPage/components/SearchResult.tsx index 6cde673..b2bed9b 100644 --- a/src/pages/MapPage/components/SearchResult.tsx +++ b/src/pages/MapPage/components/SearchResult.tsx @@ -78,8 +78,8 @@ const GradeLabel = styled.div` return theme.colors.grade.C; case 'D': return theme.colors.grade.D; - case 'F': - return theme.colors.grade.F; + case 'E': + return theme.colors.grade.E; } }}; `; diff --git a/src/pages/MapPage/components/comment/CommentCreateModal.tsx b/src/pages/MapPage/components/comment/CommentCreateModal.tsx index 5e14d10..765ea08 100644 --- a/src/pages/MapPage/components/comment/CommentCreateModal.tsx +++ b/src/pages/MapPage/components/comment/CommentCreateModal.tsx @@ -242,14 +242,14 @@ const CommentAddModal = ({ onSubmit }: CommentAddModalProps) => { - 코멘트 작성 + 결함사진 등록 × setComment(e.target.value)} /> diff --git a/src/pages/MapPage/components/comment/CommentList.tsx b/src/pages/MapPage/components/comment/CommentList.tsx index 5183075..1846729 100644 --- a/src/pages/MapPage/components/comment/CommentList.tsx +++ b/src/pages/MapPage/components/comment/CommentList.tsx @@ -54,7 +54,7 @@ const CommentList = ({ slopeId }: CommentListProps) => { setIsMore(true); }} > - 글 등록/사진 등록 + 결함사진 등록 {commentData.length === 0 ? ( diff --git a/src/pages/MapPage/components/comment/CommentUpdateModal.tsx b/src/pages/MapPage/components/comment/CommentUpdateModal.tsx index 7b58444..f9f0bfd 100644 --- a/src/pages/MapPage/components/comment/CommentUpdateModal.tsx +++ b/src/pages/MapPage/components/comment/CommentUpdateModal.tsx @@ -313,14 +313,14 @@ const CommentUpdateModal = ({ - 코멘트 수정 + 결함사진 수정 × setComment(e.target.value)} /> diff --git a/src/pages/MapPage/components/map/MapComponent.tsx b/src/pages/MapPage/components/map/MapComponent.tsx index 7b4eb9b..78fb64e 100644 --- a/src/pages/MapPage/components/map/MapComponent.tsx +++ b/src/pages/MapPage/components/map/MapComponent.tsx @@ -10,7 +10,7 @@ import AmarkerIcon from '../../../../assets/a.webp'; import BmarkerIcon from '../../../../assets/b.webp'; import CmarkerIcon from '../../../../assets/c.webp'; import DmarkerIcon from '../../../../assets/d.webp'; -import FmarkerIcon from '../../../../assets/f.webp'; +import EmarkerIcon from '../../../../assets/e.webp'; import UserPosIcon from '../../../../assets/current_position.png'; import { MapTypeId, useMapStore } from '../../../../stores/mapStore'; declare global { @@ -199,7 +199,7 @@ const MapComponent = () => { ? 'C' : item.priority?.grade.includes('D') ? 'D' - : 'F'; + : 'E'; // 적합한 마커 아이콘 선택 const markerIcon = @@ -211,7 +211,7 @@ const MapComponent = () => { ? CmarkerIcon : grade === 'D' ? DmarkerIcon - : FmarkerIcon; + : EmarkerIcon; return ( { } icon={{ content: ` - - ${ - selectedMarkerId === index || allTextShow - ? ` - - ${item.name} - - ` - : '' - } - - - `, - anchor: new navermaps.Point(16, 16), + + ${ + selectedMarkerId === index || allTextShow + ? ` + + ${item.name} + + ` + : '' + } + + + `, + anchor: new navermaps.Point(18, 18), }} onClick={() => { chooseSelectItem(item, index); diff --git a/src/pages/MapPage/interface.ts b/src/pages/MapPage/interface.ts index 76cef0d..07746d9 100644 --- a/src/pages/MapPage/interface.ts +++ b/src/pages/MapPage/interface.ts @@ -43,7 +43,7 @@ export interface SearchResultProps { B: number; C: number; D: number; - F: number; + E: number; }; } export interface CommentAddModalProps { diff --git a/src/styles/theme.ts b/src/styles/theme.ts index c6e056e..74b532a 100644 --- a/src/styles/theme.ts +++ b/src/styles/theme.ts @@ -15,11 +15,11 @@ export const theme = { }, error: '#CD1A1A', grade: { - A: '#4CAF50', - B: '#8BC34A', - C: '#FFC107', + A: '#008FCC', + B: '#4CAF50', + C: '#EBCD00', D: '#FF9800', - F: '#F44336', + E: '#CC0000', }, }, fonts: {