Commit Graph

4539 Commits

Author SHA1 Message Date
18317449825
214e039a66 perf:修改监听图表显示隐藏 2022-07-16 00:09:02 +08:00
18317449825
54c836f842 perf:修改监听图表显示隐藏 2022-07-15 23:58:18 +08:00
zhangyu
819ce51804 Merge branch 'dev-3.3' of https://git.mesalab.cn/nezha/nezha-fronted into dev-3.4 2022-07-15 17:30:08 +08:00
zhangyu
ab7750cdfa Merge branch 'dev-3.2' of https://git.mesalab.cn/nezha/nezha-fronted into dev-3.3
# Conflicts:
#	nezha-fronted/src/components/common/project/topologyL5.vue
2022-07-15 17:16:04 +08:00
zhangyu
80e52ead27 fix:修改定时时间错误的问题 2022-07-15 17:06:39 +08:00
zhangyu
60671e1d3b fix:删除控制台console 2022-07-15 17:05:03 +08:00
zyh
3260eea125 NEZ-2023 perf:chart隐藏时取消阴影 2022-07-15 15:36:15 +08:00
zyh
86ac46586d Merge branch 'dev-3.4' of git.mesalab.cn:nezha/nezha-fronted into dev-3.4 2022-07-15 15:07:10 +08:00
zyh
3dd3768b18 NEZ-2023 feat:chart支持根据variable值显示隐藏 2022-07-15 15:06:56 +08:00
likexuan
740440dcae NEZ-2032 fix : alert rule 时间计划详情提示框 样式错误 2022-07-15 11:53:02 +08:00
likexuan
6d44b127a6 fix : 类名大小写问题更改 2022-07-15 10:50:20 +08:00
likexuan
5d1c3001c1 Merge branch 'dev-3.4' of https://git.mesalab.cn/nezha/nezha-fronted into dev-3.4 2022-07-15 10:42:14 +08:00
likexuan
9d39d0231c NEZ-1965 feat : 补充 复制功能 2022-07-15 10:42:09 +08:00
zhangyu
7810e4a7b8 Merge branch 'dev-3.3' of https://git.mesalab.cn/nezha/nezha-fronted into dev-3.4 2022-07-14 18:09:34 +08:00
zhangyu
d25045ea93 fix:temp-dom 增加 fontsize为 16的 2022-07-14 18:08:43 +08:00
zhangyu
4f140057c4 fix:修改 alertMessage 不正确显示的问题 2022-07-14 18:07:52 +08:00
zhangyu
d6288b771c Merge branch 'dev-3.3' of https://git.mesalab.cn/nezha/nezha-fronted into dev-3.4 2022-07-14 17:53:52 +08:00
zhangyu
95582130f6 fix:修改 alertMessage clickSearch 不正常换行的问题 2022-07-14 17:33:52 +08:00
zhangyu
bad2acb288 Merge branch 'dev-3.3' of https://git.mesalab.cn/nezha/nezha-fronted into dev-3.4 2022-07-14 15:35:43 +08:00
zhangyu
39b21c5178 NEZ-2024 fix:{{A.$labels}} 变量展示错误 2022-07-14 15:26:19 +08:00
zhangyu
a47d3b1877 NEZ-2026 fix:chart duplicate 后 表达式变量 被替换 2022-07-14 14:31:04 +08:00
zhangyu
9842b8a69c Merge branch 'dev-3.3' of https://git.mesalab.cn/nezha/nezha-fronted into dev-3.4 2022-07-14 14:00:17 +08:00
zhangyu
db7f526b1e NEZ-2024 fix:{{A.$labels}} 变量展示错误 2022-07-14 13:59:52 +08:00
zhangyu
5002a51051 fix:删除console 2022-07-14 13:59:22 +08:00
likexuan
4c9b207729 fix : alert Message 样式调整 2022-07-14 13:30:17 +08:00
zhangyu
a175997be5 Merge branch 'dev-3.3' of https://git.mesalab.cn/nezha/nezha-fronted into dev-3.4
# Conflicts:
#	nezha-fronted/src/components/page/dashboard/panel.vue
2022-07-14 11:36:45 +08:00
zhangyu
6644b111bf Merge branch 'dev-3.2' of https://git.mesalab.cn/nezha/nezha-fronted into dev-3.3
# Conflicts:
#	nezha-fronted/src/components/common/ChartDiagram/diagram.vue
2022-07-14 11:33:43 +08:00
zhangyu
5061a0dd37 fix: 补充注释的监听事件 以及 diagram组件修改 2022-07-14 11:31:03 +08:00
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
zhangyu
73b71d578f fix:修改 topology 源码 删除创建的节点以及给节点创建的对应的事件 2022-07-14 09:55:10 +08:00
zhangyu
739fa3e82f fix:处理 topoLogy的缓存 2022-07-13 15:35:56 +08:00
zhangyu
878411720d fix:处理 topoLogy的缓存问题 2022-07-13 15:07:13 +08:00
zhangyu
d372a6b8e1 fix:topology 缓存处理 2022-07-13 14:38:10 +08:00
zhangyu
816b8c4efa fix:将 le5le 源码 移动至本地 2022-07-13 14:06:20 +08:00
likexuan
8c5ba62887 fix : chart title 修改 2022-07-13 13:34:45 +08:00
likexuan
b95bb8426e fix : backup 页面时间处理 2022-07-13 11:44:09 +08:00
likexuan
1e69a7138d fix : 国际化 更改 2022-07-13 11:20:17 +08:00
likexuan
c2191a77e8 Merge branch 'dev-3.4' of https://git.mesalab.cn/nezha/nezha-fronted into dev-3.4 2022-07-12 18:07:04 +08:00
likexuan
25658f6c90 fix : 国际化更改 2022-07-12 18:06:59 +08:00
zhangyu
062e1f02f1 Merge branch 'dev-3.3' of https://git.mesalab.cn/nezha/nezha-fronted into dev-3.4 2022-07-12 17:43:30 +08:00
zhangyu
1b53f2beae fix:修改 alertMessage 打开 新增告警静默后 无法查看详情的问题 2022-07-12 17:42:01 +08:00
likexuan
1e09d6e618 fix : 国际化更改 2022-07-12 17:10:45 +08:00
likexuan
d003f48a70 fix : 国际化更改 2022-07-12 16:50:22 +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
c9c3767d00 fix : asset list Box 页面打开时请求错误 2022-07-12 15:06:27 +08:00
likexuan
a4c1a235f0 fix : system 页面样式更改 2022-07-12 14:57:51 +08:00
likexuan
a07814dd52 fix : alertMeaaage 视图样式更改 2022-07-12 14:23:53 +08:00
likexuan
5d43060453 NEZ-2008 fix : 界面 国际化 更改 2022-07-12 14:06:14 +08:00
zhangyu
b0451e8eb5 fix:修改 diagram 泄露相关问题 2022-07-12 11:53:51 +08:00