diff --git a/src/views/projectAdmin/fourEngin/assets/images/progress/conbtn1.png b/src/views/projectAdmin/fourEngin/assets/images/progress/conbtn1.png new file mode 100644 index 00000000..27283184 Binary files /dev/null and b/src/views/projectAdmin/fourEngin/assets/images/progress/conbtn1.png differ diff --git a/src/views/projectAdmin/fourEngin/assets/images/progress/conbtn2.png b/src/views/projectAdmin/fourEngin/assets/images/progress/conbtn2.png new file mode 100644 index 00000000..8ed2ab2a Binary files /dev/null and b/src/views/projectAdmin/fourEngin/assets/images/progress/conbtn2.png differ diff --git a/src/views/projectAdmin/fourEngin/assets/images/progress/conright.png b/src/views/projectAdmin/fourEngin/assets/images/progress/conright.png new file mode 100644 index 00000000..a85b4c90 Binary files /dev/null and b/src/views/projectAdmin/fourEngin/assets/images/progress/conright.png differ diff --git a/src/views/projectAdmin/fourEngin/assets/images/progress/img1.png b/src/views/projectAdmin/fourEngin/assets/images/progress/img1.png new file mode 100644 index 00000000..7fad53ad Binary files /dev/null and b/src/views/projectAdmin/fourEngin/assets/images/progress/img1.png differ diff --git a/src/views/projectAdmin/fourEngin/assets/images/progress/img2.png b/src/views/projectAdmin/fourEngin/assets/images/progress/img2.png new file mode 100644 index 00000000..bc3e80d6 Binary files /dev/null and b/src/views/projectAdmin/fourEngin/assets/images/progress/img2.png differ diff --git a/src/views/projectAdmin/fourEngin/assets/images/progress/img3.png b/src/views/projectAdmin/fourEngin/assets/images/progress/img3.png new file mode 100644 index 00000000..2ce19c07 Binary files /dev/null and b/src/views/projectAdmin/fourEngin/assets/images/progress/img3.png differ diff --git a/src/views/projectAdmin/fourEngin/assets/images/progress/img4.png b/src/views/projectAdmin/fourEngin/assets/images/progress/img4.png new file mode 100644 index 00000000..a1b79fe0 Binary files /dev/null and b/src/views/projectAdmin/fourEngin/assets/images/progress/img4.png differ diff --git a/src/views/projectAdmin/fourEngin/assets/images/progress/img5.png b/src/views/projectAdmin/fourEngin/assets/images/progress/img5.png new file mode 100644 index 00000000..955388f8 Binary files /dev/null and b/src/views/projectAdmin/fourEngin/assets/images/progress/img5.png differ diff --git a/src/views/projectAdmin/fourEngin/assets/images/progress/img6.png b/src/views/projectAdmin/fourEngin/assets/images/progress/img6.png new file mode 100644 index 00000000..909d6e75 Binary files /dev/null and b/src/views/projectAdmin/fourEngin/assets/images/progress/img6.png differ diff --git a/src/views/projectAdmin/fourEngin/progress/index.vue b/src/views/projectAdmin/fourEngin/progress/index.vue index b9094ae8..fcee8c33 100644 --- a/src/views/projectAdmin/fourEngin/progress/index.vue +++ b/src/views/projectAdmin/fourEngin/progress/index.vue @@ -87,42 +87,42 @@ export default { }; }, created() { - // this.getList(); + this.getList(); }, computed: { ...mapState(["projectSn"]), }, methods: { change(val) { - console.log("点击的", val); + // console.log("点击的", val); this.currentIndex = val; }, - // getList() { - // listProgressOfTheTask({ - // projectSn: this.projectSn, - // isNoStart: false, - // }).then((res) => { - // console.log("查询步骤条列表: ", res); - // // state 0未开始, 1进行中, 2已完成 - // const progress = this.progress; - // res.result.forEach((item) => { - // if (item.state == 2) { - // progress.push({ - // name: item.subitemProjectName, - // date: item.actualEndTime, - // }); - // this.numberOfCompleted++; - // console.log("this.numberOfCompleted: ", this.numberOfCompleted); - // } else { - // progress.push({ - // name: item.subitemProjectName, - // date: item.startTime, - // }); - // } - // }); - // console.log(this.progress); - // }); - // }, + getList() { + listProgressOfTheTask({ + projectSn: this.projectSn, + isNoStart: false, + }).then((res) => { + // console.log("查询步骤条列表: ", res); + // state 0未开始, 1进行中, 2已完成 + // const progress = this.progress; + // res.result.forEach((item) => { + // if (item.state == 2) { + // progress.push({ + // name: item.subitemProjectName, + // date: item.actualEndTime, + // }); + // this.numberOfCompleted++; + // console.log("this.numberOfCompleted: ", this.numberOfCompleted); + // } else { + // progress.push({ + // name: item.subitemProjectName, + // date: item.startTime, + // }); + // } + // }); + // console.log(this.progress); + }); + }, }, }; @@ -146,7 +146,7 @@ export default { left: 40%; width: 212px; height: 38px; - background-image: url(../assets/temp/untab.png); + background-image: url(../assets/temp/tab.png); background-size: 100%; background-repeat: no-repeat; } @@ -156,7 +156,7 @@ export default { left: 50%; width: 212px; height: 38px; - background-image: url(../assets/temp/untab.png); + background-image: url(../assets/temp/tab.png); background-size: 100%; background-repeat: no-repeat; } @@ -166,7 +166,7 @@ export default { left: 60%; width: 212px; height: 38px; - background-image: url(../assets/temp/untab.png); + background-image: url(../assets/temp/tab.png); background-size: 100%; background-repeat: no-repeat; } @@ -176,7 +176,8 @@ export default { left: 40%; width: 212px; height: 38px; - background-image: url(../assets/temp/tab.png); + z-index: 98; + background-image: url(../assets/temp/untab.png); background-size: 100%; background-repeat: no-repeat; } @@ -185,8 +186,9 @@ export default { top: 10%; left: 50%; width: 212px; + z-index: 98; height: 38px; - background-image: url(../assets/temp/tab.png); + background-image: url(../assets/temp/untab.png); background-size: 100%; background-repeat: no-repeat; } @@ -195,8 +197,9 @@ export default { top: 10%; left: 60%; width: 212px; + z-index: 98; height: 38px; - background-image: url(../assets/temp/tab.png); + background-image: url(../assets/temp/untab.png); background-size: 100%; background-repeat: no-repeat; } @@ -276,7 +279,7 @@ export default { justify-content: center; align-items: center; .left{ - width: 23%; + width: 22%; margin-right: 1%; height: 100%; .leftone{ @@ -290,7 +293,7 @@ export default { } } .right{ - width: 77%; + width: 78%; height: 100%; background-image: url(../assets/temp/tab3.png); background-repeat: no-repeat; diff --git a/src/views/projectAdmin/fourEngin/progress/leftThree.vue b/src/views/projectAdmin/fourEngin/progress/leftThree.vue index b5e027c4..a8bd7cee 100644 --- a/src/views/projectAdmin/fourEngin/progress/leftThree.vue +++ b/src/views/projectAdmin/fourEngin/progress/leftThree.vue @@ -1,5 +1,13 @@ \ No newline at end of file diff --git a/src/views/projectAdmin/fourEngin/progress/leftTwo.vue b/src/views/projectAdmin/fourEngin/progress/leftTwo.vue index acd40d1e..6e5b45fb 100644 --- a/src/views/projectAdmin/fourEngin/progress/leftTwo.vue +++ b/src/views/projectAdmin/fourEngin/progress/leftTwo.vue @@ -1,15 +1,84 @@ \ No newline at end of file