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

故障联调接口修改



See merge request !225

-<el-dialog v-model="APMVisible" :title="titleName" width="60%" @close="closeDialog">
+<el-dialog v-model="APMVisible" :title="titleName" width="90%" @close="closeDialog">
 
   <el-row>
     <el-col :span="24">

-<el-dialog v-model="applicationMonitorVisible" :title="titleName" width="60%" @close="closeDialog">
+<el-dialog v-model="applicationMonitorVisible" :title="titleName" width="90%" @close="closeDialog" top="3vh">
 
     <el-row>
         <el-col :span="24">

@@ -20,12 +20,12 @@ export default {
                     sortable: true,
                     align: 'center',
                 },
-                {
+                /*{
                     prop: 'streamId',
                     label: '链路id',
                     sortable: true,
                     align: 'center',
-                },
+                },*/
                 {
                     prop: 'streamName',
                     label: '链路名称',

@@ -5,7 +5,7 @@
         <el-row>
           <el-col :span="24">
             <div class="flex-div-start margin-top-bottom-10">
-              <span class="fault-book-input-text context-select-text">选择类型</span>
+<!--              <span class="fault-book-input-text context-select-text">选择类型</span>-->
                <!-- <el-select class="margin-right-10" v-model="busTypeArr"  filterable clearable collapse-tags  placeholder="从业务选择">
                   <el-option
                           v-for="item in busTypeList"
@@ -17,11 +17,11 @@
                  </el-dropdown>
 -->
 
-               <el-select  class="margin-right-10" v-model="resTypeArr" @change="changeRes"  filterable clearable collapse-tags  placeholder="从资源选择">
+               <!--<el-select  class="margin-right-10" v-model="resTypeArr" @change="changeRes"  filterable clearable collapse-tags  placeholder="从资源选择">
                    <el-option
                            v-for="item in resTypeList"
                            :label="item.resName" :value="item.resId"></el-option>
-               </el-select>
+               </el-select>-->
 
               <!--<el-input style="width:160px;"  class="margin-right-10" v-model="keyWords" placeholder="输入关键字" />
 
@@ -35,16 +35,21 @@
         <el-row class="margin-bottom-50">
           <el-col :span="24">
             <cm-table-page :columns="columns" :dataList="tableDataList" @loaddata="loadTableDataList"
-                           :showIndex="false" :total="count"
+                           :showIndex="true" :total="count"
                            :showBorder="true" :loading="false"
-                           :showPage="true" :showTools="false" :height="(height - 500)">
+                           :showPage="true" :showTools="true" :height="(height - 500)">
                 <template #default="{row,prop,column}">
                   <div  v-if="prop == 'kpiName'"  class="list-data">
-                    <span class="list-data-text">指标: {{row.kpiName }}</span>
-                    <img :id="row.index" @click="deleteItem(row)" src="./src/assets/images/faultDiagnosis/icon-item-delete.png" class="img-delete cursorClass">
+                    <span class="list-data-text">{{row.kpiName }}</span>
+<!--                    <img :id="row.index" @click="deleteItem(row)" src="./src/assets/images/faultDiagnosis/icon-item-delete.png" class="img-delete cursorClass">-->
 
                   </div>
                 </template>
+                <template #tools="{scope}">
+                    <el-button type="text" size="small" @click.prevent="deleteItem(scope.row,scope.$index)">
+                        <i class="el-icon-plus"/> 删除
+                    </el-button>
+                </template>
             </cm-table-page>
           </el-col>
 

@@ -9,16 +9,34 @@ export default {
 
                 {
                     prop: 'resName',
+                    label: '资源名称',
+                    sortable: true,
+                    align: 'center',
+                },
+                {
+                    prop: 'resName',
                     label: '资源类型',
                     sortable: true,
                     align: 'center',
                 },
+                {
+                    prop: 'resName',
+                    label: 'IP',
+                    sortable: true,
+                    align: 'center',
+                },
 
                 {
                     prop: 'kpiName',
                     label: '指标名称',
                     sortable: true,
                     align: 'center',
+                },
+                {
+                    prop: 'flag',
+                    label: '指标标识',
+                    sortable: true,
+                    align: 'center',
                 }
             ],
             environmentTableData: [

@@ -640,7 +640,12 @@ export default {
             }
 
             if(this.type){
+                if(this.type=='base'){
+                    this.saveBase();
+                }else{
                     this.saveConfigDetailOther();
+
+                }
             }else{
                 this.saveFaultDefine();
             }
@@ -764,8 +769,11 @@ export default {
             this.$http.get('/api-web/fault/base/config/queryKpiInfo',{},function (res){
                 if(res && res.data){
                     that.alarmList=res.data;
-
+                    if(that.alarmList && that.alarmList.length>0){
                         that.kpiId=that.alarmList[0].kpiId;
+
+                    }
+
                 }
 
             })
@@ -803,6 +811,28 @@ export default {
 
             })
         },
+        //保存基础环境
+        saveBase(){
+            let that=this;
+            this.getTargetId('base')
+            let params={
+                targetId:this.targetId
+            }
+            this.$http.post('/api-web/fault/conf/base/saveOrUpdate',params,function (res){
+                if(res && res.success){
+                    that.targetId=res.str;
+                    that.setTargetId(that.targetId)
+                    that.$global.showMsg('保存成功')
+                    // that.alarmList=res.data;
+                    that.saveConfigDetailOther();
+                }else{
+                    that.$global.showMsg('保存失败','warning')
+
+                }
+                that.isLoading=false;
+
+            })
+        },
         //删除网络监测
         deleteNetLink(item) {
             let that=this;