修改

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

2019-01-16 db25d4c13a7152783ca8ded76d5a2da4844265ce

修改

 gx_tieta/WebRoot/mobil/batt-edit2.html

@@ -279,10 +279,12 @@


 

  function selectedIndex(index){

     var battproducer = getCookie("producer");

    battproducer = JSON.parse(battproducer);

      console.info(battproducer);

       var selected='',

           i=0;

       var battproducer = ["理士","圣阳","双登","SENRY","南都","爱默生","科士达","银泰","丰日","中兴能派","光宇",

       "艾诺斯华达","雄韬","风帆","文隆","中山"];

       //onsole.info(inde)

       selected+= '<option '+'value='+temp[index].binf.BattProducer+'>'+temp[index].binf.BattProducer+'</option>';

       for(var i=0;i<battproducer.length;i++){

               if(temp[index].binf.BattProducer!=battproducer[i]){


 gx_tieta/WebRoot/mobil/batt-infor-conf-temp1.html

@@ -259,7 +259,7 @@
  }

 

 function selectedIndex(index){

       var selected='',

   /*    var selected='',

           i=0;

           selected+= '<option '+'value='+'理士'+'>'+'理士'+'</option>';

           selected+= '<option '+'value='+'圣阳'+'>'+'圣阳'+'</option>';

@@ -280,9 +280,21 @@
            selected+= '<option '+'value='+'中山'+'>'+' 中山'+'</option>';

            selected+= '<option '+'value='+'美的'+'>'+' 美的'+'</option>';

            selected+= '<option '+'value='+'朗达'+'>'+' 朗达'+'</option>';

            selected+= '<option '+'value='+'烽火'+'>'+' 烽火'+'</option>';*/

      var battproducer = getCookie("producer");

        battproducer = JSON.parse(battproducer);

       var selected='',

           i=0;

       for(var i=1;i<battproducer.length;i++){

               console.info(battproducer[i]);

               selected+= '<option '+'value='+battproducer[i]+'>'+battproducer[i]+'</option>';	
       } 
       return selected; 

  }    

      var temp = getCookie("eleparm");

      var test=getCookie("eleparm2newbatt");

      //jifangname = JSON.parse(jifangname);

      console.info(test);

    //console.info(temp);

    temp=JSON.parse(temp);

    console.info(temp);


 gx_tieta/WebRoot/mobil/control.html

@@ -82,7 +82,7 @@
            //searchdiubao();

            createTbl(tbl1, jifangarrTh, arrTd1);

            //searchJifangInfo();

            searchSysData();

            //searchSysData();

        });

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

            var temp = getCookie("batt");

@@ -107,11 +107,11 @@
        $("#signalqual").click(function(){

            searchStationSignal();

        })

        $("battparm").click(function(){

            console.info("aaa")

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

            searchBattparm();

        })

        $("sysparm").click(function(){

        console.info("aaa")

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

        //console.info("aaa")

            searchSysData();

        })

    

@@ -205,7 +205,39 @@
            });

        }

        

		
        function searchBattparm() {

                    //console.info(temp);

                var temp={

                    dev_id:batt.FBSDeviceId,

                }

                loadshow();

                // 查询电池参数

                $.ajax({

                    type: 'post'

                    ,async: true

                    ,url:'Fbs9100_battparamAction_action_serchByCondition'

                    ,data: 'json='+JSON.stringify(temp)

                    ,dataType: 'json'

                    ,success: function(res) {

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

                        console.log(rs);

                        if(rs.code==1){

                            var data = rs.data[0];

                            var json=window.JSON.stringify(data);

                                setCookie("control_battparm",json);

                                window.location.href="control_battparm.html"

                        }else{

                            alert("查询失败");

                        }

                        loadclose();

                    }

                    ,complete: function() {

                        loadclose();

                    }

                });

			
            }

			
        function searchdiubao(arrTd1){

            $.ajax({     

                type: "post",                 

@@ -273,6 +305,7 @@
                    AT_cmd:"CSQ",

                    dev_id:batt.FBSDeviceId,

        }

        loadshow();

        console.info(param);

        $.ajax({     

            type:"post",                                 

@@ -290,6 +323,7 @@
                    console.info(data.ack_inf);

                    var msg=formatSignal(data.ack_inf);

                    console.info(msg.signal);

                    loadclose();

                    alert(msg.signal);

                }

            },error:function(e){

@@ -331,6 +365,7 @@
        // 查询设备的系统参数

        function searchSysData() {

                // 开启等待框

                loadshow();

                var temp = {

                    num:128,

                    dev_id:batt.FBSDeviceId,

@@ -353,14 +388,17 @@
                                //alert('读取成功', true);

                                var json=window.JSON.stringify(data);

                                setCookie("control_parm",json);

		                		
                                window.location.href="control_sysparm.html"

                                loadclose();

                            //}

                        }else{

                            noContent.showNoContent('查询失败!');

                            loadclose();

                        }

                    },

                    error: function() {

                        noContent.showNoContent('查询失败!');

                        loadclose();

                        // 关闭等待    

                    }

                });


 gx_tieta/WebRoot/mobil/control_battparm.html

@@ -143,13 +143,10 @@
        pageAll:0,

    };

    

    var arrTh = [ '机房编号', '省', '城市','区县','机房名称','设备名称','机房IP','FBS设备ID(重要)','FBS设备IP(重要)','子网掩码','网关','FBS设备名称','FBS电池索引(0-3)','电池组ID','机房内电池组编号','电池组名称','浮充电压阀值(V)','离线电压阀值(V)','浮充电流阀值(A)','单体数量','标称容量(AH)','标称单体电压(V)','标称单体内阻(mΩ)','标称单体电导','单体电压次低偏移量(V)','负载电流(A)','最大核容电流(A)','基站号码','电池品牌','电池型号',

    '电池生产日期','投入使用日期','安装人员','经度','维度','地址','申请时间','申请状态','申请人','审核人'];

    var arrTh = [ '设备ID', '机房名称', '电池标称容量','电池标称内阻','电池组数','每组电池单体数量','单体标称电压','电池组端标称电压','电池标称温度','电池浮充电压阈值','电池浮充电流阈值','在线电压低阈值','电池组连接类型'];

    dataArr = [];

    var startTime = "1980-01-01";

    var endTime = new Date().format('yyyy-MM-dd');

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

    var temp = getCookie("wapproval");

    var temp = getCookie("control_battparm");

    temp = JSON.parse(temp);

    console.info(temp);

    createTbl(tbl, arrTh, dataArr);

@@ -157,58 +154,26 @@
        Page.pageCurr=1;        

        console.info(temp);

        setBattLife();

        battnumber();

        //searchBattLife();

        //console.info($("#getnumber").val());        

     });

      

    function setBattLife(){

        data = temp;

        var index = 0;

        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++] = data[i].longitude;//经度

            arrTd[index++] = data[i].latitude;//纬度

            arrTd[index++] = data[i].address;//地址

            arrTd[index++] = data[i].apply_date;

            arrTd[index++] = check(data[i].check_en);

            arrTd[index++] = data[i].apply_name;

            arrTd[index++] = data[i].confirm_name;

            //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>';

        }

		
        var index=0;

            arrTd[index++] = data.dev_id;

            arrTd[index++] = data.StationName;

            arrTd[index++] = data.STD_CAP;

            arrTd[index++] = data.STD_RES;

            arrTd[index++] = data.BattGroupCount;

            arrTd[index++] = data.EachGroupBattCount;

            arrTd[index++] = data.MonomerVol;

            arrTd[index++] = data.GroupVol;

            arrTd[index++] = data.BattTemp;

            arrTd[index++] = data.FloatChargeVol;

            arrTd[index++] = data.FloatChargeCurr;

            arrTd[index++] = data.OnlineVolLow;

            arrTd[index++] = data.GroupConnType;

        createTbl(tblCon, arrTh, arrTd);

    }




 gx_tieta/WebRoot/mobil/control_sysparm.html

@@ -1,10 +1,183 @@
<!DOCTYPE html>

<html>

<html lang="en">

<head>

<meta charset="UTF-8">

<title>Insert title here</title>

    <meta charset="UTF-8">

    <title>系统参数</title>

    <meta name="viewport" content="width=device-width,initial-scale=1">

    <meta name="apple-mobile-web-app-capable" content="yes">

    <meta name="apple-mobile-web-app-status-bar-style" content="black">

    <link rel="stylesheet" href="mobilCss/jquery.mobile-1.4.5.min.css"/>

    <link href="mobilCss/mobiscroll.core-2.5.2.css" rel="stylesheet" type="text/css" />

    <link href="mobilCss/mobiscroll.animation-2.5.2.css" rel="stylesheet" type="text/css" />

    <link rel="stylesheet" type="text/css" href="css/tbl.css">

    <link rel="stylesheet" type="text/css" href="src/css/layui.css">

    <script type="text/javascript" src="mobilJs/jquery-1.8.2.js"></script>

    <script type="text/javascript" src="mobilJs/jquery.mobile-1.4.5.min.js"></script>

    <style type="text/css">

		
        /*规定面板的样式*/

        .ui-panel {

            width: 80%;

        }

        .ui-panel-dismiss{

            width: 20%;

        }

        .ui-panel-inner{

            padding:0 !important;

        }

        .ui-collapsible-heading-toggle{

            padding-left: 1em !important;

        }

        .panel-header{

            padding: 8px 0;

            font-size: 1.2em;

            text-indent: 1em;

            background-color: #DFDCDC;

        }

        /*规定开关的位置*/

        .ui-flipswitch {

            margin-left: 0.5em;

        }

		
        .ui-field-contain{

            padding: 0 0.6em ;

        }

        .ui-field-contain {

            border-bottom-color: #828282;

            border-bottom-color: rgba(0,0,0,.15);

            border-bottom-width: 1px;

            border-bottom-style: none;

        }

        .sicon{ 
            display:inline-block;width:4%;margin:1em 0;float:left; 
        }

        .checkdata{

             display:inline-block;width:48%;margin:0 0 0 0;float:left; 
         }

	     
         .next-page, .pre-page {

            position: fixed;

            width: 40px;

            height: 40px;

            top: 50%;

            margin-top: -15px;

        }

        .next-page  {

            right: 0;

        }

        .pre-page  {

            left: 0;

        }

	     
       
        table {

            margin-top:.5em;

            border-collapse:separate; 
            border-spacing:0 .5em;

        }

		
        tbody tr td{

            overflow: hidden;

            text-overflow:ellipsis;

            white-space: nowrap;

        }

        .bg-line{

            background-color:#ddd;

        }

        .operat-but{

            margin: 0;

            padding-top: 0.1em;

            padding-bottom: 0.1em;

            
        }

        .ui-table-reflow td .ui-table-cell-label, .ui-table-reflow th .ui-table-cell-label{

            width:35%;

        } 
        .fr{

        float:right;

        }

    </style>

    <link rel="stylesheet" href="css/fgpanel.css">

</head>

<body>

    <div data-role="page">

		
        <!-- 头部内容 -->

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

            <a href="control.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>

        <!-- 主体内容 -->

        <div data-role="main">

            <!-- 表格容器 -->

            <div class="tbl-container"></div>

            <table data-role="table" class="ui-responsive ui-shadow" id="tab" >

					
            </table>

        </div>



	     
    </div>

    <!-- 存储homeinfo的值 -->

    <div id="homeInfoIframe"></div>

    <div id="homeInfoIframeAll"></div>

</body>

</html>


<script src="mobilJs/mobiscroll.core-2.5.2.js" type="text/javascript"></script>

<script src="mobilJs/mobiscroll.core-2.5.2-zh.js" type="text/javascript"></script>

<script src="mobilJs/mobiscroll.datetime-2.5.1.js" type="text/javascript"></script>

<script src="mobilJs/mobiscroll.datetime-2.5.1-zh.js" type="text/javascript"></script>

<script type="text/javascript" src="js/tbl.js"></script>

<script type="text/javascript" src="mobilJs/base.js"></script>

<script type="text/javascript" src="src/layui.all.js"></script>



 <script type="text/javascript">

          /* 获取点击的是哪个按钮   */



    var arrTd = new Array();        //当前表格td数据

    var tblCon = $('.tbl-container');

    var Page = {

        pageSize:20,                 //每页的行数

        pageCurr:1,                  //当前页码数

        pageAll:0,

    };

    
    var arrTh = [ '设备ID', '设备名称', '总续航时间','保一次下电续航时间','电流钳量程','一次下电电压','二次下电电压','DCDC模块数量','单体数据来源类型','停电升压榨干电池数量','停电升压榨干电池端电压终止电压下限','停电升压榨干电池端电压启动电压下限','电池合路器主电池组编号','背光时长','停电充电电流'];

    dataArr = [];

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

    var temp = getCookie("control_parm");

    temp = JSON.parse(temp);

    console.info(temp);

    createTbl(tbl, arrTh, dataArr);

    $(document).ready(function(){

        Page.pageCurr=1;		
        console.info(temp);

        setBattLife();

        //searchBattLife();

        //console.info($("#getnumber").val());		
     });

  	
    function setBattLife(){

        data = temp;

        var index=0;

            arrTd[index++] = data.dev_id;

            arrTd[index++] = data.stationName;

            arrTd[index++] = data.GroupVolRange;

            arrTd[index++] = data.GroupVolSorce;

            arrTd[index++] = data.CurrentRange;

            arrTd[index++] = Math.ceil(data.CurrentTyte/10);

            arrTd[index++] = Math.ceil(data.MonomerOrder/10);

            arrTd[index++] = data.LoaderCount;//DC数量

            arrTd[index++] = data.DtCardCount;

            arrTd[index++] = data.POF_BG_Boost_Cnt;

            arrTd[index++] = data.POF_BG_Boost_VolStop;

            arrTd[index++] = data.POF_BG_Boost_VolStart;

            arrTd[index++] = data.MajorBattGroupNum;

            arrTd[index++] = data.BackLightTime;

            arrTd[index++] = data.PowerBreakChargeCurr;

        createTbl(tblCon, arrTh, arrTd);

    }



   </script>

</html> 

 gx_tieta/WebRoot/mobil/ele-param2.html

@@ -224,6 +224,7 @@
    <!-- 存在机房信息 -->

    <div id="homeInfoIframe"></div>

    <input id="handle_status" value="" type="hidden">

    <input id="jifangname" value="" type="hidden">

    <script src="src/layui.all.js"></script>

    <script type="text/javascript" src="js/tbl.js"></script>

    <script type="text/javascript" src="mobilJs/base.js"></script>

@@ -365,6 +366,11 @@
        }else{

               setcookieCreat(Page.pageSize-1);

           }

           var test=getCookie("eleparm2newbatt");

                        console.info(test);

         var jiafangname = $("#jifangname").val();

         console.info($("#jifangname").val());

         console.info(test);

        window.location.href="batt-infor-conf-temp1.html";   

    });

    

@@ -375,6 +381,7 @@
    var endTime = new Date().format('yyyy-MM-dd');

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

    createTbl(tbl, arrTh, dataArr);

    serchProducer();

    $(document).ready(function(){

        setPage();    

        //newbattnum;        

@@ -555,6 +562,7 @@
                getEditButIndex(0);        

            }    

        });      





    }

    //构造查询条件

@@ -816,9 +824,33 @@
        

    }

        





 
    function serchProducer(){

    var battproducer = new Array();  	
          $.ajax({

            type: 'post'

            ,async: false

            ,url: 'BattInfAction!serchByBattProducer'

            ,data: null

            ,dataType: 'json'

            ,success:function(res) {

                //console.info(res);

                data = JSON.parse(res.result);

                console.info(data.data);

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

                    data = data.data;

                    for(var i=0;i<data.length;i++){

                        //console.info(data);

                        battproducer.push(data[i].BattProducer);				
                    }	
                }

            var    json = window.JSON.stringify(battproducer);

            setCookie("producer",json);

            //var battproduce = getCookie("producer");

              //battproduce1 = JSON.parse(battproduce);

              //console.info(battproduce1);

            }		
        });

    }








 gx_tieta/WebRoot/mobil/iframe/searchBatt.html

@@ -96,11 +96,22 @@
                    if(data.length>0){

                        layer.msg('请选择下方的机房');

                    }else{

                         var json = window.JSON.stringify(input);

                        setCookie("eleparm2newbatt",json);

                         layer.confirm('您输入的机房不存在！是否要该新建机房？',{btn:['新建','取消']},function(){

                        setV();

                            var json = window.JSON.stringify(input);

                        //setCookie("eleparm2newbatt",json);

                       // $("#jifangname").val(input);

                        //console.info(input);

                       // var test=getCookie("eleparm2newbatt");

                        //console.info(test);

                        });

                        input = window.JSON.stringify(input);

                        setCookie("ele_parm2_newbatt",input);

                         //var test=getCookie("eleparm2newbatt");

                        //console.info(test);

                        //console.info(input);

                        //var json = window.JSON.stringify(input);

                        //setCookie("ele_parm2_newbatt",json);

                    }   

                }

            });