Просмотр исходного кода

提测打回时打回原因必填

wenbobowen 4 лет назад
Родитель
Сommit
c2d92a227d

+ 3 - 0
src/api/ResultPage.js

@@ -43,6 +43,7 @@ export function launchTestSendmail(data) {
   return request({
     url: Presentation + '/launchTest/sendmail',
     method: 'post',
+    timeout: '10000',
     data
   })
 }
@@ -51,6 +52,7 @@ export function projectTestReportSendmail(data) {
   return request({
     url: Presentation + '/projectTestReport/sendmail',
     method: 'post',
+    timeout: '10000',
     data
   })
 }
@@ -60,6 +62,7 @@ export function dailyReportSendmail(data) {
   return request({
     url: Presentation + '/dailyReport/sendmail',
     method: 'post',
+    timeout: '10000',
     data
   })
 }

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

@@ -70,7 +70,7 @@ export default {
         this.requireList = { toType: '缺陷', xaxis: this.bugPriority, title: '新增缺陷', yaxis: yaxis, dataIndex: index }
       } else if (index === 3) {
         const yaxis = this.setList(data, index)
-        this.requireList = { toType: '缺陷', xaxis: this.bugPrioritys, title: '缺陷修复时长', yaxis: yaxis, dataIndex: 0 }
+        this.requireList = { toType: '缺陷', xaxis: this.bugPrioritys, title: '缺陷修复时长', yaxis: yaxis, dataIndex: 1 }
       } else if (index === 5) {
         const yaxis = data.reportBugs.map(item => { return item.id })
         this.requireList = { toType: '缺陷', title: '累计reopen', yaxis: yaxis, idList: yaxis }
@@ -79,7 +79,7 @@ export default {
         const [a, s, d, f, g, h, j, k, l] = [[], [], [], [], [], [], [], [], []]
         if (data.reportBugs[0]) {
           data.reportBugs.map(item => {
-            if (item.isRepaired && item.repairTime < 24) { // 24小时内修复
+            if (item.isRepaired && Number(item.repairTime) < 24) { // 24小时内修复
               f.push(item.id) // 全部
               if (item.priority < 2) { g.push(item.id) } // P0&P1
               if (item.priority > 1) { h.push(item.id) } // P1以上

+ 1 - 1
src/views/workbench/components/searchSection.vue

@@ -134,7 +134,7 @@ export default {
   methods: {
     async queryTeamMember() { // 获取团队人员
       if (this.workbench === '团队' || this.workbench === '团队忙碌' || this.workbench === '团队空闲') {
-        const res = await queryTeamMember({ teamIds: this.searchForm.teamIds, deptCode: this.searchForm.deptCode })
+        const res = await queryTeamMember({ teamIds: this.searchForm.teamIds, deptCodes: this.searchForm.deptCodes })
         if (res.code === 200) {
           res.data = res.data || []
           this.memberList = this.handleMember(res.data)

+ 2 - 4
src/views/workbench/team/index.vue

@@ -375,7 +375,6 @@ export default {
       this.departmentName = this.department[0].label
     },
     changeTeam(command) {
-      console.log(command, '团队')
       if (command.length > 0) {
         let [a, b, stop] = ['', '', true]
         command.map(e => {
@@ -393,7 +392,6 @@ export default {
           })
         })
         const arr = command[0]
-        console.log(this.datas, 'njdibcjbcjsdi')
         if (this.teamData.teamCode === 0 && arr[0] === -1) { // 默认全选
           this.teamData = { teamBizName: '团队', teamNames: [...this.datas], teamCode: 1 }
           const list = this.datas.slice(1)
@@ -415,9 +413,9 @@ export default {
             this.searchForm.teamIds = list.map(item => { return item[1] })
           } else if (arr[0] !== -1) { // 基础多选
             this.teamData.teamNames = command
+            const data = command.map(i => { return i[1] })
             this.teamData.teamBizName = a + (b ? ' / ' + b : '')
-            const list = this.datas.slice(1)
-            this.searchForm.teamIds = list.map(item => { return item[1] })
+            this.searchForm.teamIds = data
           }
         }
       } else {