Merge remote-tracking branch 'origin/monthly_report_daily_0.0.1' into monthly_report_daily_0.0.1

src/views/monthlyReport/components/monthlyEards.vue

@@ -16,8 +16,7 @@
       </div>
       <div v-for="(i, v) in data.keyProblems" :key="v">
         <span>{{ `${v + 1}、${i.name}` }}</span>
-        归属团队：<span>{{ i.team || '无 ' }}</span>，
-        责任人：<span>{{ i.charge || '无' }}</span>
+        归属：<span>{{ i.team + '团队' || '无 ' }} - {{ i.charge || '无' }}</span>
       </div>
       <div v-for="(q, index) in data.returnBackDataList" :key="index">
         <span>{{ `${data.keyProblems.length + index + 1}、${q.name}` }}</span>
@@ -27,12 +26,12 @@
     <div class="report-title">
       <svg-icon class="report-icon-title" icon-class="icon-yellow" />上月改进
     </div>
-    <section class="report-content-data" style="margin-bottom: 10px;">
+    <section class="report-content-data" style="margin-bottom: 20px;">
       <div v-if="data.lastMonthImprovmentList && !data.lastMonthImprovmentList[0]">暂无数据</div>
       <div v-for="(item, index) in data.lastMonthImprovmentList" v-else :key="index">
           <span>{{ `${index + 1}、${item.name}` }}</span>
-          团队：<span>{{ item.team || '无' }}</span>
-          进展：<span>{{ item.process || '无' }}</span>
+          归属团队：<span>{{ item.team || '无' }}</span>
+          达成情况：<span>{{ item.process || '无' }}</span>
       </div>
     </section>
   </el-card>
@@ -97,7 +96,7 @@ export default {
     border-bottom: 1px solid #e2e2e2;
   }
   .report-title {
-    padding: 20px 20px 5px;
+    padding: 10px 20px 5px;
     display: flex;
     align-items: center;
     .report-icon-title {