Merge branch 'master-500-dev' of http://192.168.1.136:82/monitor_v3/hg-monitor-w…

…eb into master-500-dev

@@ -4740,37 +4740,6 @@ layui.define(['soulTable', 'commonDetail', 'common', 'laytpl', 'view', 'admin',
             // }
             // }
             return true;
             return true;
         },
         },
-        /**
-         * @Description 验证是否展示AJ配置的详情页 传入资源信息
-         * @Author XuHaoJie
-         * @Date  2022/3/1 15:02
-         */
-        isAjPage: function (item) {
-            let map = {
-                sign: false,
-                value: [],
-            }
-            let resType = item.resType;
-            let provider = item.provider;
-            let resId = item.resId;
-            admin.req({
-                url: common.domainName + '/api-web/ajConfig/isAjPage',
-                async: false,
-                data: {
-                    resType,
-                    provider,
-                    resId
-                },
-                success(response) {
-                    map.sign = response.success;
-                    map.value = response.data ? response.data : [];
-                },
-                error() {
-                    layer.closeAll('loading');
-                }
-            });
-            return map;
-        },
 
 
         /**
         /**
          * 获取详情页弹框的标题
          * 获取详情页弹框的标题
@@ -4836,7 +4805,6 @@ layui.define(['soulTable', 'commonDetail', 'common', 'laytpl', 'view', 'admin',
             });
             });
             //资源名称点击事件
             //资源名称点击事件
             $('[data-zymc]').unbind('click').on('click', function () {
             $('[data-zymc]').unbind('click').on('click', function () {
-
                 var state = $(this).data("state");
                 var state = $(this).data("state");
                 var resType = $(this).data("restype");
                 var resType = $(this).data("restype");
                 var provider = $(this).data("provider");
                 var provider = $(this).data("provider");
@@ -4857,7 +4825,6 @@ layui.define(['soulTable', 'commonDetail', 'common', 'laytpl', 'view', 'admin',
                 var manageIp = $(this).data("manageip");
                 var manageIp = $(this).data("manageip");
                 var collProtocol = $(this).data("collprotocol");
                 var collProtocol = $(this).data("collprotocol");
                 var provider = $(this).data("provider");
                 var provider = $(this).data("provider");
-
                 // if (name && name !== '') {
                 // if (name && name !== '') {
                 //     name += '|';
                 //     name += '|';
                 // }
                 // }
@@ -4885,55 +4852,6 @@ layui.define(['soulTable', 'commonDetail', 'common', 'laytpl', 'view', 'admin',
                 //     name = name.substr(0, name.length - 1);
                 //     name = name.substr(0, name.length - 1);
                 // }
                 // }
                 var title = obj.getTitle(resName, resType, resTypeName, ip, manageIp, collProtocol, adminName);
                 var title = obj.getTitle(resName, resType, resTypeName, ip, manageIp, collProtocol, adminName);
-
-                //判断是否启用AJ配置
-                let map = obj.isAjPage({
-                    resId: resId,
-                    name: name,
-                    resName: resName,
-                    ip: ip,
-                    resType: resType,
-                    resTypeName: resTypeName,
-                    admin: admin,
-                    adminName,
-                    manageIp: manageIp,
-                    collProtocol: collProtocol,
-                    provider: provider
-                });
-                if (map.sign && map.value.length>0) {
-                    let configAG = map.value ? map.value[0] : {param:'',designPage:''};
-                    let designPage = configAG.designPage;
-                    title += '<i data-id=${resId}  class="iconfont detail_base_info" style="margin-left: 10px" lay-tips="暂无信息">&#xe61e;</i>'
-                    title += `<a class="layui-icon layui-icon-pause" id=${resId} data-opts="stop" style="display: none" lay-tips="暂停采集"></a>`
-                    title += `<a class="layui-icon layui-icon-play" id=${resId} data-opts="start" style="display: none" lay-tips="恢复采集"></a>`
-                    title += `<a class="layui-icon layui-icon-rate" data-id=${resId} lay-tips="加入收藏夹"></a>`;
-                    title += `<a class="layui-icon filterList" data-id=${resId} lay-tips="指标过滤清单" style="margin-left: 10px"><i class="iconfont">&#XE516;</i></a>`;
-                    title += `<a class="layui-icon res-view-relation-topo" data-id=${resId} lay-tips="查看资源关系拓扑" style="margin-left: 10px"><i class="iconfont">&#XE515;</i></a>`;
-                    // if (resCategory === 'share' && hardwareFlag.endsWith("Y")) {
-                    //     title += `<a class="layui-icon res-view-assets-details" data-ip=${ip} data-name=${name} data-restype=${resType} data-id=${resId} lay-tips="资产配置信息"><i class="iconfont">&#XE517;</i></a>`;
-                    // }
-                    var area = ['90%', '90%'];
-                    if (!title) {
-                        title = "信息";
-                    }
-                    let AJUrl = sessionStorage.getItem("ajWeb") + '/#/bigscreen/viewer?reportCode=' + designPage +  configAG && configAG.param ? configAG.param : '' + '&access_token=' + localStorage.getItem("access_token");
-                    layer.open({
-                        type: 2
-                        , id: 'config_aj_id' //设定一个id，防止重复弹出
-                        , title: title
-                        , closeBtn: 1
-                        , area: area
-                        , move: false
-                        , shadeClose: true//开启遮罩层
-                        , btn: false
-                        , content: AJUrl
-                        , end: function (layero, index) {
-                            layer.closeAll();
-                        }
-                    });
-                    return false;
-                }
-
                 if (editFlag) {
                 if (editFlag) {
                     commonDetail.openDetail(resId, resType, title, editFlag, function (data) {
                     commonDetail.openDetail(resId, resType, title, editFlag, function (data) {
                         $.each(data, function (i, e) {
                         $.each(data, function (i, e) {

 <div class="container" :style="{'height':height+'px','max-height':height+'px'}">
 <div class="container" :style="{'height':height+'px','max-height':height+'px'}">
-  <iframe :src="src"  width="100%" height="100%" ></iframe>
+  <iframe :src="getSrc"  width="100%" height="100%" ></iframe>
 </div>
 </div>

@@ -9,22 +9,34 @@ export default {
     },
     },
     setup() {
     setup() {
         const {proxy} = Vue.getCurrentInstance();
         const {proxy} = Vue.getCurrentInstance();
-        let src = Vue.ref('');
+        let getSrc = Vue.ref('');
         let height = Vue.ref(window.innerHeight - 10);
         let height = Vue.ref(window.innerHeight - 10);
-        var reportCode = proxy.$global.getQueryVariable('reportCode');
+        var ajConfig = proxy.$global.getQueryVariable('ajConfig');
+        // let params = Vue.ref();
+        // let designPage = Vue.ref();
+        let getUrl=()=>{
+            let param={
+                id:ajConfig
+            }
+            let params='';
+            let designPage='';
+            proxy.$http.get(`/api-web/ajConfig/findOneById`, param, function (res) {
+                if (res && res.success == true) {
+                    params=res.object.param;
+                    designPage=res.object.designPage;
+                }
+                getSrc.value=sessionStorage.getItem("ajWeb")+'/#/bigscreen/viewer?reportCode='+designPage+params+'&access_token=' + localStorage.getItem("access_token");
 
 
-        let url=()=>{
-            src.value=sessionStorage.getItem("ajWeb")+'/#/bigscreen/viewer?reportCode='+reportCode+'&access_token=' + localStorage.getItem("access_token");
+            })
         }
         }
         // 挂载完
         // 挂载完
         Vue.onMounted(() => {
         Vue.onMounted(() => {
-            url();
+            getUrl();
         })
         })
 
 
         return {
         return {
-            url,
-            src,
-            height
+            height,
+            getSrc,
         }
         }
     }
     }
 }
 }