Merge pull request #130 from Weflo-A/develop

Develop
Weflo-A · Mar 10, 2024 · c993318 · c993318
2 parents 69cefaf + aa4408f
commit c993318
Show file tree

Hide file tree

Showing 3 changed files with 48 additions and 54 deletions.
diff --git a/src/components/common/MenuTab.tsx b/src/components/common/MenuTab.tsx
@@ -234,43 +234,39 @@ const MenuTab = ({ groups, drones, type }: MenuTabProps) => {
   /* 대시보드 내 드론 리스트 탭 */
   const renderDroneListTab = () => {
     return (
-      <>
-        <TabWrapper>
-          <Typography
-            variant='body2'
-            fontWeight='bold'
-            sx={{ padding: '0rem 0.5rem', marginBottom: '0.5rem' }}
-          >
-            전체 드론
-          </Typography>
-          <Divider sx={{ margin: '0rem 0.5rem 0.5rem' }} />
-          <TabList>
-            {drones?.map((item) => (
-              <TabItem
-                className={
-                  location.pathname.includes(`/drone/${item.id}`)
-                    ? 'active'
-                    : ''
-                }
-                onClick={() =>
-                  handleTabMenu(
-                    isEstimatePage
-                      ? `/drone-group/drone/${item.id}/estimate`
-                      : isTestDetailPage
-                        ? `/drone-group/drone/${item.id}/dashboard/test`
-                        : `/drone-group/drone/${item.id}/dashboard`,
-                    String(item.id)
-                  )
-                }
-              >
-                <Typography fontSize='14px' fontWeight={400}>
-                  {item.name}
-                </Typography>
-              </TabItem>
-            ))}
-          </TabList>
-        </TabWrapper>
-      </>
+      <TabWrapper>
+        <Typography
+          variant='body2'
+          fontWeight='bold'
+          sx={{ padding: '0rem 0.5rem', marginBottom: '0.5rem' }}
+        >
+          전체 드론
+        </Typography>
+        <Divider sx={{ margin: '0rem 0.5rem 0.5rem' }} />
+        <TabList>
+          {drones?.map((item) => (
+            <TabItem
+              className={
+                location.pathname.includes(`/drone/${item.id}/`) ? 'active' : ''
+              }
+              onClick={() =>
+                handleTabMenu(
+                  isEstimatePage
+                    ? `/drone-group/drone/${item.id}/estimate`
+                    : isTestDetailPage
+                      ? `/drone-group/drone/${item.id}/dashboard/test`
+                      : `/drone-group/drone/${item.id}/dashboard`,
+                  String(item.id)
+                )
+              }
+            >
+              <Typography fontSize='14px' fontWeight={400}>
+                {item.name}
+              </Typography>
+            </TabItem>
+          ))}
+        </TabList>
+      </TabWrapper>
     );
   };
 

diff --git a/src/components/dashboard/ResultRecord.tsx b/src/components/dashboard/ResultRecord.tsx
@@ -69,7 +69,7 @@ function ResultRecord({ droneId, data }: ResultRecordProp) {
               buttonType='accentLight'
               onClick={(e) => {
                 e.stopPropagation();
-                goToDashboard(location.state); // data.id 필요
+                goToDashboard(droneId); // data.id 필요
               }}
               style={{ width: '95px', height: '32px', fontSize: '14px' }}
             />

diff --git a/src/pages/TestDetailPage.tsx b/src/pages/TestDetailPage.tsx
@@ -123,20 +123,18 @@ const TestDetailPage = () => {
   // 메뉴탭 이동시 id 변경
   // 첫번째 날짜값으로 조회
   React.useEffect(() => {
-    if (!testDate) {
-      getTestDateList(Number(id)).then((res) => {
-        setDateList(res.data.data);
-        if (res.data.data.length > 0) {
-          const { year, month, day } = res.data.data[0];
-          console.log('탭이동', year, month, day);
-          setSelectedDate(`${year}-${month}-${day}`);
-          getTestDetail(Number(id), year, month, day).then((res) => {
-            console.log(res.data.data);
-            setTestData(res.data.data);
-          });
-        }
-      });
-    }
+    getTestDateList(Number(id)).then((res) => {
+      setDateList(res.data.data);
+      if (res.data.data.length > 0) {
+        const { year, month, day } = res.data.data[0];
+        console.log('탭이동', year, month, day);
+        setSelectedDate(`${year}-${month}-${day}`);
+        getTestDetail(Number(id), year, month, day).then((res) => {
+          console.log(res.data.data);
+          setTestData(res.data.data);
+        });
+      }
+    });
   }, [id]);
 
   // id는 고정인채 날짜만 변경시
@@ -329,12 +327,12 @@ const TestDetailPage = () => {
           </Typography>
         </Stack>
         <Stack direction='column' gap='0.25rem'>
-          {testData?.warningList.map((item) => (
+          {testData?.warningList.map((item, index) => (
             <BrokenPartInfoBox
               part={item.component}
               location={item.part}
               score={item.score}
-              warning={false}
+              warning={index < 2}
             />
           ))}
         </Stack>