故障联调 全部添加重复数据友好提醒

@@ -436,6 +436,9 @@
     width:30px;
     height:30px;
 }
+.icon-step img{
+    width:100%;
+}
 .cursorClass{
     cursor: pointer;
 }

@@ -162,19 +162,30 @@ export default {
            }else {
                proxy.$http.post('/api-web/fault/conf/apm/saveOrUpdate',params,function (res){
                    if(res && res.success){
+                       if(res.count==0){
+                           proxy.$global.showMsg(res.msg,'warning');
+
+                       }else{
                            proxy.$global.showMsg('添加成功','success');
-                    proxy.targetId=res.src;
+                           proxy.targetId=res.str;
                            proxy.saveModel();
                            // proxy.APMVisible=false;
+                       }
+
                    }else{
                        proxy.$global.showMsg('添加失败','warning');
 
                    }
 
                })
+
+
         }}
         //表格全选事件
         let selectionChange=(val)=>{
+            proxy.tableDataList.map((v,i)=>{
+                v.checked=false;
+            })
             let selectData=val;
             if(selectData.length>0){
                 selectData.map((item,index)=>{

@@ -139,29 +139,42 @@ export default {
                 proxy.$global.showMsg('暂无配置','warning');
             }else{
                 proxy.isLoading=true;
-
                 let params={
                     busId:proxy.bizId,
                     targetId:proxy.targetId,
                 }
-
                 proxy.$http.post('/api-web/fault/conf/npm/AddAllNpm',params,function (res){
                     if(res && res.success){
+                        if(res.count==0){
+                            proxy.$global.showMsg(res.msg,'warning');
+                        }else{
                             proxy.$global.showMsg('添加成功','success');
                             proxy.targetId=res.str;
                             proxy.saveModel();
                             // proxy.applicationMonitorVisible=false;
+                        }
+
                     }else{
                         proxy.$global.showMsg('添加失败','warning');
                     }
                     proxy.isLoading=false;
 
+                },function (err){
+                    proxy.isLoading=false;
+
                 })
+
+
             }
 
         }
         //表格全选事件
         let selectionChange=(val)=>{
+            proxy.tableDataList.map((v,i)=>{
+
+                    v.checked=false;
+
+            })
             let selectData=val;
             if(selectData.length>0){
                 selectData.map((item,index)=>{
@@ -177,6 +190,7 @@ export default {
                     v.checked=false;
                 })
             }
+            console.log("selectchange",val,proxy.tableDataList)
         }
 
         //添加选中的

@@ -34,7 +34,7 @@
         </el-row>
         <el-row class="margin-bottom-50">
           <el-col :span="24" class="overflow-scroll-y">
-            <cm-table-page :columns="columns" :dataList="tableDataList" @loaddata="loadTableDataList"
+            <cm-table-page v-if="tableDataList" :columns="columns" :dataList="tableDataList" @loaddata="loadTableDataList"
                            :showIndex="true" :total="count"
                            :showBorder="true" :loading="false" :pageSize="pageSize"
                            :showPage="true" :showTools="isDetail" :height="(height - 500)">

@@ -130,6 +130,11 @@ export default {
                 proxy.targetId=props.propsData.targetId;
                 proxy.busTypeArr=[props.propsData.bizId];
             }
+            if(proxy.targetId){
+                proxy.isDetail=true;
+            }else{
+                proxy.isDetail=false;
+            }
             console.log("*",props.propsData,proxy.bizId,proxy.busTypeArr)
 
         }
@@ -154,7 +159,40 @@ export default {
             proxy.pageSize=limit;
             proxy.getEnvironmentData()
         }
+        //获取基础环境资源列表数据
+        let getEnvironmentData=()=>{
+            let params={
+                busId:proxy.bizId,
+                resId:proxy.resTypeArr,
+                page:proxy.page,
+                pageSize:proxy.pageSize
+
+            }
+            console.log("*/*/*",proxy.targetId)
+            if(proxy.targetId){
+                //详情页面
+                proxy.isDetail=true;
+                proxy.$http.get('/api-web/fault/conf/base/getFaultBaseAllResInfo',params,function (res){
+                    if(res && res.data){
+                        proxy.count = res.count;
+                        proxy.tableDataList=res.data;
+                        proxy.$emit('baseCount',proxy.count);
+                    }
+                })
+            }else{
+                proxy.isDetail=false;
+                proxy.$http.get('/api-web/fault/base/config/page',params,function (res){
+                    if(res && res.data){
+                        proxy.count = res.count;
+                        proxy.tableDataList=res.data;
+                        proxy.$emit('baseCount',proxy.count);
+                    }
+                })
+            }
+
+        }
         return {
+            getEnvironmentData,
             loadTableDataList,
             page,
             pageSize,
@@ -215,39 +253,7 @@ export default {
             })
 
         },
-        //获取基础环境资源列表数据
-        getEnvironmentData(){
-            let that=this;
-            let params={
-                busId:this.bizId,
-                resId:this.resTypeArr,
-                page:this.page,
-                pageSize:this.pageSize
-
-            }
-            console.log("*/*/*",this.targetId)
-            if(this.targetId){
-                //详情页面
-                this.isDetail=true;
-                this.$http.get('/api-web/fault/conf/base/getFaultBaseAllResInfo',params,function (res){
-                    if(res && res.data){
-                        that.count = res.count;
-                        that.tableDataList=res.data;
-                        that.$emit('baseCount',that.count);
-                    }
-                })
-            }else{
-                this.isDetail=false;
-                this.$http.get('/api-web/fault/base/config/page',params,function (res){
-                    if(res && res.data){
-                        that.count = res.count;
-                        that.tableDataList=res.data;
-                        that.$emit('baseCount',that.count);
-                    }
-                })
-            }
 
-        }
 
 
 

@@ -794,7 +794,7 @@ export default {
                 }
             }else if(this.type=='apm'){
                 if(this.apmMonitorList.length==0){
-                    this.$global.showMsg('请先选择添加apm配置','warning');
+                    this.$global.showMsg('请先选择添加APM配置','warning');
                     return;
                 }
             }
@@ -953,7 +953,7 @@ export default {
                     if(res && res.success){
                         that.targetId=res.str;
                         that.setTargetId(that.targetId)
-                        that.$global.showMsg(res.msg)
+                        // that.$global.showMsg(res.msg)
                         // that.alarmList=res.data;
                         that.saveConfigDetailOther();
                     }else{