Commit a9f4f0b4 by li_hongchao

1、处理队列也可点击问题处理

2、工作流中队列名称和工作队列两列间距不一致
3、串行队列模式序号标记间距调整
4、新增逻辑库、编辑逻辑库、编辑工作流弹窗背景添加
parent 0da5c425
......@@ -75,6 +75,7 @@ class Gzlzz {
}
static _CXDL_TYPE = _DL_TYPES.CXDL.type
static _CLDL_TYPE = _DL_TYPES.CLDL.type
gzdlArr = []
gzdlCxdlArr = []
......
......@@ -44,7 +44,8 @@
</el-col>
<el-col :span="12">
<el-form-item class="info-item" label="数据库用户:">
<sjkyh-select ref='sjkyhSelect' :params='ljfkRuleForm.usersOrUserGroups' @select="selectYh" />
<sjkyh-select ref='sjkyhSelect' :params='ljfkRuleForm.usersOrUserGroups'
@select="selectYh" />
<div class="tip">
<span class="iconfont">&#xe649;</span>提示:如果不选择,默认全部用户!
</div>
......@@ -210,8 +211,7 @@
<div v-if="gzlRuleForm.pattern === 1"
v-for="(item,gindex) in getGzdlArr()"
:class="{'gong-zuo-dui-lie-bingxing-item':true}">
<div class="gong-zuo-dui-lie-bingxing-item-left"
style="margin-left: -30px;">
<div class="gong-zuo-dui-lie-bingxing-item-left">
<div :class="{verLine:true,verLineTrans: gindex === 0}" />
<div :class="{verLine:true,verLineTrans: gindex === getGzdlArr().length -1}" />
</div>
......@@ -426,7 +426,7 @@ export default {
this.isShowGzlView = !this.isShowGzlView
},
updateGzdl(clickItem, index, isAdd = false) {// 处理队列添加、取消逻辑
if (this.isBxCxdl(clickItem.type)) return
if (this.isBxCxdl(clickItem.type) || clickItem.type === Gzlzz._CLDL_TYPE) return
this.getCurGzl().updateGzdl(clickItem, index, isAdd)
},
......
......@@ -50,11 +50,14 @@
:info="addInfo"
v-if="isAddFk"
@close="closeXtfkView" />
<!-- 弹窗背景-->
<div v-if="isAddFk" ref="backBg" class="backBg" />
</el-container>
</template>
<script>
import "@/icons/ic_add.svg";
import '@/icons/ic_add.svg'
import RyXtljfkView from '../xtfkgl/RyXtljfkView.vue'
import AjXtljfkView from '../xtfkgl/AjXtljfkView.vue'
import XtfkAndGzlView from '../xtfkgl/XtfkAndGzlView.vue'
......@@ -130,4 +133,17 @@ export default {
<style scoped lang="scss">
@import "scss/xtfkgl_main";
// @import "@/assets/css/globalBase.scss";
.backBg {
top: 0;
left: 0;
z-index: 501;
width: 100%;
height: 100%;
background: rgba(255, 255, 255, 0.05);
opacity: 0.65;
backdrop-filter: blur(2px);
display: block;
position: fixed;
}
</style>
......@@ -2,10 +2,10 @@
position: fixed;
top: 0;
left: 0;
z-index: 500;
z-index: 502;
width: 100%;
height: 100%;
background: rgba($color: #fff, $alpha: 0.65);
//background: rgba($color: #fff, $alpha: 0.65);
//filter: blur(2px);
}
......@@ -176,6 +176,7 @@
justify-content: center;
position: relative;
float: left;
margin-left: 6px;
.itemBox {
min-width: 96px;
......@@ -339,6 +340,7 @@
.gong-zuo-dui-lie-bingxing-item-left {
width: 1px;
height: 52px;
margin-left: -24px;
}
.verLine {
......@@ -383,7 +385,7 @@
.gong-zuo-dui-lie-bingxing { // 并行
min-width: 96px;
height: 32px;
margin-left: 12px;
margin-left: 14px;
display: inline-block;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment