Merge branch 'monthly_report_daily_bug_0.0.1' into http_mock

src/components/dialog/normalDialog.vue

@@ -149,11 +149,11 @@ export default {
   content: ' ';
   display: inline-block;
   position: absolute;
-  top: 2px;
+  top: 3px;
   left: 0;
-  width: 5px;
-  height: 20px;
-  border-radius: 2px;
+  width: 4px;
+  height: 16px;
+  border-radius: 1px;
   background-color: rgb(64, 158, 255);
 }
 </style>

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

@@ -3,11 +3,9 @@
     {{ title }} - 
     <div v-for="(item, index) in subTitle" :key="index" class="item">
       <div v-if="isShowItem(item.copywriter)">
-        {{ item.copywriter }}
-        <div :class="{ red: isShowColor(item.copywriter, item.label) }">
-          <span class="fontWeight">{{ item.label }}</span>
+        {{ item.copywriter }}<div :class="{ red: isShowColor(item.copywriter, item.label) }"><span class="fontWeight">{{ item.label }}</span>
           <div v-if="isShow(item.copywriter)">%</div>
-        </div>
+        </div><span v-if="item.copywriter !== '全量回滚率' && item.copywriter !== '裸奔上线率'">次</span>
         <div v-if="index < subTitle.length - 1">{{ item.copywriter.search(/发布次数|全量回滚率/) > -1 ? '；' : isComma(item.copywriter) }}</div>
       </div>
     </div>

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

@@ -1,5 +1,5 @@
 <template>
-  <span style="margin-left: 5px" @click.stop>
+  <span @click.stop>
     <!-- 月报数据重新拉取 -->
     <normal-dialog
       ref="dialogRefresh"
@@ -7,7 +7,7 @@
       is-succes
       :show-dialog="false"
       :title="dialogTitle"
-      width="300px"
+      width="420px"
       @succes="refreshReport()"
     >
       <div class="report-delete">

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">{{ 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" :class="[item.label > 24 ? 'query-colors' : '' ]">{{ 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">{{ item.label }}</span>次。</span>
+        <span v-if="index === 5">Reopen<span class="fontWeight" :class="[item.label !== '0' ? 'query-colors' : '' ]">{{ 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,6 +106,10 @@ export default {
 }
 </script>
 <style scoped lang="less">
+.fontWeight {
+  color: #333;
+  font-weight: 500;
+}
 .query-bug{
   color: #333;
 }
@@ -119,8 +123,5 @@ export default {
 /deep/.el-drawer__body{
   width: 50vw;
 }
-.fontWeight {
-  color: #333;
-  font-weight: 500;
-}
+
 </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" :title="baseData.title" :tab-key="tabKey" :active-name="activeName" :dom-key="baseData.domKey" />
+      <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" />
       </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" :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" :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>
     </div>
     <div

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

@@ -6,15 +6,15 @@
       :show-dialog="false"
       is-succes
       :title="titleName"
-      width="400px"
+      width="45%"
       @succes="updateModule"
     >
-      <el-form label-width="100px" style="padding-right: 20px">
+      <el-form label-width="100px" style="padding-right: 20px;padding-left: 20px">
         <el-form-item label="问题">
           <el-input
             v-model="normalAreaName"
             autocomplete="off"
-            size="mini"
+            size="small"
             maxlength="100"
             show-word-limit
             placeholder="请输入问题"
@@ -122,4 +122,10 @@ export default {
 /deep/ .el-form-item__label {
   text-align: left!important;
 }
+.el-form-item{
+  margin-bottom: 10px;
+}
+/deep/.el-dialog__body{
+  padding-bottom: 0
+}
 </style>

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

@@ -74,31 +74,31 @@
       </div>
     </div>
     <!-- 月报发送确认 -->
-    <normal-dialog ref="dialogDelete" is-succes :show-dialog="false" :title="'删除月报'" width="300px" @succes="deleteReport('删除')" @cancel="deleteReport('取消')">
+    <normal-dialog ref="dialogDelete" is-succes :show-dialog="false" :title="'删除月报'" width="420px" @succes="deleteReport('删除')" @cancel="deleteReport('取消')">
       <div class="report-delete">
         确认删除当前月报？
       </div>
     </normal-dialog>
     <!-- 月报取消 -->
-    <normal-dialog ref="dialogCancel" is-succes :show-dialog="false" :title="'取消月报'" width="320px" @succes="$router.push({ path: '/monthlyReport/index' });window.log({ c: 'report_edit', d: 'report_edit_cancel' })" @cancel="$refs.dialogCancel.visible = false">
+    <normal-dialog ref="dialogCancel" is-succes :show-dialog="false" :title="'取消月报'" width="420px" @succes="$router.push({ path: '/monthlyReport/index' });window.log({ c: 'report_edit', d: 'report_edit_cancel' })" @cancel="$refs.dialogCancel.visible = false">
       <div class="report-delete">
         取消后填写的数据将不会保存，是否确认？
       </div>
     </normal-dialog>
     <!-- 月报发送确认 -->
-    <normal-dialog ref="dialogSend" is-succes :show-dialog="false" :title="'发送确认'" width="300px" @succes="sendReport" @cancel="sendReport('取消')">
+    <normal-dialog ref="dialogSend" is-succes :show-dialog="false" :title="'发送确认'" width="420px" @succes="sendReport" @cancel="sendReport('取消')">
       <div class="report-delete">
         确认发送当前月报？
       </div>
     </normal-dialog>
     <!-- 月报发布确认 -->
-    <normal-dialog ref="dialogPublishAll" is-succes :show-dialog="false" :title="'发送确认'" width="300px" @succes="publishAllReport">
+    <normal-dialog ref="dialogPublishAll" is-succes :show-dialog="false" :title="'发送确认'" width="420px" @succes="publishAllReport">
       <div class="report-delete">
         月报数据已检查无误，确认发布？
       </div>
     </normal-dialog>
     <!-- 月报确认 -->
-    <normal-dialog ref="dialogConfirm" is-succes :show-dialog="false" :title="'确认月报'" width="300px" @succes="confirmReport">
+    <normal-dialog ref="dialogConfirm" is-succes :show-dialog="false" :title="'确认月报'" width="420px" @succes="confirmReport">
       <div class="report-delete">
         确认数据已填写无误，进行月报确认吗？
       </div>
@@ -476,7 +476,7 @@ export default {
   }
 }
 
-.report-delete {
+/deep/.report-delete {
   text-align: center;
 }