Merge remote-tracking branch 'origin/master'

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>