zhangyu
|
33ff16f330
|
Merge branch 'dev-3.3' of https://git.mesalab.cn/nezha/nezha-fronted into dev-3.3
|
2022-04-24 09:47:23 +08:00 |
|
zhangyu
|
d3900fea67
|
Merge branch 'dev-3.3' of https://git.mesalab.cn/nezha/nezha-fronted into dev-3.3
|
2022-04-24 09:44:14 +08:00 |
|
likexuan
|
403e309600
|
NEZ-1830 fix : Network Zodiac 前端logo更换
|
2022-04-24 09:41:19 +08:00 |
|
likexuan
|
88f6e09b7f
|
NEZ-1830 fix : Network Zodiac 前端logo更换
|
2022-04-24 09:38:17 +08:00 |
|
likexuan
|
13831771d0
|
Merge branch 'dev-3.3' of https://git.mesalab.cn/nezha/nezha-fronted into dev-3.3
|
2022-04-24 09:37:55 +08:00 |
|
likexuan
|
f46788f95f
|
NEZ-1830 fix : Network Zodiac 前端logo更换
|
2022-04-22 19:21:36 +08:00 |
|
likexuan
|
a7d47d8fbc
|
NEZ-1830 fix :
|
2022-04-22 19:13:14 +08:00 |
|
zhangyu
|
aebe62f3b9
|
feat： 添加promethods 联想输入
|
2022-04-22 18:55:50 +08:00 |
|
likexuan
|
4674054048
|
NEZ-1830 fix : Network Zodiac 前端logo更换
|
2022-04-22 18:02:21 +08:00 |
|
likexuan
|
c02619ee61
|
NEZ-1830 fix : Network Zodiac 前端logo更换
|
2022-04-22 17:55:21 +08:00 |
|
likexuan
|
e3006a31ac
|
NEZ-1833 feat : asset 新增修改页面 Type & model 调整
|
2022-04-22 16:36:05 +08:00 |
|
zhangyu
|
ca432d5962
|
NEZ-1832 f ix：修改asset logs 二级页面 时间参数错误
|
2022-04-22 10:04:59 +08:00 |
|
likexuan
|
bd1b87a601
|
Merge branch 'dev-3.3' of https://git.mesalab.cn/nezha/nezha-fronted into dev-3.3
|
2022-04-22 09:21:51 +08:00 |
|
likexuan
|
681aa887c6
|
NEZ-830 feat : Network Zodiac 前端logo更换
|
2022-04-22 09:21:42 +08:00 |
|
zhangxiaolong
|
e6c1e546a3
|
NEZ-1795 feat : explore页面动态添加实现、修复alertrules的rightbox无法正常回显的问题、调整实现选择值添加到输入框尾
|
2022-04-21 17:26:06 +08:00 |
|
likexuan
|
2cbc80e959
|
Merge branch 'dev-3.3' of https://git.mesalab.cn/nezha/nezha-fronted into dev-3.3
|
2022-04-21 11:06:31 +08:00 |
|
likexuan
|
76011aaa9b
|
feat : Network Zodiac 前端logo更换
|
2022-04-21 11:06:22 +08:00 |
|
zhangxiaolong
|
5f0490ef6f
|
fix : 实现下拉框选择值显示 、save提交正常 edit回显仍有问题
|
2022-04-21 10:58:53 +08:00 |
|
zhangyu
|
2258d4c058
|
Merge branch 'dev-3.3' of https://git.mesalab.cn/nezha/nezha-fronted into dev-3.3
# Conflicts:
# nezha-fronted/src/components/page/dashboard/explore/promqlInput.vue
|
2022-04-20 19:26:24 +08:00 |
|
zhangyu
|
a4fb1a3963
|
fix: 提交 输入框 跟接口 相关
|
2022-04-20 19:22:40 +08:00 |
|
zhangxiaolong
|
7d8a34551d
|
Merge branch 'dev-3.3' of https://git.mesalab.cn/nezha/nezha-fronted into dev-3.3
|
2022-04-20 19:17:21 +08:00 |
|
zhangxiaolong
|
236b0b4bc6
|
fix : 解决codemirror选择后会关闭rightbox的问题 修改功能代码
|
2022-04-20 19:17:08 +08:00 |
|
zhangyu
|
451cf5b1f2
|
fix：优化测试用例
|
2022-04-20 18:46:11 +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
|
367c493975
|
Merge branch 'dev-3.3' of https://git.mesalab.cn/nezha/nezha-fronted into dev-3.3
|
2022-04-20 16:57:27 +08:00 |
|
zhangyu
|
bc9359b691
|
fix： 補充main。js
|
2022-04-20 16:57:14 +08:00 |
|
zhangxiaolong
|
dffd48a115
|
fix : 修复Alert Message页面控制台报错问题
|
2022-04-20 15:50:48 +08:00 |
|
zyh
|
95e069e6ab
|
NEZ-1820 fix：修复dashboard内存泄漏
|
2022-04-20 14:57:51 +08:00 |
|
zyh
|
4ae60b7843
|
NEZ-1820 fix：修复dashboard内存泄漏
|
2022-04-20 14:50:31 +08:00 |
|
zhangyu
|
1202367c6f
|
Merge branch 'dev-3.2' of https://git.mesalab.cn/nezha/nezha-fronted into dev-3.3
|
2022-04-20 13:34:23 +08:00 |
|
zhangyu
|
1d6f29b0de
|
fix：修改 stat接口为 axios.get
|
2022-04-20 13:33:33 +08:00 |
|
zhangyu
|
aead1c728a
|
fix：补充main。js的测试用例
|
2022-04-20 10:26:10 +08:00 |
|
zhangyu
|
07accb61c0
|
Merge branch 'dev-3.2' of https://git.mesalab.cn/nezha/nezha-fronted into dev-3.3
# Conflicts:
# nezha-fronted/src/components/chart/panelChart.vue
|
2022-04-20 09:38:03 +08:00 |
|
zhangyu
|
8b41a30f34
|
Merge branch 'dev-3.3' of https://git.mesalab.cn/nezha/nezha-fronted into dev-3.3
|
2022-04-20 09:36:13 +08:00 |
|
zhangyu
|
12f996555f
|
fix： 删除console
|
2022-04-20 09:35:27 +08:00 |
|
zyh
|
10663eb770
|
NEZ-1820 fix：修复dashboard内存泄漏
|
2022-04-19 19:14:28 +08:00 |
|
zyh
|
d7ef27c1a7
|
NEZ-1820 fix：修复dashboard内存泄漏
|
2022-04-19 19:12:55 +08:00 |
|
zyh
|
57119f5f89
|
NEZ-1820 fix：修复dashboard内存泄漏
|
2022-04-19 18:45:13 +08:00 |
|
zhangyu
|
8b422de2d0
|
fix：修改stat的请求方式
|
2022-04-19 18:17:49 +08:00 |
|
zhangyu
|
8689f2b6da
|
fix：stat 接口 补充参数
|
2022-04-19 17:36:54 +08:00 |
|
zhangyu
|
bd880e8f84
|
feat：补充 main。js的测试用例
|
2022-04-19 17:32:33 +08:00 |
|
zhangyu
|
847c5257b2
|
sytyle： 修复 topology 右侧菜单样式错乱的问题
|
2022-04-19 16:24:26 +08:00 |
|
zhangyu
|
f6a8f8e6c8
|
Merge branch 'dev-3.2' of https://git.mesalab.cn/nezha/nezha-fronted into dev-3.3
|
2022-04-19 16:22:05 +08:00 |
|
zhangyu
|
be967b374e
|
Merge branch 'dev-3.2' of https://git.mesalab.cn/nezha/nezha-fronted into dev-3.2
|
2022-04-19 16:19:01 +08:00 |
|
zhangyu
|
f444f8e921
|
fix：优化 topology
|
2022-04-19 16:18:43 +08:00 |
|
zyh
|
49f0a616f5
|
NEZ-1820 fix：修复dashboard内存泄漏
|
2022-04-19 16:17:14 +08:00 |
|
zhangyu
|
852049c19a
|
fix： 补充合并丢失内容
|
2022-04-19 15:55:50 +08:00 |
|
zhangyu
|
9f02048f94
|
Merge branch 'dev-3.2' of https://git.mesalab.cn/nezha/nezha-fronted into dev-3.2
# Conflicts:
# nezha-fronted/src/components/common/project/topologyL5.vue
|
2022-04-19 15:47:36 +08:00 |
|