zhangyu
|
bb7a7f120f
|
Merge branch 'dev-3.6' of https://git.mesalab.cn/nezha/nezha-fronted into dev-3.7
# Conflicts:
# nezha-fronted/src/components/layout/header.vue
# nezha-fronted/src/store/user.js
|
2023-03-10 13:48:00 +08:00 |
|
zhangyu
|
f6b3def6b4
|
NEZ-2665 fix： 用户在使用自己账号操作时切换为admin账号，登录后会自动跳转至用户账号当前操作界面
|
2023-03-10 13:46:39 +08:00 |
|
likexuan
|
284904848e
|
Merge branch 'dev-3.6' into dev-3.7
|
2023-03-10 11:51:51 +08:00 |
|
likexuan
|
10e612fb39
|
NEZ-2672 fix: Data centers通过二级页面新建或删除数据导致界面样式出错
|
2023-03-10 11:49:29 +08:00 |
|
likexuan
|
cfeefcdcf2
|
NEZ-2669 fix: 通过二级页面删除数据时，数据成功删除但界面仍然显示数据
|
2023-03-10 10:55:43 +08:00 |
|
zhangyu
|
bb69697cac
|
Merge branch 'dev-3.6' of https://git.mesalab.cn/nezha/nezha-fronted into dev-3.7
|
2023-03-10 10:47:55 +08:00 |
|
zhangyu
|
c203161321
|
NEZ-2671 fix：Data centers通过Graph查看时Location过长换行后遮挡Cabinet
|
2023-03-10 10:47:23 +08:00 |
|
zhangyu
|
f116b82944
|
NEZ-2671 fix：Data centers通过Graph查看时Location过长换行后遮挡Cabinet
|
2023-03-10 10:37:42 +08:00 |
|
zhangyu
|
d992955f3a
|
Merge branch 'dev-3.7' of https://git.mesalab.cn/nezha/nezha-fronted into dev-3.7
|
2023-03-10 09:58:47 +08:00 |
|
zhangyu
|
03299279de
|
NEZ-2665 fix： 用户在使用自己账号操作时切换为admin账号，登录后会自动跳转至用户账号当前操作界面
|
2023-03-10 09:58:08 +08:00 |
|
zyh
|
12d8f3f5b4
|
fix：删除无用代码
|
2023-03-10 09:44:30 +08:00 |
|
zyh
|
5f7909365f
|
fix：退出登录清除session
|
2023-03-10 09:05:36 +08:00 |
|
zyh
|
362b2f5863
|
fix：退出登录 直接返回登录页面
|
2023-03-09 18:06:45 +08:00 |
|
zyh
|
9aada00e4f
|
fix：bug定位
|
2023-03-09 17:25:29 +08:00 |
|
zhangyu
|
36dc0b17da
|
Merge branch 'dev-3.6' of https://git.mesalab.cn/nezha/nezha-fronted into dev-3.7
|
2023-03-09 16:33:20 +08:00 |
|
zhangyu
|
252d370eb8
|
NEZ-2665 fix： 退出登录 直接返回登录页面
|
2023-03-09 16:30:41 +08:00 |
|
likexuan
|
b318337fd1
|
NEZ-2653 fix: Asset list新建时选择父资产后必填项提示信息为消失
|
2023-03-09 16:03:03 +08:00 |
|
zyh
|
6f9d444cff
|
Merge branch 'dev-3.5' of git.mesalab.cn:nezha/nezha-fronted into dev-3.6
|
2023-03-09 15:31:37 +08:00 |
|
zyh
|
3404837fd4
|
NEZ-2668 fix：Log条数改变后 重新请求数据
|
2023-03-09 15:31:06 +08:00 |
|
zhangyu
|
43ad9ef746
|
NEZ-2649 fix： project topo 重构
|
2023-03-09 15:20:09 +08:00 |
|
likexuan
|
fa5e14dddb
|
NEZ-2655: fix: Asset list引用父资产下拉框样式过宽
|
2023-03-09 10:56:17 +08:00 |
|
zhangyu
|
582c3bcefa
|
Merge branch 'dev-3.6' of https://git.mesalab.cn/nezha/nezha-fronted into dev-3.7
|
2023-03-09 09:38:55 +08:00 |
|
zhangyu
|
9ca385b3db
|
NEZ-2659 fix： 补充导出的 type参数
|
2023-03-09 09:37:39 +08:00 |
|
zhangyu
|
87f9faf836
|
Merge branch 'dev-3.7' of https://git.mesalab.cn/nezha/nezha-fronted into dev-3.7
|
2023-03-09 09:15:51 +08:00 |
|
zhangyu
|
93a6d552e7
|
style：样式调整
|
2023-03-09 09:15:10 +08:00 |
|
zyh
|
f06a2157af
|
Merge branch 'dev-3.7' of git.mesalab.cn:nezha/nezha-fronted into dev-3.7
|
2023-03-08 18:15:06 +08:00 |
|
zyh
|
dac18d4e25
|
fix：解决冲突
|
2023-03-08 18:14:51 +08:00 |
|
zyh
|
221deef8a0
|
NEZ-2663 fix：统一快照样式
|
2023-03-08 17:56:28 +08:00 |
|
zyh
|
531683ac1c
|
NEZ-2662 asset，endpoint dashboard导出选项不支持 all data
|
2023-03-08 17:29:25 +08:00 |
|
zhangyu
|
04b6b58b80
|
NEZ-2649 feat：project topo 重构
|
2023-03-08 17:25:00 +08:00 |
|
zyh
|
95918356eb
|
NEZ-2658 fix：explore 时间选择器z-index错误
|
2023-03-08 16:46:35 +08:00 |
|
zyh
|
06f4c571ad
|
NEZ-2657 Asset list批量修改SNMP时 资产查询参数snmpEnable为1
|
2023-03-08 16:13:08 +08:00 |
|
zyh
|
d56025d240
|
NEZ-2651 fix：group 类型编辑时，类型不允许修改
|
2023-03-08 14:43:28 +08:00 |
|
zyh
|
846651c4f7
|
Merge branch 'dev-3.7' of git.mesalab.cn:nezha/nezha-fronted into dev-3.7
|
2023-03-08 11:33:42 +08:00 |
|
zyh
|
f15c264bf0
|
NEZ-2650 fix：Integration configuration markdown 样式错误
|
2023-03-08 11:33:33 +08:00 |
|
likexuan
|
a18aaab3e5
|
NEZ-2654 fix: 底部二级页面 分页 样式问题
|
2023-03-08 11:07:47 +08:00 |
|
zyh
|
eeb4ef0e35
|
Merge branch 'dev-3.7' of git.mesalab.cn:nezha/nezha-fronted into dev-3.7
|
2023-03-07 17:47:39 +08:00 |
|
zyh
|
8c06fcb6d4
|
fix：解决冲突
|
2023-03-07 17:47:23 +08:00 |
|
zhangyu
|
f7c770c944
|
Merge branch 'dev-3.7' of https://git.mesalab.cn/nezha/nezha-fronted into dev-3.7
|
2023-03-07 17:45:04 +08:00 |
|
zhangyu
|
ced635e609
|
NEZ-2649 feat： 添加方式修改 以及编辑全屏
|
2023-03-07 17:44:38 +08:00 |
|
zyh
|
a22a246dbe
|
perf：修改Automatic installation下拉框样式
|
2023-03-07 17:37:48 +08:00 |
|
likexuan
|
cce184cfd2
|
NEZ-2643 fix: 查看按钮 二级页面点击删除页面无法同步更新
|
2023-03-07 17:02:24 +08:00 |
|
zyh
|
8c80cce062
|
NEZ-2648 fix：开关扩展菜单导致chart样式错误
|
2023-03-07 16:42:03 +08:00 |
|
zhangyu
|
b2650f6675
|
NEZ-2646 fix：开启Repeat勾选样式错误,首次打开时半选状态没回显
|
2023-03-07 16:06:28 +08:00 |
|
zhangyu
|
a27c1fcabd
|
NEZ-2644 fix： chart频繁出现设置自定义时间点击无效果现象
|
2023-03-07 16:05:22 +08:00 |
|
likexuan
|
4fd3b76f7f
|
NEZ-2633 feat: 角色列表增加查看按钮
|
2023-03-07 15:51:02 +08:00 |
|
likexuan
|
c82846d7d2
|
NEZ-2642 fix: 搜索下拉框样式有误
|
2023-03-07 15:20:17 +08:00 |
|
zhangyu
|
21630e6a92
|
NEZ-2614 style： 样式修改
|
2023-03-07 14:44:05 +08:00 |
|
zhangyu
|
b758626f6b
|
style： 样式调整
|
2023-03-07 11:28:16 +08:00 |
|
zhangyu
|
3e32c3c322
|
Merge branch 'dev-3.7' of https://git.mesalab.cn/nezha/nezha-fronted into dev-3.7
|
2023-03-07 10:32:16 +08:00 |
|