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

故障联调 故障删除样式修改



See merge request !267

@@ -336,11 +336,14 @@ export default {
             if(!this.isSaveModel()){
             if(!this.isSaveModel()){
                 return;
                 return;
             }
             }
+            if(this.configData){
                 this.configData.map(item=>{
                 this.configData.map(item=>{
                     if(item.type=='apm'){
                     if(item.type=='apm'){
                         this.modleId=item.id;
                         this.modleId=item.id;
                     }
                     }
                 })
                 })
+            }
+
             this.hiddenAll();
             this.hiddenAll();
             this.apmMonitorHide = true;
             this.apmMonitorHide = true;
             this.isActiveIndex=index;
             this.isActiveIndex=index;
@@ -354,11 +357,14 @@ export default {
             if(!this.isSaveModel()){
             if(!this.isSaveModel()){
                 return;
                 return;
             }
             }
+            if(this.configData){
                 this.configData.map(item=>{
                 this.configData.map(item=>{
                     if(item.type=='log'){
                     if(item.type=='log'){
                         this.modleId=item.id;
                         this.modleId=item.id;
                     }
                     }
                 })
                 })
+            }
+
             this.$global.showMsg('敬请期待...','warning');
             this.$global.showMsg('敬请期待...','warning');
             return;
             return;
             this.hiddenAll();
             this.hiddenAll();
@@ -442,11 +448,14 @@ export default {
                     break;
                     break;
                 case "npm":
                 case "npm":
                     //应用检测
                     //应用检测
+                    if(this.configData){
                         this.configData.map((item,index)=>{
                         this.configData.map((item,index)=>{
                             if(item.type==typeVal){
                             if(item.type==typeVal){
                                 item.state='1';
                                 item.state='1';
                             }
                             }
                         })
                         })
+                    }
+
                     this.applicationMonitorVisible=true;
                     this.applicationMonitorVisible=true;
                     break;
                     break;
                 case "base":
                 case "base":

@@ -38,7 +38,7 @@ export default {
             this.$global.confirm("确认删除故障吗？", function () {
             this.$global.confirm("确认删除故障吗？", function () {
 
 
                 that.$http.get('/api-web/fault/conf/delFaultRelated/'+item.id, {},function (res){
                 that.$http.get('/api-web/fault/conf/delFaultRelated/'+item.id, {},function (res){
-                    if(res){
+                    if(res && res.success){
                         that.$global.showMsg("删除成功！");
                         that.$global.showMsg("删除成功！");
                         that.diagnosisData.splice(index,1);
                         that.diagnosisData.splice(index,1);
                     }else{
                     }else{

@@ -26,9 +26,9 @@
                 <div class="grid-content bg-purple-light network-monitor-popup-right">
                 <div class="grid-content bg-purple-light network-monitor-popup-right">
                     <div class="set-div">
                     <div class="set-div">
                         <div class="context-head">
                         <div class="context-head">
-                            <div>电子税务局网络链路配置</div>
+                            <div>{{bizName}}网络链路配置</div>
                             <div >
                             <div >
-                                <img src="./src/assets/images/faultDiagnosis/icon-popup-right-delete.png">
+<!--                                <img src="./src/assets/images/faultDiagnosis/icon-popup-right-delete.png">-->
                             </div>
                             </div>
                         </div>
                         </div>
                         <el-row  v-if="!addSetLIstVisible" class="flex-div-start" style="margin: 20px 0 10px 4%;" >
                         <el-row  v-if="!addSetLIstVisible" class="flex-div-start" style="margin: 20px 0 10px 4%;" >