monitor_v3 / hg-monitor-web · Commits

Go to a project

Authored by wangtao
Commit 9d61fb6b8758f5cf71e7d3945ca549252ac12249 2 parents e9411170 84d8315b

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

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
data: {
resIds: resIds.toString(),
kpiIds: kpiIds.toString(),
subId: subId
subId: subId,
accessToken: accessToken
},
done: function (res) {
if (res.success) {
... ... @@ -1009,7 +1010,7 @@ layui.define(['table', 'form', 'admin', 'layer', 'common', 'sessions'], function
targetId: targetId
};
admin.req({
url: common.domainName + '/api-web/bTypeSubscribe/insertOrChange' ,
url: common.domainName + '/api-web/bTypeSubscribe/insertOrChange?accessToken=' + accessToken,
type: 'post',
contentType: 'application/json',
data: JSON.stringify(typeSubscribe),
... ...
... ... @@ -208,7 +208,7 @@ layui.define(['table', 'form', 'admin', 'layer', 'common', 'reslist', 'sessions'
layer.close(index);
layer.load(2);
admin.req({
url: domainName + '/api-web/alarmtemplate/deleteByResIdsAndTempIds' ,
url: domainName + '/api-web/alarmtemplate/deleteByResIdsAndTempIds',
data: {
resIds: resIdList.toString(),
tempIds: tempIds.toString()
... ...
... ... @@ -54,7 +54,7 @@ layui.define(['table', 'form', 'admin', 'layer', 'common', 'sessions', 'xmSelect
delete data['select']
params.workReport = JSON.stringify(data)
admin.req({
url: domainName + '/api-room/assetsrepair/save?accessToken=' + accessToken,
url: domainName + '/api-room/assetsrepair/save',
data: JSON.stringify(params),
type: 'post',
contentType: "application/json; charset=utf-8",
... ...
... ... @@ -154,7 +154,7 @@ layui.define(['tree', 'table', 'view', 'carousel', 'common', 'laytpl', 'sessions
//业务系统主机数
function renderResCount() {
admin.req({
url: common.domainName + '/api-web/assetsCount/bustype?accessToken=' + accessToken,
url: common.domainName + '/api-web/assetsCount/bustype',
type: "GET",
dataType: "json",
success: function (res) {
... ... @@ -189,7 +189,7 @@ layui.define(['tree', 'table', 'view', 'carousel', 'common', 'laytpl', 'sessions
//资产类型主机数
function renderResTypeCount() {
admin.req({
url: common.domainName + '/api-web/assetsCount/restype?accessToken=' + accessToken,
url: common.domainName + '/api-web/assetsCount/restype',
type: "GET",
dataType: "json",
success: function (res) {
... ... @@ -218,7 +218,7 @@ layui.define(['tree', 'table', 'view', 'carousel', 'common', 'laytpl', 'sessions
//业务系统主机数
function renderDomainCount() {
admin.req({
url: common.domainName + '/api-web/assetsCount/domain?accessToken=' + accessToken,
url: common.domainName + '/api-web/assetsCount/domain',
type: "GET",
dataType: "json",
success: function (res) {
... ... @@ -257,7 +257,7 @@ layui.define(['tree', 'table', 'view', 'carousel', 'common', 'laytpl', 'sessions
//业务系统主机数
function topLeftAreaInfo() {
admin.req({
url: common.domainName + '/api-web/assetsCount/countByType?accessToken=' + accessToken,
url: common.domainName + '/api-web/assetsCount/countByType',
type: "GET",
dataType: "json",
success: function (res) {
... ...
... ... @@ -54,7 +54,7 @@ layui.define(['table', 'form', 'admin', 'layer', 'common', 'sessions', 'xmSelect
delete data['select']
params.bizupgrade = JSON.stringify(data)
admin.req({
url: domainName + '/api-web/machineRoom/bizupgrade/save?accessToken=' + accessToken,
url: domainName + '/api-web/machineRoom/bizupgrade/save',
data: JSON.stringify(params),
type: 'post',
contentType: "application/json; charset=utf-8",
... ...
... ... @@ -822,7 +822,7 @@ layui.define(['table', 'form', 'admin', 'layer', 'laytpl', 'common', 'view', 'se
function add(addResLayerIndex, inserts, busId, insertCount, isExistCount, resType) {
// 发送请求添加绑定
admin.req({
url: domainName + '/api-web/manage/bustype/addResource/' + busId ,
url: domainName + '/api-web/manage/bustype/addResource/' + busId,
type: 'POST',
async: false,
contentType: 'application/json',
... ...
... ... @@ -106,7 +106,7 @@ layui.define(['table', 'form', 'sessions', 'common', 'view', 'admin', 'element',
task = Object.assign(task, data.field);
loading = layer.load(2);
admin.req({
url: domainName + '/api-web/manage/task/save?accessToken=' + accessToken,
url: domainName + '/api-web/manage/task/save',
type: 'POST',
contentType: 'application/json',
data: JSON.stringify(task),
... ... @@ -169,7 +169,7 @@ layui.define(['table', 'form', 'sessions', 'common', 'view', 'admin', 'element',
}
loading = layer.load(2);
admin.req({
url: domainName + '/api-web/manage/collector/addTask/' + collectorId + '?accessToken=' + accessToken,
url: domainName + '/api-web/manage/collector/addTask/' + collectorId,
type: 'POST',
contentType: 'application/json',
data: JSON.stringify(taskIds),
... ...
... ... @@ -131,7 +131,7 @@ layui.define(['table', 'form', 'sessions', 'common', 'admin', 'reslist', 'alarms
collector = Object.assign(collector, data.field);
layer.load(2);
admin.req({
url: domainName + '/api-web/manage/collector/generate?accessToken=' + accessToken,
url: domainName + '/api-web/manage/collector/generate',
type: 'POST',
contentType: 'application/json',
data: JSON.stringify(collector),
... ...
... ... @@ -19,7 +19,7 @@ layui.define(['table', 'form', 'sessions', 'common', 'view', 'admin', 'upload',
var collTypeDdic = (function () {
var data = [];
admin.req({
url: `${domainName}/api-web/manage/ddic/findSucDdics/collType`,
url: `${domainName}/api-web/manage/ddic/findSucDdics/collType?accessToken=${accessToken}`,
method: 'get',
async: false,
success: function (res) {
... ... @@ -286,7 +286,8 @@ layui.define(['table', 'form', 'sessions', 'common', 'view', 'admin', 'upload',
admin.req({
url: domainName + '/api-web/manage/collector/getLastSyncTime',
data: {
collectorId: collector.collectorId
collectorId: collector.collectorId,
access_token: accessToken
},
async: false,
success: function (response) {
... ... @@ -496,7 +497,7 @@ layui.define(['table', 'form', 'sessions', 'common', 'view', 'admin', 'upload',
function getByCollectorId(collectorId) {
var reslist = layui.reslist();
admin.req({
url: domainName + '/api-web/trapoid/getByCollectorId?collectorId=' + collectorId ,
url: domainName + '/api-web/trapoid/getByCollectorId?collectorId=' + collectorId,
type: 'GET',
contentType: 'application/json',
}).done(function (response) {
... ...
... ... @@ -140,7 +140,7 @@ layui.define(['table', 'form', 'admin', 'layer', 'common', 'sessions', 'treeTabl
ddic.oldDdicCode = oldDdicCode;
layer.load(2);
admin.req({
url: domainName + '/api-web/manage/ddic/save' ,
url: domainName + '/api-web/manage/ddic/save',
type: 'POST',
contentType: 'application/json',
data: JSON.stringify(ddic),
... ...
... ... @@ -89,7 +89,7 @@ layui.define(['table', 'form', 'admin', 'layer', 'common', 'sessions', 'laydate'
params.deviceRecord = JSON.stringify(data);
console.log(params)
admin.req({
url: domainName + '/api-web/machineRoom/machineRoomEnterDevice/save?accessToken=' + accessToken,
url: domainName + '/api-web/machineRoom/machineRoomEnterDevice/save',
data: JSON.stringify(params),
type: 'post',
contentType: "application/json; charset=utf-8",
... ...
... ... @@ -59,7 +59,7 @@ layui.define(['table', 'form', 'admin', 'layer', 'common', 'sessions', 'xmSelect
delete data['select']
params.devicehitch = JSON.stringify(data)
admin.req({
url: domainName + '/api-web/machineRoom/devicehitch/save?accessToken=' + accessToken,
url: domainName + '/api-web/machineRoom/devicehitch/save',
data: JSON.stringify(params),
type: 'post',
contentType: "application/json; charset=utf-8",
... ...
... ... @@ -125,7 +125,7 @@ layui.define(['table', 'form', 'laydate', 'common', 'sessions', 'laydate', 'admi
bean['arr'] = arr;
admin.req({
type: 'post',
url: common.domainName + '/api-web/manage/dirctive/saveCheckTemplate?accessToken=' + accessToken,
url: common.domainName + '/api-web/manage/dirctive/saveCheckTemplate',
contentType: "application/json; charset=utf-8",
data: JSON.stringify(bean),
success: function (res) {
... ...
... ... @@ -93,7 +93,7 @@ layui.define(['table', 'form', 'admin', 'layer', 'common', 'sessions', 'xmSelect
delete data['select']
params.emergency = JSON.stringify(data)
admin.req({
url: domainName + '/api-web/emergency/save?accessToken=' + accessToken,
url: domainName + '/api-web/emergency/save',
data: JSON.stringify(params),
type: 'post',
contentType: "application/json; charset=utf-8",
... ...
... ... @@ -59,7 +59,7 @@ layui.define(['table', 'form', 'admin', 'layer', 'common', 'sessions', 'xmSelect
delete data['select']
params.extra = JSON.stringify(data)
admin.req({
url: domainName + '/api-web/machineRoom/extra/save?accessToken=' + accessToken,
url: domainName + '/api-web/machineRoom/extra/save',
data: JSON.stringify(params),
type: 'post',
contentType: "application/json; charset=utf-8",
... ...