优化

src/views/xm/rpt/branch/branchWorkItemDayList.vue

@@ -0,0 +1,266 @@
+<template>
+	<section>
+        <el-dialog fullscreen :title="dialogTitle" append-to-body modal-append-to-body width="80%" top="20px" :visible.sync="visible">
+ 
+			<el-row :gutter="5" v-if="visible">
+				<el-col :span="18"> 
+					<div> 
+						<div class="main" id="iterationWorkItemDayList" style="width:100%;height:600px;margin:0 auto;"></div> 
+					</div>
+				</el-col>
+				<el-col :span="6" class="border">
+					<el-form  :model="filters" class="padding">  
+					 
+					<el-form-item label="日期区间">
+						<br>
+							<mdp-date-range v-model="filters" value-format="yyyy-MM-dd" start-key="startBizDate" end-key="endBizDate"></mdp-date-range>
+  					</el-form-item>  
+					<el-form-item>
+						 <el-button type="primary" icon="el-icon-search" @click="listXmBranchStateHis">查询</el-button>
+					</el-form-item>  
+					</el-form>
+				</el-col>
+			</el-row>
+        </el-dialog>
+	</section>
+</template>
+
+<script>
+	import util from '@/common/js/util';//全局公共库
+	import { initSimpleDicts } from '@/api/mdp/meta/item';//下拉框数据查询  
+	import { mapGetters } from 'vuex'	 
+	
+	import  XmProductSelect from '@/views/xm/core/components/XmProductSelect';//产品选择界面
+	import  XmIterationSelect from '@/views/xm/core/components/XmIterationSelect';//迭代选择界面
+	import { listXmBranchStateHis } from '@/api/xm/core/xmBranchStateHis';
+	export default { 
+        
+		components: {  
+			XmIterationSelect,XmProductSelect,
+		},
+        props:['xmProduct','xmProject','xmIteration'],
+		computed: {
+		    ...mapGetters([
+		      'userInfo','roles'
+		    ]),  
+			dataSetCpd(){
+				return [
+					['日期',...this.xmProductStateHiss.map(i=>i.bizDate)],
+					['未关故事',...this.xmProductStateHiss.map(i=>i.menuCnt-i.menuCloseCnt)],
+					['已关故事',...this.xmProductStateHiss.map(i=>i.menuCloseCnt)],
+					['未关任务',...this.xmProductStateHiss.map(i=>i.taskCnt-i.taskCloseCnt)],
+					['已关任务',...this.xmProductStateHiss.map(i=>i.taskCloseCnt)],
+					['未关缺陷',...this.xmProductStateHiss.map(i=>i.bugCnt-i.closedBugs)],
+					['已关缺陷',...this.xmProductStateHiss.map(i=>i.closedBugs)]
+				]
+			},
+			dialogTitle(){
+				if(this.xmIteration && this.xmIteration.id){
+					return (this.xmIteration?'迭代【'+this.xmIteration.iterationName+'】':'')+'工作项每日趋势图'
+				}else{
+					return "迭代工作项每日趋势图"
+				}
+				
+			},
+			xmProductCpd(){
+				if(this.xmIteration && this.xmIteration.id){
+					return {id:this.xmIteration.productId,productName:this.xmIteration.productName}
+				}
+				if(this.xmProduct && this.xmProduct.id){
+					return this.xmProduct
+				}
+				return null;
+			}
+			
+        }, 
+		watch: {  
+			dataSetCpd(){ 
+				this.$nextTick(()=>{
+					this.drawCharts();
+				})
+				
+			}
+	    },
+		data() {
+			return {
+                filters:{
+                    category:'', 
+                    product:null,
+                    iteration:null,
+                    project:null,
+					startBizDate:'',
+					endBizDate:'',
+                },
+				dicts:{},//下拉选择框的所有静态数据  params=[{categoryId:'0001',itemCode:'sex'}] 返回结果 {'sex':[{optionValue:'1',optionName:'男',seqOrder:'1',fp:'',isDefault:'0'},{optionValue:'2',optionName:'女',seqOrder:'2',fp:'',isDefault:'0'}]} 
+				load:{ list: false, edit: false, del: false, add: false },//查询中... 
+				dateRanger:[], 
+                maxTableHeight:300, 
+                visible:false,
+				xmProductStateHiss:[],
+
+			}//end return
+		},//end data
+		methods: {  
+			listXmBranchStateHis(){ 
+				var params={orderBy:'biz_date asc'}
+				if(this.filters.startBizDate && this.filters.endBizDate){
+					params.startBizDate=this.filters.startBizDate;
+					params.endBizDate=this.filters.endBizDate;
+				}
+				listXmBranchStateHis(params).then(res=>{ 
+					this.xmProductStateHiss=res.data.tips.isOk?res.data.data:this.xmProductStateHiss;
+				})
+			},
+			open(params){
+				this.visible=true;
+				this.filters.product=params.xmProduct
+				this.filters.project=params.xmProject
+				this.filters.iteration=params.xmIteration
+				this.xmProductStateHiss=[]
+				if(this.$refs['xmProductSelect'])this.$refs['xmProductSelect'].clearSelect();
+				if(this.$refs['xmIterationSelect'])this.$refs['xmIterationSelect'].clearSelect();
+				this.$nextTick(()=>{
+					this.listXmBranchStateHis();
+				})
+				
+			},
+			drawCharts() {
+				this.myChart = this.$echarts.init(document.getElementById("iterationWorkItemDayList")); 
+				var that=this;
+				this.myChart.on('updateAxisPointer', function (event) {
+					const xAxisInfo = event.axesInfo[0];
+					if (xAxisInfo) {
+					const dimension = xAxisInfo.value + 1;
+					that.myChart.setOption({
+						series: {
+						id: 'pie',
+						label: {
+							formatter: '{b}: {@[' + dimension + ']} ({d}%)'
+						},
+						encode: {
+							value: dimension,
+							tooltip: dimension
+						}
+						}
+					});
+					}
+				});
+				this.myChart.setOption({
+					title: {
+						text: '工作项分布',
+					},
+					tooltip: {
+						trigger: 'axis',
+      					showContent: false
+					},
+					legend: { 
+					},
+
+					dataset: {
+						source:  this.dataSetCpd
+					},
+					xAxis: {
+						type: 'category', 
+					},
+					yAxis: { gridIndex: 0 },
+    				grid: { top: '55%' },
+					series: [
+						{ 	name:'未关故事',
+							type: 'line',
+        					seriesLayoutBy: 'row',
+							smooth:true, 
+        					emphasis: { focus: 'series' }, 
+						},
+						{ 	name:'已关故事',
+							type: 'line',
+        					seriesLayoutBy: 'row',
+							smooth:true, 
+        					emphasis: { focus: 'series' }, 
+						},
+						{ 
+							name:'未关任务',
+							type: 'line',
+        					seriesLayoutBy: 'row',
+							smooth:true,
+        					emphasis: { focus: 'series' }, 
+						},
+						{ 
+							name:'已关任务',
+							type: 'line',
+        					seriesLayoutBy: 'row',
+							smooth:true,
+        					emphasis: { focus: 'series' }, 
+						},
+						{ 	name:'未关缺陷',
+							type: 'line',
+        					seriesLayoutBy: 'row',
+							smooth:true,
+        					emphasis: { focus: 'series' },  
+						},
+						{ 	name:'已关缺陷',
+							type: 'line',
+        					seriesLayoutBy: 'row',
+							smooth:true,
+        					emphasis: { focus: 'series' },  
+						},
+						{
+							type: 'pie',
+							id: 'pie',
+							radius: '30%',
+							center: ['50%', '25%'],
+							emphasis: {
+								focus: 'self'
+							},
+							label: {
+								formatter: '{b}: {@日期} ({d}%)'
+							},
+							encode: {
+								itemName: '日期',
+								value: '日期',
+								tooltip: '日期'
+							}
+						}
+					]
+				}); 
+			},
+			
+			onProductSelected(product){
+				this.filters.product=product
+				this.xmProductStateHiss=[]; 
+			},
+			
+			onProductClear(){
+				this.filters.product=null
+				
+				this.xmProductStateHiss=[];
+				
+			},
+			
+			onIterationSelected(iteration){
+				this.filters.iteration=iteration
+			},
+			
+			onIterationClear(){
+				this.filters.iteration=null
+			}
+		},//end method
+		mounted() {
+			/**
+ 			initSimpleDicts('all',['demandSource','demandLvl','demandType','priority','menuStatus'] ).then(res=>{
+				this.dicts=res.data.data;
+			}) 
+             */
+			//this.charts();
+			//this.drawCharts();
+			
+		}//end mounted
+	}
+
+</script>
+
+<style scoped>
+   .image {
+    width: 100%;
+    display: block;
+  }
+</style>

src/views/xm/rpt/branch/menuDayAccumulate.vue

@@ -0,0 +1,294 @@
+<template>
+	<section>
+        <el-dialog fullscreen :title="dialogTitle" append-to-body modal-append-to-body width="80%" top="20px" :visible.sync="visible">
+			
+			<el-row :gutter="5" v-if="visible">
+				<el-col :span="18"> <div>
+					<div class="main" id="iterationMenuDayAccumulate"
+							style="width:100%;height:600px;margin:0 auto;"></div> 
+					</div>
+				</el-col>
+				<el-col :span="6" class="border">
+					<el-form  :model="filters" class="padding"> 
+						
+						<el-form-item label="归属产品"  >
+							<xm-product-select v-if="!xmProductCpd || !xmProductCpd.id"  ref="xmProductSelect" style="display:inline;"  :auto-select="false" :link-project-id="xmProject?xmProject.id:null" @row-click="onProductSelected"  :iterationId="xmIteration?xmIteration.id:null"  @clear="onProductClear"></xm-product-select>
+							<span v-else>{{xmProductCpd.id}} <span v-if="xmProductCpd.productName"><br/>{{  xmProductCpd.productName  }} </span> </span>
+						</el-form-item>
+						<el-form-item label="归属迭代" v-if="xmIteration && xmIteration.id">
+ 							<span>  {{xmIteration.id}}
+								<span v-if="xmIteration.iterationName"><br/>{{ xmIteration.iterationName  }} </span>
+							</span> 
+						</el-form-item>  
+						<el-form-item label="归属迭代" v-else-if="filters.product && filters.product.id">
+							<xm-iteration-select  ref="xmIterationSelect"  :auto-select="false"  :product-id="filters.product?filters.product.id:null" :link-project-id="xmProject?xmProject.id:null"   placeholder="迭代"  @row-click="onIterationSelected" @clear="onIterationClear"></xm-iteration-select>
+						</el-form-item>  
+					<el-form-item label="日期区间">
+						<br>
+							<mdp-date-range v-model="filters" value-format="yyyy-MM-dd" start-key="startBizDate" end-key="endBizDate"></mdp-date-range>
+  					</el-form-item>  
+					<el-form-item>
+						 <el-button type="primary" icon="el-icon-search" @click="listXmBranchStateHis">查询</el-button>
+					</el-form-item>  
+					</el-form>
+				</el-col>
+			</el-row>
+        </el-dialog>
+	</section>
+</template>
+
+<script>
+	import util from '@/common/js/util';//全局公共库
+	import { initSimpleDicts } from '@/api/mdp/meta/item';//下拉框数据查询  
+	import { mapGetters } from 'vuex'	 
+	
+	import { listXmBranchStateHis } from '@/api/xm/core/xmBranchStateHis';
+	import  XmProductSelect from '@/views/xm/core/components/XmProductSelect';//产品选择界面
+	import  XmIterationSelect from '@/views/xm/core/components/XmIterationSelect';//迭代选择界面
+	export default { 
+        
+		components: {   
+			XmIterationSelect,XmProductSelect,
+		},
+        props:['xmProduct','xmProject','xmIteration'],
+		computed: {
+		    ...mapGetters([
+		      'userInfo','roles'
+		    ]), 
+            datesCpd(){
+				if(this.xmProductStateHiss.length==0){
+					return []
+				}else{ 
+					return this.xmProductStateHiss.map(i=>i.bizDate)
+				}
+			}, 
+			menuCloseCntCpd(){
+				if(this.xmProductStateHiss.length==0){
+					return []
+				}else{ 
+					return this.xmProductStateHiss.map(i=>i.menuCloseCnt)
+				}
+			},
+			menuUnstartCntCpd(){
+				if(this.xmProductStateHiss.length==0){
+					return []
+				}else{ 
+					return this.xmProductStateHiss.map(i=> i.menuUnstartCnt)
+				}
+			},
+			menuExecCntCpd(){
+				if(this.xmProductStateHiss.length==0){
+					return []
+				}else{ 
+					return this.xmProductStateHiss.map(i=> i.menuExecCnt)
+				}
+			},
+			
+			menuFinishCntCpd(){
+				if(this.xmProductStateHiss.length==0){
+					return []
+				}else{ 
+					return this.xmProductStateHiss.map(i=>i.menuFinishCnt)
+				}
+			},
+			dialogTitle(){
+				if(this.xmIteration && this.xmIteration.id){
+					return (this.xmIteration?'迭代【'+this.xmIteration.iterationName+'】':'')+'需求每日累积图'
+				}else {
+					return (this.filters.product?'产品【'+this.filters.product.productName+'】':'')+'需求每日累积图'
+				}
+				
+			},
+			xmProductCpd(){
+				if(this.xmIteration && this.xmIteration.id){
+					return {id:this.xmIteration.productId,productName:this.xmIteration.productName}
+				}
+				if(this.xmProduct && this.xmProduct.id){
+					return this.xmProduct
+				}
+				return null;
+			}
+			
+        }, 
+		watch: {  
+			datesCpd(){
+				
+				this.$nextTick(()=>{
+					this.drawCharts();
+				})
+				
+			}
+	    },
+		data() {
+			return {
+                filters:{
+                    category:'', 
+                    product:null, 
+                    project:null,
+					iteration:null,
+                },
+				dicts:{},//下拉选择框的所有静态数据  params=[{categoryId:'0001',itemCode:'sex'}] 返回结果 {'sex':[{optionValue:'1',optionName:'男',seqOrder:'1',fp:'',isDefault:'0'},{optionValue:'2',optionName:'女',seqOrder:'2',fp:'',isDefault:'0'}]} 
+				load:{ list: false, edit: false, del: false, add: false },//查询中... 
+				dateRanger:[], 
+                maxTableHeight:300, 
+                visible:false,
+				xmProductStateHiss:[],
+
+			}//end return
+		},//end data
+		methods: {  
+			listXmBranchStateHis(){ 
+				
+				var params={orderBy:'biz_date asc'}
+				if(this.filters.startBizDate && this.filters.endBizDate){
+					params.startBizDate=this.filters.startBizDate;
+					params.endBizDate=this.filters.endBizDate;
+				}
+				listXmBranchStateHis(params).then(res=>{ 
+					this.xmProductStateHiss=res.data.tips.isOk?res.data.data:this.xmProductStateHiss;
+				})
+			},
+			open(params){
+				this.visible=true;
+				this.filters.product=params.xmProduct
+				this.filters.project=params.xmProject 
+				this.filters.iteration=params.xmIteration 
+				this.xmProductStateHiss=[]
+				if(this.$refs['xmProductSelect'])this.$refs['xmProductSelect'].clearSelect();
+				if(this.$refs['xmIterationSelect'])this.$refs['xmIterationSelect'].clearSelect();
+				this.$nextTick(()=>{
+					this.listXmBranchStateHis();
+				})
+				
+			},
+			drawCharts() {
+				this.myChart = this.$echarts.init(document.getElementById("iterationMenuDayAccumulate")); 
+				this.myChart.setOption(  
+					{
+						title: {
+							text: '需求累积图'
+						}, 
+
+						tooltip: {
+							trigger: 'axis',
+							axisPointer: {
+							type: 'cross',
+							label: {
+								backgroundColor: '#6a7985'
+							}
+							}
+						},
+						legend: {
+							data: ['未开始', '执行中', '已完成', '已关闭']
+						},
+						grid: {
+							left: '3%',
+							right: '4%',
+							bottom: '3%',
+							containLabel: true
+						},
+						toolbox: {
+							feature: {
+							saveAsImage: {}
+							}
+						},
+						xAxis: {
+							type: 'category',
+							boundaryGap: false,
+							data: this.datesCpd,
+						},
+						yAxis: {
+							type: 'value'
+						},
+						series: [
+							{
+							name: '未开始',
+							type: 'line',
+							stack: 'Total',
+							areaStyle: {},
+							emphasis: {
+								focus: 'series'
+							},
+							data: this.menuUnstartCntCpd
+							},
+							{
+							name: '执行中',
+							type: 'line',
+							stack: 'Total',
+							areaStyle: {},
+							emphasis: {
+								focus: 'series'
+							},
+							data: this.menuExecCntCpd,
+							},
+							{
+							name: '已完成',
+							type: 'line',
+							stack: 'Total',
+							areaStyle: {},
+							emphasis: {
+								focus: 'series'
+							},
+							data: this.menuFinishCntCpd,
+							},
+							{
+							name: '已关闭',
+							type: 'line',
+							stack: 'Total',
+							areaStyle: {},
+							emphasis: {
+								focus: 'series'
+							},
+
+							label: {
+								show: true,
+								position: 'top'
+							},
+							data: this.menuCloseCntCpd,
+							} 
+						]
+					}
+				)
+			},
+			
+			
+			onProductSelected(product){
+				this.filters.product=product
+				this.xmProductStateHiss=[];
+			},
+			
+			onProductClear(){
+				this.filters.product=null 
+				this.xmProductStateHiss=[]; 
+			},
+			
+			onIterationSelected(iteration){
+				this.filters.iteration=iteration
+				this.xmProductStateHiss=[]; 
+			},
+			
+			onIterationClear(){
+				this.filters.iteration=null 
+				this.xmProductStateHiss=[];
+			}
+		},//end method
+		mounted() {
+			/**
+ 			initSimpleDicts('all',['demandSource','demandLvl','demandType','priority','menuStatus'] ).then(res=>{
+				this.dicts=res.data.data;
+			}) 
+             */
+			//this.charts();
+			//this.drawCharts()
+			
+		}//end mounted
+	}
+
+</script>
+
+<style scoped>
+   .image {
+    width: 100%;
+    display: block;
+  }
+</style>

src/views/xm/rpt/branch/menuDayTrend.vue

@@ -0,0 +1,279 @@
+<template>
+	<section>
+        <el-dialog fullscreen :title="dialogTitle" append-to-body modal-append-to-body width="80%" top="20px" :visible.sync="visible">
+			
+			<el-row :gutter="5" v-if="visible">
+				<el-col :span="18"> 
+					<div>
+						<div class="main" id="iterationMenuDayTrend"
+							style="width:100%;height:600px;margin:0 auto;"></div>
+						<div class="progress"></div>
+					</div>
+				</el-col>
+				<el-col :span="6" class="border">
+					<el-form   :model="filters" class="padding">  
+					<el-form-item label="日期区间">
+						<br>
+							<mdp-date-range v-model="filters" value-format="yyyy-MM-dd" start-key="startBizDate" end-key="endBizDate"></mdp-date-range>
+  					</el-form-item>    
+					<el-form-item>
+						 <el-button type="primary" icon="el-icon-search" @click="listXmBranchStateHis">查询</el-button>
+					</el-form-item>  
+					</el-form>
+				</el-col>
+			</el-row>
+        </el-dialog>
+	</section>
+</template>
+
+<script>
+	import util from '@/common/js/util';//全局公共库
+	import { initSimpleDicts } from '@/api/mdp/meta/item';//下拉框数据查询  
+	import { mapGetters } from 'vuex'	 
+	
+	import { listXmBranchStateHis } from '@/api/xm/core/xmBranchStateHis';
+	import  XmProductSelect from '@/views/xm/core/components/XmProductSelect';//产品选择界面
+	import  XmIterationSelect from '@/views/xm/core/components/XmIterationSelect';//迭代选择界面
+	export default { 
+        
+		components: {   
+			XmIterationSelect,XmProductSelect,
+		},
+        props:['xmProduct','xmProject','xmIteration'],
+		computed: {
+		    ...mapGetters([
+		      'userInfo','roles'
+		    ]), 
+            datesCpd(){
+				if(this.xmProductStateHiss.length==0){
+					return []
+				}else{ 
+					return this.xmProductStateHiss.map(i=>i.bizDate)
+				}
+			}, 
+			menuCloseCntCpd(){
+				if(this.xmProductStateHiss.length==0){
+					return []
+				}else{ 
+					return this.xmProductStateHiss.map(i=>i.menuCloseCnt)
+				}
+			},
+			menuUnstartCntCpd(){
+				if(this.xmProductStateHiss.length==0){
+					return []
+				}else{ 
+					return this.xmProductStateHiss.map(i=> i.menuUnstartCnt)
+				}
+			},
+			menuExecCntCpd(){
+				if(this.xmProductStateHiss.length==0){
+					return []
+				}else{ 
+					return this.xmProductStateHiss.map(i=> i.menuExecCnt)
+				}
+			},
+			
+			menuFinishCntCpd(){
+				if(this.xmProductStateHiss.length==0){
+					return []
+				}else{ 
+					return this.xmProductStateHiss.map(i=>i.menuFinishCnt)
+				}
+			},
+			dialogTitle(){
+				if(this.xmIteration && this.xmIteration.id){
+					return (this.xmIteration?'迭代【'+this.xmIteration.iterationName+'】':'')+'需求每日趋势图'
+				}else {
+					return (this.filters.product?'产品【'+this.filters.product.productName+'】':'')+'需求每日趋势图'
+				}
+				
+			},
+			xmProductCpd(){
+				if(this.xmIteration && this.xmIteration.id){
+					return {id:this.xmIteration.productId,productName:this.xmIteration.productName}
+				}
+				if(this.xmProduct && this.xmProduct.id){
+					return this.xmProduct
+				}
+				return null;
+			}
+			
+        }, 
+		watch: {  
+			datesCpd(){
+
+				this.$nextTick(()=>{
+					this.drawCharts();
+				})
+				 
+			}
+	    },
+		data() {
+			return {
+                filters:{
+                    category:'', 
+                    product:null, 
+                    project:null,
+					iteration:null,
+                },
+				dicts:{},//下拉选择框的所有静态数据  params=[{categoryId:'0001',itemCode:'sex'}] 返回结果 {'sex':[{optionValue:'1',optionName:'男',seqOrder:'1',fp:'',isDefault:'0'},{optionValue:'2',optionName:'女',seqOrder:'2',fp:'',isDefault:'0'}]} 
+				load:{ list: false, edit: false, del: false, add: false },//查询中... 
+				dateRanger:[], 
+                maxTableHeight:300, 
+                visible:false,
+				xmProductStateHiss:[],
+
+			}//end return
+		},//end data
+		methods: {  
+			listXmBranchStateHis(){ 
+				var params={orderBy:'biz_date asc'}
+				
+				if(this.filters.startBizDate && this.filters.endBizDate){
+					params.startBizDate=this.filters.startBizDate;
+					params.endBizDate=this.filters.endBizDate;
+				}
+				listXmBranchStateHis(params).then(res=>{ 
+					this.xmProductStateHiss=res.data.tips.isOk?res.data.data:this.xmProductStateHiss;
+				})
+			},
+			open(params){
+				this.visible=true;
+				this.filters.product=params.xmProduct
+				this.filters.project=params.xmProject 
+				this.filters.iteration=params.xmIteration 
+				if(this.$refs['xmProductSelect'])this.$refs['xmProductSelect'].clearSelect();
+				if(this.$refs['xmIterationSelect'])this.$refs['xmIterationSelect'].clearSelect();
+				 
+				this.listXmBranchStateHis(); 
+				
+			},
+			drawCharts() {
+				this.myChart = this.$echarts.init(document.getElementById("iterationMenuDayTrend")); 
+				this.myChart.setOption(  
+					{	
+						legend: {
+							right: 40,
+							data: ['未开始故事数','执行中故事数','已完成故事数','已关闭故事数']
+						},
+						xAxis: {
+							type: 'category',
+							data: this.datesCpd
+						},
+						yAxis: {
+							type: 'value'
+						},
+						series: [
+							{
+								name:'未开始故事数',
+								data: this.menuUnstartCntCpd,
+								type: 'line',
+								smooth: true,  
+								itemStyle: {
+									normal: {
+										// 折点颜色样式
+										color: 'orange',
+										lineStyle: {
+											// 折线颜色样式
+											color: 'orange'
+										}
+									}
+								},
+							},
+							
+							{
+								name:'执行中故事数',
+								data: this.menuExecCntCpd,
+								type: 'line',
+								smooth: true, 
+								itemStyle: {
+									normal: {
+										// 折点颜色样式
+										color: 'blue',
+										lineStyle: {
+											// 折线颜色样式
+											color: 'blue'
+										}
+									}
+								},
+							},
+							
+							{
+								name:'已完成故事数',
+								data: this.menuFinishCntCpd,
+								type: 'line',
+								smooth: true, 
+								itemStyle: {
+									normal: {
+										// 折点颜色样式
+										color: 'green',
+										lineStyle: {
+											// 折线颜色样式
+											color: 'green'
+										}
+									}
+								},
+							},
+							
+							{
+								name:'已关闭故事数',
+								data: this.menuCloseCntCpd,
+								type: 'line',
+								smooth: true, 
+								itemStyle: {
+									normal: {
+										// 折点颜色样式
+										color: 'red',
+										lineStyle: {
+											// 折线颜色样式
+											color: 'red'
+										}
+									}
+								},
+							}
+						]
+					}
+				)
+			},
+			
+			onProductSelected(product){
+				this.filters.product=product
+				this.xmProductStateHiss=[]; 
+			},
+			
+			onProductClear(){
+				this.filters.product=null 
+				this.xmProductStateHiss=[];
+				
+			},
+			
+			onIterationSelected(iteration){
+				this.filters.iteration=iteration
+				this.xmProductStateHiss=[]; 
+			},
+			
+			onIterationClear(){
+				this.filters.iteration=null  
+				this.xmProductStateHiss=[];
+			}
+		},//end method
+		mounted() {
+			/**
+ 			initSimpleDicts('all',['demandSource','demandLvl','demandType','priority','menuStatus'] ).then(res=>{
+				this.dicts=res.data.data;
+			}) 
+             */
+			//this.charts();
+			//this.drawCharts();
+			
+		}//end mounted
+	}
+
+</script>
+
+<style scoped>
+   .image {
+    width: 100%;
+    display: block;
+  }
+</style>

src/views/xm/rpt/branch/questionDayAccumulate.vue

@@ -0,0 +1,283 @@
+<template>
+	<section>
+        <el-dialog fullscreen :title="dialogTitle" append-to-body modal-append-to-body width="80%" top="20px" :visible.sync="visible">
+			
+			<el-row :gutter="5" v-if="visible">
+				<el-col :span="18"> <div>
+					<div class="main" id="iterationQuestionDayAccumulate"
+							style="width:100%;height:600px;margin:0 auto;"></div> 
+					</div>
+				</el-col>
+				<el-col :span="6" class="border">
+					<el-form :model="filters" class="padding">  
+					<el-form-item label="日期区间">
+						<br>
+							<mdp-date-range v-model="filters" value-format="yyyy-MM-dd" start-key="startBizDate" end-key="endBizDate"></mdp-date-range>
+  					</el-form-item>  
+					<el-form-item>
+						 <el-button type="primary" icon="el-icon-search" @click="listXmBranchStateHis">查询</el-button>
+					</el-form-item>  
+					</el-form>
+				</el-col>
+			</el-row>
+        </el-dialog>
+	</section>
+</template>
+
+<script>
+	import util from '@/common/js/util';//全局公共库
+	import { initSimpleDicts } from '@/api/mdp/meta/item';//下拉框数据查询  
+	import { mapGetters } from 'vuex'	 
+	
+	import { listXmBranchStateHis } from '@/api/xm/core/xmBranchStateHis';
+	import  XmProductSelect from '@/views/xm/core/components/XmProductSelect';//产品选择界面
+	import  XmIterationSelect from '@/views/xm/core/components/XmIterationSelect';//迭代选择界面
+	export default { 
+        
+		components: {   
+			XmIterationSelect,XmProductSelect,
+		},
+        props:['xmProduct','xmProject','xmIteration'],
+		computed: {
+		    ...mapGetters([
+		      'userInfo','roles'
+		    ]), 
+            datesCpd(){
+				if(this.xmProductStateHiss.length==0){
+					return []
+				}else{ 
+					return this.xmProductStateHiss.map(i=>i.bizDate)
+				}
+			}, 
+			closedBugsCpd(){
+				if(this.xmProductStateHiss.length==0){
+					return []
+				}else{ 
+					return this.xmProductStateHiss.map(i=>i.closedBugs)
+				}
+			},
+			activeBugsCpd(){
+				if(this.xmProductStateHiss.length==0){
+					return []
+				}else{ 
+					return this.xmProductStateHiss.map(i=> i.menuUnstartCnt)
+				}
+			},
+			confirmedBugsCpd(){
+				if(this.xmProductStateHiss.length==0){
+					return []
+				}else{ 
+					return this.xmProductStateHiss.map(i=> i.confirmedBugs)
+				}
+			},
+			
+			resolvedBugsCpd(){
+				if(this.xmProductStateHiss.length==0){
+					return []
+				}else{ 
+					return this.xmProductStateHiss.map(i=>i.resolvedBugs)
+				}
+			},
+			dialogTitle(){
+				if(this.xmIteration && this.xmIteration.id){
+					return (this.xmIteration?'迭代【'+this.xmIteration.iterationName+'】':'')+'缺陷每日累积图'
+				}else {
+					return (this.filters.product?'产品【'+this.filters.product.productName+'】':'')+'缺陷每日累积图'
+				}
+				
+			},
+			xmProductCpd(){
+				if(this.xmIteration && this.xmIteration.id){
+					return {id:this.xmIteration.productId,productName:this.xmIteration.productName}
+				}
+				if(this.xmProduct && this.xmProduct.id){
+					return this.xmProduct
+				}
+				return null;
+			}
+			
+        }, 
+		watch: {  
+			datesCpd(){
+				
+				this.$nextTick(()=>{
+					this.drawCharts();
+				})
+				
+			}
+	    },
+		data() {
+			return {
+                filters:{
+                    category:'', 
+                    product:null, 
+                    project:null,
+                    iteration:null,
+                },
+				dicts:{},//下拉选择框的所有静态数据  params=[{categoryId:'0001',itemCode:'sex'}] 返回结果 {'sex':[{optionValue:'1',optionName:'男',seqOrder:'1',fp:'',isDefault:'0'},{optionValue:'2',optionName:'女',seqOrder:'2',fp:'',isDefault:'0'}]} 
+				load:{ list: false, edit: false, del: false, add: false },//查询中... 
+				dateRanger:[], 
+                maxTableHeight:300, 
+                visible:false,
+				xmProductStateHiss:[],
+
+			}//end return
+		},//end data
+		methods: {  
+			listXmBranchStateHis(){ 
+				
+				var params={orderBy:'biz_date asc'}
+				if(this.filters.startBizDate && this.filters.endBizDate){
+					params.startBizDate=this.filters.startBizDate;
+					params.endBizDate=this.filters.endBizDate;
+				}
+				listXmBranchStateHis(params).then(res=>{ 
+					this.xmProductStateHiss=res.data.tips.isOk?res.data.data:this.xmProductStateHiss;
+				})
+			},
+			open(params){
+				this.visible=true;
+				this.filters.product=params.xmProduct
+				this.filters.project=params.xmProject
+				this.filters.iteration=params.xmIteration
+				this.xmProductStateHiss=[]
+				if(this.$refs['xmProductSelect'])this.$refs['xmProductSelect'].clearSelect();
+				if(this.$refs['xmIterationSelect'])this.$refs['xmIterationSelect'].clearSelect();
+				this.$nextTick(()=>{
+					this.listXmBranchStateHis();
+				})
+				
+			},
+			drawCharts() {
+				this.myChart = this.$echarts.init(document.getElementById("iterationQuestionDayAccumulate")); 
+				this.myChart.setOption(  
+					{
+						title: {
+							text: '缺陷累积图'
+						}, 
+
+						tooltip: {
+							trigger: 'axis',
+							axisPointer: {
+							type: 'cross',
+							label: {
+								backgroundColor: '#6a7985'
+							}
+							}
+						},
+						legend: {
+							data: ['新提出', '执行中', '已解决', '已关闭']
+						},
+						grid: {
+							left: '3%',
+							right: '4%',
+							bottom: '3%',
+							containLabel: true
+						},
+						toolbox: {
+							feature: {
+							saveAsImage: {}
+							}
+						},
+						xAxis: {
+							type: 'category',
+							boundaryGap: false,
+							data: this.datesCpd,
+						},
+						yAxis: {
+							type: 'value'
+						},
+						series: [
+							{
+							name: '新提出',
+							type: 'line',
+							stack: 'Total',
+							areaStyle: {},
+							emphasis: {
+								focus: 'series'
+							},
+							data: this.activeBugsCpd
+							},
+							{
+							name: '执行中',
+							type: 'line',
+							stack: 'Total',
+							areaStyle: {},
+							emphasis: {
+								focus: 'series'
+							},
+							data: this.confirmedBugsCpd,
+							},
+							{
+							name: '已解决',
+							type: 'line',
+							stack: 'Total',
+							areaStyle: {},
+							emphasis: {
+								focus: 'series'
+							},
+							data: this.resolvedBugsCpd,
+							},
+							{
+							name: '已关闭',
+							type: 'line',
+							stack: 'Total',
+							areaStyle: {},
+							emphasis: {
+								focus: 'series'
+							},
+
+							label: {
+								show: true,
+								position: 'top'
+							},
+							data: this.closedBugsCpd,
+							} 
+						]
+					}
+				)
+			},
+			
+			
+			onProductSelected(product){
+				this.filters.product=product
+				this.xmProductStateHiss=[]; 
+			},
+			
+			onProductClear(){
+				this.filters.product=null
+				
+				this.xmProductStateHiss=[];
+				
+			},
+			
+			onIterationSelected(iteration){
+				this.filters.iteration=iteration
+				this.xmProductStateHiss=[]; 
+			},
+			
+			onIterationClear(){
+				this.filters.iteration=null 
+				this.xmProductStateHiss=[];
+			}
+		},//end method
+		mounted() {
+			/**
+ 			initSimpleDicts('all',['demandSource','demandLvl','demandType','priority','menuStatus'] ).then(res=>{
+				this.dicts=res.data.data;
+			}) 
+             */
+			//this.charts();
+			//this.drawCharts()
+			
+		}//end mounted
+	}
+
+</script>
+
+<style scoped>
+   .image {
+    width: 100%;
+    display: block;
+  }
+</style>

src/views/xm/rpt/branch/questionDayTrend.vue

@@ -0,0 +1,280 @@
+<template>
+	<section>
+        <el-dialog fullscreen :title="dialogTitle" append-to-body modal-append-to-body width="80%" top="20px" :visible.sync="visible">
+			
+			<el-row :gutter="5" v-if="visible">
+				<el-col :span="18"> 
+					<div>
+						<div class="main" id="iterationQuestionDayTrend"
+							style="width:100%;height:600px;margin:0 auto;"></div>
+						<div class="progress"></div>
+					</div>
+				</el-col>
+				<el-col :span="6" class="border">
+					<el-form :model="filters" class="padding">  
+					<el-form-item label="日期区间">
+						<br>
+							<mdp-date-range v-model="filters" value-format="yyyy-MM-dd" start-key="startBizDate" end-key="endBizDate"></mdp-date-range>
+  					</el-form-item>    
+					<el-form-item>
+						 <el-button type="primary" icon="el-icon-search" @click="listXmBranchStateHis">查询</el-button>
+					</el-form-item>  
+					</el-form>
+				</el-col>
+			</el-row>
+        </el-dialog>
+	</section>
+</template>
+
+<script>
+	import util from '@/common/js/util';//全局公共库
+	import { initSimpleDicts } from '@/api/mdp/meta/item';//下拉框数据查询  
+	import { mapGetters } from 'vuex'	 
+	
+	import { listXmBranchStateHis } from '@/api/xm/core/xmBranchStateHis';
+	import  XmProductSelect from '@/views/xm/core/components/XmProductSelect';//产品选择界面
+	import  XmIterationSelect from '@/views/xm/core/components/XmIterationSelect';//迭代选择界面
+	export default { 
+        
+		components: {   
+			XmIterationSelect,XmProductSelect,
+		},
+        props:['xmProduct','xmProject','xmIteration'],
+		computed: {
+		    ...mapGetters([
+		      'userInfo','roles'
+		    ]), 
+            datesCpd(){
+				if(this.xmProductStateHiss.length==0){
+					return []
+				}else{ 
+					return this.xmProductStateHiss.map(i=>i.bizDate)
+				}
+			}, 
+			closedBugsCpd(){
+				if(this.xmProductStateHiss.length==0){
+					return []
+				}else{ 
+					return this.xmProductStateHiss.map(i=>i.closedBugs)
+				}
+			},
+			activeBugsCpd(){
+				if(this.xmProductStateHiss.length==0){
+					return []
+				}else{ 
+					return this.xmProductStateHiss.map(i=> i.activeBugs)
+				}
+			},
+			confirmedBugsCpd(){
+				if(this.xmProductStateHiss.length==0){
+					return []
+				}else{ 
+					return this.xmProductStateHiss.map(i=> i.confirmedBugs)
+				}
+			},
+			
+			resolvedBugsCpd(){
+				if(this.xmProductStateHiss.length==0){
+					return []
+				}else{ 
+					return this.xmProductStateHiss.map(i=>i.resolvedBugs)
+				}
+			},
+			dialogTitle(){
+				if(this.xmIteration && this.xmIteration.id){
+					return (this.xmIteration?'迭代【'+this.xmIteration.iterationName+'】':'')+'缺陷每日趋势图'
+				}else {
+					return (this.filters.product?'产品【'+this.filters.product.productName+'】':'')+'缺陷每日趋势图'
+				}
+				
+			},
+			xmProductCpd(){
+				if(this.xmIteration && this.xmIteration.id){
+					return {id:this.xmIteration.productId,productName:this.xmIteration.productName}
+				}
+				if(this.xmProduct && this.xmProduct.id){
+					return this.xmProduct
+				}
+				return null;
+			}
+			
+        }, 
+		watch: {  
+			datesCpd(){
+
+				this.$nextTick(()=>{
+					this.drawCharts();
+				})
+				 
+			}
+	    },
+		data() {
+			return {
+                filters:{
+                    category:'', 
+                    product:null, 
+                    project:null,
+                    iteration:null,
+                },
+				dicts:{},//下拉选择框的所有静态数据  params=[{categoryId:'0001',itemCode:'sex'}] 返回结果 {'sex':[{optionValue:'1',optionName:'男',seqOrder:'1',fp:'',isDefault:'0'},{optionValue:'2',optionName:'女',seqOrder:'2',fp:'',isDefault:'0'}]} 
+				load:{ list: false, edit: false, del: false, add: false },//查询中... 
+				dateRanger:[], 
+                maxTableHeight:300, 
+                visible:false,
+				xmProductStateHiss:[],
+
+			}//end return
+		},//end data
+		methods: {  
+			listXmBranchStateHis(){
+				 
+				var params={orderBy:'biz_date asc'}
+				if(this.filters.startBizDate && this.filters.endBizDate){
+					params.startBizDate=this.filters.startBizDate;
+					params.endBizDate=this.filters.endBizDate;
+				}
+				listXmBranchStateHis(params).then(res=>{ 
+					this.xmProductStateHiss=res.data.tips.isOk?res.data.data:this.xmProductStateHiss;
+				})
+			},
+			open(params){
+				this.visible=true;
+				this.filters.product=params.xmProduct
+				this.filters.project=params.xmProject
+				this.filters.iteration=params.xmIteration 
+				if(this.$refs['xmProductSelect'])this.$refs['xmProductSelect'].clearSelect();
+				if(this.$refs['xmIterationSelect'])this.$refs['xmIterationSelect'].clearSelect();
+				this.$nextTick(()=>{
+					this.listXmBranchStateHis();
+				})
+				
+			},
+			drawCharts() {
+				this.myChart = this.$echarts.init(document.getElementById("iterationQuestionDayTrend")); 
+				this.myChart.setOption(  
+					{	
+						legend: {
+							right: 40,
+							data: ['新提出','执行中','已解决','已关闭']
+						},
+						xAxis: {
+							type: 'category',
+							data: this.datesCpd
+						},
+						yAxis: {
+							type: 'value'
+						},
+						series: [
+							{
+								name:'新提出',
+								data: this.activeBugsCpd,
+								type: 'line',
+								smooth: true,  
+								itemStyle: {
+									normal: {
+										// 折点颜色样式
+										color: 'orange',
+										lineStyle: {
+											// 折线颜色样式
+											color: 'orange'
+										}
+									}
+								},
+							},
+							
+							{
+								name:'执行中',
+								data: this.confirmedBugsCpd,
+								type: 'line',
+								smooth: true, 
+								itemStyle: {
+									normal: {
+										// 折点颜色样式
+										color: 'blue',
+										lineStyle: {
+											// 折线颜色样式
+											color: 'blue'
+										}
+									}
+								},
+							},
+							
+							{
+								name:'已解决',
+								data: this.resolvedBugsCpd,
+								type: 'line',
+								smooth: true, 
+								itemStyle: {
+									normal: {
+										// 折点颜色样式
+										color: 'green',
+										lineStyle: {
+											// 折线颜色样式
+											color: 'green'
+										}
+									}
+								},
+							},
+							
+							{
+								name:'已关闭',
+								data: this.closedBugsCpd,
+								type: 'line',
+								smooth: true, 
+								itemStyle: {
+									normal: {
+										// 折点颜色样式
+										color: 'red',
+										lineStyle: {
+											// 折线颜色样式
+											color: 'red'
+										}
+									}
+								},
+							}
+						]
+					}
+				)
+			},
+			
+			onProductSelected(product){
+				this.filters.product=product
+				this.xmProductStateHiss=[]; 
+			},
+			
+			onProductClear(){
+				this.filters.product=null 
+				this.xmProductStateHiss=[];
+				
+			},
+			
+			onIterationSelected(iteration){
+				this.filters.iteration=iteration
+				this.xmProductStateHiss=[]; 
+			},
+			
+			onIterationClear(){
+				this.filters.iteration=null 
+				this.xmProductStateHiss=[];
+			}
+		},//end method
+		mounted() {
+			/**
+ 			initSimpleDicts('all',['demandSource','demandLvl','demandType','priority','menuStatus'] ).then(res=>{
+				this.dicts=res.data.data;
+			}) 
+             */
+			//this.charts();
+			//this.drawCharts();
+			
+		}//end mounted
+	}
+
+</script>
+
+<style scoped>
+   .image {
+    width: 100%;
+    display: block;
+  }
+</style>

src/views/xm/rpt/reportIndex.vue

@@ -24,8 +24,8 @@
         <xm-iteration-burnout :category="filters.category" ref="xmIterationBurnout" :xm-iteration="xmIteration" :xm-product="xmProduct" :xm-project="xmProject"></xm-iteration-burnout>
         <xm-menu-day-trend :category="filters.category" ref="xmMenuDayTrend" :xm-product="xmProduct" :xm-project="xmProject"  :xm-iteration="xmIteration"></xm-menu-day-trend>
         <xm-menu-day-accumulate :category="filters.category" ref="xmMenuDayAccumulate" :xm-product="xmProduct" :xm-project="xmProject"  :xm-iteration="xmIteration"></xm-menu-day-accumulate>
-        <xm-iteration-xm-menu-day-trend :category="filters.category" ref="xmIterationXmMenuDayTrend" :xm-product="xmProduct" :xm-project="xmProject"  :xm-iteration="xmIteration"></xm-iteration-xm-menu-day-trend>
-        <xm-iteration-xm-menu-day-accumulate :category="filters.category" ref="xmIterationXmMenuDayAccumulate" :xm-product="xmProduct" :xm-project="xmProject"  :xm-iteration="xmIteration"></xm-iteration-xm-menu-day-accumulate>
+        <xm-iteration-menu-day-trend :category="filters.category" ref="xmIterationMenuDayTrend" :xm-product="xmProduct" :xm-project="xmProject"  :xm-iteration="xmIteration"></xm-iteration-menu-day-trend>
+        <xm-iteration-menu-day-accumulate :category="filters.category" ref="xmIterationMenuDayAccumulate" :xm-product="xmProduct" :xm-project="xmProject"  :xm-iteration="xmIteration"></xm-iteration-menu-day-accumulate>
         <xm-menu-att-dist :category="filters.category" ref="xmMenuAttDist" :xm-product="xmProduct" :xm-project="xmProject"  :xm-iteration="xmIteration"></xm-menu-att-dist>
         <xm-menu-age-dist :category="filters.category" ref="xmMenuAgeDist" :xm-product="xmProduct" :xm-project="xmProject" :xm-iteration="xmIteration"></xm-menu-age-dist>
         <xm-menu-sort :category="filters.category" ref="xmMenuSort" :xm-product="xmProduct" :xm-project="xmProject"  :xm-iteration="xmIteration"></xm-menu-sort>
@@ -41,8 +41,8 @@
         <xm-project-workload-set-month-list :category="filters.category" ref="xmProjectWorkloadSetMonthList" :xm-product="xmProduct" :xm-project="xmProject"></xm-project-workload-set-month-list>
         
 
-        <xm-iteration-xm-question-day-trend :category="filters.category" ref="xmIterationXmQuestionDayTrend" :xm-product="xmProduct" :xm-project="xmProject"  :xm-iteration="xmIteration"></xm-iteration-xm-question-day-trend>
-        <xm-iteration-xm-question-day-accumulate :category="filters.category" ref="xmIterationXmQuestionDayAccumulate" :xm-product="xmProduct" :xm-project="xmProject"  :xm-iteration="xmIteration"></xm-iteration-xm-question-day-accumulate>
+        <xm-iteration-question-day-trend :category="filters.category" ref="xmIterationQuestionDayTrend" :xm-product="xmProduct" :xm-project="xmProject"  :xm-iteration="xmIteration"></xm-iteration-question-day-trend>
+        <xm-iteration-question-day-accumulate :category="filters.category" ref="xmIterationQuestionDayAccumulate" :xm-product="xmProduct" :xm-project="xmProject"  :xm-iteration="xmIteration"></xm-iteration-question-day-accumulate>
         <xm-question-day-trend :category="filters.category" ref="xmQuestionDayTrend" :xm-product="xmProduct" :xm-project="xmProject"  :xm-iteration="xmIteration"></xm-question-day-trend>
         <xm-question-day-accumulate :category="filters.category" ref="xmQuestionDayAccumulate" :xm-product="xmProduct" :xm-project="xmProject"  :xm-iteration="xmIteration"></xm-question-day-accumulate>
         <xm-question-att-dist :category="filters.category" ref="xmQuestionAttDist" :xm-product="xmProduct" :xm-project="xmProject"  :xm-iteration="xmIteration" :xm-test-casedb="xmTestCasedb" :xm-test-plan="xmTestPlan"></xm-question-att-dist>
@@ -65,6 +65,13 @@
         <xm-test-day-times-calc :category="filters.category" ref="xmTestDayTimesCalc" :xm-product="xmProduct" :xm-project="xmProject" :xm-test-casedb="xmTestCasedb" :xm-test-plan="xmTestPlan"></xm-test-day-times-calc>
         <xm-test-case-to-plan-calc :category="filters.category" ref="xmTestCaseToPlanCalc" :xm-product="xmProduct" :xm-project="xmProject" :xm-test-casedb="xmTestCasedb" :xm-test-plan="xmTestPlan"></xm-test-case-to-plan-calc>
         
+        <!--企业级报表-->
+        <xm-branch-question-day-trend :category="filters.category" ref="xmBranchQuestionDayTrend" :xm-product="xmProduct" :xm-project="xmProject"  :xm-iteration="xmIteration"></xm-branch-question-day-trend>
+        <xm-branch-question-day-accumulate :category="filters.category" ref="xmBranchQuestionDayAccumulate" :xm-product="xmProduct" :xm-project="xmProject"  :xm-iteration="xmIteration"></xm-branch-question-day-accumulate>
+        <xm-branch-work-item-day-list :category="filters.category" ref="xmBranchWorkItemDayList" :xm-product="xmProduct" :xm-project="xmProject" :xm-iteration="xmIteration"></xm-branch-work-item-day-list>
+        <xm-branch-menu-day-trend :category="filters.category" ref="xmBranchMenuDayTrend" :xm-product="xmProduct" :xm-project="xmProject"  :xm-iteration="xmIteration"></xm-branch-menu-day-trend>
+        <xm-branch-menu-day-accumulate :category="filters.category" ref="xmBranchMenuDayAccumulate" :xm-product="xmProduct" :xm-project="xmProject"  :xm-iteration="xmIteration"></xm-branch-menu-day-accumulate>
+        
 
     </section>
 </template>
@@ -73,16 +80,12 @@
 	import util from '@/common/js/util';//全局公共库
 	import { initSimpleDicts } from '@/api/mdp/meta/item';//下拉框数据查询  
 	import { mapGetters } from 'vuex'	
-    import xmIterationBurnout from './iteration/burnout'
     import xmMenuDayTrend from './product/menuDayTrend'
     import xmMenuDayAccumulate from './product/menuDayAccumulate'
-    import xmIterationXmMenuDayTrend from './iteration/menuDayTrend'
-    import xmIterationXmMenuDayAccumulate from './iteration/menuDayAccumulate'
 	import xmMenuAttDist from './product/menuAttDist'
 	import xmMenuAgeDist from './product/menuAgeDist'
 	import xmMenuSort from './product/menuSort'
 	import xmProductWorkItemDayList from './product/productWorkItemDayList'
-	import xmIterationWorkItemDayList from './iteration/iterationWorkItemDayList'
 
 
     import xmTaskDayTrend from './project/taskDayTrend'
@@ -96,8 +99,6 @@
 
     import xmQuestionDayTrend from './product/questionDayTrend'
     import xmQuestionDayAccumulate from './product/questionDayAccumulate'
-    import xmIterationXmQuestionDayTrend from './iteration/questionDayTrend'
-    import xmIterationXmQuestionDayAccumulate from './iteration/questionDayAccumulate'
 	import xmQuestionAttDist from './product/questionAttDist'
 	import xmQuestionStateDist from './product/questionAttDist'
 	import xmQuestionAgeDist from './product/questionAgeDist'
@@ -114,6 +115,21 @@
 	import xmTestDayTimesCalc from './testPlan/testDayTimesCalc'
 	import xmTestCaseToPlanCalc from './testPlan/testCaseToPlanCalc'
 
+    
+    import xmIterationMenuDayTrend from './iteration/menuDayTrend'
+    import xmIterationMenuDayAccumulate from './iteration/menuDayAccumulate'
+    import xmIterationBurnout from './iteration/burnout'
+	import xmIterationWorkItemDayList from './iteration/iterationWorkItemDayList'
+    import xmIterationQuestionDayTrend from './iteration/questionDayTrend'
+    import xmIterationQuestionDayAccumulate from './iteration/questionDayAccumulate'
+
+    
+	import xmBranchWorkItemDayList from './branch/branchWorkItemDayList'
+    import xmBranchQuestionDayTrend from './branch/questionDayTrend'
+    import xmBranchQuestionDayAccumulate from './branch/questionDayAccumulate'
+    import xmBranchMenuDayTrend from './branch/menuDayTrend'
+    import xmBranchMenuDayAccumulate from './branch/menuDayAccumulate'
+    
     import pieSimple from './images/pie-simple.png'
     import lineStack from './images/line-stack.png'
     import areaStack from './images/area-stack.png'
@@ -125,10 +141,12 @@
         
 		components: {   
             xmIterationBurnout,xmMenuDayTrend,xmMenuDayAccumulate,xmMenuAttDist,xmMenuAgeDist,xmMenuSort,xmProductWorkItemDayList,xmTaskDayTrend,xmTaskDayAccumulate,xmTaskAttDist,xmTaskAgeDist,xmTaskSort,xmProjectWorkItemDayList,xmProjectWorkloadSetDayList,xmProjectWorkloadSetMonthList,xmQuestionDayTrend,xmQuestionDayAccumulate,xmQuestionAttDist,xmQuestionAgeDist,xmQuestionSort,
-            xmIterationXmMenuDayTrend,xmIterationXmMenuDayAccumulate,xmIterationWorkItemDayList,xmIterationXmQuestionDayTrend,xmIterationXmQuestionDayAccumulate,
+            xmIterationMenuDayTrend,xmIterationMenuDayAccumulate,xmIterationWorkItemDayList,xmIterationQuestionDayTrend,xmIterationQuestionDayAccumulate,
             
             xmTestPlanCaseExecStatusDist,xmTestPlanCaseUserDist,xmQuestionRetestDist,xmQuestionStateDist,
-            xmQuestionAskUserSort,xmQuestionHandlerUserSort,xmQuestionFuncSort,xmQuestionMenuSort,xmTestDayTimesCalc,xmTestCaseToPlanCalc
+            xmQuestionAskUserSort,xmQuestionHandlerUserSort,xmQuestionFuncSort,xmQuestionMenuSort,xmTestDayTimesCalc,xmTestCaseToPlanCalc,
+
+            xmBranchWorkItemDayList,xmBranchQuestionDayTrend,xmBranchQuestionDayAccumulate,xmBranchMenuDayTrend,xmBranchMenuDayAccumulate
         
         },
         props:['xmProduct','xmIteration','xmProject','xmTestCasedb','xmTestPlan','category'],
@@ -176,35 +194,42 @@
                 rptList:[/**{name:'报表名称',category:'报表分类，组织级、产品级、项目级、迭代级、需求、测试、任务',path:'路由路径',imgUrl:'图片路径',query:{参数}} */
                     //迭代报表
                     {rptName:'迭代燃尽图',category:'迭代级',ref:'xmIterationBurnout',desc:'跟踪迭代的剩余工作量按日期变化趋势，识别迭代当前进度情况',img:ranjintu },
-                    {rptName:'需求每日趋势',category:'迭代级',ref:'xmIterationXmMenuDayTrend',desc:'跟踪未开始、执行中、已完成、已关闭状态的需求数量按日期变化趋势，识别需求工作情况',img:lineStack  },
-                    {rptName:'需求每日累积',category:'迭代级',ref:'xmIterationXmMenuDayAccumulate',desc:'跟踪未开始、执行中、已完成、已关闭状态的需求数量按日期累积情况，识别需求工作的瓶颈',img:areaStack  },
+                    {rptName:'需求每日趋势',category:'迭代级',ref:'xmIterationMenuDayTrend',desc:'跟踪未开始、执行中、已完成、已关闭状态的需求数量按日期变化趋势，识别需求工作情况',img:lineStack  },
+                    {rptName:'需求每日累积',category:'迭代级',ref:'xmIterationMenuDayAccumulate',desc:'跟踪未开始、执行中、已完成、已关闭状态的需求数量按日期累积情况，识别需求工作的瓶颈',img:areaStack  },
                     {rptName:'迭代工作项每日趋势',category:'迭代级',ref:'xmIterationWorkItemDayList',desc:'统计迭代每日工作项数量分布情况',img:datasetLink  },  
-                    {rptName:'迭代缺陷每日趋势',category:'迭代级',ref:'xmIterationXmQuestionDayTrend',desc:'跟踪新提出、执行中、已解决、已关闭状态的缺陷数量按日期变化趋势，识别缺陷处理工作情况',img:lineStack  },
-                    {rptName:'迭代缺陷每日累积',category:'迭代级',ref:'xmIterationXmQuestionDayAccumulate',desc:'跟踪一段时间内，各种程度和类别的缺陷累积情况，监控缺陷的变化趋势',img:areaStack  },
+                    {rptName:'迭代缺陷每日趋势',category:'迭代级',ref:'xmIterationQuestionDayTrend',desc:'跟踪新提出、执行中、已解决、已关闭状态的缺陷数量按日期变化趋势，识别缺陷处理工作情况',img:lineStack  },
+                    {rptName:'迭代缺陷每日累积',category:'迭代级',ref:'xmIterationQuestionDayAccumulate',desc:'跟踪一段时间内，各种程度和类别的缺陷累积情况，监控缺陷的变化趋势',img:areaStack  },
+                   
+                    //企业级报表
+                    {rptName:'企业工作项每日趋势',category:'企业级',ref:'xmBranchWorkItemDayList',desc:'统计迭代每日工作项数量分布情况',img:datasetLink  },  
+                    {rptName:'企业缺陷每日趋势',category:'企业级',ref:'xmBranchQuestionDayTrend',desc:'跟踪新提出、执行中、已解决、已关闭状态的缺陷数量按日期变化趋势，识别缺陷处理工作情况',img:lineStack  },
+                    {rptName:'企业缺陷每日累积',category:'企业级',ref:'xmBranchQuestionDayAccumulate',desc:'跟踪一段时间内，各种程度和类别的缺陷累积情况，监控缺陷的变化趋势',img:areaStack  },
+                    {rptName:'需求每日趋势',category:'企业级',ref:'xmBranchMenuDayTrend',desc:'跟踪未开始、执行中、已完成、已关闭状态的需求数量按日期变化趋势，识别需求工作情况',img:lineStack  },
+                    {rptName:'需求每日累积',category:'企业级',ref:'xmBranchMenuDayAccumulate',desc:'跟踪未开始、执行中、已完成、已关闭状态的需求数量按日期累积情况，识别需求工作的瓶颈',img:areaStack  },
                    
                     //产品报表
-                    {rptName:'需求每日趋势',category:'产品级,企业级',ref:'xmMenuDayTrend',desc:'跟踪未开始、执行中、已完成、已关闭状态的需求数量按日期变化趋势，识别需求工作情况',img:lineStack  },
-                    {rptName:'需求每日累积',category:'产品级,企业级',ref:'xmMenuDayAccumulate',desc:'跟踪未开始、执行中、已完成、已关闭状态的需求数量按日期累积情况，识别需求工作的瓶颈',img:areaStack  },
+                    {rptName:'需求每日趋势',category:'产品级',ref:'xmMenuDayTrend',desc:'跟踪未开始、执行中、已完成、已关闭状态的需求数量按日期变化趋势，识别需求工作情况',img:lineStack  },
+                    {rptName:'需求每日累积',category:'产品级',ref:'xmMenuDayAccumulate',desc:'跟踪未开始、执行中、已完成、已关闭状态的需求数量按日期累积情况，识别需求工作的瓶颈',img:areaStack  },
                     {rptName:'需求属性分布',category:'产品级,迭代级,企业级',ref:'xmMenuAttDist',desc:'统计所有需求任意属性数量分布情况（实时数据）',img:pieSimple  },
                     {rptName:'需求年龄分布',category:'产品级,迭代级,企业级',ref:'xmMenuAgeDist',desc:'统计所有需求年龄分布情况（实时数据）',img:pieSimple  },
                     {rptName:'需求排行榜',category:'产品级,迭代级,企业级',ref:'xmMenuSort',desc:'需求提出人、负责人的用户故事数量排行（实时数据）',img:bar  },
-                    {rptName:'产品工作项每日趋势',category:'产品级,企业级',ref:'xmProductWorkItemDayList',desc:'统计产品每日工作项数量分布情况',img:datasetLink  },  
+                    {rptName:'产品工作项每日趋势',category:'产品级',ref:'xmProductWorkItemDayList',desc:'统计产品每日工作项数量分布情况',img:datasetLink  },  
                     {rptName:'产品缺陷每日趋势',category:'产品级',ref:'xmQuestionDayTrend',desc:'跟踪新提出、执行中、已解决、已关闭状态的缺陷数量按日期变化趋势，识别缺陷处理工作情况',img:lineStack  },
                     {rptName:'产品缺陷每日累积',category:'产品级',ref:'xmQuestionDayAccumulate',desc:'跟踪一段时间内，各种程度和类别的缺陷累积情况，监控缺陷的变化趋势',img:areaStack  },
                     
                     //项目报表
-                    {rptName:'任务每日趋势',category:'项目级,企业级',ref:'xmTaskDayTrend',desc:'跟踪未开始、执行中、已完成、已关闭状态的任务数量按日期变化趋势，识别任务工作情况',img:lineStack  },
-                    {rptName:'任务每日累积',category:'项目级,企业级',ref:'xmTaskDayAccumulate',desc:'跟踪未开始、执行中、已完成、已关闭状态的任务数量按日期累积情况，识别任务工作的瓶颈',img:areaStack  },
+                    {rptName:'任务每日趋势',category:'项目级',ref:'xmTaskDayTrend',desc:'跟踪未开始、执行中、已完成、已关闭状态的任务数量按日期变化趋势，识别任务工作情况',img:lineStack  },
+                    {rptName:'任务每日累积',category:'项目级',ref:'xmTaskDayAccumulate',desc:'跟踪未开始、执行中、已完成、已关闭状态的任务数量按日期累积情况，识别任务工作的瓶颈',img:areaStack  },
                     {rptName:'任务属性分布',category:'项目级,企业级',ref:'xmTaskAttDist',desc:'统计所有任务任意属性数量分布情况（实时数据）',img:pieSimple  },
                     {rptName:'任务年龄分布',category:'项目级,企业级',ref:'xmTaskAgeDist',desc:'统计所有任务年龄分布情况（实时数据）',img:pieSimple  },
                     {rptName:'任务排行榜',category:'项目级,企业级',ref:'xmTaskSort',desc:'任务提出人、负责人的用户故事数量排行（实时数据）',img:bar  },
-                    {rptName:'项目工作项每日趋势',category:'项目级,企业级',ref:'xmProjectWorkItemDayList',desc:'统计项目每日工作项数量分布情况',img:datasetLink  },
-                    {rptName:'项目结算工时每日趋势',category:'项目级,企业级',ref:'xmProjectWorkloadSetDayList',desc:'统计项目每日登记工时、结算工时数量分布情况',img:datasetLink  },
-                    {rptName:'项目结算工时每月趋势',category:'项目级,企业级',ref:'xmProjectWorkloadSetMonthList',desc:'统计项目每月登记工时、结算工时数量分布情况',img:datasetLink  },
+                    {rptName:'项目工作项每日趋势',category:'项目级',ref:'xmProjectWorkItemDayList',desc:'统计项目每日工作项数量分布情况',img:datasetLink  },
+                    {rptName:'项目结算工时每日趋势',category:'项目级',ref:'xmProjectWorkloadSetDayList',desc:'统计项目每日登记工时、结算工时数量分布情况',img:datasetLink  },
+                    {rptName:'项目结算工时每月趋势',category:'项目级',ref:'xmProjectWorkloadSetMonthList',desc:'统计项目每月登记工时、结算工时数量分布情况',img:datasetLink  },
 
 
-                    //测试计划报表 
-                     {rptName:'测试用例规划分析',category:'测试级,项目级,产品级,迭代级,企业级',ref:'xmTestCaseToPlanCalc',desc:'显示用例被规划到测试计划中的次数统计',img:bar  },
+                    //测试级报表 
+                    {rptName:'测试用例规划分析',category:'测试级,项目级,产品级,迭代级,企业级',ref:'xmTestCaseToPlanCalc',desc:'显示用例被规划到测试计划中的次数统计',img:bar  },
  
                     {rptName:'测试用例执行状态分布',category:'测试级,项目级,产品级,迭代级,企业级',ref:'xmTestPlanCaseExecStatusDist',desc:'按测试用例执行结果统计，通过、失败、忽略、阻塞',img:pieSimple  },
                     {rptName:'测试用例执行用户分布',category:'测试级,项目级,产品级,迭代级,企业级',ref:'xmTestPlanCaseUserDist',desc:'统计测试用例负责人用例执行情况',img:bar  },
@@ -254,6 +279,8 @@
                     this.filters.category="项目级"
                 }else if(this.xmProduct && this.xmProduct.id){
                     this.filters.category="产品级"
+                }else{
+                    this.filters.category="企业级"
                 }
             }