end7less
/
program_xm_vue
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

优化

master
陈裕财 3 years ago
parent
63bbe562c0
commit
b90067008a
7 changed files with 66 additions and 25 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 4
      src/views/xm/core/xmTestCase/XmTestCaseMng.vue
  2. 13
      src/views/xm/core/xmTestCasedb/XmTestCasedbEnv.vue
  3. 2
      src/views/xm/core/xmTestCasedb/top-nav.vue
  4. 34
      src/views/xm/core/xmTestPlan/XmTestPlanEdit.vue
  5. 8
      src/views/xm/core/xmTestPlan/XmTestPlanEnv.vue
  6. 13
      src/views/xm/core/xmTestPlan/XmTestPlanInfo.vue
  7. 13
      src/views/xm/core/xmTestPlan/XmTestPlanMng.vue

4
src/views/xm/core/xmTestCase/XmTestCaseMng.vue
View File

@ -215,6 +215,10 @@ export default {
if(this.filters.caseStatus){
params.caseStatus=this.filters.caseStatus
}
if(this.filters.testType){
params.testType=this.filters.testType
}
if(this.filters.xmFunc && this.filters.xmFunc.id){
params.funcPidPathsLike=this.filters.xmFunc.pidPaths
}

13
src/views/xm/core/xmTestCasedb/XmTestCasedbEnv.vue
View File

@ -1,11 +1,20 @@
<template>
<section>
<el-row class="padding-bottom">
<span style="font-size:0.8em;color:#909399;">
<h4>注意：</h4>
测试库的环境变量在整个测试库范围内共享。<br/>
测试计划的环境变量在整个测试计划范围内共享。<br/>
环境变量可以在自动化测试用例中通过<Strong>${env.变量名}</Strong>进行引用，比如变量baseApi,可以通过 ${env.baseApi}进行引用<br/>
赋值顺序：优先查找测试计划中变量，如果不存在，则从测试库中查找变量<br/>
</span>
</el-row>
<el-table
:data="envList"
style="width: 100%">
<el-table-column
prop="id"
label="参数名(英文)"
label="变量名(英文)"
min-width="100">
<template scope="scope">
<el-input v-model="scope.row.id"></el-input>
@ -13,7 +22,7 @@
</el-table-column>
<el-table-column
prop="value"
label="参数值"
label="变量值"
min-width="250">
<template scope="scope">
<el-input v-model="scope.row.value"></el-input>

2
src/views/xm/core/xmTestCasedb/top-nav.vue
View File

@ -33,7 +33,7 @@
<span slot="title"><i class="el-icon-connection"></i>测试计划</span>
</el-menu-item>
<el-menu-item :index="'/xm/core/test/env?casedbId='+testCasedb.id">
<span slot="title"><i class="el-icon-setting"></i>环境</span>
<span slot="title"><i class="el-icon-setting"></i>环境变量</span>
</el-menu-item>
<el-menu-item :index="'/xm/core/test/rpt?casedbId='+testCasedb.id">
<span slot="title"><i class="el-icon-time"></i>统计分析</span>

34
src/views/xm/core/xmTestPlan/XmTestPlanEdit.vue
View File

@ -3,16 +3,6 @@
<el-row ref="table">
<!--编辑界面 XmTestPlan 测试计划-->
<el-form :model="editForm" label-width="120px" :rules="editFormRules" ref="editFormRef" label-position="left">
<el-form-item label="归属项目" prop="projectId">
<span v-if="opType=='add'">
<xm-project-select v-if="!selProject || !selProject.id" ref="xmProjectSelect" :link-product-id="xmTestCasedb? xmTestCasedb.productId:null" @row-click="onPorjectConfirm" :auto-select="false">
</xm-project-select>
</span>
<div v-else>{{editForm.projectName}}</div>
</el-form-item>
<el-form-item prop="name" label-width="0px">
<el-row class="padding-bottom">
<my-input v-model="editForm.name" placeholder="计划名称" :maxlength="255" @change="editSomeFields(editForm,'name',$event)"></my-input>
@ -21,21 +11,34 @@
<span class="label-font-color padding-left">测试计划编号:{{ editForm.id }}</span>
</el-row>
</el-form-item>
<el-row class="padding">
<el-col :span="8">
<el-row class="padding-bottom">
<el-col :span="6">
<mdp-select-user-xm label="负责人" userid-key="cuserid" username-key="cusername" v-model="editForm" :project-id="editForm.projectId" :product-id="editForm.productId" @change="editSomeFields(editForm,'cuserid',$event)"></mdp-select-user-xm>
</el-col>
<el-col :span="8">
<el-col :span="6">
<mdp-select-dict-x label="状态" :dict="dicts['testPlanStatus']" v-model="editForm.status" @change="editSomeFields(editForm,'status',$event)"></mdp-select-dict-x>
</el-col>
<el-col :span="8">
<el-col :span="6">
<mdp-select-dict-x label="测试方式" :dict="dicts['testType']" v-model="editForm.testType" @change="editSomeFields(editForm,'testType',$event)"></mdp-select-dict-x>
</el-col>
<el-col :span="6">
<mdp-select-dict-x label="测试结果" :dict="dicts['testPlanTcode']" v-model="editForm.tcode" @change="editSomeFields(editForm,'tcode',$event)"></mdp-select-dict-x>
</el-col>
</el-row>
<el-form-item label="归属测试库" prop="casedbName">
<el-form-item label="归属测试库" prop="casedbName" class="padding-top">
{{editForm.casedbName}}
</el-form-item>
<el-form-item label="归属项目" prop="projectId" >
<span v-if="opType=='add'">
<xm-project-select v-if="!selProject || !selProject.id" ref="xmProjectSelect" :link-product-id="xmTestCasedb? xmTestCasedb.productId:null" @row-click="onPorjectConfirm" :auto-select="false">
</xm-project-select>
</span>
<div v-else>{{editForm.projectName}}</div>
</el-form-item>
<el-form-item label="归属产品" prop="productName">
{{editForm.productName}}
</el-form-item>
@ -94,6 +97,7 @@ import MdpSelectUserXm from '@/views/xm/core/components/MdpSelectUserXm';//修
dicts:{
testPlanStatus:[],
testPlanTcode:[],
testType:[],
},//下拉选择框的所有静态数据 params={categoryId:'all',itemCodes:['sex']} 返回结果 {sex: [{id:'1',name:'男'},{id:'2',name:'女'}]}
editFormRules: {

8
src/views/xm/core/xmTestPlan/XmTestPlanEnv.vue
View File

@ -1,5 +1,13 @@
<template>
<section>
<el-row class="padding-bottom">
<span style="font-size:0.8em;color:#909399;">
<h4>注意：</h4>
测试计划的环境变量在整个测试计划范围内共享。<br/>
环境变量可以在自动化测试用例中通过<Strong>${env.变量名}</Strong>进行引用，比如变量baseApi,可以通过 ${env.baseApi}进行引用<br/>
赋值顺序：优先查找测试计划中变量，如果不存在，则从测试库中查找变量<br/>
</span>
</el-row>
<el-table
:data="envList"
style="width: 100%">

13
src/views/xm/core/xmTestPlan/XmTestPlanInfo.vue
View File

@ -4,9 +4,9 @@
<el-row class="padding">
<el-button icon="el-icon-back" @click="goBackToPlanList()" type="primary" plain></el-button>
<el-divider direction="vertical"></el-divider>
{{xmTestPlan.name}}
<el-link :type="subPage=='testPlanEdit'?'primary':''" @click="subPage='testPlanEdit'"><i class="el-icon-setting"></i>{{xmTestPlan.name}}</el-link>
<el-divider direction="vertical"></el-divider>
<el-link :type="subPage=='testPlanEnv'?'primary':''" @click="subPage='testPlanEnv'"><i class="el-icon-setting"></i>&nbsp;环境</el-link>
<el-link :type="subPage=='testPlanEnv'?'primary':''" @click="subPage='testPlanEnv'"><i class="el-icon-setting"></i>&nbsp;环境变量</el-link>
<el-divider direction="vertical"></el-divider>
<el-link :type="subPage=='testPlanCase'?'primary':''" @click="subPage='testPlanCase'"><i class="el-icon-video-play"></i>&nbsp;执行测试</el-link>
<el-divider direction="vertical"></el-divider>
@ -29,6 +29,9 @@
</span>
</span>
</el-row>
<el-row v-if="subPage=='testPlanEdit'" class="padding-left padding-right">
<xm-test-plan-edit :xm-test-plan="xmTestPlan" :xm-test-casedb="xmTestCasedb"></xm-test-plan-edit>
</el-row>
<el-row v-if="subPage=='testPlanEnv'" class="padding-left padding-right">
<xm-test-plan-env :xm-test-plan="xmTestPlan" :xm-test-casedb="xmTestCasedb"></xm-test-plan-env>
</el-row>
@ -67,6 +70,7 @@ export default {
"xm-test-plan-rpt":()=>import("../../rpt/index/index.vue"),
"xm-rpt":()=>import("../../rpt/index"),
"xm-test-plan-env":()=>import("../xmTestPlan/XmTestPlanEnv.vue"),
"xm-test-plan-edit":()=>import("../xmTestPlan/XmTestPlanEdit.vue"),
"xm-test-plan-mng":()=>import("../xmTestPlan/XmTestPlanMng.vue"),
"xm-test-case-mng":()=>import("../xmTestCase/XmTestCaseMng.vue"),
"xm-test-plan-case-mng":()=>import("../xmTestPlanCase/XmTestPlanCaseMng.vue")
@ -127,7 +131,7 @@ export default {
xmTestPlan:{
deep:true,
handler(){
this.subPage="testPlanEnv"
this.subPage="testPlanEdit"
}
}
},
@ -135,8 +139,9 @@ export default {
return {
dicts:{
testPlanStatus:[],
testType:[]
},
subPage:'testPlanEnv',//testPlanCase,testBug
subPage:'testPlanEdit',//testPlanCase,testBug
}
},//end data
methods: {

13
src/views/xm/core/xmTestPlan/XmTestPlanMng.vue
View File

@ -1,10 +1,11 @@
<template>
<section>
<el-row>
<el-input v-model="filters.key" style="width: 20%;" placeholder="模糊查询" clearable></el-input>
<el-input v-model="filters.key" style="width: 15%;" placeholder="模糊查询" clearable></el-input>
<mdp-select-dict style="width:15%;" clearable placeholder="状态" :dict="dicts['testPlanStatus']" v-model="filters.status" effect="dark"></mdp-select-dict>
<mdp-select-dict style="width:15%;" clearable placeholder="结果" :dict="dicts['testPlanTcode']" v-model="filters.tcode" effect="dark" ></mdp-select-dict>
<mdp-select-dict placeholder="测试方式" style="width:15%;" clearable :dict="dicts['testType']" v-model="filters.testType" effect="dark"></mdp-select-dict>
<el-button v-loading="load.list" :disabled="load.list==true" @click="searchXmTestPlans" icon="el-icon-search">查询</el-button>
<span style="float:right;">
@ -45,6 +46,12 @@
<mdp-select-dict-tag :dict="dicts['testPlanStatus']" v-model="scope.row.status" effect="dark" @change="editSomeFields(scope.row,'status',$event)"></mdp-select-dict-tag>
</template>
</el-table-column>
<el-table-column prop="testType" label="测试方式" width="120" show-overflow-tooltip>
<template slot-scope="scope">
<mdp-select-dict-tag :dict="dicts['testType']" v-model="scope.row.testType" effect="dark" @change="editSomeFields(scope.row,'testType',$event)"></mdp-select-dict-tag>
</template>
</el-table-column>
<el-table-column prop="tcode" label="测试结果" width="120" show-overflow-tooltip>
<template slot-scope="scope">
@ -129,6 +136,7 @@ export default {
key: '',
status:'',
tcode:'',
testType:'',
},
xmTestPlans: [],//查询结果
pageInfo:{//分页数据
@ -215,6 +223,9 @@ export default {
if(this.filters.status){
params.status=this.filters.status
}
if(this.filters.testType){
params.testType=this.filters.testType
}
if(this.xmTestCasedb && this.xmTestCasedb.id){
params.casedbId=this.xmTestCasedb.id
}

Write Preview
Loading…
Cancel
Save