CJJ
2018-12-12 37783b8d097cbbf74f892069068a5b4aa49d8435
手机 未通过,已通过
3个文件已修改
275 ■■■■■ 已修改文件
gx_tieta/WebRoot/mobil/batt-approved.html 77 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
gx_tieta/WebRoot/mobil/batt-infor-unapproved-edit.html 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
gx_tieta/WebRoot/mobil/batt-unapproved.html 196 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
gx_tieta/WebRoot/mobil/batt-approved.html
@@ -179,6 +179,76 @@
            searchBattLife();
        
     });
     function getcreatArr(){
        obj = {
            apply_en : 1,
            binf : {
                page:Page,
            }
        }
        return obj;
    }
    // 查询内容
    function searchBattLife(){
        var temp = JSON.stringify(getcreatArr());
        console.info(temp);
        arrTd = new Array();
         var index = 0;
         $.ajax({
             type: 'post',
            async: true,
            url: 'Battinf_applyAction!serchByInfo',
            data: "json="+temp,
            dataType: 'json',
            success:function(data) {
                 data = JSON.parse(data.result);
                 if(data.code!=0&&data.data.length>0){
                     data=data.data
                     console.info(data);
                     for(var i=0;i<data.length;i++){
                     arrTd[index++] = data[i].binf.StationId;
                     arrTd[index++] = data[i].binf.StationName1;
                     arrTd[index++] = data[i].binf.StationName2;
                     arrTd[index++] = data[i].binf.StationName5;
                     arrTd[index++] = data[i].binf.StationName3;
                     arrTd[index++] = data[i].binf.StationName4;
                     arrTd[index++] = data[i].binf.StationIp;
                     arrTd[index++] = data[i].binf.FBSDeviceId;
                     arrTd[index++] = data[i].binf.FbsDeviceIp;
                     arrTd[index++] = data[i].binf.FbsDeviceIp_YM;
                     arrTd[index++] = data[i].binf.FbsDeviceIp_WG;
                     arrTd[index++] = data[i].binf.FBSDeviceName;
                     arrTd[index++] = data[i].binf.GroupIndexInFBSDevice;
                     arrTd[index++] = data[i].binf.BattGroupId;
                     arrTd[index++] = data[i].binf.BattGroupNum;
                     arrTd[index++] = data[i].binf.BattGroupName;
                     arrTd[index++] = data[i].binf.FloatVolLevel;
                     arrTd[index++] = data[i].binf.OfflineVolLevel;
                     arrTd[index++] = data[i].binf.BattFloatCurrent;
                     arrTd[index++] = data[i].binf.MonCount;
                     arrTd[index++] = data[i].binf.MonCapStd;
                     arrTd[index++] = data[i].binf.MonVolStd;
                     arrTd[index++] = data[i].binf.MonResStd;
                     arrTd[index++] = data[i].binf.MonSerStd;
                     arrTd[index++] = data[i].binf.MonVolLowToAvg;
                     arrTd[index++] = data[i].binf.Load_curr;
                     arrTd[index++] = data[i].binf.DisCurrMax;
                     arrTd[index++] = data[i].binf.station_phone;
                     arrTd[index++] = data[i].binf.BattProducer;
                     arrTd[index++] = data[i].binf.BattModel;
                     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>';
                     }
                 }
             createTbl(tblCon, arrTh, arrTd);
             }
         });
    }
         function setcookiedit(index){
                 var arrcookie = new Array();    
                   for(var i=0;i<33;i++){//共34项,最后一项为按钮,不必SET进数据
@@ -213,13 +283,13 @@
                   setCookie("eleparm",json);  //这里setcookie,若有上一条cookie则清空上一笔
         }
        
    // 查询内容
/*    // 查询内容
        function searchBattLife(){
            
        
            /* 模拟数据做好就删!!!!!!!! */
            
            for(i=0;i<340;i++){
        /*    for(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>
            arrTd[i]='<a href=""  class="ui-btn ui-btn-inline ui-corner-all operat-but" data-position-to="window" >电池组实时数据</a>';
@@ -234,7 +304,8 @@
                    createTbl(tblCon, arrTh, arrTd);
                    
            /* 模拟数据做好就删!!!!!!!! */                
        }
        //}
        function getUpdateArr(temp){
            var arr = new Array();
            var obj = new Object();
gx_tieta/WebRoot/mobil/batt-infor-unapproved-edit.html
@@ -98,7 +98,7 @@
        
        <!-- 头部内容 -->
        <div data-role="header" data-position="fixed">
            <a href="ele-param1.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>
            <a href="batt-unapproved.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>
            <h1>未通过申请修改</h1>
            
        </div>
gx_tieta/WebRoot/mobil/batt-unapproved.html
@@ -181,136 +181,102 @@
    createTbl(tbl, arrTh, dataArr);
    $(document).ready(function(){
        setPage();
            Page.pageCurr=1;
            searchBattLife();
        Page.pageCurr=1;
        searchBattLife();
     });
         function setcookiedit(index){
    function getcreatArr(){
        obj = {
            apply_en : 0,
            binf : {
                page:Page,
            }
        }
        return obj;
    }
    // 查询内容
    function searchBattLife(){
        var temp = JSON.stringify(getcreatArr());
        console.info(temp);
        arrTd = new Array();
         var index = 0;
         $.ajax({
             type: 'post',
            async: true,
            url: 'Battinf_applyAction!serchByInfo',
            data: "json="+temp,
            dataType: 'json',
            success:function(data) {
                 data = JSON.parse(data.result);
                 if(data.code!=0&&data.data.length>0){
                     data=data.data
                     console.info(data);
                     for(var i=0;i<data.length;i++){
                     arrTd[index++] = data[i].binf.StationId;
                     arrTd[index++] = data[i].binf.StationName1;
                     arrTd[index++] = data[i].binf.StationName2;
                     arrTd[index++] = data[i].binf.StationName5;
                     arrTd[index++] = data[i].binf.StationName3;
                     arrTd[index++] = data[i].binf.StationName4;
                     arrTd[index++] = data[i].binf.StationIp;
                     arrTd[index++] = data[i].binf.FBSDeviceId;
                     arrTd[index++] = data[i].binf.FbsDeviceIp;
                     arrTd[index++] = data[i].binf.FbsDeviceIp_YM;
                     arrTd[index++] = data[i].binf.FbsDeviceIp_WG;
                     arrTd[index++] = data[i].binf.FBSDeviceName;
                     arrTd[index++] = data[i].binf.GroupIndexInFBSDevice;
                     arrTd[index++] = data[i].binf.BattGroupId;
                     arrTd[index++] = data[i].binf.BattGroupNum;
                     arrTd[index++] = data[i].binf.BattGroupName;
                     arrTd[index++] = data[i].binf.FloatVolLevel;
                     arrTd[index++] = data[i].binf.OfflineVolLevel;
                     arrTd[index++] = data[i].binf.BattFloatCurrent;
                     arrTd[index++] = data[i].binf.MonCount;
                     arrTd[index++] = data[i].binf.MonCapStd;
                     arrTd[index++] = data[i].binf.MonVolStd;
                     arrTd[index++] = data[i].binf.MonResStd;
                     arrTd[index++] = data[i].binf.MonSerStd;
                     arrTd[index++] = data[i].binf.MonVolLowToAvg;
                     arrTd[index++] = data[i].binf.Load_curr;
                     arrTd[index++] = data[i].binf.DisCurrMax;
                     arrTd[index++] = data[i].binf.station_phone;
                     arrTd[index++] = data[i].binf.BattProducer;
                     arrTd[index++] = data[i].binf.BattModel;
                     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++] = '<a onclick="getButIndex(this)" href="#myPopup" id="butt" data-rel="popup" class="ui-btn ui-btn-inline ui-corner-all operat-but" data-position-to="window"'+'but-index='+i+'>修改或删除</a>';continue;
                     }
                 }
             setPage();
             createTbl(tblCon, arrTh, arrTd);
             }
         });
    }
    function setcookiedit(index){
                 var arrcookie = new Array();    
                   for(var i=0;i<33;i++){//共34项,最后一项为按钮,不必SET进数据
                       var value = Math.floor(34*index);
                       //console.info(value);
                       value = Math.floor(value+i);
                       //console.info(value);
                       arrcookie.push(arrTd[value]);
                   }
                   var json=window.JSON.stringify(arrcookie);
                   setCookie("eleparm",json);  //这里setcookie,若有上一条cookie则清空上一笔
         }
         function setcookieCreat(index){
                 var arrcookie = new Array();
                   for(var i=0;i<33;i++){//共34项,最后一项为按钮,不必SET进数据
                       var value = Math.floor(34*index);
                       //console.info(value);
                   for(var i=0;i<33;i++){//共35项  ,33数据有用
                       var value = Math.floor(35*index); //35
                       console.info(value);
                       value = Math.floor(value+i);
                     if(i==13){//新建功能,电池组ID默认为当页最后一个电池组ID号加1
                         var groupid = Math.floor(arrTd[value]+1);
                         console.info(groupid);
                         arrcookie.push(groupid);
                     }else{
                           //console.info(value);
                           console.info(value);
                           arrcookie.push(arrTd[value]);
                       }
                   }
                   arrcookie.push("new");
                   console.info($("#newbattnum").val());
                   arrcookie.push($("#newbattnum").val());
                   //console.info(arrcookie);
                   var json=window.JSON.stringify(arrcookie);
                   setCookie("eleparm",json);  //这里setcookie,若有上一条cookie则清空上一笔
         }
    // 查询内容
        function searchBattLife(){
            /* 模拟数据做好就删!!!!!!!! */
            for(i=0;i<340;i++){
                   if(i%35==34){arrTd[i]='<a onclick="getButIndex(this)" href="#myPopup" id="butt" data-rel="popup" class="ui-btn ui-btn-inline ui-corner-all operat-but" data-position-to="window"'+'but-index='+i+'>修改或删除</a>';continue;}
                     arrTd[i]=i*10;
                    }
                    createTbl(tblCon, arrTh, arrTd);
            /* 模拟数据做好就删!!!!!!!! */
        }
        function getUpdateArr(temp){
            var arr = new Array();
            var obj = new Object();
            obj.StationId = temp[0];    // 机房编号
            obj.StationName = (temp[1]+"-"+temp[2]+"-"+temp[4]+"-"+temp[5]);    // 拼接机房名称
            obj.StationName1 = temp[1];        // 省
            obj.StationName2 = temp[2];        // 市
            obj.StationName5 = temp[3];        // 区/县
            obj.StationName3 = temp[4];        // 机房名称
            obj.StationName4 = temp[5];        // 设备名称
            obj.StationIp = temp[6];                //机房ip
            obj.FBSDeviceId = temp[7];                //设备id
            obj.FbsDeviceIp = temp[8];                //设备ip
            obj.FbsDeviceIp_YM = temp[9];            // 设备掩码
            obj.FbsDeviceIp_WG = temp[10];            // 网关
            obj.FBSDeviceName = temp[11];            //设备名称
            obj.GroupIndexInFBSDevice = temp[12];    //fbs设备索引
            obj.BattGroupId = temp[13];                //电池组id
            obj.BattGroupNum = temp[14];            //机房内电池组编号
            obj.BattGroupName = temp[15];            //电池组名称
            obj.FloatVolLevel = temp[16];            //浮充电压阀值
            obj.OfflineVolLevel = temp[17];            //离线电压阀值
            obj.BattFloatCurrent = temp[18];        //浮充电流阀值
            obj.MonCount = temp[19];                //单体数量
            obj.MonCapStd = temp[20];                //标称容量
            obj.MonVolStd = temp[21];                //标称电压
            obj.MonResStd = temp[22];                //标称内阻
            obj.MonSerStd = temp[23];                //标称电导
            obj.MonVolLowToAvg = temp[24];            //单体电压次低偏移量
            obj.Load_curr = temp[25];                //负载电流
            obj.DisCurrMax = temp[26];                //最大核容电流
            obj.station_phone = temp[27];            //基站号码
            obj.BattProducer = temp[28];            //电池品牌
            obj.BattModel = temp[29];                //电池型号
            obj.BattProductDate =  temp[30];        //电池生产日期
            obj.BattInUseDate =  temp[31];            //电池使用日期
            obj.install_user = temp[32];            //安装人员
            arr.push(obj);
            console.info(arr);
            return arr;
        }
    function createSearchForm(){
        var temp={
                page:Page,
                StationName1:$('#mainteArea').val(),
                StationName2:$('#city').val(),
                StationName5:$('#country').val(),
                StationName:$('#homeName').val(),
        };
        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() {
        //点击上一页