新页面跳

src/views/projectManage/taskList/taskCreate.vue

@@ -222,6 +222,7 @@ export default {
           this.typeString = this.bizIdEnumList.filter(value => value.code === this.form.bizId)[0].child
           this.businessTypeShow = true
           this.businessTypeStr = this.typeString.filter(value => value.code === this.form.type)[0].child
+          this.getMember() // 保证bizId存在
         } else {
           this.errorFun(res.msg)
         }
@@ -232,7 +233,6 @@ export default {
       projectGetTypeMap().then(res => {
         if (res.code === 200) {
           this.bizIdEnumList = res.data
-          this.getMember() // 保证bizId存在
         } else {
           this.errorFun(res.msg)
         }
@@ -261,13 +261,11 @@ export default {
       this.objDataPM = { bizId: this.form.bizId, email: '', role: 'pm' }
       this.objDataRD = { bizId: this.form.bizId, email: '', role: 'rd' }
       this.objDataQA = { bizId: this.form.bizId, email: '', role: 'qa' }
-      this.objDataFOCUS = { bizId: this.form.bizId, email: '' }
-      axios.all([teamMembers(this.objDataPM), teamMembers(this.objDataRD), teamMembers(this.objDataQA), teamMembers(this.objDataFOCUS)]).then(axios.spread((resPM, resRD, resQA, resFOCUS) => {
-        if (resPM.code === 200 && resRD.code === 200 && resQA.code === 200 && resFOCUS.code === 200) {
+      axios.all([teamMembers(this.objDataPM), teamMembers(this.objDataRD), teamMembers(this.objDataQA)]).then(axios.spread((resPM, resRD, resQA) => {
+        if (resPM.code === 200 && resRD.code === 200 && resQA.code === 200) {
           this.optionsPM = resPM.data
           this.optionsRD = resRD.data
           this.optionsQA = resQA.data
-          this.optionsFOCUS = resFOCUS.data
         } else {
           this.errorFun('人员数据获取失败')
         }

src/views/projectManage/taskList/taskUpdateCreate.vue

@@ -225,9 +225,6 @@ export default {
           if (this.form.qa) {
             this.form.qa = this.form.qa.split(',')
           }
-          if (this.form.focusPenson) {
-            this.form.focusPenson = this.form.focusPenson.split(',')
-          }
           if (this.form.clientType) {
             this.businessTypeShow = true
             this.businessTypeStr = this.typeString.filter(value => value.code === this.form.type)[0].child
@@ -260,13 +257,11 @@ export default {
       this.objDataPM = { bizId: this.form.bizId, email: '', role: 'pm' }
       this.objDataRD = { bizId: this.form.bizId, email: '', role: 'rd' }
       this.objDataQA = { bizId: this.form.bizId, email: '', role: 'qa' }
-      this.objDataFOCUS = { bizId: this.form.bizId, email: '' }
-      axios.all([teamMembers(this.objDataPM), teamMembers(this.objDataRD), teamMembers(this.objDataQA), teamMembers(this.objDataFOCUS)]).then(axios.spread((resPM, resRD, resQA, resFOCUS) => {
-        if (resPM.code === 200 && resRD.code === 200 && resQA.code === 200 && resFOCUS.code === 200) {
+      axios.all([teamMembers(this.objDataPM), teamMembers(this.objDataRD), teamMembers(this.objDataQA)]).then(axios.spread((resPM, resRD, resQA, resFOCUS) => {
+        if (resPM.code === 200 && resRD.code === 200 && resQA.code === 200) {
           this.optionsPM = resPM.data
           this.optionsRD = resRD.data
           this.optionsQA = resQA.data
-          this.optionsFOCUS = resFOCUS.data
         } else {
           this.errorFun('人员数据获取失败')
         }

src/views/quality/qualityDefectProcess.vue

@@ -6,11 +6,11 @@
         <el-link type="primary">指标计算指南</el-link>
       </div>
       <div class="title-search-output">
-        <div>线下缺陷</div>
+        <h4>线下缺陷</h4>
         <div class="search-output">
-          <el-input v-model="input" style="margin-right:5px" />
-          <el-button plain type="info" style="margin-right:35px">搜索</el-button>
-          <el-button type="primary">导出</el-button>
+          <el-input v-model="input" size="medium" style="margin-right:5px" />
+          <el-button plain type="info" size="medium" style="margin-right:35px">搜索</el-button>
+          <el-button size="medium" type="primary">导出</el-button>
         </div>
       </div>
       <el-table
@@ -159,6 +159,10 @@ export default {
         align-items center
         justify-content space-between
         margin 15px 0
+        h4
+          border-left 4px solid #4665b2
+          padding-left 10px
+          color #5A738E
         .search-output
           display flex
           justify-content space-around

src/views/quality/qualityMeasurement.vue

@@ -67,7 +67,7 @@
                   <template slot-scope="scope"><a href="javascript:void(0)" style="color:#20a0ff" @click="toReportView('2')">{{ scope.row.rollbackNum }}</a></template>
                 </el-table-column>
                 <el-table-column
-                  prop="name"
+                  prop="noTestRollback"
                   label="免提测回滚数"
                   style="width:20%;"
                   align="center"
@@ -84,7 +84,7 @@
                   style="width:20%;"
                   align="center"
                 >
-                  <template slot-scope="scope"><a href="javascript:void(0)" style="color:#20a0ff" @click="toReportView('4')">{{ scope.row.preLess5Min }}</a></template>
+                  <template slot-scope="scope"><a href="javascript:void(0)" style="color:#20a0ff" @click="toReportView('4')">{{ scope.row.smallRollbackNum }}</a></template>
                 </el-table-column>
                 <el-table-column
                   label="全量回滚数"
@@ -103,23 +103,26 @@
               size="mini"
             >
               <el-table-column
-                prop="name"
                 label="预发具备率"
                 align="center"
                 width="calc(10/9)%"
-              />
+              >
+                <template slot-scope="scope">{{ scope.row.isHavePrePercent | toPercent }}</template>
+              </el-table-column>
               <el-table-column
-                prop="name"
                 label="有预发不走预发占比"
                 align="center"
                 width="110"
-              />
+              >
+                <template slot-scope="scope">{{ scope.row.skipPreIfHavaPercent | toPercent }}</template>
+              </el-table-column>
               <el-table-column
-                prop="name"
                 label="被动免提测率"
                 align="center"
                 width="calc(10/9)%"
-              />
+              >
+                <template slot-scope="scope">{{ scope.row.passiveNoTestPercent | toPercent }}</template>
+              </el-table-column>
               <el-table-column
                 label="免提测上线占比"
                 align="center"
@@ -135,11 +138,12 @@
                 <template slot-scope="scope">{{ scope.row.rollbackPercent | toPercent }}</template>
               </el-table-column>
               <el-table-column
-                prop="name"
                 label="免提测回滚占比"
                 align="center"
                 width="calc(10/9)%"
-              />
+              >
+                <template slot-scope="scope">{{ scope.row.noTestRollbackPercent | toPercent }}</template>
+              </el-table-column>
               <el-table-column
                 label="预发回滚率"
                 align="center"
@@ -152,7 +156,7 @@
                 align="center"
                 width="75"
               >
-                <template slot-scope="scope">{{ scope.row.preLess5MinPercent | toPercent }}</template>
+                <template slot-scope="scope">{{ scope.row.smallRollbackNumPercent | toPercent }}</template>
               </el-table-column>
               <el-table-column
                 label="全量回滚率"
@@ -174,14 +178,15 @@
                 style="width:25%;"
                 align="center"
               >
-                <template slot-scope="scope">{{ scope.row.name | toPercent }}</template>
+                <template slot-scope="scope">{{ scope.row.preLess5MinPercent | toPercent }}</template>
               </el-table-column>
               <el-table-column
-                prop="name"
                 label="小流量停留<5min占比"
                 style="width:25%;"
                 align="center"
-              />
+              >
+                <template slot-scope="scope">{{ scope.row.smallLess5MinPercent | toPercent }}</template>
+              </el-table-column>
               <el-table-column
                 prop="name"
                 label="裸奔上线占比"
@@ -313,7 +318,7 @@
                   width="40"
                   align="center"
                 >
-                  <template slot-scope="scope">{{ scope.row.totalP0 | toFull }}</template>
+                  <template slot-scope="scope">{{ scope.row.totalP0 | toPercent }}</template>
                 </el-table-column>
                 <el-table-column
                   prop="totalP1"
@@ -462,17 +467,12 @@ import { getBusiness, getDepartment, getOnlineProblem, getOnlineAllCount, getOnl
 export default {
   filters: {
     toPercent(value) {
-      if (!value) {
-        return '-'
-      } else {
+      if (value) {
         return Number(value * 100).toFixed(2) + '%'
-      }
-    },
-    toFull(value) {
-      if (value === null) {
-        return '-'
+      } else if (value === 0) {
+        return 0
       } else {
-        return value
+        return '-'
       }
     }
   },
@@ -574,6 +574,7 @@ export default {
         })
         this.loadingOnlineProcess = false
       } else if (this.activeIndexSecondary === 'first') {
+        this.loadingOnlineProcess = true
         this.deleteAfter()
       } else {
         this.errorFun('获取数据失败')
@@ -591,6 +592,7 @@ export default {
     handleSelect(key) {
       if (key === '0') {
         this.pauseKey = key
+        this.activeIndexSecondary = 'first'
         this._initBusinessTreeAndBeginInfo()
       } else if (key === '3') {
         this.pauseKey = key
@@ -600,10 +602,24 @@ export default {
       }
     },
     toReportView(e) {
-      this.$router.push({ name: '上线过程', query: { id: this.pauseTreeNode.id, type: this.pauseKey, dataType: e, startTime: this.timeInterval[0], endTime: this.timeInterval[1] }})
+      // 新页面跳转
+      const { href } = this.$router.resolve({
+        name: '上线过程',
+        query: {
+          id: this.pauseTreeNode.id, type: this.pauseKey, dataType: e, startTime: this.timeInterval[0], endTime: this.timeInterval[1]
+        }
+      })
+      window.open(href, '_blank')
     },
     toDefectView() {
-      this.$router.push({ name: '缺陷过程', query: { id: this.pauseTreeNode.id, type: this.pauseKey, startTime: this.timeInterval[0], endTime: this.timeInterval[1] }})
+      // 新页面跳转
+      const { href } = this.$router.resolve({
+        name: '缺陷过程',
+        query: {
+          id: this.pauseTreeNode.id, type: this.pauseKey, startTime: this.timeInterval[0], endTime: this.timeInterval[1]
+        }
+      })
+      window.open(href, '_blank')
     },
     // 业务树
     handleNodeClick(data) {

src/views/quality/qualityProcess.vue

@@ -6,13 +6,14 @@
         <el-link type="primary">指标计算指南</el-link>
       </div>
       <div class="title-search-output">
-        <div>上线过程</div>
+        <h4>上线过程</h4>
         <div class="search-output">
-          <el-input v-model="input" style="margin-right:5px" />
-          <el-button plain type="info" style="margin-right:35px">搜索</el-button>
-          <el-button type="primary">导出</el-button>
+          <el-input v-model="input" size="medium" style="margin-right:5px" />
+          <el-button plain type="info" size="medium" style="margin-right:35px">搜索</el-button>
+          <el-button size="medium" type="primary">导出</el-button>
         </div>
       </div>
+      <el-divider />
       <el-table
         :data="tableData"
         border
@@ -23,15 +24,15 @@
           prop="model"
           label="模块"
           align="center"
-          width="100"
         />
         <el-table-column
           prop="odinId"
           label="上线单号"
           align="center"
+          width="70"
         />
         <el-table-column
-          prop="gitProject"
+          prop="name"
           label="项目名称"
           align="center"
         />
@@ -65,6 +66,7 @@
           prop="step"
           label="上线阶段"
           align="center"
+          width="70"
         />
         <el-table-column
           label="预发停留时长"
@@ -77,7 +79,7 @@
           label="小流量停留时长"
           align="center"
         >
-          <template slot-scope="scope">{{ scope.row.preStayTime | judgeNull }}</template>
+          <template slot-scope="scope">{{ scope.row.smallStayTime | judgeNull }}</template>
         </el-table-column>
         <el-table-column
           prop="odinStatus"
@@ -168,13 +170,19 @@ export default {
         display flex
         align-items center
         justify-content space-between
-        margin 15px 0
+        margin 15px 0px 0px 0px
+        h4
+          border-left 4px solid #4665b2
+          padding-left 10px
+          color #5A738E
         .search-output
           display flex
           justify-content space-around
     .block >>> th
       background-color #F1F4F7 !important
       font-size 10px
+    .block >>> .el-divider--horizontal
+      margin 0 0 10px 0
     .block >>> .el-table__body-wrapper  .cell
       font-size 10px
       white-space nowrap