LiJun
2018-11-12 a55eed869a9e37f96f54992185acdb3343953632
Merge branch 'dev_lxw' of https://whyclj@gitlab.com/whyclxw1/gx_tieta.git into dev_lxw
3个文件已修改
10 ■■■■■ 已修改文件
gx_tieta/WebRoot/charge-test.jsp 3 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
gx_tieta/WebRoot/control.jsp 3 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
gx_tieta/WebRoot/pages/js/pages/siderbar.js 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
gx_tieta/WebRoot/charge-test.jsp
@@ -3413,7 +3413,8 @@
            var city = batt.StationName2;
            var county = batt.StationName5;
            var home = batt.StationName;
            $(this).attr('href', 'control.jsp?province='+province+'&city='+city+'&county='+county+'&home='+home);
            var homeid = batt.BattGroupId;
            $(this).attr('href', 'control.jsp?province='+province+'&city='+city+'&county='+county+'&home='+home+'&homeid='+homeid);
        });
    }); 
    
gx_tieta/WebRoot/control.jsp
@@ -3030,7 +3030,8 @@
                var city = batt.StationName2;
                var county = batt.StationName5;
                var home = batt.StationName;
                $(this).attr('href', 'charge-test.jsp?province='+province+'&city='+city+'&county='+county+'&home='+home);
                var homeid = batt.BattGroupId;
                $(this).attr('href', 'charge-test.jsp?province='+province+'&city='+city+'&county='+county+'&home='+home+'&homeid='+homeid);
            });
        });
    
gx_tieta/WebRoot/pages/js/pages/siderbar.js
@@ -220,7 +220,7 @@
    var city = getQueryString('city');             // 市
    var county = getQueryString('county');        // 区/县
    var home = getQueryString('home');            // 机房
    var homeid = getQueryString('homeid');        // 电池组id
    //console.log(province);
    
    // 生成一级导航-省
@@ -467,7 +467,7 @@
                    treeView.treeView(container, formatData);
                    //console.info(formatData);
                    if(active) {
                        treeView.activeFile(container,'eleGroup', '');
                        treeView.activeFile(container,'eleGroup', homeid);
                        var battId = formatData[0].id;
                        location.hash="#"+battId;
                        location.hash = "";