Authored by 袁晋鹏

告警订阅功能优化

@@ -450,7 +450,7 @@ layui.define(['table', 'form', 'admin', 'layer', 'common','sessions','tree'], fu @@ -450,7 +450,7 @@ layui.define(['table', 'form', 'admin', 'layer', 'common','sessions','tree'], fu
450 function getTableData(callback) { 450 function getTableData(callback) {
451 layer.load(2); 451 layer.load(2);
452 admin.req({ 452 admin.req({
453 - url: 'http://192.168.0.44:8080/log-access/v1/lm2_join_device' 453 + url: common.domainName + '/log-access/v1/lm2_join_device'
454 ,data:{ 454 ,data:{
455 subId:subId, 455 subId:subId,
456 _condition_:$('#condition-resType-keyword').val() 456 _condition_:$('#condition-resType-keyword').val()
@@ -532,7 +532,7 @@ layui.define(['table', 'form', 'admin', 'layer', 'common','sessions','tree'], fu @@ -532,7 +532,7 @@ layui.define(['table', 'form', 'admin', 'layer', 'common','sessions','tree'], fu
532 <td>${v.protocolType}</td><td><span id="${v.id}" class="link resource_sublist_del">删除</span></td></tr>`; 532 <td>${v.protocolType}</td><td><span id="${v.id}" class="link resource_sublist_del">删除</span></td></tr>`;
533 }); 533 });
534 var tb = ` 534 var tb = `
535 - <form class="layui-form layui-card-header layuiadmin-card-header-auto" lay-filter="dyglTools-form"> 535 + <form class="layui-form layui-card-header layuiadmin-card-header-auto" lay-filter="dyglTools-form" hidden>
536 <div class="layui-form-item"> 536 <div class="layui-form-item">
537 <div class="layui-inline"> 537 <div class="layui-inline">
538 <div class="layui-input-inline layui-input-inline--long"> 538 <div class="layui-input-inline layui-input-inline--long">
@@ -625,7 +625,7 @@ layui.define(['table', 'form', 'admin', 'layer', 'common','sessions','tree'], fu @@ -625,7 +625,7 @@ layui.define(['table', 'form', 'admin', 'layer', 'common','sessions','tree'], fu
625 //查看资源类型订阅列表 625 //查看资源类型订阅列表
626 $(".view-alarmsubscribe-resType").on("click", function () { 626 $(".view-alarmsubscribe-resType").on("click", function () {
627 var subId = $(this).data("id"); 627 var subId = $(this).data("id");
628 - common.openWin("template/res/typeSubscribeList", "选择设备类型", { 628 + common.openWin("template/res/typeSubscribeList", "订阅设备类型列表", {
629 subId: subId, 629 subId: subId,
630 type: 0 630 type: 0
631 }, ["返回"], function () { 631 }, ["返回"], function () {
@@ -637,7 +637,7 @@ layui.define(['table', 'form', 'admin', 'layer', 'common','sessions','tree'], fu @@ -637,7 +637,7 @@ layui.define(['table', 'form', 'admin', 'layer', 'common','sessions','tree'], fu
637 //查看业务类型订阅列表 637 //查看业务类型订阅列表
638 $(".view-alarmsubscribe-busId").on("click", function () { 638 $(".view-alarmsubscribe-busId").on("click", function () {
639 var subId = $(this).data("id"); 639 var subId = $(this).data("id");
640 - common.openWin("template/res/typeSubscribeList", "选择业务系统", { 640 + common.openWin("template/res/typeSubscribeList", "订阅业务系统列表", {
641 subId: subId, 641 subId: subId,
642 type: 1 642 type: 1
643 }, ["返回"], function () { 643 }, ["返回"], function () {
@@ -45,7 +45,7 @@ layui.define(['table', 'form', 'admin', 'layer', 'common','sessions', 'xmSelect' @@ -45,7 +45,7 @@ layui.define(['table', 'form', 'admin', 'layer', 'common','sessions', 'xmSelect'
45 45
46 // 设备类型 下拉选 46 // 设备类型 下拉选
47 $.ajax({ 47 $.ajax({
48 - url: 'http://192.168.0.44:8080/log-access/v1/lm2_logfmt_dirs/queryTreeList?access_token='+ accessToken, 48 + url: common.domainName + '/log-access/v1/lm2_logfmt_dirs/queryTreeList?access_token='+ accessToken,
49 type: 'get', 49 type: 'get',
50 success: function (res) { 50 success: function (res) {
51 if (res && res.data) { 51 if (res && res.data) {
@@ -176,7 +176,7 @@ layui.define(['table', 'form', 'admin', 'layer', 'common','sessions', 'xmSelect' @@ -176,7 +176,7 @@ layui.define(['table', 'form', 'admin', 'layer', 'common','sessions', 'xmSelect'
176 }); 176 });
177 177
178 $.ajax({ 178 $.ajax({
179 - url: `http://192.168.0.44:8080/log-deploy/v1/lm2_protocol?access_token=${accessToken}`, 179 + url: common.domainName + `/log-deploy/v1/lm2_protocol?access_token=${accessToken}`,
180 method:"get", 180 method:"get",
181 success(res){ 181 success(res){
182 protocolList = res.data; 182 protocolList = res.data;
@@ -204,7 +204,7 @@ layui.define(['table', 'form', 'admin', 'layer', 'common','sessions', 'xmSelect' @@ -204,7 +204,7 @@ layui.define(['table', 'form', 'admin', 'layer', 'common','sessions', 'xmSelect'
204 resType || (resType = 'all') 204 resType || (resType = 'all')
205 var reslisTable = table.render({ 205 var reslisTable = table.render({
206 elem: '#reslist_resListTable' 206 elem: '#reslist_resListTable'
207 - , url: 'http://192.168.0.44:8080/log-access/v1/lm2_join_device' 207 + , url: common.domainName + '/log-access/v1/lm2_join_device'
208 ,where:{ 208 ,where:{
209 access_token: accessToken, 209 access_token: accessToken,
210 protocolType: '', 210 protocolType: '',
@@ -365,7 +365,7 @@ layui.define(['table', 'form', 'admin', 'layer', 'common','sessions', 'xmSelect' @@ -365,7 +365,7 @@ layui.define(['table', 'form', 'admin', 'layer', 'common','sessions', 'xmSelect'
365 //刷新表格 365 //刷新表格
366 function reloadTable(resType) { 366 function reloadTable(resType) {
367 reslisTable.reload({ 367 reslisTable.reload({
368 - url:"http://192.168.0.44:8080/log-access/v1/lm2_join_device" 368 + url:common.domainName + "/log-access/v1/lm2_join_device"
369 ,where:{ 369 ,where:{
370 currentPage: 1, 370 currentPage: 1,
371 pageLimit: 20, 371 pageLimit: 20,
@@ -54,7 +54,7 @@ layui.define(['form', 'admin', 'layer', 'laytpl', 'common', 'view', 'sessions', @@ -54,7 +54,7 @@ layui.define(['form', 'admin', 'layer', 'laytpl', 'common', 'view', 'sessions',
54 54
55 // 设备树 55 // 设备树
56 $.ajax({ 56 $.ajax({
57 - url:"http://192.168.0.44:8080"+"/log-access/v1/lm2_logfmt_dirs/queryTreeList?access_token="+accessToken, 57 + url:common.domainName +"/log-access/v1/lm2_logfmt_dirs/queryTreeList?access_token="+accessToken,
58 method:"get", 58 method:"get",
59 success(res){ 59 success(res){
60 if (res.code==200){ 60 if (res.code==200){
@@ -5,7 +5,7 @@ @@ -5,7 +5,7 @@
5 <div class="layui-card"> 5 <div class="layui-card">
6 <div class="layui-card-header"> 6 <div class="layui-card-header">
7 <div class="layui-status"> 7 <div class="layui-status">
8 - <form class="layui-form layui-card-header layuiadmin-card-header-auto" lay-filter="res-list-query-form"> 8 + <form class="layui-form layui-card-header layuiadmin-card-header-auto" lay-filter="res-list-query-form" hidden>
9 <div class="layui-form-item"> 9 <div class="layui-form-item">
10 <div class="layui-inline"> 10 <div class="layui-inline">
11 <div class="layui-input-inline layui-input-inline--long"> 11 <div class="layui-input-inline layui-input-inline--long">
@@ -34,7 +34,7 @@ layui.define(['table', 'form', 'admin', 'layer', 'laytpl', 'common', 'view', 'se @@ -34,7 +34,7 @@ layui.define(['table', 'form', 'admin', 'layer', 'laytpl', 'common', 'view', 'se
34 34
35 // 业务树 35 // 业务树
36 $.ajax({ 36 $.ajax({
37 - url: "http://192.168.0.44:8080" + "/log-access/v1/lm2_logjoin_dirs/queryTreeList?access_token="+accessToken, 37 + url: domainName + "/log-access/v1/lm2_logjoin_dirs/queryTreeList?access_token="+accessToken,
38 method:"get", 38 method:"get",
39 success(res){ 39 success(res){
40 if (res.code==200){ 40 if (res.code==200){