Commit 3c02ab90 by lichengming

修改了委托进度显示

parent d97584cf
......@@ -80,16 +80,16 @@ export default {
// const list_0_value = this.list[0].value
const listZeroValue = this.list[0].value
// if (current_value) {
if (currentValue === false || currentValue === undefined) {
return undefined
if (currentValue === false) {
return false
} else if (currentValue) {
return endValue
} else {
// undefined,说明要接着向下走
// eslint-disable-next-line no-lonely-if
if (listZeroValue !== undefined && endValue) {
if (listZeroValue === true && endValue) {
return true
} else if (listZeroValue !== undefined && endValue === false) {
} else if (listZeroValue === false) {
return false
}
}
......@@ -102,7 +102,8 @@ export default {
.flow-start-border {
width: 2px;
height: 133px;
background: #666;
/*background: #666;*/
background: #eb6877;
position: absolute;
top: 30px;
}
......@@ -112,6 +113,7 @@ export default {
}
.red-flow-start-border {
background: #eb6877;
/*background: #eb6877;*/
background: #666;
}
</style>
......@@ -47,12 +47,14 @@ export default {
<style scoped>
.arrow-left {
height: 2px;
background: #666;
/*background: #666;*/
background: #eb6877;
}
.arrow-right {
border: 6px solid transparent;
border-left: 10px solid #666;
/*border-left: 10px solid #666;*/
border-left: 10px solid #eb6877;
width: 0;
height: 0px;
margin-top: -5px;
......@@ -74,7 +76,7 @@ export default {
}
.red-color-left {
background: #eb6877;
background: #666;
}
.blue-color-right {
......@@ -82,6 +84,6 @@ export default {
}
.red-color-right {
border-left-color: #eb6877;
border-left-color: #666;
}
</style>
......@@ -47,12 +47,14 @@ export default {
.circle {
width: 60px;
height: 60px;
border: 1px solid #999;
background: #999;
/*border: 1px solid #999;*/
/*background: #999;*/
color: #fff;
border-radius: 50%;
text-align: center;
font-size: 12px;
border-color: #eb6877;
background-color: #eb6877;
}
.circle span {
......@@ -76,8 +78,9 @@ export default {
}
.red-color {
border-color: #eb6877;
background-color: #eb6877;
/*border-color: #eb6877;*/
/*background-color: #eb6877;*/
color: #fff;
background: #999;
}
</style>
......@@ -42,8 +42,9 @@ export default {
<style scoped>
.rect {
border: 1px solid #999;
background: #999;
border: 1px solid #eb6877;
/*background: #999;*/
background: #eb6877;
color: #fff;
font-size: 12px;
width: 80px;
......@@ -62,8 +63,9 @@ export default {
}
.red-color {
border-color: #eb6877;
background-color: #eb6877;
border-color: #999;
/*background-color: #eb6877;*/
background-color: #999;
color: #fff;
}
</style>
......@@ -187,28 +187,21 @@ export default {
// 上面连接线颜色
upLineClassObj() {
const valueZero = this.list.end[0].value
const upValue = this.list.branch[0][2].value
// const upValue = this.list.branch[0][2].value
const upValueZero = this.list.branch[0][0].value
if (
upValue === undefined ||
upValueZero === undefined ||
upValue === false
) {
return undefined
if (upValueZero === false) {
return false
} else {
return valueZero
}
},
// 下面连接线颜色
downLineClassObj() {
const valueZero = this.list.end[0].value
const downValue = this.list.branch[2][2].value
const downValueZero = this.list.branch[2][0].value
if (
downValue !== undefined ||
(downValue === undefined && downValueZero === undefined)
) {
return undefined
const valueZero = this.list.end[0].value // true 报告编制
// const downValue = this.list.branch[2][2].value // false 高级自校版
const downValueZero = this.list.branch[2][0].value // false 高级
if (downValueZero === false) {
return false
} else {
return valueZero
}
......@@ -224,13 +217,20 @@ export default {
const branchOne = this.list.branch[1][0].value
const branchTwo = this.list.branch[2][0].value
if (index === 2) {
if (branchZero !== undefined) {
if (branchZero !== false) {
if (
(branchZero === undefined) &
(branchOne === true || branchTwo === true)
) {
return true
} else {
return branchZero
}
if (branchOne !== undefined) {
}
if (branchOne !== false) {
return branchOne
}
if (branchTwo !== undefined) {
if (branchTwo !== false) {
return branchTwo
}
} else {
......
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