monitor_v3 / hg-monitor-web · Commits

Go to a project

Authored by wangtao
Commit 421be557bec3627ea56dbbd679590cf20d1a36f3 2 parents c8fb56f4 1c60119e

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

Inline Side-by-side
Showing 3 changed files with 11 additions and 11 deletions
... ... @@ -23,7 +23,7 @@ layui.define(['common', 'swiper', 'admin', 'commonDetail', 'mxClient', 'sessions
var common = layui.common;
var commonDetail = layui.commonDetail;
var sessions = layui.sessions;
var access_token = common.getMjToken();
var accessToken = common.getMjToken;
var isNewPwd = sessionStorage.getItem("isNewPwd");
... ... @@ -907,9 +907,9 @@ layui.define(['common', 'swiper', 'admin', 'commonDetail', 'mxClient', 'sessions
mxUtils.error('浏览器不支持：Browser is not supported!', 200, false);
} else {
if (isNetAdmin) {//如果是网络管理员，获取网络拓扑
$('#indexTopoView').html(`<iframe src="${common.graphEditorOrigin}/jgraph/grapheditor/viewer.html?accessToken=${access_token}&id=${topoId}&netFlag=3"></iframe>`);
$('#indexTopoView').html(`<iframe src="${common.graphEditorOrigin}/jgraph/grapheditor/viewer.html?access_token=${accessToken}&id=${topoId}&netFlag=3"></iframe>`);
} else {
$('#indexTopoView').html(`<iframe src="${common.graphEditorOrigin}/jgraph/grapheditor/viewer.html?accessToken=${access_token}&id=${topoId}"></iframe>`);
$('#indexTopoView').html(`<iframe src="${common.graphEditorOrigin}/jgraph/grapheditor/viewer.html?access_token=${accessToken}&id=${topoId}"></iframe>`);
}
}
}
... ... @@ -1425,7 +1425,7 @@ layui.define(['common', 'swiper', 'admin', 'commonDetail', 'mxClient', 'sessions
elem: '#indexResListTable'
, url: common.domainName + '/api-web/home/res-list/' + resType
, where: {
access_token: access_token,
accessToken: accessToken,
resName: $("#index_reslist_keyword").val(),
resHealth: $("#index_reslist_resStatus").val(),
busId: currentBizId,
... ... @@ -1727,7 +1727,7 @@ layui.define(['common', 'swiper', 'admin', 'commonDetail', 'mxClient', 'sessions
curr: 1
}
, where: { //请求参数（注意：这里面的参数可任意定义，并非下面固定的格式）
access_token: access_token,
accessToken: accessToken,
resName: $("#index_reslist_keyword").val(),
resHealth: $("#index_reslist_resStatus").val(),
colonlyId: $("#index_reslist_res_colony").val(),
... ... @@ -1783,7 +1783,7 @@ layui.define(['common', 'swiper', 'admin', 'commonDetail', 'mxClient', 'sessions
admin.req({
url: counturl,
data: {
access_token: access_token,
accessToken: accessToken,
busId: currentBizId,
subResType: $("#res_sub_restype").val()
}
... ... @@ -2091,7 +2091,7 @@ layui.define(['common', 'swiper', 'admin', 'commonDetail', 'mxClient', 'sessions
dutyTime: $(this).data("dutytime")
}
admin.req({
url: common.domainName + '/api-web/manage/duty/agreeExchange?accessToken=' + access_token,
url: common.domainName + '/api-web/manage/duty/agreeExchange?accessToken=' + accessToken,
async: false,
data: duty,
done: function (res) {
... ... @@ -2122,7 +2122,7 @@ layui.define(['common', 'swiper', 'admin', 'commonDetail', 'mxClient', 'sessions
dutyTime: $(this).data("dutytime")
}
admin.req({
url: common.domainName + '/api-web/manage/duty/disagreeExchange?accessToken=' + access_token,
url: common.domainName + '/api-web/manage/duty/disagreeExchange?accessToken=' + accessToken,
async: false,
data: duty,
done: function (res) {
... ...
... ... @@ -201,7 +201,7 @@ layui.define(['table', 'form', 'admin', 'layer', 'common', 'sessions'], function
}, function () {
admin.req({
url: domainName + '/api-web/workreport/delete',
type: 'delete',
type: 'get',
data: {id: id}
}).done(function (res) {
layer.msg('删除成功', {
... ...
... ... @@ -268,11 +268,11 @@
<span class="protocol-title-span"></span>
<a href="javascript:void(0);" title="删除当前协议"
class="layui-btn layui-btn-xs layui-btn-normal btn-suffix protocol-del">
<i class="layui-icon">&#xe640;</i>
<!--<i class="layui-icon">&#xe640;</i>-->删除当前协议
</a>
<a href="javascript:void(0);" title="修改密码"
class="layui-btn layui-btn-xs layui-btn-normal btn-suffix protocol-pwd margin-right-10px">
<i class="layui-icon layui-icon-set"></i>
<!-- <i class="layui-icon layui-icon-set"></i>-->修改密码
</a>
</div>
<table class="layui-table">
... ...