imacat/lucia-frontend
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

sonar

Browse Source
This commit is contained in:
Cindy Chang
2024-07-22 13:20:19 +08:00
parent 56c94f1d80
commit 5407a4e2aa
4 changed files with 20 additions and 64 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/components/AccountMenu/AcctMenu.vue
View File

@@ -10,7 +10,7 @@
<li id="btn_acct_mgmt" <li id="btn_acct_mgmt"
class="w-full h-[40px] flex py-2 px-4 hover:text-[#000000] hover:bg-[#F1F5F9] cursor-pointer class="w-full h-[40px] flex py-2 px-4 hover:text-[#000000] hover:bg-[#F1F5F9] cursor-pointer
items-center" @click="onBtnAcctMgmtClick"> 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> <span class="flex ml-[8px]">{{i18next.t("AcctMgmt.acctMgmt")}}</span>
</li> </li>
<li id="btn_mang_ur_acct" <li id="btn_mang_ur_acct"

65
src/components/Discover/Conformance/ConformanceSidebar.vue
View File

@@ -377,18 +377,10 @@ export default {
} }
break; break;
case 'From & To': case 'From & To':
if(!this.isAlreadySubmit) { if(!this.isAlreadySubmit) { // sonar-qube fix
if(this.selectCfmPtPSEStart && this.selectCfmPtPSEEnd) { disabledBool = !(this.selectCfmPtPSEStart && this.selectCfmPtPSEEnd)
disabledBool = false; } else { // sonar-qube fix
} disabledBool = (this.selectCfmPtPSEStart && !this.selectCfmPtPSEEnd) || (!this.selectCfmPtPSEStart && this.selectCfmPtPSEEnd);
} else {
if((!this.selectCfmPtPSEStart && this.selectCfmPtPSEEnd)
|| (this.selectCfmPtPSEStart && !this.selectCfmPtPSEEnd)) {
disabledBool = true;
}
else {
disabledBool = false;
}
} }
break; break;
}; };
@@ -410,20 +402,9 @@ export default {
} }
break; break;
case 'Start & End': case 'Start & End':
if(!this.isAlreadySubmit) { if(!this.isAlreadySubmit) { // sonar-qube fix
if(this.selectCfmWtEteSEStart && this.selectCfmWtEteSEEnd) { disabledBool = !(this.selectCfmWtEteSEStart == this.selectCfmWtEteSEEnd);
disabledBool = false; };
} else {
if((!this.selectCfmWtEteSEStart && this.selectCfmWtEteSEEnd)
|| (this.selectCfmWtEteSEStart && !this.selectCfmWtEteSEEnd)) {
disabledBool = true;
}
else {
disabledBool = false;
}
}
break;
};
break; break;
} }
case 'Partial': case 'Partial':
@@ -439,18 +420,10 @@ export default {
} }
break; break;
case 'From & To': case 'From & To':
if(!this.isAlreadySubmit) { if (!this.isAlreadySubmit) { // sonar-cube fix
if(this.selectCfmWtPSEStart && this.selectCfmWtPSEEnd) { disabledBool = !(this.selectCfmWtPSEStart && this.selectCfmWtPSEEnd);
disabledBool = false;
}
} else { } else {
if((!this.selectCfmWtPSEStart && this.selectCfmWtPSEEnd) disabledBool = (this.selectCfmWtPSEStart !== this.selectCfmWtPSEEnd);
|| (this.selectCfmWtPSEStart && !this.selectCfmWtPSEEnd)) {
disabledBool = true;
}
else {
disabledBool = false;
}
} }
break; break;
}; };
@@ -473,18 +446,14 @@ export default {
} }
break; break;
case 'Start & End': case 'Start & End':
if(!this.isAlreadySubmit) { if (!this.isAlreadySubmit) { // sonar-qube fix
if(this.selectCfmCtEteSEStart && this.selectCfmCtEteSEEnd) { if (this.selectCfmCtEteSEStart && this.selectCfmCtEteSEEnd) {
disabledBool = false; disabledBool = false;
} } else {
disabledBool = true;
}
} else { } else {
if((!this.selectCfmCtEteSEStart && this.selectCfmCtEteSEEnd) disabledBool = (this.selectCfmCtEteSEStart !== this.selectCfmCtEteSEEnd);
|| (this.selectCfmCtEteSEStart && !this.selectCfmCtEteSEEnd)) {
disabledBool = true;
}
else {
disabledBool = false;
}
} }
break; break;
}; };

3
src/components/Header.vue
View File

@@ -6,9 +6,6 @@
</figure> </figure>
<div class="flex justify-between items-center relative" <div class="flex justify-between items-center relative"
v-show="showMember"> 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" <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" class="cursor-pointer z-50" @click="toggleIsAcctMenuOpen" alt="user-head"
/> />

14
src/components/Navbar.vue
View File

@@ -137,7 +137,7 @@ export default {
noShowSaveButton: function() { noShowSaveButton: function() {
return this.navViewName === 'UPLOAD' || this.navViewName === 'COMPARE' || return this.navViewName === 'UPLOAD' || this.navViewName === 'COMPARE' ||
this.navViewName === 'ACCOUNT MANAGEMENT' || this.navViewName === 'ACCOUNT MANAGEMENT' ||
this.activePage === 'PERFORMANCE' ? true : false; this.activePage === 'PERFORMANCE';
}, },
...mapState(PageAdminStore, [ ...mapState(PageAdminStore, [
'activePage', 'activePage',
@@ -148,18 +148,9 @@ export default {
}, },
watch: { watch: {
'$route':'getNavViewName', '$route':'getNavViewName',
filterName: function(newVal, oldVal) { filterName: function(newVal,) {
this.filterName = 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() { mounted() {
this.handleNavItemBtn(); this.handleNavItemBtn();
@@ -175,7 +166,6 @@ export default {
* @param {event} event 選取 Navbar 選項後傳入的值 * @param {event} event 選取 Navbar 選項後傳入的值
*/ */
onNavItemBtnClick(event) { onNavItemBtnClick(event) {
// console.log('onNavItemBtnClick');
let type; let type;
let fileId; let fileId;
let isCheckPage; let isCheckPage;