Merge branch 'master' of http://192.168.1.136:82/monitor_v3/hg-monitor-web into …

…master-v32-lushangqing

@@ -8,6 +8,7 @@ layui.define(['soulTable', 'commonDetail', 'common', 'laytpl', 'view', 'admin',
     var common = layui.common;
     var common = layui.common;
     var sessions = layui.sessions;
     var sessions = layui.sessions;
     var accessToken = sessions.getToken()['access_token'];
     var accessToken = sessions.getToken()['access_token'];
+    var regular = eval(sessionStorage.getItem("regular"));
     var soulTable = layui.soulTable;
     var soulTable = layui.soulTable;
     var laytpl = layui.laytpl;
     var laytpl = layui.laytpl;
     var view = layui.view;
     var view = layui.view;
@@ -3014,7 +3015,7 @@ layui.define(['soulTable', 'commonDetail', 'common', 'laytpl', 'view', 'admin',
                 e.preventDefault();
                 e.preventDefault();
                 //按钮
                 //按钮
                 let that=$(this);
                 let that=$(this);
-                let elementName=that.text();
+                let elementName=that.text().replace(regular, "");
                 admin.req({
                 admin.req({
                     url: common.domainName + '/api-web/bHalt'
                     url: common.domainName + '/api-web/bHalt'
                     ,data:{
                     ,data:{
@@ -3049,7 +3050,7 @@ layui.define(['soulTable', 'commonDetail', 'common', 'laytpl', 'view', 'admin',
                 e.preventDefault();
                 e.preventDefault();
                 //超链接
                 //超链接
                 let that=$(this);
                 let that=$(this);
-                let elementName=that.text();
+                let elementName=that.text().replace(regular, "");
                 admin.req({
                 admin.req({
                     url: common.domainName + '/api-web/bHalt'
                     url: common.domainName + '/api-web/bHalt'
                     ,data:{
                     ,data:{
@@ -3083,7 +3084,7 @@ layui.define(['soulTable', 'commonDetail', 'common', 'laytpl', 'view', 'admin',
                 e.preventDefault();
                 e.preventDefault();
                 //表头
                 //表头
                 let that=$(this);
                 let that=$(this);
-                let elementName=that.text();
+                let elementName=that.text().replace(regular, "");
                 admin.req({
                 admin.req({
                     url: common.domainName + '/api-web/bHalt'
                     url: common.domainName + '/api-web/bHalt'
                     ,data:{
                     ,data:{

@@ -49,7 +49,24 @@ export default {
                     proxy.$global.openDetail(e.data.data.resId, e.data.data.resType, proxy);
                     proxy.$global.openDetail(e.data.data.resId, e.data.data.resType, proxy);
                 }else if(e.data.type=='topology'){
                 }else if(e.data.type=='topology'){
                     //子页面点击拓扑图标进入拓扑页面
                     //子页面点击拓扑图标进入拓扑页面
-                    proxy.$global.viewResTopo(e.data.data.resId);
+                    let resId = data.data.resId;
+                    if(!resId){
+                        // 针对业务的跳转
+                        let busId = e.data.data.busId;
+                        if(busId){
+                            let url = `${sessionStorage.getItem("graphEditorOrigin")}/jgraph/grapheditor/viewer.html?access_token=${localStorage.getItem('access_token')}&id=${busId}&layout=organic`
+                            proxy.$global.layui.layer.open({
+                                type: 2,
+                                id : 'topology_' + (new Date()).getTime(),
+                                content: url,
+                                area: ['90%', '90%'],
+                                title: ''
+                            });
+                        }
+                        return;
+                    }
+                    //子页面点击拓扑图标进入拓扑页面
+                    proxy.$global.viewResTopo(resId);
                 } else if(e.data.type == 'openJimu' || e.data.type == 'openAJ') {
                 } else if(e.data.type == 'openJimu' || e.data.type == 'openAJ') {
                     // 打开报表页面
                     // 打开报表页面
                     let data = e.data.data;
                     let data = e.data.data;

@@ -31,3 +31,4 @@ config:
   tingyun:
   tingyun:
     api_key: aZipZbC18BhpG5GrjtiFAtThL1I0OUfn
     api_key: aZipZbC18BhpG5GrjtiFAtThL1I0OUfn
     secret_key: nbxay44wx8c3x4n5wcxe63mp87a72xed
     secret_key: nbxay44wx8c3x4n5wcxe63mp87a72xed
+  regular: /[`~!@#$^&*()=|{}':;',\\\[\]\.<>\/?~！@#￥……&*（）——|{}【】'；：""'。，、？\s ]/g

@@ -29,7 +29,7 @@
         }),$.ajax({
         }),$.ajax({
           url: '/config/getConfig',
           url: '/config/getConfig',
           data: {
           data: {
-            configName: 'config.audio'
+            configName: 'config'
           },
           },
         }),
         }),
       ).done(function (res1,res2) {
       ).done(function (res1,res2) {
@@ -42,7 +42,8 @@
         sessionStorage.setItem('ajWeb', res1[0].ajWeb);//lsq 2022-04-07 设置ajWeb的地址
         sessionStorage.setItem('ajWeb', res1[0].ajWeb);//lsq 2022-04-07 设置ajWeb的地址
         sessionStorage.setItem('sxView', res1[0].sxView);
         sessionStorage.setItem('sxView', res1[0].sxView);
         sessionStorage.setItem('workflow', res1[0].workflow);
         sessionStorage.setItem('workflow', res1[0].workflow);
-        sessionStorage.setItem('mp3', res2[0].mp3);
+        sessionStorage.setItem('mp3', res2[0].audio.mp3);
+        sessionStorage.setItem('regular', res2[0].regular);
         sessionStorage.setItem('jimuReport', res1[0].jimuReport);
         sessionStorage.setItem('jimuReport', res1[0].jimuReport);
         sessionStorage.setItem('cmdbWeb', res1[0].cmdbWeb);
         sessionStorage.setItem('cmdbWeb', res1[0].cmdbWeb);
       })
       })