Merge branch 'master' of http://192.168.1.136:82/monitor_v3/hg-monitor-web

@@ -31,7 +31,7 @@
                 <el-button type="primary" @click="onReset()">重置</el-button>
                 <el-button type="primary" @click="onBtnSearch()" style="margin-left: 10px">查询</el-button>
                 <el-button type="primary" @click="saveAll()" style="margin-left: 10px">添加选中</el-button>
-                <el-button type="primary" @click="saveAlldata()" style="margin-left: 10px">全部添加</el-button>
+                <el-button type="primary" @click="saveAllData()" style="margin-left: 10px">全部添加</el-button>
               </div>
 
             </div>

@@ -136,7 +136,7 @@ export default {
             }
 
             proxy.$http.post('/api-web/fault/conf/apm/saveOrUpdate',params,function (res){
-                if(res && res.object){
+                if(res && res.success){
                     proxy.$global.showMsg('添加成功','success');
                     proxy.targetId=res.src;
                     proxy.APMVisible=false;

@@ -37,7 +37,7 @@
             <cm-table-page :columns="columns" :dataList="tableDataList" @loaddata="loadTableDataList"
                            :showIndex="true" :total="count"
                            :showBorder="true" :loading="false"
-                           :showPage="true" :showTools="true" :height="(height - 500)">
+                           :showPage="true" :showTools="isDetail" :height="(height - 500)">
                <!-- <template #default="{row,prop,column}">
                   <div  v-if="prop == 'kpiName'"  class="list-data">
                     <span class="list-data-text">{{row.kpiName }}</span>

@@ -87,6 +87,8 @@ export default {
         let busTypeList = Vue.ref([]);
         let bizId=Vue.ref();//所属业务id
         let targetId=Vue.ref();//所属模块id
+        //是否是详情页面
+        let isDetail=Vue.ref(false);
 
         let init = () =>{
             let params={
@@ -140,6 +142,7 @@ export default {
 
         }
         return {
+            isDetail,
             changeRes,
             setBizId,
             bizId,
@@ -230,12 +233,26 @@ export default {
                 pageSize:5
 
             }
-            this.$http.get('/api-web/fault/conf/base/getFaultBaseAllResInfo',params,function (res){
-                if(res && res.data){
-                    that.count = res.count;
-                    that.tableDataList=res.data;
-                }
-            })
+            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;
+                    }
+                })
+            }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;
+                    }
+                })
+            }
+
         }
 
 

@@ -704,7 +704,7 @@ export default {
             }
 
             if(this.type){
-                if(this.type=='base'){
+                if(this.type=='base' && this.faultEnvironmentRadio=='1'){
                     this.saveBase();
                 }else{
                     this.saveConfigDetailOther();
@@ -777,7 +777,7 @@ export default {
                     that.switchModel();
 
                 }else{
-                    that.$global.showMsg('保存失败','warning')
+                    that.$global.showMsg('模块保存失败','warning')
 
                 }
                 that.isLoading=false;
@@ -904,11 +904,11 @@ export default {
                 if(res && res.success){
                     that.targetId=res.str;
                     that.setTargetId(that.targetId)
-                    that.$global.showMsg('保存成功')
+                    that.$global.showMsg(res.msg)
                     // that.alarmList=res.data;
                     that.saveConfigDetailOther();
                 }else{
-                    that.$global.showMsg('保存失败','warning')
+                    that.$global.showMsg('基础环境保存失败','warning')
 
                 }
                 that.isLoading=false;

@@ -10,7 +10,7 @@
     </el-row>
     <el-row  class="margin-all-30">
         <el-col :span="3" v-for="(item,index) in diagnosisData">
-            <div class="doc-list flex-clum" @click="detailDiagnosisDoc(item)">
+            <div class="doc-list flex-clum margin-bottom-10" @click="detailDiagnosisDoc(item)">
                 <img src="./src/assets/images/faultDiagnosis/icon-doc.png" alt="">
                 <span class="doc-name">{{item.name}}</span>
             </div>

@@ -62,8 +62,8 @@
                                                 <i class="icon-step flex-div-center"><img :src="'/src/style/img/restypeimg/'+itemNode[0].resType+'.png'" alt=""></i>
                                             </div>
                                         </el-tooltip>
-    <!--                                        <span :class="['list-line',{'isActive':item.nodeName && index<nodeData.length}]"></span>-->
                                         <span @click="addTableList(false)" v-if="index+1<nodeData.length && itemNode.length<=1" :class="['list-line','cursorClass',{'isActive':itemNode.length>1}]"></span>
+<!--                                        <span @click="addTableList(false)" v-if="itemNode.length<=1 && itemNode[0].nodeName"  :class="['list-line','cursorClass',{'isActive':itemNode.length>1}]"></span>-->
 
                                         <el-tooltip
                                                 class="item"

@@ -172,11 +172,13 @@ export default {
                 bNetNodeList.map((item,index)=>{
                     item.sort=index;
                 })
-                if(proxy.linkId){
-                    // bNetNodeList.linkId=proxy.linkId;
+                let linkId='';
+                if(proxy.isClickNet!=-1){
+                    linkId=proxy.linkId;
                 }
                 let params={
                     bNetLink:{
+                        id:linkId,
                         linkName:proxy.linkName,
                         bizId:proxy.bizId,
                         targetId:proxy.targetId,