hdw
2018-11-12 c22971419e96c3a5acde4526741b0233291f84ab
跳转
5个文件已修改
59 ■■■■ 已修改文件
gx_tieta/WebRoot/batt-state-manage.jsp 12 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
gx_tieta/WebRoot/charge-test.jsp 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
gx_tieta/WebRoot/control.jsp 37 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
gx_tieta/WebRoot/js/rightmenu.js 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
gx_tieta/WebRoot/pages/js/pages/siderbar.js 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
gx_tieta/WebRoot/batt-state-manage.jsp
@@ -113,11 +113,11 @@
                    </table>
                    <table class="condi-opt">
                <tr>
                    <td><input type="checkbox" id="ALM_TYPE_BTS9100S_POFF_ComError" name=""  value=2 class="" /><span class="checkbox-label">停电</span></td>            <!-- 停电 -->
                    <td><input type="checkbox" id="ALM_TYPE_BTS9100S_XUHANG_ComError" name=""  value=4 class=""><span class="checkbox-label">续航</span></td>            <!-- 掉站 -->
                    <td><input type="checkbox" id="ALM_TYPE_BTS9100S_FADIAN_ComError" name=""  value=8 class="" /><span class="checkbox-label">发电</span></td>        <!-- 发电 -->
                    <td><input type="checkbox" id="ALM_TYPE_BTS9100S_DOOROPEN_ComError"    name="" value=16 class="" ><span class="checkbox-label">开门异常</span></td>    <!-- 开门异常 -->
                    <td><input type="checkbox" id="ALM_TYPE_BTS9100S_DIAOZHAN_ComError" name=""  value=32 class=""><span class="checkbox-label">掉站</span></td>        <!-- 掉站 -->
                    <td><input type="checkbox" checked="checked" id="ALM_TYPE_BTS9100S_POFF_ComError" name=""  value=2 class="" /><span class="checkbox-label">停电</span></td>            <!-- 停电 -->
                    <td><input type="checkbox" checked="checked" id="ALM_TYPE_BTS9100S_XUHANG_ComError" name=""  value=4 class=""><span class="checkbox-label">续航</span></td>            <!-- 掉站 -->
                    <td><input type="checkbox" checked="checked" id="ALM_TYPE_BTS9100S_FADIAN_ComError" name=""  value=8 class="" /><span class="checkbox-label">发电</span></td>        <!-- 发电 -->
                    <td><input type="checkbox" checked="checked" id="ALM_TYPE_BTS9100S_DOOROPEN_ComError"    name="" value=16 class="" ><span class="checkbox-label">开门异常</span></td>    <!-- 开门异常 -->
                    <td><input type="checkbox" checked="checked" id="ALM_TYPE_BTS9100S_DIAOZHAN_ComError" name=""  value=32 class=""><span class="checkbox-label">掉站</span></td>        <!-- 掉站 -->
                    
                </tr>
            </table>
@@ -196,7 +196,7 @@
            var station_state = getQueryString('station_state');
            if(station_state){
                //alert(station_state);
                $('#search_form .condi-opt input[type=checkbox]').prop("checked", false);
                $('#search_form .condi-opt [value='+station_state+']:checkbox').attr("checked", true);
            }
            
gx_tieta/WebRoot/charge-test.jsp
@@ -3410,8 +3410,8 @@
            var city = batt.StationName2;
            var county = batt.StationName5;
            var home = batt.StationName;
            var homeid = batt.BattGroupId;
            $(this).attr('href', 'control.jsp?province='+province+'&city='+city+'&county='+county+'&home='+home+'&homeid='+homeid);
            var battid = batt.BattGroupId;
            $(this).attr('href', 'control.jsp?province='+province+'&city='+city+'&county='+county+'&home='+home+'&battid='+battid);
        });
    }); 
    
gx_tieta/WebRoot/control.jsp
@@ -1151,6 +1151,7 @@
    <script type="text/javascript" src="js/dischargetest/sysData.js"></script>
    <script type="text/javascript" src="pages/js/pages/control-common.js"></script>
    <script type="text/javascript" src="pages/js/pages/siderbar.js"></script>
    <script type="text/javascript" src="js/rightmenu.js"></script>
    <!-- 引入电路图 -->
    <script type="text/javascript" src="js/elecircle.js"></script>
    <script type="text/javascript" src="js/elecircle.content.js"></script>
@@ -3041,8 +3042,8 @@
                var city = batt.StationName2;
                var county = batt.StationName5;
                var home = batt.StationName;
                var homeid = batt.BattGroupId;
                $(this).attr('href', 'charge-test.jsp?province='+province+'&city='+city+'&county='+county+'&home='+home+'&homeid='+homeid);
                var battid = batt.BattGroupId;
                $(this).attr('href', 'charge-test.jsp?province='+province+'&city='+city+'&county='+county+'&home='+home+'&battid='+battid);
            });
        });
    
@@ -4424,6 +4425,36 @@
                treeView.ele.find('li').removeClass('sider-menu-open');
            });
            
            // 电路拓扑图右键菜单
            var menuItems = [
                {txt: '机房状态查询', cla: 'target', data:{target: 'batt-state-manage.jsp'}},
                {txt: '机房流量统计查询', cla: 'target', data:{target: 'batt-traffic-statistics1.jsp'}},
                {txt: '机房续航能力查询', cla: 'target', data: {target: 'batt-life-manage.jsp'}},
                {txt: '设备充放电模块状态', cla:'target', data: {target: 'equip-charge-param.jsp'}},
            ];
            // 给表格添加自己的右键菜单
            $('#contai').on('mousedown','.ele-circle',function(e){
                var batt = getBatt();
                if (e.which == 3) {
                    var disX = (e || event).clientX + 10;    //获取鼠标点击的横坐标
                    var disY = (e || event).clientY + 10;    // 获取鼠标点击的纵坐标
                    rightMenu.showMenu(menuItems, disX, disY);
                }
            });
            $('body').on('click', '#rightMenu .target', function() {
                var batt = getBatt();
                var pageName = $(this).data('data').target;
                var province = batt.StationName1;
                var city = batt.StationName2;
                var county = batt.StationName5;
                var home = batt.StationName;
                var battid = batt.BattGroupId;
                // 实现跳转
                window.open(skipUrl(pageName, province, city, county, home, battid));
            });
            // 工具条整体样式
            $('.siderbar-tools').tooltip();
            
@@ -4895,7 +4926,7 @@
                data: "json = " + JSON.stringify(temp),
                success: function(result) {
                    var rs = JSON.parse(result.result);
                    console.info(rs);
                    //console.info(rs);
                    if(rs.code == 1){
                        var dcdcWarn = '';
                        var data = rs.data;
gx_tieta/WebRoot/js/rightmenu.js
@@ -23,6 +23,10 @@
    for(var i=0; i<this.items.length;i++)
    {
        __a[i]=$('<a href="javascript:;" class="'+this.items[i].cla+'">'+this.items[i].txt+'</a>');
        // 判断是否设置data
        if(this.items[i].data) {
            __a[i].data('data', this.items[i].data);
        }
        __div.append(__a[i]);
    }
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
    var homeid = getQueryString('battid');        // 电池组id
    //console.log(province);
    
    // 生成一级导航-省