Merge branch 'wangzi_dev' into http_test

src/components/click/overClick.vue

@@ -29,7 +29,7 @@ export default {
       required: false
     },
     parameter: {
-      type: Object,
+      type: Object || Number,
       default: () => null,
       required: false
     },
@@ -78,10 +78,9 @@ export default {
       this.hideEdit = val
     },
     link() {
-      if (this.parameter) {
-        const newTab = this.$router.resolve(this.parameter)
-        window.open(newTab.href, '_blank')
-      }
+      if (this.parameter === null || this.parameter === undefined || this.parameter === -1) return
+      const newTab = this.$router.resolve(this.parameter)
+      window.open(newTab.href, '_blank')
     }
   }
 }

src/views/reportManagement/testPresentation.vue

@@ -146,7 +146,8 @@ const _ = require('lodash')
 import '@/styles/PublicStyle/index.scss'
 import { dailyReportDelete } from '@/api/testPresentetion' // 日报
 import { projectTestReportList } from '@/api/ResultPage' // 准出
-import { launchTestList, taskListCreate } from '@/api/InterfaceReport' // 提测
+import { launchTestList } from '@/api/InterfaceReport' // 提测
+import { taskListCreate } from '@/api/defectManage'
 import TestingReport from '@/views/reportManagement/components/TestingReport' // 提测
 import DailyReport from '@/views/reportManagement/components/DailyReport' // 日报
 import ReleaseReport from '@/views/reportManagement/components/ReleaseReport' // 准出
@@ -396,7 +397,7 @@ export default {
       if (val) { params.name = val }
       const res = await taskListCreate(params)
       if (res.code === 200) {
-        this.restaurants = res.data.taskInfoList
+        this.restaurants = res.data || []
       }
     },
     debounceQuery: _.debounce(function() {