测试计划接口调整

test-ui/src/api/test/planDefect.js

@@ -1,15 +1,16 @@
 import request from '@/utils/request'
 
 const api = {
-  delRelDefect: 'testPlan/defect/list',
+  delRelDefect: 'testPlan/defect/delRelDefect/',
   getDefectList: 'testPlan/defect/list',
+  addRelDefect: 'testPlan/defect/addRelDefect',
 }
 
-export function delRelDefect(data) {
+export function delRelDefect(id) {
   return request({
-    url: api.delRelDefect,
+    url: api.delRelDefect + id,
     method: 'post',
-    data
+    data: {id}
   })
 }
 
@@ -20,3 +21,11 @@ export function getDefectList(data) {
     params: data
   })
 }
+
+export function addRelDefect(data) {
+  return request({
+    url: api.addRelDefect,
+    method: 'post',
+    data
+  })
+}

test-ui/src/views/test/testplan/defects/testDefects.vue

@@ -33,7 +33,7 @@
               size="medium"
               :disabled="multiple"
               @click="handleDelete"
-            >批量删除</el-button>
+            >缺陷取消关联</el-button>
           </div>
         </el-header>
       </el-col>
@@ -55,12 +55,10 @@
             </el-form-item>
             <el-form-item label="负责人">
               <el-select v-model="queryParams.manager" placeholder="请选择" clearable filterable>
-                <simple-options :options="managerList"/>
               </el-select>
             </el-form-item>
             <el-form-item label="优先级">
               <el-select v-model="queryParams.priority" placeholder="请选择" clearable filterable>
-                <simple-options :options="dict.type.priority_level"/>
               </el-select>
             </el-form-item>
             <el-form-item>
@@ -80,7 +78,7 @@
       <el-tab-pane :label="'准生产验证'" name="3"></el-tab-pane>
       <el-tab-pane :label="'生产验证'" name="4"></el-tab-pane>
 
-      <el-Table v-loading="loading" :data="list" @selection-change="handleSelectionChange">
+      <el-Table v-loading="loading" :data="list" @selection-change="handleSelection">
         <el-table-column type="selection"/>
         <el-table-column prop="serialNumber" label="ID" align="center"/>
         <el-table-column prop="summary" label="概要" align="center"/>
@@ -140,11 +138,10 @@
 </template>
 
 <script>
-import {saveRelate} from "@/api/test/planCase";
 import SimpleOptions from "@/components/FormItem/option/SimpleOptions.vue";
 import RelateCase from "@/views/test/testplan/execute/relateCase.vue";
 import page1 from "../../case/detail/page1.vue";
-import {delRelDefect, getDefectList} from "@/api/test/planDefect";
+import {addRelDefect, delRelDefect, getDefectList} from "@/api/test/planDefect";
 import {getBugList} from "@/api/test/bug";
 
 export default {
@@ -163,6 +160,8 @@ export default {
   },
   data() {
     return {
+      // 非多个禁用
+      multiple: true,
       select: '1',
       query: '',
       activeTab: '0',
@@ -172,9 +171,8 @@ export default {
       title: '',
       // 选中数组
       ids: [],
+      idList: [],
       isExecuteVisible: true,
-      // 非多个禁用
-      multiple: true,
       // 遮罩层
       loading: false,
       relLoading: false,
@@ -183,7 +181,6 @@ export default {
       open: false,
       selectedRows: [],
       selectedData: [],
-      managerList: [],
       queryParams: {
         serialNumber: '',
         outline: '',
@@ -206,18 +203,31 @@ export default {
     },
   },
   methods: {
+    handleAdvancedSearch() {
+      // 高级筛选条件搜索
+      this.queryParams.pageNum = 1
+      this.getList()
+    },
+    resetAdvancedFilter() {
+      // 重置高级筛选条件
+      this.resetForm('queryFrom')
+      this.handleAdvancedSearch()
+    },
     // 展开/折叠
     handleCollapse(val) {
       this.activeNames = val ? ['1'] : [];
     },
     handleSelectionChange(selection) {
-      this.selectedRows = selection;
       this.ids = selection.map(item => item.id)
+    },
+    handleSelection(selection) {
+      this.selectedRows = selection;
+      this.idList = selection.map(item => item.id)
       this.multiple = !selection.length
     },
     handleTabClick(tab) {
       this.ids = [];
-      this.multiple = false;
+      this.idList = [];
       this.activeTab = tab.name;
       this.queryParams.type = parseInt(this.activeTab, 10);
       this.getList();
@@ -266,15 +276,15 @@ export default {
     reset() {
       this.selectedRows = [];
       this.ids = [];
-      this.multiple = false;
+      this.idList = [];
     },
     submitForm() {
       const form = {
         ...this.queryParams,
-        testCaseIdList: this.$refs.relateCase.getSelectedCaseIds()
+        defectIdList: this.ids
       }
       this.submitLoading = true
-      saveRelate(form)
+      addRelDefect(form)
       .then(() => {
         this.$message.success('关联成功')
         this.open = false
@@ -290,7 +300,7 @@ export default {
     },
     /** 删除按钮操作 */
     handleDelete(row) {
-      const ids = row.id || this.ids;
+      const ids = row.id || this.idList;
       this.$modal.confirm('是否确认删除关联缺陷？').then(function () {
         return delRelDefect(ids);
       }).then(() => {

test-ui/src/views/test/testplan/overview.vue

@@ -112,7 +112,6 @@ export default {
       this.editForm = res.data
     })
     this.planId = this.$route.query.id;
-    console.log(this.planId)
     this.testTitle = this.$route.query.name
     this.testStatus = this.$route.query.testStatus
   }

test-ui/src/views/test/testplan/probablyView/probablyView.vue

@@ -24,7 +24,7 @@
                 <span>当前测试计划已经开始 3 天,距离截止时间还有 52 天</span>
               </el-col>
               <el-col :span="5">
-                <span>负责人：{{ manager }}</span>
+                <span>负责人：{{  }}</span>
               </el-col>
             </el-row>
           </div>

test-ui/src/views/test/testplan/setting/testSetting.vue

@@ -0,0 +1,14 @@
+<template>
+  <div class="app-container">
+    设置
+  </div>
+</template>
+
+<script>
+  export default {
+    name: 'testSetting'
+  }
+</script>
+<style scoped>
+
+</style>