fix: alert-message搜索state参数名bug修复等
1.搜索框下拉选择区域滚动条优化 2.alert-message搜索支持asset 3.alert-message搜索state参数名bug修复
This commit is contained in:
@@ -158,7 +158,7 @@ li{
|
|||||||
border: none;
|
border: none;
|
||||||
cursor: pointer;
|
cursor: pointer;
|
||||||
opacity: 0.5;
|
opacity: 0.5;
|
||||||
background-color: #aaa;
|
background-color: #bbb;
|
||||||
outline: none;
|
outline: none;
|
||||||
z-index: 10;
|
z-index: 10;
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -40,24 +40,44 @@
|
|||||||
<div v-else-if="!change_sreach_show && ind==sreach_num && val.id!==7 " class="select_input">
|
<div v-else-if="!change_sreach_show && ind==sreach_num && val.id!==7 " class="select_input">
|
||||||
<input type="text" autocomplete="off" id="sreach_input" v-model="input_sreach" @keyup="enter(val.name, $event)" @click="stop_click">
|
<input type="text" autocomplete="off" id="sreach_input" v-model="input_sreach" @keyup="enter(val.name, $event)" @click="stop_click">
|
||||||
<div class="select_info_list" :style="'top:' + selectDom.top" v-if="val.type == 'select'">
|
<div class="select_info_list" :style="'top:' + selectDom.top" v-if="val.type == 'select'">
|
||||||
|
<el-scrollbar v-if="selectInfoList[val.label].length > 8" class="el-scrollbar-small" style="height: 240px;">
|
||||||
<ul>
|
<ul>
|
||||||
<li v-for="(item,key) in selectInfoList[val.label]" :key="key" @click="tr_selectInfo(val.label,item.value,item.label,$event)" :class="search_select_style_num==key?'search-style-ind':''">{{item.label}}</li>
|
<li v-for="(item,key) in selectInfoList[val.label]" :key="key" @click="tr_selectInfo(val.label,item.value,item.label,$event)" :class="search_select_style_num==key?'search-style-ind':''">{{item.label}}</li>
|
||||||
</ul>
|
</ul>
|
||||||
|
</el-scrollbar>
|
||||||
|
<ul v-else>
|
||||||
|
<li v-for="(item,key) in selectInfoList[val.label]" :key="key" @click="tr_selectInfo(val.label,item.value,item.label,$event)" :class="search_select_style_num==key?'search-style-ind':''">{{item.label}}</li>
|
||||||
|
</ul>
|
||||||
</div>
|
</div>
|
||||||
<div class="select_info_list" :style="'top:' + selectDom.top" v-if="val.type == 'selectString'">
|
<div class="select_info_list" :style="'top:' + selectDom.top" v-if="val.type == 'selectString'">
|
||||||
|
<el-scrollbar v-if="selectInfoList[val.label].length > 8" class="el-scrollbar-small" style="height: 240px;">
|
||||||
<ul>
|
<ul>
|
||||||
<li v-for="(item,key) in selectInfoList[val.label]" :key="key" @click="stringSelectInfo(val, item, $event)" :class="search_select_style_num==key?'search-style-ind':''">{{item.label}}</li>
|
<li v-for="(item,key) in selectInfoList[val.label]" :key="key" @click="stringSelectInfo(val, item, $event)" :class="search_select_style_num==key?'search-style-ind':''">{{item.label}}</li>
|
||||||
</ul>
|
</ul>
|
||||||
|
</el-scrollbar>
|
||||||
|
<ul v-else>
|
||||||
|
<li v-for="(item,key) in selectInfoList[val.label]" :key="key" @click="stringSelectInfo(val, item, $event)" :class="search_select_style_num==key?'search-style-ind':''">{{item.label}}</li>
|
||||||
|
</ul>
|
||||||
</div>
|
</div>
|
||||||
<div class="select_info_list" :style="'top:' + selectDom.top" v-if="val.type == 'dc'">
|
<div class="select_info_list" :style="'top:' + selectDom.top" v-if="val.type == 'dc'">
|
||||||
|
<el-scrollbar v-if="dcSelect.length > 8" class="el-scrollbar-small" style="height: 240px;">
|
||||||
<ul>
|
<ul>
|
||||||
<li v-for="(item,key) in dcSelect" :key="key" @click="selectObject(val, item, $event)" :class="search_select_style_num==key?'search-style-ind':''">{{item.name}}</li>
|
<li v-for="(item,key) in dcSelect" :key="key" @click="selectObject(val, item, $event)" :class="search_select_style_num==key?'search-style-ind':''">{{item.name}}</li>
|
||||||
</ul>
|
</ul>
|
||||||
|
</el-scrollbar>
|
||||||
|
<ul v-else>
|
||||||
|
<li v-for="(item,key) in dcSelect" :key="key" @click="selectObject(val, item, $event)" :class="search_select_style_num==key?'search-style-ind':''">{{item.name}}</li>
|
||||||
|
</ul>
|
||||||
</div>
|
</div>
|
||||||
<div class="select_info_list" :style="'top:' + selectDom.top" v-if="val.type == 'asset'">
|
<div class="select_info_list" :style="'top:' + selectDom.top" v-if="val.type == 'asset'">
|
||||||
|
<el-scrollbar v-if="assetSelect.length > 8" class="el-scrollbar-small" style="height: 240px;">
|
||||||
<ul>
|
<ul>
|
||||||
<li v-for="(item,key) in assetSelect" :key="key" @click="selectObject(val, item, $event)" :class="search_select_style_num==key?'search-style-ind':''">{{item.host}}</li>
|
<li v-for="(item,key) in assetSelect" :key="key" @click="selectObject(val, item, $event)" :class="search_select_style_num==key?'search-style-ind':''">{{item.host}}</li>
|
||||||
</ul>
|
</ul>
|
||||||
|
</el-scrollbar>
|
||||||
|
<ul v-else>
|
||||||
|
<li v-for="(item,key) in assetSelect" :key="key" @click="selectObject(val, item, $event)" :class="search_select_style_num==key?'search-style-ind':''">{{item.host}}</li>
|
||||||
|
</ul>
|
||||||
</div>
|
</div>
|
||||||
<!-- 新增日志模块action下拉选择 -->
|
<!-- 新增日志模块action下拉选择 -->
|
||||||
<div class="select_info_list" :style="'top:' + selectDom.top" v-if="val.type == 'selectAction'">
|
<div class="select_info_list" :style="'top:' + selectDom.top" v-if="val.type == 'selectAction'">
|
||||||
@@ -144,6 +164,8 @@
|
|||||||
actionSelect:[],
|
actionSelect:[],
|
||||||
dcSelect: [], //数据中心
|
dcSelect: [], //数据中心
|
||||||
assetSelect: [], //资产
|
assetSelect: [], //资产
|
||||||
|
projectSelect: [],
|
||||||
|
moduleSelect: [],
|
||||||
schemaTypeSelect:[], //日志检索Protocol下拉菜单
|
schemaTypeSelect:[], //日志检索Protocol下拉菜单
|
||||||
TypeSelect:[],//Protocol二层下拉菜单
|
TypeSelect:[],//Protocol二层下拉菜单
|
||||||
secondShow:'',//二层显示控制
|
secondShow:'',//二层显示控制
|
||||||
@@ -253,7 +275,7 @@
|
|||||||
} else {
|
} else {
|
||||||
this.clearSearchShow = true;
|
this.clearSearchShow = true;
|
||||||
}
|
}
|
||||||
if (this.$route.path.indexOf("alertList") > -1 || this.$route.path.indexOf("alertConfig") > -1) {
|
/*if (this.$route.path.indexOf("alertList") > -1 || this.$route.path.indexOf("alertConfig") > -1) {
|
||||||
// 处理alertType--asset联动问题:
|
// 处理alertType--asset联动问题:
|
||||||
// 当已选alertType为asset时,将可选列表中的asset的disabled恢复为false;
|
// 当已选alertType为asset时,将可选列表中的asset的disabled恢复为false;
|
||||||
// 当已选alertType不为asset时,将可选列表中的asset的disabled设为true,若有已选的asset,则删除;
|
// 当已选alertType不为asset时,将可选列表中的asset的disabled设为true,若有已选的asset,则删除;
|
||||||
@@ -295,7 +317,7 @@
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}*/
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
no_condition: {
|
no_condition: {
|
||||||
@@ -1531,7 +1553,6 @@
|
|||||||
position: fixed;
|
position: fixed;
|
||||||
/*left: 100px;
|
/*left: 100px;
|
||||||
top: 36px;*/
|
top: 36px;*/
|
||||||
height: auto;
|
|
||||||
width: auto;
|
width: auto;
|
||||||
max-height: 240px;
|
max-height: 240px;
|
||||||
padding: 5px 0;
|
padding: 5px 0;
|
||||||
|
|||||||
@@ -269,13 +269,13 @@
|
|||||||
type: 'input',
|
type: 'input',
|
||||||
label: 'alertName',
|
label: 'alertName',
|
||||||
disabled: false
|
disabled: false
|
||||||
}, {
|
}, /*{
|
||||||
id: 3,
|
id: 3,
|
||||||
name: this.$t('alert.list.type'),
|
name: this.$t('alert.list.type'),
|
||||||
type: 'select',
|
type: 'select',
|
||||||
label: 'alertType',
|
label: 'alertType',
|
||||||
disabled: false
|
disabled: false
|
||||||
}, {
|
}, */{
|
||||||
id: 4,
|
id: 4,
|
||||||
name: this.$t('alert.severity'),
|
name: this.$t('alert.severity'),
|
||||||
type: 'selectString',
|
type: 'selectString',
|
||||||
@@ -286,7 +286,7 @@
|
|||||||
name: this.$t('asset.asset'),
|
name: this.$t('asset.asset'),
|
||||||
type: 'asset',
|
type: 'asset',
|
||||||
label: 'asset',
|
label: 'asset',
|
||||||
disabled: true
|
disabled: false
|
||||||
}, {
|
}, {
|
||||||
id: 12,
|
id: 12,
|
||||||
name: this.$t('alert.list.state'),
|
name: this.$t('alert.list.state'),
|
||||||
@@ -549,7 +549,11 @@
|
|||||||
this.pageObj.pageNo = 1;
|
this.pageObj.pageNo = 1;
|
||||||
for (let item in searchObj) {
|
for (let item in searchObj) {
|
||||||
if (searchObj[item]) {
|
if (searchObj[item]) {
|
||||||
this.$set(this.searchLabel, item, searchObj[item]);
|
if (item == "alertMessageState") {
|
||||||
|
this.$set(this.searchLabel, "state", searchObj[item]);
|
||||||
|
} else {
|
||||||
|
this.$set(this.searchLabel, item, searchObj[item]);
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
this.getAlertList();
|
this.getAlertList();
|
||||||
|
|||||||
Reference in New Issue
Block a user