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

81041

2018-11-05 d1a5cb4b1e50a2230318cd8e6ba2221fc29a45ec

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

 gx_tieta/WebRoot/control.jsp

@@ -4475,6 +4475,16 @@
        // 系统参数设置

        $(function() {

            var sysCMD = GLOBAL.CMD.sys;

			
            // 点击读取

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

                var batt = getBatt();

                var temp = {

                    dev_id:batt.FBSDeviceId

                };

                searchSysData(temp, true);

            });

			
            // 点击设置系统参数

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

                var batt = getBatt();

@@ -4497,7 +4507,19 @@
                layer.prompt({title: '输入重启口令', formType: 1}, function(pass, index){

                    var _pass = hex_md5(pass);

                    if(_pass == resetPwd) {

                        layer.msg('功能开发中...');

                        // 关闭口令面板

                        layer.close(index);

                        // 构造重启命名

                        var batt = getBatt();

                        var temp = {

                            dev_id: batt.FBSDeviceId,

                            cmd: sysCMD.restart

                        };

						
                        console.log(temp);

                        return;

                        // 重启

                        restartSys(temp);

                    }else {

                        layer.msg('口令输入错误');

                    }

@@ -4506,7 +4528,7 @@
            

                

            // 查询设备的系统参数

            function searchSysData(temp) {

            function searchSysData(temp, showSU) {

                // 开启等待框

                var load = layer.load(1);

                // 请求后台

@@ -4522,6 +4544,9 @@
                        if(rs.code == 1){

                            var data = rs.data[0];

                            setSysSetData(data);

                            if(showSU) {

                                noContent.showNoContent('读取成功', true);

                            }

                        }else{

                            noContent.showNoContent('查询失败!');

                        }

@@ -4567,6 +4592,40 @@
                });

            }

            

            // 重启设备

            function restartSys(temp) {

                // 开启等待框

                var load = layer.load(1);

                // 请求后台

                $.ajax({

                    type: "post",

                    url: "Fbs9100_sysparamAction_action_update",

                    async: true,

                    dataType: 'json',

                    data: "json = " + JSON.stringify(temp),

                    success: function(result) {

                        var rs = JSON.parse(result.result);

                        console.info(rs);

                        if(rs.code == 1){

                            noContent.showNoContent('发送重启命令成功', true);

                        }else{

                            noContent.showNoContent('发送重启命令失败!');

                        }

		                
                        // 关闭等待

                        layer.close(load);

                    },

                    error: function() {

                        noContent.showNoContent('发送重启命令失败!');

                        // 关闭等待

                        layer.close(load);

                    }

                });

				
            }

			
			
			
            // 根据数据设置面板信息

            function setSysSetData(data) {

                $('#sysSet_dev_id').val(data.dev_id);            // 设备ID