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

查询条件优化

master
陈裕财 5 years ago
parent
7fd15eae5c
commit
38ea3ada10
4 changed files with 404 additions and 33 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 4
      config/index.js
  2. 78
      src/views/xm/core/xmQuestion/XmQuestionMng.vue
  3. 173
      src/views/xm/core/xmTestCase/XmTestCaseMng.vue
  4. 182
      src/views/xm/core/xmTestCaseExec/XmTestCaseExecMng.vue

4
config/index.js
View File

@ -11,7 +11,7 @@ module.exports = {
assetsSubDirectory: 'static', assetsSubDirectory: 'static',
assetsPublicPath: '/', assetsPublicPath: '/',
proxyTable: { proxyTable: {
/**
'/api/m1/xm': { '/api/m1/xm': {
target: 'http://localhost:7067', target: 'http://localhost:7067',
changeOrigin: true, changeOrigin: true,
@ -19,7 +19,7 @@ module.exports = {
'^/api/m1/xm': '/xm' '^/api/m1/xm': '/xm'
} }
}, },
/**
'/api/m1/workflow': { '/api/m1/workflow': {
target: 'http://localhost:7080', target: 'http://localhost:7080',
changeOrigin: true, changeOrigin: true,

78
src/views/xm/core/xmQuestion/XmQuestionMng.vue
View File

@ -13,6 +13,8 @@
<el-option v-for="(b,index) in options['bugSeverity']" :value="b.optionValue" :key="index" :label="b.optionName">{{b.optionName}} <el-option v-for="(b,index) in options['bugSeverity']" :value="b.optionValue" :key="index" :label="b.optionName">{{b.optionName}}
</el-option> </el-option>
</el-select> </el-select>
<el-tag v-if=" filters.product " closable @close="clearProduct">{{this.filters.product.productName}}</el-tag>
<el-button v-else @click="showProductVisible" type="plian">选产品</el-button>
<el-button v-if=" !filters.menus || filters.menus.length==0" @click="showMenu"> 选择故事</el-button> <el-button v-if=" !filters.menus || filters.menus.length==0" @click="showMenu"> 选择故事</el-button>
<el-tag v-else closable @close="clearFiltersMenu(filters.menus[0])">{{filters.menus[0].menuName.substr(0,5)}}等({{filters.menus.length}})个</el-tag> <el-tag v-else closable @close="clearFiltersMenu(filters.menus[0])">{{filters.menus[0].menuName.substr(0,5)}}等({{filters.menus.length}})个</el-tag>
<el-input style="width:200px;" v-model="filters.key" placeholder="问题名称"> <el-input style="width:200px;" v-model="filters.key" placeholder="问题名称">
@ -28,6 +30,10 @@
width="400" width="400"
trigger="click" > trigger="click" >
<el-row> <el-row>
<el-col :span="24" style="padding-top:5px;">
<font class="more-label-font">产品:</font><el-tag v-if=" filters.product " closable @close="clearProduct">{{this.filters.product.productName}}</el-tag>
<el-button v-else @click="showProductVisible" type="plian">选产品</el-button>
</el-col>
<el-col :span="24" style="padding-top:12px;" v-if="!selProject"> <el-col :span="24" style="padding-top:12px;" v-if="!selProject">
<font class="more-label-font">项目:</font> <font class="more-label-font">项目:</font>
<el-tag v-if="filters.selProject && !selProject" closable @close="clearProject" @click="showProjectList(true)">{{ filters.selProject.name }}</el-tag> <el-tag v-if="filters.selProject && !selProject" closable @close="clearProject" @click="showProjectList(true)">{{ filters.selProject.name }}</el-tag>
@ -36,8 +42,9 @@
</el-col> </el-col>
<el-col :span="24" style="padding-top:12px;"> <el-col :span="24" style="padding-top:12px;">
<font class="more-label-font">指派给:</font> <font class="more-label-font">指派给:</font>
<el-button v-if="!filters.handlerUsername" @click="showGroupUsers('handlerUsername')">选择被指派人</el-button>
<el-button v-if="!filters.handlerUsername" @click="showGroupUsers('handlerUsername')">选择被指派人</el-button>
<el-tag v-else closable @close="clearHandler" @click="showGroupUsers('handlerUsername')">{{filters.handlerUsername}}</el-tag> <el-tag v-else closable @close="clearHandler" @click="showGroupUsers('handlerUsername')">{{filters.handlerUsername}}</el-tag>
<el-button v-if="filters.handlerUserid!=userInfo.userid" @click="setFiltersHandlerAsMySelf">我的</el-button>
</el-col> </el-col>
<el-col :span="24" style="padding-top:5px;"> <el-col :span="24" style="padding-top:5px;">
<font class="more-label-font">故事:</font> <font class="more-label-font">故事:</font>
@ -58,6 +65,24 @@
</el-option> </el-option>
</el-select> </el-select>
</el-col> </el-col>
<el-col :span="24" style="padding-top:5px;">
<font class="more-label-font">创建时间:</font>
<el-date-picker
v-model="dateRanger"
type="daterange"
align="right"
unlink-panels
range-separator="至"
start-placeholder="开始日期"
end-placeholder="完成日期"
value-format="yyyy-MM-dd"
:default-time="['00:00:00','23:59:59']"
:picker-options="pickerOptions"
></el-date-picker>
</el-col>
<el-col :span="24" style="padding-top:5px;">
<el-button size="mini" type="primary" icon="el-icon-search" @click="searchXmQuestions">查询</el-button>
</el-col>
<el-col :span="24" style="padding-top:12px;"> <el-col :span="24" style="padding-top:12px;">
<el-button @click="handleExport" icon="el-icon-download">导出</el-button> <el-button @click="handleExport" icon="el-icon-download">导出</el-button>
</el-col> </el-col>
@ -146,6 +171,10 @@
<el-dialog append-to-body title="故事选择" :visible.sync="menuVisible" width="80%" :close-on-click-modal="false"> <el-dialog append-to-body title="故事选择" :visible.sync="menuVisible" width="80%" :close-on-click-modal="false">
<xm-menu-select :visible="menuVisible" :is-select-menu="true" :multi="true" @menus-selected="onSelectedMenus" ></xm-menu-select> <xm-menu-select :visible="menuVisible" :is-select-menu="true" :multi="true" @menus-selected="onSelectedMenus" ></xm-menu-select>
</el-dialog> </el-dialog>
<el-dialog title="选择产品" :visible.sync="productSelectVisible" width="80%" append-to-body :close-on-click-modal="false">
<xm-product-select :isSelectProduct="true" :selProject="filters.selProject" :visible="productSelectVisible" @cancel="productSelectVisible=false" @selected="onProductSelected"></xm-product-select>
</el-dialog>
</section> </section>
</template> </template>
@ -164,6 +193,8 @@
import XmGroupMng from '../xmProjectGroup/XmProjectGroupMng'; import XmGroupMng from '../xmProjectGroup/XmProjectGroupMng';
import XmProjectList from '../xmProject/XmProjectList'; import XmProjectList from '../xmProject/XmProjectList';
import XmProductSelect from '../xmProduct/XmProductSelect';//修改界面
export default { export default {
computed: { computed: {
...mapGetters([ ...mapGetters([
@ -186,6 +217,9 @@
} }
}, },
data() { data() {
const beginDate = new Date();
const endDate = new Date();
beginDate.setTime(beginDate.getTime() - 3600 * 1000 * 24 * 7 * 4 * 3 );
return { return {
filters: { filters: {
key: '', key: '',
@ -197,6 +231,7 @@
handlerUsername:'', handlerUsername:'',
selProject:null, selProject:null,
menus:[], menus:[],
product:null,
}, },
xmQuestions: [],//查询结果 xmQuestions: [],//查询结果
pageInfo:{//分页数据 pageInfo:{//分页数据
@ -232,7 +267,8 @@
}, },
/**begin 自定义属性请在下面加 请加备注**/ /**begin 自定义属性请在下面加 请加备注**/
selectUserVisible:false, selectUserVisible:false,
selectProjectVisible:false,
selectProjectVisible:false,
productSelectVisible:false,
nextAction:'', nextAction:'',
tableHeight:300, tableHeight:300,
cloumns: [ cloumns: [
@ -273,6 +309,11 @@
} }
], ],
menuVisible:false, menuVisible:false,
dateRanger: [
util.formatDate.format(beginDate, "yyyy-MM-dd"),
util.formatDate.format(endDate, "yyyy-MM-dd")
],
pickerOptions: util.pickerOptions('datarange'),
/**end 自定义属性请在上面加 请加备注**/ /**end 自定义属性请在上面加 请加备注**/
} }
@ -320,6 +361,12 @@
} }
params.orderBy= orderBys.join(",") params.orderBy= orderBys.join(",")
} }
if(!this.dateRanger || this.dateRanger.length==0){
this.$message({ message: "创建日期范围不能为空", type: 'error' });
return;
}
if( this.filters.bugStatus!=null && this.filters.bugStatus!="" ){ if( this.filters.bugStatus!=null && this.filters.bugStatus!="" ){
params.bugStatus=this.filters.bugStatus params.bugStatus=this.filters.bugStatus
} }
@ -340,6 +387,12 @@
}else if(this.filters.menus && this.filters.menus.length>1){ }else if(this.filters.menus && this.filters.menus.length>1){
params.menuIds=this.filters.menus.map(i=>i.menuId) params.menuIds=this.filters.menus.map(i=>i.menuId)
} }
if(this.filters.product){
params.productId=this.filters.product.id
}
params.createTimeStart=this.dateRanger[0]+" 00:00:00"
params.createTimeEnd=this.dateRanger[1]+" 23:59:59"
this.load.list = true; this.load.list = true;
if(this.filters.selProject){ if(this.filters.selProject){
params.projectId = this.filters.selProject.id; params.projectId = this.filters.selProject.id;
@ -368,6 +421,18 @@
}).catch( err => this.load.list = false ); }).catch( err => this.load.list = false );
}, },
clearProduct(){
this.filters.product=null;
this.searchXmQuestions();
},
showProductVisible(){
this.productSelectVisible=true;
},
onProductSelected(product){
this.filters.product=product;
this.productSelectVisible=false;
this.searchXmQuestions();
},
showMenu(){ showMenu(){
this.menuVisible=true; this.menuVisible=true;
}, },
@ -709,17 +774,24 @@
this.sendToProcessApprova(command.data,command.bizKey); this.sendToProcessApprova(command.data,command.bizKey);
} }
}, },
setFiltersHandlerAsMySelf(){
this.filters.handlerUserid=this.userInfo.userid;
this.filters.handlerUsername=this.userInfo.username;
this.searchXmQuestions();
}
},//end methods },//end methods
components: { components: {
'xm-question-add':XmQuestionAdd, 'xm-question-add':XmQuestionAdd,
'xm-question-edit':XmQuestionEdit, 'xm-question-edit':XmQuestionEdit,
XmGroupMng,XmProjectList,xmMenuSelect,
XmGroupMng,XmProjectList,xmMenuSelect,XmProductSelect
//在下面添加其它组件 //在下面添加其它组件
}, },
mounted() { mounted() {
if(this.selProject){ if(this.selProject){
this.filters.selProject=this.selProject this.filters.selProject=this.selProject
} }
this.filters.handlerUserid=this.userInfo.userid;
this.filters.handlerUsername=this.userInfo.username;
this.$nextTick(() => { this.$nextTick(() => {
var clientRect=this.$refs.table.$el.getBoundingClientRect(); var clientRect=this.$refs.table.$el.getBoundingClientRect();
var subHeight=50/1000 * window.innerHeight; var subHeight=50/1000 * window.innerHeight;

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

@ -2,8 +2,10 @@
<section> <section>
<el-row class="app-container"> <el-row class="app-container">
<div> <div>
<el-tag v-if=" filters.product " closable @close="clearProduct">{{this.filters.product.productName}}</el-tag>
<el-button v-else @click="showProductVisible" type="plian">选产品</el-button>
<el-button v-if=" !filters.menus || filters.menus.length==0" @click="showMenu"> 选择故事</el-button> <el-button v-if=" !filters.menus || filters.menus.length==0" @click="showMenu"> 选择故事</el-button>
<el-tag v-else closable @close="clearFiltersMneu(filters.menus[0])">{{filters.menus[0].menuName.substr(0,5)}}等({{filters.menus.length}})个</el-tag>
<el-tag v-else closable @close=" clearFiltersMenu(filters.menus[0])">{{filters.menus[0].menuName.substr(0,5)}}等({{filters.menus.length}})个</el-tag>
<el-input v-model="filters.key" style="width: 20%;" placeholder="模糊查询"> <el-input v-model="filters.key" style="width: 20%;" placeholder="模糊查询">
<template slot="append"> <template slot="append">
<el-button type="primary" v-loading="load.list" :disabled="load.list==true" v-on:click="searchXmTestCases" icon="el-icon-search"></el-button> <el-button type="primary" v-loading="load.list" :disabled="load.list==true" v-on:click="searchXmTestCases" icon="el-icon-search"></el-button>
@ -12,7 +14,56 @@
<el-button type="primary" v-if="!multiSelect" circle icon="el-icon-plus" @click="showAdd"></el-button> <el-button type="primary" v-if="!multiSelect" circle icon="el-icon-plus" @click="showAdd"></el-button>
<el-button type="primary" v-if="multiSelect" @click="selected">确认选中</el-button> <el-button type="primary" v-if="multiSelect" @click="selected">确认选中</el-button>
<el-button v-if="!multiSelect " type="danger" icon="el-icon-delete" v-loading="load.del" @click="batchDel" :disabled="this.sels.length===0 || load.del==true">批量删除</el-button> <el-button v-if="!multiSelect " type="danger" icon="el-icon-delete" v-loading="load.del" @click="batchDel" :disabled="this.sels.length===0 || load.del==true">批量删除</el-button>
<el-popover
placement="top-start"
title=""
width="400"
trigger="click" >
<el-row>
<el-col :span="24" style="padding-top:5px;">
<font class="more-label-font">产品:</font><el-tag v-if=" filters.product " closable @close="clearProduct">{{this.filters.product.productName}}</el-tag>
<el-button v-else @click="showProductVisible" type="plian">选产品</el-button>
</el-col>
<el-col :span="24" style="padding-top:5px;" v-if="!selProject" >
<font class="more-label-font">项目:</font><el-tag v-if=" filters.selProject " closable @close="clearProject">{{this.filters.selProject.name}}</el-tag>
<el-button v-else @click="showProjectList" type="plian">选项目</el-button>
</el-col>
<el-col :span="24" style="padding-top:5px;">
<font class="more-label-font">故事:</font>
<font v-if=" filters.menus && filters.menus.length>0">
<el-tag v-for="(item,index) in filters.menus" :key="index" closable @close="clearFiltersMenu(item)">{{item.menuName.substr(0,10)}}</el-tag>
</font>
<el-button v-else @click="showMenu" type="plian">选故事</el-button>
</el-col>
<el-col :span="24" style="padding-top:5px;">
<font class="more-label-font">更新人:</font>
<el-tag v-if=" filters.luser " closable @close="clearFiltersExecUser">{{this.filters.luser.username}}</el-tag>
<el-button v-else @click="showExecUsersForFilters" type="plian">选更新人</el-button>
<el-button v-if=" !filters.luser || filters.luser.userid!=userInfo.userid" @click="setFiltersHandlerAsMySelf">我的</el-button>
</el-col>
<el-col :span="24" style="padding-top:5px;">
<font class="more-label-font">创建时间:</font>
<el-date-picker
v-model="dateRanger"
class="hidden-sm-and-down"
type="daterange"
align="right"
unlink-panels
range-separator="至"
start-placeholder="开始日期"
end-placeholder="完成日期"
value-format="yyyy-MM-dd"
:default-time="['00:00:00','23:59:59']"
:picker-options="pickerOptions"
></el-date-picker>
</el-col>
<el-col :span="24" style="padding-top:5px;">
<el-button size="mini" type="primary" icon="el-icon-search" @click="searchXmTestCases">查询</el-button>
</el-col>
</el-row>
<el-button slot="reference" icon="el-icon-more" circle></el-button>
</el-popover>
</div> </div>
</el-row> </el-row>
<el-row class="app-container"> <el-row class="app-container">
@ -57,10 +108,20 @@
<el-dialog title="新增测试用例" :visible.sync="addFormVisible" width="80%" append-to-body :close-on-click-modal="false"> <el-dialog title="新增测试用例" :visible.sync="addFormVisible" width="80%" append-to-body :close-on-click-modal="false">
<xm-test-case-add :xm-test-case="addForm" :visible="addFormVisible" @cancel="addFormVisible=false" @submit="afterAddSubmit"></xm-test-case-add> <xm-test-case-add :xm-test-case="addForm" :visible="addFormVisible" @cancel="addFormVisible=false" @submit="afterAddSubmit"></xm-test-case-add>
</el-dialog> </el-dialog>
<el-dialog title="选中项目" :visible.sync="selectProjectVisible" width="80%" append-to-body :close-on-click-modal="false">
<xm-project-list @project-confirm="onPorjectConfirm"></xm-project-list>
</el-dialog>
<el-dialog title="选中用户" :visible.sync="selectUserForFiltersVisible" width="80%" append-to-body :close-on-click-modal="false">
<xm-group-mng v-if="filters.selProject" :sel-project=" filters.selProject " :is-select-single-user="1" @user-confirm="onFiltersUserConfirm"></xm-group-mng>
</el-dialog>
</el-row> </el-row>
<el-dialog append-to-body title="故事选择" :visible.sync="menuVisible" width="80%" :close-on-click-modal="false"> <el-dialog append-to-body title="故事选择" :visible.sync="menuVisible" width="80%" :close-on-click-modal="false">
<xm-menu-select :visible="menuVisible" :is-select-menu="true" :multi="true" @menus-selected="onSelectedMenus" ></xm-menu-select> <xm-menu-select :visible="menuVisible" :is-select-menu="true" :multi="true" @menus-selected="onSelectedMenus" ></xm-menu-select>
</el-dialog> </el-dialog>
<el-dialog title="选择产品" :visible.sync="productSelectVisible" width="80%" append-to-body :close-on-click-modal="false">
<xm-product-select :isSelectProduct="true" :selProject="filters.selProject" :visible="productSelectVisible" @cancel="productSelectVisible=false" @selected="onProductSelected"></xm-product-select>
</el-dialog>
</section> </section>
</template> </template>
@ -73,7 +134,10 @@
import XmTestCaseEdit from './XmTestCaseEdit';//修改界面 import XmTestCaseEdit from './XmTestCaseEdit';//修改界面
import { mapGetters } from 'vuex' import { mapGetters } from 'vuex'
import xmMenuSelect from '../xmMenu/XmMenuSelect'; import xmMenuSelect from '../xmMenu/XmMenuSelect';
import XmProductSelect from '../xmProduct/XmProductSelect';//修改界面
import XmProjectList from '../xmProject/XmProjectList';
import XmGroupMng from '../xmProjectGroup/XmProjectGroupMng';
export default { export default {
computed: { computed: {
@ -83,10 +147,15 @@
}, },
props:['multiSelect'], props:['multiSelect'],
data() { data() {
return {
const beginDate = new Date();
const endDate = new Date();
beginDate.setTime(beginDate.getTime() - 3600 * 1000 * 24 * 7 * 4 * 3 ); return {
filters: { filters: {
key: '', key: '',
menus:[], menus:[],
product:null,
selProject:null,
luser:null,
}, },
xmTestCases: [],//查询结果 xmTestCases: [],//查询结果
pageInfo:{//分页数据 pageInfo:{//分页数据
@ -110,6 +179,7 @@
}, },
editFormVisible: false,//编辑界面是否显示 editFormVisible: false,//编辑界面是否显示
productSelectVisible:false,
//编辑xmTestCase界面初始化数据 //编辑xmTestCase界面初始化数据
editForm: { editForm: {
id:'',caseName:'',caseRemark:'',testStep:'',expectResult:'',menuId:'',menuName:'',ctime:'',ltime:'',luserid:'',lusername:'',cbranchId:'',moduleId:'',moduleName:'',caseStatus:'' id:'',caseName:'',caseRemark:'',testStep:'',expectResult:'',menuId:'',menuName:'',ctime:'',ltime:'',luserid:'',lusername:'',cbranchId:'',moduleId:'',moduleName:'',caseStatus:''
@ -117,6 +187,16 @@
/**begin 自定义属性请在下面加 请加备注**/ /**begin 自定义属性请在下面加 请加备注**/
menuVisible:false, menuVisible:false,
tableHeight:300, tableHeight:300,
selectProjectVisible:false,
selectUserForFiltersVisible:false,
productSelectVisible:false,
nextAction:'',
dateRanger: [
util.formatDate.format(beginDate, "yyyy-MM-dd"),
util.formatDate.format(endDate, "yyyy-MM-dd")
],
pickerOptions: util.pickerOptions('datarange'),
/**end 自定义属性请在上面加 请加备注**/ /**end 自定义属性请在上面加 请加备注**/
} }
},//end data },//end data
@ -170,6 +250,22 @@
//params.xxx=xxxxx //params.xxx=xxxxx
} }
if(!this.dateRanger || this.dateRanger.length==0){
this.$message({ message: "创建日期范围不能为空", type: 'error' });
return;
}
if(this.filters.product){
params.productId=this.filters.product.id
}
if(this.filters.luser){
params.myUserid=this.filters.luser.userid
}
if(this.filters.selProject){
params.projectId=this.filters.selProject.id
}
params.ctimeStart=this.dateRanger[0]+" 00:00:00"
params.ctimeEnd=this.dateRanger[1]+" 23:59:59"
if(this.filters.key){ if(this.filters.key){
params.key='%'+this.filters.key+'%' params.key='%'+this.filters.key+'%'
} }
@ -269,6 +365,18 @@
}, },
/**begin 自定义函数请在下面加**/ /**begin 自定义函数请在下面加**/
clearProduct(){
this.filters.product=null;
this.searchXmTestCases();
},
showProductVisible(){
this.productSelectVisible=true;
},
onProductSelected(product){
this.filters.product=product;
this.productSelectVisible=false;
this.searchXmTestCases();
},
showMenu(){ showMenu(){
this.menuVisible=true; this.menuVisible=true;
}, },
@ -283,13 +391,61 @@
this.filters.menus=menus; this.filters.menus=menus;
this.getXmTestCases(); this.getXmTestCases();
}, },
clearFiltersMneu(menu){
clearFiltersMenu(menu){
var index=this.filters.menus.findIndex(i=>i.menuId==menu.menuId) var index=this.filters.menus.findIndex(i=>i.menuId==menu.menuId)
this.filters.menus.splice(index,1); this.filters.menus.splice(index,1);
this.getXmTestCases(); this.getXmTestCases();
}, },
selected(){ selected(){
this.$emit("selected",this.sels) this.$emit("selected",this.sels)
},
clearProject(){
this.filters.selProject=null
this.searchXmTestCases()
},
showProjectList:function(){
this.selectProjectVisible=true;
},
onPorjectConfirm:function(project){
this.filters.selProject=project
this.selectProjectVisible=false;
this.searchXmTestCases();
if(this.nextAction=="showExecUsersForFilters"){
this.showExecUsersForFilters();
this.nextAction=""
}
},
clearFiltersExecUser(){
this.filters.luser=null;
this.searchXmTestCases();
},
showExecUsersForFilters:function(){
if(!this.filters.selProject){
this.nextAction="showExecUsersForFilters"
this.showProjectList();
}else{
this.selectUserForFiltersVisible=true;
}
},
onFiltersUserConfirm:function(groupUsers){
if(groupUsers==null || groupUsers.length==0){
this.filters.luser=null
}else{
this.filters.luser=groupUsers[0]
}
if(this.nextAction=="showExecUsersForFilters"){
this.nextAction=""
}
this.selectUserForFiltersVisible=false
this.searchXmTestCases();
},
setFiltersHandlerAsMySelf(){
this.filters.luser=this.userInfo;
this.searchXmTestCases();
} }
/**end 自定义函数请在上面加**/ /**end 自定义函数请在上面加**/
@ -297,11 +453,12 @@
components: { components: {
'xm-test-case-add':XmTestCaseAdd, 'xm-test-case-add':XmTestCaseAdd,
'xm-test-case-edit':XmTestCaseEdit, 'xm-test-case-edit':XmTestCaseEdit,
xmMenuSelect,
xmMenuSelect,XmProductSelect,XmProjectList,XmGroupMng
//在下面添加其它组件 //在下面添加其它组件
}, },
mounted() { mounted() {
this.$nextTick(() => { this.$nextTick(() => {
this.filters.luser=this.userInfo;
this.getXmTestCases(); this.getXmTestCases();
var clientRect=this.$refs.table.$el.getBoundingClientRect(); var clientRect=this.$refs.table.$el.getBoundingClientRect();
var subHeight=65; var subHeight=65;
@ -324,4 +481,10 @@
<style scoped> <style scoped>
.more-label-font{
text-align:center;
float:left;
padding-top:10px;
}
</style> </style>

182
src/views/xm/core/xmTestCaseExec/XmTestCaseExecMng.vue
View File

@ -5,7 +5,7 @@
<el-tag type="primary" v-if="this.filters.selProject && !selProject " closable @close="clearProject" @click="showProjectList">{{ this.filters.selProject.name }}</el-tag> <el-tag type="primary" v-if="this.filters.selProject && !selProject " closable @close="clearProject" @click="showProjectList">{{ this.filters.selProject.name }}</el-tag>
<el-button v-if="!this.filters.selProject" @click="showProjectList">选择项目</el-button> <el-button v-if="!this.filters.selProject" @click="showProjectList">选择项目</el-button>
<el-button v-if=" !filters.menus || filters.menus.length==0" @click="showMenu"> 选择故事</el-button> <el-button v-if=" !filters.menus || filters.menus.length==0" @click="showMenu"> 选择故事</el-button>
<el-tag v-else closable @close="clearFiltersMneu(filters.menus[0])">{{filters.menus[0].menuName.substr(0,5)}}等({{filters.menus.length}})个</el-tag>
<el-tag v-else closable @close="clearFiltersMenu(filters.menus[0])">{{filters.menus[0].menuName.substr(0,5)}}等({{filters.menus.length}})个</el-tag>
<el-input v-model="filters.key" style="width: 20%;" placeholder="模糊查询"> <el-input v-model="filters.key" style="width: 20%;" placeholder="模糊查询">
<template slot="append"> <template slot="append">
<el-button type="primary" v-loading="load.list" :disabled="load.list==true" v-on:click="searchXmTestCaseExecs" icon="el-icon-search"></el-button> <el-button type="primary" v-loading="load.list" :disabled="load.list==true" v-on:click="searchXmTestCaseExecs" icon="el-icon-search"></el-button>
@ -13,8 +13,59 @@
</el-input> </el-input>
<el-button type="primary" @click="showCase" icon="el-icon-plus">由用例创建计划</el-button> <el-button type="primary" @click="showCase" icon="el-icon-plus">由用例创建计划</el-button>
<el-button @click="showBatchEdit" icon="el-icon-right">批量修改</el-button> <el-button @click="showBatchEdit" icon="el-icon-right">批量修改</el-button>
<!--<el-button type="danger" v-loading="load.del" @click="batchDel" icon="el-icon-delete" :disabled="this.sels.length===0 || load.del==true"></el-button>
-->
<el-popover
placement="top-start"
title=""
width="400"
trigger="click" >
<el-row>
<el-col :span="24" style="padding-top:5px;">
<font class="more-label-font">产品:</font><el-tag v-if=" filters.product " closable @close="clearProduct">{{this.filters.product.productName}}</el-tag>
<el-button v-else @click="showProductVisible" type="plian">选产品</el-button>
</el-col>
<el-col :span="24" style="padding-top:5px;" v-if="!selProject" >
<font class="more-label-font">项目:</font><el-tag v-if=" filters.selProject " closable @close="clearProject">{{this.filters.selProject.name}}</el-tag>
<el-button v-else @click="showProjectList" type="plian">选项目</el-button>
</el-col>
<el-col :span="24" style="padding-top:5px;">
<font class="more-label-font">故事:</font>
<font v-if=" filters.menus && filters.menus.length>0">
<el-tag v-for="(item,index) in filters.menus" :key="index" closable @close="clearFiltersMenu(item)">{{item.menuName.substr(0,10)}}</el-tag>
</font>
<el-button v-else @click="showMenu" type="plian">选故事</el-button>
</el-col>
<el-col :span="24" style="padding-top:5px;">
<font class="more-label-font">执行人:</font>
<el-tag v-if=" filters.execUser " closable @close="clearFiltersExecUser">{{this.filters.execUser.username}}</el-tag>
<el-button v-else @click="showExecUsersForFilters" type="plian">选执行人</el-button>
<el-button v-if=" !filters.execUser || filters.execUser.userid!=userInfo.userid" @click="setFiltersHandlerAsMySelf">我的</el-button>
</el-col>
<el-col :span="24" style="padding-top:5px;">
<font class="more-label-font">创建时间:</font>
<el-date-picker
v-model="dateRanger"
type="daterange"
align="right"
unlink-panels
range-separator="至"
start-placeholder="开始日期"
end-placeholder="完成日期"
value-format="yyyy-MM-dd"
:default-time="['00:00:00','23:59:59']"
:picker-options="pickerOptions"
></el-date-picker>
</el-col>
<el-col :span="24" style="padding-top:5px;">
<el-checkbox v-model="gstcVisible" >甘特图</el-checkbox>
</el-col>
<el-col :span="24" style="padding-top:5px;">
<el-button size="mini" type="primary" icon="el-icon-search" @click="searchXmTestCaseExecs">查询</el-button>
</el-col>
</el-row>
<el-button slot="reference" icon="el-icon-more" circle></el-button>
</el-popover>
</el-row> </el-row>
<el-row class="app-container" v-else> <el-row class="app-container" v-else>
<el-input v-model="filters.key" style="width: 20%;" placeholder="模糊查询"> <el-input v-model="filters.key" style="width: 20%;" placeholder="模糊查询">
@ -124,9 +175,11 @@
<el-dialog append-to-body title="故事选择" :visible.sync="menuVisible" fullscreen :close-on-click-modal="false"> <el-dialog append-to-body title="故事选择" :visible.sync="menuVisible" fullscreen :close-on-click-modal="false">
<xm-menu-select :visible="menuVisible" :is-select-menu="true" :multi="true" @menus-selected="onSelectedMenus" ></xm-menu-select> <xm-menu-select :visible="menuVisible" :is-select-menu="true" :multi="true" @menus-selected="onSelectedMenus" ></xm-menu-select>
</el-dialog> </el-dialog>
<el-dialog title="选中用户" :visible.sync="selectUserForFiltersVisible" width="80%" append-to-body :close-on-click-modal="false">
<xm-group-mng v-if="filters.selProject" :sel-project=" filters.selProject " :is-select-single-user="1" @user-confirm="onFiltersUserConfirm"></xm-group-mng>
</el-dialog>
<el-dialog title="选中用户" :visible.sync="selectUserVisible" width="80%" append-to-body :close-on-click-modal="false"> <el-dialog title="选中用户" :visible.sync="selectUserVisible" width="80%" append-to-body :close-on-click-modal="false">
<xm-group-mng :sel-project=" filters.selProject " :is-select-single-user="1" @user-confirm="onUserConfirm"></xm-group-mng>
<xm-group-mng v-if="filters.selProject" :sel-project=" filters.selProject " :is-select-single-user="1" @user-confirm="onUserConfirm"></xm-group-mng>
</el-dialog> </el-dialog>
<el-dialog title="选中任务" :visible.sync="selectTaskVisible" width="80%" append-to-body :close-on-click-modal="false"> <el-dialog title="选中任务" :visible.sync="selectTaskVisible" width="80%" append-to-body :close-on-click-modal="false">
<xm-task-list :sel-project="filters.selProject" @task-selected="onSelectedTask"></xm-task-list> <xm-task-list :sel-project="filters.selProject" @task-selected="onSelectedTask"></xm-task-list>
@ -142,6 +195,9 @@
<xm-question-mng :xm-test-case="xmTestCase" :xm-test-case-exec="editForm" :sel-project="filters.selProject" :visible="bugsVisible" @cancel="bugsVisible=false" ></xm-question-mng> <xm-question-mng :xm-test-case="xmTestCase" :xm-test-case-exec="editForm" :sel-project="filters.selProject" :visible="bugsVisible" @cancel="bugsVisible=false" ></xm-question-mng>
</el-dialog> </el-dialog>
<el-dialog title="选择产品" :visible.sync="productSelectVisible" width="80%" append-to-body :close-on-click-modal="false">
<xm-product-select :isSelectProduct="true" :selProject="filters.selProject" :visible="productSelectVisible" @cancel="productSelectVisible=false" @selected="onProductSelected"></xm-product-select>
</el-dialog>
<!--新增 XmQuestion xm_question界面--> <!--新增 XmQuestion xm_question界面-->
<el-dialog title="新增问题" :visible.sync="addBugVisible" fullscreen width="100%" append-to-body :close-on-click-modal="false"> <el-dialog title="新增问题" :visible.sync="addBugVisible" fullscreen width="100%" append-to-body :close-on-click-modal="false">
<xm-question-add :xm-test-case-exec="editForm" :xm-test-case="xmTestCase" :qtype="'bug'" :sel-project=" filters.selProject " :visible="addBugVisible" @cancel="addBugVisible=false"></xm-question-add> <xm-question-add :xm-test-case-exec="editForm" :xm-test-case="xmTestCase" :qtype="'bug'" :sel-project=" filters.selProject " :visible="addBugVisible" @cancel="addBugVisible=false"></xm-question-add>
@ -168,7 +224,8 @@
import XmTaskList from '../xmTask/XmTaskList'; import XmTaskList from '../xmTask/XmTaskList';
import XmTestCaseEdit from '../xmTestCase/XmTestCaseEdit';//修改界面 import XmTestCaseEdit from '../xmTestCase/XmTestCaseEdit';//修改界面
import XmQuestionMng from '../xmQuestion/XmQuestionMng';//修改界面 import XmQuestionMng from '../xmQuestion/XmQuestionMng';//修改界面
import XmQuestionAdd from '../xmQuestion/XmQuestionAdd';//修改界面
import XmQuestionAdd from '../xmQuestion/XmQuestionAdd';//修改界面
import XmProductSelect from '../xmProduct/XmProductSelect';//修改界面
import XmGantt from '../components/xm-gantt'; import XmGantt from '../components/xm-gantt';
import { mapGetters } from 'vuex' import { mapGetters } from 'vuex'
@ -187,11 +244,17 @@
} }
}, },
data() { data() {
const beginDate = new Date();
const endDate = new Date();
beginDate.setTime(beginDate.getTime() - 3600 * 1000 * 24 * 7 * 4 * 3 );
return { return {
filters: { filters: {
key: '', key: '',
selProject:null, selProject:null,
menus:[], menus:[],
execUser:null,
product:null,
}, },
xmTestCaseExecs: [],//查询结果 xmTestCaseExecs: [],//查询结果
pageInfo:{//分页数据 pageInfo:{//分页数据
@ -226,23 +289,29 @@
batchEditVisible:false, batchEditVisible:false,
valueChangeRows:[], valueChangeRows:[],
selectUserVisible:false, selectUserVisible:false,
selectUserForFiltersVisible:false,
selectTaskVisible:false, selectTaskVisible:false,
caseVisible:false, caseVisible:false,
bugsVisible:false, bugsVisible:false,
addBugVisible:false, addBugVisible:false,
productSelectVisible:false,
nextAction:'', nextAction:'',
pickerOptions: util.pickerOptions(),
gstcVisible:false,
ganrrColumns: {
children: 'children',
name: 'projectName',
id: 'id',
pid: 'parentPhaseId',
startDate: 'startTime',
endDate: 'endTime',
dateRanger: [
util.formatDate.format(beginDate, "yyyy-MM-dd"),
util.formatDate.format(endDate, "yyyy-MM-dd")
],
pickerOptions: util.pickerOptions('datarange'),
gstcVisible:false,
ganrrColumns: {
children: 'children',
name: 'projectName',
id: 'id',
pid: 'parentPhaseId',
startDate: 'startTime',
endDate: 'endTime',
},
tableHeight:300,
},
tableHeight:300,
/**end 自定义属性请在上面加 请加备注**/ /**end 自定义属性请在上面加 请加备注**/
} }
},//end data },//end data
@ -288,9 +357,6 @@
} }
params.orderBy= orderBys.join(",") params.orderBy= orderBys.join(",")
} }
if(this.filters.selProject){
params.projectId=this.filters.selProject.id
}
if(this.filters.menus && this.filters.menus.length==1){ if(this.filters.menus && this.filters.menus.length==1){
params.menuId=this.filters.menus[0].menuId params.menuId=this.filters.menus[0].menuId
@ -298,8 +364,23 @@
params.menuIds=this.filters.menus.map(i=>i.menuId) params.menuIds=this.filters.menus.map(i=>i.menuId)
}else{ }else{
//params.xxx=xxxxx //params.xxx=xxxxx
}
if(!this.dateRanger || this.dateRanger.length==0){
this.$message({ message: "创建日期范围不能为空", type: 'error' });
return;
}
if(this.filters.product){
params.productId=this.filters.product.id
} }
if(this.filters.execUser){
params.execUserid=this.filters.execUser.userid
}
if(this.filters.selProject){
params.projectId=this.filters.selProject.id
}
params.createTimeStart=this.dateRanger[0]+" 00:00:00"
params.createTimeEnd=this.dateRanger[1]+" 23:59:59"
if(this.filters.key){ if(this.filters.key){
params.key='%'+this.filters.key+'%' params.key='%'+this.filters.key+'%'
} }
@ -449,14 +530,22 @@
this.getXmTestCaseExecs(); this.getXmTestCaseExecs();
if(this.nextAction=="showBatchEdit"){ if(this.nextAction=="showBatchEdit"){
this.showBatchEdit(); this.showBatchEdit();
this.nextAction=""
}else if(this.nextAction=="showCase"){ }else if(this.nextAction=="showCase"){
this.showCase(); this.showCase();
this.nextAction=""
}else if(this.nextAction=="showAddBug"){ }else if(this.nextAction=="showAddBug"){
this.showAddBug(this.editForm); this.showAddBug(this.editForm);
this.nextAction=""
}else if(this.nextAction=="showBugs"){ }else if(this.nextAction=="showBugs"){
this.showBugs(this.editForm); this.showBugs(this.editForm);
this.nextAction=""
}else if(this.nextAction=="showSelectTask"){ }else if(this.nextAction=="showSelectTask"){
this.showSelectTask(this.editForm); this.showSelectTask(this.editForm);
this.nextAction=""
}else if(this.nextAction=="showExecUsersForFilters"){
this.showExecUsersForFilters();
this.nextAction=""
} }
}, },
formatterExecStatus(row,column,cellValue, index){ formatterExecStatus(row,column,cellValue, index){
@ -474,7 +563,18 @@
showMenu(){ showMenu(){
this.menuVisible=true; this.menuVisible=true;
}, },
clearProduct(){
this.filters.product=null;
this.searchXmTestCaseExecs();
},
showProductVisible(){
this.productSelectVisible=true;
},
onProductSelected(product){
this.filters.product=product;
this.productSelectVisible=false;
this.searchXmTestCaseExecs();
},
onSelectedMenus(menus){ onSelectedMenus(menus){
if(!menus || menus.length==0){ if(!menus || menus.length==0){
this.menuVisible=false this.menuVisible=false
@ -485,7 +585,7 @@
this.filters.menus=menus; this.filters.menus=menus;
this.getXmTestCaseExecs(); this.getXmTestCaseExecs();
}, },
clearFiltersMneu(menu){
clearFiltersMenu(menu){
var index=this.filters.menus.findIndex(i=>i.menuId==menu.menuId) var index=this.filters.menus.findIndex(i=>i.menuId==menu.menuId)
this.filters.menus.splice(index,1); this.filters.menus.splice(index,1);
this.getXmTestCaseExecs(); this.getXmTestCaseExecs();
@ -548,6 +648,31 @@
this.editForm=row this.editForm=row
this.selectUserVisible=true; this.selectUserVisible=true;
}, },
clearFiltersExecUser(){
this.filters.execUser=null;
this.searchXmTestCaseExecs();
},
showExecUsersForFilters:function(){
if(!this.filters.selProject){
this.nextAction="showExecUsersForFilters"
this.showProjectList();
}else{
this.selectUserForFiltersVisible=true;
}
},
onFiltersUserConfirm:function(groupUsers){
if(groupUsers==null || groupUsers.length==0){
this.filters.execUser=null
}else{
this.filters.execUser=groupUsers[0]
}
if(this.nextAction=="showExecUsersForFilters"){
this.nextAction=""
}
this.selectUserForFiltersVisible=false
this.searchXmTestCaseExecs();
},
onUserConfirm:function(groupUsers){ onUserConfirm:function(groupUsers){
if(groupUsers==null || groupUsers.length==0){ if(groupUsers==null || groupUsers.length==0){
this.editForm.execUserid="" this.editForm.execUserid=""
@ -627,15 +752,20 @@
}, },
/**end 自定义函数请在上面加**/ /**end 自定义函数请在上面加**/
setFiltersHandlerAsMySelf(){
this.filters.execUser=this.userInfo;
this.searchXmTestCaseExecs();
},
},//end methods },//end methods
components: { components: {
'xm-test-case-exec-add':XmTestCaseExecAdd, 'xm-test-case-exec-add':XmTestCaseExecAdd,
'xm-test-case-exec-edit':XmTestCaseExecEdit, 'xm-test-case-exec-edit':XmTestCaseExecEdit,
XmTestCaseMng,XmProjectList,xmMenuSelect,XmGroupMng,XmTaskList,XmTestCaseEdit,XmQuestionMng,XmQuestionAdd, XmGantt
XmTestCaseMng,XmProjectList,xmMenuSelect,XmGroupMng,XmTaskList,XmTestCaseEdit,XmQuestionMng,XmQuestionAdd, XmGantt,XmProductSelect
//在下面添加其它组件 //在下面添加其它组件
}, },
mounted() { mounted() {
this.filters.selProject=this.selProject; this.filters.selProject=this.selProject;
this.filters.execUser=this.userInfo;
this.$nextTick(() => { this.$nextTick(() => {
var clientRect=this.$refs.table.$el.getBoundingClientRect(); var clientRect=this.$refs.table.$el.getBoundingClientRect();
var subHeight=65/1000 * window.innerHeight; var subHeight=65/1000 * window.innerHeight;
@ -658,4 +788,10 @@
</script> </script>
<style lang="scss" scoped> <style lang="scss" scoped>
.more-label-font{
text-align:center;
float:left;
padding-top:10px;
}
</style> </style>
Write Preview
Loading…
Cancel
Save