From 4258d5e8393e33dff5a05fc756501b1cb1641fc6 Mon Sep 17 00:00:00 2001
From: qq787203167 <787203167@qq.com>
Date: Thu, 26 May 2022 14:56:50 +0800
Subject: [PATCH] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E9=A6=96=E9=A1=B5=E7=BC=A9?=
 =?UTF-8?q?=E6=94=BE=E5=8A=9F=E8=83=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 jero-web/src/assets/logoOne.png               | Bin 0 -> 765 bytes
 jero-web/src/common/lang/en-us.js             |   2 +-
 jero-web/src/components/layouts/TabLayout.vue |   2 ++
 jero-web/src/config/router.config.js          |  10 +++++++
 .../dashboard/components/documentDynamics.vue |   2 +-
 .../components/TaskPlanList.vue               |  13 +++++++++
 .../components/projectStatusAndProgress.vue   |  25 ++++++++++++++++++
 7 files changed, 52 insertions(+), 2 deletions(-)
 create mode 100644 jero-web/src/assets/logoOne.png
 create mode 100644 jero-web/src/views/projectManagement/projectStatusBoard/components/TaskPlanList.vue
 create mode 100644 jero-web/src/views/projectManagement/projectStatusBoard/components/projectStatusAndProgress.vue

diff --git a/jero-web/src/assets/logoOne.png b/jero-web/src/assets/logoOne.png
new file mode 100644
index 0000000000000000000000000000000000000000..3befba1e16fdb5c61b31989c8902e71dcda19788
GIT binary patch
literal 765
zcmV<Z0s{SsP)<h;3K|Lk000e1NJLTq001BW0015c1^@s6O$r<-0008SNkl<ZNQt%A
zOQ=<46bJBM*W1mq2r0P~WDjUiDoQkv5(i2H9~BM65~4wgH4s!B=%8qzld=X1b~R@`
zY1WG%dQw`^AhW=NE=pu2m0AiBWyp%P<J{xk=X_hw{lkHC_Fmuj|9|USuXDlhw3`&-
z65NjYxCPhZ@?81{zQ-5%3?JiU$+jf|uExW-7dIA)J%m@VGlex`%FxJ+MsZk==dl!5
z6p{y~V*wt(Fh0e<wImH5xC+l=Sqsu$cn=TaaJS7+&7$k@&H%{+i|{UP?k8XrZ`K(O
z05{-`4BlD+aaYex5_yH|@e(es9&`p_1l%K&NM7L@oW=+7y9&Yxy02PB`tSHDzmI0*
zm*N!WVZ6G6wJpf^;{Lp<+4+f6ti=0;dt8bQl?N`v*O*zb@NsO#KRs+V;)$#yz3?k$
zMc^$gB!3iJ3hcJwFKq8)cV(pKP}cW;_@t1$!VbJ$V7D*?+*)AxbPMtd+X`&v4P}Ao
zg=2W@90Wv~{m{o|G-6;X{%$Zhj>qy&FKQ_ua(xq?%=@mxa214gJ>hib>pFZBMXRNN
z=zg!|>@YPe?O7cC=7DE&7C0Y7>0Q;dzV74|b`5|$a35aAg>^6M+#+XzhXz1iVPzh6
zRd*4q^T61E$t$eL>1u)}It4`O+>JFYHjTmaL<{@y#0wbd7BCHau)4)&`!mAlVqc4O
zD^kRN6LpmZF@}BDBGtac@{U3io%GehvR+|MG{MRPF)TjSf_!OLmHQ2MW~(m2Sa#qE
zQ*rd@57Vu^$YWSN((t~-6W`*tEb$Y9@KmPB&kYOr=gFJMb$H^VhWE#_E*z^Kbf;mc
zy9-CVo*zi^AA68@lH6Srn2{~_<lnddQC9~($KpJ3Al$yBWBw~ai0F)ogSaEFcmkUK
vn*D+o@h3JHwADJq+Sl`HW7-}+%Lr!xAL@i3%o<8J00000NkvXXu0mjfD57hM

literal 0
HcmV?d00001

diff --git a/jero-web/src/common/lang/en-us.js b/jero-web/src/common/lang/en-us.js
index 9fdb884bb..78034b7da 100644
--- a/jero-web/src/common/lang/en-us.js
+++ b/jero-web/src/common/lang/en-us.js
@@ -675,7 +675,7 @@ module.exports = {
   The: 'The',
   submitted: 'Data has been submitted and cannot be submitted again',
   basicInformationOfParameters: 'Basic information of parameters',
-  regulatoryCertificationTaskPlan: 'Regulatory / certification task plan',
+  regulatoryCertificationTaskPlan: 'Regulatory / Certification Task Plan',
   bringInRelevantPersonnel: 'Bring in relevant personnel',
   confirmBringInRelevantPersonnel: 'Confirm Bring in relevant personnel',
   problemType: 'Problem type',
diff --git a/jero-web/src/components/layouts/TabLayout.vue b/jero-web/src/components/layouts/TabLayout.vue
index e76180cd4..e2b49847b 100644
--- a/jero-web/src/components/layouts/TabLayout.vue
+++ b/jero-web/src/components/layouts/TabLayout.vue
@@ -93,6 +93,8 @@
           this.$route.path == '/taskListProcess' ||
           this.$route.path == '/ProjectDetails' ||
           this.$route.path == '/handshakeProcess' ||
+          this.$route.path == '/projectStatusAndProgress' ||
+          this.$route.path == '/TaskPlanList' ||
           this.$route.path == '/historicalVersion' ||
           this.$route.path == '/dashboard/analysis' ||
           this.$route.path == '/processDetails') {
diff --git a/jero-web/src/config/router.config.js b/jero-web/src/config/router.config.js
index a7dcbd3f5..e1300427f 100644
--- a/jero-web/src/config/router.config.js
+++ b/jero-web/src/config/router.config.js
@@ -372,6 +372,16 @@ export const constantRouterMap = [
     name: 'ocrSplit',
     component: () => import(/* webpackChunkName: "user" */ '@/views/documentManage/ocr/OcrSplit')
   },
+  {
+    path: '/projectStatusAndProgress',
+    name: 'projectStatusAndProgress',
+    component: () => import(/* webpackChunkName: "user" */ '@/views/projectManagement/projectStatusBoard/components/projectStatusAndProgress')
+  },
+  {
+    path: '/TaskPlanList',
+    name: 'TaskPlanList',
+    component: () => import(/* webpackChunkName: "user" */ '@/views/projectManagement/projectStatusBoard/components/TaskPlanList')
+  },
   // {
   //   path: '/',
   //   name: 'index',
diff --git a/jero-web/src/views/dashboard/components/documentDynamics.vue b/jero-web/src/views/dashboard/components/documentDynamics.vue
index eb9d495d5..d941c35b8 100644
--- a/jero-web/src/views/dashboard/components/documentDynamics.vue
+++ b/jero-web/src/views/dashboard/components/documentDynamics.vue
@@ -18,7 +18,7 @@
       </div>
       <div class="solid"></div>
     </div>
-    <div v-else style="height: 240px;position: relative">
+    <div v-else style="height: 200px;position: relative">
       <JNoData/>
     </div>
     <JLoading :loading="loading">{{$t('dataLoading')}}</JLoading>
diff --git a/jero-web/src/views/projectManagement/projectStatusBoard/components/TaskPlanList.vue b/jero-web/src/views/projectManagement/projectStatusBoard/components/TaskPlanList.vue
new file mode 100644
index 000000000..d0a509823
--- /dev/null
+++ b/jero-web/src/views/projectManagement/projectStatusBoard/components/TaskPlanList.vue
@@ -0,0 +1,13 @@
+<template>
+
+</template>
+
+<script>
+  export default {
+    name: 'TaskPlanList'
+  }
+</script>
+
+<style scoped>
+
+</style>
\ No newline at end of file
diff --git a/jero-web/src/views/projectManagement/projectStatusBoard/components/projectStatusAndProgress.vue b/jero-web/src/views/projectManagement/projectStatusBoard/components/projectStatusAndProgress.vue
new file mode 100644
index 000000000..31222304b
--- /dev/null
+++ b/jero-web/src/views/projectManagement/projectStatusBoard/components/projectStatusAndProgress.vue
@@ -0,0 +1,25 @@
+<template>
+  <div class="doc-detail">
+    <div class="Virtual-detail-header" style="position: fixed;top: 0">
+      <div class="Virtual-detail-title">
+        <span>
+             {{this.title}}
+        </span>
+      </div>
+    </div>
+    <div style="padding: 67px 0 0 0;background: #ffffff;height:100%">
+      <div class="detail-content" style="height: 100%">
+      </div>
+    </div>
+  </div>
+</template>
+
+<script>
+  export default {
+    name: 'projectStatusAndProgress'
+  }
+</script>
+
+<style scoped>
+
+</style>
\ No newline at end of file