Merge branch 'master' of http://192.168.1.136:82/monitor_v3/hg-monitor-web

@@ -469,7 +469,7 @@ layui.define(['table', 'form', 'laydate', 'admin', 'layer', 'laytpl', 'common',
                     , icon: 1
                     , time: 1000
                 },function () {
-                    reloadTable();
+                //     reloadTable();
                 });
             }).error(function (error) {
                 console.error(error);

@@ -21,9 +21,9 @@
             <button class="layui-btn layui-btn-sm layui-btn-normal" id="reporttype-create">
               <i class="layui-icon">&#xe654;</i>新增
             </button>
-            <button class="layui-btn layui-btn-sm layui-btn-normal" id="btn-reporttype-delete">
-              <i class="layui-icon">&#xe640;</i>删除
-            </button>
+<!--            <button class="layui-btn layui-btn-sm layui-btn-normal" id="btn-reporttype-delete">-->
+<!--              <i class="layui-icon">&#xe640;</i>删除-->
+<!--            </button>-->
           </div>
           <table id="reporttype-table" lay-filter="reporttypetable"></table>
         </div>
@@ -34,7 +34,7 @@
 
 <!--新增/编辑弹出框-->
 <script type="text/html" id="reporttypeEdit">
-    <form class="layui-form layui-form-pane" action="" lay-filter="form-reporttype-edit" id="form-reporttype-edit">
+    <form class="layui-form layui-form-pane" action="" lay-filter="form-reporttype-edit" id="form-reporttype-edit" onsubmit="return false;">
       <input type="hidden" name="id">
       <fieldset class="layui-elem-field layui-field-title">
         <legend>基本信息</legend>