Merge remote-tracking branch 'origin/http_test' into http_test

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

@@ -12,9 +12,9 @@
             class="pir"
             style="width: 100%; height: 160px"
           />
-          
+
         </div>
-<div  class="detail-wrapper">
+<div class="detail-wrapper">
           <div v-if="tabData && pieData.length">
           <div class="fontWeight" style="margin-bottom: 10px;">{{ tabData.title }}</div>
           <div
@@ -38,7 +38,7 @@
           </div>
         </div>
 </div>
-        <div class="no-data" v-if="!pieData.length">各业务线{{active}}类线上问题为 <span style="font-size: 16px">0</span>！</div>
+        <div v-if="!pieData.length" class="no-data">各业务线{{ active }}类线上问题为 <span style="font-size: 16px">0</span>！</div>
       </div>
     </boxCom>
   </div>
@@ -106,8 +106,8 @@ export default {
           trigger: 'item'
         },
         label: {
-            position: 'inner',
-            fontSize: 12,
+          position: 'inner',
+          fontSize: 12
         },
         series: [
           {
@@ -142,9 +142,9 @@ export default {
       this.tabData = this.pageData.filter(
         (elm) => elm.clientType === this.active
       )[0]
-      console.log(this.tabData);
-      console.log(this.tabData.onlineProblemCopywriters);
-      
+      console.log(this.tabData)
+      console.log(this.tabData.onlineProblemCopywriters)
+
       this.pieData = this.tabData.onlineProblemCopywriters.filter(elm => elm.total)
       this.option.series[0].data = this.pieData
       this.myChart.setOption(this.option)

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

@@ -179,7 +179,7 @@ export default {
             // data: this.subIndex > -1 && this.tabData.qualityProcessAndRdEfficiencyCopywriters[this.subIndex].subReportDetails,
             data: this.tabData.qualityProcessAndRdEfficiencyCopywriters.map(elm => {
               return elm.subReportDetails
-            }).reduce((a, b) => a.concat(b)).filter(elm=>elm.total),
+            }).reduce((a, b) => a.concat(b)).filter(elm => elm.total),
             emphasis: {
               itemStyle: {
                 shadowBlur: 0,
@@ -227,7 +227,7 @@ export default {
       this.option.series[0].data = this.tabData.qualityProcessAndRdEfficiencyCopywriters
       this.option.series[1].data = this.tabData.qualityProcessAndRdEfficiencyCopywriters.map(elm => {
         return elm.subReportDetails
-      }).reduce((a, b) => a.concat(b)).filter(elm=>elm.total)
+      }).reduce((a, b) => a.concat(b)).filter(elm => elm.total)
       this.myChart.setOption(this.option)
     }
   }

src/views/projectManage/projectList/components/modifySchedule.vue

@@ -15,7 +15,7 @@
           <div v-show="form.dayList.length > 0 ">
             <span>{{ schedule }}（用时<span class="blue">{{ detailDayList.length }}</span>天）</span>
             <el-tooltip class="item" effect="dark" content="检查设置的人员在设置时间内是否存在其他排期！" placement="top">
-              <svg-icon :icon-class="icon_problem ? 'problem1' : 'problem'" style="cursor: pointer;" @mouseenter="icon_problem = true" @mouseleave="icon_problem = false" @click="checkSchedule" />
+              <svg-icon icon-class="problem1" style="cursor: pointer;margin-left: 20px;" @click="checkSchedule" />
             </el-tooltip>
           </div>
           <div v-show="form.dayList.length <= 0 " class="empty-schedule">添加排期</div>
@@ -206,7 +206,6 @@ export default {
   data() {
     return {
       tips: {},
-      icon_problem: false,
       dangerImg: danger,
       form_rules: {
         type: [{ required: true, message: '事件类型不能为空', trigger: 'blur' }],

src/views/projectManage/projectList/components/scheduledMember.vue

@@ -12,10 +12,9 @@
               <div class="projected-type">
                 类型：<span>{{ i.scheduleName }}</span>
                 时间：<span style="min-width: 200px;">{{ i.startDateStr }} - {{ i.endDateStr }}</span>
-                任务：<span v-for="(s, num) in i.tasks" :key="s.taskId">
-                    <span class="projected-hover" @click="jump(s)">
-                      {{ s.name }}
-                      <span v-if="num < (s.length - 1)">，</span>
+                任务：<span v-for="(s, num) in i.tasks" :key="s.taskId" style="min-width: 10px;margin-right:0;">
+                    <span class="projected-hover" style="margin-right:0;" @click="jump(s)">
+                      {{ s.name }}<b v-if="num < i.tasks.length - 1">，</b>
                     </span>
                   </span>
               </div>