Merge branch 'monthly_report_daily_bug_0.0.2' into http_mock

src/views/monthlyReport/childrenPage/editReport/components/PushAndBanck.vue

@@ -99,6 +99,6 @@ export default {
 }
 .fontWeight {
   // color: #333;
-  font-weight: 500;
+  font-weight: 600;
 }
 </style>

src/views/monthlyReport/childrenPage/editReport/components/SubTitle.vue

@@ -4,10 +4,10 @@
       <span class="query-bug" @click.stop="query(item, index)">
         <span v-if="index === 0">新增bug<span class="fontWeight">{{ item.label }}</span>个，</span>
         <span v-if="index === 1">其中P0 bug数<span class="fontWeight" :class="[item.label !== '0' ? 'query-colors' : '' ]">{{ item.label }}</span>个，</span>
-        <span v-if="index === 2">P1 bug数<span class="fontWeight">{{ item.label }}</span>个；</span>
-        <span v-if="index === 3">P0&P1平均修复时长<span class="fontWeight" :class="[item.label > 24 ? 'query-colors' : '' ]">{{ item.label }}h</span>；</span>
+        <span v-if="index === 2">P1 bug数 <span class="fontWeight">{{ item.label }}</span>个；</span>
+        <span v-if="index === 3">P0&P1平均修复时长<span class="fontWeight">{{ item.label }}H</span>；</span>
         <span v-if="index === 4">过夜率<span class="fontWeight">{{ item.label }}%</span>；</span>
-        <span v-if="index === 5">Reopen<span class="fontWeight" :class="[item.label !== '0' ? 'query-colors' : '' ]">{{ item.label }}</span>次。</span>
+        <span v-if="index === 5">Reopen<span class="fontWeight">{{ item.label }}</span>次。</span>
       </span>
       <!-- 新增bug 78个，其中P0 bug数XX（标红）个，P1 bug数XX个；P0&P1平均修复时长 23.8H；P0&P1 24小时修复率70.0%；reopen XX次。 -->
     </span>
@@ -106,10 +106,6 @@ export default {
 }
 </script>
 <style scoped lang="less">
-.fontWeight {
-  color: #333;
-  font-weight: 500;
-}
 .query-bug{
   color: #333;
 }
@@ -123,5 +119,8 @@ export default {
 /deep/.el-drawer__body{
   width: 50vw;
 }
-
+.fontWeight {
+  color: #333;
+  font-weight: 600;
+}
 </style>

src/views/monthlyReport/childrenPage/editReport/components/core.vue

@@ -6,7 +6,7 @@
         :title="baseData.title"
         @click.native.stop="baseDataShow"
       >
-      <Refresh v-if="pageDate && pageDate.status < 20" slot="refresh" style="margin-left: 5px" :title="baseData.title" :tab-key="tabKey" :active-name="activeName" :dom-key="baseData.domKey" />
+      <Refresh v-if="pageDate && pageDate.status < 20" slot="refresh" :title="baseData.title" :tab-key="tabKey" :active-name="activeName" :dom-key="baseData.domKey" />
       </headTitle>
     </div>
     <div
@@ -48,7 +48,7 @@
         }"
         v-html="headerTitle"
       />
-      <span v-if="baseData.title.search(/延期|发布&回滚/) > -1">。</span><Refresh v-if="pageDate && pageDate.status < 20" slot="refresh" :style="{marginLeft:baseData.title.search(/线上问题/) > -1 ? '5px' : ''}" :title="baseData.title" :dom-key="baseData.domKey" /><span><el-button v-if="headerTitle.indexOf('线下缺陷') > -1 && pageDate.status < 20" type="text" style="margin-left: 5px" @click.stop="marking">标记</el-button></span>
+      <span v-if="baseData.title.search(/延期|发布&回滚/) > -1">。</span><Refresh v-if="pageDate && pageDate.status < 20" slot="refresh" :title="baseData.title" :dom-key="baseData.domKey" /><span><el-button v-if="headerTitle.indexOf('线下缺陷') > -1 && pageDate.status < 20" type="text" style="margin-left: 5px;font-weight: 400;" @click.stop="marking">标记</el-button></span>
       <span v-if="baseData.title.search(/提测打回/) > -1">。</span>
     </div>
     <div