Merge branch 'master' of http://101.37.171.70:10101/r/MESWMS-LayUI

yusijie

2023-08-16 042cd7abea3b3c2fbe0de8f28c19d3ceb3c24c0e

 WebTM/views/³µ¼ä¹ÜÀí/±¨±í·ÖÎö/SC_DayRkReport.html

@@ -97,8 +97,8 @@
                        <table class="" id="mainTable1" lay-filter="mainTable1"></table>
                        <script type="text/html" id="toolbarDemo">
                            <div class="layui-btn-container">
                                <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-exit"><i class="layui-icon layui-icon-return"></i>退出</button>
                                <button type="button" class="layui-btn layui-btn-sm" lay-event="HideColumn"><i class="layui-icon layui-icon-form"></i>隐藏列设置</button>
                                <!--<button type="button" class="layui-btn layui-btn-sm" lay-event="btn-exit"><i class="layui-icon layui-icon-return"></i>退出</button>
    <button type="button" class="layui-btn layui-btn-sm" lay-event="HideColumn"><i class="layui-icon layui-icon-form"></i>隐藏列设置</button>-->
                            </div>
                        </script>
                    </form>
@@ -243,7 +243,7 @@
                            }
                            option = {
                                elem: '#mainTable'
                                //, toolbar: '#toolbarDemo'
                                , toolbar: '#toolbarDemo'
                                , cellMinWidth: 120
                                , limit: Number.MAX_VALUE // æ•°æ®è¡¨æ ¼é»˜è®¤å…¨éƒ¨æ˜¾ç¤º
                                , height: 500
@@ -314,7 +314,7 @@
                            }
                            option = {
                                elem: '#mainTable1'
                                //, toolbar: '#toolbarDemo'
                                , toolbar: '#toolbarDemo'
                                , cellMinWidth: 120
                                , limit: Number.MAX_VALUE // æ•°æ®è¡¨æ ¼é»˜è®¤å…¨éƒ¨æ˜¾ç¤º
                                , height: 500