Authored by 王涛

Merge branch 'master-v32-lushangqing' into 'master'

故障接口联调



See merge request !223
... ... @@ -41,7 +41,7 @@
<template #default="{row,prop,column}">
<div v-if="prop == 'kpiName'" class="list-data">
<span class="list-data-text">指标: {{row.kpiName }}</span>
<img :id="row.index" @click="deleteItem(row.id, row)" src="./src/assets/images/faultDiagnosis/icon-item-delete.png" class="img-delete cursorClass">
<img :id="row.index" @click="deleteItem(row)" src="./src/assets/images/faultDiagnosis/icon-item-delete.png" class="img-delete cursorClass">
</div>
</template>
... ...
... ... @@ -185,12 +185,21 @@ export default {
this.$emit('callbackLog', 'log');
},
//删除表格指标
deleteItem(id, list){
let params={
id:id,
list:list
}
this.$emit('callbackDelete',params)
deleteItem(item){
let that=this;
let params={
id:item.id
}
this.$http.get('/api-web/fault/conf/base/deleteById',params,function (res){
if(res){
that.$global.showMsg('删除成功');
that.getEnvironmentData();
}
that.$emit('callbackDelete',item)
})
},
//获取基础环境资源列表数据
getEnvironmentData(){
... ...
... ... @@ -166,10 +166,10 @@
<div class="btn-el-btn margin-bottom-10" v-for="(item, index) in networkMonitorList" :key="index">
<div>
<el-button class="multiple-choice-button" type="primary">{{item.linkName}}</el-button>
<img :id="item.id" @click="deleteItem(item.id, networkMonitorList)" src="./src/assets/images/faultDiagnosis/icon-item-delete.png" class="multiple-choice-icon cursorClass">
<img :id="item.id" @click="deleteNetLink(item)" src="./src/assets/images/faultDiagnosis/icon-item-delete.png" class="multiple-choice-icon cursorClass">
</div>
</div>
<div class="flex-div btn-el-btn margin-bottom-10" >
<div class="flex-div btn-el-btn margin-bottom-10" v-if="faultStateRadio==1">
<el-button class="multiple-choice-button color-999" @click="addNetNode">添加网络检测</el-button>
<img src="./src/assets/images/faultDiagnosis/icon-item-add.png" class="multiple-choice-add-icon">
</div>
... ... @@ -208,7 +208,7 @@
</div>
</div>
<div class="flex-div btn-el-btn margin-bottom-10">
<div class="flex-div btn-el-btn margin-bottom-10" v-if="faultApplicationRadio==1">
<el-button class="multiple-choice-button color-999" @click="addApplicationMonitor()">添加应用检测</el-button>
<img src="./src/assets/images/faultDiagnosis/icon-item-add.png" class="multiple-choice-add-icon">
</div>
... ... @@ -236,7 +236,7 @@
</div>
</el-col>
</el-row>
<BasicEnvironment :propsData="propsData" @callbackDelete="deleteEnvironment"></BasicEnvironment>
<BasicEnvironment v-if="faultEnvironmentRadio==1" :propsData="propsData" @callbackDelete="deleteEnvironment"></BasicEnvironment>
<!-- <el-row>
<el-col :span="24">
... ... @@ -318,11 +318,11 @@
<div class="context-multiple-choice flex-div-start margin-30 flex-div-wrap overflow-scroll-y">
<div class="btn-el-btn margin-bottom-10" v-for="(item, index) in apmMonitorList" :key="index" >
<el-button class="multiple-choice-button" type="primary">{{item.resName}}</el-button>
<img :id="item.id" @click="deleteItem(item.id, apmMonitorList)" src="./src/assets/images/faultDiagnosis/icon-item-delete.png" class="multiple-choice-icon position-absolute cursorClass">
<img :id="item.id" @click="deleteApm(item)" src="./src/assets/images/faultDiagnosis/icon-item-delete.png" class="multiple-choice-icon position-absolute cursorClass">
</div>
<div class="btn-el-btn margin-bottom-10">
<div class="btn-el-btn margin-bottom-10" v-if="faultAPMRadio==1">
<el-button class="multiple-choice-button" @click="addAPM()">添加 APM</el-button>
<img src="./src/assets/images/faultDiagnosis/icon-item-add.png" class="multiple-choice-add-icon">
</div>
... ... @@ -362,7 +362,7 @@
<img :id="item.id" @click="deleteItem(item.id, logDetectionList)" src="./src/assets/images/faultDiagnosis/icon-item-delete.png" class="multiple-choice-icon">
</div>
</div>
<div class="btn-el-btn margin-bottom-10">
<div class="btn-el-btn margin-bottom-10" v-if="faultLogRadio==1">
<el-button class="multiple-choice-button" @click="addLogMonitor()">添加日志检测</el-button>
<img src="./src/assets/images/faultDiagnosis/icon-item-add.png" class="multiple-choice-add-icon">
</div>
... ... @@ -402,7 +402,7 @@
<!--取消和保存-->
<div class="btn-faultDiagnosis flex-center">
<el-button @click="goBackIndex">取消</el-button>
<el-button @click="saveConfigDetail" type="primary">保存</el-button>
<el-button @click="saveConfigDetail" type="primary" :loading="isLoading">保存</el-button>
</div>
... ...
... ... @@ -132,12 +132,14 @@ export default {
}
},
setup(props){
//btn加载中
let isLoading=Vue.ref(false);
//所属业务id
let busTypeArr = props.detailData?props.detailData.bizId:Vue.ref();
//诊断文档id
let docId= props.detailData?props.detailData.id:Vue.ref();
//faultConfId 故障配置id
let faultConfId=props.detailData?props.detailData.faultConfId:Vue.ref();
let faultConfId=docId?docId:Vue.ref();
//模块id--网络监测,应用监测...
let targetId=Vue.ref();
let propsData=Vue.ref();//向子组件传值所属业务id
... ... @@ -197,6 +199,7 @@ export default {
{type:'report',targetId:''},
]
return{
isLoading,
modelData,
faultDefinitionRadio,
faultStateRadio,
... ... @@ -423,7 +426,14 @@ export default {
this.configData.map((item,index)=>{
if(item.type==typeVal){
// that.targetId=item.targetId;
that.setTargetId(item.targetId);
if(that.docId){
that.setTargetId(item.targetId);
}else{
that.getTargetId(typeVal)
}
that.switchState(typeVal,item.state);
that.faultConfId=item.faultConfId;
}
... ... @@ -437,6 +447,37 @@ export default {
faultConfId:this.faultConfId
}
},
//设置state
switchState(typeVal,state){
console.log("state",typeVal,state)
switch (typeVal) {
case "netlink":
//网络检测
this.faultStateRadio=state;
break;
case "npm":
//应用检测
this.faultApplicationRadio=state;
break;
case "base":
//基础环境
this.faultEnvironmentRadio=state;
break;
case "apm":
//APM
this.faultAPMRadio=state;
break;
case "log":
//日志检测
this.faultLogRadio=state;
break;
case "report":
//订阅人员
break;
}
},
//给弹框传值分类型
postPropsData(typeVal,index){
... ... @@ -444,6 +485,7 @@ export default {
this.switchModelDialog(typeVal,index)
this.setDetailConfig(typeVal);
// this.getTargetId(typeVal)
}else{
this.$global.showMsg('请选择所属业务','warning')
}
... ... @@ -514,6 +556,7 @@ export default {
// this.APMVisible=true;
this.postPropsData('apm')
},
//关闭APM弹框
getAPMList(itemData){
... ... @@ -536,6 +579,8 @@ export default {
if(res && res.data){
that.apmMonitorList=res.data;//.slice(0,3);
}else{
that.apmMonitorList=[];
}
})
},
... ... @@ -561,7 +606,7 @@ export default {
},
//基础环境指标删除回调函数
deleteEnvironment(obj){
this.deleteItem(obj.id,obj.list)
this.deleteItem(obj.id,obj)
},
//根据诊断文档列表的id获取配置详情
getDetailByid(){
... ... @@ -571,7 +616,10 @@ export default {
this.$http.get('/api-web/fault/conf/'+this.docId,params,function (res){
if(res && res.object){
that.configData=res.object.confDetailList;
that.faultConfId=that.configData[0].faultConfId;
if(that.configData && that.configData.length>0){
that.faultConfId=res.object.id;
}
that.name=res.object.name;
}
... ... @@ -646,6 +694,7 @@ export default {
createBy:localStorage.getItem("lgn")
}
}
this.isLoading=true;
this.$http.post('/api-web/fault/conf/detail/saveConfigDetail',params,function (res){
if(res && res.success){
that.targetId=res.map.configDetail.targetId;
... ... @@ -658,6 +707,7 @@ export default {
that.$global.showMsg('保存失败','warning')
}
that.isLoading=false;
})
},
... ... @@ -736,6 +786,7 @@ export default {
}
}
this.isLoading=true;
this.$http.post('/api-web/fault/conf/rule/saveOrUpdate',params,function (res){
if(res && res.success){
that.targetId=res.map.bFaultRule.targetId;
... ... @@ -746,8 +797,28 @@ export default {
that.$global.showMsg('保存失败','warning')
}
that.isLoading=false;
})
},
//删除网络监测
deleteNetLink(item) {
let that=this;
this.$global.confirm("确认删除链路及节点吗?", function () {
let params={
id:item.id,
}
this.$http.get('/api-web/fault/conf/netLink/deleteNetLinkAndNodeById',params,function (res){
if(res){
that.$global.showMsg("删除成功!");
that.getNetLinkList();
}else{
that.$global.showMsg("删除失败!",'warning')
}
})
})
},
//删除应用监测
deleteApp(item){
... ... @@ -762,19 +833,62 @@ export default {
}
})
},
//删除apm
deleteApm(item){
let that=this;
let params={
id:item.id
}
this.$http.get('/api-web/fault/conf/apm/deleteById',params,function (res){
if(res){
that.$global.showMsg('删除成功');
that.getApmListInfo();
}
})
},
//更改业务选择
changeBUsType(val){
this.propsData={
bizId:this.busTypeArr,
this.getBusList();
// this.propsData={
// bizId:this.busTypeArr,
//
// }
// if(this.type=='apm'){
// this.getApmListInfo();
//
// }
// if(this.type=='npm'){
// this.getAppList();
// }
},
//根据业务bizId判断故障诊断表是否存在所属业务
getBusList(){
let that=this;
let params={
bizId:this.busTypeArr
}
if(this.type=='apm'){
this.getApmListInfo();
}
if(this.type=='npm'){
this.getAppList();
}
this.$http.get('/api-web/fault/conf/isExistByBizId/'+this.busTypeArr, {},function (res){
if(res && res.success){
}else{
that.$global.showMsg(res.msg,'warning');
that.busTypeArr=that.detailData?that.detailData.bizId:'';
}
that.propsData={
bizId:that.busTypeArr,
}
if(that.type=='apm'){
that.getApmListInfo();
}
if(that.type=='npm'){
that.getAppList();
}
})
},
//返回首页
goBackIndex(){
... ...
... ... @@ -152,6 +152,7 @@ export default {
if(proxy.networkMonitorList.length>0){
proxy.isClickNet=0;
proxy.linkId=proxy.networkMonitorList[0].id;
proxy.linkName=proxy.networkMonitorList[0].linkName;
}
proxy.getNodeData();
... ... @@ -309,6 +310,7 @@ export default {
this.isClickNet=index;
this.addSetLIstVisible=false;
this.linkId=item.id;
this.linkName=item.linkName;
this.getNodeData();
},
... ...