diff --git a/src/api/xm/core/xmTestPlanCase.js b/src/api/xm/core/xmTestPlanCase.js
index 9b87a524..dbfca956 100644
--- a/src/api/xm/core/xmTestPlanCase.js
+++ b/src/api/xm/core/xmTestPlanCase.js
@@ -15,6 +15,13 @@ let base = config.getCoreBasePath();
//普通查询 条件之间and关系
export const listXmTestPlanCase = params => { return axios.get(`${base}/xm/core/xmTestPlanCase/list`, { params: params }); };
+//查询执行结果分布
+export const getXmTestPlanCaseExecStatusDist = params => { return axios.get(`${base}/xm/core/xmTestPlanCase/getXmTestPlanCaseExecStatusDist`, { params: params }); };
+
+//查询执行结果分布
+export const getXmTestPlanCaseUserDist = params => { return axios.get(`${base}/xm/core/xmTestPlanCase/getXmTestPlanCaseUserDist`, { params: params }); };
+
+
//删除一条测试计划与用例关系表 params={caseId:'测试用例编号 主键',planId:'计划编号 主键'}
export const delXmTestPlanCase = params => { return axios.post(`${base}/xm/core/xmTestPlanCase/del`,params); };
diff --git a/src/views/xm/core/xmTestPlan/rpt/CompsCard.vue b/src/views/xm/core/xmTestPlan/rpt/CompsCard.vue
index 91297aec..2368f794 100644
--- a/src/views/xm/core/xmTestPlan/rpt/CompsCard.vue
+++ b/src/views/xm/core/xmTestPlan/rpt/CompsCard.vue
@@ -56,7 +56,8 @@ import xmQuestionDayTrend from '@/views/xm/core/xmTestPlan/rpt/biz/questionDayTr
import xmQuestionDayAccumulate from '@/views/xm/core/xmTestPlan/rpt/biz/questionDayAccumulate'
import xmQuestionAttDist from '@/views/xm/core/xmTestPlan/rpt/biz/questionAttDist'
import xmQuestionSort from '@/views/xm/core/xmTestPlan/rpt/biz/questionSort'
-import xmTestPlanCaseResultDist from '@/views/xm/core/xmTestPlan/rpt/biz/testPlanCaseResultDist'
+import xmTestPlanCaseExecStatusDist from '@/views/xm/core/xmTestPlan/rpt/biz/testPlanCaseExecStatusDist'
+import xmTestPlanCaseUserDist from '@/views/xm/core/xmTestPlan/rpt/biz/testPlanCaseUserDist'
import { initDicts,listXmRptConfig, delXmRptConfig, batchDelXmRptConfig,editSomeFieldsXmRptConfig } from '@/api/xm/core/xmRptConfig';
@@ -71,7 +72,8 @@ export default {
xmQuestionDayAccumulate,
xmQuestionAttDist,
xmQuestionSort,
- xmTestPlanCaseResultDist,
+ xmTestPlanCaseExecStatusDist,
+ xmTestPlanCaseUserDist,
CompsSet,
},
@@ -98,12 +100,11 @@ export default {
maxTableHeight:300,
// 布局位置数据
layout: [
- { i: 0, x: 0, y: 12, w: 12, h: 4, compId:'XmQuestionAgeDist', },
- { i: 1, x: 0, y: 12, w: 12, h: 4, compId:'xmQuestionDayTrend', },
- { i: 2, x: 0, y: 12, w: 12, h: 4, compId:'xmQuestionDayAccumulate', },
+ { i: 0, x: 0, y: 12, w: 12, h: 4, compId:'XmQuestionAgeDist', },
{ i: 3, x: 0, y: 12, w: 12, h: 4, compId:'xmQuestionAttDist', },
{ i: 4, x: 0, y: 12, w: 12, h: 4, compId:'xmQuestionSort', },
- { i: 4, x: 0, y: 12, w: 12, h: 4, compId:'xmTestPlanCaseResultDist', },
+ { i: 4, x: 0, y: 12, w: 12, h: 4, compId:'xmTestPlanCaseExecStatusDist', },
+ { i: 4, x: 0, y: 12, w: 12, h: 4, compId:'xmTestPlanCaseUserDist', },
],
diff --git a/src/views/xm/core/xmTestPlan/rpt/CompsSet.vue b/src/views/xm/core/xmTestPlan/rpt/CompsSet.vue
index ca51f6be..3d79b7c6 100644
--- a/src/views/xm/core/xmTestPlan/rpt/CompsSet.vue
+++ b/src/views/xm/core/xmTestPlan/rpt/CompsSet.vue
@@ -60,14 +60,14 @@ export default {
isChecked: false,
},
{
- compId: 'xmTestPlanCaseResultDist',
+ compId: 'xmTestPlanCaseExecStatusDist',
icon: img3,
compName: '执行结果分布',
compDesc: '可以直接显示全部项目列表,也可根据项目状态产品筛选单条项目',
isChecked: false,
},
{
- compId: 'xmTestPlanCaseUserResultDist',
+ compId: 'xmTestPlanCaseUserDist',
icon: img3,
compName: '成员执行结果分布',
compDesc: '可以直接显示全部项目列表,也可根据项目状态产品筛选单条项目',
diff --git a/src/views/xm/core/xmTestPlan/rpt/biz/testPlanCaseResultDist.vue b/src/views/xm/core/xmTestPlan/rpt/biz/testPlanCaseExecStatusDist.vue
similarity index 84%
rename from src/views/xm/core/xmTestPlan/rpt/biz/testPlanCaseResultDist.vue
rename to src/views/xm/core/xmTestPlan/rpt/biz/testPlanCaseExecStatusDist.vue
index ce72aaf0..f25708c4 100644
--- a/src/views/xm/core/xmTestPlan/rpt/biz/testPlanCaseResultDist.vue
+++ b/src/views/xm/core/xmTestPlan/rpt/biz/testPlanCaseExecStatusDist.vue
@@ -6,14 +6,14 @@
- 查询
+ 查询
@@ -26,7 +26,7 @@
import { initSimpleDicts } from '@/api/mdp/meta/item';//下拉框数据查询
import { mapGetters } from 'vuex'
- import { getXmTestPlanCaseResultDist } from '@/api/xm/core/xmTestPlanCase';
+ import { getXmTestPlanCaseExecStatusDist } from '@/api/xm/core/xmTestPlanCase';
import XmIterationSelect from '@/views/xm/core/components/XmIterationSelect.vue';//修改界面
import XmProductSelect from '@/views/xm/core/components/XmProductSelect';//新增界面
@@ -41,12 +41,12 @@
...mapGetters([
'userInfo','roles'
]),
- xmTestPlanCaseResultDistsCpd(){
- if(this.xmTestPlanCaseResultDists.length==0){
+ xmTestPlanCaseExecStatusDistsCpd(){
+ if(this.xmTestPlanCaseExecStatusDists.length==0){
return []
}else{
var itemId="testPlanTcode";
- return this.xmTestPlanCaseResultDists.map(i=>{
+ return this.xmTestPlanCaseExecStatusDists.map(i=>{
var data={...i}
data.name=this.formatDict(itemId,data.name)
return data;
@@ -63,7 +63,7 @@
},
watch: {
- xmTestPlanCaseResultDistsCpd(){
+ xmTestPlanCaseExecStatusDistsCpd(){
this.drawCharts();
}
},
@@ -78,7 +78,7 @@
dateRanger:[],
maxTableHeight:300,
visible:false,
- xmTestPlanCaseResultDists:[],
+ xmTestPlanCaseExecStatusDists:[],
conditionBtnVisible:false,
}//end return
@@ -95,7 +95,7 @@
return val;
},
drawCharts() {
- this.myChart = this.$echarts.init(document.getElementById("xmTestPlanCaseResultDist"));
+ this.myChart = this.$echarts.init(document.getElementById("xmTestPlanCaseExecStatusDist"));
this.myChart.setOption(
{
title: {
@@ -114,7 +114,7 @@
{
type: 'pie',
radius: '50%',
- data: this.xmTestPlanCaseResultDistsCpd,
+ data: this.xmTestPlanCaseExecStatusDistsCpd,
emphasis: {
itemStyle: {
shadowBlur: 10,
@@ -133,12 +133,12 @@
)
},
onXmQuestionSomeFieldsChange(fieldName,$event){
- this.xmTestPlanCaseResultDists=[]
+ this.xmTestPlanCaseExecStatusDists=[]
},
- searchXmTestPlanCaseResultDist(){
+ searchXmTestPlanCaseExecStatusDist(){
var params={...this.filters}
- getXmTestPlanCaseResultDist(params).then(res=>{
- this.xmTestPlanCaseResultDists=res.data.data
+ getXmTestPlanCaseExecStatusDist(params).then(res=>{
+ this.xmTestPlanCaseExecStatusDists=res.data.data
})
},
@@ -179,7 +179,7 @@
this.dicts=res.data.data;
})
this.initData();
- this.searchXmTestPlanCaseResultDist();
+ this.searchXmTestPlanCaseExecStatusDist();
//this.charts();
//this.drawCharts();
diff --git a/src/views/xm/core/xmTestPlan/rpt/biz/testPlanCaseUserDist.vue b/src/views/xm/core/xmTestPlan/rpt/biz/testPlanCaseUserDist.vue
new file mode 100644
index 00000000..53021e0d
--- /dev/null
+++ b/src/views/xm/core/xmTestPlan/rpt/biz/testPlanCaseUserDist.vue
@@ -0,0 +1,196 @@
+
+
+
+ {{comp?comp.compName:'成员执行结果分布'}}
+
+
+
+
+ 查询
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file