|
@@ -184,6 +184,13 @@ const initOnlineChart = () => {
|
|
}
|
|
}
|
|
}
|
|
}
|
|
},
|
|
},
|
|
|
|
+ grid: {
|
|
|
|
+ left: '2%',
|
|
|
|
+ right: '2%',
|
|
|
|
+ top: '2%',
|
|
|
|
+ bottom: '10%',
|
|
|
|
+ containLabel: true
|
|
|
|
+ },
|
|
legend: {
|
|
legend: {
|
|
orient: 'horizontal',
|
|
orient: 'horizontal',
|
|
bottom: 0
|
|
bottom: 0
|
|
@@ -197,7 +204,7 @@ const initOnlineChart = () => {
|
|
},
|
|
},
|
|
series: [
|
|
series: [
|
|
{
|
|
{
|
|
- name: '人数',
|
|
|
|
|
|
+ name: '各时段在线人数',
|
|
type: 'line',
|
|
type: 'line',
|
|
smooth: true,
|
|
smooth: true,
|
|
data: yAxis
|
|
data: yAxis
|
|
@@ -214,6 +221,8 @@ const initRoomVisitChart = () => {
|
|
const ch1X = ch1.map(i => i.dataKey)
|
|
const ch1X = ch1.map(i => i.dataKey)
|
|
const ch1Y = ch1.map(i => i.dataCount)
|
|
const ch1Y = ch1.map(i => i.dataCount)
|
|
const ch2X = ch2.map(i => i.dataKey)
|
|
const ch2X = ch2.map(i => i.dataKey)
|
|
|
|
+
|
|
|
|
+ const allX = Array.from(new Set(ch1X.concat(ch2X)));
|
|
const ch2Y = ch2.map(i => i.dataCount)
|
|
const ch2Y = ch2.map(i => i.dataCount)
|
|
const ch1Max = Math.max.apply(Math, ch1Y) + 200
|
|
const ch1Max = Math.max.apply(Math, ch1Y) + 200
|
|
const ch1Min =
|
|
const ch1Min =
|
|
@@ -240,7 +249,8 @@ const initRoomVisitChart = () => {
|
|
},
|
|
},
|
|
xAxis: {
|
|
xAxis: {
|
|
type: 'category',
|
|
type: 'category',
|
|
- data: ch1X,
|
|
|
|
|
|
+ data: allX,
|
|
|
|
+
|
|
splitLine: {
|
|
splitLine: {
|
|
show: true,
|
|
show: true,
|
|
lineStyle: {
|
|
lineStyle: {
|
|
@@ -256,7 +266,8 @@ const initRoomVisitChart = () => {
|
|
yAxis: [
|
|
yAxis: [
|
|
{
|
|
{
|
|
type: 'value',
|
|
type: 'value',
|
|
- max: ch2X,
|
|
|
|
|
|
+ min: ch1Min,
|
|
|
|
+ max: ch1Max,
|
|
splitNumber: 4,
|
|
splitNumber: 4,
|
|
axisTick: {
|
|
axisTick: {
|
|
show: false
|
|
show: false
|
|
@@ -280,7 +291,7 @@ const initRoomVisitChart = () => {
|
|
{
|
|
{
|
|
smooth: true,
|
|
smooth: true,
|
|
data: ch1Y,
|
|
data: ch1Y,
|
|
- type: 'line',
|
|
|
|
|
|
+ type: 'bar',
|
|
areaStyle: {},
|
|
areaStyle: {},
|
|
name: '用户浏览量',
|
|
name: '用户浏览量',
|
|
itemStyle: {
|
|
itemStyle: {
|
|
@@ -290,7 +301,7 @@ const initRoomVisitChart = () => {
|
|
{
|
|
{
|
|
smooth: true,
|
|
smooth: true,
|
|
data: ch2Y,
|
|
data: ch2Y,
|
|
- type: 'line',
|
|
|
|
|
|
+ type: 'bar',
|
|
name: '用户分享数',
|
|
name: '用户分享数',
|
|
areaStyle: {},
|
|
areaStyle: {},
|
|
itemStyle: {
|
|
itemStyle: {
|
|
@@ -310,7 +321,8 @@ const initRoomMsgChart = () => {
|
|
const ch1Y = ch1.map(i => i.dataCount)
|
|
const ch1Y = ch1.map(i => i.dataCount)
|
|
const ch2X = ch2.map(i => i.dataKey)
|
|
const ch2X = ch2.map(i => i.dataKey)
|
|
const ch2Y = ch2.map(i => i.dataCount)
|
|
const ch2Y = ch2.map(i => i.dataCount)
|
|
- const ch1Max = Math.max.apply(Math, ch1Y) + 200
|
|
|
|
|
|
+ const allX = Array.from(new Set(ch1X.concat(ch2X)));
|
|
|
|
+ const ch1Max = Math.max.apply(Math, ch1Y) + 100
|
|
const ch1Min =
|
|
const ch1Min =
|
|
Math.min.apply(Math, ch1Y) === 0 ? 0 : Math.min.apply(Math, ch1Y)
|
|
Math.min.apply(Math, ch1Y) === 0 ? 0 : Math.min.apply(Math, ch1Y)
|
|
|
|
|
|
@@ -335,7 +347,7 @@ const initRoomMsgChart = () => {
|
|
},
|
|
},
|
|
xAxis: {
|
|
xAxis: {
|
|
type: 'category',
|
|
type: 'category',
|
|
- data: ch1X,
|
|
|
|
|
|
+ data: allX,
|
|
splitLine: {
|
|
splitLine: {
|
|
show: true,
|
|
show: true,
|
|
lineStyle: {
|
|
lineStyle: {
|
|
@@ -351,7 +363,8 @@ const initRoomMsgChart = () => {
|
|
yAxis: [
|
|
yAxis: [
|
|
{
|
|
{
|
|
type: 'value',
|
|
type: 'value',
|
|
- max: ch2X,
|
|
|
|
|
|
+ min: ch1Min,
|
|
|
|
+ max: ch1Max,
|
|
splitNumber: 4,
|
|
splitNumber: 4,
|
|
axisTick: {
|
|
axisTick: {
|
|
show: false
|
|
show: false
|
|
@@ -375,9 +388,9 @@ const initRoomMsgChart = () => {
|
|
{
|
|
{
|
|
smooth: true,
|
|
smooth: true,
|
|
data: ch1Y,
|
|
data: ch1Y,
|
|
- type: 'bar',
|
|
|
|
|
|
+ type: 'line',
|
|
areaStyle: {},
|
|
areaStyle: {},
|
|
- name: '用户留言数',
|
|
|
|
|
|
+ name: '留言人数',
|
|
itemStyle: {
|
|
itemStyle: {
|
|
color: '#5ab1ef'
|
|
color: '#5ab1ef'
|
|
}
|
|
}
|
|
@@ -385,8 +398,8 @@ const initRoomMsgChart = () => {
|
|
{
|
|
{
|
|
smooth: true,
|
|
smooth: true,
|
|
data: ch2Y,
|
|
data: ch2Y,
|
|
- type: 'bar',
|
|
|
|
- name: '用户留言数',
|
|
|
|
|
|
+ type: 'line',
|
|
|
|
+ name: '留言总数',
|
|
areaStyle: {},
|
|
areaStyle: {},
|
|
itemStyle: {
|
|
itemStyle: {
|
|
color: '#019680'
|
|
color: '#019680'
|