Merge branch 'dev_lxw' of https://whychdw@gitlab.com/whyclxw1/gx_tieta.git ...

hdw

2018-11-12 82846eab9685597fa69afe7be852eae7a9329cd1

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

 gx_tieta/WebRoot/control.jsp

@@ -4539,7 +4539,7 @@
                searchSysData(temp, true);

            });

            

            // 点击设置系统参数

            // 点击系统参数按钮

            $('#sysSet').click(function() {

                var batt = getBatt();

                var temp = {

@@ -4571,7 +4571,7 @@
                        var batt = getBatt();

                        var temp = {

                            dev_id: batt.FBSDeviceId,

                            cmd: sysCMD.restart

                            num: sysCMD.restart

                        };

                        

                        /* console.log(temp);