hdw
2019-01-18 0d3439eff37ad2c5d1b998adb48be70ff4d7fd02
修改测试数据跳转链接
9个文件已修改
98 ■■■■■ 已修改文件
gx_tieta/WebRoot/mobil/battM.html 7 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
gx_tieta/WebRoot/mobil/control.html 30 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
gx_tieta/WebRoot/mobil/history.html 5 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
gx_tieta/WebRoot/mobil/homeList.html 20 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
gx_tieta/WebRoot/mobil/index.html 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
gx_tieta/WebRoot/mobil/machineroomM.html 13 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
gx_tieta/WebRoot/mobil/mobilJs/base.js 8 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
gx_tieta/WebRoot/mobil/selectbatt.html 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
gx_tieta/WebRoot/mobil/testdata.html 11 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
gx_tieta/WebRoot/mobil/battM.html
@@ -14,7 +14,7 @@
        <!-- 三级菜单内容    -->
        <div data-role="page">
            <div data-role="header" data-position="fixed">
                <a href="homeList.html" class="ui-btn ui-corner-all ui-shadow ui-icon-back ui-btn-icon-left" target="_top" style="padding-top:0.7em;padding-bottom:0.7em;">返回</a>
                <a href="selectbatt.html" class="ui-btn ui-corner-all ui-shadow ui-icon-back ui-btn-icon-left" target="_top" style="padding-top:0.7em;padding-bottom:0.7em;">返回</a>
                <h1>蓄电池组</h1>
            </div>
    
@@ -44,7 +44,10 @@
                
                var data = [
                    {url: 'javascript:JumpHomePage();', txt: '首页'},
                    {url: 'homeList.html', txt: temp.StationName},
                    {url: 'javascript:JumpFirstPage();', txt:temp.StationName1},
                    {url: 'javascript:JumpcityPage();', txt: temp.StationName2},
                    {url: 'selectcounty.html', txt: temp.StationName5 },
                    {url: 'selectbatt.html', txt: temp.StationName3 },
                    {url: 'javascript:;', txt: '蓄电池组'}
                ];
                addBreadCrumb($('.breadcrumb').eq(0),data);
gx_tieta/WebRoot/mobil/control.html
@@ -23,7 +23,7 @@
    </div>
    <div data-role="content">
        <!-- <ul class="breadcrumb"></ul> -->
        <ul class="breadcrumb"></ul>
        <ul data-role="listview" data-inset="true">
            <li>
                <a href="voltageM.html" target="_top">1.单体电压 </a>
@@ -52,7 +52,7 @@
        <div data-role="collapsible" data-collapsed="false">
          <h1 id="zhuangtai">电池组状态</h1>
          <div class="tbl-container"></div>
    </div>
        </div>
        <div data-role="footer" data-position="fixed" data-theme="a">    
            <div data-role="navbar">
                <ul>
@@ -61,7 +61,8 @@
                  <li><a href="" id="signalqual" class="ui-btn ui-btn-inline ui-corner-all  ui-btn-icon-check" data-icon="check" data-role="button">信号质量</a></li>
                </ul>
            </div>        
        </div>
        </div>
    </div>
    <script type="text/javascript" src="js/tbl.js"></script>
    <script type="text/javascript" src="mobilJs/base.js"></script>
    <script type="text/javascript" src="js/battNav.js"></script>
@@ -422,12 +423,12 @@
                                loadclose();
                            //}
                        }else{
                            noContent.showNoContent('查询失败!');
                            alert('查询失败!');
                            loadclose();
                        }
                    },
                    error: function() {
                        noContent.showNoContent('查询失败!');
                        alert('查询失败!');
                        loadclose();
                        // 关闭等待    
                    }
@@ -457,14 +458,15 @@
            var temp = getCookie("batt");
            var batt = JSON.parse(temp);
            var data = [
                        {url: 'javascript:JumpHomePage();', txt: '首页'},
                        {url: 'machineroomM.html', txt: batt.StationName1},    // 省
                        {url: 'selectcity.html' , txt:batt.StationName2},//市
                        {url: 'selectcounty.html' , txt:batt.StationName5},
                        {url: 'battM.html', txt: batt.StationName3},    // 电池组
                        {url: 'testdata.html', txt: '电池组数据'},    // 当前页面
                        {url: 'javascript:;', txt: '实时-监测数据'}
                    ];
                {url: 'javascript:JumpHomePage();', txt: '首页'},
                {url: 'javascript:JumpFirstPage();', txt: batt.StationName1},
                {url: 'javascript:JumpcityPage();', txt: batt.StationName2},
                {url: 'selectcounty.html', txt: batt.StationName5 },
                {url: 'selectbatt.html', txt: batt.StationName3 },
                {url: 'battM.html', txt: batt.BattGroupName},    // 电池组
                {url: 'testdata.html', txt: '电池组数据'},    // 当前页面
                {url: 'javascript:;', txt: '实时-监测数据'}
            ];
            /*var data = [
                {url: 'javascript:JumpHomePage();', txt: '首页'},
                {url: 'machineroomM.html', txt: batt.StationName},    // 机房
@@ -475,7 +477,7 @@
            if(batt.install_user||batt.install_user==0){
                
            }else{
                //addBreadCrumb($('.breadcrumb').eq(0), data);
                addBreadCrumb($('.breadcrumb').eq(0), data);
            }
        });
        
gx_tieta/WebRoot/mobil/history.html
@@ -236,7 +236,10 @@
                var batt = JSON.parse(temp);
                var data = [
                    {url: 'javascript:JumpHomePage();', txt: '首页'},
                    {url: 'homeList.html', txt: batt.StationName},    // 机房
                    {url: 'javascript:JumpFirstPage();', txt: batt.StationName1},
                    {url: 'javascript:JumpcityPage();', txt: batt.StationName2},
                    {url: 'selectcounty.html', txt: batt.StationName5 },
                    {url: 'selectbatt.html', txt: batt.StationName3 },
                    {url: 'battM.html', txt: batt.BattGroupName},    // 电池组
                    {url: 'testdata.html', txt: '电池组数据'},                                // 电池组数据
                    {url: 'javascript:;', txt: '历史-监测数据'}                                // 电池组数据
gx_tieta/WebRoot/mobil/homeList.html
@@ -15,12 +15,12 @@
    <body>
        <div data-role="page"  tabindex="0" id="page0">
            <div data-role="header" data-position="fixed">
                <a href="index.html"  target="_top" style="padding-top:0.7em;padding-bottom:0.7em;">返回</a>
                <a href="javascript:window.history.go(-1)"  target="_top" style="padding-top:0.7em;padding-bottom:0.7em;">返回</a>
                <h1>机房列表</h1>
            </div>
            <div data-role="content">
                <div class="home-search-input-container">
                    <input type="text" data-type="search" name="search" id="searchInput" placeholder="搜索内容...">
                    <input type="text" data-type="search" name="search" id="searchInput" placeholder="搜索内容..." autofocus="autofocus">
                </div>
                <div id="battList"></div>
            </div>
@@ -35,14 +35,6 @@
    <script type="text/javascript" src="src/layui.all.js"></script>
     <script src="app/js/common.js"></script>
    <script type="text/javascript">
        var stationlist = new Array();
        // 初始化页面内容
        $(document).ready(function(){
            setCookie("station",null);
            setCookie("batt",null);
        });
        // 页面初始化完成
        $(document).on('pageinit', function(event) {
            setTimeout(function() {
@@ -81,11 +73,17 @@
                    StationName2: homeData.city,
                    StationName5: homeData.county,
                    StationName: homeData.home,
                    StationName3: homeData.home3,
                    StationId: homeData.homeid
                };
                
                
                var json=window.JSON.stringify(temp);
                //设置必要的cookie
                setCookie('StationName1', json);
                setCookie('city', json);
                setCookie('county', json);
                setCookie("battselect",json);
                window.location.href="battM.html";
            });
@@ -105,6 +103,7 @@
                if(rs.code==1){
                    homeSource = [];
                    var data = rs.data;
                    console.log(data);
                    for(var i=0; i<data.length; i++) {
                        var _data = data[i];
                        var tmp = {
@@ -112,6 +111,7 @@
                            province: _data.StationName1,
                            city: _data.StationName2,
                            county: _data.StationName5,
                            home3: _data.StationName3,
                            home: _data.StationName,
                            homeid: _data.StationId
                        };
gx_tieta/WebRoot/mobil/index.html
@@ -20,7 +20,7 @@
    <div data-role="content" >
        <ul data-role="listview"  data-icon="false" data-inset="true">
            <li>
                <a href="homeList.html" target="_top" data-i18n="main.index">测试数据</a>
                <a href="machineroomM.html" target="_top" data-i18n="main.index">测试数据</a>
            </li>
            <li>
                <a href="ele-param2.html" target="_top" data-i18n="main.warningmanagement">电池安装申请</a>
gx_tieta/WebRoot/mobil/machineroomM.html
@@ -20,6 +20,9 @@
        
            <div data-role="content">
                <ul class="breadcrumb"></ul>
                <div class="home-search-input-container">
                    <input type="text" data-type="search" name="search" id="searchInput" placeholder="搜索内容...">
                </div>
                <div id="battList"></div>
            </div>
            <div data-role="popup" id="myPopup" class="defined-popup">
@@ -41,7 +44,7 @@
                    </div>
                </div>
            <div data-role="footer" data-position="fixed">
                <!-- <h1>福光电子有限公司</h1> -->
            </div>
        </div>
    </body>
@@ -67,7 +70,13 @@
                setCookie("StationName1",json);
                window.location.href="selectcity.html";
            });
            // 点击搜索框跳转到homeList页面
            $('#searchInput').click(function() {
                $(this).blur();
                window.location.href="homeList.html";
            });
        });
        
        // 定义面包屑导航条
gx_tieta/WebRoot/mobil/mobilJs/base.js
@@ -278,17 +278,9 @@
function addBreadCrumb(breadcrumb, data) {
    // 清理导航内容
    breadcrumb.text("");
    console.log(data);
    // 遍历data向容器中添加内容
    for(var i = 0; i < data.length; i++) {
        var li;
         console.warn(data[i].txt);
        if(data[i].txt.trim().length > 0) {
            if(i == data.length-1) {
                li= $('<li><a href="'+data[i].url+'" class="active">'+data[i].txt+'</a></li>');
gx_tieta/WebRoot/mobil/selectbatt.html
@@ -50,7 +50,7 @@
                    {url: 'javascript:JumpHomePage();', txt: '首页'},
                    {url: 'javascript:JumpFirstPage();', txt:temp.StationName1},
                    {url: 'javascript:JumpcityPage();', txt: temp.StationName2},
                    {url: 'machineroomM.html', txt: temp.StationName5 },
                    {url: 'selectcounty.html', txt: temp.StationName5 },
                    {url: 'javascript:;', txt: '机房'}
                ];
                addBreadCrumb($('.breadcrumb').eq(0),data);
gx_tieta/WebRoot/mobil/testdata.html
@@ -62,15 +62,18 @@
            <script type="text/javascript" src="src/layui.all.js"></script>
            <script type="text/javascript">
                $(function() {
                //console.warn(111133);
                console.info(batt);
                    //console.warn(111133);
                    temp = JSON.parse(temp);
                    var data = [
                        {url: 'javascript:JumpHomePage();', txt: '首页'},
                        {url: 'homeList.html' , txt:batt.StationName},
                        {url: 'javascript:JumpFirstPage();', txt:temp.StationName1},
                        {url: 'javascript:JumpcityPage();', txt: temp.StationName2},
                        {url: 'selectcounty.html', txt: temp.StationName5 },
                        {url: 'selectbatt.html', txt: temp.StationName3 },
                        {url: 'battM.html', txt: batt.BattGroupName},    // 电池组
                        {url: 'javascript:;', txt: '电池组数据'}    // 当前页面
                    ];
                    console.info(data);
                    addBreadCrumb($('.breadcrumb').eq(0), data);
                });