perf: mib-browser高级搜索取消图标等

1.修复port是字符串的问题
2.高级搜索取消图标
3.暂时注掉alert-message的label的点击弹框内容
This commit is contained in:
陈劲松
2020-04-15 15:27:02 +08:00
parent 878b795f1d
commit 17078fd48d
4 changed files with 11 additions and 12 deletions

View File

@@ -34,7 +34,7 @@
<!--alertMessage页的详情--> <!--alertMessage页的详情-->
<template v-if="from == 'alertMessage'"> <template v-if="from == 'alertMessage'">
<common-detail-tab v-show="subResizeShow" :from="from" :targetTab="targetTab" v-for="(item, index) in tabList" :key="index" <common-detail-tab v-show="subResizeShow" :from="from" :targetTab="targetTab" v-for="(item, index) in tabList" :key="index" :detail="detailList[index]"
v-if="targetTab == item" @changeTab="changeTab"></common-detail-tab> v-if="targetTab == item" @changeTab="changeTab"></common-detail-tab>
</template> </template>
</div> </div>

View File

@@ -25,7 +25,7 @@
class="sub-list-tab" :class="{'sub-list-tab-active': targetTab == 'project'}" @click="changeTab('project')">{{$t("project.project.project")}}</div><div class="sub-list-tab" :class="{'sub-list-tab-active': targetTab == 'project'}" @click="changeTab('project')">{{$t("project.project.project")}}</div><div
class="sub-list-tab" :class="{'sub-list-tab-active': targetTab == 'module'}" @click="changeTab('module')">{{$t("project.module.module")}}</div><div class="sub-list-tab" :class="{'sub-list-tab-active': targetTab == 'module'}" @click="changeTab('module')">{{$t("project.module.module")}}</div><div
class="sub-list-tab" :class="{'sub-list-tab-active': targetTab == 'endpoint'}" @click="changeTab('endpoint')">{{$t("project.endpoint.endpoint")}}</div><div class="sub-list-tab" :class="{'sub-list-tab-active': targetTab == 'endpoint'}" @click="changeTab('endpoint')">{{$t("project.endpoint.endpoint")}}</div><div
class="sub-list-tab" :class="{'sub-list-tab-active': targetTab == 'datacenter'}" @click="changeTab('datacenter')">{{$t("config.dc.dc")}}</div> class="sub-list-tab" :class="{'sub-list-tab-active': targetTab == 'dc'}" @click="changeTab('dc')">{{$t("config.dc.dc")}}</div>
</template> </template>
</div> </div>
</div> </div>

View File

@@ -96,7 +96,7 @@
<span v-else>-</span> <span v-else>-</span>
</div>--> </div>-->
<template v-else-if="item.prop == 'labels'"> <template v-else-if="item.prop == 'labels'">
<el-tag @click="showTagDetail(scope.row.labels, key)" <el-tag @click="showTagDetail(scope.row, key)"
:key="key" :key="key"
:class="{'link': key == 'asset' || key == 'endpoint' || key == 'project' || key == 'module' || key == 'datacenter'}" :class="{'link': key == 'asset' || key == 'endpoint' || key == 'project' || key == 'module' || key == 'datacenter'}"
v-if="key != 'alertname' && key != 'severity' && key != 'linkId'" v-if="key != 'alertname' && key != 'severity' && key != 'linkId'"
@@ -455,7 +455,6 @@
let hours=this.formatNum(date.getHours()); let hours=this.formatNum(date.getHours());
let minutes=this.formatNum(date.getMinutes()); let minutes=this.formatNum(date.getMinutes());
let seconds=this.formatNum(date.getSeconds()); let seconds=this.formatNum(date.getSeconds());
console.log(day)
return year + split + month + split + day + ' ' + hours + split + minutes + split + seconds; return year + split + month + split + day + ' ' + hours + split + minutes + split + seconds;
}, },
formatNum:function(num){ formatNum:function(num){
@@ -496,7 +495,7 @@
listResize(e) { listResize(e) {
this.$bottomBoxWindow.listResize(vm, e); this.$bottomBoxWindow.listResize(vm, e);
}, },
showTagDetail(labels, key) { showTagDetail(data, key) {
let open = false; let open = false;
if (key == "asset" || key == "project" || key == "module" || key == "endpoint" || key == "datacenter") { if (key == "asset" || key == "project" || key == "module" || key == "endpoint" || key == "datacenter") {
open = true; open = true;
@@ -504,16 +503,16 @@
if (open) { if (open) {
let labelList = []; let labelList = [];
let detailList = []; let detailList = [];
for (let item in labels) { for (let item in data) {
if (item == "asset" || item == "project" || item == "module" || item == "endpoint" || item == "datacenter") { if (item == "asset" || item == "project" || item == "module" || item == "endpoint" || item == "dc") {
labelList.push(item); labelList.push(item);
detailList.push(labels[item]); detailList.push(data[item]);
} }
} }
this.showSubList = true; this.showSubList = true;
this.tabList = labelList; this.tabList = labelList;
this.tabDetailList = detailList; /*this.tabDetailList = detailList;
this.targetTab = key; this.targetTab = key;*/
} }
}, },
labelsClassName(row) { labelsClassName(row) {

View File

@@ -28,7 +28,7 @@
<el-input size="mini" v-model="searchParam.oid" placeholder="OID"></el-input> <el-input size="mini" v-model="searchParam.oid" placeholder="OID"></el-input>
</div> </div>
<div class="nz-btn-group nz-btn-group-size-normal nz-btn-group-light margin-l-20 mib-browser-btn-group"> <div class="nz-btn-group nz-btn-group-size-normal nz-btn-group-light margin-l-20 mib-browser-btn-group">
<div class="el-popover mib-browser-ad-tip" v-show="searchParam.version != 2 || searchParam.port != 161 || searchParam.community != 'public'"><i class="el-icon-more"></i></div> <!--<div class="el-popover mib-browser-ad-tip" v-show="searchParam.version != 2 || searchParam.port != 161 || searchParam.community != 'public'"><i class="el-icon-more"></i></div>-->
<el-select class="nz-input-group-left input-x-mini-24 operation" v-model="searchParam.operation"> <el-select class="nz-input-group-left input-x-mini-24 operation" v-model="searchParam.operation">
<el-option v-for="item in operationData" :key="item" :value="item"></el-option> <el-option v-for="item in operationData" :key="item" :value="item"></el-option>
</el-select><el-popover trigger="click" placement="bottom" @show="popShow" @hide="popHide"> </el-select><el-popover trigger="click" placement="bottom" @show="popShow" @hide="popHide">
@@ -36,7 +36,7 @@
<el-row class="mib-browser-ad-search-item"> <el-row class="mib-browser-ad-search-item">
<el-col :span="6"><div class="mib-browser-ad-search-label">{{$t("project.endpoint.port")}}</div></el-col> <el-col :span="6"><div class="mib-browser-ad-search-label">{{$t("project.endpoint.port")}}</div></el-col>
<el-col :span="17"> <el-col :span="17">
<el-input class="input-x-mini-24" v-model="searchParamPop.port"></el-input> <el-input class="input-x-mini-24" v-model.number="searchParamPop.port"></el-input>
</el-col> </el-col>
</el-row> </el-row>
<el-row class="mib-browser-ad-search-item"> <el-row class="mib-browser-ad-search-item">