From 6ff00770fc97977114bcb58bc20d49dc22f8683c Mon Sep 17 00:00:00 2001 From: BianLzhaoMin <11485688+bianliangzhaomin123@user.noreply.gitee.com> Date: Tue, 22 Oct 2024 10:52:39 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BB=A3=E7=A0=81=E4=BC=98=E5=8C=96=E4=BB=A5?= =?UTF-8?q?=E5=8F=8A=E4=BD=9C=E4=B8=9A=E8=AE=A1=E5=88=92=E9=83=A8=E5=88=86?= =?UTF-8?q?=E9=A1=B5=E9=9D=A2=E5=BC=80=E5=8F=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pages.json | 15 +- pages/realName/index/index.vue | 8 +- pages/workPlan/dayPlan/index.vue | 11 +- pages/workPlan/index/components/calendar.vue | 57 +- pages/workPlan/monthPlan/index.vue | 9 +- .../networkPlan/components/time-select.vue | 39 ++ pages/workPlan/networkPlan/index.vue | 452 +++++++++++++++ .../tempPlan/components/time-select.vue | 39 ++ pages/workPlan/tempPlan/index.vue | 520 ++++++++++++++++++ pages/workPlan/weekPlan/index.vue | 13 +- .../components/infrastructure-model.vue | 8 +- .../workbench/components/production-model.vue | 8 +- 12 files changed, 1154 insertions(+), 25 deletions(-) create mode 100644 pages/workPlan/networkPlan/components/time-select.vue create mode 100644 pages/workPlan/networkPlan/index.vue create mode 100644 pages/workPlan/tempPlan/components/time-select.vue create mode 100644 pages/workPlan/tempPlan/index.vue 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 @@