5901 Commits

Author SHA1 Message Date
zhangyu
3b21cee731 style: 国际化调整 2023-08-07 10:29:42 +08:00
zyh
41b3f27cda fix:解决冲突 2023-08-02 10:58:13 +08:00
zyh
c4d2245309 Merge branch 'dev-3.4' of git.mesalab.cn:nezha/nezha-fronted into dev-3.5 2023-08-02 10:55:11 +08:00
zyh
dfdc4c33bf NEZ-3027 fix:【E21现场】NZ快照页面中的图表无法显示超过20条之外的指标信息 2023-08-02 10:52:01 +08:00
zyh
55b9d9a12e fix:修复dashboard快照在没有图表时 未提示接口返回的消息 2023-07-27 10:02:09 +08:00
zyh
26f9d2b5f5 fix:判断是否为dashboard导入导出 改为导出接口判断 2023-07-25 11:28:24 +08:00
zyh
234143ed08 Merge branch 'dev-3.5' of git.mesalab.cn:nezha/nezha-fronted into dev-3.6 2023-07-14 15:56:16 +08:00
zyh
b42f3468ec NEZ-2986 fix:clock图表多次渲染 未清除上次的定时器 2023-07-14 15:55:41 +08:00
zyh
da649d407d fix:修复dashboard变量name重复时 修改其中一个name 另一个校验未消失 2023-07-06 17:53:40 +08:00
zhangyu
03885df704 fix: 登录成功后,依然跳转到了 setup 页面 2023-07-06 17:08:34 +08:00
zhangyu
ca2a4dc5e4 NEZ-2969 fix:登录成功后,依然跳转到了 setup 页面 2023-07-06 17:07:46 +08:00
zhangyu
f80f0dc3c9 Merge branch 'dev-3.5' of https://git.mesalab.cn/nezha/nezha-fronted into dev-3.6 2023-06-28 14:35:06 +08:00
zhangyu
5c36266eea NEZ-2940 fix:Users模块重置2FA按钮缺少图标 2023-06-28 14:32:26 +08:00
zhangyu
f502b7a74f Merge branch 'dev-3.5' of https://git.mesalab.cn/nezha/nezha-fronted into dev-3.6 2023-06-27 15:25:04 +08:00
zhangyu
6a7db88f91 NEZ-2935 fix:告警规则页面,有效时间日期与新增时显示的不一致 2023-06-27 15:22:31 +08:00
zhangyu
4f30b66ba4 Merge branch 'dev-3.5' of https://git.mesalab.cn/nezha/nezha-fronted into dev-3.6
# Conflicts:
#	nezha-fronted/src/assets/css/common.scss
#	nezha-fronted/src/components/chart/chartList.vue
2023-06-27 14:43:59 +08:00
zhangyu
245c737b2c NEZ-2932 fix:Map of datacenter 全屏后Tooltip位置异常 2023-06-27 14:39:44 +08:00
zhangyu
cb4d0f3905 NEZ-2558 fix:当文件夹下文件及目录数量较大时,导致页面卡死 2023-06-21 18:05:03 +08:00
zyh
bb388bcfdd fix:修复el-message高度错误 2023-06-21 14:04:33 +08:00
zyh
14f78cef9e Merge branch 'dev-3.5' of git.mesalab.cn:nezha/nezha-fronted into dev-3.6 2023-06-21 13:44:40 +08:00
zyh
850f8d0f81 NEZ-2899 fix:Record rules复制Name过长数据时,自动补充错误 2023-06-21 13:41:13 +08:00
zyh
58dc677c8d NEZ-2898 fix:修复terminal select asset 未国际化 2023-06-21 10:39:54 +08:00
zyh
5f0b21be80 Merge branch 'dev-3.5' of git.mesalab.cn:nezha/nezha-fronted into dev-3.6 2023-06-20 11:32:10 +08:00
zyh
0116f915b4 NEZ-2887 fix:修复search input 查询条件显示有遮挡 2023-06-20 11:31:39 +08:00
zhangyu
aed1832ae9 Merge branch 'dev-3.5' of https://git.mesalab.cn/nezha/nezha-fronted into dev-3.6
# Conflicts:
#	nezha-fronted/src/components/common/mixin/exportHtml.js
2023-06-15 18:46:12 +08:00
zhangyu
2cee77db39 fix: 处理 快照因为网络波动导致的下载文件不全的问题 2023-06-15 18:29:33 +08:00
zhangyu
d2ef2a92cf NEZ-2688 fix:Explore使用快照后单位有误 2023-06-15 13:49:29 +08:00
zhangyu
7ace824b0b Merge branch 'dev-3.5' of https://git.mesalab.cn/nezha/nezha-fronted into dev-3.6
# Conflicts:
#	nezha-fronted/src/components/page/dashboard/explore/exploreItemHtml.vue
2023-06-15 13:45:25 +08:00
zhangyu
ed052e4f07 NEZ-2688 fix:Explore使用快照后单位有误 2023-06-15 11:43:36 +08:00
zhangyu
aa67176fd9 Merge branch 'dev-3.5' of https://git.mesalab.cn/nezha/nezha-fronted into dev-3.6 2023-06-15 10:52:06 +08:00
zhangyu
1007414e61 fix:处理chart-tooltip 单位显示不正确的问题 2023-06-15 10:50:13 +08:00
zhangyu
a2925a4e00 NEZ-2877 fix:修复单位为none时 处理数据null报错的问题 2023-06-15 10:44:58 +08:00
zyh
39ad58fb8e Merge branch 'dev-3.5' of git.mesalab.cn:nezha/nezha-fronted into dev-3.6 2023-06-14 15:26:45 +08:00
zyh
8ef46f1ac0 fix:修复tool表格prop为对象时 排序错误 2023-06-14 15:25:42 +08:00
zyh
5c58f6adb7 fix:explore 导出snapshot loading样式错误 2023-06-14 10:46:19 +08:00
zhangyu
a9e29ba327 Merge branch 'dev-3.5' of https://git.mesalab.cn/nezha/nezha-fronted into dev-3.6 2023-06-09 14:04:29 +08:00
zhangyu
a5f72d69e7 NEZ-2865 fix:chart-Group 内部chart移动时 chart-Group高度计算错误 导致dashboard错位 2023-06-09 14:03:16 +08:00
zhangyu
5f8fb7ea50 fix:修改 chartTemp 复制报错的问题 2023-06-09 11:10:42 +08:00
zyh
a956f8e88b fix:优化变量校验方式 2023-06-08 16:43:17 +08:00
zyh
d12fe9615f fix:解决冲突 2023-06-08 16:33:41 +08:00
zyh
045d1827c7 Merge branch 'dev-3.5' of git.mesalab.cn:nezha/nezha-fronted into dev-3.5 2023-06-08 16:14:58 +08:00
zyh
d83d832a9c NEZ-2862 fix:打开底部弹窗时 悬浮窗被遮挡 2023-06-08 16:14:45 +08:00
zhangyu
459d2246f0 Merge branch 'dev-3.5' of https://git.mesalab.cn/nezha/nezha-fronted into dev-3.6 2023-06-08 15:34:34 +08:00
zhangyu
feecf7956a NEZ-2860 fxi: Chart preview 时间范围错误 2023-06-08 15:33:35 +08:00
zhangyu
844772c937 NEZ-2860 fix:Chart preview 时间范围错误 2023-06-08 14:58:31 +08:00
zhangyu
c7cec9e908 NEZ-2858 fix:修改Endpoint 列表 Configuration 悬浮框 大小问题 2023-06-07 15:35:10 +08:00
zhangyu
ea908b658f Merge branch 'dev-3.5' of https://git.mesalab.cn/nezha/nezha-fronted into dev-3.6 2023-05-26 17:36:56 +08:00
zhangyu
d10fa8fc68 NEZ-2844 fix:Table chart, value mapping 配置 {{$value}} 显示空白,未显示正确值 2023-05-26 17:34:49 +08:00
zhangyu
24909e8358 Merge branch 'dev-3.5' of https://git.mesalab.cn/nezha/nezha-fronted into dev-3.6 2023-05-17 17:52:24 +08:00
zhangyu
c4d1b7013d NEZ-2827 fix:Dashboard 快照文件,将图表放大到某一时间段,Y轴 计算有误 2023-05-17 17:51:48 +08:00