Merge branch 'dev' of http://git.sinoecare.com/sinoecare/digital_village_v2/dvcp_v2_webapp into dev
This commit is contained in:
		| @@ -159,6 +159,7 @@ | |||||||
|         deptList: [], |         deptList: [], | ||||||
|         selectDeptName: '', |         selectDeptName: '', | ||||||
|         isDepartData: true, |         isDepartData: true, | ||||||
|  |         departBarData: [], | ||||||
|         type: '', |         type: '', | ||||||
|       } |       } | ||||||
|     }, |     }, | ||||||
| @@ -323,6 +324,7 @@ | |||||||
|               this.isDepartData = true |               this.isDepartData = true | ||||||
|               var items = [], xData = [], yData = [] |               var items = [], xData = [], yData = [] | ||||||
|               res.data.map((item) => { |               res.data.map((item) => { | ||||||
|  |                 this.departBarData.push(item) | ||||||
|                 var i = {type: 'departmentName', id: item.deptId, corpid: this.user.info.corpId} |                 var i = {type: 'departmentName', id: item.deptId, corpid: this.user.info.corpId} | ||||||
|                 items.push(i) |                 items.push(i) | ||||||
|                 yData.push(item.taskCount) |                 yData.push(item.taskCount) | ||||||
| @@ -366,6 +368,10 @@ | |||||||
|             trigger: 'axis', |             trigger: 'axis', | ||||||
|             axisPointer: { |             axisPointer: { | ||||||
|               type: 'shadow' |               type: 'shadow' | ||||||
|  |             }, | ||||||
|  |             formatter: function(data) { | ||||||
|  |               let name = `<ai-open-data type="userName" :openid="${this.departBarData[data[0].dataIndex].deptId}" class="name"></ai-open-data><br/>宣发任务数:${data[0].data}` | ||||||
|  |               return name | ||||||
|             } |             } | ||||||
|           }, |           }, | ||||||
|           dataZoom: [ |           dataZoom: [ | ||||||
|   | |||||||
		Reference in New Issue
	
	Block a user