修复弹出框全屏bug 基站信息验收实时查询 添加查看机房环境的按钮
6个文件已修改
163 ■■■■ 已修改文件
gx_tieta/WebRoot/batch-set-curr.jsp 48 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
gx_tieta/WebRoot/ex-battinfo.jsp 52 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
gx_tieta/WebRoot/iframe/homeinfo.html 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
gx_tieta/WebRoot/mobil/map.html 5 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
gx_tieta/WebRoot/pages/js/mylayui.js 29 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
gx_tieta/WebRoot/pages/js/pages/homeInfo.js 25 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
gx_tieta/WebRoot/batch-set-curr.jsp
@@ -152,6 +152,15 @@
                <table id="pageTbl" lay-filter="pageTbl"></table>
            </div>
        </div>
        <script type="text/html" id="setStatus">
            {{# if(d.setCurr == 1){ }}
                <button class="layui-btn layui-btn-sm layui-btn-warm">设置放电参数成功</button>
            {{# }else if(d.setCurr == 2){ }}
                <button class="layui-btn layui-btn-sm layui-btn-danger">设置放电参数失败</button>
            {{# }else { }}
                <button class="layui-btn layui-btn-sm layui-btn-normal">未设置放电参数</button>
            {{# } }}
        </script>
        <script type="text/javascript" src="js/jquery-1.8.3.js"></script>
        <script type="text/javascript" src="js/echarts.js"></script>
        <script type="text/javascript" src="jqueryui/jquery-ui.min.js"></script>
@@ -415,6 +424,7 @@
                        ,{field:'station_phone', title:'基站手机号码', align:'center', width: 140}
                        ,{field:'BattProducer', title:'电池品牌', align:'center', width: 140}
                        ,{field:'BattModel', title:'电池型号', align:'center', width: 260}
                        ,{field:'doThings', fixed: 'right', title: '设置状态', toolbar: '#setStatus', align: 'center', width: 160}
                    ]]
                    ,data:[]
                    ,limit: 20
@@ -427,9 +437,6 @@
                
                // 更新表格的对象
                var layuiTbl = new LayuiTbl(tOptions, layui, laytpl, table.cache.pageTbl);
                // 查询后台数据
                
                // 点击添加电池组
                $('#batchAdd').click(function() {
@@ -455,25 +462,24 @@
                        ,data: 'json='+JSON.stringify(temp)
                        ,dataType: 'json'
                        ,success: function(res) {
                            console.log(res);
                            // console.log(res);
                            var rs = JSON.parse(res.result);
                            var data = [];
                            if(rs.code == 1) {
                                var data = rs.data;
                                console.log(data);
                                tOptions.data = data;
                                // 生成表格数据
                                table.render(tOptions);
                                data = rs.data;
                            }else {
                                layer.msg('没有可设置的电池组!');
                            }
                            tOptions.data = data;
                               // 生成表格数据
                            table.render(tOptions);
                        }
                        ,complete:function() {
                            layer.close(load);
                        }
                    });
                }
                
                // 点击添加构造查询
                function structAddData() {
@@ -513,6 +519,26 @@
                    }
                    return rs;
                }
                // 点击批量设置放电电流参数
                $('#batchSetCurr').click(function() {
                    var checkStatus = table.checkStatus('pageTbl');
                    var data = checkStatus.data;
                    if(data.length == 0) {
                        layer.msg('请选择要设置的机房');
                        return;
                    }
                    // console.log(data);
                    // 设置放电参数
                    getDisCurrParam(data);
                });
                // 获取放电参数
                function getDisCurrParam(data) {
                    console.log(data);
                    var data = GetHourRate();
                }
            });
        </script>
    </body>
gx_tieta/WebRoot/ex-battinfo.jsp
@@ -77,15 +77,21 @@
                </div>
            </div>
        </div>
        <!-- 机房面板信息面板信息 -->
        <div id="homeInfoIframeData"></div>
        <!-- 审核操作栏 -->
        <script type="text/html" id="battGrouptools">
            <a class="layui-btn layui-btn-xs" lay-event="adopt">审核</a>
        </script>
        <script type="text/html" id="acceptBattGroupTools">
            {{# if(d.check_en !=2){ }}
                <a class="layui-btn layui-btn-xs layui-btn-disabled" lay-event="accepted">验收</a>
            {{# if(d.check_en ==0){ }}
                <a class="layui-btn layui-btn-xs layui-btn-disabled" lay-event="accepted">待申请</a>
            {{# }else if(d.check_en ==1) { }}
                <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>
            {{# } }}
            <a class="layui-btn layui-btn-xs layui-bg-blue" lay-event="look">机房环境</a>
            <a class="layui-btn layui-btn-xs layui-bg-blue" lay-event="control">实时查询</a>
        </script>
        <script type="text/html" id="applyEn">
@@ -122,6 +128,7 @@
        <script type="text/javascript" src="src/layui.js"></script>
        <script type="text/javascript" src="pages/js/mylayui.js"></script>
        <script type="text/javascript" src="pages/js/common.js"></script>
        <script type="text/javascript" src="pages/js/pages/homeInfo.js"></script>
        <script type="text/javascript">
            layui.use(['form', 'table', 'layer', 'element'], function() {
                /* 页面导入layui模块 */
@@ -129,6 +136,7 @@
                var form = layui.form;            // 获取表单模块
                var layer = layui.layer;        // 获取弹出框模块
                var element = layui.element;    // 获取元素操作模块
                var laytpl = layui.laytpl;        // 获取模板操作模块
                
                /* 分页信息模块 */
                var Page = new TblPage();    // 实例化TblPage对象--验收的的审核信息
@@ -276,7 +284,7 @@
                        ,{field:'apply_date', title:'申请日期', align:'center', width: 260}
                        ,{field:'confirm_name', title:'审核人', align:'center', width: 120}
                        ,{field:'check_uname', title:'验收人', align:'center', width: 120}
                        ,{field:'doThings', fixed: 'right', title:'验收操作', align: 'center', toolbar: '#acceptBattGroupTools', width:180}
                        ,{field:'doThings', fixed: 'right', title:'验收操作', align: 'center', toolbar: '#acceptBattGroupTools', width:240}
                    ]]
                    ,data:[]
                    ,limit: 10000
@@ -287,6 +295,8 @@
                // 生成表格数据
                table.render(acceptOptions);
                
                // 更新表格的对象
                var layuiTbl = new LayuiTbl(acceptOptions, layui, laytpl, table.cache.acceptTbl);
                
                // 审批操作栏
                table.on('tool(pageTbl)', function(obj) {
@@ -311,6 +321,9 @@
                        break;
                        case 'control':
                            controlPage(obj.data);
                        break;
                        case 'look':
                            lookHomeInfo(obj.data);
                        break;
                    }
                });
@@ -477,6 +490,26 @@
                    window.open(url);
                }
                
                // 查看机房信息
                function lookHomeInfo(data) {
                    var sid = data.StationId;
                    var tabC = [
                        {
                            type: 'env'
                            ,title: '基站环境短视频'
                            ,tshow: ''
                            ,cshow: ''
                        }
                        ,{
                            type: 'envImg'
                            ,title: '基站环境图集'
                            ,tshow: 'layui-this'
                            ,cshow: 'layui-show'
                        }
                    ];
                    showHomeInfoIframe(sid, tabC);
                }
                // 查询后台数据
                search();
                function search() {
@@ -617,7 +650,7 @@
                        ,complete: function() {
                            layer.close(load);
                            // 启动自动刷新
                            //updateAcceptSearch();
                            updateAcceptSearch();
                        }
                    });
                }
@@ -661,10 +694,13 @@
                                acceptPage.setAll(0);
                            }
                            
                            $('#acceptNum').text(getAcceptHome(resData));     // 设置徽章
                            acceptOptions.data = resData;        // 设置表格的数据
                            // 生成表格数据
                            table.reload('acceptTbl', acceptOptions);
                            // 遍历data的值更新数据
                            for(var i=0; i<resData.length; i++) {
                                var _resData = resData[i];
                                _resData.doThings = '';
                                layuiTbl.updateTr(i, _resData);
                            }
                            // 实时回调
                            updateAcceptSearch.timer = setTimeout(updateAcceptSearch, 4000);
                        }
gx_tieta/WebRoot/iframe/homeinfo.html
@@ -288,7 +288,7 @@
                    </table>
                </div>
                {{# }else if(item.type == 'env'){ }}
                    <div class="layui-tab-item">
                    <div class="layui-tab-item {{ item.cshow }}">
                        <div id="video" style="width: 100%;height: 100%;"></div>
                        <div id="videos" class="video-list">
                            <div class="video-list-container">
@@ -338,7 +338,7 @@
                        </div>
                    </div>
                {{# }else if(item.type == 'envImg'){ }}
                    <div class="layui-tab-item">
                    <div class="layui-tab-item {{ item.cshow }}">
                        <div class="layui-carousel" id="imgCarousel" lay-filter="imgCarousel">
                              <div carousel-item="" class="carousel-item" id="carouselItems"></div>
                        </div>
gx_tieta/WebRoot/mobil/map.html
@@ -280,6 +280,7 @@
                ,anim: 4
                ,content: 'iframe/homeinfo.html'
            });
            layer.full(iframePopup);
        }
        
        // 点击筛选弹出内容
@@ -293,6 +294,7 @@
                ,anim: 4
                ,content: 'iframe/homeinfo.html'
            });
            layer.full(iframePopup);
        });
        // 搜索机房获取焦点
@@ -307,6 +309,7 @@
                ,anim: 5
                ,content: 'iframe/searchHome.html'
            });
            layer.full(iframePopup);
        });
        
        // 查询机房
@@ -530,6 +533,7 @@
                ,anim: 4
                ,content: 'iframe/homeinfo.html'
            });
            layer.full(iframePopup);
        }
        
        // 删除地图图标
@@ -738,6 +742,7 @@
                ,anim: 4
                ,content: 'iframe/seenhomeinfo.html'
            });
            layer.full(iframePopup);
        }
        
        // 显示地图提示面板
gx_tieta/WebRoot/pages/js/mylayui.js
@@ -405,14 +405,28 @@
        var layui = this.layui;
        
        var preData = this.cache[index];
        var _data = $.extend(preData, data||{});
        var _data = $.extend(preData||{}, data||{});
        var tds = this._getBodyTds(index);
        console.log(preData);
        var tdRs = this._getFixedRTds(index);
        //console.log(_data);
        // 遍历
        var _this = this;
        layui.each(_data, function(key, value) {
            // 遍历tds的值
            tds.each(function() {
            tds.each(function(k) {
                var _field = $(this).data('field');
                if(key == _field) {
                    var cell = $(this).find('.layui-table-cell');
                    var content = _this._getContent(key, value, _data);
                    cell.html(content);
                }
            });
        });
        // 修改浮动
        layui.each(_data, function(key, value) {
            // 遍历tds的值
            tdRs.each(function(k) {
                var _field = $(this).data('field');
                if(key == _field) {
                    var cell = $(this).find('.layui-table-cell');
@@ -429,6 +443,12 @@
        return trList.eq(index).find('td');
    }
    ,_getFixedRTds: function(index) {
        var layuiTableView = $(this.ele).next('.layui-table-view');
        var layuiFixedR = layuiTableView.find('.layui-table-fixed.layui-table-fixed-r .layui-table tbody');
        var trList = layuiFixedR.find('tr');
        return trList.eq(index).find('td');
    }
    ,_getContent: function(key, value, data) {
        var col = this.col;             //  所有的列
        var laytpl = this.tpl;
@@ -440,7 +460,8 @@
            // 判断当前内容是否为对应的需要更新的数据
            if(key == _col.field) {
                // 判断是否有模板
                templet = _col.templet?$(_col.templet).html():_col.toolbar?$(_col.toolbar).html():value;
                templet = _col.templet?$(_col.templet).html():_col.toolbar?$(_col.toolbar).html():value.toString();
                //console.log(templet);
                // 根据模板构成content
                laytpl(templet).render(data, function(html) {
                    rs = html;
gx_tieta/WebRoot/pages/js/pages/homeInfo.js
@@ -207,4 +207,27 @@
    
    // 返回结果集
    return rs;
}
}
// 显示机房信息
function showHomeInfoIframe(sid, data) {
    var rs = {
        sid: sid,
        tabc:data
    };
    $('#homeInfoIframeData').data('data', rs);
    // 显示面板
    layer.open({
        type: 2,
        title: '<i class="fa fa-home"></i>基站信息',
        area: ['960px', '524px'],
        btn:['重置面板'],
        fixed: true, //不固定
        maxmin: true,
        content: 'iframe/homeinfo.html',
        yes:function(index) {
            layer.iframeSrc(index, 'iframe/homeinfo.html');
        }
    });
}