gfwleak/nezha-nezha-fronted
Archived
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

feat: alertMessage-labels等

Browse Source 
1.alertMessage-labels
2.退出登录切换语言再重登后国际化不对的bug
3.修复切换左侧菜单后顶部菜单显示不对的问题
This commit is contained in:
陈劲松
2020-04-06 22:11:25 +08:00
parent 874696feb7
commit f74f852470
21 changed files with 286 additions and 134 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
nezha-fronted/src/components/common/bottomBox/bottomBox.vue
View File

@@ -28,10 +28,23 @@
<!--endpoint页的asset详情-->
<common-detail-tab v-show="subResizeShow" :obj="obj" :from="from" :detail="assetDetail" :targetTab="targetTab"
v-if="targetTab == 'assetDetail' && from == 'endpoint'"
@changeTab="changeTab"
></common-detail-tab>
@changeTab="changeTab"></common-detail-tab>
<!--endpoint-query-->
<endpoint-query-tab v-show="subResizeShow" v-if="(from == 'endpoint' && targetTab == 'endpointQuery')" :from="from" :obj="obj" @changeTab="changeTab"></endpoint-query-tab>
<!--alertMessage页的详情-->
<template v-if="from == 'alertMessage'">
<common-detail-tab v-show="subResizeShow" :from="from" :targetTab="targetTab" v-for="item, index in tabList"
v-if="targetTab == item" @changeTab="changeTab"></common-detail-tab>
<!--<common-detail-tab v-show="subResizeShow" :from="from" :detail="detail" :targetTab="targetTab" v-for="item in tagList"
v-if="targetTab == 'project'" @changeTab="changeTab"></common-detail-tab>
<common-detail-tab v-show="subResizeShow" :from="from" :detail="detail" :targetTab="targetTab" v-for="item in tagList"
v-if="targetTab == 'module'" @changeTab="changeTab"></common-detail-tab>
<common-detail-tab v-show="subResizeShow" :from="from" :detail="detail" :targetTab="targetTab" v-for="item in tagList"
v-if="targetTab == 'endpoint'" @changeTab="changeTab"></common-detail-tab>
<common-detail-tab v-show="subResizeShow" :from="from" :detail="detail" :targetTab="targetTab" v-for="item in tagList"
v-if="targetTab == 'dc'" @changeTab="changeTab"></common-detail-tab>-->
</template>
</div>
</span>
</template>
@@ -58,8 +71,10 @@
subResizeShow: Boolean, //resize时，用v-show="subResizeShow"控制页面内容是否显示
obj: Object, //关联的实体对象
from: String, //来自哪个页面
tabList: Array, //动态页签列表
targetTab: String, //展示哪个页签
detail: Array, //对象详情内容
detailList: Array, //多个对象详情内容
assetDetail: Array, //endpoint页的asset详情
},

9
nezha-fronted/src/components/common/bottomBox/tabs/commonDetailTab.vue
View File

@@ -9,8 +9,9 @@
<template v-else-if="from == 'alertRule'">{{$t("alert.alertName")}}：{{obj.alertName}}</template>
<template v-else-if="from == 'asset'">{{$t("project.endpoint.asset")}}：{{obj.host}}</template>
<template v-else-if="from == 'endpoint'">{{$t("project.endpoint.endpointId")}}: {{obj.id}}</template>
<template v-else-if="from == 'alertMessage'">&nbsp;</template>
<!-- 为防止代码换行导致页面中元素之间有间隙，所以将元素的标签尾部和相邻元素的标签头部连在一起写 -->
</div><div class="sub-list-tab" :class="{'sub-list-tab-active': targetTab == 'detail'}" @click="changeTab('detail')">{{$t("overall.detail")}}</div><template v-if="from == 'dc'">
</div><div v-if="from != 'alertMessage'" class="sub-list-tab" :class="{'sub-list-tab-active': targetTab == 'detail'}" @click="changeTab('detail')">{{$t("overall.detail")}}</div><template v-if="from == 'dc'">
<div class="sub-list-tab" @click="changeTab('cabinet')">{{$t("config.dc.cabinets")}}</div>
</template><template v-if="from == 'alertRule' || from == 'asset'">
<div class="sub-list-tab" @click="changeTab('alertMessage')">{{$t("asset.tableTitle.alerts")}}</div>
@@ -19,6 +20,12 @@
</template><template v-if="from == 'endpoint'">
<div class="sub-list-tab" @click="changeTab('endpointQuery')">{{$t("overall.query")}}</div><div
class="sub-list-tab" :class="{'sub-list-tab-active': targetTab == 'assetDetail'}" @click="changeTab('assetDetail')">{{$t("project.endpoint.asset")}}</div>
</template><template v-if="from == 'alertMessage'">
<div class="sub-list-tab" :class="{'sub-list-tab-active': targetTab == 'asset'}" @click="changeTab('asset')">{{$t("project.endpoint.asset")}}</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 == '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>
</template>
</div>
</div>