diff --git a/public/dashboard/index.html b/public/dashboard/index.html
index 7d931ef..dd8e507 100644
--- a/public/dashboard/index.html
+++ b/public/dashboard/index.html
@@ -316,7 +316,11 @@
name: '未陪护'
},
]
+ var monthChartX = []
+ var monthY = []
+ var incomeChart = []
var projectChartX = []
+ var projectChartYperson = []
var projectChartY = []
$(function() {
getStatistic()
@@ -371,10 +375,25 @@
name: '未陪护'
}
]
+ // 本月陪护订单分析
+ var monthsArr = datas.monthAccompany
+ monthsArr.map(item=>{
+ monthChartX.push(item.name)
+ monthChartY.push(item.total)
+ })
+ // 本月营收分析
+ var incomes = datas.income
+ incomes.map(item=>{
+ incomeChart.push({
+ name:item.name.,
+ total:item.total
+ })
+ })
// 陪护统计表
var projects = datas.project
projects.map(item=>{
projectChartX.push(item.name)
+ projectChartYperson.push(item.paramedic_total)
projectChartY.push(item.total)
})
@@ -454,7 +473,7 @@
fontSize: '14px'
}
},
- data: projectChartX,
+ data: monthChartX,
},
yAxis: {
axisLine: {
@@ -495,16 +514,15 @@
}
},
- data: projectChartY,
- }
- // , {
- // name: '陪护订单量',
- // type: 'pictorialBar',
- // barGap: '-100%',
- // symbolPosition: 'end',
- // symbolSize: 50,
- // symbolOffset: [0, '-120%'],
- // },
+ data: monthChartY,
+ }, {
+ name: '陪护订单量',
+ type: 'pictorialBar',
+ barGap: '-100%',
+ symbolPosition: 'end',
+ symbolSize: 50,
+ symbolOffset: [0, '-120%'],
+ },
]
};
var myChart2 = echarts.init(document.getElementById('byph'));
@@ -520,39 +538,7 @@
radius: '70%',
center: ['50%', '50%'],
color: ["#ffb22f", "#ff4954", "#01babb"],
- data: [{
- value: 75,
- name: '一院'
- },
- {
- value: 60,
- name: '市中'
- },
- {
- value: 30,
- name: '武进南院'
- },
- {
- value: 25,
- name: '阳湖院'
- },
- {
- value: 30,
- name: '康复医院'
- },
- {
- value: 20,
- name: '妇幼院'
- },
- {
- value: 25,
- name: '武中'
- },
- {
- value: 18,
- name: '溧阳院'
- }
- ].sort(function(a, b) {
+ data: incomeChart.sort(function(a, b) {
return a.value - b.value;
}),
roseType: 'radius',
@@ -604,7 +590,7 @@
},
xAxis: {
type: 'category',
- data: ['一院', '市中', '武进南院', '阳湖院', '康复医院', '妇幼院', '武中', '溧阳院'],
+ data: projectChartX,
axisLine: {
show: true,
lineStyle: {
@@ -651,7 +637,7 @@
series: [{
type: 'bar',
name: '陪护单数',
- data: [336, 150, 42, 156, 42, 30, 54, 45],
+ data: projectChartY,
itemStyle: {
color: '#ffb22f',
}
@@ -659,7 +645,7 @@
{
type: 'bar',
name: '总护工数',
- data: [288, 130, 35, 125, 38, 30, 50, 40],
+ data: projectChartXperson,
itemStyle: {
color: '#0087ff'
}