From 2a7e4a712365872bf68f040ea1b7d0a7803e05b5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=99=88=E8=A3=95=E8=B4=A2?= <cyc58469@163.com>
Date: Sun, 3 Apr 2022 21:31:45 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/xm/core/xmMenu.js                     |   4 +
 src/api/xm/core/xmProductStateHis.js          |   4 +-
 src/views/xm/rpt/iteration/burnout.vue        |   5 +-
 src/views/xm/rpt/product/menuAttDist.vue      | 301 ++++++++++++++++++
 .../xm/rpt/product/menuDayAccumulate.vue      |   9 +-
 src/views/xm/rpt/product/menuDayTrend.vue     |   9 +-
 src/views/xm/rpt/reportIndex.vue              |  45 ++-
 7 files changed, 359 insertions(+), 18 deletions(-)
 create mode 100644 src/views/xm/rpt/product/menuAttDist.vue

diff --git a/src/api/xm/core/xmMenu.js b/src/api/xm/core/xmMenu.js
index 0e5a2ece..d4ec907f 100644
--- a/src/api/xm/core/xmMenu.js
+++ b/src/api/xm/core/xmMenu.js
@@ -46,3 +46,7 @@ export const batchChangeParentMenu = params => { return axios.post(`${base}/xm/c
 
 
 
+export const getXmMenuAttDist = params => { return axios.get(`${base}/xm/core/xmMenu/getXmMenuAttDist`, { params: params }); };
+
+
+
diff --git a/src/api/xm/core/xmProductStateHis.js b/src/api/xm/core/xmProductStateHis.js
index acce018d..c4d3c68b 100644
--- a/src/api/xm/core/xmProductStateHis.js
+++ b/src/api/xm/core/xmProductStateHis.js
@@ -27,4 +27,6 @@ export const batchDelXmProductStateHis = params => { return axios.post(`${base}/
 export const editXmProductStateHis = params => { return axios.post(`${base}/xm/core/xmProductStateHis/edit`, params); };
 
 //新增一条功能状态表,无需前端维护，所有数据由汇总统计得出
-export const addXmProductStateHis = params => { return axios.post(`${base}/xm/core/xmProductStateHis/add`, params); };
\ No newline at end of file
+export const addXmProductStateHis = params => { return axios.post(`${base}/xm/core/xmProductStateHis/add`, params); };
+
+export const getXmMenuAttDist = params => { return axios.get(`${base}/xm/core/xmProductStateHis/getXmMenuAttDist`, { params: params }); };
\ No newline at end of file
diff --git a/src/views/xm/rpt/iteration/burnout.vue b/src/views/xm/rpt/iteration/burnout.vue
index f9a794b9..430d10a4 100644
--- a/src/views/xm/rpt/iteration/burnout.vue
+++ b/src/views/xm/rpt/iteration/burnout.vue
@@ -2,7 +2,7 @@
 	<section>
         <el-dialog :title="filters.iteration?'【'+filters.iterationName+'】':''+'迭代燃尽图'" append-to-body modal-append-to-body width="80%" top="20px" :visible.sync="visible">
 			<div>
-				<div class="main" id="main"
+				<div class="main" id="burnout"
 					style="width:100%;height:600px;margin:0 auto;"></div>
 				<div class="progress"></div>
 			</div>
@@ -113,7 +113,7 @@
 				
 			},
 			drawWorkload() {
-				this.myChart = this.$echarts.init(document.getElementById("main")); 
+				this.myChart = this.$echarts.init(document.getElementById("burnout")); 
 				this.myChart.setOption({
 					title: {
 						text: '燃尽图：',
@@ -197,6 +197,7 @@
 			}) 
              */
 			//this.charts();
+			//this.drawWorkload();
 			
 		}//end mounted
 	}
diff --git a/src/views/xm/rpt/product/menuAttDist.vue b/src/views/xm/rpt/product/menuAttDist.vue
new file mode 100644
index 00000000..b0567d88
--- /dev/null
+++ b/src/views/xm/rpt/product/menuAttDist.vue
@@ -0,0 +1,301 @@
+<template>
+	<section>
+        <el-dialog :title="filters.product?'产品【'+filters.product.productName+'】':''+'需求属性分布'" append-to-body modal-append-to-body width="80%" top="20px" :visible.sync="visible">
+			<el-row :gutter="5">
+				<el-col :span="18"> 
+					<div>
+						<div class="main" id="xmMenuAttDist"
+							style="width:100%;height:600px;margin:0 auto;"></div>
+						<div class="progress"></div>
+					</div>
+				</el-col>
+				<el-col :span="6">
+					<el-form :label-position="'top'" label-width="120px" :model="filters">
+						<el-form-item label="分组属性">
+							<el-select   v-model="groupBy"  @change="onXmMenuSomeFieldsChange('groupBy',$event)" clearable>
+								<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="需求状态" prop="status">
+							<el-select   v-model="filters.status"  @change="onXmMenuSomeFieldsChange('status',$event)" clearable>
+								<el-option v-for="i in this.dicts.menuStatus" :label="i.name" :key="i.id" :value="i.id"></el-option>
+							</el-select>
+						</el-form-item>
+						
+						<el-form-item  label="需求类型" prop="dtype" >
+							<el-select v-model="filters.dtype"  @change="onXmMenuSomeFieldsChange('dtype',$event)" clearable>
+								<el-option v-for="i in this.dicts.demandType" :label="i.name" :key="i.id" :value="i.id"></el-option>
+							</el-select>
+						</el-form-item> 
+						<el-form-item  label="需求来源" prop="source">
+							<el-select v-model="filters.source"  @change="onXmMenuSomeFieldsChange('source',$event)" clearable>
+								<el-option v-for="i in this.dicts.demandSource" :label="i.name" :key="i.id" :value="i.id"></el-option>
+							</el-select>
+						</el-form-item> 
+						<el-form-item  label="需求层次" prop="dlvl" >
+							<el-select v-model="filters.dlvl"  @change="onXmMenuSomeFieldsChange('dlvl',$event)" clearable>
+								<el-option v-for="i in this.dicts.demandLvl" :label="i.name" :key="i.id" :value="i.id"></el-option>
+							</el-select>
+						</el-form-item> 
+					<el-form-item  label="优先级" prop="priority" >
+						<el-select v-model="filters.priority" @change="onXmMenuSomeFieldsChange('priority',$event)" clearable>
+								<el-option v-for="i in dicts.priority" :label="i.name" :key="i.id" :value="i.id"></el-option>
+						</el-select>
+					</el-form-item>  
+					<el-form-item>
+						 <el-button type="primary" icon="el-icon-search" @click="searchXmMenuAttDist">查询</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 { getXmMenuAttDist } from '@/api/xm/core/xmMenu';
+	export default { 
+        
+		components: {   
+		},
+        props:['xmProduct'],
+		computed: {
+		    ...mapGetters([
+		      'userInfo','roles'
+		    ]), 
+            datesCpd(){
+				if(this.xmMenuAttDists.length==0){
+					return []
+				}else{ 
+					return this.xmMenuAttDists.map(i=>i.bizDate)
+				}
+			}, 
+			menuCloseCntCpd(){
+				if(this.xmMenuAttDists.length==0){
+					return []
+				}else{ 
+					return this.xmMenuAttDists.map(i=>i.menuCloseCnt)
+				}
+			},
+			menuUnstartCntCpd(){
+				if(this.xmMenuAttDists.length==0){
+					return []
+				}else{ 
+					return this.xmMenuAttDists.map(i=> i.menuUnstartCnt)
+				}
+			},
+			menuExecCntCpd(){
+				if(this.xmMenuAttDists.length==0){
+					return []
+				}else{ 
+					return this.xmMenuAttDists.map(i=> i.menuExecCnt)
+				}
+			},
+			
+			menuFinishCntCpd(){
+				if(this.xmMenuAttDists.length==0){
+					return []
+				}else{ 
+					return this.xmMenuAttDists.map(i=>i.menuFinishCnt)
+				}
+			},
+			xmMenuAttDistsCpd(){
+				if(this.xmMenuAttDists.length==0){
+					return []
+				}else{ 
+					var itemId="";
+					if(this.groupBy=='status'){
+						itemId="menuStatus"
+					}else if(this.groupBy=='dlvl'){
+						itemId="demandLvl"
+					}else if(this.groupBy=='dtype'){
+						itemId="demandType"
+					}else if(this.groupBy=='priority'){
+						itemId="priority"
+					}else if(this.groupBy=='source'){
+						itemId="demandSource"
+					} 
+					return this.xmMenuAttDists.map(i=>{
+						var data={...i}
+						data.name=this.formatDict(itemId,data.name)
+						return data;
+					})
+				}
+			},
+			title(){
+				return this.groupBys.find(i=>i.id==this.groupBy).name+'数量分布'
+			},
+			legendCpd(){
+				var itemId="";
+				if(this.groupBy=='status'){
+					itemId="menuStatus"
+				}else if(this.groupBy=='dlvl'){
+					itemId="demandLvl"
+				}else if(this.groupBy=='dtype'){
+					itemId="demandType"
+				}else if(this.groupBy=='priority'){
+					itemId="priority"
+				}else if(this.groupBy=='source'){
+					itemId="demandSource"
+				} 
+
+				return this.dicts[itemId].map(i=>i.name)
+			}
+			
+        }, 
+		watch: {  
+			xmMenuAttDistsCpd(){
+				this.drawCharts();
+			}
+	    },
+		data() {
+			return {
+                filters:{
+                    category:'', 
+                    product:null, 
+                    project:null,
+                },
+				groupBy:'status',
+				groupBys:[
+					{id:'status', name:'需求状态'},
+					{id:'dtype', name:'需求类型'},
+					{id:'source', name:'需求来源'},
+					{id:'dlvl', name:'需求层次'},
+					{id:'priority', name:'优先级'}
+				],
+				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,
+				xmMenuAttDists:[],
+
+			}//end return
+		},//end data
+		methods: { 
+			formatDict(itemId,val){
+				var dict=this.dicts[itemId]
+				if(dict){
+					var item=dict.find(i=>i.id==val)
+					if(item){
+						return item.name
+					}
+				}
+				return val;
+			},
+			 findMax( list ) {
+				var i, max = list[0];
+				
+				if(list.length < 2) return max;
+			
+				for (i = 0; i < list.length; i++) {
+					if (list[i].distBudgetWorkload > max.distBudgetWorkload) {
+						max = list[i];
+					}
+				}
+				return max;
+			},
+			getXmMenuAttDist(){
+				var params={productId:'mmcloud-xm',orderBy:'biz_date asc'}
+				getXmMenuAttDist(params).then(res=>{ 
+					this.xmMenuAttDists=res.data.tips.isOk?res.data.data:this.xmMenuAttDists;
+				})
+			}, 
+			open(params){
+				this.visible=true;
+				this.filters.product=params.xmProduct
+				this.filters.project=params.xmProject
+				this.filters.Product=params.xmProduct 
+				
+			},
+			drawCharts() {
+				this.myChart = this.$echarts.init(document.getElementById("xmMenuAttDist")); 
+				this.myChart.setOption(   
+					{
+						title: {
+							text: this.title, 
+							left: 'center'
+						},
+						tooltip: {
+							trigger: 'item'
+						},
+						legend: { 
+							top:'5%',
+							left: 'center',
+							data:this.legendCpd,
+						},
+						series: [
+							{
+							type: 'pie',
+							radius: '50%',
+							data: this.xmMenuAttDistsCpd,
+							emphasis: {
+								itemStyle: {
+								shadowBlur: 10,
+								shadowOffsetX: 0,
+								shadowColor: 'rgba(0, 0, 0, 0.5)'
+								}
+							},
+
+							label: {
+								show: true,
+								position: 'center'
+							},
+							}
+						]
+					}
+				)
+			},
+			onXmMenuSomeFieldsChange(fieldName,$event){
+
+			},
+			searchXmMenuAttDist(){
+				if(!this.groupBy){
+					this.$notify({showClose:true,message:'请选中分组属性',type:'warning'})
+					return 
+				}
+				var params={}
+				if(this.filters.dtype){
+					params.dtype=this.filters.dtype
+				}
+				if(this.filters.status){
+					params.status=this.filters.status
+				}
+				if(this.filters.source){
+					params.source=this.filters.source
+				}
+				if(this.filters.dlvl){
+					params.dlvl=this.filters.dlvl
+				}
+				if(this.filters.priority){
+					params.priority=this.filters.priority
+				} 
+				params.groupBy=this.groupBy
+				getXmMenuAttDist(params).then(res=>{
+					this.xmMenuAttDists=res.data.data
+				})
+				
+			}
+		},//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>
\ No newline at end of file
diff --git a/src/views/xm/rpt/product/menuDayAccumulate.vue b/src/views/xm/rpt/product/menuDayAccumulate.vue
index f5f6b2e2..efac97fc 100644
--- a/src/views/xm/rpt/product/menuDayAccumulate.vue
+++ b/src/views/xm/rpt/product/menuDayAccumulate.vue
@@ -2,7 +2,7 @@
 	<section>
         <el-dialog :title="filters.product?'产品【'+filters.product.productName+'】':''+'需求累积图'" append-to-body modal-append-to-body width="80%" top="20px" :visible.sync="visible">
 			<div>
-				<div class="main" id="main"
+				<div class="main" id="menuDayAccumulate"
 					style="width:100%;height:600px;margin:0 auto;"></div>
 				<div class="progress"></div>
 			</div>
@@ -65,7 +65,7 @@
         }, 
 		watch: {  
 			xmProductStateHiss(){
-				this.drawWorkload();
+				this.drawCharts();
 			}
 	    },
 		data() {
@@ -113,8 +113,8 @@
 				})
 				
 			},
-			drawWorkload() {
-				this.myChart = this.$echarts.init(document.getElementById("main")); 
+			drawCharts() {
+				this.myChart = this.$echarts.init(document.getElementById("menuDayAccumulate")); 
 				this.myChart.setOption(  
 					{
 						title: {
@@ -182,6 +182,7 @@
 			}) 
              */
 			//this.charts();
+			//this.drawCharts()
 			
 		}//end mounted
 	}
diff --git a/src/views/xm/rpt/product/menuDayTrend.vue b/src/views/xm/rpt/product/menuDayTrend.vue
index 0893af4d..fb109832 100644
--- a/src/views/xm/rpt/product/menuDayTrend.vue
+++ b/src/views/xm/rpt/product/menuDayTrend.vue
@@ -2,7 +2,7 @@
 	<section>
         <el-dialog :title="filters.product?'产品【'+filters.product.productName+'】':''+'需求每日趋势'" append-to-body modal-append-to-body width="80%" top="20px" :visible.sync="visible">
 			<div>
-				<div class="main" id="main"
+				<div class="main" id="menuDayTrend"
 					style="width:100%;height:600px;margin:0 auto;"></div>
 				<div class="progress"></div>
 			</div>
@@ -65,7 +65,7 @@
         }, 
 		watch: {  
 			xmProductStateHiss(){
-				this.drawWorkload();
+				this.drawCharts();
 			}
 	    },
 		data() {
@@ -113,8 +113,8 @@
 				})
 				
 			},
-			drawWorkload() {
-				this.myChart = this.$echarts.init(document.getElementById("main")); 
+			drawCharts() {
+				this.myChart = this.$echarts.init(document.getElementById("menuDayTrend")); 
 				this.myChart.setOption(  
 					{	
 						legend: {
@@ -208,6 +208,7 @@
 			}) 
              */
 			//this.charts();
+			//this.drawCharts();
 			
 		}//end mounted
 	}
diff --git a/src/views/xm/rpt/reportIndex.vue b/src/views/xm/rpt/reportIndex.vue
index ba23e8c1..08669a95 100644
--- a/src/views/xm/rpt/reportIndex.vue
+++ b/src/views/xm/rpt/reportIndex.vue
@@ -12,6 +12,10 @@
                         <img src="https://shadow.elemecdn.com/app/element/hamburger.9cf7b091-55e9-11e9-a976-7f4d0b07eef6.png" class="image">
                         <div style="padding: 14px;">
                             <span>{{p.rptName}}</span> 
+                            <div class="bottom clearfix">
+                            <time class="time">{{ p.desc }}</time>
+                            <el-button type="text" class="button"></el-button>
+                            </div> 
                         </div>
                     </el-card>
                 </el-col>
@@ -20,6 +24,7 @@
         <xm-iteration-burnout ref="xmIterationBurnout"></xm-iteration-burnout>
         <xm-menu-day-trend ref="xmMenuDayTrend"></xm-menu-day-trend>
         <xm-menu-day-accumulate ref="xmMenuDayAccumulate"></xm-menu-day-accumulate>
+        <xm-menu-att-dist ref="xmMenuAttDist"></xm-menu-att-dist>
 	</section>
 </template>
 
@@ -30,11 +35,11 @@
     import xmIterationBurnout from './iteration/burnout'
     import xmMenuDayTrend from './product/menuDayTrend'
     import xmMenuDayAccumulate from './product/menuDayAccumulate'
-	
+	import xmMenuAttDist from './product/menuAttDist'
 	export default { 
         
 		components: {   
-            xmIterationBurnout,xmMenuDayTrend,xmMenuDayAccumulate,
+            xmIterationBurnout,xmMenuDayTrend,xmMenuDayAccumulate,xmMenuAttDist,
 		},
         props:['xmProduct','xmIteration','xmProject'],
 		computed: {
@@ -76,9 +81,10 @@
 				dateRanger:[], 
                 maxTableHeight:300,
                 rptList:[/**{name:'报表名称',category:'报表分类，组织级、产品级、项目级、迭代级、需求、测试、任务',path:'路由路径',imgUrl:'图片路径',query:{参数}} */
-                    {rptName:'迭代燃尽图',category:'迭代级',ref:'xmIterationBurnout' },
-                    {rptName:'需求每日趋势',category:'产品级',ref:'xmMenuDayTrend' },
-                    {rptName:'需求每日累积',category:'产品级',ref:'xmMenuDayAccumulate' },
+                    {rptName:'迭代燃尽图',category:'迭代级',ref:'xmIterationBurnout',desc:'跟踪迭代的剩余工作量按日期变化趋势，识别迭代当前进度情况' },
+                    {rptName:'需求每日趋势',category:'产品级',ref:'xmMenuDayTrend',desc:'跟踪未开始、执行中、已完成、已关闭状态的需求数量按日期变化趋势，识别需求工作情况' },
+                    {rptName:'需求每日累积',category:'产品级',ref:'xmMenuDayAccumulate',desc:'跟踪未开始、执行中、已完成、已关闭状态的需求数量按日期累积情况，识别需求工作的瓶颈' },
+                    {rptName:'需求属性分布',category:'产品级',ref:'xmMenuAttDist',desc:'统计所有需求任意属性数量分布情况（实时数据）' },
                 ],
 			}//end return
 		},//end data
@@ -107,9 +113,34 @@
 
 </script>
 
-<style scoped>
-   .image {
+<style scoped> 
+  .time {
+    font-size: 13px;
+    color: #999;
+  }
+  
+  .bottom {
+    margin-top: 13px;
+    line-height: 12px;
+  }
+
+  .button {
+    padding: 0;
+    float: right;
+  }
+
+  .image {
     width: 100%;
     display: block;
   }
+
+  .clearfix:before,
+  .clearfix:after {
+      display: table;
+      content: "";
+  }
+  
+  .clearfix:after {
+      clear: both
+  }
 </style>
\ No newline at end of file