Commit Graph

2704 Commits

Author SHA1 Message Date
zhangyu
68d483b409 feat:添加detail的详情 2022-03-31 09:52:13 +08:00
zhangyu
781d20c47c style:样式调整 2022-03-30 18:58:47 +08:00
zhangyu
5a912e7aae Merge branch 'dev-3.2' of https://git.mesalab.cn/nezha/nezha-fronted into dev-3.3
# Conflicts:
#	nezha-fronted/src/components/charts/chartDataFormat.js
#	nezha-fronted/src/components/page/asset/asset.vue
2022-03-30 18:35:11 +08:00
zhangyu
ac53f7b7d3 fix:修复 修改宽度 引起重叠的问题 2022-03-30 17:45:45 +08:00
zhangyu
4a959f9267 NEZ-1755 fix:组内 修改图表后 图表移至最后 2022-03-30 17:25:15 +08:00
zhangyu
8861effc7e fix:修改关闭按钮 不提示弹窗的问题 2022-03-30 16:12:29 +08:00
zhangyu
31cdf53daf NEZ-1735 fix: 部分内容未进行国际化显示 2022-03-30 16:03:07 +08:00
zhangyu
5b6e01c79b fix:添加alertMessagrInfo(30%) 2022-03-30 15:55:38 +08:00
zhangyu
42ae7d5dfe Merge branch 'dev-3.2' of https://git.mesalab.cn/nezha/nezha-fronted into dev-3.3 2022-03-30 15:17:08 +08:00
zhangyu
9c4e4e17b5 fix:优化 group 折叠的问题 补充国际化 2022-03-29 17:59:56 +08:00
zhangyu
745c7c6c30 NEZ-1748 fix: Chart 修改,改变内容后,点击 cancel 没有触发 未保存提示 效果 2022-03-29 15:21:28 +08:00
zhangyu
97eca56a9c style: 复制按钮样式调整 2022-03-29 11:13:01 +08:00
zhangyu
fc5a9a70c0 feat: alertMessage 详情开发 2022-03-28 16:44:40 +08:00
zhangyu
b2ec953c95 Merge branch 'dev-3.2' of https://git.mesalab.cn/nezha/nezha-fronted into dev-3.3 2022-03-28 14:24:34 +08:00
zhangyu
c42ddd6e24 NEZ-1740 feat:告警列 最近告警柱形图 根据 告警数量显示不同高度 2022-03-28 12:30:51 +08:00
zhangyu
ef4e9cf2fc Merge branch 'dev-3.3' of https://git.mesalab.cn/nezha/nezha-fronted into dev-3.3 2022-03-28 11:45:35 +08:00
zhangyu
778f7efc3b fix:处理loading unbind 报错 2022-03-28 11:41:12 +08:00
@changcode
e8e0e6606b fix: explore 补充loading加载动画,login登陆按钮loading加载样式调整 2022-03-28 11:06:40 +08:00
zhangyu
5c4b263809 NEZ-1740 fix:告警列 最近告警柱形图 根据 告警数量显示不同高度 2022-03-28 10:42:31 +08:00
zhangyu
5fbc79346b fix:替换全局搜索 跳转的loading 2022-03-28 09:48:28 +08:00
zhangyu
12970ab5a2 Merge branch 'dev-3.2' of https://git.mesalab.cn/nezha/nezha-fronted into dev-3.3 2022-03-25 17:43:17 +08:00
zhangyu
2e158729df fix:优化 loading 2022-03-25 17:34:59 +08:00
zhangyu
f294512463 feat:添加 新的 loading 2022-03-25 17:24:53 +08:00
zhangyu
4e343d7137 fix: 修改 值为 “0” 对取最大值的影响 2022-03-25 16:37:24 +08:00
@changcode
b1e4745909 NEZ-1739 feat: 补充loading 动画 2022-03-25 15:40:05 +08:00
zhangyu
c5aab4ae7f fix:修改 自定义指令 my-loading 的逻辑 2022-03-25 15:10:16 +08:00
zhangyu
1588b9328f NEZ-1726 feat: loading 动画优化 添加 unbind事件 2022-03-25 14:43:36 +08:00
zhangyu
69f061d868 Merge branch 'dev-3.2' of https://git.mesalab.cn/nezha/nezha-fronted into dev-3.3
# Conflicts:
#	nezha-fronted/src/components/charts/chartDataFormat.js
2022-03-25 14:28:07 +08:00
zhangyu
f2b055f20f fix:assetBox 补充国际化 2022-03-25 14:25:13 +08:00
zhangyu
5b276cf845 NEZ-1735 fix: 部分内容未进行国际化显示 2022-03-25 14:12:03 +08:00
zhangyu
7283faa72d feat:添加 新的 loading 2022-03-25 10:48:46 +08:00
zhangyu
235411cbe8 Merge branch 'dev-3.2' of https://git.mesalab.cn/nezha/nezha-fronted into dev-3.3 2022-03-25 09:22:18 +08:00
zhangyu
53e5ad91a7 fix:补充中文国际化 2022-03-24 16:27:20 +08:00
zhangyu
fae3c0ab0c NEZ-1734 fix:页面 国际化的问题 2022-03-24 15:59:05 +08:00
@changcode
21b6fa9db3 fix: 修复列表页面错位 2022-03-24 14:16:35 +08:00
zhangyu
3201c50026 fix:添加 loading 2022-03-24 14:09:00 +08:00
zhangyu
9e00d50795 Merge branch 'dev-3.2' of https://git.mesalab.cn/nezha/nezha-fronted into dev-3.3
# Conflicts:
#	nezha-fronted/src/components/chart/chart/chartGauge.vue
#	nezha-fronted/src/components/chart/chart/chartHexagonD3.vue
2022-03-24 13:40:37 +08:00
zhangyu
f636b2ed5e Merge branch 'dev-3.2' of https://git.mesalab.cn/nezha/nezha-fronted into dev-3.2 2022-03-24 09:55:20 +08:00
zhangyu
a2cd704d14 fix:修复 因为路由改变跳转的问题 2022-03-24 09:52:47 +08:00
@changcode
e2e7eaec2a fix: 修复 exploreItem 分页报错,projects 点击列表跳转页面, 初始获取路由为null报错 2022-03-24 09:46:14 +08:00
zhangyu
792f9bf95a feay: 添加 loading 2022-03-24 09:44:32 +08:00
zhangyu
7f0eebcd86 fix:asset add by template 报错修改 2022-03-23 18:18:43 +08:00
zhangyu
bd259fd291 fix:修改 project module endpoint 的路由 2022-03-23 18:08:00 +08:00
@changcode
34a6a92031 fix: 修复projects 左侧图,弹框Box报错 2022-03-23 17:47:27 +08:00
zhangyu
be54a0d868 NEZ-1729 fix:开启2FA登录后再次开启第二个窗口后界面出错 2022-03-23 17:33:11 +08:00
@changcode
44c76c11b6 fix: asset ,endpoint 详情信息 info 列表,告警列统一 2022-03-23 16:27:59 +08:00
zhangyu
d01abf6abe feat:添加自定义 loading指令 2022-03-23 16:04:14 +08:00
zhangyu
5ab9c33ddd fix:解决冲突 2022-03-23 15:20:58 +08:00
zhangyu
261b3369d9 Merge branch 'dev-3.2' of https://git.mesalab.cn/nezha/nezha-fronted into dev-3.3
# Conflicts:
#	nezha-fronted/src/components/common/bottomBox/tabs/alertMessageTabNew.vue
2022-03-23 15:18:55 +08:00
zhangyu
1e7b1da349 NEZ-1708 fix:Chart templates点击删除图表模板按钮后弹窗后点击取消浏览器报错,再次点击删除按钮失效 2022-03-23 15:06:36 +08:00