Merge branch 'master' of http://blit.7drlb.com:8888/r/screen_demo2

fengxiang

2018-07-31 a2bd66a59a51c84100474d1ce3eb79d7ed3b754e

 src/app/routes/forecasting-warning/forecasting-warning.component.ts

@@ -88,7 +88,7 @@
        };

        return [

          params[0].value[0],

          '风速：' + params[0].value[1] + '节',

          '风速：' + params[0].value[1],

          '风向：' + directionName[params[0].value[2]]

        ].join('<br>');

      }

@@ -98,7 +98,7 @@
      boundaryGap: true

    },

    yAxis: {

      name: '风速（节）'

      name: '风速（m/s）'

    },

    series: [

      {