修复bug

hdw

2018-10-29 2421e7a75751f1f8e0fc58811a7abcfd8420c13d

修复bug

 gx_tieta/WebRoot/control.jsp

@@ -281,7 +281,13 @@
    <!-- 电池组机历卡详细信息-->

    <div id="card_infor">

        <span class="title-log"><s:text name="The_battery_pack_machine_through_the_card"/></span>                                        <!-- 电池组机历卡 -->

        <div class="con-list ele-infor con-show">

        <div id="cardInfoTab" class="whyc-tab-card">

            <ul class="whyc-tab-title">

                <li class="whyc-tab-this">电池组信息</li>

                <li class="">基站信息</li>

            </ul>

        </div>

        <div class="con-list ele-infor con-show" style="height: 400px;overflow-y: auto">

            <table>

                <tr>

                    <th id="card_infor_left"><s:text name="Parameter_name"/></th>            <!-- 参数名称 -->

@@ -358,6 +364,14 @@
                <tr>

                    <td><s:text name="Head"/></td>                                    <!-- 负责人 -->

                    <td></td>

                </tr>

            </table>

        </div>

        <div class="con-list ele-infor" style="height: 400px;overflow-y: auto">

            <table>

                <tr>

                    <th id="card_infor_left"><s:text name="Parameter_name"/></th>            <!-- 参数名称 -->

                    <th><s:text name="Parameter_value"/></th>                                <!-- 参数值 -->

                </tr>

            </table>

        </div>

@@ -4167,6 +4181,24 @@
            }

            

        });

		
        // 机历卡模块

        $(function() {

            // 获取选项卡列表

            var tabs = $('#cardInfoTab .whyc-tab-title li');

            var tabContents = $('#card_infor .con-list');

            // 点击tabs触发

            tabs.click(function() {

                var index = $(this).index();

                // 移除特效

                tabs.removeClass('whyc-tab-this');

                tabContents.removeClass('con-show');

				
                // 显示特效

                $(this).addClass('whyc-tab-this');

                tabContents.eq(index).addClass('con-show');

            });

        });

    </script>

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

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


 gx_tieta/WebRoot/ele-match-group.jsp

@@ -476,7 +476,7 @@
                            var formatData = [];

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

                                var __data = _data[i];

                                var tmp = treeView.getFolder(__data.StationName1, 'province', __data);

                                var tmp = treeView.getFolder(__data.StationName1, 'province', __data.StationName1, __data);

                                formatData.push(tmp);

                            }

                            treeView.treeView(container, formatData);

@@ -509,7 +509,7 @@
                            for(var i=0; i<_data.length;i++) {

                                var __data = _data[i];

                                var txt = '<input type="radio" name="city">'+ __data.StationName2;

                                var tmp = treeView.getFolder(txt, 'city', __data);

                                var tmp = treeView.getFolder(txt, 'city', __data.StationName2,__data);

                                formatData.push(tmp);

                            }

                            treeView.treeView(container, formatData);


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

@@ -65,7 +65,7 @@
    // 设置容器的宽度

    _prop.setContainer = function() {

        var eleWidth = this.ele.width();

        this.container.width(eleWidth+20);

        //this.container.width(eleWidth+20);

    };



    // 生成列表

@@ -88,7 +88,7 @@
            var _data = $.extend({}, defaults, data[i]);

            // 设置内容容器

            var _li = $('<li></li>');

            var _a = $('<a href="javascript:;" id="'+_data.txt+'" class="sider-menu-folder"></a>');

            var _a = $('<a href="javascript:;" id="'+_data.id+'" class="sider-menu-folder"></a>');

            var _i = $('<i class="fa fa fa-caret-right"></i>');

            var _span = $('<span class="treeview-txt">'+_data.txt+'</span>');

            if(_data.file) {

@@ -111,10 +111,11 @@
    };



    // 获取folder的一条数据

    _prop.getFolder = function (txt, cla,attr) {

    _prop.getFolder = function (txt, cla, id,attr) {

        var tmp = {};

        tmp.txt = txt;

        tmp.cla = cla;

        tmp.id = id;

        tmp.attr = attr;

        return tmp;

    };

@@ -237,7 +238,7 @@
                    var formatData = [];

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

                        var __data = _data[i];

                        var tmp = treeView.getFolder(__data.StationName1, 'province', __data);

                        var tmp = treeView.getFolder(__data.StationName1, 'province', __data.StationName1,__data);

                        formatData.push(tmp);

                    }

                    treeView.treeView(container, formatData);

@@ -279,7 +280,7 @@
                    var formatData = [];

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

                        var __data = _data[i];

                        var tmp = treeView.getFolder(__data.StationName2, 'city', __data);

                        var tmp = treeView.getFolder(__data.StationName2, 'city', __data.StationName2, __data);

                        formatData.push(tmp);

                    }

                    treeView.treeView(container, formatData);

@@ -324,7 +325,7 @@
                    var formatData = [];

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

                        var __data = _data[i];

                        var tmp = treeView.getFolder(__data.StationName, 'home', __data);

                        var tmp = treeView.getFolder(__data.StationName, 'home', __data.StationName,__data);

                        formatData.push(tmp);

                    }

                    treeView.treeView(container, formatData);

@@ -480,7 +481,7 @@
                    var formatData = [];

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

                        var __data = _data[i];

                        var tmp = treeView.getFolder(__data.StationName1, 'province', __data);

                        var tmp = treeView.getFolder(__data.StationName1, 'province', __data.StationName1,__data);

                        formatData.push(tmp);

                    }

                    treeView.treeView(container, formatData);

@@ -520,7 +521,7 @@
                    var formatData = [];

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

                        var __data = _data[i];

                        var tmp = treeView.getFolder(__data.StationName2, 'city', __data);

                        var tmp = treeView.getFolder(__data.StationName2, 'city', __data.StationName2, __data);

                        formatData.push(tmp);

                    }

                    treeView.treeView(container, formatData);

@@ -563,7 +564,7 @@
                    var formatData = [];

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

                        var __data = _data[i];

                        var tmp = treeView.getFolder(__data.StationName, 'home', __data);

                        var tmp = treeView.getFolder(__data.StationName, 'home', __data.StationName, __data);

                        formatData.push(tmp);

                    }

                    treeView.treeView(container, formatData);