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

81041

2018-11-06 dab587733203e81bc405449abe48f66061d454e6

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

 gx_tieta/WebRoot/control.jsp

@@ -247,6 +247,11 @@
                                    <span class="whyc-btn-icon fa fa-gear"></span>

                                    <span class="whyc-btn-txt">系统参数</span>

                                </a>

                                <br>

                                <a href="javascript:void(0);" id="signalBtn" class="whyc-btn whyc-btn-disabled" id="specialGraphExport">

                                    <span class="whyc-btn-icon fa fa-signal"></span>

                                    <span class="whyc-btn-txt">信号质量</span>

                                </a>

                            </div>

                        </div>

                    </div>

@@ -4328,7 +4333,7 @@
                    // 负载电流

                    var loadCurr = batt.Load_curr+'A';

                    changeEleCircleOpt(eleCircle, 'loaderCurr', {name:'最大负载电流：'+loadCurr});

					
                    changeEleCircleOpt(eleCircle, 'signal', {isShow:false});

                    // 最大核容电流

                    var disCurrMax = batt.DisCurrMax+'A';

                    changeEleCircleOpt(eleCircle, 'disCurrMax', {name:'最大核容电流：'+disCurrMax});

@@ -4718,6 +4723,64 @@
                

                return rs;

            }

			
            // 查询信号质量模块

            var gprs = GLOBAL.CMD.gprs;

            var signalSearch = {

                num: gprs.param,

                AT_cmd: gprs.signal,

                dev_id: ''

            };

            // 点击查看当前信号的质量

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

                var batt = getBatt();

                signalSearch.dev_id = batt.FBSDeviceId;

                // 请求后台获取信号的质量

                searchStationSignal(signalSearch,function(data){

                    // 基础配置

                    var signalOpts = {

                        img: signalBad,

                        isShow: true,

                        startX: 10,

                        startY: 30,

                        name: ''

                    };

                    var signalInfo = formatSignal(""); 
                    if(data.code == 1) {

                        var csq = data.data.ack_inf;

                        signalInfo = formatSignal(csq);

                    }

                    // 显示图片类型

                    if(signalInfo.img) {

                        signalOpts.img = signalGood;

                    }

					
                    // 图片描述

                    signalOpts.name = '信号强度：'+signalInfo.signal;

                    changeEleCircleOpt(eleCircle, 'signal', signalOpts);

                });

				
            });

			
            // 解析信号质量结果

            function formatSignal(signal) {

                var rs = {

                    signal: '未知',

                    bitError: '未知',

                    img: 0

                };

                var ptn = new RegExp(".*:\\s(\\d{2}),(\\d{2})");

                var testCsq = ptn.test(signal);

                if(testCsq) {

                    rs.signal = RegExp.$1;

                    rs.bitError = RegExp.$2;

                    if(rs.signal>20) {

                        rs.img = 1;

                    }

                }

				
                return rs;

            }

        });

        

        // 机历卡模块

@@ -4737,6 +4800,29 @@
                tabContents.eq(index).addClass('con-show');

            });

        });

		
        var gprs = GLOBAL.CMD.gprs;

		
        var temp = {

            num: gprs.param,

            AT_cmd: gprs.signal,

            dev_id:910000577

        };

		
		
		
        /* searchStationSignal(temp,function(data){

            changeEleCircleOpt(eleCircle, 'signal', {

                img: signalBad,

                isShow: true,

            });

            var csq = data.data.ack_inf;

            var ptn = new RegExp(".*:\\s(\\d{2}),(\\d{2})");

            var testCsq = ptn.test(csq);

            console.log(RegExp.$1);

            console.log(RegExp.$2);

            console.log(data.data.ack_inf);

        }); */

    </script>

    <script type="text/javascript" src="js/Title.js"></script>

    <script type="text/javascript" src="js/control.js"></script>


 gx_tieta/WebRoot/image/eleCircle/signalBad.gif

 gx_tieta/WebRoot/image/eleCircle/signalGood.gif

 gx_tieta/WebRoot/js/elecircle.content.js

@@ -1,5 +1,18 @@
var eleCircle = new EleCircle('eleCircle', {});

var signalGood = new Image();

signalGood.src="image/eleCircle/signalGood.gif";

var signalBad = new Image();

signalBad.src="image/eleCircle/signalBad.gif";

$(function() {

    eleCircle.drawImg({

        startX: 10,

        startY: 30,

        width: 30,

        height: 30,

        isShow:false,

        id: 'signal'

    });

	
    // 最上方的横线

    eleCircle.drawLine({

        startX: 120,


 gx_tieta/WebRoot/js/elecircle.js

@@ -1133,6 +1133,11 @@
        startY: 0,

        width: 30,

        height: 30,

        lineWidth: 4,

        fontSize: 14,

        fontWeight: '',

        strokeStyle: '#000',

        fillStyle: '#000',

        isShow: true,

        name:'',

        id: '',

@@ -1140,8 +1145,24 @@
    

    var opts = $.extend({}, defaluts, options || {});

    

    if(opts.img != '')

    this.context.drawImage(opts.img, opts.startX-30, opts.startY-3, 65, 105);

    if(opts.img != '' && opts.isShow) {

        this.context.drawImage(opts.img, opts.startX, opts.startY, opts.width, opts.height);

		
        this.context.lineWidth = opts.lineWidth;

        this.context.strokeStyle = opts.strokeStyle;

        this.context.fillStyle = opts.fillStyle;

        this.context.font = opts.fontSize+'px Arial';

        this.context.fillText(opts.name, opts.startX+30, opts.startY+25);

    }

	
    // 存储内容

    var txtInfor = {

        options: opts,

        type:'drawImg',

    };

    this.opts.push(txtInfor);

	
	
};



// 重新绘制图


 gx_tieta/WebRoot/pages/js/common.js

@@ -557,13 +557,12 @@
function searchStationSignal(param,callback){

    $.ajax({     

        type:"post",                                 

        url: "Bts_gprs_stateAction_action_update",						
        url: "Bts_gprs_stateAction_action_update?"+(new Date().getTime()),						
        async:true,                

        dataType:'json',

        data:'json='+JSON.stringify(param),        

        success: function(data){ 

            var model = eval('('+data.result+')');

            console.info(model);

            if(callback && typeof callback == 'function'){

                callback(model);

            }