fix:1.修复asset机柜编辑回显null的bug 2.搜索框添加点击空白处关闭下拉框逻辑

This commit is contained in:
wangwenrui
2020-05-21 16:08:23 +08:00
parent 2e6a60db96
commit 77425043f6
3 changed files with 9 additions and 3 deletions

View File

@@ -368,11 +368,12 @@
},
computed:{
inputShowInfo:function(){
console.log(this.selectedData)
let idcName=this.selectedData.idc?this.selectedData.idc.name+'/':'';
let cabinetName=this.selectedData.cabinet?this.selectedData.cabinet.name+'/':'';
let uValues=this.selectedData.u&&this.selectedData.u.length>0?this.selectedData.u[0]+'-'+this.selectedData.u[1]:'';
let uValues=this.selectedData.u&&this.selectedData.u.length>0&&this.selectedData.u[0]&&this.selectedData.u[1]?this.selectedData.u[0]+'-'+this.selectedData.u[1]:'';
if(!this.selectedData.idc){
return '';

View File

@@ -1,5 +1,5 @@
<template>
<div class="new-search" >
<div class="new-search" v-clickoutside="clickout">
<div class="search-input-all input-position" @click="stop_click">
<!-- 历史记录-->
<div class="search-history">
@@ -449,6 +449,9 @@
clearSearch() {
this.select_list = [];
},
clickout(){
this.input_list=true;
},
selectObject(column, selectItem, e) {
this.stop_click(e);
for (let i = 0; i < this.select_list.length; i++) {
@@ -798,6 +801,7 @@
}
this.input_list = true;
this.restructure_historyDate();
this.$emit("search", objectInfo);
},
//清空历史记录
@@ -1077,6 +1081,7 @@
},
//点击遮罩层
zhezhao_click() {
console.log(111)
if(this.input_sreach!=''){
if(!this.searchMsg.zheze_none){
if (this.input_sreach!='') {

View File

@@ -314,7 +314,7 @@ instance_cpu_time_ns{app="fox", proc="widget", rev="4d3a513", env="prod", job="c
})
if(result.metric&&Object.keys(result.metric).length>0){
let metric = Object.assign({}, result.metric);
seriesItem.name += metric.__name__ + '{';
seriesItem.name += metric.__name__?metric.__name__:''+ '{';
delete metric.__name__;
for (let key in metric) {
seriesItem.name += key + "=" + '"' + metric[key] + '",';