bug
CJJ
2018-12-25 edbafe463bdaa51f7b466a1491943e0bdcd4dd13
bug
2个文件已修改
197 ■■■■■ 已修改文件
gx_tieta/WebRoot/mobil/batt-approved.html 29 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
gx_tieta/WebRoot/mobil/batt-infor-conf-temp1.html 168 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
gx_tieta/WebRoot/mobil/batt-approved.html
@@ -209,7 +209,7 @@
       
    
       var arrdata = new Array();  
    var arrTh = [ '机房编号', '省', '城市','区县','机房名称','设备名称','机房IP','FBS设备ID(重要)','FBS设备IP(重要)','子网掩码','网关','FBS设备名称','FBS电池索引(0-3)','电池组ID','机房内电池组编号','电池组名称','浮充电压阀值(V)','离线电压阀值(V)','浮充电流阀值(A)','单体数量','标称容量(AH)','标称单体电压(V)','标称单体内阻(mΩ)','标称单体电导','单体电压次低偏移量(V)','负载电流(A)','最大核容电流(A)','基站号码','电池品牌','电池型号','电池生产日期','投入使用日期','安装人员','通讯计数','是否验收',''];
    var arrTh = [ '机房编号', '省', '城市','区县','机房名称','设备名称','机房IP','FBS设备ID(重要)','FBS设备IP(重要)','子网掩码','网关','FBS设备名称','FBS电池索引(0-3)','电池组ID','机房内电池组编号','电池组名称','浮充电压阀值(V)','离线电压阀值(V)','浮充电流阀值(A)','单体数量','标称容量(AH)','标称单体电压(V)','标称单体内阻(mΩ)','标称单体电导','单体电压次低偏移量(V)','负载电流(A)','最大核容电流(A)','基站号码','电池品牌','电池型号','电池生产日期','投入使用日期','安装人员','通讯计数','丢包率','是否验收',''];
    dataArr = [];
    var startTime = "1980-01-01";
    var endTime = new Date().format('yyyy-MM-dd');
@@ -233,16 +233,21 @@
            success:function(data) {
                data = JSON.parse(data.result);
                if(data.code==1){
                    console.info(data.data);
                    var json =JSON.stringify(data.data);
                    setCookie("numberget",json);
                    //return data.data;
                }
            }
        });
     }
     function getCookienumber(id){//输入ID,返回通讯计数。数据从缓存获取。
         //var a = getnumber();
         //console.info(a);
         if(getCookie("numberget")){
             var number = getCookie("numberget");
             number = JSON.parse(number);
             console.info(number);
             if(number[0]){
                 for(var i =0; i<number.length;i++){
                     if(id == number[i].dev_id){
@@ -253,7 +258,24 @@
         }
         return 0;
     }
     function getCookiediubao(id){
         if(getCookie("numberget")){
             var number = getCookie("numberget");
             number = JSON.parse(number);
             console.info(number);
             if(number[0]){
                 for(var i =0; i<number.length;i++){
                     if(id == number[i].dev_id){
                         var errorCount = number[i].dev_errcommcount;
                         var allCount = number[i].dev_commcount+errorCount;
                         return number[i].dev_commcount;
                     }
                 }
             }
         }
         return 0;
     }
     function getcreatArr(){
        obj = {
            apply_en : 1,
@@ -269,7 +291,7 @@
            return "未验收";
        }else if(check_en==2){
            return "已申请验收";
        }else if(check==1){
        }else if(check_en==1){
            return"已完成验收";s
        }
    }
@@ -330,6 +352,7 @@
                     arrTd[index++] = data[i].binf.BattInUseDate.substr(0,10);
                     arrTd[index++] = data[i].binf.install_user;
                     arrTd[index++] = getCookienumber(data[i].binf.FBSDeviceId);
                     arrTd[index++] = getCookiediubao(data[i].binf.FBSDeviceId);
                     arrTd[index++] = yanshou(data[i].check_en);
                     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>'+
                     '<a onclick="getApplyYanshouIndex(this)" href="#myPopup" id="apply_yanshou" data-rel="popup"  class="ui-btn ui-btn-inline ui-corner-all operat-but fr" data-position-to="window"'+'but-index='+i+'>申请验收</a>';
gx_tieta/WebRoot/mobil/batt-infor-conf-temp1.html
@@ -13,7 +13,7 @@
    <script type="text/javascript" src="mobilJs/base.js"></script>
    <script type="text/javascript" src="mobilJs/jquery.mobile-1.4.5.min.js"></script>
    <style type="text/css">     
       input{-webkit-appearance: none;}
        table {
            margin-top:.5em;
            border-collapse:separate; 
@@ -61,7 +61,25 @@
                                        <tr>
                                            <td>机房编号</td>
                                            <td>
                                                <input type="text" id="StationId" class="unable" data-mini="true" />
                                                <input type="text" id="StationId" class="unable" data-mini="true" onfocus="this.blur()"/>
                                            </td>
                                        </tr>
                                        <tr>
                                            <td>FBS设备ID(重要)</td>
                                            <td>
                                                <input type="text" id="FBSDeviceId" class="unable" data-mini="true" />
                                            </td>
                                        </tr>
                                        <tr>
                                            <td>FBS设备IP(重要)</td>
                                            <td>
                                                <input type="text" id="FbsDeviceIp" class="unable" data-mini="true" />
                                            </td>
                                        </tr>
                                        <tr>
                                            <td>电池组ID</td>
                                            <td>
                                                <input type="text" readonly unselectable="on" value="123"class="unable" id="BattGroupId" class="uncheck" data-mini="true" />
                                            </td>
                                        </tr>
                                        <tr>
@@ -94,9 +112,8 @@
                                        <tr>
                                            <td>机房名称</td>
                                            <td>
                                                <select id="homeName" data-mini="true">
                                                    <option value="">全部</option>
                                                </select>
                                                <input type="text" id="homeName"  data-mini="true">
                                            </td>
                                        </tr>
                                        
@@ -107,18 +124,7 @@
                                                <input type="hidden" id="StationIp" data-mini="true" />
                                            
                                        
                                        <tr>
                                            <td>FBS设备ID(重要)</td>
                                            <td>
                                                <input type="text" id="FBSDeviceId" class="unable" data-mini="true" />
                                            </td>
                                        </tr>
                                        <tr>
                                            <td>FBS设备IP(重要)</td>
                                            <td>
                                                <input type="text" id="FbsDeviceIp" class="unable" data-mini="true" />
                                            </td>
                                        </tr>
                                        
                                            
                                                <input type="hidden" id="FbsDeviceIp_YM" class="unable" data-mini="true" value="456"/>    
@@ -127,12 +133,7 @@
                                            
                                        
                                    
                                        <tr>
                                            <td>电池组ID</td>
                                            <td>
                                                <input type="text" readonly unselectable="on" value="123"class="unable" id="BattGroupId" class="uncheck" data-mini="true" />
                                            </td>
                                        </tr>
                                        
                                            
                                                <input type="hidden" readonly unselectable="on" value="123" id="BattGroupNum" class="unable" class="uncheck" data-mini="true" />
@@ -202,22 +203,10 @@
                                                <input type="text" id="station_phone" data-mini="true" />
                                            </td>
                                        </tr>
                                        <tr>
                                            <td>电池品牌</td>
                                            <td>
                                                <input type="text" id="BattProducer" data-mini="true" />
                                            </td>
                                        </tr>
                                        <tr>
                                            <td>*电池型号</td>
                                            <td>
                                                <input type="text" id="BattModel" data-mini="true" />
                                            </td>
                                        </tr>
                                                <input id="startTestrecord"  type="hidden" name="appDate" class="appDatefir"  value="2000-01-01" />
                                            <input id="startTestrecord"  type="hidden" name="appDate" class="appDatefir"  value="2000-01-01" />
                                            
                                                <input id="endTestrecord" type="hidden" name="appDate" class="appDatesec"  value="2017-01-01" />
                                            <input id="endTestrecord" type="hidden" name="appDate" class="appDatesec"  value="2017-01-01" />
                                            
                                        <tr>
                                            <td>*安装人员</td>
@@ -431,61 +420,10 @@
                       }
                }
                updataSel($Ostation_name1, arr);
            }
          findStationNamebyStationname1();
            }
        }
        });
    }
 //当区县更新时更新机房
    function findStationNamebyStationname1(){
        var data = {
            StationName1: $("#mainteArea").val(),
            StationName2:$("#city").val(),
            StationName5:$("#country").val()
        };
        //console.info(data);
        $.ajax({
            type: "post",
            url: "BattInfAction!serchStationName3",
            async:true,
            dataType:'json',
            data:"json = "+JSON.stringify(data),
            success: function(data){
            data = data.result;
            data = eval("("+data+")");
            //console.info(data);
            //console.info(data.code);
            if(data.code==1&&data.data.length>0){
                   var $Ostation_name1=$("#homeName");
                $Ostation_name1.text("");
                var arr = new Array();
                for(var i=0;i<=data.data.length;i++)
                {
                       if(i == 0){
                           arr.push({
                               val:"",
                               stationid:"",
                               txt:"全部(共"+data.data.length+"个)",
                           });
                       }else{
                           arr.push({
                               val:data.data[i-1].StationName3,
                               stationid:data.data[i-1].StationId,
                               txt:data.data[i-1].StationName3,
                           });
                       }
                }
                //console.info(111111111111111);
                updataSelStation($Ostation_name1, arr);
            }
        }
        });
    }
    
   //当省改变时更新市
   $('#mainteArea').change(function(){
@@ -495,30 +433,24 @@
   $('#city').change(function(){
           findCounty();    
   });
   //当区/县改变时改变机房
   $('#country').change(function(){
           findStationNamebyStationname1();
   });
    
    //构造查询条件
        function createSearchParam(){
            var temp = {
                page:Page,
                binf:{
                    StationName1:$('#mainteArea').val(),
                    StationName2:$('#city').val(),
                    StationName5: $('#country').val(),
                    StationName:$('#homeName').val(),
                },
            };
            console.info(temp);
            return temp;
        }
    function createSearchParam(){
        var temp = {
            page:Page,
            binf:{
                StationName1:$('#mainteArea').val(),
                StationName2:$('#city').val(),
                StationName5: $('#country').val(),
                StationName:$('#homeName').val(),
            },
        };
        console.info(temp);
        return temp;
    }
   
    $(function () {
        //setTimes($("#startTestrecord"),'2000-01-01');
@@ -668,11 +600,11 @@
            document.getElementById("DisCurrMax").value = data.DisCurrMax;
    //        document.getElementById("station_phone").value = data.station_phone;
    //        document.getElementById("BattProducer").value = data.BattProducer;
            document.getElementById("BattModel").value = data.BattModel;
        //    document.getElementById("BattModel").value = data.BattModel;
            //document.getElementById("startTestrecord").value = temp[30];
            //document.getElementById("endTestrecord").value = temp[31];
            setTimes($("#startTestrecord"),data.productDate);
            setTimes($("#endTestrecord"),data.useDate);
            //setTimes($("#startTestrecord"),data.productDate);
            //setTimes($("#endTestrecord"),data.useDate);
    //        document.getElementById("install_user").value = data.install_user;            
        }else{
            document.getElementById("StationId").value = temp[0];
@@ -821,6 +753,9 @@
<script type="text/javascript">  
    $(function(){
        $(".unable").prop("readonly","readonly").attr("unselectable","on").addClass("uncheck");
        $(function(){
        alert(333);
        })
        $("#sure").click(function(){
            if(nullOrn()){
                if(temp[34]!="edit"){
@@ -912,12 +847,13 @@
   });
   
   function creatMonCapOpt(){
       var k,optionStr='';
       var k,optionStr='',allString;
     for(var i=1;i<11;i++){
          k=i*50;
          optionStr+='<option'+' value='+k+'>'+k+'</option>'; 
     }
   $("#MonCapStd").html(optionStr);
     allString=optionStr+'<option'+' value='+1000+'>'+1000+'</option>'
   $("#MonCapStd").html(allString);
   }
   creatMonCapOpt();
    /* 操作成功