报表优化

3 years ago · e3f23a16db
12 changed files with 70 additions and 72 deletions
--- a/src/views/xm/rpt/product/questionAgeDist.vue
+++ b/src/views/xm/rpt/product/questionAgeDist.vue
@ -179,9 +179,7 @@
 				this.filters.project=this.xmProject
 				this.filters.iteration=this.xmIteration
 				this.filters.testCasedb=this.xmTestCasedb
-				if((this.filters.product && this.filters.product.id) || ( this.filters.iteration && this.filters.iteration.id)){
 				this.searchXmQuestionAgeDist()
-				}
 				
 			},
 			drawCharts() {
--- a/src/views/xm/rpt/product/questionAttDist.vue
+++ b/src/views/xm/rpt/product/questionAttDist.vue
@ -248,10 +248,7 @@
 				this.filters.project=this.xmProject
 				this.filters.iteration=this.xmIteration
 				this.filters.testCasedb=this.xmTestCasedb
-				
-				if((this.filters.product && this.filters.product.id) || ( this.filters.iteration && this.filters.iteration.id)){
 				this.searchXmQuestionAttDist()
-				}
 			},
 			drawCharts() {
 				this.myChart = this.$echarts.init(document.getElementById("xmQuestionAttDist")); 
--- a/src/views/xm/rpt/product/questionRetestDist.vue
+++ b/src/views/xm/rpt/product/questionRetestDist.vue
@ -214,9 +214,7 @@
 				this.filters.iteration=this.xmIteration
 				this.filters.testCasedb=this.xmTestCasedb
 				
-				if((this.filters.product && this.filters.product.id) || ( this.filters.iteration && this.filters.iteration.id)){
 				this.searchXmQuestionRetestDist()
-				}
 			},
 			drawCharts() {
 				this.myChart = this.$echarts.init(document.getElementById("xmQuestionRetestDist")); 
--- a/src/views/xm/rpt/product/questionSort.vue
+++ b/src/views/xm/rpt/product/questionSort.vue
@ -203,9 +203,7 @@
 				if(this.initGroupBy){
 					this.groupBy=this.initGroupBy
 				}
-				if((this.filters.product && this.filters.product.id) || ( this.filters.iteration && this.filters.iteration.id)){
 				this.searchXmQuestionSort()
-				}
 			},
 			drawCharts() {
 				this.myChart = this.$echarts.init(document.getElementById("xmQuestionSort")); 
--- a/src/views/xm/rpt/project/projectWorkItemDayList.vue
+++ b/src/views/xm/rpt/project/projectWorkItemDayList.vue
@ -2,7 +2,7 @@
 	<section>
        <el-dialog :title="(filters.project?'【'+filters.project.name+'】':'')+'工作项按日分布趋势图'" fullscreen append-to-body modal-append-to-body width="80%" top="20px" :visible.sync="visible">
 
-			<el-row :gutter="5">
+			<el-row :gutter="5" v-if="visible">
 				<el-col :span="18"> 
 					<div> 
 						<div class="main" id="projectWorkItemDayList" style="width:100%;height:600px;margin:0 auto;"></div> 
@ -10,8 +10,9 @@
 				</el-col>
 				<el-col :span="6" class="border">
 					<el-form   :model="filters" class="padding"> 
-					<el-form-item label="归属项目" v-if="!xmProject">
-							 <xm-project-select  ref="xmProjectSelect" style="display:inline;"  :auto-select="false" :link-project-id="xmProject?xmProject.id:null" @row-click="onProjectSelected"   @clear="onProjectClear"></xm-project-select>
+					<el-form-item label="归属项目" >
+						<xm-project-select v-if="!xmProject || !xmProject.id" ref="xmProjectSelect" style="display:inline;"  :auto-select="false" :link-project-id="xmProject?xmProject.id:null" @row-click="onProjectSelected"   @clear="onProjectClear"></xm-project-select>
+						<span v-else>{{xmProject.id}} <span v-if="xmProject.name"><br/>{{  xmProject.name  }} </span> </span> 
 					</el-form-item>   
 					<el-form-item label="日期区间">
 						<br>
@ -102,9 +103,9 @@
 			},
 			open(params){
 				this.visible=true;
-				this.filters.product=params.xmProduct
-				this.filters.project=params.xmProject
-				this.filters.iteration=params.xmIteration
+				this.filters.product=this.xmProduct
+				this.filters.project=this.xmProject
+				this.filters.iteration=this.xmIteration 
 				this.xmProjectStateHiss=[]
 				
 				this.$nextTick(()=>{
--- a/src/views/xm/rpt/project/projectWorkloadSetDayList.vue
+++ b/src/views/xm/rpt/project/projectWorkloadSetDayList.vue
@ -2,7 +2,7 @@
 	<section>
        <el-dialog fullscreen :title="(filters.project?'【'+(filters.project.name?filters.project.name:filters.project.id)+'】':'')+'结算工时按日分布趋势图'" append-to-body modal-append-to-body width="80%" top="20px" :visible.sync="visible">
 
-			<el-row :gutter="5">
+			<el-row :gutter="5" v-if="visible">
 				<el-col :span="18"> 
 					<div> 
 						<div class="main" :id="id" style="width:100%;height:600px;margin:0 auto;"></div> 
@ -10,8 +10,9 @@
 				</el-col>
 				<el-col :span="6" class="border">
 					<el-form   :model="filters" class="padding"> 
-					<el-form-item label="归属项目" v-if="!xmProject">
-							 <xm-project-select  v-if="!xmProject"  ref="xmProjectSelect" style="display:inline;"  :auto-select="false" :link-project-id="xmProject?xmProject.id:null" @row-click="onProjectSelected"   @clear="onProjectClear"></xm-project-select>
+					<el-form-item label="归属项目" >
+						<xm-project-select v-if="!xmProject || !xmProject.id" ref="xmProjectSelect" style="display:inline;"  :auto-select="false" :link-project-id="xmProject?xmProject.id:null" @row-click="onProjectSelected"   @clear="onProjectClear"></xm-project-select>
+						<span v-else>{{xmProject.id}} <span v-if="xmProject.name"><br/>{{  xmProject.name  }} </span> </span> 
 					</el-form-item>  
 					<el-form-item label="人员编号">
 						<mdp-select-user-xm label="选择人员" :clearable="true" v-model="filters" userid-key="userid" username-key="username" :project-id="filters.project?filters.project.id:null"></mdp-select-user-xm>
@ -122,9 +123,9 @@
 			},
 			open(params){
 				this.visible=true;
-				this.filters.product=params.xmProduct
-				this.filters.project=params.xmProject
-				this.filters.iteration=params.xmIteration
+				this.filters.product=this.xmProduct
+				this.filters.project=this.xmProject
+				this.filters.iteration=this.xmIteration 
 				this.xmProjectWorkloadSetDays=[] 
 				this.$nextTick(()=>{
 					if(this.$refs['xmProjectSelect'])this.$refs['xmProjectSelect'].clearSelect();
--- a/src/views/xm/rpt/project/projectWorkloadSetMonthList.vue
+++ b/src/views/xm/rpt/project/projectWorkloadSetMonthList.vue
@ -2,7 +2,7 @@
 	<section>
        <el-dialog fullscreen :title="(filters.project?'【'+filters.project.name+'】':'')+'结算工时按月分布趋势图'" append-to-body modal-append-to-body width="80%" top="20px" :visible.sync="visible">
 
-			<el-row :gutter="5">
+			<el-row :gutter="5" v-if="visible">
 				<el-col :span="18"> 
 					<div> 
 						<div class="main" id="projectWorkloadSetMonthList" style="width:100%;height:600px;margin:0 auto;"></div> 
@ -10,8 +10,9 @@
 				</el-col>
 				<el-col :span="6" class="border">
 					<el-form   :model="filters" class="padding"> 
-					<el-form-item label="归属项目" v-if="!xmProject">
-							 <xm-project-select  v-if="!xmProject"  ref="xmProjectSelect" style="display:inline;"  :auto-select="false" :link-project-id="xmProject?xmProject.id:null" @row-click="onProjectSelected"   @clear="onProjectClear"></xm-project-select>
+					<el-form-item label="归属项目" >
+						<xm-project-select v-if="!xmProject || !xmProject.id" ref="xmProjectSelect" style="display:inline;"  :auto-select="false" :link-project-id="xmProject?xmProject.id:null" @row-click="onProjectSelected"   @clear="onProjectClear"></xm-project-select>
+						<span v-else>{{xmProject.id}} <span v-if="xmProject.name"><br/>{{  xmProject.name  }} </span> </span> 
 					</el-form-item>  
 					<el-form-item label="人员编号">
 						<mdp-select-user-xm label="选择人员" :clearable="true" v-model="filters" userid-key="userid" username-key="username" :project-id="filters.project?filters.project.id:null"></mdp-select-user-xm>
@ -121,9 +122,9 @@
 			},
 			open(params){
 				this.visible=true;
-				this.filters.product=params.xmProduct
-				this.filters.project=params.xmProject
-				this.filters.iteration=params.xmIteration
+				this.filters.product=this.xmProduct
+				this.filters.project=this.xmProject
+				this.filters.iteration=this.xmIteration 
 				this.xmProjectWorkloadSetMonths=[]
 				
 				this.$nextTick(()=>{
--- a/src/views/xm/rpt/project/taskAgeDist.vue
+++ b/src/views/xm/rpt/project/taskAgeDist.vue
@ -1,7 +1,7 @@
 <template>
 	<section>
        <el-dialog fullscreen :title="(filters.project?'【'+filters.project.name+'】':'')+'任务属性分布'" append-to-body modal-append-to-body width="80%" top="20px" :visible.sync="visible">
-			<el-row :gutter="5">
+			<el-row :gutter="5" v-if="visible">
 				<el-col :span="18"> 
 					<div>
 						<div class="main" id="xmTaskAgeDist"
@ -11,8 +11,9 @@
 				</el-col>
 				<el-col :span="6" class="border">
 					<el-form  :model="filters" class="padding">   
-						<el-form-item label="归属项目" v-if="!xmProject">
-							 <xm-project-select  v-if="!xmProject"  ref="xmProjectSelect" style="display:inline;"  :auto-select="false" :link-project-id="xmProject?xmProject.id:null" @row-click="onProjectSelected"  :iterationId="xmIteration?xmIteration.id:null"  @clear="onProjectClear"></xm-project-select>
+						<el-form-item label="归属项目" >
+							<xm-project-select v-if="!xmProject || !xmProject.id" ref="xmProjectSelect" style="display:inline;"  :auto-select="false" :link-project-id="xmProject?xmProject.id:null" @row-click="onProjectSelected"   @clear="onProjectClear"></xm-project-select>
+							<span v-else>{{xmProject.id}} <span v-if="xmProject.name"><br/>{{  xmProject.name  }} </span> </span> 
 						</el-form-item>  
 						 <el-form-item label="任务状态" prop="taskState">
 							<el-select   v-model="filters.taskState"  @change="onXmTaskSomeFieldsChange('taskState',$event)" clearable>
@ -111,10 +112,10 @@
 		methods: {   
 			open(params){
 				this.visible=true;
-				this.filters.product=params.xmProduct
-				this.filters.project=params.xmProject
-				this.filters.Product=params.xmProduct 
-				
+				this.filters.product=this.xmProduct
+				this.filters.project=this.xmProject
+				this.filters.iteration=this.xmIteration 
+				this.searchXmTaskAgeDist();
 			},
 			drawCharts() {
 				this.myChart = this.$echarts.init(document.getElementById("xmTaskAgeDist")); 
--- a/src/views/xm/rpt/project/taskAttDist.vue
+++ b/src/views/xm/rpt/project/taskAttDist.vue
@ -1,7 +1,7 @@
 <template>
 	<section>
        <el-dialog fullscreen :title="(filters.project?'【'+filters.project.name+'】':'')+'任务属性分布'" append-to-body modal-append-to-body width="80%" top="20px" :visible.sync="visible">
-			<el-row :gutter="5">
+			<el-row :gutter="5" v-if="visible">
 				<el-col :span="18"> 
 					<div>
 						<div class="main" id="xmTaskAttDist"
@ -16,9 +16,9 @@
 								<el-option v-for="i in this.groupBys" :label="i.name" :key="i.id" :value="i.id"></el-option>
 							</el-select>
 						</el-form-item>     
-						
-						<el-form-item label="归属项目" v-if="!xmProject">
-							<xm-project-select  v-if="!xmProject"  ref="xmProjectSelect" style="display:inline;"  :auto-select="false" :link-project-id="xmProject?xmProject.id:null" @row-click="onProjectSelected"  :iterationId="xmIteration?xmIteration.id:null"  @clear="onProjectClear"></xm-project-select>
+						<el-form-item label="归属项目" >
+							<xm-project-select v-if="!xmProject || !xmProject.id" ref="xmProjectSelect" style="display:inline;"  :auto-select="false" :link-project-id="xmProject?xmProject.id:null" @row-click="onProjectSelected"   @clear="onProjectClear"></xm-project-select>
+							<span v-else>{{xmProject.id}} <span v-if="xmProject.name"><br/>{{  xmProject.name  }} </span> </span> 
 						</el-form-item>    
 							 
 						<el-form-item label="任务状态" prop="taskState">
@ -172,10 +172,10 @@
 			}, 
 			open(params){
 				this.visible=true;
-				this.filters.product=params.xmProduct
-				this.filters.project=params.xmProject
-				this.filters.Product=params.xmProduct 
-				
+				this.filters.product=this.xmProduct
+				this.filters.project=this.xmProject
+				this.filters.iteration=this.xmIteration 
+				this.searchXmTaskAttDist()
 			},
 			drawCharts() {
 				this.myChart = this.$echarts.init(document.getElementById("xmTaskAttDist")); 
--- a/src/views/xm/rpt/project/taskDayAccumulate.vue
+++ b/src/views/xm/rpt/project/taskDayAccumulate.vue
@ -2,7 +2,7 @@
 	<section>
        <el-dialog fullscreen :title="(filters.project?'【'+filters.project.name+'】':'')+'任务累积图'" append-to-body modal-append-to-body width="80%" top="20px" :visible.sync="visible">
 			
-			<el-row :gutter="5">
+			<el-row :gutter="5" v-if="visible">
 				<el-col :span="18"> <div>
 					<div class="main" id="taskDayAccumulate"
 							style="width:100%;height:600px;margin:0 auto;"></div> 
@ -10,8 +10,9 @@
 				</el-col>
 				<el-col :span="6" class="border">
 					<el-form   :model="filters" class="padding"> 
-						<el-form-item label="归属项目" v-if="!xmProject">
-							 <xm-project-select  v-if="!xmProject"  ref="xmProjectSelect" style="display:inline;"  :auto-select="false" :link-project-id="xmProject?xmProject.id:null" @row-click="onProjectSelected"   @clear="onProjectClear"></xm-project-select>
+					<el-form-item label="归属项目" >
+						<xm-project-select v-if="!xmProject || !xmProject.id" ref="xmProjectSelect" style="display:inline;"  :auto-select="false" :link-project-id="xmProject?xmProject.id:null" @row-click="onProjectSelected"   @clear="onProjectClear"></xm-project-select>
+						<span v-else>{{xmProject.id}} <span v-if="xmProject.name"><br/>{{  xmProject.name  }} </span> </span> 
 					</el-form-item>  
 					<el-form-item label="日期区间">
 						<br>
@ -125,9 +126,9 @@
 			},
 			open(params){
 				this.visible=true;
-				this.filters.product=params.xmProduct
-				this.filters.project=params.xmProject
-				this.filters.Product=params.xmProduct
+				this.filters.product=this.xmProduct
+				this.filters.project=this.xmProject
+				this.filters.iteration=this.xmIteration 
 				this.xmProjectStateHiss=[]
 				if(this.$refs['xmProjectSelect'])this.$refs['xmProjectSelect'].clearSelect();
 				this.$nextTick(()=>{
--- a/src/views/xm/rpt/project/taskDayTrend.vue
+++ b/src/views/xm/rpt/project/taskDayTrend.vue
@ -2,7 +2,7 @@
 	<section>
        <el-dialog fullscreen :title="(filters.project?'【'+filters.project.name+'】':'')+'任务每日趋势'" append-to-body modal-append-to-body width="80%" top="20px" :visible.sync="visible">
 			
-			<el-row :gutter="5">
+			<el-row :gutter="5" v-if="visible">
 				<el-col :span="18"> 
 					<div>
 						<div class="main" id="taskDayTrend"
@ -12,8 +12,9 @@
 				</el-col>
 				<el-col :span="6" class="border">
 					<el-form   :model="filters" class="padding"> 
-						<el-form-item  label="归属项目" v-if="!xmProject" >
-							 <xm-project-select  v-if="!xmProject"  ref="xmProjectSelect" style="display:inline;"  :auto-select="false" :link-project-id="xmProject?xmProject.id:null" @row-click="onProjectSelected"   @clear="onProjectClear"></xm-project-select>
+					<el-form-item label="归属项目" >
+						<xm-project-select v-if="!xmProject || !xmProject.id" ref="xmProjectSelect" style="display:inline;"  :auto-select="false" :link-project-id="xmProject?xmProject.id:null" @row-click="onProjectSelected"   @clear="onProjectClear"></xm-project-select>
+						<span v-else>{{xmProject.id}} <span v-if="xmProject.name"><br/>{{  xmProject.name  }} </span> </span> 
 					</el-form-item>  
 					<el-form-item label="日期区间">
 						<br>
@ -127,9 +128,9 @@
 			},
 			open(params){
 				this.visible=true;
-				this.filters.product=params.xmProduct
-				this.filters.project=params.xmProject
-				this.filters.Product=params.xmProduct 
+				this.filters.product=this.xmProduct
+				this.filters.project=this.xmProject
+				this.filters.iteration=this.xmIteration 
 				if(this.$refs['xmProjectSelect'])this.$refs['xmProjectSelect'].clearSelect();
 				this.$nextTick(()=>{
 					this.listXmProjectStateHis();
--- a/src/views/xm/rpt/project/taskSort.vue
+++ b/src/views/xm/rpt/project/taskSort.vue
@ -1,7 +1,7 @@
 <template>
 	<section>
        <el-dialog fullscreen :title="(filters.project?'【'+filters.project.name+'】':'')+'任务排行榜'" append-to-body modal-append-to-body width="80%" top="20px" :visible.sync="visible">
-			<el-row :gutter="5">
+			<el-row :gutter="5" v-if="visible">
 				<el-col :span="18"> 
 					<div>
 						<div class="main" id="xmTaskSort"
@ -16,8 +16,9 @@
 								<el-option v-for="i in this.groupBys" :label="i.name" :key="i.id" :value="i.id"></el-option>
 							</el-select>
 						</el-form-item>     
-						<el-form-item  label="归属项目" v-if="!xmProject" >
-							 <xm-project-select v-if="!xmProject"  ref="xmProjectSelect" style="display:inline;"  :auto-select="false" :link-project-id="xmProject?xmProject.id:null" @row-click="onProjectSelected"  :iterationId="xmIteration?xmIteration.id:null"  @clear="onProjectClear"></xm-project-select>
+						<el-form-item label="归属项目" >
+							<xm-project-select v-if="!xmProject || !xmProject.id" ref="xmProjectSelect" style="display:inline;"  :auto-select="false" :link-project-id="xmProject?xmProject.id:null" @row-click="onProjectSelected"   @clear="onProjectClear"></xm-project-select>
+							<span v-else>{{xmProject.id}} <span v-if="xmProject.name"><br/>{{  xmProject.name  }} </span> </span> 
 						</el-form-item>  
 						 <el-form-item label="任务状态" prop="taskState">
 							<el-select   v-model="filters.taskState"  @change="onXmTaskSomeFieldsChange('taskState',$event)" clearable>
@ -131,10 +132,10 @@
 		methods: { 
 			open(params){
 				this.visible=true;
-				this.filters.product=params.xmProduct
-				this.filters.project=params.xmProject
-				this.filters.Product=params.xmProduct 
-				
+				this.filters.product=this.xmProduct
+				this.filters.project=this.xmProject
+				this.filters.iteration=this.xmIteration 
+				this.searchXmTaskSort()
 			},
 			drawCharts() {
 				this.myChart = this.$echarts.init(document.getElementById("xmTaskSort"));