zyh
|
06ecb452b4
|
Merge branch 'dev-3.3' of git.mesalab.cn:nezha/nezha-fronted into dev-3.3
|
2022-04-12 12:01:11 +08:00 |
|
zyh
|
3eacdec407
|
style:配置tool菜单图标
|
2022-04-12 12:00:51 +08:00 |
|
zhangyu
|
ecb893012b
|
Merge branch 'dev-3.3' of https://git.mesalab.cn/nezha/nezha-fronted into dev-3.3
|
2022-04-12 10:55:24 +08:00 |
|
zhangyu
|
257814f6b0
|
Merge branch 'dev-3.2' of https://git.mesalab.cn/nezha/nezha-fronted into dev-3.3
# Conflicts:
# nezha-fronted/src/components/charts/chart-alert-list.vue
# nezha-fronted/src/components/common/bottomBox/tabs/endpointQueryTab.vue
# nezha-fronted/src/components/common/table/alert/alertMessageTable.vue
|
2022-04-12 10:46:19 +08:00 |
|
zyh
|
cebc19533c
|
Merge branch 'dev-3.3' of git.mesalab.cn:nezha/nezha-fronted into dev-3.3
|
2022-04-12 10:33:16 +08:00 |
|
zyh
|
54e09846ea
|
feat:ping、trace列支持前端排序
|
2022-04-12 10:32:58 +08:00 |
|
zhangyu
|
87c48a8f35
|
perf:删除没有用到的代码
|
2022-04-12 10:30:33 +08:00 |
|
zhangyu
|
8a2118f268
|
Merge branch 'dev-3.2' of https://git.mesalab.cn/nezha/nezha-fronted into dev-3.3
# Conflicts:
# nezha-fronted/src/components/common/js/htmlToPdf.js
|
2022-04-12 09:29:21 +08:00 |
|
zhangyu
|
2b20284882
|
feat:锁定svg的版本
|
2022-04-12 09:20:07 +08:00 |
|
zhangyu
|
03ebb14aff
|
feat:panel底弹窗添加导出pdf
|
2022-04-11 17:54:38 +08:00 |
|
zhangyu
|
f0b5f13a70
|
fix: 修改未执行eslint的代码
|
2022-04-11 17:24:10 +08:00 |
|
zhangyu
|
29289e9235
|
feat:panel 添加导出 当前数据
|
2022-04-11 17:13:56 +08:00 |
|
zhangxiaolong
|
d2e47d836d
|
fix : 修复多次调用接口及其它问题
|
2022-04-11 16:01:36 +08:00 |
|
zhangxiaolong
|
1ab110ad20
|
fix : 备份模块清除开发过程中的打印 进一步修改样式
|
2022-04-11 13:38:56 +08:00 |
|
zhangxiaolong
|
0be634c262
|
Merge branch 'dev-3.3' of https://git.mesalab.cn/nezha/nezha-fronted into dev-3.3
|
2022-04-11 12:30:08 +08:00 |
|
zhangxiaolong
|
dad29bb976
|
fix : 备份页面组件修改 样式修改
|
2022-04-11 12:29:50 +08:00 |
|
zyh
|
4095ceffa1
|
Merge branch 'dev-3.3' of git.mesalab.cn:nezha/nezha-fronted into dev-3.3
|
2022-04-11 11:12:46 +08:00 |
|
zyh
|
17248566ad
|
NEZ-1789trace页面开发
|
2022-04-11 11:12:30 +08:00 |
|
zhangyu
|
051f0a776c
|
NEZ-1783 fix:alert rule 详情图标颜色不正确
|
2022-04-11 11:09:15 +08:00 |
|
zhangxiaolong
|
c4b24fa657
|
fix : 解决返回数据处理有报错的问题
|
2022-04-08 19:07:25 +08:00 |
|
zhangxiaolong
|
d64f2519f9
|
fix : 备份模块样式修改
|
2022-04-08 18:51:13 +08:00 |
|
zhangxiaolong
|
e818ff1e4b
|
fix: backup 国际化
|
2022-04-08 18:02:57 +08:00 |
|
zhangxiaolong
|
474b60dce2
|
fix : 修复save无法刷新界面问题 修改一些样式
|
2022-04-08 16:39:36 +08:00 |
|
zhangxiaolong
|
8efcb56f34
|
Merge branch 'dev-3.3' of https://git.mesalab.cn/nezha/nezha-fronted into dev-3.3
|
2022-04-08 16:07:53 +08:00 |
|
zhangxiaolong
|
b50cd0c2db
|
NEZ-1778 fix:添加备份表单的校验
|
2022-04-08 16:07:06 +08:00 |
|
zhangyu
|
d82b7335cf
|
fix:补充国际化
|
2022-04-08 15:24:05 +08:00 |
|
zhangyu
|
a83140fd60
|
fix:补充国际化
|
2022-04-08 15:22:49 +08:00 |
|
zhangyu
|
e081e151bf
|
fix:修改 时间问题
|
2022-04-08 15:05:10 +08:00 |
|
zyh
|
59584ce1b3
|
Merge branch 'dev-3.3' of git.mesalab.cn:nezha/nezha-fronted into dev-3.3
|
2022-04-08 14:24:10 +08:00 |
|
zyh
|
d3bb814ba4
|
NEZ-1780feat:Ping页面接口对接
|
2022-04-08 14:23:48 +08:00 |
|
zhangxiaolong
|
576a267137
|
NEZ-1778 NEZ-1779 feat: 系统备份 页面开发
|
2022-04-08 14:14:10 +08:00 |
|
zhangxiaolong
|
d287509948
|
NEZ-1778 NEZ-1779 feat: 系统备份 页面开发
|
2022-04-08 14:09:56 +08:00 |
|
zhangyu
|
f32fb779da
|
Merge branch 'dev-3.2' of https://git.mesalab.cn/nezha/nezha-fronted into dev-3.3
|
2022-04-08 13:56:51 +08:00 |
|
zhangyu
|
6fd326949f
|
NEZ-1788 fix: panel页面整页导出
|
2022-04-08 13:48:49 +08:00 |
|
zhangyu
|
71d2a0a43f
|
feat:新增导出 pdf
|
2022-04-08 11:26:17 +08:00 |
|
zhangyu
|
3ae380da42
|
NEZ-1800 fix:link 点击无反应
|
2022-04-08 10:58:41 +08:00 |
|
zyh
|
df2557613e
|
Merge branch 'dev-3.3' of git.mesalab.cn:nezha/nezha-fronted into dev-3.3
|
2022-04-07 18:52:21 +08:00 |
|
zyh
|
9c91fcf35d
|
NEZ-1780feat:Ping页面开发mock数据
|
2022-04-07 18:51:39 +08:00 |
|
方顺健
|
fd750b86f9
|
fix: 当 {{}} 变量替换没有查找到对应变量时,显示空字符串
|
2022-04-07 09:48:31 +00:00 |
|
zhangyu
|
c01feac8d9
|
Merge branch 'dev-3.2' of https://git.mesalab.cn/nezha/nezha-fronted into dev-3.3
|
2022-04-06 17:40:49 +08:00 |
|
zhangyu
|
fd96a0fbe1
|
fix:修复 日志 时间列换行显示的问题
|
2022-04-06 17:40:19 +08:00 |
|
zhangyu
|
c62012e0c4
|
Merge branch 'dev-3.2' of https://git.mesalab.cn/nezha/nezha-fronted into dev-3.3
|
2022-04-06 15:22:32 +08:00 |
|
zhangyu
|
78c93b0f1a
|
NEZ-1784 fix:开启堆叠图后点击刷新按钮图表复位,堆叠图按钮依然是选中状态
|
2022-04-06 15:21:53 +08:00 |
|
zhangyu
|
4be3edb7a3
|
NEZ-1783 feat:asset,endpoint 等详情页面优化
|
2022-04-06 14:54:03 +08:00 |
|
zhangyu
|
4674e2f09d
|
fix:开始主题切换
|
2022-04-06 14:38:10 +08:00 |
|
zyh
|
9d69ede588
|
Merge branch 'dev-3.3' of git.mesalab.cn:nezha/nezha-fronted into dev-3.3
|
2022-04-06 10:46:08 +08:00 |
|
zyh
|
465b3309b6
|
格式缩进
|
2022-04-06 10:45:32 +08:00 |
|
zhangyu
|
a3b44d9337
|
fix:修改 scope点击事件错误的问题
|
2022-04-06 10:41:06 +08:00 |
|
zhangyu
|
76ae65f0cc
|
fix:优化alertMessage Info的显示
|
2022-04-06 10:31:12 +08:00 |
|
zhangyu
|
f446981d0e
|
Merge branch 'dev-3.2' of https://git.mesalab.cn/nezha/nezha-fronted into dev-3.3
# Conflicts:
# nezha-fronted/src/components/chart/chart/chartTimeSeries.vue
|
2022-04-06 10:24:57 +08:00 |
|