Commit 3c02ab90 by lichengming

修改了委托进度显示

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