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

@@ -318,7 +318,7 @@ export default {
         saveModel(){
             let that=this;
             let params={
-                type:'npm',
+                type:'apm',
                 targetId:this.targetId,
                 state:'1',
                 id:this.modleId,

@@ -9,7 +9,7 @@
                     <el-select class="margin-right-10" v-model="busTypeArr" @change="changeBUsType"  filterable clearable collapse-tags  placeholder="请选择业务">
                         <el-option
                                 v-for="item in busTypeList"
-                                :label="item.busTypeName" :value="item.busId"></el-option>
+                                :label="item.busTypeName" :value="item.busId" :key="item.busId"></el-option>
                     </el-select>
                 </div>
             </el-col>
@@ -166,7 +166,8 @@
                     <div class="btn-el-btn margin-bottom-10" v-for="(item, index) in networkMonitorList" :key="index">
                         <div>
                             <el-button :disabled="faultStateRadio==0" class="multiple-choice-button" type="primary">{{item.linkName}}</el-button>
-                            <img :id="item.id" @click="deleteNetLink(item)" src="./src/assets/images/faultDiagnosis/icon-item-delete.png" class="multiple-choice-icon cursorClass">
+                            <img :id="item.id" v-if="faultStateRadio==1" @click="deleteNetLink(item)" src="./src/assets/images/faultDiagnosis/icon-item-delete.png" class="multiple-choice-icon cursorClass">
+                            <img src="" v-else style="width:12px;height:12px;" class="multiple-choice-icon" alt="">
                         </div>
                     </div>
                     <div class="flex-div btn-el-btn margin-bottom-10" v-if="faultStateRadio==1">

@@ -989,7 +989,7 @@ export default {
         //更改业务选择
         changeBUsType(val){
             if(val){
-                this.getBusList();
+                this.getBusList(val);
 
             }
             // this.propsData={
@@ -1005,7 +1005,7 @@ export default {
             // }
         },
         //根据业务bizId判断故障诊断表是否存在所属业务
-        getBusList(){
+        getBusList(val){
 
             let that=this;
             let params={
@@ -1014,6 +1014,10 @@ export default {
 
             this.$http.get('/api-web/fault/conf/isExistByBizId/'+this.busTypeArr, {},function (res){
                 if(res && res.success){
+                    console.log('sssss',that.busTypeArr)
+                    that.$forceUpdate();
+                    that.$set('that','busTypeArr',val)
+
 
                 }else{
                     that.$global.showMsg(res.msg,'warning');

@@ -59,7 +59,7 @@
                                                     </ul>
                                                 </template>
                                                 <div  @click="addTableList(true,itemNode)" :class="['step-img','flex-div-center',{'isActive':itemNode[0].nodeName}]">
-                                                    <i v-if="itemNode[0].nodeName" class="icon-delete-right" @click.stop="deleteNode(item,index)"></i>
+                                                    <i v-if="itemNode[0].nodeName" class="icon-delete-right" @click.stop="deleteNode(itemNode,index)"></i>
                                                     <i class="icon-step flex-div-center"><img :src="'/src/style/img/restypeimg/'+itemNode[0].resType+'.png'" alt=""></i>
                                                 </div>
                                             </el-tooltip>

@@ -103,7 +103,7 @@ export default {
         let name=Vue.ref();
 
         Vue.watch(()=>props.isDisplay,(newValue, oldValue)=>{
-
+console.log("jdjdjdjdj",newValue)
             proxy.networkMonitorVisible=newValue;
             if(newValue){
                 proxy.setBizId();
@@ -193,7 +193,13 @@ export default {
                 let linkId='';
                 if(proxy.isClickNet!=-1){
                     linkId=proxy.linkId;
+
+                }else{
+                    linkId='';
                 }
+                bNetNodeList.map((item,index)=>{
+                    item.linkId=linkId;
+                })
                 let params={
                     bNetLink:{
                         id:linkId,
@@ -204,7 +210,7 @@ export default {
                     bNetNodeList:bNetNodeList
                 }
                 proxy.$http.post(proxy.apiUrl1,params,function (res){
-                    if(res){
+                    if(res && res.success){
                         proxy.$global.showMsg("添加成功", "success")
                         // proxy.tableVisible=false;
                         if(res.object){
@@ -215,6 +221,9 @@ export default {
                         }
 
                         proxy.getNetLinkList();
+                    }else{
+                        proxy.$global.showMsg("添加失败", "success")
+
                     }
                 })
             }else{
@@ -398,7 +407,7 @@ export default {
                 that.nodeData.splice(index, 1);
                 that.nodeName='';
                 console.log("delette",that.nodeData.length)
-                if(that.nodeData.length==1){
+                if(that.nodeData.length<1){
                     that.addSetLIstVisible=true;
                 }
 
@@ -539,7 +548,7 @@ export default {
         saveModel(){
             let that=this;
             let params={
-                type:'npm',
+                type:'netlink',
                 targetId:this.targetId,
                 state:'1',
                 id:this.modleId,