hdw
2018-11-12 c426db921a97e78ad9e741301bdd346b7aba6f11
修改内容
2个文件已修改
66 ■■■■■ 已修改文件
gx_tieta/WebRoot/charge-test.jsp 64 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
gx_tieta/WebRoot/control.jsp 2 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
gx_tieta/WebRoot/charge-test.jsp
@@ -383,8 +383,6 @@
    <div id="right_menu">
        <ul>
            <li><a href="javascript:"><s:text name="Check_the_battery_card"></s:text></a></li>                        <!-- 查看电池组机历卡 -->
            <li><a href="upload.jsp" target="_blank"><s:text name="Upload_FBO/IDC_data"></s:text></a></li>                        <!-- 上传'FBO/IDC'数据 -->
            <li><a href="uploadresis.jsp" target="_blank"><s:text name="Upload_resistance_conductivity_data"></s:text></a></li>            <!-- 上传电阻电导数据 -->
            <li><a href="eleBrdwMaint.jsp" target="_blank"><s:text name="Batt_failure_maintenance_record_query" /></a></li>                <!-- 电池故障维护记录查询 -->
            <li><a href="javascript:targetBattReport();"><s:text name="Battery_statistical_analysis_queries"></s:text></a></li>        <!-- 电池统计分析查询-->
            <!-- <li><a href="eleMonomer.jsp"><s:text name="Batt_statistical_analysis_query"></s:text></a></li>                 电池单体统计分析查询 -->
@@ -396,7 +394,6 @@
                </div>
            </li> -->
            <li style="display:none;"><a href="javascript:"><s:text name="Search_engine_or_the_batt_group"></s:text></a></li>                <!-- 搜索机房或电池组-->
            <li><a href="javascript:" id="all_show"><s:text name="Expand_all"></s:text></a></li>                                    <!-- 全部展开 -->
            <li><a href="javascript:" id="all_hide"><s:text name="Collapse_all"></s:text></a></li>                                <!-- 全部收缩 -->
        </ul>
    </div>
@@ -2235,8 +2232,8 @@
                    for(var i=0;i<AllTestData.length;i++){
                        if(AllTestData[i].record_num != test_record_num){
                            //console.info(AllTestData[i]);
                            BattGroupVol[0].push(AllTestData[i].group_vol.toFixed(2));        //组端电压
                            BattGroupVol[1].push(AllTestData[i].online_vol.toFixed(2));        //在线电压
                            BattGroupVol[0].push(AllTestData[i].online_vol.toFixed(2));        //在线电压
                            BattGroupVol[1].push(AllTestData[i].group_vol.toFixed(2));        //组端电压
                            BattGroupCurr.push(AllTestData[i].test_curr.toFixed(1));        //组端电流
                            TestTime.push(formatSeconds(AllTestData[i].test_timelong));
                            batt_test_evary_record.push(AllTestData[i]);
@@ -3365,7 +3362,7 @@
    var Residual_capacity = '<s:text name="Residual_capacity" />';    //剩余容量
    var Actual_capacity = '<s:text name="Actual_capacity" />';      //实际容量
    var Percent_total_capacity = '<s:text name="Percent_total_capacity" />';     //容量百分比
    var group_vol = ['<s:text name="Group_voltage"/>','<s:text name="On-line_voltage"/>'];
    var group_vol = ['<s:text name="On-line_voltage"/>', '<s:text name="Group_voltage"/>'];    // 在线电压, 组端电压
    var batt_curr = '<s:text name="Batt_current"/>';
    
    // 更新表格第二列
@@ -3761,8 +3758,8 @@
    //跳转到指定的电池组统计分析查询
    function targetBattReport(){
        var batt = getBattinfById();
        //console.info(batt);
        window.open("eleAnalyse.jsp?battgroupId="+BattGroupId+"&stationId="+batt.StationId);
        var url = skipUrl("eleAnalyse.jsp",batt.StationName1,batt.StationName2,batt.StationName5,batt.StationName,batt.BattGroupId);
        window.open(url);
    }
    
    // 使用jquery实现左导航的显示和隐藏
@@ -3881,16 +3878,6 @@
                }
                
            });
        });
        //全部收缩
        $('#all_hide').click(function(){
            $('.fir').next().slideUp();
            //$('.sec').next().slideUp();
            $("#lside").scrollTop(0);
            $(".arrow").removeClass("up");
            $(".arrow").addClass("down");
            $(".mark").text("+");
            $(".mark").removeClass("black");
        });
    });
    
@@ -4292,8 +4279,8 @@
                    
                    specialGroupVolOpts = $.extend(true, {}, specialGroupVolOpts, {
                        xdata: rsData.time,
                        sdata: [rsData.groupVol, rsData.onlineVol],
                        lname: ['组端电压', '在线电压']
                        sdata: [rsData.onlineVol, rsData.groupVol],
                        lname: ['在线电压', '组端电压']
                    });
                    
                    specialCurrOpts = $.extend(true, {}, specialCurrOpts, {
@@ -4661,8 +4648,8 @@
                    
                    specialGroupVolOpts = $.extend({}, specialGroupVolOpts, {
                        xdata: testtiem_arr,
                        sdata: [groupvol_arr, onlinevol_arr],
                        lname: ['组端电压', '在线电压']
                        sdata: [ onlinevol_arr, groupvol_arr],
                        lname: ['在线电压', '组端电压']
                    });
                    
                    specialCurrOpts = $.extend({}, specialCurrOpts, {
@@ -4863,6 +4850,39 @@
            $('#testrecordcout').val('-1');
        });
        
        // 右键菜单显示
        treeView.ele.on('mousedown', '.eleGroup', function(e) {
            //利用jquery的方式获取当前点击的是否是右键
               if(e.which==3)
               {
                   BattGroupId=$(this).attr("id");
                   var disX=(e||event).clientX+10;            //得到鼠标点击X的位置
                  var disY=(e||event).clientY+10;            //得到鼠标点击Y的位置
                  var scrollY=$(window).scrollTop();        //获取浏览器滚动的高度
                //console.log(scrollY);
                  var oRightMenu=document.getElementById("right_menu");
                  $(this).click();
                  //显示菜单内容
                  $("#right_menu").show();
                  $("#right_menu .more_menu").hide();
                  $("#right_menu .angle").hide();
                  //console.log(disX+"***"+disY);
                  //使菜单跟随鼠标位置
                  oRightMenu.style.left= disX+'px';
                  oRightMenu.style.top= disY+scrollY+'px';
                  setPosition($("#right_menu"),disX, disY);
               }
        });
        //全部收缩
        $('#all_hide').click(function(){
            treeView.ele.find('li').removeClass('sider-menu-open');
        });
        // 电池充放电数据监控
        var batt_list = $('.batt-listen .batt-list');
        batt_list.on('click', 'a', function(){
gx_tieta/WebRoot/control.jsp
@@ -3130,9 +3130,7 @@
    function targetBattReport(){
        var batt = getBatt();        
        var url = skipUrl("eleAnalyse.jsp",batt.StationName1,batt.StationName2,batt.StationName5,batt.StationName,batt.BattGroupId);
        //console.info(url);
        window.open(url);
        //window.open("eleAnalyse.jsp?battgroupId="+BattGroupId+"&stationId="+batt.StationId);
    }
    // 使用jquery实现左导航的显示和隐藏
    $(document).ready(function(){