hdw
2018-10-26 d46faf5aa20c139213d774bb479c638263882416
历史数据监测修改
3个文件已修改
186 ■■■■ 已修改文件
gx_tieta/WebRoot/charge-test.jsp 179 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
gx_tieta/WebRoot/control.jsp 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
gx_tieta/WebRoot/js/popup.js 5 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
gx_tieta/WebRoot/charge-test.jsp
@@ -27,6 +27,7 @@
<link href="css/collapse.css" type="text/css" rel="stylesheet" />
<link rel="stylesheet" type="text/css" href="css/confirm.css">
<link rel="stylesheet" href="css/common.css">
<link rel="stylesheet" type="text/css" href="css/popup-tbl.css">
<!-- font-awesome-4.7.0 -->
<link rel="stylesheet" href="font-awesome-4.7.0/css/font-awesome.min.css">
<script type="text/javascript" src="js/echarts2.js"></script>
@@ -77,13 +78,14 @@
        <table id="all_content">
            <tr>
                <td id="ele_content">
                    <!-- 机房数电池组数 -->
                    <div id="mach_num">
                        <s:text name="Room_num"></s:text>
                        :<span id="room_num"></span>;&nbsp;
                        <s:text name="Batt_group_num"></s:text>
                        :<span id="batt_group_num"></span>
                    </div> <!--电池组菜单栏-->
                    <div class="siderbar-tools">
                        <div class="siderbar-tools-right">
                            <i class="fa fa-file-text-o" title="机历卡" id="siderbarToolsCard"></i>
                            <i class="fa fa-search" title="查询机房" id="siderbarToolsSearch"></i>
                            <i class="fa fa-outdent" title="全部收缩" id="siderbarToolsHide"></i>
                        </div>
                    </div>
                    <!--电池组菜单栏-->
                    <div id="lside"></div>
                    <div class="batt-listen">
                        <div class="count-num">
@@ -528,6 +530,31 @@
    </div>
    
    <div id="bigEchartsCon"></div>
    <!-- 导航定位  -->
    <div class="popup w500 mr250" id="localNav">
        <div class="popup-title"><span>机房查询</span><a href="javascript:;" class="close">X</a></div>
        <div class="popup-content">
            <div class="popup-tbl">
                <table>
                    <tbody>
                        <tr>
                            <th>机房名称/机房id</th>
                        </tr>
                        <tr>
                            <td>
                                <input name="popupHomeName" id="popupHomeName" type="text">
                            </td>
                        </tr>
                    </tbody>
                </table>
            </div>
        </div>
        <div class="popup-footer">
            <input type="button" name="" id="localNav_en" class="status-change-btn" value="确定" > <!-- 确定 -->
            <input type="button" name="" class="close" value="取消" >                <!-- 取消 -->
        </div>
    </div>
    <!-- 清除浮动 -->
    <div class="clear"></div>
    <div id="allGraph">
@@ -542,6 +569,7 @@
<script type="text/javascript" src="js/collapse.js"></script>
<script type="text/javascript" src="js/charge.js"></script>
<script type="text/javascript" src="js/myConfirm.js"></script>                <!-- 确认框 -->
<script type="text/javascript" src="js/popup.js"></script>
<script type="text/javascript" src="pages/js/pages/siderbar.js"></script>
<script type="text/javascript">
    var permits;
@@ -609,6 +637,21 @@
    searchUserColor();
    
    loading.showLoading($('#lside'));
    var localNav = new Popup($('#localNav'));
    // 充放电弹出框设置
    $(function() {
        // 初始化localNav弹出框
        $('#localNav').find('.close').bind('click', function() {
            localNav.hidePopup();    // 隐藏localNav弹出框和遮罩层
        });
        // 窗口大小改变
        $(window).resize(function() {
            localNav.hidePopup();
        });
    });
    
    // 设置echarts对象
    var specialMonVolLine;
@@ -4637,28 +4680,112 @@
                searchAll_lowAction();            //获取阀值
            }
            
            // 电池充放电数据监控
            var batt_list = $('.batt-listen .batt-list');
            batt_list.on('click', 'a', function(){
                batt_list.find('a').removeClass('active');
                $(this).addClass('active');
                var battInfo = $(this).parent().data('attr');
                var tmp = {
                    province: battInfo.province,
                    city: battInfo.city,
                    home: battInfo.home,
                    homeid: battInfo.note,
                    battid: battInfo.val
                };
                console.log(tmp);
                localSideBar(treeView, treeView.container, tmp);
            });
            // 设置记录的笔数为-1
            $('#testrecordcout').val('-1');
        });
        // 电池充放电数据监控
        var batt_list = $('.batt-listen .batt-list');
        batt_list.on('click', 'a', function(){
            batt_list.find('a').removeClass('active');
            $(this).addClass('active');
            var battInfo = $(this).parent().data('attr');
            var tmp = {
                province: battInfo.province,
                city: battInfo.city,
                home: battInfo.home,
                homeid: battInfo.note,
                battid: battInfo.val
            };
            localSideBar(treeView, treeView.container, tmp);
        });
        // 工具条整体样式
        $('.siderbar-tools').tooltip();
        // 工具条-机历卡
        $('#siderbarToolsCard').click(function(){
            var batt = getBattinfById();
            var tmp = {
                province: batt.StationName1,
                city: batt.StationName2,
                home: batt.StationName,
                homeid: batt.StationId,
                battid: batt.BattGroupId
            };
            findBattinfByBattGroupId(batt.BattGroupId);
            // 根据数据定位
            localSideBar(treeView, treeView.container, tmp);
        });
        // 工具条-全部收缩
        $('#siderbarToolsHide').click(function(){
            treeView.ele.find('li').removeClass('sider-menu-open');
        });
        // 工具条-查询
        $('#siderbarToolsSearch').click(function(){
            localNav.homeInfo = undefined;
            $('#popupHomeName').val('');
            localNav.showPopup();
        });
        // 点击面板的确定按钮
        $('#localNav_en').click(function() {
            // 定位
            if(localNav.homeInfo) {
                localNav.hidePopup();
                localSideBar(treeView, treeView.container, localNav.homeInfo);
            }else {
            }
        });
        // 查询机房并更新source
        var homeSource = [];
        findHome();
        // 定义机房查询信息
        $( "#popupHomeName" ).autocomplete({
            source: homeSource,
            select: function(event, ui) {
                localNav.homeInfo = ui.item;    // 设置机房信息内容
            }
        });
        // 查询机房
        function findHome() {
            var tmp = {
                StationName1:'',
                StationName2: ''
            };
            // 查询将信息
            $.post("BattInfAction!serchStationName3","json="+JSON.stringify(tmp),function(result){
                var rs = JSON.parse(result.result);
                if(rs.code==1){
                    homeSource = [];
                    var data = rs.data;
                    for(var i=0; i<data.length; i++) {
                        var _data = data[i];
                        var tmp = {
                            label: _data.StationName+'('+_data.StationId+')',
                            province: _data.StationName1,
                            city: _data.StationName2,
                            home: _data.StationName,
                            homeid: _data.StationId,
                            battid: undefined
                        };
                        // 添加到资源
                        homeSource.push(tmp);
                    }
                    $( "#popupHomeName" ).autocomplete('option', 'source', homeSource);
                }
            });
        }
    });
</script>
</html>
gx_tieta/WebRoot/control.jsp
@@ -823,7 +823,7 @@
                <table>
                    <tbody>
                        <tr>
                            <th>机房名称</th>
                            <th>机房名称/机房id</th>
                        </tr>
                        <tr>
                            <td>
gx_tieta/WebRoot/js/popup.js
@@ -8,7 +8,10 @@
Popup.prototype.showPopup = function() {
    var winHt = $(window).height();
    var popupMask = $('<div class="popup-mask"></div>');
    $('body').append(popupMask);
    if($('body .popup-mask').length == 0) {
        $('body').append(popupMask);
    }
    $('.popup-mask').animate({height: winHt+"px"});
    this.centerPopup();
    this.popup.css('visibility', 'visible');