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

hdw

2018-12-14 78110e040425adf4243f966ccc865fb0498f69e1

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

 gx_tieta/WebRoot/mobil/batt-approved.html

@@ -329,9 +329,7 @@
                //<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;

			
            }   

                arrTd[i]=i*10;

            }


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

@@ -382,8 +382,9 @@
                var index = String(i);

                console.info(battString);

                var obj = {

                    //apply_date : new Date().format("yyyy-MM-dd hh:mm:ss"),

                    apply_date : new Date().format("yyyy-MM-dd hh:mm:ss"),

                    num : tempnum[i],

					
                    binf:{

                        StationId : $("#StationId").val(),    // 机房编号

                        StationName : ($("#station_name1").val()+"-"+$("#city").val()+"-"+$("#StationName3").val()+"-"+$("#StationName4").val()),    // 拼接机房名称

@@ -421,6 +422,7 @@
                        BattProductDate :  $("#startTestrecord").val()+" 00:00:00",        //电池生产日期

                        BattInUseDate :  $("#endTestrecord").val()+" 00:00:00",            //电池使用日期

                        install_user : $("#install_user").val(),            //安装人员

						
                    }

                }

                arr.push(obj);

@@ -461,12 +463,12 @@
                        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"

                }

         });

   }