diff --git a/jero-web/src/assets/logoOne.png b/jero-web/src/assets/logoOne.png new file mode 100644 index 000000000..3befba1e1 Binary files /dev/null and b/jero-web/src/assets/logoOne.png differ 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 @@
-
+
{{$t('dataLoading')}} 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 @@ + + + + + \ 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 @@ + + + + + \ No newline at end of file