This repository has been archived on 2025-09-14. You can view files and clone it, but cannot push or open issues or pull requests.

zhangyu 2c91184bb0 Merge branch 'dev-3.2' of https://git.mesalab.cn/nezha/nezha-fronted into dev-3.3 ...

# Conflicts:
#	.gitignore
#	nezha-fronted/src/assets/css/font/iconfont.js
#	nezha-fronted/src/components/chart/chart/chartAutotopology.vue
#	nezha-fronted/src/components/common/ChartDiagram/diagram.vue
#	nezha-fronted/src/components/common/detailView/view/detailViewRight.vue
#	nezha-fronted/src/components/common/js/common.js
#	nezha-fronted/src/components/common/js/tools.js
#	nezha-fronted/src/components/common/project/topologyL5.vue
#	nezha-fronted/static/config.json

2022-07-14 10:19:06 +08:00

..

alertMessageTab.vue

fix：删除重复国际化数据

2022-06-21 18:14:21 +08:00

alertMessageTabNew.vue

fix：修改 topology 源码 删除创建的节点以及给节点创建的对应的事件

2022-07-14 09:55:10 +08:00

alertRuleEvalLog.vue

NEZ-1739 feat: 补充loading 动画

2022-03-25 15:40:05 +08:00

assetSubTab.vue

fix：黑色主题下 禁用样式优化

2022-06-17 16:32:37 +08:00

assetTab.vue

fix：处理中英文完全一样的国际化为一个

2022-06-16 15:58:17 +08:00

cabinetTab.vue

NEZ-1739 feat: 补充loading 动画

2022-03-25 15:40:05 +08:00

endpointQuery.vue

NEZ-1930 fix： 底弹框 切换数据源未删除搜索条件

2022-06-15 14:04:03 +08:00

endpointQueryTab.vue

fix：删除重复国际化数据

2022-06-21 18:14:21 +08:00

endpointTab.vue

fix：删除重复国际化数据

2022-06-21 18:14:21 +08:00

endpointTabNew.vue

NEZ-1930 fix： 底弹框 切换数据源未删除搜索条件

2022-06-15 14:04:03 +08:00

IpDetails.vue

NEZ-1984 fix： 限制 alertRule Evaluation interval 为 15 s - 24h

2022-06-27 17:35:24 +08:00

logBottomTab.vue

NEZ-1832 f ix：修改asset logs 二级页面 时间参数错误

2022-04-22 10:04:59 +08:00

operationLogTab.vue

fix：处理中英文完全一样的国际化为一个

2022-06-16 15:58:17 +08:00

panelTabNew.vue

Merge branch 'dev-3.2' of https://git.mesalab.cn/nezha/nezha-fronted into dev-3.3

2022-07-14 10:19:06 +08:00

scrapeEndpoint.vue

fix：详细视图 鼠标滑过被选中的item 右侧闪烁的问题

2022-07-06 17:49:53 +08:00

terminalLogCMDTab.vue

Merge remote-tracking branch 'origin/dev-3.1' into dev-3.2

2021-11-29 16:19:13 +08:00

terminalLogMonitorTab.vue

fix：处理中英文完全一样的国际化为一个

2022-06-16 15:58:17 +08:00

terminalLogRecordTab.vue

Merge remote-tracking branch 'origin/dev-3.1' into dev-3.2

2021-11-29 16:19:13 +08:00

terminalLogTab.vue

fix：国际化修改

2022-06-17 10:39:36 +08:00