Merge branch 'monthly_report_daily_0.0.1' into http_test

# Conflicts:
#	src/views/monthlyReport/childrenPage/editReport/components/OverallOverviewOfTheClient/qualityProcess.vue

src/views/monthlyReport/childrenPage/editReport/components/MrTable/index.vue

@@ -75,8 +75,8 @@
                       </el-dropdown-menu>
                     </el-dropdown>
                   </span>
-                  <!--链接-->
-                  <span v-else-if="btnItem.value === '链接' && isShowButton(scope.row, item)" @click.stop>
+    <!--链接-->
+        <span v-else-if="btnItem.value === '链接' && isShowButton(scope.row, item)" @click.stop>
                     <el-popover
                       v-if="scope.row.operationTarget"
                       placement="bottom-start"

src/views/monthlyReport/childrenPage/editReport/components/OverallOverviewOfTheClient/qualityProcess.vue

@@ -14,7 +14,7 @@
             class="pir"
             style="width: 100%; height: 170px"
           />
-          <div v-if="tabData && this.pieData.filter(elm => elm.total).length" style="width: 205px;color: #333">
+          <div v-if="tabData && pieData.filter(elm => elm.total).length" style="width: 205px;color: #333">
             本月{{ active }}类：
             <span v-for="(item, itemIndex ) in tabData.qualityProcessAndRdEfficiencyCopywriters" :key="itemIndex">
               <span>{{ item.type }}</span>
@@ -24,7 +24,7 @@
           </div>
         </div>
         <div class="detail-wrapper" :style="{marginTop : '10px'}">
-          <div  v-if="this.pieData.filter(elm => elm.total).length">
+          <div v-if="pieData.filter(elm => elm.total).length">
             <div
               v-for="(
                 item, itemIndex
@@ -64,7 +64,7 @@
             </div>
           </div>
         </div>
-        <div v-if="!this.pieData.filter(elm => elm.total).length" class="no-data">各业务线{{ active }}类质量流程&研发效率问题为 <span style="font-size: 16px">0</span>！</div>
+        <div v-if="!pieData.filter(elm => elm.total).length" class="no-data">各业务线{{ active }}类质量流程&研发效率问题为 <span style="font-size: 16px">0</span>！</div>
       </div>
     </boxCom>
   </div>
@@ -130,7 +130,7 @@ export default {
     },
     echartsInit() {
       this.pieData = this.tabData.qualityProcessAndRdEfficiencyCopywriters.filter(elm => elm.total)
-      const subReportDetails = this.pieData.map(elm => {return elm.subReportDetails })
+      const subReportDetails = this.pieData.map(elm => { return elm.subReportDetails })
 
       this.option = {
         color: [
@@ -233,8 +233,8 @@ export default {
       this.option.series[1].data = this.pieData.map(elm => {
         return elm.subReportDetails
       }).reduce((a, b) => a.concat(b)).filter(elm => elm.total)
-      if(this.pieData.filter(elm => elm.total).length) {
-        this.myChart.setOption(this.option)  
+      if (this.pieData.filter(elm => elm.total).length) {
+        this.myChart.setOption(this.option)
       }
     }
   }