monitor_v3 / hg-monitor-web · Commits

Go to a project

Authored by 王涛
Commit 63fdaf1bcb9e6b74bad5236aa188f77f8638f58a 2 parents 05a92997 87bc566f

Merge branch 'master-500-prod-joke-new' into 'master-500-prod' 

页面指标组管理页面优化

页面指标组管理页面优化

See merge request !779
Inline Side-by-side
Showing 6 changed files with 67 additions and 71 deletions
@@ -148,7 +148,7 @@ layui.define(['table', 'form', 'laydate', 'common', 'sessions', 'laydate', 'elem @@ -148,7 +148,7 @@ layui.define(['table', 'form', 'laydate', 'common', 'sessions', 'laydate', 'elem
148 } 148 }
149 }, 149 },
150 {field: 'createUser', title: '创建人', align: 'center'}, 150 {field: 'createUser', title: '创建人', align: 'center'},
151 - {field: 'createTime', title: '创建人', align: 'center'}, 151 + {field: 'createTime', title: '创建时间', align: 'center'},
152 { 152 {
153 title: '操作',width: 100, align: 'center', templet: '<div><span data-index="{{(d.LAY_INDEX-1)}}" class="link link-kpiflag-delete">' + 153 title: '操作',width: 100, align: 'center', templet: '<div><span data-index="{{(d.LAY_INDEX-1)}}" class="link link-kpiflag-delete">' +
154 '<a class="layui-btn layui-btn-xs layui-btn-normal" title="删除"><i class="layui-icon"></i></a></span>' 154 '<a class="layui-btn layui-btn-xs layui-btn-normal" title="删除"><i class="layui-icon"></i></a></span>'
@@ -203,8 +203,9 @@ layui.define(['table', 'form', 'laydate', 'common', 'sessions', 'laydate', 'elem @@ -203,8 +203,9 @@ layui.define(['table', 'form', 'laydate', 'common', 'sessions', 'laydate', 'elem
203 field: 'resTypeCode', title: '编码', align: 'center', sort: true 203 field: 'resTypeCode', title: '编码', align: 'center', sort: true
204 }, { 204 }, {
205 field: 'resTypeDesc', title: '类别', align: 'center', sort: true 205 field: 'resTypeDesc', title: '类别', align: 'center', sort: true
  206 + },{field: 'createUser', title: '创建人', align: 'center'
206 }, { 207 }, {
207 - field: 'createTime', title: '创建时间', align: 'center', sort: true 208 + field: 'createTime', title: '创建时间', align: 'center'
208 }, { 209 }, {
209 title: '操作', align: 'center', fixed: 'right', width: '170', 210 title: '操作', align: 'center', fixed: 'right', width: '170',
210 toolbar: 211 toolbar:
@@ -177,6 +177,13 @@ layui.define(['table', 'form', 'admin', 'layer', 'common', 'sessions', "commonDe @@ -177,6 +177,13 @@ layui.define(['table', 'form', 'admin', 'layer', 'common', 'sessions', "commonDe
177 } 177 }
178 }); 178 });
179 } 179 }
  180 +
  181 + //获取选中的数据
  182 + function getCheckData() {
  183 + return table.checkStatus('kpiflag_table').data;
  184 + }
  185 +
  186 + return {getData: getCheckData};
180 }); 187 });
181 188
182 }); 189 });
1 /** 指标组新增 */ 1 /** 指标组新增 */
2 -layui.define(['table', 'form', 'laydate', 'common', 'sessions', 'laydate', 'element', 'admin', 'kpiIndex', 'resourcetype'], function (exports) { 2 +layui.define(['table', 'form', 'laydate', 'common', 'sessions', 'laydate', 'element', 'admin', 'kpiIndex', 'resourcetype','kpiflagIndex'], function (exports) {
3 var $ = layui.$; 3 var $ = layui.$;
4 var form = layui.form; 4 var form = layui.form;
5 var table = layui.table; 5 var table = layui.table;
@@ -15,11 +15,11 @@ layui.define(['table', 'form', 'laydate', 'common', 'sessions', 'laydate', 'elem @@ -15,11 +15,11 @@ layui.define(['table', 'form', 'laydate', 'common', 'sessions', 'laydate', 'elem
15 var accessToken = sessions.getToken().access_token; 15 var accessToken = sessions.getToken().access_token;
16 var domainName = common.domainName; 16 var domainName = common.domainName;
17 // 表格数据 17 // 表格数据
18 - var restypepageKpiTableData = []; 18 + var restypepageFlagTableData = [];
19 // 指标自定义类型数据组装option 19 // 指标自定义类型数据组装option
20 var restypekpitype; 20 var restypekpitype;
21 //指标表格 21 //指标表格
22 - var restypepageKpiTable; 22 + var restypepageFlagTable;
23 // 加载遮罩 23 // 加载遮罩
24 var loading; 24 var loading;
25 // 如果是编辑，回显数据 25 // 如果是编辑，回显数据
@@ -75,6 +75,7 @@ layui.define(['table', 'form', 'laydate', 'common', 'sessions', 'laydate', 'elem @@ -75,6 +75,7 @@ layui.define(['table', 'form', 'laydate', 'common', 'sessions', 'laydate', 'elem
75 async: false, 75 async: false,
76 }).done(function (res) { 76 }).done(function (res) {
77 var list = res.data; 77 var list = res.data;
  78 + options += '<option value="">=请选择=</option>';
78 $.each(list, function (i, v) { 79 $.each(list, function (i, v) {
79 options += '<option value="' + v.ddicCode + '">' + v.ddicName + '</option>'; 80 options += '<option value="' + v.ddicCode + '">' + v.ddicName + '</option>';
80 }); 81 });
@@ -96,7 +97,7 @@ layui.define(['table', 'form', 'laydate', 'common', 'sessions', 'laydate', 'elem @@ -96,7 +97,7 @@ layui.define(['table', 'form', 'laydate', 'common', 'sessions', 'laydate', 'elem
96 success: function (res) { 97 success: function (res) {
97 restypePageData = res.object; 98 restypePageData = res.object;
98 form.val('form-restypepage-edit', res.object); 99 form.val('form-restypepage-edit', res.object);
99 - restypepageKpiTableData = res.object.restypePageKpis; 100 + restypepageFlagTableData = res.object.restypePageFlags;
100 reloadRestypepageKpiFlagTable(); 101 reloadRestypepageKpiFlagTable();
101 } 102 }
102 }); 103 });
@@ -111,32 +112,16 @@ layui.define(['table', 'form', 'laydate', 'common', 'sessions', 'laydate', 'elem @@ -111,32 +112,16 @@ layui.define(['table', 'form', 'laydate', 'common', 'sessions', 'laydate', 'elem
111 * 112 *
112 * */ 113 * */
113 function loadRestypepageKpiFlagTable(){ 114 function loadRestypepageKpiFlagTable(){
114 - restypepageKpiTable = table.render({ 115 + restypepageFlagTable = table.render({
115 elem: '#restypepage-edit-table' 116 elem: '#restypepage-edit-table'
116 , cellMinWidth: 80 117 , cellMinWidth: 80
117 , limit: 10 118 , limit: 10
118 , even: true 119 , even: true
119 - , data: restypepageKpiTableData 120 + , data: restypepageFlagTableData
120 , cols: [[ 121 , cols: [[
121 {field: 'index', title: '序号', align: 'center', type: 'numbers'}, 122 {field: 'index', title: '序号', align: 'center', type: 'numbers'},
122 - {field: 'kpiName', title: '指标名称', align: 'center'},  
123 - {  
124 - field: 'kpiIdent', title: '指标分类', align: 'center',  
125 - templet: function (d) {  
126 - switch (d.kpiIdent) {  
127 - case '0':  
128 - return '基本指标';  
129 - case '1':  
130 - return '性能指标';  
131 - case '2':  
132 - return '状态指标';  
133 - case '3':  
134 - return '告警指标';  
135 - default:  
136 - return '';  
137 - }  
138 - }  
139 - }, 123 + {field: 'flagName', title: '指标组名称', align: 'center'},
  124 + {field: 'flagDesc', title: '指标组描述', align: 'center'},
140 { 125 {
141 title: '类型', align: 'center', 126 title: '类型', align: 'center',
142 templet: function (d) { 127 templet: function (d) {
@@ -144,27 +129,19 @@ layui.define(['table', 'form', 'laydate', 'common', 'sessions', 'laydate', 'elem @@ -144,27 +129,19 @@ layui.define(['table', 'form', 'laydate', 'common', 'sessions', 'laydate', 'elem
144 restypekpitype + 129 restypekpitype +
145 '</select>'); 130 '</select>');
146 var index = (d.LAY_INDEX-1); 131 var index = (d.LAY_INDEX-1);
147 - var type = restypepageKpiTableData[index].type; 132 + var type = restypepageFlagTableData[index].type;
148 selectDom.find('option[value="'+type+'"]').attr('selected', 'selected'); 133 selectDom.find('option[value="'+type+'"]').attr('selected', 'selected');
149 return selectDom.prop('outerHTML'); 134 return selectDom.prop('outerHTML');
150 } 135 }
151 - }, {  
152 - field: 'id', title: 'id', align: 'center' , hide: true, templet: function (d) {  
153 - var inputDom = $('<input id="txt-restypepagekpi-table-id-' + (d.LAY_INDEX-1) + '" data-index="' + (d.LAY_INDEX-1) + '" autocomplete="off" class="layui-input txt-restypepagekpi-table-id">');  
154 - var index = (d.LAY_INDEX-1);  
155 - var id = restypepageKpiTableData[index].id;  
156 - if (id != '' && id != null) {  
157 - inputDom.attr("value", id);  
158 - }  
159 - return inputDom.prop('outerHTML');  
160 - }  
161 - }  
162 - , { 136 + },
  137 + {field: 'createUser', title: '创建人', align: 'center'},
  138 + {field: 'createTime', title: '创建时间', align: 'center'},
  139 + {
163 field: 'sort', title: '排序', align: 'center', 140 field: 'sort', title: '排序', align: 'center',
164 templet: function (d) { 141 templet: function (d) {
165 var inputDom = $('<input id="txt-restypepagekpi-table-sort-' + (d.LAY_INDEX-1) + '" data-index="' + (d.LAY_INDEX-1) + '" type="number" autocomplete="off" class="layui-input txt-restypepagekpi-table-sort">'); 142 var inputDom = $('<input id="txt-restypepagekpi-table-sort-' + (d.LAY_INDEX-1) + '" data-index="' + (d.LAY_INDEX-1) + '" type="number" autocomplete="off" class="layui-input txt-restypepagekpi-table-sort">');
166 if (d.sort != null) { 143 if (d.sort != null) {
167 - inputDom.attr("value", restypepageKpiTableData[(d.LAY_INDEX-1)].sort); 144 + inputDom.attr("value", restypepageFlagTableData[(d.LAY_INDEX-1)].sort);
168 } 145 }
169 return inputDom.prop('outerHTML'); 146 return inputDom.prop('outerHTML');
170 } 147 }
@@ -181,15 +158,15 @@ layui.define(['table', 'form', 'laydate', 'common', 'sessions', 'laydate', 'elem @@ -181,15 +158,15 @@ layui.define(['table', 'form', 'laydate', 'common', 'sessions', 'laydate', 'elem
181 // 排序下拉框改变事件 158 // 排序下拉框改变事件
182 form.on('select(select-restypepagekpi-table-type)', function (data) { 159 form.on('select(select-restypepagekpi-table-type)', function (data) {
183 var index = $(data.elem).data('index'); 160 var index = $(data.elem).data('index');
184 - restypepageKpiTableData[index].type = data.value; 161 + restypepageFlagTableData[index].type = data.value;
185 }); 162 });
186 // 排序输入框输入事件 163 // 排序输入框输入事件
187 $('.txt-restypepagekpi-table-sort').change(function () { 164 $('.txt-restypepagekpi-table-sort').change(function () {
188 - restypepageKpiTableData[$(this).data('index')].sort = $(this).val(); 165 + restypepageFlagTableData[$(this).data('index')].sort = $(this).val();
189 }); 166 });
190 // 删除事件 167 // 删除事件
191 $('.link-restypepagekpi-delete').click(function () { 168 $('.link-restypepagekpi-delete').click(function () {
192 - restypepageKpiTableData.splice($(this).data('index'), 1); 169 + restypepageFlagTableData.splice($(this).data('index'), 1);
193 reloadRestypepageKpiFlagTable(); 170 reloadRestypepageKpiFlagTable();
194 }); 171 });
195 } 172 }
@@ -198,9 +175,9 @@ layui.define(['table', 'form', 'laydate', 'common', 'sessions', 'laydate', 'elem @@ -198,9 +175,9 @@ layui.define(['table', 'form', 'laydate', 'common', 'sessions', 'laydate', 'elem
198 175
199 // 刷新指标表格 176 // 刷新指标表格
200 function reloadRestypepageKpiFlagTable() { 177 function reloadRestypepageKpiFlagTable() {
201 - restypepageKpiTable.reload({ 178 + restypepageFlagTable.reload({
202 page: {curr: 1}, 179 page: {curr: 1},
203 - data: restypepageKpiTableData 180 + data: restypepageFlagTableData
204 }); 181 });
205 } 182 }
206 183
@@ -215,7 +192,7 @@ layui.define(['table', 'form', 'laydate', 'common', 'sessions', 'laydate', 'elem @@ -215,7 +192,7 @@ layui.define(['table', 'form', 'laydate', 'common', 'sessions', 'laydate', 'elem
215 model: '', 192 model: '',
216 protocol: '', 193 protocol: '',
217 remark: '', 194 remark: '',
218 - restypePageKpis: restypepageKpiTableData 195 + restypePageFlags: restypepageFlagTableData
219 }; 196 };
220 Object.assign(restypePage, form.val('form-restypepage-edit')); 197 Object.assign(restypePage, form.val('form-restypepage-edit'));
221 admin.req({ 198 admin.req({
@@ -253,38 +230,42 @@ layui.define(['table', 'form', 'laydate', 'common', 'sessions', 'laydate', 'elem @@ -253,38 +230,42 @@ layui.define(['table', 'form', 'laydate', 'common', 'sessions', 'laydate', 'elem
253 230
254 // 选择指标 231 // 选择指标
255 $('#btn-restypepage-kpi-bind').click(function () { 232 $('#btn-restypepage-kpi-bind').click(function () {
256 - $('[lay-id="/baseconfig/kpi/index"]').find('.layui-tab-close').trigger('click'); 233 + $('[lay-id="/baseconfig/kpiflag/index"]').find('.layui-tab-close').trigger('click');
257 layer.open({ 234 layer.open({
258 title: '选择指标', 235 title: '选择指标',
259 - id: 'restypepageKpiIndexChooseHtml', 236 + id: 'restypepageFlagIndexChooseHtml',
260 type: 1, 237 type: 1,
261 area: ['90%', '800px'], 238 area: ['90%', '800px'],
262 btn: ['确定', '取消'], 239 btn: ['确定', '取消'],
263 scrollbar: true, 240 scrollbar: true,
264 success: function () { 241 success: function () {
265 - view(this.id).render('/baseconfig/kpi/index', {}); 242 + view(this.id).render('/baseconfig/kpiflag/index', {});
266 }, 243 },
267 yes: function (index, layero) { 244 yes: function (index, layero) {
268 - var kpiIndex = layui.kpiIndex({});  
269 - var data = kpiIndex.getData(); 245 + var kpiflagIndex = layui.kpiflagIndex({});
  246 + var data = kpiflagIndex.getData();
270 if (data.length > 0) { 247 if (data.length > 0) {
271 $.each(data, function (i, e) { 248 $.each(data, function (i, e) {
  249 + console.log(JSON.stringify(e));
272 var flag = true; 250 var flag = true;
273 - $.each(restypepageKpiTableData, function (j, k) {  
274 - if (e.kpiId == k.kpiId) { 251 + $.each(restypepageFlagTableData, function (j, k) {
  252 + if (e.flagId == k.flagId) {
275 flag = false; 253 flag = false;
276 } 254 }
277 }); 255 });
278 if (flag == true) { 256 if (flag == true) {
279 - restypepageKpiTableData.push({ 257 + restypepageFlagTableData.push({
  258 + flagName: e.name,
  259 + flagDesc: e.describes,
280 id: '', 260 id: '',
281 pageId: id, 261 pageId: id,
282 resType: restypePageData.resType, 262 resType: restypePageData.resType,
283 - kpiId: e.kpiId,  
284 - kpiName: e.kpiName,  
285 - kpiIdent: e.kpiIdent, 263 + flagDimension: e.dimension,
  264 + flagId: e.id,
286 type: 'base', 265 type: 'base',
287 - sort: i 266 + sort: i,
  267 + createUser: form.val('form-restypepage-edit').createUser,
  268 + createTime: common.getToday('')
288 }); 269 });
289 } 270 }
290 }); 271 });
@@ -93,7 +93,7 @@ layui.define(['table', 'form', 'admin', 'layer', 'common', 'sessions', 'treeTabl @@ -93,7 +93,7 @@ layui.define(['table', 'form', 'admin', 'layer', 'common', 'sessions', 'treeTabl
93 var $from = $("#restypepageQueryForm") 93 var $from = $("#restypepageQueryForm")
94 var search = { 94 var search = {
95 access_token: accessToken, 95 access_token: accessToken,
96 - keyword: $from.find("input[name='keyword']").val(), 96 + keyword: $from.find("input[name='keywords']").val(),
97 resType: $from.find("select[name='restypepageresType']").val(), 97 resType: $from.find("select[name='restypepageresType']").val(),
98 os: $from.find("select[name='restypepageos']").val(), 98 os: $from.find("select[name='restypepageos']").val(),
99 protocol: $from.find("select[name='restypepagecollProtocol']").val(), 99 protocol: $from.find("select[name='restypepagecollProtocol']").val(),
@@ -117,17 +117,18 @@ layui.define(['table', 'form', 'admin', 'layer', 'common', 'sessions', 'treeTabl @@ -117,17 +117,18 @@ layui.define(['table', 'form', 'admin', 'layer', 'common', 'sessions', 'treeTabl
117 }, 117 },
118 cols: [[ 118 cols: [[
119 { type: 'checkbox' } 119 { type: 'checkbox' }
120 - , {field: 'index', title: '序号', align: 'center', type: 'numbers'}  
121 - , { field: 'resTypeName', title: '资源类型', align: 'center'}  
122 - , { field: 'osName', title: '操作系统', align: 'center'}  
123 - , { field: 'provderName', title: '厂商', align: 'center'}  
124 - , { field: 'protocolName', title: '采集协议', align: 'center'}  
125 - , { field: 'model', title: '型号', align: 'center'}  
126 - , { field: 'keyword', title: '辅助关键字', align: 'center'} 120 + , {field: 'index', title: '序号', align: 'center', type: 'numbers',width: 50}
  121 + , { field: 'keyword', title: '辅助关键字', align: 'center',width: 200}
  122 + , { field: 'resTypeName', title: '资源类型', align: 'center',width: 150}
  123 + , { field: 'osName', title: '操作系统', align: 'center',width: 100}
  124 + , { field: 'provderName', title: '厂商', align: 'center',width: 100}
  125 + , { field: 'protocolName', title: '采集协议', align: 'center',width: 100}
  126 + , { field: 'model', title: '型号', align: 'center',width: 100}
  127 + , { field: 'flags', title: '配置指标组', align: 'left',width: 300}
127 , { field: 'kpis', title: '配置指标', align: 'left',width: 300} 128 , { field: 'kpis', title: '配置指标', align: 'left',width: 300}
128 , { field: 'remark', title: '备注', align: 'left',width: 300} 129 , { field: 'remark', title: '备注', align: 'left',width: 300}
129 , { 130 , {
130 - title: '操作', align: 'center', width: 100, 131 + title: '操作', align: 'center',fixed: 'right', width: 100,
131 templet: 132 templet:
132 '<div>' + 133 '<div>' +
133 '<button data-id="{{d.id}}" class="layui-btn layui-btn-xs layui-btn-normal link-restypepage-edit" lay-tips="编辑"><i class="layui-icon layui-icon-edit"></i></button>'+ 134 '<button data-id="{{d.id}}" class="layui-btn layui-btn-xs layui-btn-normal link-restypepage-edit" lay-tips="编辑"><i class="layui-icon layui-icon-edit"></i></button>'+
@@ -55,9 +55,15 @@ @@ -55,9 +55,15 @@
55 </div> 55 </div>
56 <div class="layui-form-item"> 56 <div class="layui-form-item">
57 <div class="inline-half layui-inline"> 57 <div class="inline-half layui-inline">
58 - <label class="layui-form-label">辅助关键字</label> 58 + <label class="layui-form-label">辅助关键字<span style="color: red">*</span></label>
59 <div class="layui-input-inline"> 59 <div class="layui-input-inline">
60 - <input type="text" name="keyword" placeholder="请输入辅助关键字" class="layui-input"> 60 + <input type="text" name="keyword" lay-verify="required" placeholder="请输入辅助关键字" class="layui-input">
  61 + </div>
  62 + </div>
  63 + <div class="inline-half layui-inline">
  64 + <label class="layui-form-label">创建人<span style="color: red">*</span></label>
  65 + <div class="layui-input-inline">
  66 + <input type="text" name="createUser" required lay-verify="required" placeholder="请输入创建人" class="layui-input">
61 </div> 67 </div>
62 </div> 68 </div>
63 </div> 69 </div>
@@ -71,7 +77,7 @@ @@ -71,7 +77,7 @@
71 </form> 77 </form>
72 <form class="layui-form layui-form-pane" onsubmit="return false"> 78 <form class="layui-form layui-form-pane" onsubmit="return false">
73 <fieldset class="layui-elem-field layui-field-title"> 79 <fieldset class="layui-elem-field layui-field-title">
74 - <legend>选择指标&nbsp;&nbsp; 80 + <legend>选择指标组&nbsp;&nbsp;
75 <button class="layui-btn layui-btn-xs layui-btn-normal fieldset-btn" id="btn-restypepage-kpi-bind"><i class="layui-icon">&#xe624;</i></button> 81 <button class="layui-btn layui-btn-xs layui-btn-normal fieldset-btn" id="btn-restypepage-kpi-bind"><i class="layui-icon">&#xe624;</i></button>
76 </legend> 82 </legend>
77 </fieldset> 83 </fieldset>
@@ -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="keyword" placeholder="输入关键字，回车搜索" lay-tips="关键字检索包含：</br>型号</br>关键字</br>备注</br>绑定指标" 13 + <input autocomplete="off" class="layui-input" name="keywords" placeholder="输入关键字，回车搜索" lay-tips="关键字检索包含：</br>型号</br>关键字</br>备注</br>指标组名称</br>指标名称"
14 type="text"> 14 type="text">
15 </div> 15 </div>
16 </div> 16 </div>