Authored by 王涛

Merge branch 'master-V32-LH' into 'master'

拨测功能前端打开拨测分析展示框bug修改



See merge request !378
... ... @@ -467,7 +467,7 @@
<!--APM弹框-->
<APM v-show="APMVisible" :isDisplay="APMVisible" :apmMonitorList="apmMonitorList" :propsData="propsData" @callbackAPM="getAPMList"></APM>
<!--拨测分析弹框-->
<DialTest v-show="dialtestMonitorVisible" :isDisplay="dialtestMonitorVisible" :dialtestMonitorList="dialtestMonitorList" :propsData="propsData" @callbackApp="getDialtestMoniList"></DialTest>
<DialTest v-show="dialtestMonitorVisible" :isDisplay="dialtestMonitorVisible" :dialtestMonitorList="dialtestMonitorList" :propsData="propsData" @callbackDialtest="getDialtestMoniList"></DialTest>
<!--日志监测弹框-->
<LogMonition v-if="logMonitionVisible" :propsData="propsData" @callbackLog="getLogMonitionList"></LogMonition>
<!--订阅人员弹框-->
... ...
... ... @@ -112,6 +112,8 @@ export default {
setup(props){
const {proxy} = Vue.getCurrentInstance();
let applicationMonitorVisible=Vue.ref(false);
let dialtestMonitorVisible=Vue.ref(false);
let baseVisible=Vue.ref(false);
//btn加载中
let isLoading=Vue.ref(false);
... ... @@ -211,6 +213,7 @@ export default {
baseCount,
setDetail,
applicationMonitorVisible,
dialtestMonitorVisible,
baseVisible,
modleId,
ruleId,
... ... @@ -360,7 +363,7 @@ export default {
this.setDetailConfig(this.type)
this.getApmListInfo();
},
//拨测分析
//打开拨测分析
dialtestMonitorFunc(index){
if(!this.isSaveModel()){
return;
... ... @@ -526,7 +529,6 @@ export default {
}
})
}
this.dialtestMonitorVisible=true;
break;
case "log":
... ... @@ -756,7 +758,7 @@ export default {
},
//关闭拨测分析弹框
getDialtestMoniList(itemData){
this.applicationMonitorVisible=false;
this.dialtestMonitorVisible=false;
if(itemData.faultConfId){
this.faultConfId=itemData.faultConfId;
}
... ...
... ... @@ -6,7 +6,7 @@ export default {
data () {
return {
titleName:'拨测分析配置',
// applicationMonitorVisible: true,
// dialtestMonitorVisible: true,
columns:[
{
... ... @@ -255,7 +255,7 @@ export default {
faultConfId:proxy.faultConfId,
}
proxy.$emit('callbackApp',obj);
proxy.$emit('callbackDialtest',obj);
}
//清除数据
let restData=()=>{
... ...