Merge branch 'http_test' of git.xiaojukeji.com:pu_qa_tool/thoth-frontend into http_test

src/views/projectManage/projectList/projectIndex.vue

@@ -443,11 +443,11 @@ export default {
     },
     link_project(id) {
       const bizId_id = EncryptId(`${this.bizId}_${id}`)
-      if (localStorage.getItem('openPageHandle') === 'blank') {
+      if (localStorage.getItem('openPageHandle') === 'self') {
+        this.$router.push({ name: '项目详情', query: { bizId_id: bizId_id }})
+      } else {
         const newTab = this.$router.resolve({ name: '项目详情', query: { bizId_id: bizId_id }})
         window.open(newTab.href, '_blank')
-      } else {
-        this.$router.push({ name: '项目详情', query: { bizId_id: bizId_id }})
       }
     },
     showSelect() {

src/views/projectManage/requirement/list/index.vue

@@ -756,7 +756,7 @@ export default {
         date: []
       }
       if (this.nowTab === 'charts') {
-        this.searchForm = { ...this.searchForm, rqmtOrntIds: [], name: '', statusList: [] }
+        this.searchForm = { ...this.searchForm, name: '', statusList: [] }
       }
       if (this.nowTab === 'charts') {
         this.get_charts()
@@ -783,11 +783,11 @@ export default {
     },
     getToRequirementDetails(id) { // table点击跳转
       const bizId_id = EncryptId(`${this.bizId}_${id}`)
-      if (localStorage.getItem('openPageHandle') === 'blank') {
+      if (localStorage.getItem('openPageHandle') === 'self') {
+        this.$router.push({ name: '需求详情', query: { bizId_id: bizId_id }})
+      } else {
         const newTab = this.$router.resolve({ name: '需求详情', query: { bizId_id: bizId_id }})
         window.open(newTab.href, '_blank')
-      } else {
-        this.$router.push({ name: '需求详情', query: { bizId_id: bizId_id }})
       }
     },
     chartSearchFormChange(key, value) {

src/views/projectManage/taskList/taskIndex.vue

@@ -679,11 +679,11 @@ export default {
     },
     link_task(id) {
       const bizId_id = EncryptId(`${this.bizId}_${id}`)
-      if (localStorage.getItem('openPageHandle') === 'blank') {
+      if (localStorage.getItem('openPageHandle') === 'self') {
+        this.$router.push({ name: '任务详情', query: { bizId_id: bizId_id }})
+      } else {
         const newTab = this.$router.resolve({ name: '任务详情', query: { bizId_id: bizId_id }})
         window.open(newTab.href, '_blank')
-      } else {
-        this.$router.push({ name: '任务详情', query: { bizId_id: bizId_id }})
       }
     },
     query_Reset() {
@@ -704,7 +704,7 @@ export default {
         date: []
       }
       if (this.nowTab === 'charts') {
-        this.form_task = { ...this.form_task, moduleIds: [], name: '', statusList: [] }
+        this.form_task = { ...this.form_task, name: '', statusList: [] }
       }
       this.updateChartSearchFormValue()
       if (this.nowTab === 'charts') {

src/views/reportManagement/testPresentation.vue

@@ -28,7 +28,7 @@
               <a v-if="title === '测试日报' || title === '准出报告'" href="javascript:void(0)" style="color:#20a0ff" @click="history ? toReportView(scope.row) : OldDaily(scope.row)">{{ scope.row.reportName }}</a>
               <div v-if="title === '准出报告' && scope.row.passStatus === 1" class="passStatus1">不通过</div>
               <a v-if="title === '提测报告'" href="javascript:void(0)" style="color:#20a0ff" @click="history ? toReportView(scope.row) : OldDaily(scope.row)">{{ history ? scope.row.reportName : scope.row.name }}</a>
-              <div v-if="title === '提测报告' && scope.row.returnReason" style="color: red;">打回报告：{{ scope.row.returnReason }}</div>
+              <div v-if="title === '提测报告' && scope.row.returnReason" style="color: red;" class="breakText1">打回报告：{{ scope.row.returnReason }}</div>
             </template>
           </el-table-column>
           <el-table-column label="状态" min-width="150">
@@ -602,6 +602,12 @@ export default {
 }
 </script>
 <style lang="scss" scoped>
+.breakText1 {
+  word-break: break-all;
+  overflow: hidden;
+  text-overflow: ellipsis;
+  white-space: nowrap;
+}
 .eleStyle {
   width: 100%;
   height:100%;