Browse Source

月报2.0改造(1.6)

洪海涛 4 years ago
parent
commit
783f7434fb

+ 2 - 2
src/store/modules/monthlyReport/edit/index.js

@@ -921,7 +921,7 @@ export default {
           res.data.content[0].tableHeaders
         )
       }
-      if (title.search(/上月问题跟进|发布&回滚|线上问题/) > -1) {
+      if (title.search(/上月问题跟进|发布&回滚|线上问题|项目延期提测|项目提测打回/) > -1) {
         const contentIndex = title === '线上问题' ? 1 : 0
         setTableHeader(res.data.content[contentIndex].tableHeaders)
         res.data.content[contentIndex].tableRows = arrToObj(
@@ -965,7 +965,7 @@ export default {
             }
             if (elm.content && elm.content.length) {
               elm.content.forEach((item) => {
-                if (title.search(/上月问题跟进|发布&回滚|线上问题/) > -1) {
+                if (title.search(/上月问题跟进|发布&回滚|线上问题|项目延期提测|项目提测打回/) > -1) {
                   item.content = [...res.data.content]
                   // console.log(item, 957)
                   // console.log(res.data, [...res.data.content], 958)

+ 1 - 1
src/views/monthlyReport/childrenPage/editReport/components/Refresh.vue

@@ -59,7 +59,7 @@ export default {
     return {
       animateClass: '',
       dialogTitle: '重新拉取数据',
-      pullDataAgainTitle: ['上月问题跟进', '线上问题', '线下缺陷', '发布&回滚']
+      pullDataAgainTitle: ['上月问题跟进', '线上问题', '线下缺陷', '发布&回滚', '延期 - 项目延期提测{param}次,延期发布{param}次', '提测打回/准出不通过 - 项目提测打回{param}次,准出不通过{param}次']
     }
   },
   computed: {

+ 10 - 4
src/views/monthlyReport/childrenPage/editReport/components/SubTitle.vue

@@ -38,7 +38,7 @@ export default {
       requireList: {},
       bugPriority: ['全部', 'P0', 'P1', 'P1以上'],
       bugPrioritys: ['全部', 'P0&P1', 'P1以上'],
-      bugHour: ['全部修复', '24小时内修复', '修复时长超过24小时']
+      bugHour: ['全部修复', '24小时内修复', '修复时长超过24小时', '未修复']
     }
   },
   watch: {
@@ -75,8 +75,8 @@ export default {
         const yaxis = data.reportBugs.map(item => { return item.id })
         this.requireList = { toType: '缺陷', title: '累计reopen', yaxis: yaxis, idList: yaxis }
       } else if (index === 4) {
-        let [one, tow, three] = [[], [], []]
-        const [a, s, d, f, g, h, j, k, l] = [[], [], [], [], [], [], [], [], []]
+        let [one, tow, three, four] = [[], [], [], []]
+        const [a, s, d, f, g, h, j, k, l, z, x, c] = [[], [], [], [], [], [], [], [], []]
         if (data.reportBugs[0]) {
           data.reportBugs.map(item => {
             if (item.isRepaired && item.repairTime < 24) { // 24小时内修复
@@ -91,13 +91,19 @@ export default {
               if (item.priority > 1) { d.push(item.id) }
               three = [a, s, d]
             }
+            if (item.isRepaired && item.status === 0) { // 未修复
+              z.push(item.id)
+              if (item.priority < 2) { x.push(item.id) }
+              if (item.priority > 1) { c.push(item.id) }
+              four = [z, x, c]
+            }
             j.push(item.id)
             if (item.priority < 2) { k.push(item.id) }
             if (item.priority > 1) { l.push(item.id) }
             tow = [j, k, l]
           })
         }
-        const yaxis = [tow, one, three]
+        const yaxis = [tow, one, three, four]
         this.requireList = { toType: '缺陷', xaxis: this.bugHour, towTimeLine: this.bugPrioritys, title: '缺陷24小时修复', yaxis: yaxis, dataIndex: 1 }
       }
       this.openDrawer = true

+ 1 - 2
src/views/monthlyReport/childrenPage/editReport/components/core.vue

@@ -67,7 +67,7 @@
       <OnlineQuestion
         v-if="headerTitle.indexOf('线上问题') > -1"
         :sub-title="baseData.subTitles"
-        style="margin-bottom: 10px" />
+        style="margin-bottom: 10px" /><span v-if="baseData.title.search(/提测打回|增发/) > -1">。</span>
       <Refresh
         v-if="pageDate && pageDate.status < 20"
         slot="refresh"
@@ -79,7 +79,6 @@
         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
       v-if="baseData.content && baseData.content.length"