diff --git a/src/components/floor-plan/CanvasMenu.jsx b/src/components/floor-plan/CanvasMenu.jsx
index 2a68ab26..fa06fa08 100644
--- a/src/components/floor-plan/CanvasMenu.jsx
+++ b/src/components/floor-plan/CanvasMenu.jsx
@@ -156,6 +156,7 @@ export default function CanvasMenu(props) {
           text: getMessage('stuff.detail.move.confirmMsg'),
           type: 'confirm',
           confirmFn: () => {
+            setIsGlobalLoading(true)
             router.push(`/management/stuff/detail?objectNo=${objectNo}`, { scroll: false })
           },
         })
@@ -187,7 +188,8 @@ export default function CanvasMenu(props) {
 
         break
       case 5:
-        // let pid = urlParams.get('pid')
+        setIsGlobalLoading(true)
+        //로딩바해제는 견적서 상세조회쪽(useEstimateController.js)에서 setIsGlobalLoading(false)
         promiseGet({ url: `/api/estimate/${objectNo}/${selectedPlan.planNo}/detail` }).then((res) => {
           if (res.status === 200) {
             const estimateDetail = res.data
@@ -198,12 +200,15 @@ export default function CanvasMenu(props) {
               setFloorPlanObjectNo({ floorPlanObjectNo: objectNo })
               router.push(`/floor-plan/estimate/${menu.index}?pid=${selectedPlan.planNo}&objectNo=${objectNo}`)
             } else {
+              setIsGlobalLoading(false)
               swalFire({ text: getMessage('estimate.menu.move.valid1') })
             }
           }
         })
         break
       case 6:
+        setIsGlobalLoading(true)
+        //로딩바해제는 발전시뮬레이션 조회쪽에서(Simulator.jsx) setIsGlobalLoading(false)
         promiseGet({ url: `/api/estimate/${objectNo}/${selectedPlan.planNo}/detail` }).then((res) => {
           if (res.status === 200) {
             const estimateDetail = res.data
@@ -212,6 +217,7 @@ export default function CanvasMenu(props) {
               setCurrentMenu(menu.title)
               router.push(`/floor-plan/simulator/${menu.index}?pid=${selectedPlan.planNo}&objectNo=${objectNo}`)
             } else {
+              setIsGlobalLoading(false)
               swalFire({ text: getMessage('simulator.menu.move.valid1') })
             }
           }
@@ -321,15 +327,15 @@ export default function CanvasMenu(props) {
       confirmFn: async () => {
         setIsGlobalLoading(true)
         const params = {
-          objectNo: objectNo,
-          planNo: pid,
+          objectNo: estimateRecoilState.objectNo,
+          planNo: estimateRecoilState.planNo,
           userId: sessionState.userId,
         }
         try {
           await promisePost({ url: '/api/estimate/reset-estimate', data: params }).then((res) => {
             if (res.status === 201) {
               swalFire({ text: getMessage('estimate.detail.reset.alertMsg'), type: 'alert' })
-              fetchSetting(objectNo, pid, 'R')
+              fetchSetting(estimateRecoilState.objectNo, estimateRecoilState.planNo, 'R')
             }
           })
         } catch (error) {
@@ -386,45 +392,108 @@ export default function CanvasMenu(props) {
 
   useEffect(() => {
     if (isObjectNotEmpty(estimateRecoilState)) {
-      if (estimateRecoilState?.createUser && estimateRecoilState?.tempFlg && estimateRecoilState.lockFlg) {
-        if (estimateRecoilState?.createUser === 'T01') {
+      const { createUser, tempFlg, lockFlg } = estimateRecoilState
+
+      if (createUser && tempFlg && lockFlg) {
+        if (createUser === 'T01') {
           if (sessionState.storeId !== 'T01') {
-            setButtonStyle1('none')
-            setButtonStyle2('none')
-            setButtonStyle3('none')
-            setButtonStyle4('none')
-            setButtonStyle5('none')
+            setAllButtonStyles('none')
+          } else {
+            handleButtonStyles(tempFlg, lockFlg)
           }
         } else {
-          if (isObjectNotEmpty(estimateRecoilState)) {
-            if (estimateRecoilState?.tempFlg && estimateRecoilState.lockFlg) {
-              if (estimateRecoilState?.tempFlg === '1') {
-                setButtonStyle1('none')
-                setButtonStyle2('')
-                setButtonStyle3('none')
-                setButtonStyle4('none')
-                setButtonStyle5('none')
-              } else {
-                if (estimateRecoilState?.tempFlg === '0' && estimateRecoilState?.lockFlg === '0') {
-                  setButtonStyle1('')
-                  setButtonStyle2('')
-                  setButtonStyle3('')
-                  setButtonStyle4('')
-                  setButtonStyle5('')
-                } else {
-                  setButtonStyle1('')
-                  setButtonStyle2('none')
-                  setButtonStyle3('none')
-                  setButtonStyle4('')
-                  setButtonStyle5('')
-                }
-              }
-            }
-          }
+          handleButtonStyles(tempFlg, lockFlg)
         }
       }
     }
-  }, [estimateRecoilState?.createUser, estimateRecoilState?.tempFlg, estimateRecoilState?.lockFlg])
+  }, [estimateRecoilState])
+
+  const setAllButtonStyles = (style) => {
+    setButtonStyle1(style)
+    setButtonStyle2(style)
+    setButtonStyle3(style)
+    setButtonStyle4(style)
+    setButtonStyle5(style)
+  }
+
+  const handleButtonStyles = (tempFlg, lockFlg) => {
+    if (tempFlg === '1') {
+      setAllButtonStyles('none')
+      setButtonStyle2('')
+    } else if (tempFlg === '0' && lockFlg === '0') {
+      setAllButtonStyles('')
+    } else {
+      setButtonStyle1('')
+      setButtonStyle2('none')
+      setButtonStyle3('none')
+      setButtonStyle4('')
+      setButtonStyle5('')
+    }
+  }
+
+  // useEffect(() => {
+  //   if (isObjectNotEmpty(estimateRecoilState)) {
+  //     if (estimateRecoilState?.createUser && estimateRecoilState?.tempFlg && estimateRecoilState.lockFlg) {
+  //       if (estimateRecoilState?.createUser === 'T01') {
+  //         if (sessionState.storeId !== 'T01') {
+  //           setButtonStyle1('none')
+  //           setButtonStyle2('none')
+  //           setButtonStyle3('none')
+  //           setButtonStyle4('none')
+  //           setButtonStyle5('none')
+  //         } else {
+  //           if (estimateRecoilState?.tempFlg === '1') {
+  //             setButtonStyle1('none')
+  //             setButtonStyle2('')
+  //             setButtonStyle3('none')
+  //             setButtonStyle4('none')
+  //             setButtonStyle5('none')
+  //           } else {
+  //             if (estimateRecoilState?.tempFlg === '0' && estimateRecoilState?.lockFlg === '0') {
+  //               setButtonStyle1('')
+  //               setButtonStyle2('')
+  //               setButtonStyle3('')
+  //               setButtonStyle4('')
+  //               setButtonStyle5('')
+  //             } else {
+  //               setButtonStyle1('')
+  //               setButtonStyle2('none')
+  //               setButtonStyle3('none')
+  //               setButtonStyle4('')
+  //               setButtonStyle5('')
+  //             }
+  //           }
+  //         }
+  //       } else {
+  //         if (isObjectNotEmpty(estimateRecoilState)) {
+  //           if (estimateRecoilState?.tempFlg && estimateRecoilState.lockFlg) {
+  //             if (estimateRecoilState?.tempFlg === '1') {
+  //               setButtonStyle1('none')
+  //               setButtonStyle2('')
+  //               setButtonStyle3('none')
+  //               setButtonStyle4('none')
+  //               setButtonStyle5('none')
+  //             } else {
+  //               if (estimateRecoilState?.tempFlg === '0' && estimateRecoilState?.lockFlg === '0') {
+  //                 setButtonStyle1('')
+  //                 setButtonStyle2('')
+  //                 setButtonStyle3('')
+  //                 setButtonStyle4('')
+  //                 setButtonStyle5('')
+  //               } else {
+  //                 setButtonStyle1('')
+  //                 setButtonStyle2('none')
+  //                 setButtonStyle3('none')
+  //                 setButtonStyle4('')
+  //                 setButtonStyle5('')
+  //               }
+  //             }
+  //           }
+  //         }
+  //       }
+  //     }
+  //   }
+  // }, [estimateRecoilState])
 
   /**
    * 견적서 잠금 / 해제
@@ -450,37 +519,49 @@ export default function CanvasMenu(props) {
           await promisePost({ url: '/api/estimate/save-estimate-lock', data: params }).then((res) => {
             if (res.status === 201) {
               estimateRecoilState.lockFlg = estimateRecoilState.lockFlg === '0' ? '1' : '0'
-              if (estimateRecoilState?.createUser === 'T01') {
-                if (sessionState.storeId !== 'T01') {
-                  setButtonStyle1('none')
-                  setButtonStyle2('none')
-                  setButtonStyle3('none')
-                  setButtonStyle4('none')
-                  setButtonStyle5('none')
-                }
-              } else {
-                if (estimateRecoilState?.tempFlg === '1') {
-                  setButtonStyle1('none')
-                  setButtonStyle2('')
-                  setButtonStyle3('none')
-                  setButtonStyle4('none')
-                  setButtonStyle5('none')
-                } else {
-                  if (estimateRecoilState?.tempFlg === '0' && estimateRecoilState?.lockFlg === '0') {
-                    setButtonStyle1('')
-                    setButtonStyle2('')
-                    setButtonStyle3('')
-                    setButtonStyle4('')
-                    setButtonStyle5('')
+              const { createUser, tempFlg, lockFlg } = estimateRecoilState
+              if (createUser && tempFlg && lockFlg) {
+                if (createUser === 'T01') {
+                  if (sessionState.storeId !== 'T01') {
+                    setAllButtonStyles('none')
                   } else {
-                    setButtonStyle1('')
-                    setButtonStyle2('none')
-                    setButtonStyle3('none')
-                    setButtonStyle4('')
-                    setButtonStyle5('')
+                    handleButtonStyles(tempFlg, lockFlg)
                   }
+                } else {
+                  handleButtonStyles(tempFlg, lockFlg)
                 }
               }
+              // if (estimateRecoilState?.createUser === 'T01') {
+              //   if (sessionState.storeId !== 'T01') {
+              //     setButtonStyle1('none')
+              //     setButtonStyle2('none')
+              //     setButtonStyle3('none')
+              //     setButtonStyle4('none')
+              //     setButtonStyle5('none')
+              //   }
+              // } else {
+              //   if (estimateRecoilState?.tempFlg === '1') {
+              //     setButtonStyle1('none')
+              //     setButtonStyle2('')
+              //     setButtonStyle3('none')
+              //     setButtonStyle4('none')
+              //     setButtonStyle5('none')
+              //   } else {
+              //     if (estimateRecoilState?.tempFlg === '0' && estimateRecoilState?.lockFlg === '0') {
+              //       setButtonStyle1('')
+              //       setButtonStyle2('')
+              //       setButtonStyle3('')
+              //       setButtonStyle4('')
+              //       setButtonStyle5('')
+              //     } else {
+              //       setButtonStyle1('')
+              //       setButtonStyle2('none')
+              //       setButtonStyle3('none')
+              //       setButtonStyle4('')
+              //       setButtonStyle5('')
+              //     }
+              //   }
+              // }
             }
             setIsGlobalLoading(false)
           })