diff --git a/src/assets/img/wel/1.png b/src/assets/img/wel/1.png index cf8b978..fded551 100644 Binary files a/src/assets/img/wel/1.png and b/src/assets/img/wel/1.png differ diff --git a/src/assets/img/wel/2.png b/src/assets/img/wel/2.png index fded551..cf8b978 100644 Binary files a/src/assets/img/wel/2.png and b/src/assets/img/wel/2.png differ diff --git a/src/views/plugin/workflow/process/todo.vue b/src/views/plugin/workflow/process/todo.vue index 2b66540..d916343 100644 --- a/src/views/plugin/workflow/process/todo.vue +++ b/src/views/plugin/workflow/process/todo.vue @@ -211,7 +211,7 @@ export default { this.searchForm.startTime = this.searchForm.timeArr[0]; this.searchForm.endTime = this.searchForm.timeArr[1]; } - let isBecomeDue = this.$route.query.id === 1?1:0 + let isBecomeDue = this.$route.query.id == 2?1:0 getList({ current: currentPage, size: pageSize, diff --git a/src/views/wel/index.vue b/src/views/wel/index.vue index 2b6cce4..c9bd4bb 100644 --- a/src/views/wel/index.vue +++ b/src/views/wel/index.vue @@ -18,10 +18,10 @@ class="num" :style="{ color: - item.id === 2 - ? '#FF8723' - : item.id === 1 + item.id === 1 ? '#27D477' + : item.id === 2 + ? '#FF8723' : item.id === 3 ? '#2E92F6' : '#273240', @@ -476,7 +476,7 @@ export default { getAboutMy().then((res) => { const { expireNum, needDoNum, todayAddNum, todayFinishNum } = res.data.data; - const arr = [expireNum, needDoNum, todayAddNum, todayFinishNum]; + const arr = [ needDoNum,expireNum, todayAddNum, todayFinishNum]; for (const i in this.headerList) { this.headerList[i].num = arr[i]; }