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

src/views/monthlyReport/components/monthlyEards.vue

@@ -15,12 +15,12 @@
         已完成：{{ data.finishNum }}
       </div>
       <div v-for="(i, v) in data.keyProblems" :key="v">
-        <span>{{ i.name }}</span>，
+        <span>{{ `${v + 1}、${i.name}` }}</span>
         归属团队：<span>{{ i.team || '无 ' }}</span>，
         责任人：<span>{{ i.charge || '无' }}</span>
       </div>
       <div v-for="(q, index) in data.returnBackDataList" :key="index">
-        <span>{{ q.name }}</span>，
+        <span>{{ `${data.keyProblems.length + index + 1}、${q.name}` }}</span>
         <span>{{ q.team }}</span>
       </div>
     </section>
@@ -30,7 +30,7 @@
     <section class="report-content-data" style="margin-bottom: 10px;">
       <div v-if="data.lastMonthImprovmentList && !data.lastMonthImprovmentList[0]">暂无数据</div>
       <div v-for="(item, index) in data.lastMonthImprovmentList" v-else :key="index">
-          <span>{{ item.name }}</span>
+          <span>{{ `${index + 1}、${item.name}` }}</span>
           团队：<span>{{ item.team || '无' }}</span>
           进展：<span>{{ item.process || '无' }}</span>
       </div>
@@ -91,7 +91,7 @@ export default {
     justify-content: flex-start;
   }
   .report-header {
-    font-weight: 500;
+    font-weight: 600;
     line-height: 60px;
     padding: 0 20px;
     border-bottom: 1px solid #e2e2e2;

src/views/monthlyReport/index.vue

@@ -25,10 +25,9 @@
         <el-button v-if="reportStatus.status === 30" type="text" @click="jump('report_home_viewReport', '/monthlyReport/edit', { pageType: 'editAll', reportId: reportStatus.id })"> 查看完整报告</el-button>
         <el-button v-if="reportStatus.status === 0" type="text" @click="sendConfirm(reportData)"> 发送确认</el-button>
       </div>
-      <div v-show="tagData.analysisList || tagData.confirmeList || tagData.toBeConfirmList" class="report-bottom">
-        <i class="el-icon-warning report-icon-warning" />
-        <span v-if="reportStatus.status === 30 && tagData.analysisList"> 本月质量月报<b>{{ tagData.analysisList }}</b>有您负责的重点问题需要分析反馈，请点击<b>{{ tagData.analysisList }}</b>的"查看更多"按钮进入填写！</span>
-        <span v-if="tagData.confirmeList || tagData.toBeConfirmList "> 已确认业务线<b>{{ tagData.confirmeList || '无' }}</b> ，未确认业务线<b>{{ tagData.toBeConfirmList || '无' }}</b>。 </span>
+      <div v-show="reportStatus.status === 30" class="report-bottom">
+        <span v-if="tagData.analysisList"><i class="el-icon-warning report-icon-warning" /> 本月质量月报<b>{{ tagData.analysisList }}</b>有您负责的重点问题需要分析反馈，请点击<b>{{ tagData.analysisList }}</b>的"查看更多"按钮进入填写！</span>
+        <span v-if="tagData.confirmeList || tagData.toBeConfirmList "><i class="el-icon-warning report-icon-warning" /> 已确认业务线<b>{{ tagData.confirmeList || '无' }}</b> ，未确认业务线<b>{{ tagData.toBeConfirmList || '无' }}</b>。 </span>
       </div>
       <el-row :gutter="12">
         <el-col v-for="(i, k) in tagData.subReportList" :key="k" :span="innerWidth">

src/views/monthlyReport/style.less

@@ -15,9 +15,9 @@
   padding: 10px 30px 20px;
   .report-bottom {
     margin-bottom: 10px;
+    color: #FAAD14;
     b {
-      color: #333333;
-      font-weight: 500;
+      font-weight: 600;
     }
   }
   .content-reportName {
@@ -26,9 +26,6 @@
     color: #333333;
     line-height: 39px;
   }
-  .report-icon-warning {
-    color: #FAAD14;
-  }
 }
 .report-create-margin {
   padding: 0 30px;