monitor_v3 / hg-monitor-web · Commits

Go to a project

Authored by 鲁尚清
Commit 17576210e5bb9828dcbfd6f281eacdf9422fa908 1 parent cd36a73d

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

Inline Side-by-side
Showing 2 changed files with 9 additions and 17 deletions
@@ -8,12 +8,12 @@ @@ -8,12 +8,12 @@
8 <el-col :span="24"> 8 <el-col :span="24">
9 <div class="flex-div-start margin-top-bottom-10"> 9 <div class="flex-div-start margin-top-bottom-10">
10 10
11 - <!--lsq 取消掉选择资源及选择指标两个筛选条件 2022-08-17-->  
12 - <!-- <el-select :size="$global.elementConfig.size.input" class="margin-right-10" v-model="resTypeArr" @change="changeRes" filterable clearable collapse-tags placeholder="请选择资源"> 11 + <!--lsq 取消掉选择指标筛选条件 2022-08-17-->
  12 + <el-select :size="$global.elementConfig.size.input" class="margin-right-10" v-model="resTypeArr" @change="changeRes" filterable clearable collapse-tags placeholder="请选择资源">
13 <el-option 13 <el-option
14 v-for="item in resTypeList" 14 v-for="item in resTypeList"
15 :label="item.resName" :value="item.resId"></el-option> 15 :label="item.resName" :value="item.resId"></el-option>
16 - </el-select>--> 16 + </el-select>
17 17
18 <!-- <el-dropdown class="margin-right-10"> 18 <!-- <el-dropdown class="margin-right-10">
19 <cm-res-type-tree-input multiple clearable collapseTags @callback="getResType"/> 19 <cm-res-type-tree-input multiple clearable collapseTags @callback="getResType"/>
@@ -21,18 +21,7 @@ export default { @@ -21,18 +21,7 @@ export default {
21 sortable: true, 21 sortable: true,
22 align: 'center', 22 align: 'center',
23 }, 23 },
24 - /* {  
25 - prop: 'ip',  
26 - label: 'ip地址',  
27 - sortable: true,  
28 - align: 'center',  
29 - },*/  
30 - {  
31 - prop: 'kpiName',  
32 - label: '指标名称',  
33 - sortable: true,  
34 - align: 'center',  
35 - }, 24 +
36 { 25 {
37 prop: 'flag', 26 prop: 'flag',
38 label: '指标标识', 27 label: '指标标识',
@@ -238,6 +227,8 @@ export default { @@ -238,6 +227,8 @@ export default {
238 // proxy.APMVisible=false; 227 // proxy.APMVisible=false;
239 } 228 }
240 229
  230 + }else{
  231 + proxy.$global.showMsg(res.msg,'warning');
241 } 232 }
242 } 233 }
243 ) 234 )
@@ -260,7 +251,7 @@ export default { @@ -260,7 +251,7 @@ export default {
260 if(props.apmMonitorList){ 251 if(props.apmMonitorList){
261 props.apmMonitorList.map((item,index)=>{ 252 props.apmMonitorList.map((item,index)=>{
262 proxy.tableDataList.map(v=>{ 253 proxy.tableDataList.map(v=>{
263 - if(item.id==v.id){ 254 + if(item.resId==v.resId && item.flag==item.flag){
264 proxy.apmMonitorListChecked.push(v) 255 proxy.apmMonitorListChecked.push(v)
265 256
266 } 257 }
@@ -325,7 +316,8 @@ export default { @@ -325,7 +316,8 @@ export default {
325 let params={ 316 let params={
326 keyWords:this.keyWords, 317 keyWords:this.keyWords,
327 busId:this.bizId, 318 busId:this.bizId,
328 - kpiId:this.kpiTypeArr, 319 + // kpiId:this.kpiTypeArr,
  320 + resId:this.resTypeArr,
329 page:this.page, 321 page:this.page,
330 pageSize:this.pageSize, 322 pageSize:this.pageSize,
331 323