diff --git a/pages.json b/pages.json index e9a281b..ea058a1 100644 --- a/pages.json +++ b/pages.json @@ -261,7 +261,8 @@ "style": { "navigationStyle": "custom" } - },{ + }, + { //首页二级跳转页面 -- 人员详情 "path": "pages/realName/index/pages/personDetail", "style": { @@ -777,6 +778,18 @@ "style": { "navigationStyle": "custom" } + }, + { + "path": "pages/workPlan/networkPlan/index", + "style": { + "navigationStyle": "custom" + } + }, + { + "path": "pages/workPlan/tempPlan/index", + "style": { + "navigationStyle": "custom" + } } ], "globalStyle": { diff --git a/pages/realName/index/index.vue b/pages/realName/index/index.vue index 6d9005e..af875e6 100644 --- a/pages/realName/index/index.vue +++ b/pages/realName/index/index.vue @@ -142,7 +142,9 @@ {{ item.progress_title }} - {{ item.progress_proportion }}% + + {{ isNaN(item.progress_proportion) ? 0 : item.progress_proportion }}% + @@ -685,7 +687,7 @@ export default { e.progress_amount = this.einTemporaryAttPersonNum e.progress_ready = this.einTemporaryAttPersonNum } - e.progress_proportion = ((e.progress_ready / e.progress_amount) * 100).toFixed(0) + e.progress_proportion = ((e.progress_ready / e.progress_amount) * 100).toFixed(2) }) console.log('this.progressList', this.progressList) @@ -704,7 +706,7 @@ export default { e.project_num = completeProNum } - e.project_ratio = ((e.project_num / proAmount) * 100).toFixed(0) + e.project_ratio = ((e.project_num / proAmount) * 100).toFixed(2) }) }, /* 跳转作业计划 */ diff --git a/pages/workPlan/dayPlan/index.vue b/pages/workPlan/dayPlan/index.vue index a91864c..1e68f03 100644 --- a/pages/workPlan/dayPlan/index.vue +++ b/pages/workPlan/dayPlan/index.vue @@ -86,7 +86,7 @@ label-width="200" > diff --git a/pages/workPlan/index/components/calendar.vue b/pages/workPlan/index/components/calendar.vue index 35592db..ae77e2f 100644 --- a/pages/workPlan/index/components/calendar.vue +++ b/pages/workPlan/index/components/calendar.vue @@ -1,10 +1,10 @@