monitor_v3 / hg-monitor-web · Commits

Go to a project

Authored by xwx
Commit 6e50a79faa8325ba36bbf3dfda07fcd43b87dbaa 2 parents 9f86312a 5846084b

Merge branch 'master-500-dev' of http://113.200.75.45:82/monitor_v3/hg-monitor-w… 

…eb into master-500-dev-xwx
Inline Side-by-side
Showing 4 changed files with 4 additions and 5 deletions
@@ -149,7 +149,7 @@ layui.define(['table', 'form', 'laydate', 'common', 'sessions', 'laydate', 'elem @@ -149,7 +149,7 @@ layui.define(['table', 'form', 'laydate', 'common', 'sessions', 'laydate', 'elem
149 }]], 149 }]],
150 done: function (res, curr, count) { 150 done: function (res, curr, count) {
151 form.render(); 151 form.render();
152 - $(".layui-table-body, .layui-table-box, .layui-table-cell").css('overflow', 'visible'); 152 + $(".kpiflag-edit-table .layui-table-body,.kpiflag-edit-table .layui-table-box,.kpiflag-edit-table .layui-table-cell").css('overflow', 'visible');
153 // 排序下拉框改变事件 153 // 排序下拉框改变事件
154 form.on('select(select-kpiflag-table-isSort)', function (data) { 154 form.on('select(select-kpiflag-table-isSort)', function (data) {
155 var index = $(data.elem).data('index'); 155 var index = $(data.elem).data('index');
@@ -52,13 +52,12 @@ layui.define(['table', 'form', 'admin', 'layer', 'common', 'sessions', "commonDe @@ -52,13 +52,12 @@ layui.define(['table', 'form', 'admin', 'layer', 'common', 'sessions', "commonDe
52 keyWord: $("#kpiflag_keyword").val(), 52 keyWord: $("#kpiflag_keyword").val(),
53 dimension: $('select[name="dimension"]').val() 53 dimension: $('select[name="dimension"]').val()
54 } 54 }
55 - , height: 'full-340' 55 + , height: 'full-200'
56 , cellMinWidth: 80 56 , cellMinWidth: 80
57 , page: { 57 , page: {
58 layout: ['count', 'prev', 'page', 'next', 'limit', 'skip'] 58 layout: ['count', 'prev', 'page', 'next', 'limit', 'skip']
59 , theme: '#1E9FFF' 59 , theme: '#1E9FFF'
60 } 60 }
61 - , limit: 10  
62 , even: true 61 , even: true
63 , cols: [[ 62 , cols: [[
64 {type: 'checkbox'} 63 {type: 'checkbox'}
@@ -49,7 +49,7 @@ @@ -49,7 +49,7 @@
49 <button class="layui-btn layui-btn-xs layui-btn-normal fieldset-btn" id="btn-kpiflag-kpi-bind"><i class="layui-icon">&#xe624;</i></button> 49 <button class="layui-btn layui-btn-xs layui-btn-normal fieldset-btn" id="btn-kpiflag-kpi-bind"><i class="layui-icon">&#xe624;</i></button>
50 </legend> 50 </legend>
51 </fieldset> 51 </fieldset>
52 - <div class="layui-form-item layui-form-item-flex"> 52 + <div class="layui-form-item layui-form-item-flex kpiflag-edit-table">
53 <table id="kpiflag-edit-table" class="input-flex-1"></table> 53 <table id="kpiflag-edit-table" class="input-flex-1"></table>
54 </div> 54 </div>
55 <div class="layui-form-item layui-form-item-flex hide"> 55 <div class="layui-form-item layui-form-item-flex hide">
@@ -10,7 +10,7 @@ @@ -10,7 +10,7 @@
10 <div class="layui-inline"> 10 <div class="layui-inline">
11 <div class="layui-input-inline layui-input-inline--long"> 11 <div class="layui-input-inline layui-input-inline--long">
12 <input type="text" id="kpiflag_keyword" name="kpiflag_keyword" placeholder="输入关键字，回车搜索" autocomplete="off" 12 <input type="text" id="kpiflag_keyword" name="kpiflag_keyword" placeholder="输入关键字，回车搜索" autocomplete="off"
13 - lay-tips="关键字检索包含： </br>指标组名称</br>flag</br>备注</br>绑定资源类型" 13 + lay-tips="关键字检索包含： </br>指标组名称</br>flag</br>备注</br>绑定资源类型</br>绑定指标"
14 class="layui-input"> 14 class="layui-input">
15 <input type="text" style="display: none"> 15 <input type="text" style="display: none">
16 </div> 16 </div>