monitor_v3 / hg-monitor-web · Commits

Go to a project

Authored by zhangtianqi
Commit 678f03b01e2d049f08cabba9be6134e3578edd7a 2 parents 3657b873 421be557

Merge branch 'master-mj' of http://113.200.75.45:82/monitor_v3/hg-monitor-web into master-mj-ztq 

 Conflicts:
	hg-monitor-web-base/src/main/resources/static/src/controller/alarmsubscribeIndex.js
	hg-monitor-web-base/src/main/resources/static/src/controller/alarmtemplateIndex.js
	hg-monitor-web-base/src/main/resources/static/src/controller/bustype.js
	hg-monitor-web-base/src/main/resources/static/src/controller/collectorlist.js
	hg-monitor-web-base/src/main/resources/static/src/controller/ddicAdd.js
Inline Side-by-side
Showing 28 changed files with 41 additions and 41 deletions
@@ -299,7 +299,7 @@ layui.define(['form', 'admin', 'laydate', 'common', 'sessions', 'reskpilist'], f @@ -299,7 +299,7 @@ layui.define(['form', 'admin', 'laydate', 'common', 'sessions', 'reskpilist'], f
299 "kpiId": data.kpiId 299 "kpiId": data.kpiId
300 } 300 }
301 admin.req({ 301 admin.req({
302 - url: domainName + '/api-web/policyMerge/save?accessToken=' + accessToken 302 + url: domainName + '/api-web/policyMerge/save'
303 , data: JSON.stringify(noticeMergeData) 303 , data: JSON.stringify(noticeMergeData)
304 , type: 'post' 304 , type: 'post'
305 , contentType: "application/json; charset=utf-8" 305 , contentType: "application/json; charset=utf-8"
@@ -320,7 +320,7 @@ layui.define(['form', 'admin', 'laydate', 'common', 'sessions', 'reskpilist'], f @@ -320,7 +320,7 @@ layui.define(['form', 'admin', 'laydate', 'common', 'sessions', 'reskpilist'], f
320 form.on('submit(alarmpolicy-form-save-id)', function () { 320 form.on('submit(alarmpolicy-form-save-id)', function () {
321 delete data.noticeMergeFlagExpr; 321 delete data.noticeMergeFlagExpr;
322 admin.req({ 322 admin.req({
323 - url: domainName + '/api-web/alarmPolicy/save?accessToken=' + accessToken 323 + url: domainName + '/api-web/alarmPolicy/save'
324 , data: JSON.stringify(data) 324 , data: JSON.stringify(data)
325 , type: 'post' 325 , type: 'post'
326 , contentType: "application/json; charset=utf-8" 326 , contentType: "application/json; charset=utf-8"
@@ -369,7 +369,7 @@ layui.define(['form', 'admin', 'laydate', 'common', 'sessions', 'reskpilist', 't @@ -369,7 +369,7 @@ layui.define(['form', 'admin', 'laydate', 'common', 'sessions', 'reskpilist', 't
369 function initExprSelect() { 369 function initExprSelect() {
370 var options = '<option value="">=快速引用=</option>' 370 var options = '<option value="">=快速引用=</option>'
371 admin.req({ 371 admin.req({
372 - url: `${domainName}/api-web/manage/ddic/findSucDdics/alarm_expr?accessToken=${accessToken}`, 372 + url: `${domainName}/api-web/manage/ddic/findSucDdics/alarm_expr`,
373 method: 'POST', 373 method: 'POST',
374 success: function (res) { 374 success: function (res) {
375 if (res && res.data) { 375 if (res && res.data) {
@@ -392,7 +392,7 @@ layui.define(['table', 'form', 'admin', 'layer', 'common','sessions','xmSelect', @@ -392,7 +392,7 @@ layui.define(['table', 'form', 'admin', 'layer', 'common','sessions','xmSelect',
392 } 392 }
393 393
394 admin.req({ 394 admin.req({
395 - url: `${common.domainName}/api-web/manage/restype/list?accessToken=${accessToken}` 395 + url: `${common.domainName}/api-web/manage/restype/list`
396 ,type:"GET" 396 ,type:"GET"
397 }).done(function (res) { 397 }).done(function (res) {
398 // 资源类型下拉框 398 // 资源类型下拉框
@@ -355,7 +355,7 @@ layui.define(['form', 'admin', 'laydate', 'table', 'common', 'sessions', 'cron', @@ -355,7 +355,7 @@ layui.define(['form', 'admin', 'laydate', 'table', 'common', 'sessions', 'cron',
355 } 355 }
356 str = 1; 356 str = 1;
357 admin.req({ 357 admin.req({
358 - url: domainName + '/api-web/alarmsubscribe/save?accessToken=' + accessToken 358 + url: domainName + '/api-web/alarmsubscribe/save'
359 , data: JSON.stringify(data) 359 , data: JSON.stringify(data)
360 , type: 'post' 360 , type: 'post'
361 , contentType: "application/json; charset=utf-8" 361 , contentType: "application/json; charset=utf-8"
@@ -1010,7 +1010,7 @@ layui.define(['table', 'form', 'admin', 'layer', 'common', 'sessions'], function @@ -1010,7 +1010,7 @@ layui.define(['table', 'form', 'admin', 'layer', 'common', 'sessions'], function
1010 targetId: targetId 1010 targetId: targetId
1011 }; 1011 };
1012 admin.req({ 1012 admin.req({
1013 - url: common.domainName + '/api-web/bTypeSubscribe/insertOrChange', 1013 + url: common.domainName + '/api-web/bTypeSubscribe/insertOrChange?accessToken=' + accessToken,
1014 type: 'post', 1014 type: 'post',
1015 contentType: 'application/json', 1015 contentType: 'application/json',
1016 data: JSON.stringify(typeSubscribe), 1016 data: JSON.stringify(typeSubscribe),
@@ -36,7 +36,7 @@ layui.define(['form', 'table', 'admin', 'common', 'sessions'], function (exports @@ -36,7 +36,7 @@ layui.define(['form', 'table', 'admin', 'common', 'sessions'], function (exports
36 } 36 }
37 data.policyIds = policyIds.toString(); 37 data.policyIds = policyIds.toString();
38 admin.req({ 38 admin.req({
39 - url: domainName + '/api-web/alarmtemplate/save?accessToken=' + accessToken 39 + url: domainName + '/api-web/alarmtemplate/save'
40 , data: JSON.stringify(data) 40 , data: JSON.stringify(data)
41 , type: 'post' 41 , type: 'post'
42 , contentType: "application/json; charset=utf-8" 42 , contentType: "application/json; charset=utf-8"
@@ -146,7 +146,7 @@ layui.define(['table', 'form', 'admin', 'layer', 'laytpl', 'common', 'view', 'se @@ -146,7 +146,7 @@ layui.define(['table', 'form', 'admin', 'layer', 'laytpl', 'common', 'view', 'se
146 //初始化用户下拉列表框 146 //初始化用户下拉列表框
147 function initUserSelect() { 147 function initUserSelect() {
148 $.ajax({ 148 $.ajax({
149 - url: domainName + '/api-user/users/getAll?accessToken=' + accessToken, 149 + url: domainName + '/api-user/users/getAll',
150 async: false, // 接口请求导致，设置默认值出错 150 async: false, // 接口请求导致，设置默认值出错
151 success: function (res) { 151 success: function (res) {
152 userSelect = xmSelect.render({ 152 userSelect = xmSelect.render({
@@ -95,7 +95,7 @@ layui.define(['table', 'form', 'sessions', 'common', 'admin', 'reslist', 'alarms @@ -95,7 +95,7 @@ layui.define(['table', 'form', 'sessions', 'common', 'admin', 'reslist', 'alarms
95 }); 95 });
96 // 采集类型下拉框 96 // 采集类型下拉框
97 admin.req({ 97 admin.req({
98 - url: `${domainName}/api-web/manage/ddic/findSucDdics/collType?accessToken=${accessToken}`, 98 + url: `${domainName}/api-web/manage/ddic/findSucDdics/collType`,
99 method: 'POST', 99 method: 'POST',
100 async: false, 100 async: false,
101 success: function (res) { 101 success: function (res) {
@@ -610,7 +610,7 @@ layui.define(['xmSelect', 'md5'], function (exports) { @@ -610,7 +610,7 @@ layui.define(['xmSelect', 'md5'], function (exports) {
610 }); 610 });
611 var options = "<option value=''>=请选择=</option>"; 611 var options = "<option value=''>=请选择=</option>";
612 admin.req({ 612 admin.req({
613 - url: `${this.domainName}/api-web/manage/ddic/findSucDdics/${ddicCategory}?accessToken=${accessToken}` 613 + url: `${this.domainName}/api-web/manage/ddic/findSucDdics/${ddicCategory}`
614 , method: 'get' 614 , method: 'get'
615 }).done(function (res) { 615 }).done(function (res) {
616 if (res && res.data) { 616 if (res && res.data) {
@@ -73,7 +73,7 @@ layui.define(['laytpl', 'admin', 'form', 'table', 'echarts', 'sessions', 'xmSele @@ -73,7 +73,7 @@ layui.define(['laytpl', 'admin', 'form', 'table', 'echarts', 'sessions', 'xmSele
73 } 73 }
74 editKpiList = []; 74 editKpiList = [];
75 admin.req({ 75 admin.req({
76 - url: common.domainName + '/api-web/manage/ddic/findSucDdics/topoBindKpiIds?accessToken=' + accessToken 76 + url: common.domainName + '/api-web/manage/ddic/findSucDdics/topoBindKpiIds'
77 , method: 'POST' 77 , method: 'POST'
78 , async: false 78 , async: false
79 , success: function (res) { 79 , success: function (res) {
@@ -225,7 +225,7 @@ layui.define(['table', 'form', 'laydate', 'common', 'sessions', 'xmSelect', 'lay @@ -225,7 +225,7 @@ layui.define(['table', 'form', 'laydate', 'common', 'sessions', 'xmSelect', 'lay
225 var loading = layer.load(2); 225 var loading = layer.load(2);
226 $.ajax({ 226 $.ajax({
227 type: 'post', 227 type: 'post',
228 - url: common.domainName + '/inspection-report/dataSource/saveOrUpdate?accessToken=' + accessToken, 228 + url: common.domainName + '/inspection-report/dataSource/saveOrUpdate',
229 contentType: "application/json; charset=utf-8", 229 contentType: "application/json; charset=utf-8",
230 data: JSON.stringify(bean), 230 data: JSON.stringify(bean),
231 success: function (res) { 231 success: function (res) {
@@ -555,7 +555,7 @@ layui.define(['table', 'form', 'laydate', 'view', 'common', 'sessions', 'xmSelec @@ -555,7 +555,7 @@ layui.define(['table', 'form', 'laydate', 'view', 'common', 'sessions', 'xmSelec
555 var token = localStorage.getItem("access_token"); 555 var token = localStorage.getItem("access_token");
556 admin.req({ 556 admin.req({
557 type: 'get', 557 type: 'get',
558 - url: domainName + '/api-web/manage/ddic/findSucDdics/' + ddicCategory + '?accessToken=' + token, 558 + url: domainName + '/api-web/manage/ddic/findSucDdics/' + ddicCategory ,
559 contentType: "application/json; charset=utf-8", 559 contentType: "application/json; charset=utf-8",
560 success: callback 560 success: callback
561 }); 561 });
@@ -586,7 +586,7 @@ layui.define(['table', 'form', 'laydate', 'view', 'common', 'sessions', 'xmSelec @@ -586,7 +586,7 @@ layui.define(['table', 'form', 'laydate', 'view', 'common', 'sessions', 'xmSelec
586 //alert(token); 586 //alert(token);
587 admin.req({ 587 admin.req({
588 type: 'get', 588 type: 'get',
589 - url: domainName + '/api-web/manage/protocol/findProtocolList?accessToken=' + token, 589 + url: domainName + '/api-web/manage/protocol/findProtocolList',
590 contentType: "application/json; charset=utf-8", 590 contentType: "application/json; charset=utf-8",
591 success: function (res) { 591 success: function (res) {
592 var data = res.data; 592 var data = res.data;
@@ -630,7 +630,7 @@ layui.define(['table', 'form', 'laydate', 'view', 'common', 'sessions', 'xmSelec @@ -630,7 +630,7 @@ layui.define(['table', 'form', 'laydate', 'view', 'common', 'sessions', 'xmSelec
630 var token = localStorage.getItem("access_token"); 630 var token = localStorage.getItem("access_token");
631 admin.req({ 631 admin.req({
632 type: 'get', 632 type: 'get',
633 - url: domainName + '/api-web/manage/kpi/list?accessToken=' + token, 633 + url: domainName + '/api-web/manage/kpi/list',
634 contentType: "application/json; charset=utf-8", 634 contentType: "application/json; charset=utf-8",
635 success: function (res) { 635 success: function (res) {
636 layer.close(loding); 636 layer.close(loding);
@@ -659,7 +659,7 @@ layui.define(['table', 'form', 'laydate', 'view', 'common', 'sessions', 'xmSelec @@ -659,7 +659,7 @@ layui.define(['table', 'form', 'laydate', 'view', 'common', 'sessions', 'xmSelec
659 var token = localStorage.getItem("access_token"); 659 var token = localStorage.getItem("access_token");
660 admin.req({ 660 admin.req({
661 type: 'get', 661 type: 'get',
662 - url: domainName + '/api-web/manage/dirctive/findCollDirctiveById/' + id + '?accessToken=' + token + '&type=' + type, 662 + url: domainName + '/api-web/manage/dirctive/findCollDirctiveById/' + id + '?type=' + type,
663 contentType: "application/json; charset=utf-8", 663 contentType: "application/json; charset=utf-8",
664 success: function (res) { 664 success: function (res) {
665 if (res) { 665 if (res) {
@@ -585,7 +585,7 @@ layui.define(['table', 'form', 'admin', 'layer', 'common', 'sessions', 'treeTabl @@ -585,7 +585,7 @@ layui.define(['table', 'form', 'admin', 'layer', 'common', 'sessions', 'treeTabl
585 function obtain() { 585 function obtain() {
586 //获取用户数据 586 //获取用户数据
587 $.ajax({ 587 $.ajax({
588 - url: common.domainName + '/mj/user/getAll?accessToken=' + accessToken, 588 + url: common.domainName + '/mj/user/getAll',
589 async: false, 589 async: false,
590 data: {name: ''}, 590 data: {name: ''},
591 success: function (data) { 591 success: function (data) {
@@ -17,7 +17,7 @@ layui.define(['table', 'form', 'laydate', 'common', 'sessions', 'xmSelect', 'res @@ -17,7 +17,7 @@ layui.define(['table', 'form', 'laydate', 'common', 'sessions', 'xmSelect', 'res
17 17
18 var collectorSelect; 18 var collectorSelect;
19 $.ajax({ 19 $.ajax({
20 - url: common.domainName + '/api-web/bPing/getCollectorSelectItem?accessToken=' + accessToken, 20 + url: common.domainName + '/api-web/bPing/getCollectorSelectItem',
21 type: 'get', 21 type: 'get',
22 async: false, 22 async: false,
23 success: function (resultData) { 23 success: function (resultData) {
@@ -79,7 +79,7 @@ layui.define(['table', 'form', 'laydate', 'common', 'sessions', 'xmSelect', 'res @@ -79,7 +79,7 @@ layui.define(['table', 'form', 'laydate', 'common', 'sessions', 'xmSelect', 'res
79 submitData.collectorId = collectorSelect.getValue('value')[0]; 79 submitData.collectorId = collectorSelect.getValue('value')[0];
80 80
81 $.ajax({ 81 $.ajax({
82 - url: common.domainName + '/api-web/bHttp/http/info?accessToken=' + accessToken, 82 + url: common.domainName + '/api-web/bHttp/http/info',
83 type: 'post', 83 type: 'post',
84 data: JSON.stringify(submitData), 84 data: JSON.stringify(submitData),
85 contentType: "application/json;charset=UTF-8", 85 contentType: "application/json;charset=UTF-8",
@@ -104,7 +104,7 @@ layui.define(['table', 'form', 'laydate', 'common', 'sessions', 'xmSelect', 'res @@ -104,7 +104,7 @@ layui.define(['table', 'form', 'laydate', 'common', 'sessions', 'xmSelect', 'res
104 if (httpId && httpId.length) { 104 if (httpId && httpId.length) {
105 $.ajax({ 105 $.ajax({
106 async: false, 106 async: false,
107 - url: common.domainName + '/api-web/bHttp/http/info/' + httpId + '?accessToken=' + accessToken, 107 + url: common.domainName + '/api-web/bHttp/http/info/' + httpId,
108 type: 'get', 108 type: 'get',
109 success: function (res) { 109 success: function (res) {
110 if (res.msg && res.msg !== 'null' && res.code) { 110 if (res.msg && res.msg !== 'null' && res.code) {
@@ -132,7 +132,7 @@ layui.define(['table', 'form', 'laydate', 'common', 'sessions', 'xmSelect', 'res @@ -132,7 +132,7 @@ layui.define(['table', 'form', 'laydate', 'common', 'sessions', 'xmSelect', 'res
132 submitData.header = requestHeader; 132 submitData.header = requestHeader;
133 submitData.param = requestParameter; 133 submitData.param = requestParameter;
134 $.ajax({ 134 $.ajax({
135 - url: common.domainName + '/api-web/bHttp/saveOrUpdate?accessToken=' + accessToken, 135 + url: common.domainName + '/api-web/bHttp/saveOrUpdate',
136 type: 'post', 136 type: 'post',
137 data: JSON.stringify(submitData), 137 data: JSON.stringify(submitData),
138 contentType: "application/json;charset=UTF-8", 138 contentType: "application/json;charset=UTF-8",
@@ -20,7 +20,7 @@ layui.define(['table', 'admin', 'form', 'laydate', 'common', 'sessions', 'xmSele @@ -20,7 +20,7 @@ layui.define(['table', 'admin', 'form', 'laydate', 'common', 'sessions', 'xmSele
20 //初始化下拉框数据 20 //初始化下拉框数据
21 function initSelect() { 21 function initSelect() {
22 admin.req({ 22 admin.req({
23 - url: common.domainName + '/api-web/manage/kpi/initSelect?accessToken=' + accessToken, 23 + url: common.domainName + '/api-web/manage/kpi/initSelect',
24 async: false, 24 async: false,
25 type: 'get', 25 type: 'get',
26 success: function (res) { 26 success: function (res) {
@@ -34,7 +34,7 @@ layui.define(['table', 'admin', 'form', 'laydate', 'common', 'sessions', 'xmSele @@ -34,7 +34,7 @@ layui.define(['table', 'admin', 'form', 'laydate', 'common', 'sessions', 'xmSele
34 form.render(); 34 form.render();
35 if (kpiId) { 35 if (kpiId) {
36 admin.req({ 36 admin.req({
37 - url: common.domainName + '/api-web/manage/kpi/findById?accessToken=' + accessToken, 37 + url: common.domainName + '/api-web/manage/kpi/findById',
38 data: {"kpiId": kpiId}, 38 data: {"kpiId": kpiId},
39 success: function (res) { 39 success: function (res) {
40 //初始化下拉框后再判断是否为编辑需要回填数据否 40 //初始化下拉框后再判断是否为编辑需要回填数据否
@@ -51,7 +51,7 @@ layui.define(['table', 'form', 'laydate', 'admin', 'layer', 'laytpl', 'common', @@ -51,7 +51,7 @@ layui.define(['table', 'form', 'laydate', 'admin', 'layer', 'laytpl', 'common',
51 }); 51 });
52 52
53 admin.req({ 53 admin.req({
54 - url: domainName + '/api-web/manage/kpi/initSelect?accessToken=' + accessToken, 54 + url: domainName + '/api-web/manage/kpi/initSelect',
55 type: 'get', 55 type: 'get',
56 sync: false, 56 sync: false,
57 success: function (res) { 57 success: function (res) {
@@ -82,7 +82,7 @@ layui.define(['table', 'form', 'laydate', 'admin', 'layer', 'laytpl', 'common', @@ -82,7 +82,7 @@ layui.define(['table', 'form', 'laydate', 'admin', 'layer', 'laytpl', 'common',
82 } 82 }
83 }); 83 });
84 admin.req({ 84 admin.req({
85 - url: domainName + '/api-web/manage/ddic/findSucDdics/KPI_POEWER?accessToken=' + accessToken, 85 + url: domainName + '/api-web/manage/ddic/findSucDdics/KPI_POEWER',
86 method: 'get', 86 method: 'get',
87 sync: false, 87 sync: false,
88 success: function (res) { 88 success: function (res) {
@@ -409,7 +409,7 @@ layui.define(['table', 'form', 'laydate', 'admin', 'layer', 'laytpl', 'common', @@ -409,7 +409,7 @@ layui.define(['table', 'form', 'laydate', 'admin', 'layer', 'laytpl', 'common',
409 } 409 }
410 410
411 admin.req({ 411 admin.req({
412 - url: common.domainName + '/api-web/manage/kpi/save?accessToken=' + accessToken, 412 + url: common.domainName + '/api-web/manage/kpi/save',
413 type: 'post', 413 type: 'post',
414 data: JSON.stringify(submitData), 414 data: JSON.stringify(submitData),
415 contentType: "application/json;charset=utf-8", 415 contentType: "application/json;charset=utf-8",
@@ -472,7 +472,7 @@ layui.define(['table', 'form', 'laydate', 'admin', 'layer', 'laytpl', 'common', @@ -472,7 +472,7 @@ layui.define(['table', 'form', 'laydate', 'admin', 'layer', 'laytpl', 'common',
472 472
473 473
474 admin.req({ 474 admin.req({
475 - url: common.domainName + '/api-web/manage/kpi/save?accessToken=' + accessToken, 475 + url: common.domainName + '/api-web/manage/kpi/save',
476 type: 'post', 476 type: 'post',
477 data: JSON.stringify(submitData), 477 data: JSON.stringify(submitData),
478 contentType: "application/json;charset=utf-8", 478 contentType: "application/json;charset=utf-8",
@@ -65,7 +65,7 @@ layui.define(['table', 'form', 'laydate', 'admin', 'layer', 'laytpl', 'common', @@ -65,7 +65,7 @@ layui.define(['table', 'form', 'laydate', 'admin', 'layer', 'laytpl', 'common',
65 btn: ['确定', '取消'] //按钮 65 btn: ['确定', '取消'] //按钮
66 }, function () { 66 }, function () {
67 $.ajax({ 67 $.ajax({
68 - url: common.domainName + '/api-web/filterkpi/kpi/remove?accessToken=' + accessToken, 68 + url: common.domainName + '/api-web/filterkpi/kpi/remove',
69 data: param, 69 data: param,
70 success: function () { 70 success: function () {
71 layer.msg('删除成功', { 71 layer.msg('删除成功', {
@@ -142,7 +142,7 @@ layui.define(['table', 'form', 'admin', 'layer', 'common', 'sessions', 'treeTabl @@ -142,7 +142,7 @@ layui.define(['table', 'form', 'admin', 'layer', 'common', 'sessions', 'treeTabl
142 layer.confirm('将要删除' + machineroomIds.length + '条数据，是否删除？', {icon: 3}, function () { 142 layer.confirm('将要删除' + machineroomIds.length + '条数据，是否删除？', {icon: 3}, function () {
143 loading = layer.load(2); 143 loading = layer.load(2);
144 admin.req({ 144 admin.req({
145 - url: domainName + '/api-web/manage/machineroom/deleteByIds?accessToken=' + accessToken, 145 + url: domainName + '/api-web/manage/machineroom/deleteByIds',
146 type: 'POST', 146 type: 'POST',
147 contentType: 'application/json', 147 contentType: 'application/json',
148 data: JSON.stringify(machineroomIds) 148 data: JSON.stringify(machineroomIds)
@@ -532,7 +532,7 @@ layui.define(['commonDetail', 'admin', 'sessions', 'common', 'tree', 'echarts', @@ -532,7 +532,7 @@ layui.define(['commonDetail', 'admin', 'sessions', 'common', 'tree', 'echarts',
532 layer.confirm('删除后不可恢复，请确认', function (index) { 532 layer.confirm('删除后不可恢复，请确认', function (index) {
533 layer.load(2); 533 layer.load(2);
534 $.ajax({ 534 $.ajax({
535 - url: common.domainName + '/inspection-report/bMaintainInfo/delete/' + id + '?accessToken=' + accessToken, 535 + url: common.domainName + '/inspection-report/bMaintainInfo/delete/' + id,
536 type: 'delete', 536 type: 'delete',
537 success: function (res) { 537 success: function (res) {
538 layer.closeAll("loading") 538 layer.closeAll("loading")
@@ -78,7 +78,7 @@ layui.define(['table', 'form', 'admin', 'layer', 'common', 'commonDetail', 'sess @@ -78,7 +78,7 @@ layui.define(['table', 'form', 'admin', 'layer', 'common', 'commonDetail', 'sess
78 'remark': tdArr[4] 78 'remark': tdArr[4]
79 }; 79 };
80 var params = {} 80 var params = {}
81 - var url = common.domainName + '/api-web/machineRoom/meetingsummary/save?accessToken=' + accessToken; 81 + var url = common.domainName + '/api-web/machineRoom/meetingsummary/save' ;
82 layer.load(2); 82 layer.load(2);
83 params.meetingsummaryManufacturer = JSON.stringify(param) 83 params.meetingsummaryManufacturer = JSON.stringify(param)
84 admin.req({ 84 admin.req({
@@ -214,7 +214,7 @@ layui.define(['form', 'admin', 'layer', 'common', 'sessions', 'xmSelect', 'resli @@ -214,7 +214,7 @@ layui.define(['form', 'admin', 'layer', 'common', 'sessions', 'xmSelect', 'resli
214 remark: $("#jgraph_remark").val(), 214 remark: $("#jgraph_remark").val(),
215 }; 215 };
216 admin.req({ 216 admin.req({
217 - url: common.domainName + '/api-web/mxgraph/save?accessToken=' + access_token 217 + url: common.domainName + '/api-web/mxgraph/save'
218 , type: 'post' 218 , type: 'post'
219 , async: false 219 , async: false
220 , contentType: "application/json;charset=UTF-8"//指定消息请求类型 220 , contentType: "application/json;charset=UTF-8"//指定消息请求类型
@@ -230,7 +230,7 @@ layui.define(['table', 'form', 'laydate', 'admin', 'layer', 'laytpl', 'common', @@ -230,7 +230,7 @@ layui.define(['table', 'form', 'laydate', 'admin', 'layer', 'laytpl', 'common',
230 function saveDeptPwd(conf) { 230 function saveDeptPwd(conf) {
231 loading = layer.load(2); 231 loading = layer.load(2);
232 admin.req({ 232 admin.req({
233 - url: domainName + '/api-web/orgPassword/saveOrUpdate?accessToken=' + accessToken, 233 + url: domainName + '/api-web/orgPassword/saveOrUpdate',
234 data: JSON.stringify(conf), 234 data: JSON.stringify(conf),
235 type: 'POST', 235 type: 'POST',
236 contentType: 'application/json;charset=UTF-8', 236 contentType: 'application/json;charset=UTF-8',
@@ -107,7 +107,7 @@ layui.define(['table', 'form', 'laydate', 'common', 'sessions', 'laydate', 'admi @@ -107,7 +107,7 @@ layui.define(['table', 'form', 'laydate', 'common', 'sessions', 'laydate', 'admi
107 var loading = layer.load(2); 107 var loading = layer.load(2);
108 var submitData = layui.form.val('protocolparam-add-form'); 108 var submitData = layui.form.val('protocolparam-add-form');
109 $.ajax({ 109 $.ajax({
110 - url: common.domainName + '/api-web/manage/protocol/param/save?accessToken=' + accessToken, 110 + url: common.domainName + '/api-web/manage/protocol/param/save',
111 type: 'post', 111 type: 'post',
112 data: JSON.stringify(submitData), 112 data: JSON.stringify(submitData),
113 contentType: "application/json;charset=utf-8", 113 contentType: "application/json;charset=utf-8",
@@ -48,7 +48,7 @@ layui.define(['table', 'form', 'admin', 'layer', 'common', 'commonDetail','sessi @@ -48,7 +48,7 @@ layui.define(['table', 'form', 'admin', 'layer', 'common', 'commonDetail','sessi
48 params.recoveryverify = JSON.stringify(data) 48 params.recoveryverify = JSON.stringify(data)
49 params.deviceList = devicesBak; 49 params.deviceList = devicesBak;
50 admin.req({ 50 admin.req({
51 - url: domainName + '/api-web/recoveryverify/save?accessToken=' + accessToken, 51 + url: domainName + '/api-web/recoveryverify/save',
52 data: JSON.stringify(params), 52 data: JSON.stringify(params),
53 type: 'post', 53 type: 'post',
54 contentType: "application/json; charset=utf-8", 54 contentType: "application/json; charset=utf-8",
@@ -622,4 +622,4 @@ layui.define(['table', 'form', 'admin', 'layer', 'common', 'commonDetail','sessi @@ -622,4 +622,4 @@ layui.define(['table', 'form', 'admin', 'layer', 'common', 'commonDetail','sessi
622 }); 622 });
623 } 623 }
624 }) 624 })
625 -})  
  625 +})
@@ -68,7 +68,7 @@ layui.define(['common', 'layer', 'form', 'editor', 'admin', 'reslist', 'table', @@ -68,7 +68,7 @@ layui.define(['common', 'layer', 'form', 'editor', 'admin', 'reslist', 'table',
68 submitData.id = id; 68 submitData.id = id;
69 layer.load(2); 69 layer.load(2);
70 admin.req({ 70 admin.req({
71 - url: domainName + '/api-web/relation/save?accessToken=' + accessToken, 71 + url: domainName + '/api-web/relation/save',
72 type: 'POST', 72 type: 'POST',
73 contentType: 'application/json', 73 contentType: 'application/json',
74 data: JSON.stringify(submitData), 74 data: JSON.stringify(submitData),
@@ -44,7 +44,7 @@ layui.define(['table', 'form', 'admin', 'layer', 'common', 'sessions', 'xmSelect @@ -44,7 +44,7 @@ layui.define(['table', 'form', 'admin', 'layer', 'common', 'sessions', 'xmSelect
44 data.userName = userSelect.getValue('nameStr') 44 data.userName = userSelect.getValue('nameStr')
45 data.theirType = $('#config_theirType').val(); 45 data.theirType = $('#config_theirType').val();
46 admin.req({ 46 admin.req({
47 - url: domainName + '/api-web/bWorkreportGroup/save?accessToken=' + accessToken, 47 + url: domainName + '/api-web/bWorkreportGroup/save',
48 data: JSON.stringify(data), 48 data: JSON.stringify(data),
49 type: 'post', 49 type: 'post',
50 contentType: "application/json; charset=utf-8", 50 contentType: "application/json; charset=utf-8",
@@ -290,7 +290,7 @@ layui.define(['common', 'tree', 'laypage', 'laytpl', 'upload', 'admin', 'form', @@ -290,7 +290,7 @@ layui.define(['common', 'tree', 'laypage', 'laytpl', 'upload', 'admin', 'form',
290 } 290 }
291 layer.load(2); 291 layer.load(2);
292 admin.req({ 292 admin.req({
293 - url: `${common.domainName}/api-web/manage/restypeProtocol/getProtocolByResType?${tokenKey}=${accessToken}&resTypeCode=${data.id}`, 293 + url: `${common.domainName}/api-web/manage/restypeProtocol/getProtocolByResType?resTypeCode=${data.id}`,
294 success(response) { 294 success(response) {
295 layer.closeAll('loading'); 295 layer.closeAll('loading');
296 if (response && response.success) { 296 if (response && response.success) {
@@ -381,7 +381,7 @@ layui.define(['common', 'tree', 'laypage', 'laytpl', 'upload', 'admin', 'form', @@ -381,7 +381,7 @@ layui.define(['common', 'tree', 'laypage', 'laytpl', 'upload', 'admin', 'form',
381 } 381 }
382 layer.load(2); 382 layer.load(2);
383 admin.req({ 383 admin.req({
384 - url: `${common.domainName}/api-web/manage/restypeProtocol/getProtocolByResType?accessToken=${accessToken}&resTypeCode=${data.id}`, 384 + url: `${common.domainName}/api-web/manage/restypeProtocol/getProtocolByResType?resTypeCode=${data.id}`,
385 success(response) { 385 success(response) {
386 layer.closeAll('loading'); 386 layer.closeAll('loading');
387 if (response && response.success) { 387 if (response && response.success) {
@@ -91,7 +91,7 @@ layui.define(['table', 'form', 'admin', 'layer', 'common', 'sessions', 'xmSelect @@ -91,7 +91,7 @@ layui.define(['table', 'form', 'admin', 'layer', 'common', 'sessions', 'xmSelect
91 delete data['select'] 91 delete data['select']
92 params.workReport = JSON.stringify(data) 92 params.workReport = JSON.stringify(data)
93 admin.req({ 93 admin.req({
94 - url: domainName + '/api-web/workreport/save?accessToken=' + accessToken, 94 + url: domainName + '/api-web/workreport/save',
95 data: JSON.stringify(params), 95 data: JSON.stringify(params),
96 type: 'post', 96 type: 'post',
97 contentType: "application/json; charset=utf-8", 97 contentType: "application/json; charset=utf-8",