Commit Graph

87 Commits

Author SHA1 Message Date
zhangyu
1cf6fdbeb3 fix:修改 鼠标悬浮非内置标签 alertLabel 不消失的问题 2023-01-09 17:15:10 +08:00
zhangyu
f046f519a9 NEZ-2186 fix: 搜索框 样式调整 2022-09-09 14:47:56 +08:00
zhangyu
00b28d464d fix:处理 asset 复制name 详细视图刷新的问题 2022-09-08 13:47:46 +08:00
zhangyu
889ddca357 NEZ-2180 fix:asset 详情视图 hover弹窗 显示遮挡 2022-09-07 15:45:51 +08:00
zhangyu
4a6ad5ea9d fix:处理alertLabel的报错 2022-09-06 14:07:12 +08:00
likexuan
c36129bb2a NEZ-2167 fix : record 列表页面 labels 列取消 鼠标悬浮 2022-09-02 14:38:28 +08:00
likexuan
958c02e743 NEZ-2103 feat : Record rule 编辑页面开发 2022-08-09 17:30:29 +08:00
likexuan
8af4f22941 fix : 国际化更改 2022-08-01 16:32:29 +08:00
likexuan
18132f9a8c fix : 判断复制内容是否为空 2022-07-22 10:46:49 +08:00
likexuan
6d44b127a6 fix : 类名大小写问题更改 2022-07-15 10:50:20 +08:00
likexuan
9d39d0231c NEZ-1965 feat : 补充 复制功能 2022-07-15 10:42:09 +08:00
likexuan
92084915c2 NEZ-2022 fix : module 详情弹窗 未正确显示 name 2022-07-12 15:27:20 +08:00
likexuan
55b0f6b583 fix : chartTopology 提示框位置更改 2022-07-12 15:19:45 +08:00
likexuan
bbfad7106d NEZ-2008 fix : 界面 国际化 检查 2022-07-11 10:10:26 +08:00
likexuan
581dff59c2 perf : 弹框位置调整 2022-07-05 16:32:57 +08:00
zhangyu
6403b570f5 Merge branch 'dev-3.3' of https://git.mesalab.cn/nezha/nezha-fronted into dev-3.4
# Conflicts:
#	nezha-fronted/src/assets/css/common.scss
2022-06-23 16:51:51 +08:00
likexuan
acbd5016a9 fix : user 页面提示框位置修改 2022-06-23 16:05:24 +08:00
zhangyu
98decd29f9 Merge branch 'dev-3.3' of https://git.mesalab.cn/nezha/nezha-fronted into dev-3.4
# Conflicts:
#	nezha-fronted/src/components/common/table/settings/userTable.vue
2022-06-22 11:47:20 +08:00
zhangyu
8010406cd1 fix:删除重复国际化数据 2022-06-21 18:14:21 +08:00
likexuan
0230a9eeac fix : user 提示框 email国际化 2022-06-21 16:37:41 +08:00
likexuan
0d66536e25 EZ-1945 feat : 用户列表页面 详细视图下 增加 详情提示窗 2022-06-20 15:37:09 +08:00
zhangyu
e65f37b5b5 fix:处理中英文完全一样的国际化为一个 2022-06-16 15:58:17 +08:00
likexuan
9c4c5278c2 fix : 修改Name 2022-04-24 13:59:02 +08:00
likexuan
eadf2fb68a fix : 修改Name 2022-04-24 13:49:34 +08:00
likexuan
9c08d0b108 解决冲突 2022-04-20 18:00:59 +08:00
likexuan
9b553f4fbb Merge branch 'dev-3.3' of https://git.mesalab.cn/nezha/nezha-fronted into dev-3.3 2022-04-20 17:31:00 +08:00
likexuan
5f4f8f0e3d fix:alert silence 列表页面增加 alerts 列、告警详情页面 样式优化 2022-04-20 17:16:07 +08:00
zhangyu
bc9359b691 fix: 補充main。js 2022-04-20 16:57:14 +08:00
zhangyu
4be3edb7a3 NEZ-1783 feat:asset,endpoint 等详情页面优化 2022-04-06 14:54:03 +08:00
zhangyu
9c4e2a9525 feat:alertMessage 添加 info 2022-04-01 15:43:14 +08:00
zhangyu
e47e353566 Merge branch 'dev-3.2' of https://git.mesalab.cn/nezha/nezha-fronted into dev-3.3
# Conflicts:
#	nezha-fronted/src/components/common/project/popData/Info.vue
2022-04-01 13:33:16 +08:00
zhangyu
7db7e39a47 NEZ-1735 fix:国际化补充 2022-04-01 11:03:31 +08:00
@changcode
b1e4745909 NEZ-1739 feat: 补充loading 动画 2022-03-25 15:40:05 +08:00
zhangyu
ff48f86654 fix:控制台报错处理 2022-03-10 13:34:24 +08:00
zhangyu
24ed289135 fix:修改详情页面报错的问题 2022-03-07 09:37:27 +08:00
zhangyu
69b71805ec NEZ-1602 fix:鼠标悬浮详情页面参照 列表页面 alert 列实现 2022-03-01 11:04:16 +08:00
zhangyu
678b45583a NEZ-1514 feat: 全局搜索功能开发(50%) 2022-01-14 18:04:34 +08:00
zhangyu
2ccd8ff66c fix:优化 alertmessage tooltip 显示位置问题 2021-12-31 10:15:36 +08:00
chenjinsong
a0dcb8d877 Merge remote-tracking branch 'origin/dev-3.1' into dev-3.1.1_theme
# Conflicts:
#	nezha-fronted/src/components/cli/webSSH.vue
#	nezha-fronted/src/components/common/alert/alertLabel2.vue
#	nezha-fronted/src/components/common/detailView/list/asset/assetDetail.vue
#	nezha-fronted/src/components/common/popBox/topToolMoreOptions.vue
#	nezha-fronted/src/components/common/rightBox/editEndpointBoxNew.vue
#	nezha-fronted/src/components/common/rightBox/moduleBox.vue
#	nezha-fronted/src/components/page/config/system.vue
#	nezha-fronted/src/components/page/monitor/project/index.vue
2021-11-11 11:28:19 +08:00
@changcode
3b131e96cd fix: 修复 asset详情视图ping图标颜色 2021-11-08 15:03:17 +08:00
@changcode
fa1b6e4530 NEZ-1191 fix: 修复Endpoint 详情页面显示状态不正确 2021-11-08 14:56:50 +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
3094e94b0c NEZ-1160 fix: 修复Endpoint页面鼠标悬浮在Project字段元素超出边框 2021-11-02 17:19:33 +08:00
@changcode
8abb1e0980 fix: 修复 alertLable 页面,因定位问题超出浏览器窗口 2021-11-02 16:07:50 +08:00
@changcode
e38bdd4e19 NEZ-1156 fix: 修复alert rule type字段未正确翻译为 metrics.logs.snmp trap 2021-11-02 11:04:06 +08:00
@changcode
efb0996777 fix: alertLabel页面增加判断,区分alertMessage页面,和chart-alert-lis全屏t页面 2021-11-02 10:17:26 +08:00
chenjinsong
d1efdde2ba NEZ-1072 feat: 主题切换冲突解决 2021-11-01 23:05:28 +08:00
chenjinsong
6ebeeeacd1 Merge remote-tracking branch 'origin/dev-3.1' into dev-3.1.1_theme
# Conflicts:
#	nezha-fronted/src/components/common/labelFilter/clickSearch.vue
2021-11-01 18:32:30 +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
@changcode
853807fafd fix: 修复cahrt-alert-list页面全屏问题 2021-11-01 17:59:32 +08:00