monitor_v3 / hg-monitor-web · Commits

Go to a project

Authored by 王涛
Commit a136d902f6cb92b4fb927bd6a281261ad670dfb2 2 parents 91bc3688 22150e38

Merge branch 'master-mj-joke' into 'master-mj' 

chore:资源管理页面优化

chore:资源管理页面优化

See merge request !1118
Inline Side-by-side
Showing 7 changed files with 188 additions and 287 deletions
@@ -10,13 +10,14 @@ layui.define(['table', 'form', 'laydate', 'common', 'sessions', 'laydate', 'admi @@ -10,13 +10,14 @@ layui.define(['table', 'form', 'laydate', 'common', 'sessions', 'laydate', 'admi
10 10
11 //对外暴露的接口 11 //对外暴露的接口
12 exports('resManageAdd', function (data) { 12 exports('resManageAdd', function (data) {
  13 + var accessToken = common.getMjToken();
  14 + var tokenKey = common.getMjTokenKey();
13 var inputTags = layui.inputTags; 15 var inputTags = layui.inputTags;
14 var id = data.id; 16 var id = data.id;
15 var copy = data.copy; 17 var copy = data.copy;
16 var resType = data.resType; 18 var resType = data.resType;
17 var hardwareFlag = data.hardwareFlag; 19 var hardwareFlag = data.hardwareFlag;
18 var sessions = layui.sessions; 20 var sessions = layui.sessions;
19 - var accessToken = common.getMjToken();  
20 var formData = {ip: '', port: '', manageIp: ''}; 21 var formData = {ip: '', port: '', manageIp: ''};
21 var protocolParam = []; 22 var protocolParam = [];
22 var dimainlist = []; 23 var dimainlist = [];
@@ -31,37 +32,37 @@ layui.define(['table', 'form', 'laydate', 'common', 'sessions', 'laydate', 'admi @@ -31,37 +32,37 @@ layui.define(['table', 'form', 'laydate', 'common', 'sessions', 'laydate', 'admi
31 //延递对象 32 //延递对象
32 $.when( 33 $.when(
33 $.ajax({ 34 $.ajax({
34 - url: common.domainName + '/api-web/home/business/findAllBusType?accessToken=' + accessToken, 35 + url: common.domainName + `/api-web/home/business/findAllBusType?${tokenKey}=${accessToken}` ,
35 data: {'type': 'per'} 36 data: {'type': 'per'}
36 }), $.ajax({ 37 }), $.ajax({
37 - url: `${common.domainName}/api-web/manage/ddic/findSucDdics/provider?accessToken=${accessToken}`, 38 + url: `${common.domainName}/api-web/manage/ddic/findSucDdics/provider?${tokenKey}=${accessToken}`,
38 method: 'get' 39 method: 'get'
39 }), $.ajax({ 40 }), $.ajax({
40 - url: `${common.domainName}/api-web/manage/application/page?page=-1&limit=-1&accessToken=${accessToken}`, 41 + url: `${common.domainName}/api-web/manage/application/page?page=-1&limit=-1&${tokenKey}=${accessToken}`,
41 method: 'POST' 42 method: 'POST'
42 }), $.ajax({ 43 }), $.ajax({
43 - url: `${common.domainName}/api-web/manage/restype/list?accessToken=${accessToken}`, 44 + url: `${common.domainName}/api-web/manage/restype/list?${tokenKey}=${accessToken}`,
44 method: 'GET' 45 method: 'GET'
45 }), $.ajax({ 46 }), $.ajax({
46 - url: `${common.domainName}/api-user/users/getAll?accessToken=${accessToken}`, 47 + url: `${common.domainName}/mj/user/page?username=&nickname=&enabled=&perPage=10000&page=1&${tokenKey}=${accessToken}`,
47 method: 'GET' 48 method: 'GET'
48 }), $.ajax({ 49 }), $.ajax({
49 - url: `${common.domainName}/api-web/manage/ddic/findSucDdics/os?accessToken=${accessToken}`, 50 + url: `${common.domainName}/api-web/manage/ddic/findSucDdics/os?${tokenKey}=${accessToken}`,
50 method: 'get' 51 method: 'get'
51 }), $.ajax({ 52 }), $.ajax({
52 - url: `${common.domainName}/api-web/manage/domain/page?accessToken=${accessToken}`, 53 + url: `${common.domainName}/api-web/manage/domain/page?${tokenKey}=${accessToken}`,
53 method: 'GET' 54 method: 'GET'
54 }), $.ajax({ 55 }), $.ajax({
55 - url: `${common.domainName}/api-web/manage/restypeProtocol/getProtocolByResType?accessToken=${accessToken}&resTypeCode=${resType}`, 56 + url: `${common.domainName}/api-web/manage/restypeProtocol/getProtocolByResType?${tokenKey}=${accessToken}&resTypeCode=${resType}`,
56 method: 'GET' 57 method: 'GET'
57 }), $.ajax({ 58 }), $.ajax({
58 - url: `${common.domainName}/api-web/sysConf/getConfByCode?accessToken=${accessToken}&code=pwd_level`, 59 + url: `${common.domainName}/api-web/sysConf/getConfByCode?${tokenKey}=${accessToken}&code=pwd_level`,
59 method: 'GET' 60 method: 'GET'
60 }), $.ajax({ 61 }), $.ajax({
61 - url: `${common.domainName}/api-web/manage/ddic/findSucDdics/resCategory?accessToken=${accessToken}`, 62 + url: `${common.domainName}/api-web/manage/ddic/findSucDdics/resCategory?${tokenKey}=${accessToken}`,
62 method: 'get' 63 method: 'get'
63 }), $.ajax({ 64 }), $.ajax({
64 - url: `${common.domainName}/api-web/manage/machineroom/list?accessToken=${accessToken}`, 65 + url: `${common.domainName}/api-web/manage/machineroom/list?${tokenKey}=${accessToken}`,
65 method: 'GET' 66 method: 'GET'
66 }) 67 })
67 ).done(function (res1, res2, res3, res4, res5, res6, res7, res8, res9, res10, res11) { 68 ).done(function (res1, res2, res3, res4, res5, res6, res7, res8, res9, res10, res11) {
@@ -95,7 +96,7 @@ layui.define(['table', 'form', 'laydate', 'common', 'sessions', 'laydate', 'admi @@ -95,7 +96,7 @@ layui.define(['table', 'form', 'laydate', 'common', 'sessions', 'laydate', 'admi
95 var bizlist = res1[0].data; 96 var bizlist = res1[0].data;
96 var ddiclist = res2[0].data; 97 var ddiclist = res2[0].data;
97 var applist = res3[0].data; 98 var applist = res3[0].data;
98 - var userList = res5[0]; 99 + var userList = res5[0].data.rows;
99 var oslist = res6[0].data; 100 var oslist = res6[0].data;
100 dimainlist = res7[0].data; 101 dimainlist = res7[0].data;
101 var resCategoryList = res10[0].data; 102 var resCategoryList = res10[0].data;
@@ -168,7 +169,7 @@ layui.define(['table', 'form', 'laydate', 'common', 'sessions', 'laydate', 'admi @@ -168,7 +169,7 @@ layui.define(['table', 'form', 'laydate', 'common', 'sessions', 'laydate', 'admi
168 $("#resManageAddForm").find("input[name='resId']").val(id); 169 $("#resManageAddForm").find("input[name='resId']").val(id);
169 } 170 }
170 $.ajax({ 171 $.ajax({
171 - url: common.domainName + '/api-web/manage/resource/findById?accessToken=' + accessToken, 172 + url: common.domainName + `/api-web/manage/resource/findById?${tokenKey}=${accessToken}` ,
172 data: {resId: id}, 173 data: {resId: id},
173 async: false, 174 async: false,
174 success: function (res) { 175 success: function (res) {
@@ -762,7 +763,7 @@ layui.define(['table', 'form', 'laydate', 'common', 'sessions', 'laydate', 'admi @@ -762,7 +763,7 @@ layui.define(['table', 'form', 'laydate', 'common', 'sessions', 'laydate', 'admi
762 success: function (index, layero) { 763 success: function (index, layero) {
763 $.ajax({ 764 $.ajax({
764 type: 'get', 765 type: 'get',
765 - url: common.domainName + '/api-web/manage/resextendgroup/page?accessToken=' + accessToken, 766 + url: common.domainName + `/api-web/manage/resextendgroup/page?${tokenKey}=${accessToken}` ,
766 success: function (res) { 767 success: function (res) {
767 var selects = res.data; 768 var selects = res.data;
768 $("#chooseExtendParamGroupSelect").append("<option value=''>请选择</option>"); 769 $("#chooseExtendParamGroupSelect").append("<option value=''>请选择</option>");
@@ -816,7 +817,7 @@ layui.define(['table', 'form', 'laydate', 'common', 'sessions', 'laydate', 'admi @@ -816,7 +817,7 @@ layui.define(['table', 'form', 'laydate', 'common', 'sessions', 'laydate', 'admi
816 var param = {groupName: val, arr: arr} 817 var param = {groupName: val, arr: arr}
817 $.ajax({ 818 $.ajax({
818 type: 'post', 819 type: 'post',
819 - url: common.domainName + '/api-web/manage/resextendgroup/save?accessToken=' + accessToken, 820 + url: common.domainName + `/api-web/manage/resextendgroup/save?${tokenKey}=${accessToken}` ,
820 data: JSON.stringify(param), 821 data: JSON.stringify(param),
821 contentType: "application/json; charset=utf-8", 822 contentType: "application/json; charset=utf-8",
822 success: function (res) { 823 success: function (res) {
@@ -49,7 +49,9 @@ layui.define(['common', 'tree', 'laypage', 'laytpl', 'upload', 'admin', 'form', @@ -49,7 +49,9 @@ layui.define(['common', 'tree', 'laypage', 'laytpl', 'upload', 'admin', 'form',
49 } 49 }
50 50
51 var sessions = layui.sessions; 51 var sessions = layui.sessions;
52 - accessToken = sessions.getToken().access_token; 52 + // accessToken = sessions.getToken().access_token;
  53 + accessToken = common.getMjToken();
  54 + var tokenKey = common.getMjTokenKey();
53 var checkList = common.checkPermission(accessToken); 55 var checkList = common.checkPermission(accessToken);
54 var loading = layer.load(2, {shade: 0.2}); 56 var loading = layer.load(2, {shade: 0.2});
55 admin.req({ 57 admin.req({
@@ -288,7 +290,7 @@ layui.define(['common', 'tree', 'laypage', 'laytpl', 'upload', 'admin', 'form', @@ -288,7 +290,7 @@ layui.define(['common', 'tree', 'laypage', 'laytpl', 'upload', 'admin', 'form',
288 } 290 }
289 layer.load(2); 291 layer.load(2);
290 admin.req({ 292 admin.req({
291 - url: `${common.domainName}/api-web/manage/restypeProtocol/getProtocolByResType?access_token=${accessToken}&resTypeCode=${data.id}`, 293 + url: `${common.domainName}/api-web/manage/restypeProtocol/getProtocolByResType?${tokenKey}=${accessToken}&resTypeCode=${data.id}`,
292 success(response) { 294 success(response) {
293 layer.closeAll('loading'); 295 layer.closeAll('loading');
294 if (response && response.success) { 296 if (response && response.success) {
@@ -310,7 +312,7 @@ layui.define(['common', 'tree', 'laypage', 'laytpl', 'upload', 'admin', 'form', @@ -310,7 +312,7 @@ layui.define(['common', 'tree', 'laypage', 'laytpl', 'upload', 'admin', 'form',
310 yes: function (index, layero) { 312 yes: function (index, layero) {
311 var checks = table.checkStatus('protocol_table').data; 313 var checks = table.checkStatus('protocol_table').data;
312 var params = { 314 var params = {
313 - access_token: accessToken, 315 + accessToken: accessToken,
314 protocolCodes: checks.map(item => item.protocolCode).toString(), 316 protocolCodes: checks.map(item => item.protocolCode).toString(),
315 resTypeCode: data.id 317 resTypeCode: data.id
316 } 318 }
@@ -331,7 +333,7 @@ layui.define(['common', 'tree', 'laypage', 'laytpl', 'upload', 'admin', 'form', @@ -331,7 +333,7 @@ layui.define(['common', 'tree', 'laypage', 'laytpl', 'upload', 'admin', 'form',
331 //渲染上传组件 333 //渲染上传组件
332 var uploadIndex = upload.render({ 334 var uploadIndex = upload.render({
333 elem: '#btn-resManageImport' 335 elem: '#btn-resManageImport'
334 - , url: domainName + '/api-web/bResource/importFromTemplate?access_token=' + accessToken 336 + , url: domainName + '/api-web/bResource/importFromTemplate?accessToken=' + accessToken
335 , accept: 'file', 337 , accept: 'file',
336 before: function () { 338 before: function () {
337 loadIndex = layer.load(1, {shade: [0.6], content: '正在导入，请稍后...'}); 339 loadIndex = layer.load(1, {shade: [0.6], content: '正在导入，请稍后...'});
@@ -379,7 +381,7 @@ layui.define(['common', 'tree', 'laypage', 'laytpl', 'upload', 'admin', 'form', @@ -379,7 +381,7 @@ layui.define(['common', 'tree', 'laypage', 'laytpl', 'upload', 'admin', 'form',
379 } 381 }
380 layer.load(2); 382 layer.load(2);
381 admin.req({ 383 admin.req({
382 - url: `${common.domainName}/api-web/manage/restypeProtocol/getProtocolByResType?access_token=${accessToken}&resTypeCode=${data.id}`, 384 + url: `${common.domainName}/api-web/manage/restypeProtocol/getProtocolByResType?accessToken=${accessToken}&resTypeCode=${data.id}`,
383 success(response) { 385 success(response) {
384 layer.closeAll('loading'); 386 layer.closeAll('loading');
385 if (response && response.success) { 387 if (response && response.success) {
@@ -411,7 +413,7 @@ layui.define(['common', 'tree', 'laypage', 'laytpl', 'upload', 'admin', 'form', @@ -411,7 +413,7 @@ layui.define(['common', 'tree', 'laypage', 'laytpl', 'upload', 'admin', 'form',
411 } 413 }
412 } 414 }
413 Object.assign(params, { 415 Object.assign(params, {
414 - access_token: accessToken, 416 + accessToken: accessToken,
415 protocolCodes: checks.map(item => item.protocolCode).toString(), 417 protocolCodes: checks.map(item => item.protocolCode).toString(),
416 resTypeCode: data.id 418 resTypeCode: data.id
417 }); 419 });
@@ -461,9 +463,8 @@ layui.define(['common', 'tree', 'laypage', 'laytpl', 'upload', 'admin', 'form', @@ -461,9 +463,8 @@ layui.define(['common', 'tree', 'laypage', 'laytpl', 'upload', 'admin', 'form',
461 return false; 463 return false;
462 } 464 }
463 var loding = layer.load(2); 465 var loding = layer.load(2);
464 - admin.req({  
465 - type: "get",  
466 - url: common.domainName + '/api-web/manage/restemp/resourceTaskTemplate?resIds=' + resIds.toString() + '&taskId=' + taskId + '&checkTempId=' + checkTempId , 466 + $.ajax({
  467 + url: common.domainName + '/api-web/manage/restemp/resourceTaskTemplate?resIds=' + resIds.toString() + '&taskId=' + taskId + '&checkTempId=' + checkTempId + '&accessToken=' + accessToken,
467 success: function (res) { 468 success: function (res) {
468 layer.close(loding); 469 layer.close(loding);
469 layer.msg('配置成功', { 470 layer.msg('配置成功', {
@@ -475,29 +476,11 @@ layui.define(['common', 'tree', 'laypage', 'laytpl', 'upload', 'admin', 'form', @@ -475,29 +476,11 @@ layui.define(['common', 'tree', 'laypage', 'laytpl', 'upload', 'admin', 'form',
475 reloadTable(); 476 reloadTable();
476 }); 477 });
477 }, 478 },
478 - error: function (err) { 479 + error: function () {
479 layer.close(loding) 480 layer.close(loding)
480 layer.msg("配置失败！服务异常", {offset: '15px', icon: 7, time: 2000}); 481 layer.msg("配置失败！服务异常", {offset: '15px', icon: 7, time: 2000});
481 } 482 }
482 - });  
483 - // $.ajax({  
484 - // url: common.domainName + '/api-web/manage/restemp/resourceTaskTemplate?resIds=' + resIds.toString() + '&taskId=' + taskId + '&checkTempId=' + checkTempId + '&access_token=' + accessToken,  
485 - // success: function (res) {  
486 - // layer.close(loding);  
487 - // layer.msg('配置成功', {  
488 - // offset: '15px'  
489 - // , icon: 1  
490 - // , time: 1500  
491 - // }, function () {  
492 - // layer.closeAll();  
493 - // reloadTable();  
494 - // });  
495 - // },  
496 - // error: function () {  
497 - // layer.close(loding)  
498 - // layer.msg("配置失败！服务异常", {offset: '15px', icon: 7, time: 2000});  
499 - // }  
500 - // }) 483 + })
501 }) 484 })
502 } 485 }
503 }) 486 })
@@ -510,18 +493,25 @@ layui.define(['common', 'tree', 'laypage', 'laytpl', 'upload', 'admin', 'form', @@ -510,18 +493,25 @@ layui.define(['common', 'tree', 'laypage', 'laytpl', 'upload', 'admin', 'form',
510 $.each(data, function (i, e) { 493 $.each(data, function (i, e) {
511 resIds.push(e.resId) 494 resIds.push(e.resId)
512 }) 495 })
513 - var url = "/vue3/index.html#/vue3/portSense";//不传参 496 + var url = "/monitor-web/vue3/index.html#/vue3/portSense";//不传参
514 if (data.length > 0) {//传参 497 if (data.length > 0) {//传参
515 - url = "/vue3/index.html#/vue3/portSense?resId=" + resIds.toString(); 498 + url = "/monitor-web/vue3/index.html#/vue3/portSense?resId=" + resIds.toString();
516 } 499 }
517 - layer.open({  
518 - type: 1  
519 - , title: '端口侦测'  
520 - , closeBtn: 1  
521 - , area: ['90%', '80%']  
522 - , id: 'lay_port_sense' //设定一个id，防止重复弹出  
523 - , content: '<iframe src=' + url + ' frameborder="0" class="layadmin-iframe"/>' //支持传入html  
524 - }); 500 + let win = window.parent;
  501 + if (win) {
  502 + window.parent.postMessage({
  503 + type: 'dialog',
  504 + message: {'params':{},'title':'端口侦测','url':url}
  505 + }, '*')
  506 + }
  507 + // layer.open({
  508 + // type: 1
  509 + // , title: '端口侦测'
  510 + // , closeBtn: 1
  511 + // , area: ['90%', '80%']
  512 + // , id: 'lay_port_sense' //设定一个id，防止重复弹出
  513 + // , content: '<iframe src=' + url + ' frameborder="0" class="layadmin-iframe"/>' //支持传入html
  514 + // });
525 }) 515 })
526 516
527 function openResManageCollHtml(callback) { 517 function openResManageCollHtml(callback) {
@@ -549,35 +539,8 @@ layui.define(['common', 'tree', 'laypage', 'laytpl', 'upload', 'admin', 'form', @@ -549,35 +539,8 @@ layui.define(['common', 'tree', 'laypage', 'laytpl', 'upload', 'admin', 'form',
549 resize: false, 539 resize: false,
550 area: ['50%', '40%'], 540 area: ['50%', '40%'],
551 success: function (indexm, layero) { 541 success: function (indexm, layero) {
552 - admin.req({  
553 - url: common.domainName + '/api-web/manage/task/page?page=-1&limit=-1' ,  
554 - success: function (res) {  
555 - $.each(res.data, function (i, e) {  
556 - var option = '<option value="' + e.taskId + '">' + e.taskName + '</option>'  
557 - $("#resChooseTaskSelect").append(option);  
558 - })  
559 - $("#resChooseTaskSelect").on("change", function () {  
560 - var $that = $(this);  
561 - $("#resChooseTaskTempSelect").empty();  
562 - $("#resChooseTaskTempSelect").append('<option value="">请选择</option>')  
563 - if ($that.val()) {  
564 - $.ajax({  
565 - url: common.domainName + '/api-web/manage/restemp/findByTaskId?taskId=' + $that.val() + '&access_token=' + accessToken,  
566 - success: function (tempRes) {  
567 - $.each(tempRes.data, function (k, j) {  
568 - var option = '<option value="' + j.checkTempId + '">' + j.taskId + '</option>'  
569 - $("#resChooseTaskTempSelect").append(option);  
570 - })  
571 - }  
572 - })  
573 - }  
574 - })  
575 - },  
576 - error: function (err) {  
577 - }  
578 - });  
579 - // $.ajax({  
580 - // url: common.domainName + '/api-web/manage/task/page?page=-1&limit=-1&access_token=' + accessToken, 542 + // admin.req({
  543 + // url: common.domainName + '/api-web/manage/task/page?page=-1&limit=-1' ,
581 // success: function (res) { 544 // success: function (res) {
582 // $.each(res.data, function (i, e) { 545 // $.each(res.data, function (i, e) {
583 // var option = '<option value="' + e.taskId + '">' + e.taskName + '</option>' 546 // var option = '<option value="' + e.taskId + '">' + e.taskName + '</option>'
@@ -599,8 +562,35 @@ layui.define(['common', 'tree', 'laypage', 'laytpl', 'upload', 'admin', 'form', @@ -599,8 +562,35 @@ layui.define(['common', 'tree', 'laypage', 'laytpl', 'upload', 'admin', 'form',
599 // }) 562 // })
600 // } 563 // }
601 // }) 564 // })
  565 + // },
  566 + // error: function (err) {
602 // } 567 // }
603 - // }) 568 + // });
  569 + $.ajax({
  570 + url: common.domainName + '/api-web/manage/task/page?page=-1&limit=-1&accessToken=' + accessToken,
  571 + success: function (res) {
  572 + $.each(res.data, function (i, e) {
  573 + var option = '<option value="' + e.taskId + '">' + e.taskName + '</option>'
  574 + $("#resChooseTaskSelect").append(option);
  575 + })
  576 + $("#resChooseTaskSelect").on("change", function () {
  577 + var $that = $(this);
  578 + $("#resChooseTaskTempSelect").empty();
  579 + $("#resChooseTaskTempSelect").append('<option value="">请选择</option>')
  580 + if ($that.val()) {
  581 + $.ajax({
  582 + url: common.domainName + '/api-web/manage/restemp/findByTaskId?taskId=' + $that.val() + '&accessToken=' + accessToken,
  583 + success: function (tempRes) {
  584 + $.each(tempRes.data, function (k, j) {
  585 + var option = '<option value="' + j.checkTempId + '">' + j.taskId + '</option>'
  586 + $("#resChooseTaskTempSelect").append(option);
  587 + })
  588 + }
  589 + })
  590 + }
  591 + })
  592 + }
  593 + })
604 }, 594 },
605 yes: function (index, layero) { 595 yes: function (index, layero) {
606 if (callback && callback()) { 596 if (callback && callback()) {
@@ -951,7 +941,7 @@ layui.define(['common', 'tree', 'laypage', 'laytpl', 'upload', 'admin', 'form', @@ -951,7 +941,7 @@ layui.define(['common', 'tree', 'laypage', 'laytpl', 'upload', 'admin', 'form',
951 , id: 'resManageTable' 941 , id: 'resManageTable'
952 , url: common.domainName + '/api-web/home/res-list/' + resType 942 , url: common.domainName + '/api-web/home/res-list/' + resType
953 , where: { 943 , where: {
954 - access_token: accessToken, 944 + accessToken: accessToken,
955 editMode: 'true', 945 editMode: 'true',
956 resName: $("#resManageIndexForm").find("input[name='resName']").val() ? $("#resManageIndexForm").find("input[name='resName']").val() : searchId, 946 resName: $("#resManageIndexForm").find("input[name='resName']").val() ? $("#resManageIndexForm").find("input[name='resName']").val() : searchId,
957 ipOrManageIp: $("#resManageIndexForm").find("input[name='ipOrManageIp']").val(), 947 ipOrManageIp: $("#resManageIndexForm").find("input[name='ipOrManageIp']").val(),
@@ -1016,7 +1006,7 @@ layui.define(['common', 'tree', 'laypage', 'laytpl', 'upload', 'admin', 'form', @@ -1016,7 +1006,7 @@ layui.define(['common', 'tree', 'laypage', 'laytpl', 'upload', 'admin', 'form',
1016 }); 1006 });
1017 $('[resmanage-data-console]').unbind("click").on('click', function () { 1007 $('[resmanage-data-console]').unbind("click").on('click', function () {
1018 var resId = $(this).attr("resmanage-data-console"); 1008 var resId = $(this).attr("resmanage-data-console");
1019 - window.open('/src/lib/extend/ssh/page/webssh.html?resId=' + resId, "_blank"); 1009 + window.open('/monitor-web/src/lib/extend/ssh/page/webssh.html?resId=' + resId, "_blank");
1020 }); 1010 });
1021 $('[resmanage-data-stopcoll]').unbind("click").on('click', function () { 1011 $('[resmanage-data-stopcoll]').unbind("click").on('click', function () {
1022 var $that = $(this) 1012 var $that = $(this)
@@ -1029,14 +1019,14 @@ layui.define(['common', 'tree', 'laypage', 'laytpl', 'upload', 'admin', 'form', @@ -1029,14 +1019,14 @@ layui.define(['common', 'tree', 'laypage', 'laytpl', 'upload', 'admin', 'form',
1029 resId: $that.attr("resmanage-data-stopcoll"), 1019 resId: $that.attr("resmanage-data-stopcoll"),
1030 state: $that.data("param") 1020 state: $that.data("param")
1031 } 1021 }
1032 - admin.req({  
1033 - url: common.domainName + '/api-web/manage/resource/stopOrStartColl'  
1034 - ,data: JSON.stringify(opj) 1022 + $.ajax({
  1023 + url: common.domainName + '/api-web/manage/resource/stopOrStartColl?accessToken=' + accessToken
  1024 + , data: JSON.stringify(opj)
1035 , type: 'post' 1025 , type: 'post'
1036 - , contentType: "application/json; charset=utf-8",  
1037 - success: function (res) { 1026 + , contentType: "application/json; charset=utf-8"
  1027 + , success: function (res) {
  1028 + layer.close(loding);
1038 if (res.success) { 1029 if (res.success) {
1039 - layer.close(loding);  
1040 layer.msg('操作成功', { 1030 layer.msg('操作成功', {
1041 offset: '15px' 1031 offset: '15px'
1042 , icon: 1 1032 , icon: 1
@@ -1053,32 +1043,7 @@ layui.define(['common', 'tree', 'laypage', 'laytpl', 'upload', 'admin', 'form', @@ -1053,32 +1043,7 @@ layui.define(['common', 'tree', 'laypage', 'laytpl', 'upload', 'admin', 'form',
1053 layer.closeAll(); 1043 layer.closeAll();
1054 console.error(res); 1044 console.error(res);
1055 } 1045 }
1056 - });  
1057 - // $.ajax({  
1058 - // url: common.domainName + '/api-web/manage/resource/stopOrStartColl?access_token=' + accessToken  
1059 - // , data: JSON.stringify(opj)  
1060 - // , type: 'post'  
1061 - // , contentType: "application/json; charset=utf-8"  
1062 - // , success: function (res) {  
1063 - // if (res.success) {  
1064 - // layer.close(loding);  
1065 - // layer.msg('操作成功', {  
1066 - // offset: '15px'  
1067 - // , icon: 1  
1068 - // , time: 1500  
1069 - // }, function () {  
1070 - // layer.closeAll();  
1071 - // reloadTable();  
1072 - // });  
1073 - // } else {  
1074 - // layer.msg('操作异常：' + res.msg, {icon: 7, time: 3000});  
1075 - // }  
1076 - // },  
1077 - // error: function (res) {  
1078 - // layer.closeAll();  
1079 - // console.error(res);  
1080 - // }  
1081 - // }) 1046 + })
1082 }); 1047 });
1083 }); 1048 });
1084 // 加入/移出收藏夹 1049 // 加入/移出收藏夹
@@ -1523,11 +1488,10 @@ layui.define(['common', 'tree', 'laypage', 'laytpl', 'upload', 'admin', 'form', @@ -1523,11 +1488,10 @@ layui.define(['common', 'tree', 'laypage', 'laytpl', 'upload', 'admin', 'form',
1523 subIds: formdata.subIds 1488 subIds: formdata.subIds
1524 } 1489 }
1525 var loding = layer.load(2); 1490 var loding = layer.load(2);
1526 - admin.req({  
1527 - //修改扩展字段T3/IOp值  
1528 - url: common.domainName + '/api-web/manage/resource/saveResAlarmAndTaskInfo', 1491 + $.ajax({
  1492 + url: common.domainName + `/api-web/manage/resource/saveResAlarmAndTaskInfo?${tokenKey}=${accessToken}` ,
1529 data: param, 1493 data: param,
1530 - success: function (response) { 1494 + success: function (res) {
1531 layer.msg('配置成功', {offset: '15px', icon: 1, time: 2000}, function () { 1495 layer.msg('配置成功', {offset: '15px', icon: 1, time: 2000}, function () {
1532 layer.closeAll(); 1496 layer.closeAll();
1533 reloadTable(); 1497 reloadTable();
@@ -1537,27 +1501,10 @@ layui.define(['common', 'tree', 'laypage', 'laytpl', 'upload', 'admin', 'form', @@ -1537,27 +1501,10 @@ layui.define(['common', 'tree', 'laypage', 'laytpl', 'upload', 'admin', 'form',
1537 }); 1501 });
1538 1502
1539 }, 1503 },
1540 - error: function (err) { 1504 + error: function (res) {
1541 layer.close(loding); 1505 layer.close(loding);
1542 } 1506 }
1543 - });  
1544 - // $.ajax({  
1545 - // url: common.domainName + '/api-web/manage/resource/saveResAlarmAndTaskInfo?access_token=' + accessToken,  
1546 - // data: param,  
1547 - // success: function (res) {  
1548 - // layer.msg('配置成功', {offset: '15px', icon: 1, time: 2000}, function () {  
1549 - // layer.closeAll();  
1550 - // reloadTable();  
1551 - // if (next == '1') {  
1552 - // openResourceRelationConfigHtml(bean.resId, bean.resType)  
1553 - // }  
1554 - // });  
1555 - //  
1556 - // },  
1557 - // error: function (res) {  
1558 - // layer.close(loding);  
1559 - // }  
1560 - // }) 1507 + })
1561 }) 1508 })
1562 1509
1563 }, 1510 },
@@ -1613,7 +1560,7 @@ layui.define(['common', 'tree', 'laypage', 'laytpl', 'upload', 'admin', 'form', @@ -1613,7 +1560,7 @@ layui.define(['common', 'tree', 'laypage', 'laytpl', 'upload', 'admin', 'form',
1613 btn: ['关闭'], 1560 btn: ['关闭'],
1614 success: function (layero, index) { 1561 success: function (layero, index) {
1615 relationTableRender(resId) 1562 relationTableRender(resId)
1616 - var url = domainName + '/api-web/relationType/getAll?access_token=' + accessToken 1563 + var url = domainName + '/api-web/relationType/getAll?accessToken=' + accessToken
1617 var options = ''; 1564 var options = '';
1618 $.ajaxSettings.async = false; 1565 $.ajaxSettings.async = false;
1619 $.getJSON(url, function (res) { 1566 $.getJSON(url, function (res) {
@@ -1634,12 +1581,11 @@ layui.define(['common', 'tree', 'laypage', 'laytpl', 'upload', 'admin', 'form', @@ -1634,12 +1581,11 @@ layui.define(['common', 'tree', 'laypage', 'laytpl', 'upload', 'admin', 'form',
1634 layer.msg("请先选择关系类型！", {offset: '15px', icon: 7, time: 2000}); 1581 layer.msg("请先选择关系类型！", {offset: '15px', icon: 7, time: 2000});
1635 return false; 1582 return false;
1636 } 1583 }
1637 - admin.req({  
1638 - //修改扩展字段T3/IOp值 1584 + $.ajax({
1639 url: common.domainName + '/api-web/manage/resource/findResRelationByResId', 1585 url: common.domainName + '/api-web/manage/resource/findResRelationByResId',
1640 async: false, 1586 async: false,
1641 data: { 1587 data: {
1642 - access_token: accessToken, 1588 + accessToken: accessToken,
1643 resId: resId, 1589 resId: resId,
1644 reType: reType, 1590 reType: reType,
1645 page: 1, 1591 page: 1,
@@ -1649,26 +1595,8 @@ layui.define(['common', 'tree', 'laypage', 'laytpl', 'upload', 'admin', 'form', @@ -1649,26 +1595,8 @@ layui.define(['common', 'tree', 'laypage', 'laytpl', 'upload', 'admin', 'form',
1649 resIds = res.data.map(item => { 1595 resIds = res.data.map(item => {
1650 return item.targetId; 1596 return item.targetId;
1651 }) 1597 })
1652 - },  
1653 - error: function (err) {  
1654 } 1598 }
1655 - });  
1656 - // $.ajax({  
1657 - // url: common.domainName + '/api-web/manage/resource/findResRelationByResId',  
1658 - // async: false,  
1659 - // data: {  
1660 - // access_token: accessToken,  
1661 - // resId: resId,  
1662 - // reType: reType,  
1663 - // page: 1,  
1664 - // limit: -1  
1665 - // },  
1666 - // success: function (res) {  
1667 - // resIds = res.data.map(item => {  
1668 - // return item.targetId;  
1669 - // })  
1670 - // }  
1671 - // }) 1599 + })
1672 common.openWin("template/res/reslist", "选择资源", {oldData: resIds}, ["选择"], function () { 1600 common.openWin("template/res/reslist", "选择资源", {oldData: resIds}, ["选择"], function () {
1673 var reslist = layui.reslist({}); 1601 var reslist = layui.reslist({});
1674 var data = reslist.getData(); 1602 var data = reslist.getData();
@@ -1691,9 +1619,8 @@ layui.define(['common', 'tree', 'laypage', 'laytpl', 'upload', 'admin', 'form', @@ -1691,9 +1619,8 @@ layui.define(['common', 'tree', 'laypage', 'laytpl', 'upload', 'admin', 'form',
1691 reType: reType, 1619 reType: reType,
1692 arr: arr 1620 arr: arr
1693 } 1621 }
1694 - admin.req({  
1695 - //修改扩展字段T3/IOp值  
1696 - url: common.domainName + '/api-web/manage/resource/saveResRelation', 1622 + $.ajax({
  1623 + url: common.domainName + `/api-web/manage/resource/saveResRelation?${tokenKey}=${accessToken}` ,
1697 type: 'post', 1624 type: 'post',
1698 contentType: "application/json; charset=utf-8", 1625 contentType: "application/json; charset=utf-8",
1699 data: JSON.stringify(param), 1626 data: JSON.stringify(param),
@@ -1703,25 +1630,10 @@ layui.define(['common', 'tree', 'laypage', 'laytpl', 'upload', 'admin', 'form', @@ -1703,25 +1630,10 @@ layui.define(['common', 'tree', 'laypage', 'laytpl', 'upload', 'admin', 'form',
1703 relationTableRender(resId); 1630 relationTableRender(resId);
1704 }); 1631 });
1705 }, 1632 },
1706 - error: function (err) { 1633 + error: function (res) {
1707 layer.close(loding); 1634 layer.close(loding);
1708 } 1635 }
1709 - });  
1710 - // $.ajax({  
1711 - // url: common.domainName + '/api-web/manage/resource/saveResRelation?access_token=' + accessToken,  
1712 - // type: 'post',  
1713 - // contentType: "application/json; charset=utf-8",  
1714 - // data: JSON.stringify(param),  
1715 - // success: function (res) {  
1716 - // layer.msg('保存成功！', {icon: 1, time: 1500}, function () {  
1717 - // layer.close(loding);  
1718 - // relationTableRender(resId);  
1719 - // });  
1720 - // },  
1721 - // error: function (res) {  
1722 - // layer.close(loding);  
1723 - // }  
1724 - // }) 1636 + })
1725 return true; 1637 return true;
1726 }) 1638 })
1727 }) 1639 })
@@ -1732,7 +1644,7 @@ layui.define(['common', 'tree', 'laypage', 'laytpl', 'upload', 'admin', 'form', @@ -1732,7 +1644,7 @@ layui.define(['common', 'tree', 'laypage', 'laytpl', 'upload', 'admin', 'form',
1732 elem: '#resource_relation_add_table' 1644 elem: '#resource_relation_add_table'
1733 , url: common.domainName + '/api-web/manage/resource/findResRelationByResId' 1645 , url: common.domainName + '/api-web/manage/resource/findResRelationByResId'
1734 , where: { 1646 , where: {
1735 - access_token: accessToken, 1647 + accessToken: accessToken,
1736 resId: resId, 1648 resId: resId,
1737 reType: $('input[name="res_retype"]:checked').val(), 1649 reType: $('input[name="res_retype"]:checked').val(),
1738 } 1650 }
@@ -1775,7 +1687,7 @@ layui.define(['common', 'tree', 'laypage', 'laytpl', 'upload', 'admin', 'form', @@ -1775,7 +1687,7 @@ layui.define(['common', 'tree', 'laypage', 'laytpl', 'upload', 'admin', 'form',
1775 $('.delete_resRelation').unbind().on('click', function (el) { 1687 $('.delete_resRelation').unbind().on('click', function (el) {
1776 var id = $(this).data('id'); 1688 var id = $(this).data('id');
1777 var deleteLoding = layer.load(2) 1689 var deleteLoding = layer.load(2)
1778 - var url = common.domainName + '/api-web/manage/resource/deleteResRelation?access_token=' + accessToken + '&id=' + id; 1690 + var url = common.domainName + '/api-web/manage/resource/deleteResRelation?accessToken=' + accessToken + '&id=' + id;
1779 $.get(url, function (res) { 1691 $.get(url, function (res) {
1780 if (res.success) { 1692 if (res.success) {
1781 layer.close(deleteLoding); 1693 layer.close(deleteLoding);
@@ -2022,7 +1934,7 @@ layui.define(['common', 'tree', 'laypage', 'laytpl', 'upload', 'admin', 'form', @@ -2022,7 +1934,7 @@ layui.define(['common', 'tree', 'laypage', 'laytpl', 'upload', 'admin', 'form',
2022 curr: 1 1934 curr: 1
2023 } 1935 }
2024 , where: { //请求参数（注意：这里面的参数可任意定义，并非下面固定的格式） 1936 , where: { //请求参数（注意：这里面的参数可任意定义，并非下面固定的格式）
2025 - access_token: accessToken, 1937 + accessToken: accessToken,
2026 resName: $("#resManageIndexForm").find("input[name='resName']").val(), 1938 resName: $("#resManageIndexForm").find("input[name='resName']").val(),
2027 ipOrManageIp: $("#resManageIndexForm").find("input[name='ipOrManageIp']").val(), 1939 ipOrManageIp: $("#resManageIndexForm").find("input[name='ipOrManageIp']").val(),
2028 // admin: $("#resManageIndexForm").find("input[name='admin']").val(), 1940 // admin: $("#resManageIndexForm").find("input[name='admin']").val(),
@@ -2075,9 +1987,8 @@ layui.define(['common', 'tree', 'laypage', 'laytpl', 'upload', 'admin', 'form', @@ -2075,9 +1987,8 @@ layui.define(['common', 'tree', 'laypage', 'laytpl', 'upload', 'admin', 'form',
2075 extend: extend 1987 extend: extend
2076 } 1988 }
2077 var loding = layer.load(2) 1989 var loding = layer.load(2)
2078 - admin.req({  
2079 - //修改扩展字段T3/IOp值  
2080 - url: common.domainName + '/api-web/manage/resource/save', 1990 + $.ajax({
  1991 + url: common.domainName + '/api-web/manage/resource/save?accessToken=' + accessToken,
2081 type: 'post', 1992 type: 'post',
2082 data: JSON.stringify(param), 1993 data: JSON.stringify(param),
2083 contentType: "application/json;charset=utf-8", 1994 contentType: "application/json;charset=utf-8",
@@ -2092,30 +2003,10 @@ layui.define(['common', 'tree', 'laypage', 'laytpl', 'upload', 'admin', 'form', @@ -2092,30 +2003,10 @@ layui.define(['common', 'tree', 'laypage', 'laytpl', 'upload', 'admin', 'form',
2092 } 2003 }
2093 }); 2004 });
2094 }, 2005 },
2095 - error: function (err) { 2006 + error: function (res) {
2096 layer.close(loding) 2007 layer.close(loding)
2097 } 2008 }
2098 - });  
2099 - // $.ajax({  
2100 - // url: common.domainName + '/api-web/manage/resource/save?access_token=' + accessToken,  
2101 - // type: 'post',  
2102 - // data: JSON.stringify(param),  
2103 - // contentType: "application/json;charset=utf-8",  
2104 - // success: function (res) {  
2105 - // layer.close(loding)  
2106 - // layer.msg('保存成功！', {icon: 1, time: 1500}, function () {  
2107 - // layer.closeAll();  
2108 - // reloadTable();  
2109 - // if (next == '1') {  
2110 - // //openCollTaskAndAlarm(res.object)  
2111 - // openResourceRelationConfigHtml(res.object.resId, res.object.resType)  
2112 - // }  
2113 - // });  
2114 - // },  
2115 - // error: function (res) {  
2116 - // layer.close(loding)  
2117 - // }  
2118 - // }) 2009 + })
2119 } 2010 }
2120 2011
2121 //资源协议验证 2012 //资源协议验证
@@ -82,7 +82,7 @@ layui.define(['table', 'form', 'sessions', 'common', 'view', 'admin', 'taskadd'] @@ -82,7 +82,7 @@ layui.define(['table', 'form', 'sessions', 'common', 'view', 'admin', 'taskadd']
82 elem: '#task-table', 82 elem: '#task-table',
83 url: domainName + '/api-web/manage/task/page', 83 url: domainName + '/api-web/manage/task/page',
84 where: { 84 where: {
85 - access_token: accessToken, 85 + accessToken: accessToken,
86 keyword: $('#condition-task-name').val(), 86 keyword: $('#condition-task-name').val(),
87 resId: resId, 87 resId: resId,
88 haveNotCollector: haveNotCollector 88 haveNotCollector: haveNotCollector
@@ -12,7 +12,8 @@ layui.define(['table', 'form', 'admin', 'layer', 'upload', 'common', 'sessions', @@ -12,7 +12,8 @@ layui.define(['table', 'form', 'admin', 'layer', 'upload', 'common', 'sessions',
12 //对外暴露的接口 12 //对外暴露的接口
13 exports('userIndex', function (data) { 13 exports('userIndex', function (data) {
14 var sessions = layui.sessions; 14 var sessions = layui.sessions;
15 - var accessToken = sessions.getToken()['access_token']; 15 + // var accessToken = sessions.getToken()['access_token'];
  16 + var accessToken = common.getMjToken();
16 var userResTable = {}; 17 var userResTable = {};
17 var userindexOrgSel = {}; 18 var userindexOrgSel = {};
18 var userroleSelect = {} 19 var userroleSelect = {}
@@ -63,9 +64,8 @@ layui.define(['table', 'form', 'admin', 'layer', 'upload', 'common', 'sessions', @@ -63,9 +64,8 @@ layui.define(['table', 'form', 'admin', 'layer', 'upload', 'common', 'sessions',
63 64
64 //新增 65 //新增
65 $('#addUserBtn').unbind().on('click', function () { 66 $('#addUserBtn').unbind().on('click', function () {
66 - if ($.inArray('back:user:save', permissionList) == -1) {  
67 - layer.msg('暂无权限', {icon: 7, time: 3000})  
68 - return false; 67 + if (!common.hasPermission('back:user:save')){
  68 + return;
69 } 69 }
70 openUserForm() 70 openUserForm()
71 }) 71 })
@@ -77,55 +77,49 @@ layui.define(['table', 'form', 'admin', 'layer', 'upload', 'common', 'sessions', @@ -77,55 +77,49 @@ layui.define(['table', 'form', 'admin', 'layer', 'upload', 'common', 'sessions',
77 77
78 //冻结 78 //冻结
79 $('#disableUserBtn').on('click', function () { 79 $('#disableUserBtn').on('click', function () {
80 - if ($.inArray('back:user:operating', permissionList) == -1) {  
81 - layer.msg('暂无权限', {icon: 7, time: 3000})  
82 - return false; 80 + if (!common.hasPermission('back:user:operating')){
  81 + return;
83 } 82 }
84 disableUser() 83 disableUser()
85 }) 84 })
86 85
87 //恢复 86 //恢复
88 $('#recoverUserBtn').on('click', function () { 87 $('#recoverUserBtn').on('click', function () {
89 - if ($.inArray('back:user:operating', permissionList) == -1) {  
90 - layer.msg('暂无权限', {icon: 7, time: 3000})  
91 - return false; 88 + if (!common.hasPermission('back:user:operating')){
  89 + return;
92 } 90 }
93 recoverUser() 91 recoverUser()
94 }) 92 })
95 93
96 //下载模板 94 //下载模板
97 $('#user_temp_download').on('click', function () { 95 $('#user_temp_download').on('click', function () {
98 - if ($.inArray('back:user:operating', permissionList) == -1) {  
99 - layer.msg('暂无权限', {icon: 7, time: 3000})  
100 - return false; 96 + if (!common.hasPermission('back:user:operating')){
  97 + return;
101 } 98 }
102 - var url = domainName + '/api-user/users/userTemp-download?access_token=' + accessToken; 99 + var url = domainName + '/api-user/users/userTemp-download?accessToken=' + accessToken;
103 window.open(url); 100 window.open(url);
104 }) 101 })
105 102
106 //资源类型授权 103 //资源类型授权
107 $('#user_resType_authorization').unbind().on('click', function () { 104 $('#user_resType_authorization').unbind().on('click', function () {
108 - if ($.inArray('back:user:impower', permissionList) == -1) {  
109 - layer.msg('暂无权限', {icon: 7, time: 3000})  
110 - return false; 105 + if (!common.hasPermission('back:user:impower')){
  106 + return;
111 } 107 }
112 resTypeAuthorization() 108 resTypeAuthorization()
113 }) 109 })
114 110
115 //业务类型授权 111 //业务类型授权
116 $('#user_busType_authorization').unbind().on('click', function () { 112 $('#user_busType_authorization').unbind().on('click', function () {
117 - if ($.inArray('back:user:impower', permissionList) == -1) {  
118 - layer.msg('暂无权限', {icon: 7, time: 3000})  
119 - return false; 113 + if (!common.hasPermission('back:user:impower')){
  114 + return;
120 } 115 }
121 busTypeAuthorization() 116 busTypeAuthorization()
122 }) 117 })
123 118
124 //资源授权 119 //资源授权
125 $('#user_resource_authorization').unbind().on('click', function () { 120 $('#user_resource_authorization').unbind().on('click', function () {
126 - if ($.inArray('back:user:impower', permissionList) == -1) {  
127 - layer.msg('暂无权限', {icon: 7, time: 3000})  
128 - return false; 121 + if (!common.hasPermission('back:user:impower')){
  122 + return;
129 } 123 }
130 resourceAuthorization() 124 resourceAuthorization()
131 }) 125 })
@@ -133,14 +127,23 @@ layui.define(['table', 'form', 'admin', 'layer', 'upload', 'common', 'sessions', @@ -133,14 +127,23 @@ layui.define(['table', 'form', 'admin', 'layer', 'upload', 'common', 'sessions',
133 //渲染表格 127 //渲染表格
134 var userTable = table.render({ 128 var userTable = table.render({
135 elem: '#user_table', 129 elem: '#user_table',
136 - url: domainName + "/api-user/users", 130 + url: domainName + "/mj/user/page",
137 where: { 131 where: {
138 - access_token: accessToken, 132 + accessToken: accessToken,
139 username: $('#userSearchForm').find("input[name='username']").val(), 133 username: $('#userSearchForm').find("input[name='username']").val(),
140 nickname: $('#userSearchForm').find("input[name='nickname']").val(), 134 nickname: $('#userSearchForm').find("input[name='nickname']").val(),
141 enabled: $('#userSearchForm').find("select[name='enabled']").val(), 135 enabled: $('#userSearchForm').find("select[name='enabled']").val(),
142 orgId: userindexOrgSel.getValue("valueStr"), 136 orgId: userindexOrgSel.getValue("valueStr"),
143 roles: userroleSelect.getValue("valueStr"), 137 roles: userroleSelect.getValue("valueStr"),
  138 + perPage: 10000
  139 + },
  140 + parseData:function(res){ // 解析请求到的结果 在return 中也可以返回自己想要的东西
  141 + return{
  142 + "code":0, // 这个0 一定是数字类型的
  143 + "msg":"",
  144 + "count":res.data.count,
  145 + "data":res.data.rows, // 注意此处res为对象包含 code msg data
  146 + }
144 }, 147 },
145 height: 'full-200', 148 height: 'full-200',
146 cellMinWidth: 80, 149 cellMinWidth: 80,
@@ -208,9 +211,8 @@ layui.define(['table', 'form', 'admin', 'layer', 'upload', 'common', 'sessions', @@ -208,9 +211,8 @@ layui.define(['table', 'form', 'admin', 'layer', 'upload', 'common', 'sessions',
208 done: function (res, curr, count) { 211 done: function (res, curr, count) {
209 //点击用户名编辑表单 212 //点击用户名编辑表单
210 $('.user_name_btn').on('click', function () { 213 $('.user_name_btn').on('click', function () {
211 - if ($.inArray('back:user:update', permissionList) == -1) {  
212 - layer.msg('暂无权限', {icon: 7, time: 3000})  
213 - return false; 214 + if (!common.hasPermission('back:user:update')){
  215 + return;
214 } 216 }
215 var id = $(this).data('id') 217 var id = $(this).data('id')
216 openUserForm(id) 218 openUserForm(id)
@@ -218,9 +220,8 @@ layui.define(['table', 'form', 'admin', 'layer', 'upload', 'common', 'sessions', @@ -218,9 +220,8 @@ layui.define(['table', 'form', 'admin', 'layer', 'upload', 'common', 'sessions',
218 220
219 //点击角色为用户分配角色 221 //点击角色为用户分配角色
220 $('.user_roles_btn').on('click', function () { 222 $('.user_roles_btn').on('click', function () {
221 - if ($.inArray('back:user:setRole', permissionList) == -1) {  
222 - layer.msg('暂无权限', {icon: 7, time: 3000})  
223 - return false; 223 + if (!common.hasPermission('back:user:setRole')){
  224 + return;
224 } 225 }
225 var id = $(this).data('id') 226 var id = $(this).data('id')
226 setRoles(id) 227 setRoles(id)
@@ -228,9 +229,8 @@ layui.define(['table', 'form', 'admin', 'layer', 'upload', 'common', 'sessions', @@ -228,9 +229,8 @@ layui.define(['table', 'form', 'admin', 'layer', 'upload', 'common', 'sessions',
228 229
229 //修改密码 230 //修改密码
230 $('.user_pass_btn').on('click', function () { 231 $('.user_pass_btn').on('click', function () {
231 - if ($.inArray('back:user:password', permissionList) == -1) {  
232 - layer.msg('暂无权限', {icon: 7, time: 3000})  
233 - return false; 232 + if (!common.hasPermission('back:user:password')){
  233 + return;
234 } 234 }
235 var id = $(this).data('id'); 235 var id = $(this).data('id');
236 var username = $(this).data('username'); 236 var username = $(this).data('username');
@@ -244,33 +244,30 @@ layui.define(['table', 'form', 'admin', 'layer', 'upload', 'common', 'sessions', @@ -244,33 +244,30 @@ layui.define(['table', 'form', 'admin', 'layer', 'upload', 'common', 'sessions',
244 }) 244 })
245 //资源类型授权 joke add 20210426 245 //资源类型授权 joke add 20210426
246 $('.user_resType_authorization_btn').unbind().on('click', function () { 246 $('.user_resType_authorization_btn').unbind().on('click', function () {
247 - if ($.inArray('back:user:impower', permissionList) == -1) {  
248 - layer.msg('暂无权限', {icon: 7, time: 3000})  
249 - return false; 247 + if (!common.hasPermission('back:user:impower')){
  248 + return;
250 } 249 }
251 resTypeAuthorization($(this).data('username')); 250 resTypeAuthorization($(this).data('username'));
252 }); 251 });
253 252
254 //业务类型授权 joke add 20210426 253 //业务类型授权 joke add 20210426
255 $('.user_busType_authorization_btn').unbind().on('click', function () { 254 $('.user_busType_authorization_btn').unbind().on('click', function () {
256 - if ($.inArray('back:user:impower', permissionList) == -1) {  
257 - layer.msg('暂无权限', {icon: 7, time: 3000})  
258 - return false; 255 + if (!common.hasPermission('back:user:impower')){
  256 + return;
259 } 257 }
260 busTypeAuthorization($(this).data('username')) 258 busTypeAuthorization($(this).data('username'))
261 }); 259 });
262 260
263 //资源授权 joke add 20210426 261 //资源授权 joke add 20210426
264 $('.user_resource_authorization_btn').unbind().on('click', function () { 262 $('.user_resource_authorization_btn').unbind().on('click', function () {
265 - if ($.inArray('back:user:impower', permissionList) == -1) {  
266 - layer.msg('暂无权限', {icon: 7, time: 3000})  
267 - return false; 263 + if (!common.hasPermission('back:user:impower')){
  264 + return;
268 } 265 }
269 resourceAuthorization($(this).data('username')) 266 resourceAuthorization($(this).data('username'))
270 }); 267 });
271 //资源授权的回显 268 //资源授权的回显
272 if (data && data.resIds && data.resIds.split(',').length == 1) { 269 if (data && data.resIds && data.resIds.split(',').length == 1) {
273 - var url = common.domainName + "/api-web/manage/resource/getUserIdsByResId?resId=" + data.resIds.split(',')[0] + '&access_token=' + accessToken 270 + var url = common.domainName + "/api-web/manage/resource/getUserIdsByResId?resId=" + data.resIds.split(',')[0] + '&accessToken=' + accessToken
274 $.ajax({ 271 $.ajax({
275 url: url, 272 url: url,
276 type: 'get', 273 type: 'get',
@@ -485,7 +482,7 @@ layui.define(['table', 'form', 'admin', 'layer', 'upload', 'common', 'sessions', @@ -485,7 +482,7 @@ layui.define(['table', 'form', 'admin', 'layer', 'upload', 'common', 'sessions',
485 482
486 layer.load(2); 483 layer.load(2);
487 admin.req({ 484 admin.req({
488 - url: domainName + '/api-web/defaultIndex/save?access_token=' + accessToken, 485 + url: domainName + '/api-web/defaultIndex/save?accessToken=' + accessToken,
489 type: 'POST', 486 type: 'POST',
490 contentType: 'application/json', 487 contentType: 'application/json',
491 data: JSON.stringify({ 488 data: JSON.stringify({
@@ -513,7 +510,7 @@ layui.define(['table', 'form', 'admin', 'layer', 'upload', 'common', 'sessions', @@ -513,7 +510,7 @@ layui.define(['table', 'form', 'admin', 'layer', 'upload', 'common', 'sessions',
513 btn2: function (layerIndex) { 510 btn2: function (layerIndex) {
514 layer.load(2); 511 layer.load(2);
515 admin.req({ 512 admin.req({
516 - url: domainName + '/api-web/defaultIndex/delete?access_token=' + accessToken, 513 + url: domainName + '/api-web/defaultIndex/delete?accessToken=' + accessToken,
517 data: { 514 data: {
518 type: 'user', 515 type: 'user',
519 targetId: username 516 targetId: username
@@ -552,7 +549,7 @@ layui.define(['table', 'form', 'admin', 'layer', 'upload', 'common', 'sessions', @@ -552,7 +549,7 @@ layui.define(['table', 'form', 'admin', 'layer', 'upload', 'common', 'sessions',
552 function reloadTable() { 549 function reloadTable() {
553 userTable.reload({ 550 userTable.reload({
554 where: { 551 where: {
555 - access_token: accessToken, 552 + accessToken: accessToken,
556 username: $('#userSearchForm').find("input[name='username']").val(), 553 username: $('#userSearchForm').find("input[name='username']").val(),
557 nickname: $('#userSearchForm').find("input[name='nickname']").val(), 554 nickname: $('#userSearchForm').find("input[name='nickname']").val(),
558 enabled: $('#userSearchForm').find("select[name='enabled']").val(), 555 enabled: $('#userSearchForm').find("select[name='enabled']").val(),
@@ -567,9 +564,8 @@ layui.define(['table', 'form', 'admin', 'layer', 'upload', 'common', 'sessions', @@ -567,9 +564,8 @@ layui.define(['table', 'form', 'admin', 'layer', 'upload', 'common', 'sessions',
567 564
568 //删除数据 565 //删除数据
569 function deleteUser(id) { 566 function deleteUser(id) {
570 - if ($.inArray('back:user:delete', permissionList) == -1) {  
571 - layer.msg('暂无权限', {icon: 7, time: 3000})  
572 - return false; 567 + if (!common.hasPermission('back:user:delete')){
  568 + return;
573 } 569 }
574 if (typeof (id) == "number") { 570 if (typeof (id) == "number") {
575 id = id.toString() 571 id = id.toString()
@@ -593,7 +589,7 @@ layui.define(['table', 'form', 'admin', 'layer', 'upload', 'common', 'sessions', @@ -593,7 +589,7 @@ layui.define(['table', 'form', 'admin', 'layer', 'upload', 'common', 'sessions',
593 btn: ['确定', '取消'] //按钮 589 btn: ['确定', '取消'] //按钮
594 }, function () { 590 }, function () {
595 $.ajax({ 591 $.ajax({
596 - url: common.domainName + '/api-user/users/delete?access_token=' + accessToken 592 + url: common.domainName + '/api-user/users/delete?accessToken=' + accessToken
597 , type: "get" 593 , type: "get"
598 , data: {ids: id} 594 , data: {ids: id}
599 }).done(function (res) { 595 }).done(function (res) {
@@ -627,7 +623,7 @@ layui.define(['table', 'form', 'admin', 'layer', 'upload', 'common', 'sessions', @@ -627,7 +623,7 @@ layui.define(['table', 'form', 'admin', 'layer', 'upload', 'common', 'sessions',
627 //初始化角色下拉列表框 623 //初始化角色下拉列表框
628 function initRolesSelect() { 624 function initRolesSelect() {
629 $.ajax({ 625 $.ajax({
630 - url: domainName + '/api-user/roles?access_token=' + accessToken, 626 + url: domainName + '/mj/sys/role/roles?name=&perPage=100&page=1&accessToken=' + accessToken,
631 async: false, 627 async: false,
632 success: function (res) { 628 success: function (res) {
633 userroleSelect = xmSelect.render({ 629 userroleSelect = xmSelect.render({
@@ -656,7 +652,7 @@ layui.define(['table', 'form', 'admin', 'layer', 'upload', 'common', 'sessions', @@ -656,7 +652,7 @@ layui.define(['table', 'form', 'admin', 'layer', 'upload', 'common', 'sessions',
656 }, 652 },
657 filterable: true, 653 filterable: true,
658 layVerType: 'msg', 654 layVerType: 'msg',
659 - data: res.data, 655 + data: res.data.rows,
660 }) 656 })
661 } 657 }
662 }) 658 })
@@ -666,7 +662,7 @@ layui.define(['table', 'form', 'admin', 'layer', 'upload', 'common', 'sessions', @@ -666,7 +662,7 @@ layui.define(['table', 'form', 'admin', 'layer', 'upload', 'common', 'sessions',
666 //TODO 目前先设置为非强制父子关系，后期讨论看用户列表查询如何根据组织查询 joke 20210423 662 //TODO 目前先设置为非强制父子关系，后期讨论看用户列表查询如何根据组织查询 joke 20210423
667 function initOrgSelect() { 663 function initOrgSelect() {
668 $.ajax({ 664 $.ajax({
669 - url: domainName + '/api-user/org/getOrgTreeByPid?access_token=' + accessToken, 665 + url: domainName + '/mj/sysOrg/orgTree?name=&accessToken=' + accessToken,
670 async: false, 666 async: false,
671 success: function (res) { 667 success: function (res) {
672 userindexOrgSel = xmSelect.render({ 668 userindexOrgSel = xmSelect.render({
@@ -118,10 +118,10 @@ @@ -118,10 +118,10 @@
118 <button class="layui-btn layui-btn-sm layui-btn-normal" id="resManageSub" type="button"><i 118 <button class="layui-btn layui-btn-sm layui-btn-normal" id="resManageSub" type="button"><i
119 class="layui-icon">&#xe678;</i>告警订阅 119 class="layui-icon">&#xe678;</i>告警订阅
120 </button> 120 </button>
121 - <button class="layui-btn layui-btn-sm layui-btn-normal" id="res-user-grant-btn"><i 121 + <button class="layui-btn layui-btn-sm layui-btn-normal layui-hide" id="res-user-grant-btn"><i
122 class="layui-icon">&#xe66f;</i>资源授权 122 class="layui-icon">&#xe66f;</i>资源授权
123 </button> 123 </button>
124 - <button class="layui-btn layui-btn-sm layui-btn-normal" id="res_relation_config"><i 124 + <button class="layui-btn layui-btn-sm layui-btn-normal layui-hide" id="res_relation_config"><i
125 class="layui-icon">&#xe630;</i>关系配置 125 class="layui-icon">&#xe630;</i>关系配置
126 </button> 126 </button>
127 <div class="right-btns" style="float: right"> 127 <div class="right-btns" style="float: right">
@@ -54,16 +54,16 @@ @@ -54,16 +54,16 @@
54 </div> 54 </div>
55 <div class="layui-card-body"> 55 <div class="layui-card-body">
56 <div class="warn-btns"> 56 <div class="warn-btns">
57 - <button class="layui-btn layui-btn-sm layui-btn-normal" id="addUserBtn" type="button"><i 57 + <button class="layui-btn layui-btn-sm layui-btn-normal layui-hide" id="addUserBtn" type="button"><i
58 class="layui-icon">&#xe654;</i>新增 58 class="layui-icon">&#xe654;</i>新增
59 </button> 59 </button>
60 - <button class="layui-btn layui-btn-sm layui-btn-normal" id="delUserBtn" type="button"><i 60 + <button class="layui-btn layui-btn-sm layui-btn-normal layui-hide" id="delUserBtn" type="button"><i
61 class="layui-icon">&#xe640;</i>删除 61 class="layui-icon">&#xe640;</i>删除
62 </button> 62 </button>
63 - <button class="layui-btn layui-btn-sm layui-btn-normal" id="disableUserBtn" type="button"><i 63 + <button class="layui-btn layui-btn-sm layui-btn-normal layui-hide" id="disableUserBtn" type="button"><i
64 class="layui-icon">&#xe651;</i>冻结 64 class="layui-icon">&#xe651;</i>冻结
65 </button> 65 </button>
66 - <button class="layui-btn layui-btn-sm layui-btn-normal" id="recoverUserBtn" type="button"><i 66 + <button class="layui-btn layui-btn-sm layui-btn-normal layui-hide" id="recoverUserBtn" type="button"><i
67 class="layui-icon">&#xe652;</i>恢复 67 class="layui-icon">&#xe652;</i>恢复
68 </button> 68 </button>
69 <!-- <button id="user_resType_authorization" type="button" class="layui-btn layui-btn-sm layui-btn-normal"><i--> 69 <!-- <button id="user_resType_authorization" type="button" class="layui-btn layui-btn-sm layui-btn-normal"><i-->
@@ -468,20 +468,33 @@ layui.define(['xmSelect', 'md5'], function (exports) { @@ -468,20 +468,33 @@ layui.define(['xmSelect', 'md5'], function (exports) {
468 renderCollProtocolSelect(targtetId, callback) { 468 renderCollProtocolSelect(targtetId, callback) {
469 var sessions = layui.sessions; 469 var sessions = layui.sessions;
470 var accessToken = sessions.getToken()['access_token']; 470 var accessToken = sessions.getToken()['access_token'];
471 - $.ajax({  
472 - url: obj.domainName + '/api-web/manage/protocol/page?page=1&limit=10000&access_token=' + accessToken,  
473 - success: function (res) {  
474 - if (res && res.data) {  
475 - res.data.forEach(function (v) {  
476 - var options = `<option value="${v.protocolCode}">${v.protocolName}</option>`  
477 - $('[id="' + targtetId + '"]').append(options);  
478 - })  
479 - if (callback) {  
480 - callback();  
481 - }  
482 - } 471 + admin.req({
  472 + url: obj.domainName + '/api-web/manage/protocol/page?page=1&limit=10000',
  473 + async: false,
  474 + }).done(function (res) {
  475 + if (res && res.data) {
  476 + res.data.forEach(function (v) {
  477 + var options = `<option value="${v.protocolCode}">${v.protocolName}</option>`
  478 + $('[id="' + targtetId + '"]').append(options);
  479 + })
483 } 480 }
484 - }) 481 + }).error(function (error) {
  482 + console.error(error);
  483 + });
  484 + // $.ajax({
  485 + // url: obj.domainName + '/api-web/manage/protocol/page?page=1&limit=10000&access_token=' + accessToken,
  486 + // success: function (res) {
  487 + // if (res && res.data) {
  488 + // res.data.forEach(function (v) {
  489 + // var options = `<option value="${v.protocolCode}">${v.protocolName}</option>`
  490 + // $('[id="' + targtetId + '"]').append(options);
  491 + // })
  492 + // if (callback) {
  493 + // callback();
  494 + // }
  495 + // }
  496 + // }
  497 + // })
485 }, 498 },
486 499
487 menuXmSelect: function (xmSelectParams, done, username_, roleId_) { 500 menuXmSelect: function (xmSelectParams, done, username_, roleId_) {