monitor_v3 / hg-monitor-web · Commits

Go to a project

Authored by 王涛
Commit 84d8315b14a5a0b1a3eca9622fc4b9fbfe421c98 2 parents 421be557 678f03b0

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

Master mj ztq



See merge request !1158
Inline Side-by-side
Showing 15 changed files with 24 additions and 22 deletions
@@ -917,7 +917,8 @@ layui.define(['table', 'form', 'admin', 'layer', 'common', 'sessions'], function @@ -917,7 +917,8 @@ layui.define(['table', 'form', 'admin', 'layer', 'common', 'sessions'], function
917 data: { 917 data: {
918 resIds: resIds.toString(), 918 resIds: resIds.toString(),
919 kpiIds: kpiIds.toString(), 919 kpiIds: kpiIds.toString(),
920 - subId: subId 920 + subId: subId,
  921 + accessToken: accessToken
921 }, 922 },
922 done: function (res) { 923 done: function (res) {
923 if (res.success) { 924 if (res.success) {
@@ -1009,7 +1010,7 @@ layui.define(['table', 'form', 'admin', 'layer', 'common', 'sessions'], function @@ -1009,7 +1010,7 @@ layui.define(['table', 'form', 'admin', 'layer', 'common', 'sessions'], function
1009 targetId: targetId 1010 targetId: targetId
1010 }; 1011 };
1011 admin.req({ 1012 admin.req({
1012 - url: common.domainName + '/api-web/bTypeSubscribe/insertOrChange' , 1013 + url: common.domainName + '/api-web/bTypeSubscribe/insertOrChange?accessToken=' + accessToken,
1013 type: 'post', 1014 type: 'post',
1014 contentType: 'application/json', 1015 contentType: 'application/json',
1015 data: JSON.stringify(typeSubscribe), 1016 data: JSON.stringify(typeSubscribe),
@@ -208,7 +208,7 @@ layui.define(['table', 'form', 'admin', 'layer', 'common', 'reslist', 'sessions' @@ -208,7 +208,7 @@ layui.define(['table', 'form', 'admin', 'layer', 'common', 'reslist', 'sessions'
208 layer.close(index); 208 layer.close(index);
209 layer.load(2); 209 layer.load(2);
210 admin.req({ 210 admin.req({
211 - url: domainName + '/api-web/alarmtemplate/deleteByResIdsAndTempIds' , 211 + url: domainName + '/api-web/alarmtemplate/deleteByResIdsAndTempIds',
212 data: { 212 data: {
213 resIds: resIdList.toString(), 213 resIds: resIdList.toString(),
214 tempIds: tempIds.toString() 214 tempIds: tempIds.toString()
@@ -54,7 +54,7 @@ layui.define(['table', 'form', 'admin', 'layer', 'common', 'sessions', 'xmSelect @@ -54,7 +54,7 @@ layui.define(['table', 'form', 'admin', 'layer', 'common', 'sessions', 'xmSelect
54 delete data['select'] 54 delete data['select']
55 params.workReport = JSON.stringify(data) 55 params.workReport = JSON.stringify(data)
56 admin.req({ 56 admin.req({
57 - url: domainName + '/api-room/assetsrepair/save?accessToken=' + accessToken, 57 + url: domainName + '/api-room/assetsrepair/save',
58 data: JSON.stringify(params), 58 data: JSON.stringify(params),
59 type: 'post', 59 type: 'post',
60 contentType: "application/json; charset=utf-8", 60 contentType: "application/json; charset=utf-8",
@@ -154,7 +154,7 @@ layui.define(['tree', 'table', 'view', 'carousel', 'common', 'laytpl', 'sessions @@ -154,7 +154,7 @@ layui.define(['tree', 'table', 'view', 'carousel', 'common', 'laytpl', 'sessions
154 //业务系统主机数 154 //业务系统主机数
155 function renderResCount() { 155 function renderResCount() {
156 admin.req({ 156 admin.req({
157 - url: common.domainName + '/api-web/assetsCount/bustype?accessToken=' + accessToken, 157 + url: common.domainName + '/api-web/assetsCount/bustype',
158 type: "GET", 158 type: "GET",
159 dataType: "json", 159 dataType: "json",
160 success: function (res) { 160 success: function (res) {
@@ -189,7 +189,7 @@ layui.define(['tree', 'table', 'view', 'carousel', 'common', 'laytpl', 'sessions @@ -189,7 +189,7 @@ layui.define(['tree', 'table', 'view', 'carousel', 'common', 'laytpl', 'sessions
189 //资产类型主机数 189 //资产类型主机数
190 function renderResTypeCount() { 190 function renderResTypeCount() {
191 admin.req({ 191 admin.req({
192 - url: common.domainName + '/api-web/assetsCount/restype?accessToken=' + accessToken, 192 + url: common.domainName + '/api-web/assetsCount/restype',
193 type: "GET", 193 type: "GET",
194 dataType: "json", 194 dataType: "json",
195 success: function (res) { 195 success: function (res) {
@@ -218,7 +218,7 @@ layui.define(['tree', 'table', 'view', 'carousel', 'common', 'laytpl', 'sessions @@ -218,7 +218,7 @@ layui.define(['tree', 'table', 'view', 'carousel', 'common', 'laytpl', 'sessions
218 //业务系统主机数 218 //业务系统主机数
219 function renderDomainCount() { 219 function renderDomainCount() {
220 admin.req({ 220 admin.req({
221 - url: common.domainName + '/api-web/assetsCount/domain?accessToken=' + accessToken, 221 + url: common.domainName + '/api-web/assetsCount/domain',
222 type: "GET", 222 type: "GET",
223 dataType: "json", 223 dataType: "json",
224 success: function (res) { 224 success: function (res) {
@@ -257,7 +257,7 @@ layui.define(['tree', 'table', 'view', 'carousel', 'common', 'laytpl', 'sessions @@ -257,7 +257,7 @@ layui.define(['tree', 'table', 'view', 'carousel', 'common', 'laytpl', 'sessions
257 //业务系统主机数 257 //业务系统主机数
258 function topLeftAreaInfo() { 258 function topLeftAreaInfo() {
259 admin.req({ 259 admin.req({
260 - url: common.domainName + '/api-web/assetsCount/countByType?accessToken=' + accessToken, 260 + url: common.domainName + '/api-web/assetsCount/countByType',
261 type: "GET", 261 type: "GET",
262 dataType: "json", 262 dataType: "json",
263 success: function (res) { 263 success: function (res) {
@@ -54,7 +54,7 @@ layui.define(['table', 'form', 'admin', 'layer', 'common', 'sessions', 'xmSelect @@ -54,7 +54,7 @@ layui.define(['table', 'form', 'admin', 'layer', 'common', 'sessions', 'xmSelect
54 delete data['select'] 54 delete data['select']
55 params.bizupgrade = JSON.stringify(data) 55 params.bizupgrade = JSON.stringify(data)
56 admin.req({ 56 admin.req({
57 - url: domainName + '/api-web/machineRoom/bizupgrade/save?accessToken=' + accessToken, 57 + url: domainName + '/api-web/machineRoom/bizupgrade/save',
58 data: JSON.stringify(params), 58 data: JSON.stringify(params),
59 type: 'post', 59 type: 'post',
60 contentType: "application/json; charset=utf-8", 60 contentType: "application/json; charset=utf-8",
@@ -822,7 +822,7 @@ layui.define(['table', 'form', 'admin', 'layer', 'laytpl', 'common', 'view', 'se @@ -822,7 +822,7 @@ layui.define(['table', 'form', 'admin', 'layer', 'laytpl', 'common', 'view', 'se
822 function add(addResLayerIndex, inserts, busId, insertCount, isExistCount, resType) { 822 function add(addResLayerIndex, inserts, busId, insertCount, isExistCount, resType) {
823 // 发送请求添加绑定 823 // 发送请求添加绑定
824 admin.req({ 824 admin.req({
825 - url: domainName + '/api-web/manage/bustype/addResource/' + busId , 825 + url: domainName + '/api-web/manage/bustype/addResource/' + busId,
826 type: 'POST', 826 type: 'POST',
827 async: false, 827 async: false,
828 contentType: 'application/json', 828 contentType: 'application/json',
@@ -106,7 +106,7 @@ layui.define(['table', 'form', 'sessions', 'common', 'view', 'admin', 'element', @@ -106,7 +106,7 @@ layui.define(['table', 'form', 'sessions', 'common', 'view', 'admin', 'element',
106 task = Object.assign(task, data.field); 106 task = Object.assign(task, data.field);
107 loading = layer.load(2); 107 loading = layer.load(2);
108 admin.req({ 108 admin.req({
109 - url: domainName + '/api-web/manage/task/save?accessToken=' + accessToken, 109 + url: domainName + '/api-web/manage/task/save',
110 type: 'POST', 110 type: 'POST',
111 contentType: 'application/json', 111 contentType: 'application/json',
112 data: JSON.stringify(task), 112 data: JSON.stringify(task),
@@ -169,7 +169,7 @@ layui.define(['table', 'form', 'sessions', 'common', 'view', 'admin', 'element', @@ -169,7 +169,7 @@ layui.define(['table', 'form', 'sessions', 'common', 'view', 'admin', 'element',
169 } 169 }
170 loading = layer.load(2); 170 loading = layer.load(2);
171 admin.req({ 171 admin.req({
172 - url: domainName + '/api-web/manage/collector/addTask/' + collectorId + '?accessToken=' + accessToken, 172 + url: domainName + '/api-web/manage/collector/addTask/' + collectorId,
173 type: 'POST', 173 type: 'POST',
174 contentType: 'application/json', 174 contentType: 'application/json',
175 data: JSON.stringify(taskIds), 175 data: JSON.stringify(taskIds),
@@ -131,7 +131,7 @@ layui.define(['table', 'form', 'sessions', 'common', 'admin', 'reslist', 'alarms @@ -131,7 +131,7 @@ layui.define(['table', 'form', 'sessions', 'common', 'admin', 'reslist', 'alarms
131 collector = Object.assign(collector, data.field); 131 collector = Object.assign(collector, data.field);
132 layer.load(2); 132 layer.load(2);
133 admin.req({ 133 admin.req({
134 - url: domainName + '/api-web/manage/collector/generate?accessToken=' + accessToken, 134 + url: domainName + '/api-web/manage/collector/generate',
135 type: 'POST', 135 type: 'POST',
136 contentType: 'application/json', 136 contentType: 'application/json',
137 data: JSON.stringify(collector), 137 data: JSON.stringify(collector),
@@ -19,7 +19,7 @@ layui.define(['table', 'form', 'sessions', 'common', 'view', 'admin', 'upload', @@ -19,7 +19,7 @@ layui.define(['table', 'form', 'sessions', 'common', 'view', 'admin', 'upload',
19 var collTypeDdic = (function () { 19 var collTypeDdic = (function () {
20 var data = []; 20 var data = [];
21 admin.req({ 21 admin.req({
22 - url: `${domainName}/api-web/manage/ddic/findSucDdics/collType`, 22 + url: `${domainName}/api-web/manage/ddic/findSucDdics/collType?accessToken=${accessToken}`,
23 method: 'get', 23 method: 'get',
24 async: false, 24 async: false,
25 success: function (res) { 25 success: function (res) {
@@ -286,7 +286,8 @@ layui.define(['table', 'form', 'sessions', 'common', 'view', 'admin', 'upload', @@ -286,7 +286,8 @@ layui.define(['table', 'form', 'sessions', 'common', 'view', 'admin', 'upload',
286 admin.req({ 286 admin.req({
287 url: domainName + '/api-web/manage/collector/getLastSyncTime', 287 url: domainName + '/api-web/manage/collector/getLastSyncTime',
288 data: { 288 data: {
289 - collectorId: collector.collectorId 289 + collectorId: collector.collectorId,
  290 + access_token: accessToken
290 }, 291 },
291 async: false, 292 async: false,
292 success: function (response) { 293 success: function (response) {
@@ -496,7 +497,7 @@ layui.define(['table', 'form', 'sessions', 'common', 'view', 'admin', 'upload', @@ -496,7 +497,7 @@ layui.define(['table', 'form', 'sessions', 'common', 'view', 'admin', 'upload',
496 function getByCollectorId(collectorId) { 497 function getByCollectorId(collectorId) {
497 var reslist = layui.reslist(); 498 var reslist = layui.reslist();
498 admin.req({ 499 admin.req({
499 - url: domainName + '/api-web/trapoid/getByCollectorId?collectorId=' + collectorId , 500 + url: domainName + '/api-web/trapoid/getByCollectorId?collectorId=' + collectorId,
500 type: 'GET', 501 type: 'GET',
501 contentType: 'application/json', 502 contentType: 'application/json',
502 }).done(function (response) { 503 }).done(function (response) {
@@ -140,7 +140,7 @@ layui.define(['table', 'form', 'admin', 'layer', 'common', 'sessions', 'treeTabl @@ -140,7 +140,7 @@ layui.define(['table', 'form', 'admin', 'layer', 'common', 'sessions', 'treeTabl
140 ddic.oldDdicCode = oldDdicCode; 140 ddic.oldDdicCode = oldDdicCode;
141 layer.load(2); 141 layer.load(2);
142 admin.req({ 142 admin.req({
143 - url: domainName + '/api-web/manage/ddic/save' , 143 + url: domainName + '/api-web/manage/ddic/save',
144 type: 'POST', 144 type: 'POST',
145 contentType: 'application/json', 145 contentType: 'application/json',
146 data: JSON.stringify(ddic), 146 data: JSON.stringify(ddic),
@@ -89,7 +89,7 @@ layui.define(['table', 'form', 'admin', 'layer', 'common', 'sessions', 'laydate' @@ -89,7 +89,7 @@ layui.define(['table', 'form', 'admin', 'layer', 'common', 'sessions', 'laydate'
89 params.deviceRecord = JSON.stringify(data); 89 params.deviceRecord = JSON.stringify(data);
90 console.log(params) 90 console.log(params)
91 admin.req({ 91 admin.req({
92 - url: domainName + '/api-web/machineRoom/machineRoomEnterDevice/save?accessToken=' + accessToken, 92 + url: domainName + '/api-web/machineRoom/machineRoomEnterDevice/save',
93 data: JSON.stringify(params), 93 data: JSON.stringify(params),
94 type: 'post', 94 type: 'post',
95 contentType: "application/json; charset=utf-8", 95 contentType: "application/json; charset=utf-8",
@@ -59,7 +59,7 @@ layui.define(['table', 'form', 'admin', 'layer', 'common', 'sessions', 'xmSelect @@ -59,7 +59,7 @@ layui.define(['table', 'form', 'admin', 'layer', 'common', 'sessions', 'xmSelect
59 delete data['select'] 59 delete data['select']
60 params.devicehitch = JSON.stringify(data) 60 params.devicehitch = JSON.stringify(data)
61 admin.req({ 61 admin.req({
62 - url: domainName + '/api-web/machineRoom/devicehitch/save?accessToken=' + accessToken, 62 + url: domainName + '/api-web/machineRoom/devicehitch/save',
63 data: JSON.stringify(params), 63 data: JSON.stringify(params),
64 type: 'post', 64 type: 'post',
65 contentType: "application/json; charset=utf-8", 65 contentType: "application/json; charset=utf-8",
@@ -125,7 +125,7 @@ layui.define(['table', 'form', 'laydate', 'common', 'sessions', 'laydate', 'admi @@ -125,7 +125,7 @@ layui.define(['table', 'form', 'laydate', 'common', 'sessions', 'laydate', 'admi
125 bean['arr'] = arr; 125 bean['arr'] = arr;
126 admin.req({ 126 admin.req({
127 type: 'post', 127 type: 'post',
128 - url: common.domainName + '/api-web/manage/dirctive/saveCheckTemplate?accessToken=' + accessToken, 128 + url: common.domainName + '/api-web/manage/dirctive/saveCheckTemplate',
129 contentType: "application/json; charset=utf-8", 129 contentType: "application/json; charset=utf-8",
130 data: JSON.stringify(bean), 130 data: JSON.stringify(bean),
131 success: function (res) { 131 success: function (res) {
@@ -93,7 +93,7 @@ layui.define(['table', 'form', 'admin', 'layer', 'common', 'sessions', 'xmSelect @@ -93,7 +93,7 @@ layui.define(['table', 'form', 'admin', 'layer', 'common', 'sessions', 'xmSelect
93 delete data['select'] 93 delete data['select']
94 params.emergency = JSON.stringify(data) 94 params.emergency = JSON.stringify(data)
95 admin.req({ 95 admin.req({
96 - url: domainName + '/api-web/emergency/save?accessToken=' + accessToken, 96 + url: domainName + '/api-web/emergency/save',
97 data: JSON.stringify(params), 97 data: JSON.stringify(params),
98 type: 'post', 98 type: 'post',
99 contentType: "application/json; charset=utf-8", 99 contentType: "application/json; charset=utf-8",
@@ -59,7 +59,7 @@ layui.define(['table', 'form', 'admin', 'layer', 'common', 'sessions', 'xmSelect @@ -59,7 +59,7 @@ layui.define(['table', 'form', 'admin', 'layer', 'common', 'sessions', 'xmSelect
59 delete data['select'] 59 delete data['select']
60 params.extra = JSON.stringify(data) 60 params.extra = JSON.stringify(data)
61 admin.req({ 61 admin.req({
62 - url: domainName + '/api-web/machineRoom/extra/save?accessToken=' + accessToken, 62 + url: domainName + '/api-web/machineRoom/extra/save',
63 data: JSON.stringify(params), 63 data: JSON.stringify(params),
64 type: 'post', 64 type: 'post',
65 contentType: "application/json; charset=utf-8", 65 contentType: "application/json; charset=utf-8",