方顺健
|
3c3e3269d6
|
build: 更新 gitlab ci
|
2022-04-13 03:45:59 +00:00 |
|
zhangyu
|
501e7f5043
|
Merge branch 'dev-3.2' of https://git.mesalab.cn/nezha/nezha-fronted into dev-3.3
# Conflicts:
# nezha-fronted/src/assets/css/font/iconfont.css
# nezha-fronted/src/assets/css/font/iconfont.js
# nezha-fronted/src/assets/css/font/iconfont.ttf
# nezha-fronted/src/assets/css/font/iconfont.woff
# nezha-fronted/src/assets/css/font/iconfont.woff2
# nezha-fronted/src/assets/css/nzIcon.css
# nezha-fronted/src/components/page/dashboard/panel.vue
|
2022-04-13 10:50:11 +08:00 |
|
zhangyu
|
b29d9f8489
|
feat：导出 pdf 添加时间
|
2022-04-13 10:48:00 +08:00 |
|
zhangyu
|
18635c5ad0
|
feat：导出 pdf 添加 时间
|
2022-04-13 09:31:18 +08:00 |
|
zhangxiaolong
|
90e948905b
|
fix : 时间选择器组件优化 初步修改 未完全完成
|
2022-04-12 20:05:18 +08:00 |
|
方顺健
|
bc7face67f
|
build: 新增 gitlab ci配置文件
|
2022-04-12 10:53:23 +00:00 |
|
zyh
|
44e72ad3b0
|
Merge branch 'dev-3.3' of git.mesalab.cn:nezha/nezha-fronted into dev-3.3
|
2022-04-12 18:14:18 +08:00 |
|
zyh
|
c4b06d370f
|
style：删除leftMenu子菜单图标
|
2022-04-12 18:13:48 +08:00 |
|
zhangyu
|
8f4df97372
|
style：修改 导出pdf的图标
|
2022-04-12 18:07:42 +08:00 |
|
zhangyu
|
c56b81f1c7
|
style：修改导出pdf的图标
|
2022-04-12 17:19:51 +08:00 |
|
zhangyu
|
2cf42ef73b
|
Merge branch 'dev-3.3' of https://git.mesalab.cn/nezha/nezha-fronted into dev-3.3
|
2022-04-12 15:59:22 +08:00 |
|
zhangyu
|
9aa3f4fbc2
|
fix：删除 webpack script脚本
|
2022-04-12 15:58:59 +08:00 |
|
zhangxiaolong
|
a9c23747d2
|
NEZ-1787 feat :时间选择器组件 优化 初步模型 未完全完成
|
2022-04-12 15:54:29 +08:00 |
|
zhangxiaolong
|
bfbf62e710
|
NEZ-1779 fix : 恢复和删除接口功能实现 Lint代码
|
2022-04-12 15:03:33 +08:00 |
|
zhangxiaolong
|
898c0c01dc
|
NEZ-1779 fix : 恢复和删除接口功能实现
|
2022-04-12 14:34:55 +08:00 |
|
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
|
97b0b541a1
|
Revert "feat：锁定svg的版本"
This reverts commit 2b20284882.
|
2022-04-12 10:47:20 +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 |
|