Commit Graph

4316 Commits

Author SHA1 Message Date
zhangyu
dcd2db3ee7 Merge branch 'dev-3.2' of https://git.mesalab.cn/nezha/nezha-fronted into dev-3.3 2022-04-14 15:19:06 +08:00
zhangyu
9919e703eb NEZ-1819 fix:chart-line 超过 20条数据 lengend颜色 和 line的颜色不对应 2022-04-14 13:56:06 +08:00
zhangxiaolong
7068816308 fix : 解决alertMessage页面时间选中状态的样式冲突问题 2022-04-14 12:45:43 +08:00
zhangxiaolong
531c8e02d7 NEZ-1787 fix : hover显示、 默认时间处理 、快捷选择后文案显示 2022-04-14 11:51:57 +08:00
zhangxiaolong
9258a0d7fd NEZ-1787 fix : 时间选择器组件 优化 国际化以及不同页面的样式修改 2022-04-13 19:06:47 +08:00
zhangyu
e0aed5d4f8 fix:修改 底部弹窗 传递id的方法 2022-04-13 18:14:08 +08:00
zhangxiaolong
8214300cb1 fix : 修复组件外点击问题 修改样式 2022-04-13 17:47:09 +08:00
zhangxiaolong
52fbff49e2 fix : 时间选择器历史记录绑定修改 2022-04-13 17:09:59 +08:00
zhangyu
081677e7dc fix:修改自定义时间不生效的问题 2022-04-13 16:22:54 +08:00
zhangxiaolong
ff37d50c9a Merge branch 'dev-3.3' of https://git.mesalab.cn/nezha/nezha-fronted into dev-3.3 2022-04-13 15:57:16 +08:00
zhangxiaolong
9b7f36f405 fix : 时间选择器优化样式修改 历史记录绑定 2022-04-13 15:57:03 +08:00
zhangyu
0f6c991b30 NEZ-1813 fix:处理宽高过小的时候 fontSize = 0 的问题 2022-04-13 14:06:51 +08:00
zhangxiaolong
a848db4267 NEZ-1787 fix : 基本完成 下一步自测以及修改历史展示 2022-04-13 13:11:16 +08:00
zhangyu
884cfac5da Merge branch 'dev-3.2' of https://git.mesalab.cn/nezha/nezha-fronted into dev-3.3
# Conflicts:
#	nezha-fronted/src/components/chart/chart/chartStat.vue
2022-04-13 11:55:24 +08:00
zhangyu
007bf705b5 Merge branch 'dev-3.3' of https://git.mesalab.cn/nezha/nezha-fronted into dev-3.3 2022-04-13 11:54:38 +08:00
zhangyu
e6f096ded3 fix:修改char Stat 未设置最小字号的问题 2022-04-13 11:54:03 +08:00
方顺健
3c3e3269d6 build: 更新 gitlab ci 2022-04-13 03:45:59 +00:00
zhangyu
15ffedabc3 fix:修复登录界面 默认语言的问题 2022-04-13 11:24:42 +08:00
zhangyu
77b7cd89a6 fix:修改登录界面的语言问题 2022-04-13 11:21:56 +08: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