81041
2018-11-29 a6628f076ca6b331e626e8d3cb6a3c41c52ec808
Merge branch 'dev_lxw' of https://whyclxw1@gitlab.com/whyclxw1/gx_tieta.git into dev_lxw
1个文件已添加
1个文件已修改
316 ■■■■■ 已修改文件
gx_tieta/WebRoot/mobil/batt-infor-conf-temp.html 283 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
gx_tieta/WebRoot/mobil/ele-param.html 33 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
gx_tieta/WebRoot/mobil/batt-infor-conf-temp.html
New file
@@ -0,0 +1,283 @@
<!DOCTYPE html>
<html lang="en">
<head>
    <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">
    <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">
        table {
            margin-top:.5em;
            border-collapse:separate;
            border-spacing:0 .5em;
        }
        tbody tr td{
            overflow: hidden;
            text-overflow:ellipsis;
            white-space: nowrap;
        }
        .uncheck{
            background-color: #dddddd38!important;
            color: #bdbdbdc4!important;
        }
    </style>
    <link rel="stylesheet" href="css/fgpanel.css">
</head>
<body>
    <div data-role="page">
        <!-- 头部内容 -->
        <div data-role="header" data-position="fixed">
            <a href="ele-param.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="set-option"> -->
                                <table class="layout-set">
                                    <tbody>
                                        <tr>
                                            <td>机房编号</td>
                                            <td>
                                                <input type="text" id="" data-mini="true" />
                                            </td>
                                        </tr>
                                        <tr>
                                            <td>省</td>
                                            <td>
                                                <input type="text" id="" data-mini="true" />
                                            </td>
                                        </tr>
                                        <tr>
                                            <td>城市</td>
                                            <td>
                                                <input type="text" id="" data-mini="true" />
                                            </td>
                                        </tr>
                                        <tr>
                                            <td>区县</td>
                                            <td>
                                                <input type="text" id="" data-mini="true" />
                                            </td>
                                        </tr>
                                        <tr>
                                            <td>机房名称</td>
                                            <td>
                                                <input type="text" id="" data-mini="true" />
                                            </td>
                                        </tr>
                                        <tr>
                                            <td>设备名称</td>
                                            <td>
                                                <input type="text" id="" data-mini="true" />
                                            </td>
                                        </tr>
                                        <tr>
                                            <td>机房IP</td>
                                            <td>
                                                <input type="text" id="" data-mini="true" />
                                            </td>
                                        </tr>
                                        <tr>
                                            <td>FBS设备ID(重要)</td>
                                            <td>
                                                <input type="text" id="" data-mini="true" />
                                            </td>
                                        </tr>
                                        <tr>
                                            <td>FBS设备IP(重要)</td>
                                            <td>
                                                <input type="text" id="" data-mini="true" />
                                            </td>
                                        </tr>
                                        <tr>
                                            <td>子网掩码</td>
                                            <td>
                                                <input type="text" id="" class="unable" data-mini="true" value="456"/>
                                            </td>
                                        </tr>
                                        <tr>
                                            <td>网关</td>
                                            <td>
                                                <input type="text" id="" class="unable" data-mini="true" value="456"/>
                                            </td>
                                        </tr>
                                        <tr>
                                            <td>FBS设备名称</td>
                                            <td>
                                                <input type="text" id="" data-mini="true" />
                                            </td>
                                        </tr>
                                        <tr>
                                            <td>FBS电池索引(0-3)</td>
                                            <td>
                                                <input type="text" id="" data-mini="true" />
                                            </td>
                                        </tr>
                                        <tr>
                                            <td>电池组ID</td>
                                            <td>
                                                <input type="text" readonly unselectable="on" value="123" id="" class="uncheck" data-mini="true" />
                                            </td>
                                        </tr>
                                        <tr>
                                            <td>机房内电池组编号</td>
                                            <td>
                                                <input type="text" readonly unselectable="on" value="123" id="" class="uncheck" data-mini="true" />
                                            </td>
                                        </tr>
                                        <tr>
                                            <td>电池组名称</td>
                                            <td>
                                                <input type="text" id=""  data-mini="true" />
                                            </td>
                                        </tr>
                                        <tr>
                                            <td>浮充电压阀值(V)</td>
                                            <td>
                                                <input type="text" id="" data-mini="true" />
                                            </td>
                                        </tr>
                                        <tr>
                                            <td>离线电压阀值(V)</td>
                                            <td>
                                                <input type="text" id="" data-mini="true" />
                                            </td>
                                        </tr>
                                        <tr>
                                            <td>浮充电流阀值(A)</td>
                                            <td>
                                                <input type="text" id="" data-mini="true" />
                                            </td>
                                        </tr>
                                        <tr>
                                            <td>单体数量</td>
                                            <td>
                                                <input type="text" id="" data-mini="true" />
                                            </td>
                                        </tr>
                                        <tr>
                                            <td>标称容量(AH)</td>
                                            <td>
                                                <input type="text" id="" data-mini="true" />
                                            </td>
                                        </tr>
                                        <tr>
                                            <td>标称单体电压(V)</td>
                                            <td>
                                                <input type="text" id="" data-mini="true" />
                                            </td>
                                        </tr>
                                        <tr>
                                            <td>标称单体内阻(mΩ)</td>
                                            <td>
                                                <input type="text" id="" data-mini="true" />
                                            </td>
                                        </tr>
                                        <tr>
                                            <td>标称单体电导</td>
                                            <td>
                                                <input type="text" id="" data-mini="true" />
                                            </td>
                                        </tr>
                                        <tr>
                                            <td>单体电压次低偏移量(V)</td>
                                            <td>
                                                <input type="text" id="" data-mini="true" />
                                            </td>
                                        </tr>
                                        <tr>
                                            <td>负载电流(A)</td>
                                            <td>
                                                <input type="text" id="" data-mini="true" />
                                            </td>
                                        </tr>
                                        <tr>
                                            <td>最大核容电流(A)</td>
                                            <td>
                                                <input type="text" id="" data-mini="true" />
                                            </td>
                                        </tr>
                                        <tr>
                                            <td>基站号码</td>
                                            <td>
                                                <input type="text" id="" data-mini="true" />
                                            </td>
                                        </tr>
                                        <tr>
                                            <td>电池品牌</td>
                                            <td>
                                                <input type="text" id="" data-mini="true" />
                                            </td>
                                        </tr>
                                        <tr>
                                            <td>电池型号</td>
                                            <td>
                                                <input type="text" id="" data-mini="true" />
                                            </td>
                                        </tr>
                                        <tr>
                                            <td>电池生产日期</td>
                                            <td>
                                                <input id="startTestrecord"  type="text" name="appDate" class="appDatefir"  value="2000-01-01" />
                                            </td>
                                        </tr>
                                        <tr>
                                            <td>投入使用日期    </td>
                                            <td>
                                                <input id="endTestrecord" type="text" name="appDate" class="appDatesec"  value="2017-01-01" />
                                            </td>
                                        </tr>
                                        <tr>
                                            <td>安装人员</td>
                                            <td>
                                                <input type="text" id="" data-mini="true" />
                                            </td>
                                        </tr>
                                    </tbody>
                                </table>
                            <!-- </div> -->
        </div>
        <div data-role="footer" data-position="fixed" data-theme="a">
            <div data-role="navbar">
                <ul>
                  <li><a href="" target="_top" data-role="button" data-icon="check" data-transition="slide">确定</a></li>
                  <li><a href="" target="_top" data-role="button" data-icon="delete" data-transition="slide">取消</a></li>
                </ul>
            </div>
        </div>
    </div>
</body>
<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">
    $(function () {
        setTimes($("#startTestrecord"),'2000-01-01');
        setTimes($("#endTestrecord"),new Date().format('yyyy-MM-dd'));
    });
</script>
 <script type="text/javascript">
   $(function(){
    $(".unable").prop("readonly","readonly").attr("unselectable","on").addClass("uncheck");
   });
   </script>
</html>
gx_tieta/WebRoot/mobil/ele-param.html
@@ -80,6 +80,14 @@
            text-overflow:ellipsis;
            white-space: nowrap;
        }
        .bg-line{
            background-color:#ddd;
        }
        .operat-but{
            margin: 0;
            padding-top: 0.7em;
            padding-bottom: 0.7em;
        }
    </style>
    <link rel="stylesheet" href="css/fgpanel.css">
</head>
@@ -138,11 +146,16 @@
            <div data-role="navbar">
                <ul>
                  <li><a href="index.html" target="_top" data-role="button" data-icon="home" data-transition="slide">首页</a></li>
                  <li><a href="" target="_top" data-role="button" data-icon="grid" data-transition="slide">新建</a></li>
                  <li><a href="batt-infor-conf-temp.html" target="_top" data-role="button" data-icon="plus" data-transition="slide">新建</a></li>
                </ul>
            </div>        
        </div>   
        <div data-role="popup" id="myPopup" class="ui-content" data-overlay-theme="b">
        <a href="#" data-rel="back" class="ui-btn ui-corner-all ui-shadow ui-btn ui-icon-delete ui-btn-icon-notext ui-btn-right">关闭</a>
      <a href="batt-infor-conf-temp.html" class="ui-btn ui-corner-all ui-shadow  ui-btn-icon-left ui-icon-edit" >修改</a>
    <a href="batt-infor-delete.html" class="ui-btn ui-corner-all ui-shadow  ui-btn-icon-left ui-icon-forbidden"  data-icon="delete">删除</a>
    </div>
    </div>
</body>
@@ -167,7 +180,7 @@
    $('document').ready(function(){panel.show();});    
  
    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');
@@ -199,7 +212,7 @@
                data:"json="+json,
                success:function(data){
                    //console.info(data);
                    var data = JSON.parse(data.result);
                    //var data = JSON.parse(data.result);
                    //layer.close(load);
                    if(data.code==1&&data.data.length>0){
                        data=data.data;
@@ -222,11 +235,21 @@
                }    
            });     
            /* 模拟数据做好就删!!!!!!!! */
            for(i=0;i<100;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="#myPopup" data-rel="popup" class="ui-btn ui-btn-inline ui-corner-all operat-but" data-position-to="window" >修改或删除</a>';
            console.warn(i);
            continue;
            }
                     arrTd[i]=i*10;
                    }
                        
                    createTbl(tblCon, arrTh, arrTd);
            /* 模拟数据做好就删!!!!!!!! */                
        }