Browse Source

优化

master
陈裕财 3 years ago
parent
commit
197bbbf5a2
  1. 2
      src/views/xm/core/xmQuestion/XmQuestionEdit.vue
  2. 3
      src/views/xm/core/xmTestPlan/XmTestPlanEdit.vue
  3. 4
      src/views/xm/core/xmTestPlan/XmTestPlanMng.vue
  4. 17
      src/views/xm/core/xmTestPlanCase/XmTestPlanCaseSelect.vue

2
src/views/xm/core/xmQuestion/XmQuestionEdit.vue

@ -197,7 +197,7 @@
</el-dialog> </el-dialog>
<el-dialog append-to-body title="执行用例选择" :visible.sync="caseVisible" width="80%" top="20px" :close-on-click-modal="false"> <el-dialog append-to-body title="执行用例选择" :visible.sync="caseVisible" width="80%" top="20px" :close-on-click-modal="false">
<xm-test-plan-case-mng v-if="caseVisible" :select="true" :visible="caseVisible" :xm-test-plan="xmTestPlan" :xm-product="editForm.productId?{id:editForm.productId,productName:editForm.productName}:xmProductCpd" @select="onTestPlanCaseSelected" ></xm-test-plan-case-mng>
<xm-test-plan-case-mng v-if="caseVisible" :select="true" :visible="caseVisible" :xm-project="selProject&&selProject.id?selProject:(editForm.projectId?{id:editForm.projectId}:null)" :xm-test-plan="xmTestPlan" :xm-product="editForm.productId?{id:editForm.productId,productName:editForm.productName}:xmProductCpd" @select="onTestPlanCaseSelected" ></xm-test-plan-case-mng>
</el-dialog> </el-dialog>
</section> </section>
</template> </template>

3
src/views/xm/core/xmTestPlan/XmTestPlanEdit.vue

@ -16,6 +16,9 @@
<el-form-item prop="name" label-width="0px"> <el-form-item prop="name" label-width="0px">
<el-row class="padding-bottom"> <el-row class="padding-bottom">
<my-input v-model="editForm.name" placeholder="计划名称" :maxlength="255" @change="editSomeFields(editForm,'name',$event)"></my-input> <my-input v-model="editForm.name" placeholder="计划名称" :maxlength="255" @change="editSomeFields(editForm,'name',$event)"></my-input>
</el-row>
<el-row >
<span class="label-font-color padding-left">测试计划编号:{{ editForm.id }}</span>
</el-row> </el-row>
</el-form-item> </el-form-item>
<el-row class="padding"> <el-row class="padding">

4
src/views/xm/core/xmTestPlan/XmTestPlanMng.vue

@ -28,12 +28,16 @@
</span> </span>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column prop="projectName" label="项目" min-width="120" show-overflow-tooltip>
</el-table-column>
<el-table-column prop="cusername" label="负责人" min-width="120" show-overflow-tooltip> <el-table-column prop="cusername" label="负责人" min-width="120" show-overflow-tooltip>
<template slot-scope="scope"> <template slot-scope="scope">
<mdp-select-user-xm userid-key="cuserid" username-key="cusername" v-model="scope.row" :disabled="true"> <mdp-select-user-xm userid-key="cuserid" username-key="cusername" v-model="scope.row" :disabled="true">
</mdp-select-user-xm> </mdp-select-user-xm>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column prop="totalCases" label="用例数" width="120" show-overflow-tooltip>
</el-table-column>
<el-table-column prop="status" label="状态" width="120" show-overflow-tooltip> <el-table-column prop="status" label="状态" width="120" show-overflow-tooltip>
<template slot-scope="scope"> <template slot-scope="scope">
<mdp-select-dict-tag :dict="dicts['testPlanStatus']" v-model="scope.row.status" effect="dark" @change="editSomeFields(scope.row,'status',$event)"></mdp-select-dict-tag> <mdp-select-dict-tag :dict="dicts['testPlanStatus']" v-model="scope.row.status" effect="dark" @change="editSomeFields(scope.row,'status',$event)"></mdp-select-dict-tag>

17
src/views/xm/core/xmTestPlanCase/XmTestPlanCaseSelect.vue

@ -7,7 +7,8 @@
</el-col> </el-col>
<el-col :span="(xmTestCase&&xmTestCase.id)?24:18"> <el-col :span="(xmTestCase&&xmTestCase.id)?24:18">
<el-row> <el-row>
<el-input v-model="filters.key" style="width:40%;" placeholder="模糊查询" clearable></el-input>
<el-input v-model="filters.key" style="width:30%;" placeholder="模糊查询" clearable></el-input>
<el-input v-model="filters.caseId" style="width:20%;" placeholder="用例编号" clearable></el-input>
<el-button v-loading="load.list" :disabled="load.list==true" @click="searchXmTestPlanCases" icon="el-icon-search">查询</el-button> <el-button v-loading="load.list" :disabled="load.list==true" @click="searchXmTestPlanCases" icon="el-icon-search">查询</el-button>
</el-row> </el-row>
<el-row> <el-row>
@ -19,7 +20,10 @@
<span class="cell-bar"><el-input style="display:inline;" v-model="scope.row.username" placeholder="" @change="editSomeFields(scope.row,'username',$event)" :maxlength="22"></el-input></span> <span class="cell-bar"><el-input style="display:inline;" v-model="scope.row.username" placeholder="" @change="editSomeFields(scope.row,'username',$event)" :maxlength="22"></el-input></span>
</el-table-column> </el-table-column>
--> -->
<el-table-column prop="caseName" label="用例名称" min-width="350">
<el-table-column prop="planId" label="测试计划" width="150" sortable>
</el-table-column>
<el-table-column prop="caseName" label="用例名称" min-width="250">
</el-table-column> </el-table-column>
<el-table-column prop="caseStatus" label="用例状态" width="100" show-overflow-tooltip> <el-table-column prop="caseStatus" label="用例状态" width="100" show-overflow-tooltip>
<template slot-scope="scope"> <template slot-scope="scope">
@ -27,7 +31,7 @@
</template> </template>
</el-table-column> </el-table-column>
<el-table-column prop="execStatus" label="执行结果" width="120" show-overflow-tooltip>
<el-table-column prop="execStatus" label="执行结果" width="100" show-overflow-tooltip>
<template slot-scope="scope"> <template slot-scope="scope">
<mdp-select-dict-tag :dict="dicts['testStepTcode']" v-model="scope.row.execStatus" effect="dark" :disabled="true"></mdp-select-dict-tag> <mdp-select-dict-tag :dict="dicts['testStepTcode']" v-model="scope.row.execStatus" effect="dark" :disabled="true"></mdp-select-dict-tag>
</template> </template>
@ -43,7 +47,7 @@
<mdp-select-dict-tag :dict="dicts['priority']" v-model="scope.row.priority" :disabled="true"></mdp-select-dict-tag> <mdp-select-dict-tag :dict="dicts['priority']" v-model="scope.row.priority" :disabled="true"></mdp-select-dict-tag>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="操作" width="150" fixed="right">
<el-table-column label="操作" width="100" fixed="right">
<template slot-scope="scope"> <template slot-scope="scope">
<el-button type="primary" @click="$emit('select',scope.row)">选择</el-button> <el-button type="primary" @click="$emit('select',scope.row)">选择</el-button>
</template> </template>
@ -70,7 +74,7 @@ export default {
components: { components: {
XmFuncSelect,MdpSelectUserXm, XmFuncSelect,MdpSelectUserXm,
}, },
props:['visible','xmTestPlan','xmTestCasedb','xmTestCase','xmProduct','select'],
props:['visible','xmTestPlan','xmTestCasedb','xmTestCase','xmProduct','select','xmProject'],
computed: { computed: {
...mapGetters(['userInfo']), ...mapGetters(['userInfo']),
xmProductCpd(){ xmProductCpd(){
@ -199,6 +203,9 @@ export default {
if(this.xmProductCpd && this.xmProductCpd.id){ if(this.xmProductCpd && this.xmProductCpd.id){
params.productId=this.xmProductCpd.id params.productId=this.xmProductCpd.id
} }
if(this.xmProject && this.xmProject.id){
params.projectId=this.xmProject.id
}
params.caseStatus="2" params.caseStatus="2"
this.load.list = true; this.load.list = true;
listXmTestPlanCase(params).then((res) => { listXmTestPlanCase(params).then((res) => {

Loading…
Cancel
Save