monitor_v3 / hg-monitor-web · Commits

Go to a project

Authored by 袁晋鹏
Commit a14665f3f03792ee86dc018a99b1de86de68baf5 1 parent 517ec395

新增日志页面嵌套监控的公共方法，后续根据需求合入公共代码

Inline Side-by-side
Showing 6 changed files with 120 additions and 120 deletions
@@ -54,19 +54,19 @@ layui.define(['table', 'form', 'admin', 'layer', 'common','sessions','xmSelect', @@ -54,19 +54,19 @@ layui.define(['table', 'form', 'admin', 'layer', 'common','sessions','xmSelect',
54 form.render(null, 'alarmpolicy-form'); 54 form.render(null, 'alarmpolicy-form');
55 //新增 55 //新增
56 $("#alarmpolicy_create").unbind("click").on("click",function () { 56 $("#alarmpolicy_create").unbind("click").on("click",function () {
57 - if ($.inArray('back:alarmpolicy:save', checkList) == -1) {  
58 - layer.msg('暂无权限!', {icon: 7, time: 3000});  
59 - return;  
60 - } 57 + // if ($.inArray('back:alarmpolicy:save', checkList) == -1) {
  58 + // layer.msg('暂无权限!', {icon: 7, time: 3000});
  59 + // return;
  60 + // }
61 openPolicyForm(); 61 openPolicyForm();
62 }); 62 });
63 63
64 //同步 64 //同步
65 $("#alarmpolicy_sync").on("click",function (){ 65 $("#alarmpolicy_sync").on("click",function (){
66 - if ($.inArray('back:alarmpolicy:synchronization', checkList) == -1) {  
67 - layer.msg('暂无权限!', {icon: 7, time: 3000});  
68 - return;  
69 - } 66 + // if ($.inArray('back:alarmpolicy:synchronization', checkList) == -1) {
  67 + // layer.msg('暂无权限!', {icon: 7, time: 3000});
  68 + // return;
  69 + // }
70 syncAlarmPolicy(); 70 syncAlarmPolicy();
71 }); 71 });
72 //删除 72 //删除
@@ -180,10 +180,10 @@ layui.define(['table', 'form', 'admin', 'layer', 'common','sessions','xmSelect', @@ -180,10 +180,10 @@ layui.define(['table', 'form', 'admin', 'layer', 'common','sessions','xmSelect',
180 180
181 //点击名称编辑 181 //点击名称编辑
182 $(".view-alarmPolicy-name").off("click").on("click",function () { 182 $(".view-alarmPolicy-name").off("click").on("click",function () {
183 - if ($.inArray('back:alarmpolicy:update', checkList) == -1) {  
184 - layer.msg('暂无权限!', {icon: 7, time: 3000});  
185 - return;  
186 - } 183 + // if ($.inArray('back:alarmpolicy:update', checkList) == -1) {
  184 + // layer.msg('暂无权限!', {icon: 7, time: 3000});
  185 + // return;
  186 + // }
187 openPolicyForm($(this).data("id")); 187 openPolicyForm($(this).data("id"));
188 }); 188 });
189 189
@@ -279,10 +279,10 @@ layui.define(['table', 'form', 'admin', 'layer', 'common','sessions','xmSelect', @@ -279,10 +279,10 @@ layui.define(['table', 'form', 'admin', 'layer', 'common','sessions','xmSelect',
279 279
280 //删除数据 280 //删除数据
281 function deleteAlarmPolicy(id) { 281 function deleteAlarmPolicy(id) {
282 - if ($.inArray('back:alarmpolicy:delete', checkList) == -1) {  
283 - layer.msg('暂无权限!', {icon: 7, time: 3000});  
284 - return;  
285 - } 282 + // if ($.inArray('back:alarmpolicy:delete', checkList) == -1) {
  283 + // layer.msg('暂无权限!', {icon: 7, time: 3000});
  284 + // return;
  285 + // }
286 if (typeof (id) != "string") { 286 if (typeof (id) != "string") {
287 var ids = []; 287 var ids = [];
288 var data = table.checkStatus('alarmpolicyTable').data; 288 var data = table.checkStatus('alarmpolicyTable').data;
@@ -51,19 +51,19 @@ layui.define(['table', 'form', 'admin', 'layer', 'common', 'sessions'], function @@ -51,19 +51,19 @@ layui.define(['table', 'form', 'admin', 'layer', 'common', 'sessions'], function
51 form.render(null, 'alarmpolicy-form'); 51 form.render(null, 'alarmpolicy-form');
52 //新增 52 //新增
53 $("#alarmpolicy_list_create").unbind("click").on("click", function () { 53 $("#alarmpolicy_list_create").unbind("click").on("click", function () {
54 - if ($.inArray('back:alarmpolicy:save', checkList) == -1) {  
55 - layer.msg('暂无权限!', {icon: 7, time: 3000});  
56 - return;  
57 - } 54 + // if ($.inArray('back:alarmpolicy:save', checkList) == -1) {
  55 + // layer.msg('暂无权限!', {icon: 7, time: 3000});
  56 + // return;
  57 + // }
58 openPolicyForm(); 58 openPolicyForm();
59 }); 59 });
60 60
61 //同步 61 //同步
62 $("#alarmpolicy_list_sync").on("click", function () { 62 $("#alarmpolicy_list_sync").on("click", function () {
63 - if ($.inArray('back:alarmpolicy:synchronization', checkList) == -1) {  
64 - layer.msg('暂无权限!', {icon: 7, time: 3000});  
65 - return;  
66 - } 63 + // if ($.inArray('back:alarmpolicy:synchronization', checkList) == -1) {
  64 + // layer.msg('暂无权限!', {icon: 7, time: 3000});
  65 + // return;
  66 + // }
67 syncAlarmPolicy(); 67 syncAlarmPolicy();
68 }); 68 });
69 //删除 69 //删除
@@ -177,10 +177,10 @@ layui.define(['table', 'form', 'admin', 'layer', 'common', 'sessions'], function @@ -177,10 +177,10 @@ layui.define(['table', 'form', 'admin', 'layer', 'common', 'sessions'], function
177 177
178 //点击名称编辑 178 //点击名称编辑
179 $(".view-alarmPolicy-name").off("click").on("click", function () { 179 $(".view-alarmPolicy-name").off("click").on("click", function () {
180 - if ($.inArray('back:alarmpolicy:update', checkList) == -1) {  
181 - layer.msg('暂无权限!', {icon: 7, time: 3000});  
182 - return;  
183 - } 180 + // if ($.inArray('back:alarmpolicy:update', checkList) == -1) {
  181 + // layer.msg('暂无权限!', {icon: 7, time: 3000});
  182 + // return;
  183 + // }
184 openPolicyForm($(this).data("id")); 184 openPolicyForm($(this).data("id"));
185 }); 185 });
186 186
@@ -264,10 +264,10 @@ layui.define(['table', 'form', 'admin', 'layer', 'common', 'sessions'], function @@ -264,10 +264,10 @@ layui.define(['table', 'form', 'admin', 'layer', 'common', 'sessions'], function
264 264
265 //删除数据 265 //删除数据
266 function deleteAlarmPolicy(id) { 266 function deleteAlarmPolicy(id) {
267 - if ($.inArray('back:alarmpolicy:delete', checkList) == -1) {  
268 - layer.msg('暂无权限!', {icon: 7, time: 3000});  
269 - return;  
270 - } 267 + // if ($.inArray('back:alarmpolicy:delete', checkList) == -1) {
  268 + // layer.msg('暂无权限!', {icon: 7, time: 3000});
  269 + // return;
  270 + // }
271 if (typeof (id) != "string") { 271 if (typeof (id) != "string") {
272 var ids = []; 272 var ids = [];
273 var data = table.checkStatus('alarmpolicyListTable').data; 273 var data = table.checkStatus('alarmpolicyListTable').data;
@@ -46,10 +46,10 @@ layui.define(['table', 'form', 'admin', 'layer', 'common','sessions'], function @@ -46,10 +46,10 @@ layui.define(['table', 'form', 'admin', 'layer', 'common','sessions'], function
46 form.render(null, 'alarmsubscribe-form'); 46 form.render(null, 'alarmsubscribe-form');
47 //新增 47 //新增
48 $("#alarmsubscribe_create").off("click").on("click",function () { 48 $("#alarmsubscribe_create").off("click").on("click",function () {
49 - if ($.inArray('back:alarmsubscribe:save', checkList) == -1) {  
50 - layer.msg('暂无权限!', {icon: 7, time: 3000});  
51 - return;  
52 - } 49 + // if ($.inArray('back:alarmsubscribe:save', checkList) == -1) {
  50 + // layer.msg('暂无权限!', {icon: 7, time: 3000});
  51 + // return;
  52 + // }
53 openAlarmsubscribeForm(); 53 openAlarmsubscribeForm();
54 }); 54 });
55 //删除 55 //删除
@@ -58,10 +58,10 @@ layui.define(['table', 'form', 'admin', 'layer', 'common','sessions'], function @@ -58,10 +58,10 @@ layui.define(['table', 'form', 'admin', 'layer', 'common','sessions'], function
58 }); 58 });
59 //同步 59 //同步
60 $("#alarmsubscribe_sync").on("click",function () { 60 $("#alarmsubscribe_sync").on("click",function () {
61 - if ($.inArray('back:alarmsubscribe:synchronization', checkList) == -1) {  
62 - layer.msg('暂无权限!', {icon: 7, time: 3000});  
63 - return;  
64 - } 61 + // if ($.inArray('back:alarmsubscribe:synchronization', checkList) == -1) {
  62 + // layer.msg('暂无权限!', {icon: 7, time: 3000});
  63 + // return;
  64 + // }
65 var ids = []; 65 var ids = [];
66 var data = table.checkStatus('alarmsubscribeTable').data; 66 var data = table.checkStatus('alarmsubscribeTable').data;
67 if(data && data.length > 0){ 67 if(data && data.length > 0){
@@ -320,10 +320,10 @@ layui.define(['table', 'form', 'admin', 'layer', 'common','sessions'], function @@ -320,10 +320,10 @@ layui.define(['table', 'form', 'admin', 'layer', 'common','sessions'], function
320 done:function () { 320 done:function () {
321 //点击名称编辑 321 //点击名称编辑
322 $(".view-alarmsubscribe-name").on("click",function () { 322 $(".view-alarmsubscribe-name").on("click",function () {
323 - if ($.inArray('back:alarmsubscribe:update', checkList) == -1) {  
324 - layer.msg('暂无权限!', {icon: 7, time: 3000});  
325 - return;  
326 - } 323 + // if ($.inArray('back:alarmsubscribe:update', checkList) == -1) {
  324 + // layer.msg('暂无权限!', {icon: 7, time: 3000});
  325 + // return;
  326 + // }
327 openAlarmsubscribeForm($(this).data("id")); 327 openAlarmsubscribeForm($(this).data("id"));
328 }); 328 });
329 329
@@ -800,10 +800,10 @@ layui.define(['table', 'form', 'admin', 'layer', 'common','sessions'], function @@ -800,10 +800,10 @@ layui.define(['table', 'form', 'admin', 'layer', 'common','sessions'], function
800 800
801 //资源订阅 801 //资源订阅
802 $(".alarmsubscribe-resource-btn").on("click", function () { 802 $(".alarmsubscribe-resource-btn").on("click", function () {
803 - if ($.inArray('back:alarmsubscribe:resource', checkList) == -1) {  
804 - layer.msg('暂无权限!', {icon: 7, time: 3000});  
805 - return;  
806 - } 803 + // if ($.inArray('back:alarmsubscribe:resource', checkList) == -1) {
  804 + // layer.msg('暂无权限!', {icon: 7, time: 3000});
  805 + // return;
  806 + // }
807 var subId = $(this).data("id"); 807 var subId = $(this).data("id");
808 var oldData = getResOrKpiBySubId(subId, 'res'); 808 var oldData = getResOrKpiBySubId(subId, 'res');
809 oldData = $.map(oldData, function (item) { 809 oldData = $.map(oldData, function (item) {
@@ -847,10 +847,10 @@ layui.define(['table', 'form', 'admin', 'layer', 'common','sessions'], function @@ -847,10 +847,10 @@ layui.define(['table', 'form', 'admin', 'layer', 'common','sessions'], function
847 847
848 //指标订阅 848 //指标订阅
849 $(".alarmsubscribe-kpi-btn").on("click",function (){ 849 $(".alarmsubscribe-kpi-btn").on("click",function (){
850 - if ($.inArray('back:alarmsubscribe:target', checkList) == -1) {  
851 - layer.msg('暂无权限!', {icon: 7, time: 3000});  
852 - return;  
853 - } 850 + // if ($.inArray('back:alarmsubscribe:target', checkList) == -1) {
  851 + // layer.msg('暂无权限!', {icon: 7, time: 3000});
  852 + // return;
  853 + // }
854 var subId = $(this).data("id"); 854 var subId = $(this).data("id");
855 var oldData = getResOrKpiBySubId(subId,'kpi'); 855 var oldData = getResOrKpiBySubId(subId,'kpi');
856 var oldKpiData = Array.from(new Set($.map(oldData,function (item) { 856 var oldKpiData = Array.from(new Set($.map(oldData,function (item) {
@@ -1054,10 +1054,10 @@ layui.define(['table', 'form', 'admin', 'layer', 'common','sessions'], function @@ -1054,10 +1054,10 @@ layui.define(['table', 'form', 'admin', 'layer', 'common','sessions'], function
1054 1054
1055 //删除拓扑数据 1055 //删除拓扑数据
1056 function deletealarmsubscribe(id) { 1056 function deletealarmsubscribe(id) {
1057 - if ($.inArray('back:alarmsubscribe:delete', checkList) == -1) {  
1058 - layer.msg('暂无权限!', {icon: 7, time: 3000});  
1059 - return;  
1060 - } 1057 + // if ($.inArray('back:alarmsubscribe:delete', checkList) == -1) {
  1058 + // layer.msg('暂无权限!', {icon: 7, time: 3000});
  1059 + // return;
  1060 + // }
1061 if (typeof (id) != "string") { 1061 if (typeof (id) != "string") {
1062 var ids = []; 1062 var ids = [];
1063 var data = table.checkStatus('alarmsubscribeTable').data; 1063 var data = table.checkStatus('alarmsubscribeTable').data;
@@ -222,7 +222,7 @@ layui.define(['table', 'form', 'laydate','view', 'common','sessions','xmSelect', @@ -222,7 +222,7 @@ layui.define(['table', 'form', 'laydate','view', 'common','sessions','xmSelect',
222 var data1 = form.val("dirctiveAddForm"); 222 var data1 = form.val("dirctiveAddForm");
223 var txt = codeEditor.editor.getValue(); 223 var txt = codeEditor.editor.getValue();
224 if (data1.dirctiveName != '' && data1.collScope != '' && txt != '') { 224 if (data1.dirctiveName != '' && data1.collScope != '' && txt != '') {
225 - test(); 225 + //test();
226 } else { 226 } else {
227 layer.msg("请将所有必填项补充完整后验证！", { offset: '15px' , icon: 7 , time: 2000 }); 227 layer.msg("请将所有必填项补充完整后验证！", { offset: '15px' , icon: 7 , time: 2000 });
228 } 228 }
@@ -73,7 +73,7 @@ layui.define(['sessions', 'form', 'common'], function (exports) { @@ -73,7 +73,7 @@ layui.define(['sessions', 'form', 'common'], function (exports) {
73 success(response) { 73 success(response) {
74 //debugger 74 //debugger
75 if (response.gateway) { 75 if (response.gateway) {
76 - //logApi = response.gateway; 76 + logApi = response.gateway;
77 } 77 }
78 } 78 }
79 }); 79 });
@@ -93,66 +93,67 @@ layui.define(['sessions', 'form', 'common'], function (exports) { @@ -93,66 +93,67 @@ layui.define(['sessions', 'form', 'common'], function (exports) {
93 success: function (rsp) { 93 success: function (rsp) {
94 if (rsp.code == 0) { 94 if (rsp.code == 0) {
95 var name = rsp.object.username; 95 var name = rsp.object.username;
96 - try {  
97 - var SubtleCrypto = new SubtleCrypto();  
98 - var pwd = SubtleCrypto.decrypt(rsp.object.password);  
99 - console.log(pwd);  
100 - } catch (e) {  
101 -  
102 - }  
103 -  
104 - var field = {};  
105 - field.username = name;  
106 - field.password = '123456';  
107 - field.grant_type = 'password';  
108 - field.scope = 'app';  
109 - field.client_id = 'webApp';  
110 - field.client_secret = 'webApp';  
111 - field.deviceId = "";  
112 - field.validCode = '';  
113 -  
114 -  
115 - $.ajax({  
116 - url: common.domainName + '/api-auth/oauth/token',  
117 - data: field,  
118 - type: 'POST',  
119 - dataType: 'JSON',  
120 - success: function (data) {  
121 - if (data.access_token) {  
122 - console.log('登录成功')  
123 -  
124 - layui.data(setter.tableName, {  
125 - key: setter.request.tokenName  
126 - , value: data.access_token  
127 - });  
128 - sessions.putToken(data);  
129 - sessions.putUser(name);  
130 - layer.closeAll();  
131 - //将access_token和refresh_token写入本地  
132 - localStorage.setItem("access_token", data.access_token);  
133 - localStorage.setItem("refresh_token", data.refresh_token);  
134 - //将登陆url写入本地  
135 - localStorage.setItem("loginUrl", location.href);  
136 -  
137 - //登入成功的提示与跳转  
138 - if (url.indexOf("ajConfig") != -1 && url.indexOf("ajConfig/view") != -1) {  
139 -  
140 - window.location = window.location.origin + '/vue3/index.html#/' + url;  
141 -  
142 - } else {  
143 - window.location = window.location.origin + '/start/index.html?show=0&access_token=' + data.access_token + '#/' + url;  
144 - }  
145 -  
146 - } else {  
147 - layer.msg('登录失败，请重试', {icon: 5, time: 500});  
148 - }  
149 - },  
150 - error: function (xhr) {  
151 - err(); 96 + // try {
  97 + // var SubtleCrypto = new SubtleCrypto();
  98 + // var pwd = SubtleCrypto.decrypt(rsp.object.password);
  99 + // } catch (e) {
  100 + //
  101 + // }
  102 + //
  103 + // var field = {};
  104 + // field.username = name;
  105 + // field.password = '123456';
  106 + // field.grant_type = 'password';
  107 + // field.scope = 'app';
  108 + // field.client_id = 'webApp';
  109 + // field.client_secret = 'webApp';
  110 + // field.deviceId = "";
  111 + // field.validCode = '';
  112 + //
  113 + //
  114 + // $.ajax({
  115 + // url: common.domainName + '/api-auth/oauth/token',
  116 + // data: field,
  117 + // type: 'POST',
  118 + // dataType: 'JSON',
  119 + // success: function (data) {
  120 + if (tokenStr) {
  121 + console.log('登录成功')
  122 +
  123 + layui.data(setter.tableName, {
  124 + key: setter.request.tokenName
  125 + , value: tokenStr
  126 + });
  127 + sessions.putToken({"access_token":tokenStr});
  128 + sessions.putUser(name);
  129 + layer.closeAll();
  130 + //将access_token和refresh_token写入本地
  131 + localStorage.setItem("access_token", tokenStr);
  132 + //localStorage.setItem("refresh_token", data.refresh_token);
  133 + //将登陆url写入本地
  134 + localStorage.setItem("loginUrl", location.href);
  135 +
  136 + //登入成功的提示与跳转
  137 + if (url.indexOf("ajConfig") != -1 && url.indexOf("ajConfig/view") != -1) {
  138 +
  139 + window.location = window.location.origin + '/vue3/index.html#/' + url;
  140 +
  141 + } else {
  142 + window.location = window.location.origin + '/start/index.html?show=0&access_token=' + tokenStr+ '#/' + url;
152 } 143 }
153 - }); 144 + }
  145 + //
  146 + // } else {
  147 + // layer.msg('登录失败，请重试', {icon: 5, time: 500});
  148 + // }
  149 + // },
  150 + // error: function (xhr) {
  151 + // err();
  152 + // }
  153 + //});
154 } 154 }
155 - }, 155 + }
  156 + ,
156 error: function (xhr, type, errorThrown) { 157 error: function (xhr, type, errorThrown) {
157 err(); 158 err();
158 } 159 }
@@ -206,8 +206,7 @@ layui.extend({ @@ -206,8 +206,7 @@ layui.extend({
206 // 跳转到过度页面的时候，判断参数与跳转的过渡页面的参数是否一直，则强制设置hash 206 // 跳转到过度页面的时候，判断参数与跳转的过渡页面的参数是否一直，则强制设置hash
207 // http://localhost:8088/?Authorization=xxx&show=0&url=alarm/activewarning#/page/forward 207 // http://localhost:8088/?Authorization=xxx&show=0&url=alarm/activewarning#/page/forward
208 var href = window.location.href; 208 var href = window.location.href;
209 - console.log(pathURL)  
210 - console.log(href) 209 +
211 if (href.indexOf('?Authorization') != -1 && href.indexOf('&show=0&url=') != -1 && pathURL !== '/page/forward'&& pathURL !== '/page/log') { 210 if (href.indexOf('?Authorization') != -1 && href.indexOf('&show=0&url=') != -1 && pathURL !== '/page/forward'&& pathURL !== '/page/log') {
212 if(href.indexOf('&flag=log') != -1){ 211 if(href.indexOf('&flag=log') != -1){
213 return location.hash = "/page/log"; 212 return location.hash = "/page/log";
@@ -639,8 +638,8 @@ layui.extend({ @@ -639,8 +638,8 @@ layui.extend({
639 if (!connectFlg) { 638 if (!connectFlg) {
640 tryIndex++; 639 tryIndex++;
641 access_token = localStorage.getItem("access_token") 640 access_token = localStorage.getItem("access_token")
642 - webSockState = false;  
643 - alarmWebSocket(); 641 + //webSockState = false;
  642 + //alarmWebSocket();
644 //setTimeout(tryFunc(),3000); 643 //setTimeout(tryFunc(),3000);
645 } 644 }
646 }, tryIndex * 3000); 645 }, tryIndex * 3000);