monitor_v3 / hg-monitor-web · Commits

Go to a project

Authored by xwx
Commit 25c0f1e98a82aaf7b488fab63d8facebe2df343b 2 parents e4436d44 4db61732

Merge branch 'master' of http://113.200.75.45:82/monitor_v3/hg-monitor-web into master-v32-xwx

Inline Side-by-side
Showing 4 changed files with 28 additions and 18 deletions
@@ -211,6 +211,7 @@ @@ -211,6 +211,7 @@
211 min-height: 500px; 211 min-height: 500px;
212 overflow-y: auto; 212 overflow-y: auto;
213 max-height: 630px; 213 max-height: 630px;
  214 + border-radius: 5px;
214 } 215 }
215 216
216 .network-monitor-popup{ 217 .network-monitor-popup{
@@ -336,11 +336,14 @@ export default { @@ -336,11 +336,14 @@ export default {
336 if(!this.isSaveModel()){ 336 if(!this.isSaveModel()){
337 return; 337 return;
338 } 338 }
339 - this.configData.map(item=>{  
340 - if(item.type=='apm'){  
341 - this.modleId=item.id;  
342 - }  
343 - }) 339 + if(this.configData){
  340 + this.configData.map(item=>{
  341 + if(item.type=='apm'){
  342 + this.modleId=item.id;
  343 + }
  344 + })
  345 + }
  346 +
344 this.hiddenAll(); 347 this.hiddenAll();
345 this.apmMonitorHide = true; 348 this.apmMonitorHide = true;
346 this.isActiveIndex=index; 349 this.isActiveIndex=index;
@@ -354,11 +357,14 @@ export default { @@ -354,11 +357,14 @@ export default {
354 if(!this.isSaveModel()){ 357 if(!this.isSaveModel()){
355 return; 358 return;
356 } 359 }
357 - this.configData.map(item=>{  
358 - if(item.type=='log'){  
359 - this.modleId=item.id;  
360 - }  
361 - }) 360 + if(this.configData){
  361 + this.configData.map(item=>{
  362 + if(item.type=='log'){
  363 + this.modleId=item.id;
  364 + }
  365 + })
  366 + }
  367 +
362 this.$global.showMsg('敬请期待...','warning'); 368 this.$global.showMsg('敬请期待...','warning');
363 return; 369 return;
364 this.hiddenAll(); 370 this.hiddenAll();
@@ -442,11 +448,14 @@ export default { @@ -442,11 +448,14 @@ export default {
442 break; 448 break;
443 case "npm": 449 case "npm":
444 //应用检测 450 //应用检测
445 - this.configData.map((item,index)=>{  
446 - if(item.type==typeVal){  
447 - item.state='1';  
448 - }  
449 - }) 451 + if(this.configData){
  452 + this.configData.map((item,index)=>{
  453 + if(item.type==typeVal){
  454 + item.state='1';
  455 + }
  456 + })
  457 + }
  458 +
450 this.applicationMonitorVisible=true; 459 this.applicationMonitorVisible=true;
451 break; 460 break;
452 case "base": 461 case "base":
@@ -38,7 +38,7 @@ export default { @@ -38,7 +38,7 @@ export default {
38 this.$global.confirm("确认删除故障吗？", function () { 38 this.$global.confirm("确认删除故障吗？", function () {
39 39
40 that.$http.get('/api-web/fault/conf/delFaultRelated/'+item.id, {},function (res){ 40 that.$http.get('/api-web/fault/conf/delFaultRelated/'+item.id, {},function (res){
41 - if(res){ 41 + if(res && res.success){
42 that.$global.showMsg("删除成功！"); 42 that.$global.showMsg("删除成功！");
43 that.diagnosisData.splice(index,1); 43 that.diagnosisData.splice(index,1);
44 }else{ 44 }else{
@@ -26,9 +26,9 @@ @@ -26,9 +26,9 @@
26 <div class="grid-content bg-purple-light network-monitor-popup-right"> 26 <div class="grid-content bg-purple-light network-monitor-popup-right">
27 <div class="set-div"> 27 <div class="set-div">
28 <div class="context-head"> 28 <div class="context-head">
29 - <div>电子税务局网络链路配置</div> 29 + <div>{{bizName}}网络链路配置</div>
30 <div > 30 <div >
31 - <img src="./src/assets/images/faultDiagnosis/icon-popup-right-delete.png"> 31 +<!-- <img src="./src/assets/images/faultDiagnosis/icon-popup-right-delete.png">-->
32 </div> 32 </div>
33 </div> 33 </div>
34 <el-row v-if="!addSetLIstVisible" class="flex-div-start" style="margin: 20px 0 10px 4%;" > 34 <el-row v-if="!addSetLIstVisible" class="flex-div-start" style="margin: 20px 0 10px 4%;" >