修改

D:/workspace/chenjingjing/git/gx_tieta/gx_tieta/.gitignore

2019-01-17 0b8e9cc4a2cd216dfac79bc00ee44796412e2009

修改

 gx_tieta/WebRoot/mobil/control.html

@@ -68,7 +68,7 @@
    <script>

        var arrTh = ['电池状态：', '端电压：', '电池电流：', '测试日期：', '测试时长：', '测试容量：', '剩余容量：', '续航时间：'];

        var tbl = $('.tbl-container').eq(1);

        var jifangarrTh = ['SD卡','通讯计数','通信丢包率','信号强度']

        var jifangarrTh = ['SD卡','通讯计数','通信丢包率','设备工作状态']

        var tbl1 = $('.tbl-container').eq(0);

        var arrtdjifangstate = new Array;

        var temp = getCookie("batt");

@@ -250,7 +250,7 @@
                success: function(data){ 

                    data=JSON.parse(data);

                    data = JSON.parse(data.result);

                    //console.info(data);

                    console.info(data);

                    if(data.code==1&&data.data.length>0){

                        data = data.data[0];

                        var jishu = data.dev_commcount;

@@ -258,12 +258,41 @@
                        arrTd1.push(jishu);

                        var diubao=(data.dev_commcount==0?0:(data.dev_errcommcount*100/data.dev_commcount)).toFixed(2);

                        arrTd1.push(diubao);

                        arrTd1.push(workstate(data.dev_workstate))

                        createTbl(tbl1, jifangarrTh, arrTd1);

                    }else{

                        var arrTd2 = new Array();

                        arrTd2.push("设备未连接")

                        var jifangzhuangtai=["设备状态"]

                        createTbl(tbl1,jifangzhuangtai,arrTd2);

                    }

                }

             });

        }



        function workstate(data){

            switch (data){

            case 0:

                return "在线浮充";

                break;

            case 1:

                return "放电状态";

                break;

            case 2:

                return "充电状态";

                break;

            case 3:

                return "内阻测试";

                break;

            case 4:

                return "未知"			
                break;

            default:{

                    //未连接

                return "未连接";

                }

            break;	
            }

        }

        //查询设备的SD卡状态

        function searchDevSDState(){

            arrTd1=new Array();

@@ -278,7 +307,7 @@
                success: function(result) {

                   //console.info(result);

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

                       //console.info(rs);

                       console.info(rs);

                    var sdStatus = (rs.data == 0)?'正常': '<span style="color: #FF0000">故障</span>';

                       arrtdjifangstate .push(sdStatus);

                    //console.log(sdStatus);