Merge branch 'master-500-dev-joke' into 'master-500-dev'

指标组管理页面优化

指标组管理页面优化

See merge request !745

@@ -149,7 +149,7 @@ layui.define(['table', 'form', 'laydate', 'common', 'sessions', 'laydate', 'elem
       }]],
       done: function (res, curr, count) {
         form.render();
-        $(".layui-table-body, .layui-table-box, .layui-table-cell").css('overflow', 'visible');
+        $(".kpiflag-edit-table .layui-table-body,.kpiflag-edit-table .layui-table-box,.kpiflag-edit-table .layui-table-cell").css('overflow', 'visible');
         // 排序下拉框改变事件
         form.on('select(select-kpiflag-table-isSort)', function (data) {
           var index = $(data.elem).data('index');

@@ -52,13 +52,12 @@ layui.define(['table', 'form', 'admin', 'layer', 'common', 'sessions', "commonDe
                 keyWord: $("#kpiflag_keyword").val(),
                 dimension: $('select[name="dimension"]').val()
             }
-            , height: 'full-340'
+            , height: 'full-200'
             , cellMinWidth: 80
             , page: {
                 layout: ['count', 'prev', 'page', 'next', 'limit', 'skip']
                 , theme: '#1E9FFF'
             }
-            , limit: 10
             , even: true
             , cols: [[
                 {type: 'checkbox'}

@@ -49,7 +49,7 @@
         <button class="layui-btn layui-btn-xs layui-btn-normal fieldset-btn" id="btn-kpiflag-kpi-bind"><i class="layui-icon">&#xe624;</i></button>
       </legend>
     </fieldset>
-    <div class="layui-form-item layui-form-item-flex">
+    <div class="layui-form-item layui-form-item-flex kpiflag-edit-table">
       <table id="kpiflag-edit-table" class="input-flex-1"></table>
     </div>
     <div class="layui-form-item layui-form-item-flex hide">

@@ -10,7 +10,7 @@
                                 <div class="layui-inline">
                                     <div class="layui-input-inline layui-input-inline--long">
                                         <input type="text" id="kpiflag_keyword" name="kpiflag_keyword" placeholder="输入关键字，回车搜索" autocomplete="off"
-                                               lay-tips="关键字检索包含： </br>指标组名称</br>flag</br>备注</br>绑定资源类型"
+                                               lay-tips="关键字检索包含： </br>指标组名称</br>flag</br>备注</br>绑定资源类型</br>绑定指标"
                                                class="layui-input">
                                         <input type="text" style="display: none">
                                     </div>