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

hdw

2018-12-14 0221141e9b5597656bf8810a648f9c4f29b6251a

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

 gx_tieta/WebRoot/mobil/batt-approved.html

@@ -139,10 +139,10 @@
          /* 获取点击的是哪个按钮   */

          function getButIndex(t){

                var index = $(t).attr("but-index");   

                index=(index/33-1);

               // index=(index/33-1);

                   console.info(index);

                   setcookiedit(index);

                   //window.location.href="control.html"; 	
                   window.location.href="control.html"; 	
                return ;

            }

    

@@ -182,7 +182,7 @@
        return obj;

    }

    // 查询内容

/*    function searchBattLife(){

    function searchBattLife(){

        var temp = JSON.stringify(getcreatArr());

        console.info(temp);

        arrTd = new Array();

@@ -232,14 +232,15 @@
                     arrTd[index++] = data[i].binf.BattProductDate.substr(0,10);

                     arrTd[index++] = data[i].binf.BattInUseDate.substr(0,10);

                     arrTd[index++] = data[i].binf.install_user;

                     arrTd[index++] = "";

                     arrTd[index++] = arrTd[i]='<a href=""  class="ui-btn ui-btn-inline ui-corner-all operat-but" data-position-to="window" >电池组实时数据</a>';

                     //arrTd[index++] = "";

                      arrTd[index++]='<a onclick="getButIndex(this)"  class="ui-btn ui-btn-inline ui-corner-all operat-but" data-position-to="window"'+'but-index='+i+'>电池组实时数据</a>';

                     }

                 }

                 console.info(arrTd);

             createTbl(tblCon, arrTh, arrTd);

             }

         });            

    }*/

    }

        

         function setcookiedit(index){

                 var arrcookie = new Array();    

@@ -319,29 +320,30 @@
         }

        

    // 查询内容

        function searchBattLife(){

    /*    function searchBattLife(){

            

        

            /* 模拟数据做好就删！！！！！！！！ */

            

            for(var i=0;i<340;i++){

        /*    for(var i=0;i<340;i++){

                if(i%34==33){

                //<a href="count-report.html" target="_top" class="ui-btn ui-corner-all ui-shadow ui-icon-back ui-btn-icon-left" style="padding-top: 0.7em; padding-bottom: 0.7em;">返回</a>

                console.info(i);

                arrTd[i]='<a onclick="getButIndex(this)"  class="ui-btn ui-btn-inline ui-corner-all operat-but" data-position-to="window"'+'but-index='+i+'>电池组实时数据</a>';            

				
                continue;

                }

                if(i=13){

			
            }   if(i==13){

                    arrTd[i]=1002102;

                }else{   

                    arrTd[i]=i;

                    arrTd[i]=i*10;

                }

            }

                        

            createTbl(tblCon, arrTh, arrTd);

                    

            /* 模拟数据做好就删！！！！！！！！ */                

        }

        //}



        function getUpdateArr(temp){

            var arr = new Array();


 gx_tieta/WebRoot/mobil/batt-infor-unapproved-edit.html

@@ -439,12 +439,7 @@
    $(".unable").prop("readonly","readonly").attr("unselectable","on").addClass("uncheck");

    $("#sure").click(function(){

            editParm();     

       /*    function backpage(){window.location.href="ele-param1.html";}

                 setTimeout(backpage,500); 
              });

        $("#cancel").click(function(){

         window.location.href="ele-param1.html";

        */



        });

   });

   function editParm(){

@@ -462,15 +457,15 @@
                    console.info(model);

                    if(model.code ==1){

                        alert("修改成功");

                        //window.location.href="batt-unapproved.html"

                        window.location.href="batt-unapproved.html"

                    }else{

                        alert("修改失败!");

                        //window.location.href="batt-unapproved.html"

                        window.location.href="batt-unapproved.html"

                    }        

                },

                error:function(){

                    alert("修改电池组失败!");

                    //window.location.href="batt-unapproved.html"

                    window.location.href="batt-unapproved.html"

                }

         });

   }


 gx_tieta/WebRoot/mobil/control.html

@@ -18,7 +18,7 @@
<body>

<div data-role="page">

    <div data-role="header" data-position="fixed">

        <a href="testdata.html" class="ui-btn ui-corner-all ui-shadow ui-icon-back ui-btn-icon-left" target="_top" style="padding-top:0.7em;padding-bottom:0.7em;">返回</a>

        <a id= "return" class="ui-btn ui-corner-all ui-shadow ui-icon-back ui-btn-icon-left" target="_top" style="padding-top:0.7em;padding-bottom:0.7em;">返回</a>

        <h1>实时—检测数据</h1>

    </div>



@@ -61,7 +61,16 @@
            //findrtstate();

            searchBattInfo();

        });

		
        $("#return").click(function(){

            var temp = getCookie("batt");

            var batt = JSON.parse(temp);

            console.info(batt);

            if(batt.install_user){

                window.location.href="batt-approved.html";

            }else{

                window.location.href="testdata.html";

            }

        });

        var timeer ;

        //根据电池组id查询电池组信息

        /* function findrtstate(){

@@ -191,7 +200,11 @@
                {url: 'testdata.html', txt: '电池组数据'},                                // 电池组数据

                {url: 'javascript:;', txt: '实时-监测数据'}                                // 电池组数据

            ];*/

            if(batt.install_user){

				
            }else{

            addBreadCrumb($('.breadcrumb').eq(0), data);

            }

        });

        

        function sethoubeiTime(value){