Merge branch 'xgmasrs' of https://gitee.com/luxiaotao1123/zy-asrs into xgmasrs

luxiaotao1123

2021-09-14 c6bc9682699d3e10dc06a3d6641a70179e64f9a1

 src/main/webapp/static/js/report/stayTime.js

@@ -120,6 +120,14 @@
        pageCurr = 1;
        tableReload(false);
    });

    // 搜索栏重置事件
    form.on('submit(reset)', function (data) {
        pageCurr = 1;
        clearFormVal($('#search-box'));
        tableReload(false);
    });

});

// 关闭动作
@@ -132,8 +140,9 @@
    $.each($('#search-box [name]').serializeArray(), function() {
        searchData[this.name] = this.value;
    });

    (child ? parent.tableIns : tableIns).reload({
        where: searchData,
        where:searchData,
        page: {
            curr: pageCurr
        },