Commit Graph

30 Commits

Author SHA1 Message Date
zhangyu
2ccd8ff66c fix:优化 alertmessage tooltip 显示位置问题 2021-12-31 10:15:36 +08:00
chenjinsong
a709585a9f Merge remote-tracking branch 'origin/dev-3.1' into dev-3.1.1_theme
# Conflicts:
#	nezha-fronted/src/components/common/alert/alertLabel.vue
#	nezha-fronted/src/components/common/detailView/detailViewTopSearch.vue
#	nezha-fronted/src/components/common/i18n.js
#	nezha-fronted/src/components/common/labelFilter/clickSearch.vue
#	nezha-fronted/src/components/common/login.vue
#	nezha-fronted/src/components/common/popBox/topToolMoreOptions.vue
2021-11-04 14:49:40 +08:00
@changcode
e38bdd4e19 NEZ-1156 fix: 修复alert rule type字段未正确翻译为 metrics.logs.snmp trap 2021-11-02 11:04:06 +08:00
chenjinsong
d1efdde2ba NEZ-1072 feat: 主题切换冲突解决 2021-11-01 23:05:28 +08:00
chenjinsong
ef664be5ef Merge remote-tracking branch 'origin/dev-3.1' into dev-3.1.1_theme
# Conflicts:
#	nezha-fronted/src/assets/css/common.scss
#	nezha-fronted/src/assets/css/common/tableCommon.scss
#	nezha-fronted/src/assets/stylus/main.scss
#	nezha-fronted/src/components/charts/chart-list.vue
#	nezha-fronted/src/components/charts/logs.vue
#	nezha-fronted/src/components/common/alert/alertLabel.vue
#	nezha-fronted/src/components/common/alert/alertRuleInfo.vue
#	nezha-fronted/src/components/common/bottomBox/bottomBox.vue
#	nezha-fronted/src/components/common/bottomBox/tabs/endpointQuery.vue
#	nezha-fronted/src/components/common/bottomBox/tabs/endpointQueryTab.vue
#	nezha-fronted/src/components/common/bottomBox/tabs/logBottomTab.vue
#	nezha-fronted/src/components/common/bottomBox/tabs/panelTabNew.vue
#	nezha-fronted/src/components/common/detailView/list/alertRule/alertRuleDetail.vue
#	nezha-fronted/src/components/common/detailView/list/asset/assetDetail.vue
#	nezha-fronted/src/components/common/detailView/list/dc/dcDetail.vue
#	nezha-fronted/src/components/common/detailView/list/endpoint/endpointDetail.vue
#	nezha-fronted/src/components/common/detailView/list/module/moduleDetail.vue
#	nezha-fronted/src/components/common/detailView/nzDetailView.vue
#	nezha-fronted/src/components/common/detailView/view/detailViewRight.vue
#	nezha-fronted/src/components/common/labelFilter/clickSearch.vue
#	nezha-fronted/src/components/common/multipleTime.vue
#	nezha-fronted/src/components/common/pickTime.vue
#	nezha-fronted/src/components/common/popBox/topToolMoreOptions.vue
#	nezha-fronted/src/components/common/project/L5/topoTooltip.vue
#	nezha-fronted/src/components/common/project/popData/Info.vue
#	nezha-fronted/src/components/common/rightBox/alertRuleBox.vue
#	nezha-fronted/src/components/common/table/alert/alertRuleTable.vue
#	nezha-fronted/src/components/common/table/alert/alertSilenceTable.vue
#	nezha-fronted/src/components/common/table/settings/userTable.vue
#	nezha-fronted/src/components/layout/header.vue
#	nezha-fronted/src/components/page/alert/alertMessage.vue
#	nezha-fronted/src/components/page/alert/nzAlertTag.vue
#	nezha-fronted/src/components/page/asset/components/operation.vue
#	nezha-fronted/src/components/page/config/mibBrowser.vue
#	nezha-fronted/src/components/page/dashboard/explore/exploreItem.vue
#	nezha-fronted/src/components/page/dashboard/explore/logTab.vue
#	nezha-fronted/src/components/page/dashboard/explore/promqlInput.vue
#	nezha-fronted/src/components/page/dashboard/overview/overview2.vue
#	nezha-fronted/src/components/page/dashboard/panel.vue
2021-11-01 18:24:01 +08:00
chenjinsong
914c096463 NEZ-1072 feat: 主题切换 2021-11-01 17:23:01 +08:00
@changcode
d52f671261 NEZ-1142 fix: 修复Asset页面元素超出边框 2021-11-01 09:39:42 +08:00
@changcode
f3345fd187 fix: 补充鼠标悬浮国际化内容 2021-10-27 16:49:58 +08:00
@changcode
aac45c2fc2 fix: 调整alertLabel页面字段暂时为空时的占位符 2021-10-27 14:02:09 +08:00
@changcode
586246d34f style: endpoint Configuration列,鼠标移入弹框样式调整 2021-10-27 10:59:54 +08:00
@changcode
5a831004f5 NEZ-1080 style: 鼠标悬浮样式调整 2021-10-26 17:47:49 +08:00
zhangyu
e6a35e3fc9 NEZ-994 fix: alert message label x修改 2021-09-14 14:19:38 +08:00
chenjinsong
13b0454d00 fix: 修复alertmsg的rule弹框不显示的问题 2021-05-21 19:28:50 +08:00
chenjinsong
337ee9a938 feat: 引入eslint 2021-03-19 18:52:19 +08:00
zhangyu
c3ac72e483 feat:添加beforeDestroy生命周期,解绑bus.$on 以及。on事件 2020-11-20 11:19:25 +08:00
zhangyu
1db264eb4f style:调宽alertLabel的title的宽度 2020-10-20 14:01:47 +08:00
wangwenrui
5efaa21baf fix:处理系统时区 2020-10-16 19:26:50 +08:00
zhangyu
253b536f36 style:去除console 2020-10-16 17:42:12 +08:00
zhangyu
fed3af50f8 fix:修改tooltip的样式 以及内置 alert rule expression 显示 - 2020-10-16 16:11:23 +08:00
zhangyu
9279bdf13e fix:修改alerrt tooltip 靠近底部时不向上显示的问题 2020-10-15 18:20:32 +08:00
zhangyu
d1d1f00b52 fix:修改所有的 high medium low 为 P1 P2 P3 2020-10-14 14:24:07 +08:00
zhangyu
613911374c fix:修改 project alertTable的state的颜色 以及换行 2020-10-09 11:26:16 +08:00
chenjinsong
64e31173ee perf: alert-rule悬停换行 2020-09-29 18:52:43 +08:00
chenjinsong
f41d59a0a0 fix: alert-list样式调整、label悬停bug修复 2020-09-29 18:51:03 +08:00
chenjinsong
4d1d89cd84 perf: alertList性能优化 2020-09-28 16:27:03 +08:00
zhangyu
5d01a7401d feat:使用1.2的icon 2020-09-10 17:00:32 +08:00
zhangyu
5592cd5a5e fix:修改alertmessageTable level不显示的问题 以及 value点击变为整个div 2020-08-03 10:18:48 +08:00
chenjinsong
68399d2750 NEZ-351 perf: dashboard相关滑框bug修复、优化 2020-07-31 20:57:04 +08:00
zhangyu
99609a06bf fix: 修正抽取组件没有批量删除的功能 style:修改小驼峰为中划线的格式 2020-07-31 10:55:25 +08:00
zhangyu
af4c076df4 NEZ-358 feat : assetMessage页面 label 和name增加鼠标悬浮显示
style : 放宽assetMessa时间的宽度 缩小value
2020-07-27 18:26:44 +08:00