修改头部信息

hdw

2018-12-26 208e6450a75b053c5fb71ffafcdd21b178c4899d

修改头部信息

 gx_tieta/WebRoot/Top.jsp

@@ -64,24 +64,24 @@
            <div class="batt-state">

            

                <div class="list">

                    <div class="list-contain"><s:text name='Power_cut'/><s:text name='Computer_room'/><s:text name='Num'/>:<a href="batt-state-manage.jsp?station_state=2" class="badge default" id="poweroff_num"><span class="num">0</span>/<span class="dev-num">0</span></a></div>        <!-- 机房停电数 -->

                    <div class="list-contain"><s:text name='Power_cut'/><s:text name='Computer_room'/><s:text name='Num'/>:<a href="batt-state-manage.jsp?station_state=2" class="badge default" id="poweroff_num"><span class="num">0</span></a></div>        <!-- 机房停电数 -->

                </div>

                <div class="list">

                    <div class="list-contain">续航不足机房数:<a href="batt-life-manage.jsp?is_stand=1" class="badge default" id="weak_home"><span class="num">0</span>/<span class="dev-num">0</span></a></div>        <!-- 机房续航不足数 -->

                    <div class="list-contain">续航不足机房数:<a href="batt-life-manage.jsp?is_stand=1" class="badge default" id="weak_home"><span class="num">0</span></a></div>        <!-- 机房续航不足数 -->

                </div>

                <div class="list">

                    <div class="list-contain"><s:text name="Batt"/><s:text name="Alarm"/><s:text name="Num"/>:<a href="elewarn.jsp" class="badge danger" id="batt_alarm_num"><span class="num">0</span>/<span class="batt-num">0</span></a></div>                                <!-- 电池告警数 -->

                    <div class="list-contain"><s:text name="Batt"/><s:text name="Alarm"/><s:text name="Num"/>:<a href="elewarn.jsp" class="badge danger" id="batt_alarm_num"><span class="num">0</span></a></div>                                <!-- 电池告警数 -->

                </div>

                <div class="list">

                    <div class="list-contain"><s:text name="Capacity"/><s:text name="Behind_number_monomer"/>:<a href="taskplan.jsp" class="badge default" id="batt_low_num"><span class="num">0</span>/<span class="batt-num">0</span></a></div>                                                            <!-- 落后单体数 -->

                    <div class="list-contain"><s:text name="Capacity"/>落后单体数:<a href="taskplan.jsp" class="badge default" id="batt_low_num"><span class="num">0</span></a></div>                                                            <!-- 落后单体数 -->

                </div>

                <div class="list">

                    <div class="list-contain"><s:text name="Equipment"/><s:text name="Alarm"/><s:text name="Num"/> :<a href="equipWarn1.jsp" class="badge danger" id="dev_alarm_num"><span class="num">0</span>/<span class="dev-num">0</span></a></div>                        <!-- 设备告警数 -->

                    <div class="list-contain"><s:text name="Equipment"/><s:text name="Alarm"/><s:text name="Num"/> :<a href="equipWarn1.jsp" class="badge danger" id="dev_alarm_num"><span class="num">0</span></a></div>                        <!-- 设备告警数 -->

                </div>

                

                <div class="list">

                    <div class="list-contain">

                        核容测试设备数:<a href="javascript:void(0);" class="badge default" id="nuclear_test"><span class="num">0</span>/<span class="dev-num">0</span></a>

                        核容测试设备数:<a href="javascript:void(0);" class="badge default" id="nuclear_test"><span class="num">0</span></a>

                    </div>

                </div>

            </div>

@@ -136,6 +136,10 @@
                </div>

                <div class="cell-list server-time" style="white-space: nowrap">                    

                    2018-11-26 00:00:00

                </div>

                <div class="cell-list batt-count" style="white-space: nowrap; color: #FF0000;">

                    电池总数：<span class="batt-num">0</span>&nbsp;,&nbsp;机房总数：<span class="dev-num">0</span>

					
                </div>            

            </div>

            <div class="international">

@@ -367,7 +371,8 @@
                var rs = JSON.parse(res.result);

                if(rs.code == 1) {

                    var sum = rs.sum;

                    $('.batt-state .dev-num').text(sum);

                    $('.cell-list.batt-count .dev-num').text(sum);

                    // $('.batt-state .dev-num').text(sum);

                }

                

                // 延时执行

@@ -389,7 +394,8 @@
                var rs = JSON.parse(res.result);

                if(rs.code == 1) {

                    var sum = rs.sum;

                    $('.batt-state .batt-num').text(sum);

                    $('.cell-list.batt-count .batt-num').text(sum);

                    //$('.batt-state .batt-num').text(sum);

                }

                // 延时执行

                setTimeout(searchAllEleGroupNum, 5000);


 gx_tieta/WebRoot/ex-battinfo.jsp

@@ -81,7 +81,7 @@
            <a class="layui-btn layui-btn-xs" lay-event="adopt">审核</a>

        </script>

        <script type="text/html" id="acceptBattGroupTools">

            {{# if(d.check_en){ }}

            {{# if(d.check_en !=2){ }}

                <a class="layui-btn layui-btn-xs layui-btn-disabled" lay-event="accepted">验收</a>

            {{# }else { }}

                <a class="layui-btn layui-btn-xs layui-bg-blue" lay-event="accept">验收</a>

@@ -96,10 +96,12 @@
            {{# } }}

        </script>

        <script type="text/html" id="acceptEn">

            {{# if(d.check_en){ }}

            {{# if(d.check_en == 1){ }}

                <a class="layui-btn layui-btn-xs">已验收</a>

            {{# }else if(d.check_en == 2){ }}

                <a class="layui-btn layui-btn-danger layui-btn-xs">已申请验收</a>

            {{# }else{ }}

                <a class="layui-btn layui-btn-danger layui-btn-xs">待验收</a>

                <a class="layui-btn layui-btn-danger layui-btn-xs">待申请验收</a>

            {{# } }}

        </script>

        <script type="text/html" id="produceTime">

@@ -212,12 +214,12 @@
                        ,{field:'apply_name', title:'申请人', align:'center', width: 120}

                        ,{field:'apply_en', title:'申请状态', align:'center', templet: '#applyEn',width: 120}

                        ,{field:'apply_date', title:'申请日期', align:'center', width: 260}

                        ,{fixed: 'right', title:'审批操作', align: 'center', toolbar: '#battGrouptools', width:120}

                        ,{field:'doThings', fixed: 'right', title:'审批操作', align: 'center', toolbar: '#battGrouptools', width:120}

                    ]]

                    ,data:[]

                    ,limit: 10000

                    ,page: false

                    ,height: 'full-235'

                    ,height: 'full-10'

                };

                

                // 生成表格数据

@@ -267,11 +269,14 @@
                        ,{field:'isInstall', title:'安装状态', templet: '#isInstall', align:'center', width: 140}

                        ,{field:'install_user', title:'设备安装人员', align:'center', width: 260}

                        ,{field:'check_en', title:'验收状态', templet: '#acceptEn',align:'center', width: 120}

                        ,{field:'latitude', title:'经度', align:'center', width: 150}

                        ,{field:'longitude', title:'纬度', align:'center', width: 150}

                        ,{field:'address', title:'地址', align:'center', width: 230}

                        ,{field:'apply_name', title:'申请人', align:'center', width: 120}

                        ,{field:'apply_date', title:'申请日期', align:'center', width: 260}

                        ,{field:'confirm_name', title:'审核人', align:'center', width: 120}

                        ,{field:'check_uname', title:'验收人', align:'center', width: 120}

                        ,{fixed: 'right', title:'验收操作', align: 'center', toolbar: '#acceptBattGroupTools', width:180}

                        ,{field:'doThings', fixed: 'right', title:'验收操作', align: 'center', toolbar: '#acceptBattGroupTools', width:180}

                    ]]

                    ,data:[]

                    ,limit: 10000

@@ -399,6 +404,7 @@
                function acceptBattGroup(data) {

                    // 构造验收通过的机房的信息

                    var temp = [createAcceptParam(data)];

                    console.log(temp);

                    // 是否却确认验收

                    layer.confirm('是否确认验收', {icon: 3, title: '提示'}, function(index) {

                        layer.close(index);

@@ -413,8 +419,14 @@
                    var temp = {};

                    temp.binf = {};

                    Object.keys(data).forEach(function(key) {

                        if(key == 'num') {

                        if(key == 'num') {        // 主键

                            temp.num = data[key];

                        }else if(key == 'latitude'){        // 纬度

                            temp.latitude = data[key];

                        }else if(key == 'longitude'){        // 经度

                            temp.longitude = data[key];

                        }else if(key == 'address') {        // 地址

                            temp.address = data[key];

                        }else {

                            temp.binf[key] = data[key];

                        }

@@ -504,6 +516,8 @@
                        }

                        ,complete: function() {

                            layer.close(load);

                            // 启动自动刷新

                            //updateSearch();

                        }

                    });

                }

@@ -518,6 +532,48 @@
                    };

                    return temp;

                }

				
                // 更新审查表格

                function updateSearch() {

                    var temp = createSearchParam();

                    clearInterval(updateSearch.timer);

                    // 查询后台

                    $.ajax({

                        type: 'post'

                        ,async: true

                        ,url: "Battinf_applyAction!serchByCondition"

                        ,data: "json="+JSON.stringify(temp)

                        ,dataType: 'json'

                        ,success: function(res) {

                            //console.log(res);

                            var rs = JSON.parse(res.result);

                            var resData = [];

                            if(rs.code == 1) {

                                var data = rs.data;

                                // console.log(data);

                                // 遍历数据的值

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

                                    var _data = data[i];

                                    var _tmp = formaterResData(_data);

                                    resData.push(_tmp);

                                    Page.setAll(_data.apply_note);

                                }

                            }else {

                                Page.setAll(0);

                            }

                            $('#applyNum').text(Page.all);     // 设置徽章

                            tOptions.data = resData;    //  设置表格的数据

							
                            // 生成表格数据

                            table.reload('pageTbl', tOptions);

							
                            // 实时回调

                            updateSearch.timer = setTimeout(updateSearch, 4000);

                        }

                    });

                }

				
				
                

                // 查询待验收的机房

                acceptSearch();

@@ -538,7 +594,7 @@
                            var resData = [];

                            if(rs.code == 1) {

                                var data = rs.data;

                                // console.log(data);

                                //console.log(data);

                                // 遍历数据的值

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

                                    var _data = data[i];

@@ -556,10 +612,12 @@
                            

                            // 生成表格数据

                            table.render(acceptOptions);

							
                            console.log(table);

                        }

                        ,complete: function() {

                            layer.close(load);

                            // 启动自动刷新

                            //updateAcceptSearch();

                        }

                    });

                }

@@ -574,6 +632,45 @@
                    };

                    return temp;

                }

				
                // 更新验收表格

                function updateAcceptSearch() {

                    var temp = acceptSearchParam();

                    clearInterval(updateAcceptSearch.timer);

                    // 查询后台

                    $.ajax({

                        type: 'post'

                        ,async: true

                        ,url: "Battinf_applyAction!serchByCondition"

                        ,data: "json="+JSON.stringify(temp)

                        ,dataType: 'json'

                        ,success: function(res) {

                            var rs = JSON.parse(res.result);

                            var resData = [];

                            if(rs.code == 1) {

                                var data = rs.data;

                                // 遍历数据的值

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

                                    var _data = data[i];

                                    var _tmp = formaterResData(_data);

                                    resData.push(_tmp);

                                    acceptPage.setAll(_data.apply_note);

                                }

                                //console.log(resData);

                            }else {

                                acceptPage.setAll(0);

                            }

							
                            $('#acceptNum').text(getAcceptHome(resData));     // 设置徽章

                            acceptOptions.data = resData;        // 设置表格的数据

                            // 生成表格数据

                            table.reload('acceptTbl', acceptOptions);

                            // 实时回调

                            updateAcceptSearch.timer = setTimeout(updateAcceptSearch, 4000);

                        }

                    });

                }

				
                

                // 构造结果集

                function formaterResData(data) {

@@ -601,7 +698,7 @@
                    for(var i=0; i<data.length; i++) {

                        var _data = data[i];

                        // 判断是否被验收

                        if(!_data.check_en) {

                        if(_data.check_en != 1) {

                            num++;

                        } 

                    }


 gx_tieta/WebRoot/index.jsp

@@ -126,7 +126,7 @@
                        <div class="map-info-detail">

                            <div class="layui-collapse" lay-filter="test" lay-accordion="">

                                <div class="layui-colla-item">

                                    <h2 class="layui-colla-title">搜索机房</h2>

                                    <h2 class="layui-colla-title">筛选机房</h2>

                                    <div class="layui-colla-content layui-show">

                                        <table>

                                            <tbody>