Merge remote-tracking branch 'origin/master'

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',

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') {

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',

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>

jero-web/src/views/projectManagement/projectStatusBoard/components/TaskPlanList.vue

@@ -0,0 +1,13 @@
+<template>
+
+</template>
+
+<script>
+  export default {
+    name: 'TaskPlanList'
+  }
+</script>
+
+<style scoped>
+
+</style>

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>