diff --git a/src/components/AccountMenu/AcctMenu.vue b/src/components/AccountMenu/AcctMenu.vue
index b008233..59202ed 100644
--- a/src/components/AccountMenu/AcctMenu.vue
+++ b/src/components/AccountMenu/AcctMenu.vue
@@ -10,7 +10,7 @@
         <li id="btn_acct_mgmt"
           class="w-full h-[40px] flex py-2 px-4 hover:text-[#000000] hover:bg-[#F1F5F9] cursor-pointer
           items-center" @click="onBtnAcctMgmtClick">          
-            <span class="w-[24px] h-[24px] flex"><img src="@/assets/icon-crown.svg"></span>
+            <span class="w-[24px] h-[24px] flex"><img src="@/assets/icon-crown.svg" alt="accountManagement"></span>
             <span class="flex ml-[8px]">{{i18next.t("AcctMgmt.acctMgmt")}}</span>
         </li>
         <li id="btn_mang_ur_acct"
diff --git a/src/components/Discover/Conformance/ConformanceSidebar.vue b/src/components/Discover/Conformance/ConformanceSidebar.vue
index 28ab594..6aef7fc 100644
--- a/src/components/Discover/Conformance/ConformanceSidebar.vue
+++ b/src/components/Discover/Conformance/ConformanceSidebar.vue
@@ -377,18 +377,10 @@ export default {
                   }
                   break;
                 case 'From & To':
-                  if(!this.isAlreadySubmit) {
-                    if(this.selectCfmPtPSEStart && this.selectCfmPtPSEEnd) {
-                      disabledBool = false;
-                    }
-                  } else {
-                    if((!this.selectCfmPtPSEStart && this.selectCfmPtPSEEnd) 
-                    || (this.selectCfmPtPSEStart && !this.selectCfmPtPSEEnd)) {
-                      disabledBool = true;
-                    }
-                    else {
-                      disabledBool = false;
-                    }
+                  if(!this.isAlreadySubmit) { // sonar-qube fix
+                      disabledBool = !(this.selectCfmPtPSEStart && this.selectCfmPtPSEEnd)
+                  } else { // sonar-qube fix
+                     disabledBool = (this.selectCfmPtPSEStart && !this.selectCfmPtPSEEnd) || (!this.selectCfmPtPSEStart && this.selectCfmPtPSEEnd);
                   }
                 break;
               };
@@ -410,20 +402,9 @@ export default {
                   }
                   break;
                 case 'Start & End':
-                  if(!this.isAlreadySubmit) {
-                    if(this.selectCfmWtEteSEStart && this.selectCfmWtEteSEEnd) {
-                      disabledBool = false;                      
-                    } else {
-                      if((!this.selectCfmWtEteSEStart && this.selectCfmWtEteSEEnd) 
-                      || (this.selectCfmWtEteSEStart && !this.selectCfmWtEteSEEnd)) {
-                        disabledBool = true;
-                      }
-                      else {
-                        disabledBool = false;
-                      }
-                    }
-                    break;
-                };
+                  if(!this.isAlreadySubmit) { // sonar-qube fix
+                    disabledBool = !(this.selectCfmWtEteSEStart == this.selectCfmWtEteSEEnd);
+                  };
                 break;
               }
             case 'Partial':
@@ -439,18 +420,10 @@ export default {
                   }
                   break;
                 case 'From & To':
-                  if(!this.isAlreadySubmit) {
-                    if(this.selectCfmWtPSEStart && this.selectCfmWtPSEEnd) {
-                      disabledBool = false;
-                    }
+                  if (!this.isAlreadySubmit) { // sonar-cube fix
+                      disabledBool = !(this.selectCfmWtPSEStart && this.selectCfmWtPSEEnd);
                   } else {
-                    if((!this.selectCfmWtPSEStart && this.selectCfmWtPSEEnd) 
-                    || (this.selectCfmWtPSEStart && !this.selectCfmWtPSEEnd)) {
-                      disabledBool = true;
-                    }
-                    else {
-                      disabledBool = false;
-                    }
+                      disabledBool = (this.selectCfmWtPSEStart !== this.selectCfmWtPSEEnd);
                   }
                   break;
               };
@@ -473,18 +446,14 @@ export default {
               }
               break;
             case 'Start & End':
-              if(!this.isAlreadySubmit) {
-                if(this.selectCfmCtEteSEStart && this.selectCfmCtEteSEEnd) {
-                  disabledBool = false;
-                }
+            if (!this.isAlreadySubmit) { // sonar-qube fix
+              if (this.selectCfmCtEteSEStart && this.selectCfmCtEteSEEnd) {
+                      disabledBool = false;
+                  } else {
+                      disabledBool = true;
+                  }
               } else {
-                if((!this.selectCfmCtEteSEStart && this.selectCfmCtEteSEEnd) 
-                || (this.selectCfmCtEteSEStart && !this.selectCfmCtEteSEEnd)) {
-                  disabledBool = true;
-                }
-                else {
-                  disabledBool = false;
-                }
+                  disabledBool = (this.selectCfmCtEteSEStart !== this.selectCfmCtEteSEEnd);
               }
               break;
           };
diff --git a/src/components/Header.vue b/src/components/Header.vue
index ba40cb7..3ef676a 100644
--- a/src/components/Header.vue
+++ b/src/components/Header.vue
@@ -6,9 +6,6 @@
       </figure>
       <div class="flex justify-between items-center relative"
         v-show="showMember">
-        <!-- 不再使用本顆登出按鈕 <button id="logout_btn" class="btn btn-sm btn-neutral mr-2" @click.prevent="logOutButton">
-          Logout
-        </button> -->
         <img v-show="true" id="acct_mgmt_button" src="@/assets/icon-head-black.svg" width="32" height="32" 
           class="cursor-pointer z-50"  @click="toggleIsAcctMenuOpen" alt="user-head"
         />
diff --git a/src/components/Navbar.vue b/src/components/Navbar.vue
index 1f5589a..801c133 100644
--- a/src/components/Navbar.vue
+++ b/src/components/Navbar.vue
@@ -137,7 +137,7 @@ export default {
     noShowSaveButton: function() {
       return this.navViewName === 'UPLOAD' || this.navViewName === 'COMPARE' || 
         this.navViewName === 'ACCOUNT MANAGEMENT' ||
-        this.activePage === 'PERFORMANCE' ? true : false;
+        this.activePage === 'PERFORMANCE';
     },
     ...mapState(PageAdminStore, [
       'activePage',
@@ -148,18 +148,9 @@ export default {
   },
   watch: {
     '$route':'getNavViewName',
-    filterName: function(newVal, oldVal) {
+    filterName: function(newVal,) {
       this.filterName = newVal;
     },
-    activePageComputedByRoute (newVal) {
-      // console.log('activePageComputedByRoute newVal', newVal);
-    },
-    activePage: function(newVal){
-      // console.log('watch activePage', this.activePage);
-    },
-    pendingActivePage: function(newVal){
-      // console.log('watch pendingActivePage', this.pendingActivePage);
-    },
   },
   mounted() {
     this.handleNavItemBtn();
@@ -175,7 +166,6 @@ export default {
      * @param {event} event 選取 Navbar 選項後傳入的值
      */
     onNavItemBtnClick(event) {
-      // console.log('onNavItemBtnClick');
       let type;
       let fileId;
       let isCheckPage;