Merge commit 'ed5fa161f56b2d0f34abaa138d7df04292e55f07' into iipbs/wr/form_fuction

apps/wr/components/ui/form/fcltReg/htdflReg/htdflRegForm.tsx

@@ -22,6 +22,7 @@ import {
   formatCommaNumber,
   handleCommaNumberChange,
 } from "@/components/lib/func/commom";
+import { formH1Class } from "@/components/lib/class/comClass";
 
 export default function HtdflRegForm({
   htdflForm,
@@ -82,17 +83,17 @@ export default function HtdflRegForm({
   }, [htdflForm]);
 
   return (
+    <div className="!mx-[1.6rem] !p-0r">
     <Form {...form}>
       <form onSubmit={form.handleSubmit(onSubmit)}>
         {/* <div className="flex justify-between items-center mx-3"> */}
         <div>
-          <div className="grid grid-cols-12">
-            <h1 className="pl-3 text-xl  col-span-10">○온배수 시설 정보</h1>
+          <div className="grid grid-cols-12 flex items-center card-header">
+            <h1 className="text-2xl font-medium text-label col-span-10">온배수 시설 정보</h1>
             <Button
               size={"sm"}
               type="submit"
-              className="col-start-12  col-span-1"
-            >
+              className="col-start-12  col-span-1">
               저장
             </Button>
           </div>
@@ -100,14 +101,14 @@ export default function HtdflRegForm({
 
         {isModal && htdflForm != undefined ? <BdstReg form={form} /> : <></>}
         {isModal ? (
-          <h1 className="pl-3 text-xl col-span-10  mt-4 ">
-            ○ 중수도 시설 정보{" "}
+          <h1 className="text-xl col-span-10 mt-4">
+            온배수 시설 정보{" "}
           </h1>
         ) : (
           <></>
         )}
 
-        <div className="grid grid-cols-6 gap-2 mt-4 pl-6">
+        <div className="grid grid-cols-6 gap-2 mt-4">
           <div className="col-span-2">
             <FormField
               control={form.control}
@@ -165,13 +166,13 @@ export default function HtdflRegForm({
           </div>
         </div>
         <div className=" my-4">
-          <h1 className="bg-gray-400 text-xl text-center border-2 p-2  mt-4 pl-6">
+          <h1 className={formH1Class}>
             온배수 시설 운영현황
           </h1>
         </div>
 
         <div className="grid grid-cols-10 gap-1 mt-4">
-          <div className="col-span-5 pl-6">
+          <div className="col-span-5">
             <FormField
               control={form.control}
               name="reuseBuilding.0.htdflObj.orgwtWtritSpt"
@@ -207,7 +208,7 @@ export default function HtdflRegForm({
               )}
             />
           </div>
-          <div className="col-span-5 pl-6">
+          <div className="col-span-5">
             <FormField
               control={form.control}
               name="reuseBuilding.0.htdflObj.wtritEntrcTp"
@@ -226,7 +227,7 @@ export default function HtdflRegForm({
               )}
             />
           </div>
-          <div className="col-span-5 pl-6">
+          <div className="col-span-5">
             <FormField
               control={form.control}
               name="reuseBuilding.0.htdflObj.amtgnr"
@@ -245,7 +246,7 @@ export default function HtdflRegForm({
               )}
             />
           </div>
-          <div className="col-span-5 pl-6">
+          <div className="col-span-5">
             <FormField
               control={form.control}
               name="reuseBuilding.0.htdflObj.prcsProcsYn"
@@ -263,7 +264,7 @@ export default function HtdflRegForm({
               )}
             />
           </div>
-          <div className="col-span-5 pl-6">
+          <div className="col-span-5">
             <FormField
               control={form.control}
               name="reuseBuilding.0.htdflObj.prcsFcltCpct"
@@ -282,7 +283,7 @@ export default function HtdflRegForm({
               )}
             />
           </div>
-          <div className="col-span-5 pl-6">
+          <div className="col-span-5">
             <FormField
               control={form.control}
               name="reuseBuilding.0.htdflObj.fmYn"
@@ -300,7 +301,7 @@ export default function HtdflRegForm({
               )}
             />
           </div>
-          <div className="col-span-5 pl-6">
+          <div className="col-span-5">
             <FormField
               control={form.control}
               name="reuseBuilding.0.htdflObj.utztnCpct"
@@ -319,7 +320,7 @@ export default function HtdflRegForm({
               )}
             />
           </div>
-          <div className="col-span-5 pl-6">
+          <div className="col-span-5">
             <FormField
               control={form.control}
               name="reuseBuilding.0.htdflObj.utztnUsg"
@@ -339,12 +340,12 @@ export default function HtdflRegForm({
         </div>
 
         <div className=" my-2">
-          <h1 className="bg-gray-400 text-xl text-center border-2 p-2 mt-4  ">
+          <h1 className={formH1Class}>
             요구수질
           </h1>
         </div>
 
-        <div className="grid grid-cols-12 gap-4  pl-6">
+        <div className="grid grid-cols-12 gap-4">
           <div className="col-span-6">
             <FormField
               control={form.control}
@@ -386,7 +387,7 @@ export default function HtdflRegForm({
           </div>
         </div>
 
-        <div className="grid grid-cols-12 gap-4  pl-6">
+        <div className="grid grid-cols-12 gap-4">
           <div className="col-span-6">
             <FormField
               control={form.control}
@@ -428,7 +429,7 @@ export default function HtdflRegForm({
           </div>
         </div>
 
-        <div className="grid grid-cols-12 gap-4  pl-6">
+        <div className="grid grid-cols-12 gap-4">
           <div className="col-span-6">
             <FormField
               control={form.control}
@@ -470,7 +471,7 @@ export default function HtdflRegForm({
           </div>
         </div>
 
-        <div className="grid grid-cols-12 gap-4  pl-6">
+        <div className="grid grid-cols-12 gap-4">
           <div className="col-span-6">
             <FormField
               control={form.control}
@@ -512,7 +513,7 @@ export default function HtdflRegForm({
           </div>
         </div>
 
-        <div className="grid grid-cols-12 gap-4  pl-6">
+        <div className="grid grid-cols-12 gap-4">
           <div className="col-span-6">
             <FormField
               control={form.control}
@@ -554,7 +555,7 @@ export default function HtdflRegForm({
           </div>
         </div>
 
-        <div className="grid grid-cols-12 gap-4  pl-6">
+        <div className="grid grid-cols-12 gap-4">
           <div className="col-span-6">
             <FormField
               control={form.control}
@@ -597,5 +598,6 @@ export default function HtdflRegForm({
         </div>
       </form>
     </Form>
+    </div>
   );
 }

apps/wr/components/ui/form/fcltReg/rainReg/rainRegForm.tsx

@@ -122,7 +122,7 @@ export default function RainRegForm({
           </div>
           {isModal && rainForm != undefined ? <BdstReg form={form} /> : <></>}
           {isModal ? (
-            <h1 className="pl-3 text-xl col-span-10  mt-4 ">
+            <h1 className="pl-3 text-xl col-span-10 mt-4">
               빗물이용시설 정보{" "}
             </h1>
           ) : (

apps/wr/components/ui/modal/chkgd/chkgdExcel/chkgdExcel.tsx

@@ -15,6 +15,7 @@ import {
   Form,
   FormField,
   FormUi,
+  SelectBox,
   Title,
 } from "@common/business_components/ui";
 import { Button, Input } from "@common/components/ui";
@@ -37,7 +38,19 @@ export default function ChkgdExcel({ type }: { type: string }) {
   >();
   const [excelRswtData, setExcelRswtData] = useState<rswtChkZodType[]>();
 
-  const defaultValues: z.infer<typeof chkgdRegExcel> = chkgdRegExcel.parse({});
+  const currentYear = new Date().getFullYear();
+  const startYear = 1970;
+  const yearOptions: { val: string; text: string }[] = Array.from(
+    { length: currentYear - startYear + 1 },
+    (_, i) => {
+      const y = startYear + i;
+      return { val: String(y), text: `${y}년` };
+    }
+  );
+
+  const defaultValues: z.infer<typeof chkgdRegExcel> = chkgdRegExcel.parse({
+    chckYr: String(currentYear)
+  });
 
   const form = useForm<z.infer<typeof chkgdRegExcel>>({
     resolver: zodResolver(chkgdRegExcel),
@@ -178,8 +191,8 @@ export default function ChkgdExcel({ type }: { type: string }) {
               ></Title>
             </div>
             <div className="flex justify-between">
-              <h3 className="text-2xl font-bold text-gray-900">
-                {"○점검정보 입력"}
+              <h3 className="text-2xl font-bold text-gray-900 mt-1 ml-7">
+                {"점검정보 입력"}
               </h3>
 
               <Button className="" type="submit">
@@ -193,11 +206,13 @@ export default function ChkgdExcel({ type }: { type: string }) {
                 name="chckYr"
                 render={({ field }) => (
                   <FormUi label="등록년도">
-                    <Input
-                      className={`text-3xl`}
-                      type="text"
+                    <SelectBox
+                      className="w-1/4 text-3xl"
+                      selectClass={""}
+                      label=""
+                      selectArray={yearOptions}
                       value={field.value}
-                      onChange={field.onChange}
+                      onSelectValue={(val) => field.onChange(String(val))}
                     />
                   </FormUi>
                 )}

apps/wr/components/ui/modal/chkgd/chkgdModal/chkgdModal.tsx

@@ -224,14 +224,14 @@ export default function ChkgdModal({ type, obj }: { type: string; obj: any }) {
           <Title
             title={
               type === "RNB"
-                ? "빗물이용시설"
-                : "중수도 이용시설" + "지도점검 결과등록"
+                ? "빗물이용시설 " + "지도점검 결과등록"
+                : "중수도 이용시설 " + "지도점검 결과등록"
             }
           ></Title>
         </div>
         <div className="flex justify-between">
-          <h3 className="text-2xl font-bold text-gray-900">
-            {"○" + "" + `(${obj.bdstNm})`}
+          <h3 className="text-2xl font-bold text-gray-900 mt-2 ml-6">
+            {`(${obj.bdstNm})`}
           </h3>
           {!rainChkSttn.isSttn ? (
             <Button className="" onClick={allDataUpdate}>

apps/wr/components/ui/table/chkgdTable/guideDetailTable/guideDetailTable.tsx

@@ -60,19 +60,19 @@ export function GuideDetailsTable({
               <TableCell key={head.id + headIndex} className="w-36" >
                 {head.edit ===true && data.edit !==false?
                 <Input
-                  className={`${head.id !== "utztnUsgCd" ? "text-right" : "text-center"} !text-2xl h-10 w-full`}
+                  className={`${head.id !== "utztnUsgCd" ? "text-right" : "text-center"} !text-xl h-10 w-full`}
                   onChange={(e) =>
                     handleChange(dataIndex, head.id, e.target.value)
                   }
-                  value={data[head.id as keyof any] || ""}
+                  value={data[head.id as keyof any] ?? ""}
                 /> : (
                   <div
                     className={`
                       ${head.id !== "utztnUsgCd" ? "text-right" : "text-center"} 
-                      !text-2xl w-full h-10 
+                      !text-xl w-full h-10 
                     `}
                   >
-                    {data[head.id as keyof any] || ""}
+                    {data[head.id as keyof any] ?? ""}
                   </div>
                 )
                 }