From 1c432ff8b13bd431e8560d12f601b57a59bfa74f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=AA=86=E4=B9=90?= <342503599@qq.com> Date: Thu, 4 Aug 2022 10:10:14 +0800 Subject: [PATCH 1/4] =?UTF-8?q?=E6=B9=96=E9=87=8C=E5=A4=A7=E5=B1=8F(?= =?UTF-8?q?=E8=BF=9B=E5=BA=A6=E8=AE=A1=E5=88=92):=E7=8A=B6=E6=80=81?= =?UTF-8?q?=E7=BB=9F=E8=AE=A1=E6=A8=A1=E5=9D=97?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../{jChart/pie => components}/progress.vue | 0 .../projectHuScreen/jChart/bar/JBarChart.vue | 1 + .../{problemChart.vue => JProblemChart.vue} | 0 .../planProgress/centerBottom.vue | 2 +- .../planProgress/leftBottom.vue | 6 +-- .../planProgress/leftCenter.vue | 42 +++++++++++++++++-- .../projectHuli/constructProgress.vue | 2 +- .../projectHuli/qualityProblem.vue | 2 +- 8 files changed, 46 insertions(+), 9 deletions(-) rename src/views/projectAdmin/dataBoard/projectHuScreen/{jChart/pie => components}/progress.vue (100%) rename src/views/projectAdmin/dataBoard/projectHuScreen/jChart/pie/{problemChart.vue => JProblemChart.vue} (100%) diff --git a/src/views/projectAdmin/dataBoard/projectHuScreen/jChart/pie/progress.vue b/src/views/projectAdmin/dataBoard/projectHuScreen/components/progress.vue similarity index 100% rename from src/views/projectAdmin/dataBoard/projectHuScreen/jChart/pie/progress.vue rename to src/views/projectAdmin/dataBoard/projectHuScreen/components/progress.vue diff --git a/src/views/projectAdmin/dataBoard/projectHuScreen/jChart/bar/JBarChart.vue b/src/views/projectAdmin/dataBoard/projectHuScreen/jChart/bar/JBarChart.vue index ad0d1a73..b674067c 100644 --- a/src/views/projectAdmin/dataBoard/projectHuScreen/jChart/bar/JBarChart.vue +++ b/src/views/projectAdmin/dataBoard/projectHuScreen/jChart/bar/JBarChart.vue @@ -80,6 +80,7 @@ export default { }, yAxis: { type: 'value', + splitNumber: 4, splitLine: { show: true, lineStyle: { diff --git a/src/views/projectAdmin/dataBoard/projectHuScreen/jChart/pie/problemChart.vue b/src/views/projectAdmin/dataBoard/projectHuScreen/jChart/pie/JProblemChart.vue similarity index 100% rename from src/views/projectAdmin/dataBoard/projectHuScreen/jChart/pie/problemChart.vue rename to src/views/projectAdmin/dataBoard/projectHuScreen/jChart/pie/JProblemChart.vue diff --git a/src/views/projectAdmin/dataBoard/projectHuScreen/planProgress/centerBottom.vue b/src/views/projectAdmin/dataBoard/projectHuScreen/planProgress/centerBottom.vue index 040961fa..bb8de9f2 100644 --- a/src/views/projectAdmin/dataBoard/projectHuScreen/planProgress/centerBottom.vue +++ b/src/views/projectAdmin/dataBoard/projectHuScreen/planProgress/centerBottom.vue @@ -7,7 +7,7 @@ diff --git a/src/views/projectAdmin/dataBoard/projectHuScreen/projectHuli/constructProgress.vue b/src/views/projectAdmin/dataBoard/projectHuScreen/projectHuli/constructProgress.vue index 83610f0e..876b4c46 100644 --- a/src/views/projectAdmin/dataBoard/projectHuScreen/projectHuli/constructProgress.vue +++ b/src/views/projectAdmin/dataBoard/projectHuScreen/projectHuli/constructProgress.vue @@ -49,7 +49,7 @@ From 9e985aa0b33aa5225a0673584bd9ed52c22672aa Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=AA=86=E4=B9=90?= <342503599@qq.com> Date: Thu, 4 Aug 2022 13:33:10 +0800 Subject: [PATCH 3/4] =?UTF-8?q?=E6=B9=96=E9=87=8C=E5=A4=A7=E5=B1=8F(?= =?UTF-8?q?=E5=8A=B3=E5=8A=A1=E7=AE=A1=E7=90=86):=E4=BA=BA=E5=91=98?= =?UTF-8?q?=E6=A6=82=E5=86=B5=E6=A8=A1=E5=9D=97?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../laborManage/leftCenter.vue | 91 ++++++++++++++++++- 1 file changed, 88 insertions(+), 3 deletions(-) diff --git a/src/views/projectAdmin/dataBoard/projectHuScreen/laborManage/leftCenter.vue b/src/views/projectAdmin/dataBoard/projectHuScreen/laborManage/leftCenter.vue index 74e6d586..b19c191f 100644 --- a/src/views/projectAdmin/dataBoard/projectHuScreen/laborManage/leftCenter.vue +++ b/src/views/projectAdmin/dataBoard/projectHuScreen/laborManage/leftCenter.vue @@ -1,7 +1,54 @@ @@ -26,7 +73,7 @@ export default { From d805d3d522698fc7661aee554300b6e1d270e5f1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=AA=86=E4=B9=90?= <342503599@qq.com> Date: Thu, 4 Aug 2022 15:24:38 +0800 Subject: [PATCH 4/4] =?UTF-8?q?=E6=B9=96=E9=87=8C=E5=A4=A7=E5=B1=8F(?= =?UTF-8?q?=E5=8A=B3=E5=8A=A1=E7=AE=A1=E7=90=86):=E4=BA=BA=E5=91=98?= =?UTF-8?q?=E7=B1=BB=E5=9E=8B=E5=AE=89=E5=85=A8=E5=9F=B9=E8=AE=AD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../laborManage/leftBottom.vue | 90 +++++++++++++++-- .../laborManage/rightCenter.vue | 97 +++++++++++++++---- .../projectHuScreen/laborManage/rightTop.vue | 70 ++++++++++--- 3 files changed, 216 insertions(+), 41 deletions(-) diff --git a/src/views/projectAdmin/dataBoard/projectHuScreen/laborManage/leftBottom.vue b/src/views/projectAdmin/dataBoard/projectHuScreen/laborManage/leftBottom.vue index 90c9f507..131a6b5c 100644 --- a/src/views/projectAdmin/dataBoard/projectHuScreen/laborManage/leftBottom.vue +++ b/src/views/projectAdmin/dataBoard/projectHuScreen/laborManage/leftBottom.vue @@ -1,13 +1,25 @@ + diff --git a/src/views/projectAdmin/dataBoard/projectHuScreen/laborManage/rightCenter.vue b/src/views/projectAdmin/dataBoard/projectHuScreen/laborManage/rightCenter.vue index d5593f00..a7ec3e22 100644 --- a/src/views/projectAdmin/dataBoard/projectHuScreen/laborManage/rightCenter.vue +++ b/src/views/projectAdmin/dataBoard/projectHuScreen/laborManage/rightCenter.vue @@ -1,42 +1,101 @@ - diff --git a/src/views/projectAdmin/dataBoard/projectHuScreen/laborManage/rightTop.vue b/src/views/projectAdmin/dataBoard/projectHuScreen/laborManage/rightTop.vue index 762f2ecb..edc6d871 100644 --- a/src/views/projectAdmin/dataBoard/projectHuScreen/laborManage/rightTop.vue +++ b/src/views/projectAdmin/dataBoard/projectHuScreen/laborManage/rightTop.vue @@ -1,14 +1,14 @@