monitor_v3 / hg-monitor-web · Commits

Go to a project

Authored by 王涛
Commit 2ffd274036c2c50bdcbecbab0676c4efd2ba1d44 2 parents 3f0105a3 79517e92

Merge branch 'master-mj-ztq' into 'master-mj' 

Master mj ztq



See merge request !1205
Inline Side-by-side
Showing 1 changed file with 95 additions and 8 deletions
@@ -296,16 +296,20 @@ layui.define(['table', 'form', 'admin', 'layer', 'common', 'sessions'], function @@ -296,16 +296,20 @@ layui.define(['table', 'form', 'admin', 'layer', 'common', 'sessions'], function
296 } 296 }
297 } 297 }
298 , { 298 , {
299 - field: 'userTotal', title: '订阅人数', align: 'right', sort: true, width: 120, 299 + field: 'userTotal', title: '订阅者', align: 'right', sort: true, width: 120,
300 templet: function (d) { 300 templet: function (d) {
301 - if (d.userTotal != '0') { 301 + /*if (d.userTotal != '0') {
302 return `<div><span data-id="${d.subId}" class="layui-table-link view-alarmsubscribe-users-total">${d.userTotal}</span></div>`; 302 return `<div><span data-id="${d.subId}" class="layui-table-link view-alarmsubscribe-users-total">${d.userTotal}</span></div>`;
303 } else { 303 } else {
304 return d.userTotal; 304 return d.userTotal;
  305 + }*/
  306 + return `<div>
  307 + <span data-id="${d.subId}" class="layui-table-link view-alarmsubscribe-users-total" lay-tips="用户">${d.userTotal}</span> /
  308 + <span data-id="${d.subId}" class="layui-table-link view-alarmsubscribe-org-total" lay-tips="部门">${d.orgTotal}</span> /
  309 + <span data-id="${d.subId}" class="layui-table-link view-alarmsubscribe-user-group-total" lay-tips="用户组">${d.userGroupTotal}</span>
  310 + </div>`;
305 } 311 }
306 } 312 }
307 - }  
308 - , {field: 'times', title: '允许通知时间段', align: 'center', sort: true, width: 180}  
309 , { 313 , {
310 field: 'syncFlag', title: '同步状态', align: 'center', sort: true, width: 120, 314 field: 'syncFlag', title: '同步状态', align: 'center', sort: true, width: 120,
311 templet: function (d) { 315 templet: function (d) {
@@ -315,7 +319,7 @@ layui.define(['table', 'form', 'admin', 'layer', 'common', 'sessions'], function @@ -315,7 +319,7 @@ layui.define(['table', 'form', 'admin', 'layer', 'common', 'sessions'], function
315 return ' <button type="button" class="layui-btn layui-bg-green layui-btn-radius layui-btn-xs p-0-15">已同步</button>'; 319 return ' <button type="button" class="layui-btn layui-bg-green layui-btn-radius layui-btn-xs p-0-15">已同步</button>';
316 } 320 }
317 } 321 }
318 - } 322 + }, {field: 'times', title: '允许通知时间段', align: 'center', sort: true, width: 180}
319 , { 323 , {
320 title: '操作', align: 'center', minWidth: 460, fixed: 'right', toolbar: 324 title: '操作', align: 'center', minWidth: 460, fixed: 'right', toolbar:
321 '<div>' + 325 '<div>' +
@@ -389,8 +393,13 @@ layui.define(['table', 'form', 'admin', 'layer', 'common', 'sessions'], function @@ -389,8 +393,13 @@ layui.define(['table', 'form', 'admin', 'layer', 'common', 'sessions'], function
389 }); 393 });
390 }); 394 });
391 395
392 - //订阅人 396 + // 订阅人
393 $(".view-alarmsubscribe-users-total").on("click", function () { 397 $(".view-alarmsubscribe-users-total").on("click", function () {
  398 + if ($(this).text() == '0') {
  399 + layer.msg('暂无订阅人，请先订阅！', {icon: 7, time: 3000});
  400 + return false;
  401 + }
  402 +
394 var id = $(this).data("id"); 403 var id = $(this).data("id");
395 admin.req({ 404 admin.req({
396 url: domainName + '/api-web/alarmsubscribe/users' 405 url: domainName + '/api-web/alarmsubscribe/users'
@@ -399,8 +408,8 @@ layui.define(['table', 'form', 'admin', 'layer', 'common', 'sessions'], function @@ -399,8 +408,8 @@ layui.define(['table', 'form', 'admin', 'layer', 'common', 'sessions'], function
399 if (res.data && res.data.length > 0) { 408 if (res.data && res.data.length > 0) {
400 var trs = ''; 409 var trs = '';
401 $.each(res.data, function (i, v) { 410 $.each(res.data, function (i, v) {
402 - trs += `<tr style="text-align: center"><td>${i + 1}</td><td>${v.username}</td><td>${v.nickname}</td><td>${v.email != 'undefined'?v.email:''}</td>  
403 - <td>${v.phone != 'undefined'?v.phone:''}</td><td>${v.operator != 'undefined'?v.operator:''}</td><td>${v.resTotal}</td><td>${v.bizTotal}</td></tr>`; 411 + trs += `<tr style="text-align: center"><td>${i + 1}</td><td>${v.username}</td><td>${v.nickname}</td><td>${v.email != 'undefined' && v.email != null?v.email:''}</td>
  412 + <td>${v.phone != 'undefined' && v.phone != null?v.phone:''}</td><td>${v.operator != 'undefined' && v.operator != null?v.operator:''}</td><td>${v.resTotal}</td><td>${v.bizTotal}</td></tr>`;
404 }); 413 });
405 var tb = `<div class="layui-form" style="padding: 0 10px;"> 414 var tb = `<div class="layui-form" style="padding: 0 10px;">
406 <table class="layui-table"> 415 <table class="layui-table">
@@ -424,6 +433,84 @@ layui.define(['table', 'form', 'admin', 'layer', 'common', 'sessions'], function @@ -424,6 +433,84 @@ layui.define(['table', 'form', 'admin', 'layer', 'common', 'sessions'], function
424 }); 433 });
425 434
426 }); 435 });
  436 + // 订阅部门
  437 + $(".view-alarmsubscribe-org-total").on("click", function () {
  438 + if ($(this).text() == '0') {
  439 + layer.msg('暂无订阅部门，请先订阅！', {icon: 7, time: 3000});
  440 + return false;
  441 + }
  442 + var id = $(this).data("id");
  443 + admin.req({
  444 + url: domainName + '/api-web/alarmsubscribe/userOrg'
  445 + , data: {subId: id}
  446 + , done: function (res) {
  447 + if (res.data && res.data.length > 0) {
  448 + var trs = '';
  449 + $.each(res.data, function (i, v) {
  450 + trs += `<tr style="text-align: center"><td>${i + 1}</td><td>${v.username}</td><td>${v.nickname}</td><td>${v.orgName}</td><td>${v.email != 'undefined' && v.email != null?v.email:''}</td>
  451 + <td>${v.phone != 'undefined' && v.phone != null?v.phone:''}</td><td>${v.operator != 'undefined' && v.operator != null?v.operator:''}</td><td>${v.resTotal}</td><td>${v.bizTotal}</td></tr>`;
  452 + });
  453 + var tb = `<div class="layui-form" style="padding: 0 10px;">
  454 + <table class="layui-table">
  455 + <thead>
  456 + <tr> <th>序号</th><th>用户名</th><th>昵称</th><th>部门</th><th>邮箱</th><th>手机号</th>
  457 + <th>运营商</th><th>负责资源数</th><th>负责业务</th> </tr>
  458 + </thead>
  459 + <tbody> ${trs} </tbody>
  460 + </table>
  461 + </div>`;
  462 + layer.open({
  463 + type: 1
  464 + , title: "部门用户列表"
  465 + , shade: 0.8
  466 + , area: ['80%', '90%']
  467 + , id: 'alarm_subscribe_users' //设定一个id，防止重复弹出
  468 + , content: tb
  469 + })
  470 + }
  471 + }
  472 + });
  473 +
  474 + });
  475 + // 订阅组
  476 + $(".view-alarmsubscribe-user-group-total").on("click", function () {
  477 + if ($(this).text() == '0') {
  478 + layer.msg('暂无订阅组，请先订阅！', {icon: 7, time: 3000});
  479 + return false;
  480 + }
  481 + var id = $(this).data("id");
  482 + admin.req({
  483 + url: domainName + '/api-web/alarmsubscribe/userGroup'
  484 + , data: {subId: id}
  485 + , done: function (res) {
  486 + if (res.data && res.data.length > 0) {
  487 + var trs = '';
  488 + $.each(res.data, function (i, v) {
  489 + trs += `<tr style="text-align: center"><td>${i + 1}</td><td>${v.username}</td><td>${v.nickname}</td><td>${v.userGroupName}</td><td>${v.email != 'undefined' && v.email != null?v.email:''}</td>
  490 + <td>${v.phone != 'undefined' && v.phone != null?v.phone:''}</td><td>${v.operator != 'undefined' && v.operator != null?v.operator:''}</td><td>${v.resTotal}</td><td>${v.bizTotal}</td></tr>`;
  491 + });
  492 + var tb = `<div class="layui-form" style="padding: 0 10px;">
  493 + <table class="layui-table">
  494 + <thead>
  495 + <tr> <th>序号</th><th>用户名</th><th>昵称</th><th>用户组</th><th>邮箱</th><th>手机号</th>
  496 + <th>运营商</th><th>负责资源数</th><th>负责业务</th> </tr>
  497 + </thead>
  498 + <tbody> ${trs} </tbody>
  499 + </table>
  500 + </div>`;
  501 + layer.open({
  502 + type: 1
  503 + , title: "用户组用户列表"
  504 + , shade: 0.8
  505 + , area: ['80%', '90%']
  506 + , id: 'alarm_subscribe_users' //设定一个id，防止重复弹出
  507 + , content: tb
  508 + })
  509 + }
  510 + }
  511 + });
  512 +
  513 + });
427 514
428 //设置同步 515 //设置同步
429 form.on('switch(switchSyncalarmsubscribe)', function (obj) { 516 form.on('switch(switchSyncalarmsubscribe)', function (obj) {