monitor_v3 / hg-monitor-web · Commits

Go to a project

Authored by 袁晋鹏
Commit 15836f056647f55b558b2029df1c2ef376adad2f 1 parent bdc8250e

fix:迁移告警压缩查询功能，优化资源管理删除不展示、监控概况业务莫i快不展示的问题，和工作日志不能删除的问题

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 @@ -23,7 +23,7 @@ layui.define(['common', 'swiper', 'admin', 'commonDetail', 'mxClient', 'sessions
23 var common = layui.common; 23 var common = layui.common;
24 var commonDetail = layui.commonDetail; 24 var commonDetail = layui.commonDetail;
25 var sessions = layui.sessions; 25 var sessions = layui.sessions;
26 - var access_token = common.getMjToken(); 26 + var accessToken = common.getMjToken;
27 27
28 var isNewPwd = sessionStorage.getItem("isNewPwd"); 28 var isNewPwd = sessionStorage.getItem("isNewPwd");
29 29
@@ -907,9 +907,9 @@ layui.define(['common', 'swiper', 'admin', 'commonDetail', 'mxClient', 'sessions @@ -907,9 +907,9 @@ layui.define(['common', 'swiper', 'admin', 'commonDetail', 'mxClient', 'sessions
907 mxUtils.error('浏览器不支持：Browser is not supported!', 200, false); 907 mxUtils.error('浏览器不支持：Browser is not supported!', 200, false);
908 } else { 908 } else {
909 if (isNetAdmin) {//如果是网络管理员，获取网络拓扑 909 if (isNetAdmin) {//如果是网络管理员，获取网络拓扑
910 - $('#indexTopoView').html(`<iframe src="${common.graphEditorOrigin}/jgraph/grapheditor/viewer.html?accessToken=${access_token}&id=${topoId}&netFlag=3"></iframe>`); 910 + $('#indexTopoView').html(`<iframe src="${common.graphEditorOrigin}/jgraph/grapheditor/viewer.html?access_token=${accessToken}&id=${topoId}&netFlag=3"></iframe>`);
911 } else { 911 } else {
912 - $('#indexTopoView').html(`<iframe src="${common.graphEditorOrigin}/jgraph/grapheditor/viewer.html?accessToken=${access_token}&id=${topoId}"></iframe>`); 912 + $('#indexTopoView').html(`<iframe src="${common.graphEditorOrigin}/jgraph/grapheditor/viewer.html?access_token=${accessToken}&id=${topoId}"></iframe>`);
913 } 913 }
914 } 914 }
915 } 915 }
@@ -1425,7 +1425,7 @@ layui.define(['common', 'swiper', 'admin', 'commonDetail', 'mxClient', 'sessions @@ -1425,7 +1425,7 @@ layui.define(['common', 'swiper', 'admin', 'commonDetail', 'mxClient', 'sessions
1425 elem: '#indexResListTable' 1425 elem: '#indexResListTable'
1426 , url: common.domainName + '/api-web/home/res-list/' + resType 1426 , url: common.domainName + '/api-web/home/res-list/' + resType
1427 , where: { 1427 , where: {
1428 - access_token: access_token, 1428 + accessToken: accessToken,
1429 resName: $("#index_reslist_keyword").val(), 1429 resName: $("#index_reslist_keyword").val(),
1430 resHealth: $("#index_reslist_resStatus").val(), 1430 resHealth: $("#index_reslist_resStatus").val(),
1431 busId: currentBizId, 1431 busId: currentBizId,
@@ -1727,7 +1727,7 @@ layui.define(['common', 'swiper', 'admin', 'commonDetail', 'mxClient', 'sessions @@ -1727,7 +1727,7 @@ layui.define(['common', 'swiper', 'admin', 'commonDetail', 'mxClient', 'sessions
1727 curr: 1 1727 curr: 1
1728 } 1728 }
1729 , where: { //请求参数（注意：这里面的参数可任意定义，并非下面固定的格式） 1729 , where: { //请求参数（注意：这里面的参数可任意定义，并非下面固定的格式）
1730 - access_token: access_token, 1730 + accessToken: accessToken,
1731 resName: $("#index_reslist_keyword").val(), 1731 resName: $("#index_reslist_keyword").val(),
1732 resHealth: $("#index_reslist_resStatus").val(), 1732 resHealth: $("#index_reslist_resStatus").val(),
1733 colonlyId: $("#index_reslist_res_colony").val(), 1733 colonlyId: $("#index_reslist_res_colony").val(),
@@ -1783,7 +1783,7 @@ layui.define(['common', 'swiper', 'admin', 'commonDetail', 'mxClient', 'sessions @@ -1783,7 +1783,7 @@ layui.define(['common', 'swiper', 'admin', 'commonDetail', 'mxClient', 'sessions
1783 admin.req({ 1783 admin.req({
1784 url: counturl, 1784 url: counturl,
1785 data: { 1785 data: {
1786 - access_token: access_token, 1786 + accessToken: accessToken,
1787 busId: currentBizId, 1787 busId: currentBizId,
1788 subResType: $("#res_sub_restype").val() 1788 subResType: $("#res_sub_restype").val()
1789 } 1789 }
@@ -2091,7 +2091,7 @@ layui.define(['common', 'swiper', 'admin', 'commonDetail', 'mxClient', 'sessions @@ -2091,7 +2091,7 @@ layui.define(['common', 'swiper', 'admin', 'commonDetail', 'mxClient', 'sessions
2091 dutyTime: $(this).data("dutytime") 2091 dutyTime: $(this).data("dutytime")
2092 } 2092 }
2093 admin.req({ 2093 admin.req({
2094 - url: common.domainName + '/api-web/manage/duty/agreeExchange?accessToken=' + access_token, 2094 + url: common.domainName + '/api-web/manage/duty/agreeExchange?accessToken=' + accessToken,
2095 async: false, 2095 async: false,
2096 data: duty, 2096 data: duty,
2097 done: function (res) { 2097 done: function (res) {
@@ -2122,7 +2122,7 @@ layui.define(['common', 'swiper', 'admin', 'commonDetail', 'mxClient', 'sessions @@ -2122,7 +2122,7 @@ layui.define(['common', 'swiper', 'admin', 'commonDetail', 'mxClient', 'sessions
2122 dutyTime: $(this).data("dutytime") 2122 dutyTime: $(this).data("dutytime")
2123 } 2123 }
2124 admin.req({ 2124 admin.req({
2125 - url: common.domainName + '/api-web/manage/duty/disagreeExchange?accessToken=' + access_token, 2125 + url: common.domainName + '/api-web/manage/duty/disagreeExchange?accessToken=' + accessToken,
2126 async: false, 2126 async: false,
2127 data: duty, 2127 data: duty,
2128 done: function (res) { 2128 done: function (res) {
@@ -201,7 +201,7 @@ layui.define(['table', 'form', 'admin', 'layer', 'common', 'sessions'], function @@ -201,7 +201,7 @@ layui.define(['table', 'form', 'admin', 'layer', 'common', 'sessions'], function
201 }, function () { 201 }, function () {
202 admin.req({ 202 admin.req({
203 url: domainName + '/api-web/workreport/delete', 203 url: domainName + '/api-web/workreport/delete',
204 - type: 'delete', 204 + type: 'get',
205 data: {id: id} 205 data: {id: id}
206 }).done(function (res) { 206 }).done(function (res) {
207 layer.msg('删除成功', { 207 layer.msg('删除成功', {
@@ -268,11 +268,11 @@ @@ -268,11 +268,11 @@
268 <span class="protocol-title-span"></span> 268 <span class="protocol-title-span"></span>
269 <a href="javascript:void(0);" title="删除当前协议" 269 <a href="javascript:void(0);" title="删除当前协议"
270 class="layui-btn layui-btn-xs layui-btn-normal btn-suffix protocol-del"> 270 class="layui-btn layui-btn-xs layui-btn-normal btn-suffix protocol-del">
271 - <i class="layui-icon">&#xe640;</i> 271 + <!--<i class="layui-icon">&#xe640;</i>-->删除当前协议
272 </a> 272 </a>
273 <a href="javascript:void(0);" title="修改密码" 273 <a href="javascript:void(0);" title="修改密码"
274 class="layui-btn layui-btn-xs layui-btn-normal btn-suffix protocol-pwd margin-right-10px"> 274 class="layui-btn layui-btn-xs layui-btn-normal btn-suffix protocol-pwd margin-right-10px">
275 - <i class="layui-icon layui-icon-set"></i> 275 + <!-- <i class="layui-icon layui-icon-set"></i>-->修改密码
276 </a> 276 </a>
277 </div> 277 </div>
278 <table class="layui-table"> 278 <table class="layui-table">