Merge branch 'feature/chenshu/panel' into dev

src/modules/home/Home.jsx

@@ -112,9 +112,6 @@ class Home extends React.Component {
 			},
 			},
 			time: {
 			time: {
 				formatter: (val) => {
 				formatter: (val) => {
-					if (val == 8) {
-						return '7日外'
-					} 
           return `${val}`
           return `${val}`
 				},
 				},
 				range: [0.06, 0.94]
 				range: [0.06, 0.94]
@@ -160,13 +157,13 @@ class Home extends React.Component {
 		this._chart.line().position('time*studyNum').color('#5289FA').tooltip('time*studyNum', function( time, studyNum){
 		this._chart.line().position('time*studyNum').color('#5289FA').tooltip('time*studyNum', function( time, studyNum){
 			return {
 			return {
 				name: '学习人数',
 				name: '学习人数',
-				value: studyNum
+				value: studyNum + '人'
 			}
 			}
 		});
 		});
 		this._chart.line().position('time*studyTime').color('#FFB714').tooltip('time*studyTime', function( time, studyTime){
 		this._chart.line().position('time*studyTime').color('#FFB714').tooltip('time*studyTime', function( time, studyTime){
 			return {
 			return {
 				name: '人均学习时长',
 				name: '人均学习时长',
-				value: studyTime
+				value: studyTime + '分钟'
 			}
 			}
 		});
 		});