修改内容

hdw

2018-10-26 5185279bbb5de67e2c67d04623e73955d6fe366e

修改内容

 gx_tieta/WebRoot/control.jsp

@@ -113,6 +113,12 @@
        .w400 {

            width: 400px;

        }

        .w500 {

            width: 500px;

        }

        .mr250 {

            margin-left: -250px;

        }

    </style>

    

  </head>  

@@ -127,6 +133,13 @@
        <table>

            <tr>

                <td id="ele_content">

                    <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">

                        

@@ -802,6 +815,32 @@
        </div>

    </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>机房名称</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="confirm">

        <div class="confirm-header"><span>最大内阻单体（前10）</span><a href="javascript:closeConfirm();" class="close">X</a></div>

@@ -905,6 +944,7 @@
        var equip61850_popup = new Popup($('#equip61850'));

        var BTS_popup = new Popup($('#bts'));

        var equip4016_popup = new Popup($('#equip4016'));

        var localNav = new Popup($('#localNav'));

        // 充放电弹出框设置

        $(function() {

            // 初始化LD9充放电弹出框

@@ -927,12 +967,18 @@
                equip4016_popup.hidePopup();    // 隐藏61850弹出框和遮罩层

            });

            

            // 初始化localNav弹出框

            $('#localNav').find('.close').bind('click', function() {

                localNav.hidePopup();    // 隐藏localNav弹出框和遮罩层

            });

			
            // 窗口大小改变

            $(window).resize(function() {

                LD9_popup.hidePopup();    // 隐藏LD9弹出框和遮罩层

                equip61850_popup.hidePopup();    // 隐藏61850弹出框和遮罩层

                BTS_popup.hidePopup();    // 隐藏bts弹出框和遮罩层

                equip4016_popup.hidePopup();    // 隐藏4016弹出框和遮罩层

                localNav.hidePopup();

            });

        });

        //初始化柱状图

@@ -1452,7 +1498,7 @@
                        _str = GLOBAL.circleStatus.BTSCircle(batt, model, mygraph, updateEleCircle);

                    }

                    //console.log(mygraph);

                    debugger;

                    //debugger;

                    if(model.code == 1) {

                        var nowTime = new Date().getTime();        //当前时间

                        var record = new Date(model.data[0].record_datetime).getTime();

@@ -3884,6 +3930,14 @@
            $('.confirm-mask').hide();

        }

        

        // 机房定位面板数据查询

        $(function() {

			
			
        });

		
		
		
        // siderbar模块

        $(function() {

            var TreeView = GLOBAL.pages.TreeView;

@@ -3985,7 +4039,7 @@
                       var disX=(e||event).clientX+10;            //得到鼠标点击X的位置

                      var disY=(e||event).clientY+10;            //得到鼠标点击Y的位置

                      var scrollY=$(window).scrollTop();        //获取浏览器滚动的高度

                    console.log(scrollY);

                    //console.log(scrollY);

                      var oRightMenu=document.getElementById("right_menu");

                      

                      $(this).click();

@@ -3994,7 +4048,7 @@
                      $("#right_menu").show();

                      $("#right_menu .more_menu").hide();

                      $("#right_menu .angle").hide();

                      console.log(disX+"***"+disY);

                      //console.log(disX+"***"+disY);

                      //使菜单跟随鼠标位置

                      oRightMenu.style.left= disX+'px';

                      oRightMenu.style.top= disY+scrollY+'px';

@@ -4009,6 +4063,47 @@
                treeView.ele.find('li').removeClass('sider-menu-open');

            });

            

            // 工具条整体样式

            $('.siderbar-tools').tooltip();

			
            // 工具条-机历卡

            $('#siderbarToolsCard').click(function(){

                var batt = getBatt();

                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 {

					
                }

            });

			 
            // 电池充放电数据监控

            var batt_list = $('#ele_content .batt-listen .batt-list');

            batt_list.on('click', 'a', function(){

@@ -4022,10 +4117,55 @@
                    home: battInfo.home,

                    homeid: battInfo.note,

                    battid: battInfo.val

                }

                };

                

                localSideBar(treeView, treeView.container, tmp);

            });

			
            // 查询机房并更新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>

    <script type="text/javascript" src="js/Title.js"></script>


 gx_tieta/WebRoot/css/common.css

@@ -73,6 +73,30 @@
    display: none;

}



/* siderbar tools */

.siderbar-tools {

    position: relative;

    height: 30px;

    background-color: #3c3f4a;

}

.siderbar-tools-right {

    position: absolute;

    top: 5px;

    right: 8px;

    font-size: 16px;

}

.siderbar-tools-right i {

    margin-left: 8px;

    color: #C5C6C9;

}

.siderbar-tools-right i:hover {

    color: #FFFFFF;

}

.siderbar-tools-right i:active {

    color: #FF0000;

}





.tpl-tbl-opts-tbl {

    margin-top: -20px;

    margin-left: -15px;

@@ -96,4 +120,16 @@
.tpl-tbl-opts-header table td {

    text-align: center;

    border: 1px solid #ccc;

}



/* jquery ui style */

body .ui-front {

    z-index: 999999;

}



body .ui-autocomplete {

    max-height: 300px;

    overflow-y: auto;

    /* 防止水平滚动条 */

    overflow-x: hidden;

}

 gx_tieta/WebRoot/image/mapDefault.gif

 gx_tieta/WebRoot/index.jsp

@@ -370,6 +370,7 @@
    var search;

    var warnOpts;

    //console.info(BMap);

    var mapDefults = new Image().src = 'image/mapDefault.gif';

    var mapImages = getMapImageUrl();

    // 定义省-市资源内容

    var area = [

@@ -2203,7 +2204,7 @@
            data: "json="+JSON.stringify(mapPages),

            success: function(result) {

                var data = JSON.parse(result.result);

                //console.log(data);

                console.log(data);

                for(var i=0; i<data.length; i++) {

                    var _data = data[i];

                    var _list =  formatUpdateStation(_data);

@@ -2215,6 +2216,7 @@
                    }

                }

                

                console.log(updateStationData);

                createMapDot(map, updateStationData);

                

                // 更新分页信息

@@ -2865,6 +2867,7 @@
        rs.devalarm = "User_ChartAction!serchByInfo?json={Chart_file:'"+user_logo+"',Chart_name:chart_dev_alarm}";    // 设备告警

        rs.precharge = "User_ChartAction!serchByInfo?json={Chart_file:'"+user_logo+"',Chart_name:chart_pre_charge}";    // 预充电

        rs.float = "User_ChartAction!serchByInfo?json={Chart_file:'"+user_logo+"',Chart_name:chart_online_charge}";    // 浮充

        rs.defaults = mapDefults;

        return rs;

    }

    /* $(function(){

@@ -3143,6 +3146,9 @@
     function getMapStateImg(imgs, cla) {

         var rs = imgs.normal;

         switch(cla) {

             case 'item-normal':

                 rs = imgs.normal;

                 break

             case 'item-warn':    // 告警

                 rs = imgs.warn;

                 break;

@@ -3164,6 +3170,9 @@
             case 'item-pre_charge':    // 61850预充电

                 rs = imgs.precharge;

                 break;

             default:

                 rs = imgs.defaults;

                 break;

         }

         

         return rs;


 gx_tieta/WebRoot/js/base.js

@@ -380,7 +380,7 @@
        //data=eval("("+data+")");

        data=data.result;

        data=eval("("+data+")");

        console.info(data);

        //console.info(data);

        if(data.code==1){

            if(data.data.length>0){

                data=data.data[0];

@@ -390,7 +390,7 @@
                document.getElementById("batt_group_id").innerHTML=data.BattGroupId;            //电池组ip

                

                document.getElementById("BattGroupName").innerHTML=data.BattGroupName;            //电池组名称

                document.getElementById("BattGroupNum").innerHTML=data.BattGroupNum;            //电池组序号

                document.getElementById("BattGroupNum").innerHTML=data.GroupIndexInFBSDevice+1;            //电池组序号

                document.getElementById("BattProducer").innerHTML=data.BattProducer;            //电池品牌

                document.getElementById("BattModel").innerHTML=data.BattModel;                    //电池型号

                document.getElementById("MonCapStd").innerHTML=data.MonCapStd;                    //标称容量


 gx_tieta/WebRoot/js/popup.js

@@ -12,6 +12,8 @@
    $('.popup-mask').animate({height: winHt+"px"});

    this.centerPopup();

    this.popup.css('visibility', 'visible');

	
    $('body').css('overflow-y', 'hidden');

    //console.info('显示执行成功！！！');

};



@@ -24,6 +26,7 @@


Popup.prototype.hidePopup = function() {

    this.popup.css('top', -9999+'px');

    $('body').css('overflow-y', 'auto');

    $('.popup-mask').animate({height:0},function() {



        $('.popup-mask').remove();


 gx_tieta/WebRoot/pages/js/pages/siderbar.js

@@ -568,6 +568,8 @@
                    }

                    treeView.treeView(container, formatData);

                    if(spread) {

                        location.hash="#"+homeInfo.StationName;

                        location.hash="";

                        treeView.spreadFolder('home', homeInfo.StationName, thirdSpread, true);

                    }

                }