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

【1596】 3、APM诊断配置-取消指标筛选条件，资源查询更改参数 #2



See merge request !867

@@ -8,12 +8,12 @@
             <el-col :span="24">
             <el-col :span="24">
               <div class="flex-div-start margin-top-bottom-10">
               <div class="flex-div-start margin-top-bottom-10">
 
 
-                <!--lsq 取消掉选择资源及选择指标两个筛选条件 2022-08-17-->
-             <!--   <el-select :size="$global.elementConfig.size.input" class="margin-right-10" v-model="resTypeArr"  @change="changeRes"  filterable clearable collapse-tags  placeholder="请选择资源">
+                <!--lsq 取消掉选择指标筛选条件 2022-08-17-->
+                <el-select :size="$global.elementConfig.size.input" class="margin-right-10" v-model="resTypeArr"  @change="changeRes"  filterable clearable collapse-tags  placeholder="请选择资源">
                   <el-option
                   <el-option
                           v-for="item in resTypeList"
                           v-for="item in resTypeList"
                           :label="item.resName" :value="item.resId"></el-option>
                           :label="item.resName" :value="item.resId"></el-option>
-                </el-select>-->
+                </el-select>
 
 
                 <!-- <el-dropdown  class="margin-right-10">
                 <!-- <el-dropdown  class="margin-right-10">
                      <cm-res-type-tree-input multiple clearable collapseTags @callback="getResType"/>
                      <cm-res-type-tree-input multiple clearable collapseTags @callback="getResType"/>

@@ -21,18 +21,7 @@ export default {
                     sortable: true,
                     sortable: true,
                     align: 'center',
                     align: 'center',
                 },
                 },
-               /* {
-                    prop: 'ip',
-                    label: 'ip地址',
-                    sortable: true,
-                    align: 'center',
-                },*/
-                {
-                    prop: 'kpiName',
-                    label: '指标名称',
-                    sortable: true,
-                    align: 'center',
-                },
+
                 {
                 {
                     prop: 'flag',
                     prop: 'flag',
                     label: '指标标识',
                     label: '指标标识',
@@ -238,6 +227,8 @@ export default {
                                 // proxy.APMVisible=false;
                                 // proxy.APMVisible=false;
                             }
                             }
 
 
+                        }else{
+                            proxy.$global.showMsg(res.msg,'warning');
                         }
                         }
                     }
                     }
                 )
                 )
@@ -260,7 +251,7 @@ export default {
             if(props.apmMonitorList){
             if(props.apmMonitorList){
                 props.apmMonitorList.map((item,index)=>{
                 props.apmMonitorList.map((item,index)=>{
                     proxy.tableDataList.map(v=>{
                     proxy.tableDataList.map(v=>{
-                        if(item.id==v.id){
+                        if(item.resId==v.resId && item.flag==item.flag){
                             proxy.apmMonitorListChecked.push(v)
                             proxy.apmMonitorListChecked.push(v)
 
 
                         }
                         }
@@ -325,7 +316,8 @@ export default {
             let params={
             let params={
                 keyWords:this.keyWords,
                 keyWords:this.keyWords,
                 busId:this.bizId,
                 busId:this.bizId,
-                kpiId:this.kpiTypeArr,
+                // kpiId:this.kpiTypeArr,
+                resId:this.resTypeArr,
                 page:this.page,
                 page:this.page,
                 pageSize:this.pageSize,
                 pageSize:this.pageSize,