monitor_v3 / hg-monitor-web · Commits

Go to a project

Authored by 张凯
Commit e54a8e21f2c07a55d7cbc6457c5d2e5ad4a35e88 1 parent 5eeb3941

指标组管理及页面指标组管理优化

Inline Side-by-side
Showing 7 changed files with 84 additions and 14 deletions
@@ -518,7 +518,7 @@ layui.define(['table', 'form', 'laydate', 'common', 'sessions', 'laydate', 'elem @@ -518,7 +518,7 @@ layui.define(['table', 'form', 'laydate', 'common', 'sessions', 'laydate', 'elem
518 kpiIdent: e.kpiIdent 518 kpiIdent: e.kpiIdent
519 }, 519 },
520 isUnique: '0', 520 isUnique: '0',
521 - sort: i, 521 + sort: kpiFlagTableData.length+1,
522 createUser: form.val('form-flag-edit').createUser, 522 createUser: form.val('form-flag-edit').createUser,
523 createTime: common.getToday('') 523 createTime: common.getToday('')
524 }); 524 });
@@ -22,6 +22,24 @@ layui.define(['table', 'form', 'admin', 'layer', 'common', 'sessions', "commonDe @@ -22,6 +22,24 @@ layui.define(['table', 'form', 'admin', 'layer', 'common', 'sessions', "commonDe
22 reloadTable(); 22 reloadTable();
23 } 23 }
24 }); 24 });
  25 + //回车事件
  26 + $('#kpiflag_describe').keydown(function (e) {
  27 + if (e.keyCode === 13) {
  28 + reloadTable();
  29 + }
  30 + });
  31 + //回车事件
  32 + $('#kpiflag_kpis').keydown(function (e) {
  33 + if (e.keyCode === 13) {
  34 + reloadTable();
  35 + }
  36 + });
  37 + //回车事件
  38 + $('#kpiflag_restypes').keydown(function (e) {
  39 + if (e.keyCode === 13) {
  40 + reloadTable();
  41 + }
  42 + });
25 $("#kpiflagQueryBtn").unbind().on("click", function () { 43 $("#kpiflagQueryBtn").unbind().on("click", function () {
26 reloadTable(); 44 reloadTable();
27 }) 45 })
@@ -53,6 +71,9 @@ layui.define(['table', 'form', 'admin', 'layer', 'common', 'sessions', "commonDe @@ -53,6 +71,9 @@ layui.define(['table', 'form', 'admin', 'layer', 'common', 'sessions', "commonDe
53 , where: { 71 , where: {
54 access_token: accessToken, 72 access_token: accessToken,
55 keyWord: $("#kpiflag_keyword").val(), 73 keyWord: $("#kpiflag_keyword").val(),
  74 + describe: $("#kpiflag_describe").val(),
  75 + kpis: $("#kpiflag_kpis").val(),
  76 + restypes: $("#kpiflag_restypes").val(),
56 dimension: $('select[name="dimension"]').val() 77 dimension: $('select[name="dimension"]').val()
57 } 78 }
58 , height: 'full-200' 79 , height: 'full-200'
@@ -173,6 +194,9 @@ layui.define(['table', 'form', 'admin', 'layer', 'common', 'sessions', "commonDe @@ -173,6 +194,9 @@ layui.define(['table', 'form', 'admin', 'layer', 'common', 'sessions', "commonDe
173 , where: { 194 , where: {
174 access_token: accessToken, 195 access_token: accessToken,
175 keyWord: $("#kpiflag_keyword").val(), 196 keyWord: $("#kpiflag_keyword").val(),
  197 + describe: $("#kpiflag_describe").val(),
  198 + kpis: $("#kpiflag_kpis").val(),
  199 + restypes: $("#kpiflag_restypes").val(),
176 dimension: $('select[name="dimension"]').val() 200 dimension: $('select[name="dimension"]').val()
177 } 201 }
178 }); 202 });
@@ -249,7 +249,7 @@ layui.define(['table', 'form', 'laydate', 'common', 'sessions', 'laydate', 'elem @@ -249,7 +249,7 @@ layui.define(['table', 'form', 'laydate', 'common', 'sessions', 'laydate', 'elem
249 console.log(JSON.stringify(e)); 249 console.log(JSON.stringify(e));
250 var flag = true; 250 var flag = true;
251 $.each(restypepageFlagTableData, function (j, k) { 251 $.each(restypepageFlagTableData, function (j, k) {
252 - if (e.flagId == k.flagId) { 252 + if (e.id == k.flagId) {
253 flag = false; 253 flag = false;
254 } 254 }
255 }); 255 });
@@ -263,7 +263,7 @@ layui.define(['table', 'form', 'laydate', 'common', 'sessions', 'laydate', 'elem @@ -263,7 +263,7 @@ layui.define(['table', 'form', 'laydate', 'common', 'sessions', 'laydate', 'elem
263 flagDimension: e.dimension, 263 flagDimension: e.dimension,
264 flagId: e.id, 264 flagId: e.id,
265 type: 'base', 265 type: 'base',
266 - sort: i, 266 + sort: restypepageFlagTableData.length+1,
267 createUser: form.val('form-restypepage-edit').createUser, 267 createUser: form.val('form-restypepage-edit').createUser,
268 createTime: common.getToday('') 268 createTime: common.getToday('')
269 }); 269 });
@@ -118,12 +118,18 @@ layui.define(['table', 'form', 'admin', 'layer', 'common', 'sessions', 'treeTabl @@ -118,12 +118,18 @@ layui.define(['table', 'form', 'admin', 'layer', 'common', 'sessions', 'treeTabl
118 cols: [[ 118 cols: [[
119 { type: 'checkbox' } 119 { type: 'checkbox' }
120 , {field: 'index', title: '序号', align: 'center', type: 'numbers',width: 50} 120 , {field: 'index', title: '序号', align: 'center', type: 'numbers',width: 50}
121 - , { field: 'keyword', title: '辅助关键字', align: 'center',width: 200} 121 + , {
  122 + field: 'name', title: '页面名称', align: 'center', sort: true,width: 200,
  123 + templet: '<div>' +
  124 + '<span restypepage-data-edit="{{d.id}}" data-flag="{{d.flag}}" class="layui-table-link">{{d.name}}</span>' +
  125 + '</div>'
  126 + }
122 , { field: 'resTypeName', title: '资源类型', align: 'center',width: 150} 127 , { field: 'resTypeName', title: '资源类型', align: 'center',width: 150}
123 , { field: 'osName', title: '操作系统', align: 'center',width: 100} 128 , { field: 'osName', title: '操作系统', align: 'center',width: 100}
124 , { field: 'provderName', title: '厂商', align: 'center',width: 100} 129 , { field: 'provderName', title: '厂商', align: 'center',width: 100}
125 , { field: 'protocolName', title: '采集协议', align: 'center',width: 100} 130 , { field: 'protocolName', title: '采集协议', align: 'center',width: 100}
126 , { field: 'model', title: '型号', align: 'center',width: 100} 131 , { field: 'model', title: '型号', align: 'center',width: 100}
  132 + , { field: 'keyword', title: '辅助关键字', align: 'center',width: 200}
127 , { field: 'flags', title: '配置指标组', align: 'left',width: 300} 133 , { field: 'flags', title: '配置指标组', align: 'left',width: 300}
128 , { field: 'kpis', title: '配置指标', align: 'left',width: 300} 134 , { field: 'kpis', title: '配置指标', align: 'left',width: 300}
129 , { field: 'remark', title: '备注', align: 'left',width: 300} 135 , { field: 'remark', title: '备注', align: 'left',width: 300}
@@ -136,6 +142,14 @@ layui.define(['table', 'form', 'admin', 'layer', 'common', 'sessions', 'treeTabl @@ -136,6 +142,14 @@ layui.define(['table', 'form', 'admin', 'layer', 'common', 'sessions', 'treeTabl
136 '</div>' 142 '</div>'
137 }]], 143 }]],
138 done: function (res) { 144 done: function (res) {
  145 + //点击协议名称 进行编辑
  146 + $('[restypepage-data-edit]').on('click', function () {
  147 + if ($.inArray('back:restypepage:add', checkList) == -1) {
  148 + layer.msg('暂无权限!', {icon: 7, time: 3000});
  149 + return;
  150 + }
  151 + openEditHtml($(this).attr("restypepage-data-edit"));
  152 + });
139 // 点击编辑事件 153 // 点击编辑事件
140 $('.link-restypepage-edit').click(function () { 154 $('.link-restypepage-edit').click(function () {
141 if ($.inArray('back:restypepage:add', checkList) == -1) { 155 if ($.inArray('back:restypepage:add', checkList) == -1) {
@@ -10,7 +10,31 @@ @@ -10,7 +10,31 @@
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>绑定资源类型</br>绑定指标" 13 + lay-tips="关键字检索包含： </br>指标组名称</br>flag</br>备注</br>绑定资源类型</br>绑定指标</br>指标组描述</br>创建人"
  14 + class="layui-input">
  15 + <input type="text" style="display: none">
  16 + </div>
  17 + </div>
  18 + <div class="layui-inline">
  19 + <div class="layui-input-inline layui-input-inline--long">
  20 + <input type="text" id="kpiflag_describe" name="kpiflag_describe" placeholder="输入指标组描述，回车搜索" autocomplete="off"
  21 + lay-tips="关键字检索包含： </br>指标组描述"
  22 + class="layui-input">
  23 + <input type="text" style="display: none">
  24 + </div>
  25 + </div>
  26 + <div class="layui-inline">
  27 + <div class="layui-input-inline layui-input-inline--long">
  28 + <input type="text" id="kpiflag_kpis" name="kpiflag_kpis" placeholder="输入指标名称，回车搜索" autocomplete="off"
  29 + lay-tips="关键字检索包含： </br>指标名称"
  30 + class="layui-input">
  31 + <input type="text" style="display: none">
  32 + </div>
  33 + </div>
  34 + <div class="layui-inline">
  35 + <div class="layui-input-inline layui-input-inline--long">
  36 + <input type="text" id="kpiflag_restypes" name="kpiflag_restypes" placeholder="输入资源类型，回车搜索" autocomplete="off"
  37 + lay-tips="关键字检索包含： </br>资源类型名称"
14 class="layui-input"> 38 class="layui-input">
15 <input type="text" style="display: none"> 39 <input type="text" style="display: none">
16 </div> 40 </div>
@@ -5,6 +5,12 @@ @@ -5,6 +5,12 @@
5 </fieldset> 5 </fieldset>
6 <div class="layui-form-item"> 6 <div class="layui-form-item">
7 <div class="inline-half layui-inline"> 7 <div class="inline-half layui-inline">
  8 + <label class="layui-form-label">页面名称<span style="color: red">*</span></label>
  9 + <div class="layui-input-inline">
  10 + <input type="text" name="name" lay-verify="required" placeholder="请输入页面名称" class="layui-input">
  11 + </div>
  12 + </div>
  13 + <div class="inline-half layui-inline">
8 <label class="layui-form-label">资源类型<span style="color: red">*</span></label> 14 <label class="layui-form-label">资源类型<span style="color: red">*</span></label>
9 <div class="layui-input-inline"> 15 <div class="layui-input-inline">
10 <select name="resType" lay-verify="required" lay-search="" id="restypepagekpi_select_resType" class="layui-select"> 16 <select name="resType" lay-verify="required" lay-search="" id="restypepagekpi_select_resType" class="layui-select">
@@ -12,6 +18,8 @@ @@ -12,6 +18,8 @@
12 </select> 18 </select>
13 </div> 19 </div>
14 </div> 20 </div>
  21 + </div>
  22 + <div class="layui-form-item">
15 <div class="inline-half layui-inline"> 23 <div class="inline-half layui-inline">
16 <label class="layui-form-label">操作系统</label> 24 <label class="layui-form-label">操作系统</label>
17 <div class="layui-input-inline"> 25 <div class="layui-input-inline">
@@ -20,8 +28,6 @@ @@ -20,8 +28,6 @@
20 </select> 28 </select>
21 </div> 29 </div>
22 </div> 30 </div>
23 - </div>  
24 - <div class="layui-form-item">  
25 <div class="inline-half layui-inline"> 31 <div class="inline-half layui-inline">
26 <label class="layui-form-label">厂商</label> 32 <label class="layui-form-label">厂商</label>
27 <div class="layui-input-inline"> 33 <div class="layui-input-inline">
@@ -30,6 +36,8 @@ @@ -30,6 +36,8 @@
30 </select> 36 </select>
31 </div> 37 </div>
32 </div> 38 </div>
  39 + </div>
  40 + <div class="layui-form-item">
33 <div class="inline-half layui-inline"> 41 <div class="inline-half layui-inline">
34 <label class="layui-form-label">采集协议</label> 42 <label class="layui-form-label">采集协议</label>
35 <div class="layui-input-inline"> 43 <div class="layui-input-inline">
@@ -38,28 +46,28 @@ @@ -38,28 +46,28 @@
38 </select> 46 </select>
39 </div> 47 </div>
40 </div> 48 </div>
41 - </div>  
42 - <div class="layui-form-item">  
43 <div class="inline-half layui-inline"> 49 <div class="inline-half layui-inline">
44 <label class="layui-form-label">型号</label> 50 <label class="layui-form-label">型号</label>
45 <div class="layui-input-inline"> 51 <div class="layui-input-inline">
46 <input type="text" name="model" placeholder="请输入型号" class="layui-input"> 52 <input type="text" name="model" placeholder="请输入型号" class="layui-input">
47 </div> 53 </div>
48 </div> 54 </div>
  55 + </div>
  56 + <div class="layui-form-item">
49 <div class="inline-half layui-inline"> 57 <div class="inline-half layui-inline">
50 <label class="layui-form-label">排序<span style="color: red">*</span></label> 58 <label class="layui-form-label">排序<span style="color: red">*</span></label>
51 <div class="layui-input-inline"> 59 <div class="layui-input-inline">
52 <input class="layui-input" lay-verify="required" name="sort" value="1" placeholder="请输入排序" type="number"> 60 <input class="layui-input" lay-verify="required" name="sort" value="1" placeholder="请输入排序" type="number">
53 </div> 61 </div>
54 </div> 62 </div>
55 - </div>  
56 - <div class="layui-form-item">  
57 <div class="inline-half layui-inline"> 63 <div class="inline-half layui-inline">
58 - <label class="layui-form-label">辅助关键字<span style="color: red">*</span></label> 64 + <label class="layui-form-label">辅助关键字</label>
59 <div class="layui-input-inline"> 65 <div class="layui-input-inline">
60 - <input type="text" name="keyword" lay-verify="required" placeholder="请输入辅助关键字" class="layui-input"> 66 + <input type="text" name="keyword" placeholder="请输入辅助关键字" class="layui-input">
61 </div> 67 </div>
62 </div> 68 </div>
  69 + </div>
  70 + <div class="layui-form-item">
63 <div class="inline-half layui-inline"> 71 <div class="inline-half layui-inline">
64 <label class="layui-form-label">创建人<span style="color: red">*</span></label> 72 <label class="layui-form-label">创建人<span style="color: red">*</span></label>
65 <div class="layui-input-inline"> 73 <div class="layui-input-inline">
@@ -10,7 +10,7 @@ @@ -10,7 +10,7 @@
10 <div class="layui-form-item"> 10 <div class="layui-form-item">
11 <div class="layui-inline"> 11 <div class="layui-inline">
12 <div class="layui-input-inline layui-input-inline--long"> 12 <div class="layui-input-inline layui-input-inline--long">
13 - <input autocomplete="off" class="layui-input" name="keywords" placeholder="输入关键字，回车搜索" lay-tips="关键字检索包含：</br>型号</br>关键字</br>备注</br>指标组名称</br>指标名称" 13 + <input autocomplete="off" class="layui-input" name="keywords" placeholder="输入关键字，回车搜索" lay-tips="关键字检索包含：</br>页面名称</br>型号</br>关键字</br>备注</br>指标组名称</br>指标名称"
14 type="text"> 14 type="text">
15 </div> 15 </div>
16 </div> 16 </div>