Merge branch 'iipbs/sn/dev'

apps/sn/.env.development

@@ -1,12 +1,13 @@
 NEXT_PUBLIC_SITE_ID = SN
 NEXT_PUBLIC_PORT = 11302
 NEXT_PUBLIC_PROXY_HOST = http://con.mind-one.co.kr:11302
+NEXT_PUBLIC_ADDR_URL = http://con.mind-one.co.kr:11082
 NEXT_PUBLIC_SERVER_API_URL = http://dev.onasys.co.kr:8000
 NEXT_PUBLIC_GEOSERVER_URL = http://rsone.iptime.org:10010/geoserver
 NEXT_PUBLIC_LX_GEOSERVER_URL = http://con.mind-one.co.kr:11306/geoserver #TODO 운영에서 바꿔야 함 
+NEXT_PUBLIC_RSONE_DC_URL     = https://apigateway.rsonesoft.com #자료관 데이터
 NEXT_PUBLIC_CLAIM_NAME = Authorization
 NEXT_PUBLIC_AUTH_USER_ID = token-id
 NEXT_PUBLIC_ACCESS_TOKEN = access-token
 NEXT_PUBLIC_REFRESH_TOKEN = refresh-token
-
-NEXT_PUBLIC_SEWERAGE_API_URL=http://con.mind-one.co.kr:11083/sewerage-service/api   # 개발 서버 API
+NEXT_PUBLIC_SEWERAGE_API_URL=http://con.mind-one.co.kr:11083/sewerage-service/api   # 개발 서버 API

apps/sn/.env.local

@@ -10,7 +10,6 @@ NEXT_PUBLIC_CLAIM_NAME = Authorization
 NEXT_PUBLIC_AUTH_USER_ID = token-id
 NEXT_PUBLIC_ACCESS_TOKEN = access-token
 NEXT_PUBLIC_REFRESH_TOKEN = refresh-token
-
 NEXT_PUBLIC_SEWERAGE_API_URL=http://con.mind-one.co.kr:11083/sewerage-service/api   # 개발 서버 API
 #NEXT_PUBLIC_SEWERAGE_API_URL=http://192.168.1.128:8883/sewerage-service/api         # 최용성 부장님 API
-#NEXT_PUBLIC_SEWERAGE_API_URL=http://192.168.1.222:8883/sewerage-service/api          # 박이정 차장님 API
+#NEXT_PUBLIC_SEWERAGE_API_URL=http://192.168.1.222:8883/sewerage-service/api          # 박이정 차장님 API

apps/sn/.env.production

@@ -6,9 +6,4 @@ NEXT_PUBLIC_CLAIM_NAME = Authorization
 NEXT_PUBLIC_AUTH_USER_ID = token-id
 NEXT_PUBLIC_ACCESS_TOKEN = access-token
 NEXT_PUBLIC_REFRESH_TOKEN = refresh-token
-
-NEXT_PUBLIC_GEOSERVER_URL = http://172.29.143.87:8080/geoserver
-NEXT_PUBLIC_LX_GEOSERVER_URL =  http://172.29.143.87:8080/geoserver_swl
-NEXT_PUBLIC_SEWERAGE_API_URL=  http://apigateway.iipbs-dev.svc.cluster.local:8000/sewerage-service/api
-NEXT_PUBLIC_ADDR_URL = http://con.mind-one.co.kr:11082
-NEXT_PUBLIC_RSONE_DC_URL     = https://apigateway.rsonesoft.com #자료관 데이터
+NEXT_PUBLIC_SEWERAGE_API_URL=http://con.mind-one.co.kr:11083/sewerage-service/api   # 개발 서버 API

apps/sn/app/(map-layout)/map/components/popupComponent/chart/infilChart.tsx

@@ -43,8 +43,8 @@ const InfilChart = ({ pplMngNo }: ModalOpenProp) => {
 
   const chartForm = CHART_FORM.LINE;
   const chartConfig = {
-    chartData1: { label: '순오수량(m³/h)', color: "red", },
-    chartData2: { label: '실측하수량(m³/h)', color: "orange", }
+    chartData1: { label: '순오수량', color: "red", },
+    chartData2: { label: '실측하수량', color: "orange", }
   } as ChartConfig;
 
   useEffect(() => {
@@ -150,7 +150,7 @@ const InfilChart = ({ pplMngNo }: ModalOpenProp) => {
           </Button>
           {/* 상수사용량 적용연월 */}
           <div className="bg-white px-4 py-2 ">
-            <span className="text-2xl text-red-600 font-bold">상수사용량 적용연월</span>
+            <span className="text-2xl text-red-600 font-bold">● 상수사용량 적용연월</span>
             <div className="flex items-center mt-2">
               <span className="text-black text-xl font-bold">
                 {(selectedAplcnYm) ? moment(selectedAplcnYm, "YYYYMM").format("YYYY-MM") : ""}
@@ -159,16 +159,17 @@ const InfilChart = ({ pplMngNo }: ModalOpenProp) => {
           </div>
           {/* 침입수량 분석결과 */}
           <div className="bg-white px-4 py-2 ">
-            <span className="text-2xl text-red-600 font-bold">침입수량 분석결과</span>
+            <span className="text-2xl text-red-600 font-bold">● 침입수량 산정결과</span>
             <div className="flex items-center mt-2">
-              <span className="text-black text-xl font-bold">{inftwtQty}</span>
+              <span className="ml-2 text-black text-xl">침입수량 : </span>
+              <span className="w-[35px] inline-block text-right text-black text-xl font-bold">{inftwtQty}</span>
               <span className="ml-2 text-black text-xl">m³/d</span>
             </div>
           </div>
         </div>
         {/* 차트 */}
         <div className="h-[90%] bg-white text-3xl">
-          <MainChart chartConfig={chartConfig} chartForm={chartForm} chartData={chartData} chartTitle={'관로유량'} 
+          <MainChart chartConfig={chartConfig} chartForm={chartForm} chartData={chartData} chartTitle={'침입수량 그래프'} 
             yFieldText2="시간" yFieldText="유량(m³/h)"/>
         </div>
       </div>
@@ -256,7 +257,7 @@ const InfilChart = ({ pplMngNo }: ModalOpenProp) => {
               닫기
             </button>
             <button className="px-4 py-2 bg-gray-600 text-white rounded" onClick={infilRsltChart}>
-              분석결과 도표
+              선택조건 적용
             </button>
           </div>
         </div>)}
@@ -271,7 +272,7 @@ const InfilChart = ({ pplMngNo }: ModalOpenProp) => {
       headerTitle=""
       bodyClass={`
             min-h-[50vh]
-            w-[50vw]
+            w-[55vw]
             max-w-none
             max-h-none
             overflow-visible

apps/sn/app/(map-layout)/map/components/popupComponent/chart/rdiiChart.tsx

@@ -44,7 +44,7 @@ const RdiiChart = ({ pplMngNo }: ModalOpenProp) => {
 
   const chartForm = CHART_FORM.LINE;
   const chartConfig = {
-    chartData1: { label: 'RDII(m³/h)', color: "red", },
+    chartData1: { label: 'RDII', color: "red", },
     //chartData2: { label: '순오수량(m³/h)', color: "orange", },
   } as ChartConfig;
 
@@ -127,7 +127,7 @@ const RdiiChart = ({ pplMngNo }: ModalOpenProp) => {
           </Button>
           {/* 상수사용량 적용연월 */}
           <div className="bg-white px-4 py-2 ">
-            <span className="text-2xl text-red-600 font-bold">상수사용량 적용연월</span>
+            <span className="text-2xl text-red-600 font-bold">● 상수사용량 적용연월</span>
             <div className="flex items-center mt-2">
               <span className="text-black text-xl font-bold">
                 {(aplcnYm)? moment(aplcnYm, "YYYYMM").format("YYYY-MM"):""}
@@ -137,20 +137,22 @@ const RdiiChart = ({ pplMngNo }: ModalOpenProp) => {
         
           {/* 강우유입수량 분석결과 */}
           <div className="bg-white px-4 py-2 ">
-            <span className="text-2xl text-red-600 font-bold">강우유입수량 분석결과</span>
+            <span className="text-2xl text-red-600 font-bold">● 강우유입수량 분석결과</span>
             <div className="flex items-center mt-2">
-              <span className="text-black text-xl font-bold">{rdiiQty}</span>
-              <span className="ml-2 text-black">m³/d</span>
+              <span className="w-[90px] inline-block text-right ml-2 text-black text-xl">평균RDII : </span>
+              <span className="w-[30px] inline-block text-right text-black text-xl font-bold"> {rdiiQty}</span>
+              <span className="ml-2 text-black"> m³/d</span>
             </div>
             <div className="flex items-center mt-2">
-              <span className="text-black text-xl font-bold">{totalVolume}</span>
-              <span className="ml-2 text-black">m³/mm</span>
+              <span className="w-[90px] inline-block text-right ml-2 text-black text-xl">강우량대비RDII : </span>
+              <span className="w-[30px] inline-block text-right text-black text-xl font-bold"> {totalVolume}</span>
+              <span className="ml-2 text-black"> m³/mm</span>
             </div>
           </div>
         </div>
         {/* 차트 */}
         <div className="h-[90%] bg-white text-2xl">
-          <MainChart chartConfig={chartConfig} chartForm={chartForm} chartData={chartData} chartTitle={'관로유량'}
+          <MainChart chartConfig={chartConfig} chartForm={chartForm} chartData={chartData} chartTitle={'RDII 그래프'}
                     yFieldText2="시간" yFieldText="유량(m³/h)" />
         </div>
       </div>
@@ -242,7 +244,7 @@ const RdiiChart = ({ pplMngNo }: ModalOpenProp) => {
               닫기
             </button>
             <button className="px-4 py-2 bg-gray-600 text-white rounded" onClick={rdiiRsltChart}>
-              분석결과 도표
+              선택조건 적용
             </button>
           </div>
         </div>)}
@@ -257,7 +259,7 @@ const RdiiChart = ({ pplMngNo }: ModalOpenProp) => {
       headerTitle=""
       bodyClass={`
             min-h-[50vh]
-            w-[50vw]
+            w-[55vw]
             max-w-none
             max-h-none
             overflow-visible