style(系统设置): 弹框遮罩层样式调整
This commit is contained in:
parent
a2a13b8f47
commit
d58264983b
|
@ -19,7 +19,7 @@
|
|||
<el-aside
|
||||
:class="isCollapse ? 'ms-aside': 'ms-aside-open'"
|
||||
class="ms-left-aside"
|
||||
:style="isFixed ? 'opacity:100%; position: relative': 'opacity: 95%;position: fixed'"
|
||||
:style="isFixed ? 'opacity:100%; position: relative;z-index: 666;': 'opacity: 95%;position: fixed'"
|
||||
@mouseenter.native="collapseOpen"
|
||||
@mouseleave.native="collapseClose">
|
||||
<ms-aside-header :color="color" :isCollapse="isCollapse"/>
|
||||
|
|
|
@ -109,7 +109,7 @@ export function editApiScenarioCaseOrder(request, callback) {
|
|||
}
|
||||
|
||||
export function savePreciseEnvProjectIds(projectIds, envMap) {
|
||||
if (envMap != null && projectIds != null) {
|
||||
if (envMap != null && projectIds != null && projectIds.length > 0) {
|
||||
let keys = envMap.keys();
|
||||
for (let key of keys) {
|
||||
if (!projectIds.has(key)) {
|
||||
|
|
|
@ -1,10 +1,6 @@
|
|||
<template>
|
||||
<div>
|
||||
<el-menu :unique-opened="true" class="header-user-menu align-right header-top-menu"
|
||||
mode="horizontal"
|
||||
text-color="#fff"
|
||||
active-text-color="#fff">
|
||||
<el-menu-item onselectstart="return false">
|
||||
<div class="ms-header-menu align-right">
|
||||
<el-tooltip effect="light">
|
||||
<template v-slot:content>
|
||||
<span>{{ $t('commons.notice_center') }}</span>
|
||||
|
@ -16,8 +12,7 @@
|
|||
</div>
|
||||
<font-awesome-icon @click="showNoticeCenter" class="icon global focusing" :icon="['fas', 'bell']" v-else/>
|
||||
</el-tooltip>
|
||||
</el-menu-item>
|
||||
</el-menu>
|
||||
</div>
|
||||
|
||||
<el-drawer :visible.sync="taskVisible" :destroy-on-close="true" direction="rtl"
|
||||
:withHeader="true" :modal="false" :title="$t('commons.notice_center')" size="550px"
|
||||
|
@ -276,4 +271,14 @@ export default {
|
|||
.ms-task-success {
|
||||
color: #67C23A;
|
||||
}
|
||||
|
||||
.ms-header-menu {
|
||||
padding: 12px 0px 0px;
|
||||
}
|
||||
|
||||
.ms-header-menu:hover {
|
||||
cursor: pointer;
|
||||
border-color: var(--color);
|
||||
}
|
||||
|
||||
</style>
|
||||
|
|
|
@ -63,7 +63,7 @@ h1 {
|
|||
width: 400px;
|
||||
position: fixed;
|
||||
right: 0px;
|
||||
z-index: 666;
|
||||
z-index: 3000;
|
||||
top: 6px;
|
||||
}
|
||||
</style>
|
||||
|
|
|
@ -1,26 +1,17 @@
|
|||
<template>
|
||||
<div v-permission="['PROJECT_API_SCENARIO:READ','WORKSPACE_USER:READ']">
|
||||
<el-menu
|
||||
v-if="showMenu"
|
||||
:unique-opened="true"
|
||||
class="header-user-menu align-right header-top-menu"
|
||||
mode="horizontal"
|
||||
text-color="#fff"
|
||||
active-text-color="#fff">
|
||||
<el-menu-item onselectstart="return false">
|
||||
<el-tooltip effect="light">
|
||||
|
||||
<el-tooltip effect="light" class="ms-header-menu align-right" v-if="showMenu">
|
||||
<template v-slot:content>
|
||||
<span>{{ $t('commons.task_center') }}</span>
|
||||
</template>
|
||||
<div @click="showTaskCenter" v-if="runningTotal > 0">
|
||||
<el-badge :value="runningTotal" class="item" type="primary">
|
||||
<font-awesome-icon class="icon global focusing" :icon="['fas', 'tasks']" style="font-size: 18px"/>
|
||||
<font-awesome-icon class="icon global focusing" :icon="['fas', 'tasks']"/>
|
||||
</el-badge>
|
||||
</div>
|
||||
<font-awesome-icon @click="showTaskCenter" class="icon global focusing" :icon="['fas', 'tasks']" v-else/>
|
||||
</el-tooltip>
|
||||
</el-menu-item>
|
||||
</el-menu>
|
||||
|
||||
<el-drawer
|
||||
:visible.sync="taskVisible"
|
||||
|
@ -485,28 +476,7 @@ export default {
|
|||
|
||||
.global {
|
||||
color: rgb(96, 98, 102);
|
||||
}
|
||||
|
||||
.header-top-menu {
|
||||
height: 40px;
|
||||
line-height: 40px;
|
||||
color: inherit;
|
||||
}
|
||||
|
||||
.header-top-menu.el-menu--horizontal > li {
|
||||
height: 40px;
|
||||
line-height: 40px;
|
||||
color: inherit;
|
||||
}
|
||||
|
||||
.header-top-menu.el-menu--horizontal > li.el-submenu > * {
|
||||
height: 39px;
|
||||
line-height: 40px;
|
||||
color: inherit;
|
||||
}
|
||||
|
||||
.header-top-menu.el-menu--horizontal > li.is-active {
|
||||
background: var(--color_shallow) !important;
|
||||
font-size: 14px
|
||||
}
|
||||
|
||||
.ms-card-task:hover {
|
||||
|
@ -514,26 +484,19 @@ export default {
|
|||
border-color: #783887;
|
||||
}
|
||||
|
||||
.ms-header-menu {
|
||||
padding: 12px 0px 0px;
|
||||
}
|
||||
|
||||
.ms-header-menu:hover {
|
||||
cursor: pointer;
|
||||
border-color: var(--color);
|
||||
}
|
||||
|
||||
/deep/ .el-progress-bar {
|
||||
padding-right: 20px;
|
||||
}
|
||||
|
||||
/deep/ .el-menu-item {
|
||||
padding-left: 0;
|
||||
padding-right: 0;
|
||||
}
|
||||
|
||||
/deep/ .el-badge__content.is-fixed {
|
||||
top: 25px;
|
||||
}
|
||||
|
||||
/deep/ .el-badge__content {
|
||||
border-radius: 10px;
|
||||
height: 10px;
|
||||
line-height: 10px;
|
||||
}
|
||||
|
||||
|
||||
.item {
|
||||
margin-right: 10px;
|
||||
}
|
||||
|
|
Loading…
Reference in New Issue