从告警页面跳到机房问题记录页面时底层页面不查询 弹窗关闭后再查询问题记录

whychw

2020-04-29 afcd63d57e5158ee86516a10eb85e0d69c652e34

从告警页面跳到机房问题记录页面时底层页面不查询 弹窗关闭后再查询问题记录

 gx_tieta/WebRoot/batt-fault-manage.jsp

@@ -200,6 +200,12 @@
            pageSize:10,

            pageAll:0

        };



    var searchFlag = true;

    // 如果是从告警页面跳转过来的 先不执行查询 关闭问题记录窗之后再更新为可查询

    if (popFlag) {

      searchFlag = false;

    }

        

        // 应用layui框架

        layui.use(['layer', 'table', 'form', 'laytpl', 'element','jquery'],function() {

@@ -270,6 +276,13 @@
                  resize: false,

                  maxmin: true,

                  content: 'iframe/batt-fault-manage-add1.html' + searchStr

                  ,cancel: function (index, layero) {

                    searchFlag = true;

                    // if(confirm('关闭吗？')) {

                    //   layer.close(index);

                    // }

                    // return false;

                  }

                });

              }

            });

@@ -705,6 +718,12 @@
            //  查询故障内容

            function searchfault()

            {

          // searchFlag 
          // 当从告警页跳转过来 searchFlag为false 不执行查询

          // 当问题记录窗关闭时 searchFlag为true 可执行查询

          if (!searchFlag) {

            return false;

          }

                var sData = tempCondition(); 

                var load = layer.load(1);

                tOptions.data = [];


 gx_tieta/WebRoot/iframe/batt-fault-manage-add1.html

@@ -265,6 +265,8 @@
                        layer.close(load);

                        layer.closeAll();

                        layer.msg('上传成功！3秒后自动关闭')    ;

                        // 父页面 查询标志位更新 可以查询

                        parent.searchFlag = true;

                        setTimeout(function() {

                            closePage.click();

                        }, 3000);

@@ -272,6 +274,7 @@
                    error:function(e){

                        layer.close(load);

                        layer.msg('上传失败！')    ;

                        parent.searchFlag = true;

                    }                

                });

            }