Merge branch 'feature/grade' into release/180420

@@ -2,8 +2,9 @@ import 'activity/grade-detail.page.css';
 import $ from 'yoho-jquery';
 import $ from 'yoho-jquery';
 import echarts from 'echarts/lib/echarts';
 import echarts from 'echarts/lib/echarts';
 import 'echarts/lib/chart/line';
 import 'echarts/lib/chart/line';
-import 'echarts/lib/component/dataZoom';
-import 'echarts/lib/component/markLine';
+
+// import 'echarts/lib/component/dataZoom';
+// import 'echarts/lib/component/markLine';
 import Page from 'yoho-page';
 import Page from 'yoho-page';
 import graphOptions from './graph-options';
 import graphOptions from './graph-options';
 import yoho from 'yoho-app';
 import yoho from 'yoho-app';
@@ -42,9 +43,10 @@ class GradeDetailPage extends Page {
         });
         });
 
 
         this.eGradeGraph = echarts.init(this.view.gradeGraph[0]);
         this.eGradeGraph = echarts.init(this.view.gradeGraph[0]);
-        this.eGradeGraph.on('click', this.monthDetailInit.bind(this));
-        this.view.navBack.on('click', this.goBack.bind(this));
-        this.eGradeGraph.on('dataZoom', this.dataZoomEvent.bind(this));
+
+        // this.eGradeGraph.on('click', this.monthDetailInit.bind(this));
+        // this.view.navBack.on('click', this.goBack.bind(this));
+        // this.eGradeGraph.on('dataZoom', this.dataZoomEvent.bind(this));
 
 
         this.beforeScroll = document.body.scrollTop;
         this.beforeScroll = document.body.scrollTop;
         this.year = 0;
         this.year = 0;

@@ -17,14 +17,15 @@ export default (graphData) => {
         tooltip: {
         tooltip: {
             trigger: 'none'
             trigger: 'none'
         },
         },
-        dataZoom: [{
-            type: 'inside',
-            start: graphData.start,
-            end: 100,
-            zoomLock: true,
-            zoomOnMouseWheel: false,
-            filterMode: 'none'
-        }],
+
+        // dataZoom: [{
+        //     type: 'inside',
+        //     start: graphData.start,
+        //     end: 100,
+        //     zoomLock: true,
+        //     zoomOnMouseWheel: false,
+        //     filterMode: 'none'
+        // }],
         xAxis: {
         xAxis: {
             type: 'category',
             type: 'category',
             boundaryGap: false,
             boundaryGap: false,
@@ -46,6 +47,8 @@ export default (graphData) => {
             color: ['#A59075'],
             color: ['#A59075'],
             symbol: 'circle',
             symbol: 'circle',
             symbolSize: 10,
             symbolSize: 10,
+            clipOverflow: false,
+            hoverAnimation: false,
             type: 'line',
             type: 'line',
             label: {
             label: {
                 normal: {
                 normal: {