Browse Source

测试

master
陈裕财 4 years ago
parent
commit
a9b2c2f838
  1. 9
      src/views/xm/core/xmQuestion/XmQuestionMng.vue
  2. 4
      src/views/xm/core/xmTestPlanCase/TestStepResult.vue
  3. 42
      src/views/xm/core/xmTestPlanCase/XmTestPlanCaseEdit.vue
  4. 2
      src/views/xm/core/xmTestPlanCase/XmTestPlanCaseMng.vue

9
src/views/xm/core/xmQuestion/XmQuestionMng.vue

@ -190,6 +190,7 @@
</span>
</template>
</el-table-column>
<!--
<el-table-column prop="projectId" label="项目" width="100" show-overflow-tooltip>
<template slot-scope="scope">
<div class="cell-text">
@ -218,6 +219,7 @@
<el-table-column prop="ltime" label="更新时间" sortable width="100" show-overflow-tooltip>
</el-table-column>
-->
<el-table-column prop="handlerUsername" label="负责人" width="100" show-overflow-tooltip>
<template slot-scope="scope">
<div class="cell-text">
@ -284,7 +286,7 @@
'userInfo','roles'
]),
},
props: ["selProject",'qtype','xmTestCaseExec','xmTestCase','xmIteration','xmProduct','queryScene'],
props: ["selProject",'qtype','xmTestPlanCase','xmTestCase','xmIteration','xmProduct','queryScene'],
watch:{
selProject:function(selProject){
this.filters.selProject=this.selProject
@ -518,8 +520,9 @@
if(this.filters.selProject){
params.projectId = this.filters.selProject.id;
}
if(this.xmTestCaseExec){
params.caseExecId=this.xmTestCaseExec.id
if(this.xmTestPlanCase){
params.planId=this.xmTestPlanCase.planId
params.caseId=this.xmTestPlanCase.caseId
}
if(this.xmTestCase){
params.caseId=this.xmTestCase.id

4
src/views/xm/core/xmTestPlanCase/TestStepResult.vue

@ -51,7 +51,9 @@
</el-select>
</el-col>
<el-col :span="1">
<el-button @click="addBug(item,index)" icon="el-icon-plus" type="text"></el-button>
<slot name="addBug">
<el-button @click="addBug(item,index)" icon="el-icon-plus" circle></el-button>
</slot>
</el-col>
</el-row>
<el-divider></el-divider>

42
src/views/xm/core/xmTestPlanCase/XmTestPlanCaseEdit.vue

@ -1,8 +1,6 @@
<template>
<section>
<el-row>
</el-row>
<el-row :style="{overflowX:'auto',height:maxTableHeight+'px'}" ref="table">
<section >
<el-row :style="{overflow:'auto',maxHeight:maxTableHeight+'px'}" ref="table">
<!--编辑界面 XmTestPlanCase 测试计划与用例关系表-->
<el-form :model="editForm" label-width="120px" :rules="editFormRules" ref="editFormRef" label-position="left" >
@ -48,8 +46,9 @@
</el-col>
</el-row>
</el-form-item>
<el-tabs>
<el-tab-pane name="1" label="用例信息">
<el-tabs v-model="activateName" >
<el-tab-pane name="1" label="用例信息" >
<el-row >
<el-row class="padding-top">
<el-col :span="6">
<el-row class="label-font-size">
@ -103,7 +102,9 @@
测试步骤
</el-row>
<el-row class="padding">
<test-step-result class="padding" v-model="editForm.testStep"></test-step-result>
<test-step-result class="padding" v-model="editForm.testStep">
<el-button slot="addBug" @click="addBugVisible=true" icon="el-icon-plus" circle></el-button>
</test-step-result>
</el-row>
<el-row v-if="opType!='add' && editFormBak.testStep!=editForm.testStep" >
<el-button v-loading="load.edit" type="primary" @click.native="editSomeFields(editForm,'testStep',editForm.testStep)" :disabled="load.edit==true">保存测试步骤</el-button>
@ -121,6 +122,7 @@
<el-form-item label="执行备注" prop="remark">
<el-input type="textarea" :rows="6" v-model="editForm.remark" placeholder="执行备注" :maxlength="2147483647" @change="editSomeFields(editForm,'remark',$event)"></el-input>
</el-form-item>
</el-row>
</el-tab-pane>
<el-tab-pane name="2" label="需求">
<el-row>
@ -137,17 +139,17 @@
</el-col>
</el-row>
</el-tab-pane>
<el-tab-pane name="3" label="缺陷">
<el-tab-pane name="3" label="缺陷">
<el-row v-if="activateName=='3'">
<xm-question-mng :xm-test-plan-case="editForm" :xm-product="{id:xmTestPlanCase.productId,productName:xmTestPlanCase.productName}" :sel-project="{id:xmTestPlanCase.projectId,name:xmTestPlanCase.projectName}"></xm-question-mng>
</el-row>
</el-tab-pane>
<el-tab-pane name="4" label="附件">
</el-tab-pane>
</el-tabs>
</el-form>
</el-form>
</el-row>
<el-row>
<el-col :span="8">
<el-checkbox v-model="next">继续下一条执行用例</el-checkbox>
@ -174,10 +176,16 @@
<el-button @click.native="handleCancel">取消</el-button>
<el-button v-loading="load.edit" type="primary" @click.native="saveSubmit" :disabled="load.edit==true">提交</el-button>
</el-row>
<el-dialog append-to-body title="需求明细" :visible.sync="menuVisible" width="80%" top="20px" :close-on-click-modal="false">
<xm-menu-edit :visible="menuVisible" :reload="true" :xm-menu="{menuId:editForm.menuId,menuName:editForm.menuName}" ></xm-menu-edit>
</el-dialog>
<!--新增 XmQuestion xm_question界面-->
<el-dialog title="新增缺陷" :visible.sync="addBugVisible" width="90%" top="20px" append-to-body :close-on-click-modal="false">
<xm-question-add :xm-product="{id:editForm.productId,productName:editForm.productName}" :xm-test-plan-case="editForm" :qtype="qtype" :sel-project=" {id:editForm.projectId,name:editForm.projectName} " :visible="addBugVisible" @cancel="addBugVisible=false" ></xm-question-add>
</el-dialog>
</section>
</template>
@ -189,11 +197,13 @@
import TestStepResult from './TestStepResult.vue';
import MyInput from '@/components/MDinput/index';
import XmMenuEdit from '../xmMenu/XmMenuEdit.vue';
import XmQuestionMng from '@/views/xm/core/xmQuestion/XmQuestionMng';//
import XmQuestionAdd from '../xmQuestion/XmQuestionAdd';//
export default {
name:'xmTestPlanCaseEdit',
components: {
TestStepResult,MyInput,XmMenuEdit,
TestStepResult,MyInput,XmMenuEdit,XmQuestionMng,XmQuestionAdd,
},
computed: {
@ -234,6 +244,8 @@ TestStepResult,MyInput,XmMenuEdit,
maxTableHeight:300,
menuVisible:false,
next:false,
activateName:'1',
addBugVisible:false,
}//end return
},//end data
methods: {
@ -325,7 +337,7 @@ TestStepResult,MyInput,XmMenuEdit,
this.$nextTick(() => {
initDicts(this);
this.initData()
this.maxTableHeight = util.calcTableMaxHeight(this.$refs.table.$el)
this.maxTableHeight = util.calcTableMaxHeight(this.$refs.table.$el)-100
});
}
}

2
src/views/xm/core/xmTestPlanCase/XmTestPlanCaseMng.vue

@ -69,7 +69,7 @@
</el-row>
<el-row>
<!--编辑 XmTestPlanCase 测试计划与用例关系表界面-->
<el-dialog title="测试执行" :visible.sync="editFormVisible" width="80%" top="20px" append-to-body :close-on-click-modal="false">
<el-dialog title="测试执行" :visible.sync="editFormVisible" width="90%" top="20px" append-to-body :close-on-click-modal="false">
<xm-test-plan-case-edit op-type="edit" :xm-test-plan-case="editForm" :visible="editFormVisible" @cancel="editFormVisible=false" @submit="afterEditSubmit" @edit-fields="onEditFields"></xm-test-plan-case-edit>
</el-dialog>

Loading…
Cancel
Save