Merge branch 'dev_lxw' of https://gitlab.com/whyclxw1/gx_tieta.git into dev...

admin:huo123456@qq

2019-01-21 a86aed1d459024ab2a97d98115ef57f8dce808e6

 gx_tieta/WebRoot/pages/js/pages/control-common.js

@@ -393,8 +393,8 @@
          min = min>0?0:min;

       }

       

       console.info(max);

       console.info(min);

       //console.info(max);

       //console.info(min);

       

       var option={      

         tooltip:{