Commit Graph

2018 Commits

Author SHA1 Message Date
zhangyu
4c64c41342 feat:修改 asset 的 loading 2022-03-25 14:30:24 +08:00
zhangyu
69f061d868 Merge branch 'dev-3.2' of https://git.mesalab.cn/nezha/nezha-fronted into dev-3.3
# Conflicts:
#	nezha-fronted/src/components/charts/chartDataFormat.js
2022-03-25 14:28:07 +08:00
zhangyu
5b276cf845 NEZ-1735 fix: 部分内容未进行国际化显示 2022-03-25 14:12:03 +08:00
zhangyu
72cca3e3c6 fix: opearationLog terminalLog 默认 id 倒序 2022-03-25 09:52:05 +08:00
zhangyu
235411cbe8 Merge branch 'dev-3.2' of https://git.mesalab.cn/nezha/nezha-fronted into dev-3.3 2022-03-25 09:22:18 +08:00
zhangyu
b0c2dd6a83 fix:补充国际化 2022-03-24 16:37:44 +08:00
zhangyu
9e00d50795 Merge branch 'dev-3.2' of https://git.mesalab.cn/nezha/nezha-fronted into dev-3.3
# Conflicts:
#	nezha-fronted/src/components/chart/chart/chartGauge.vue
#	nezha-fronted/src/components/chart/chart/chartHexagonD3.vue
2022-03-24 13:40:37 +08:00
zhangyu
f636b2ed5e Merge branch 'dev-3.2' of https://git.mesalab.cn/nezha/nezha-fronted into dev-3.2 2022-03-24 09:55:20 +08:00
zhangyu
a2cd704d14 fix:修复 因为路由改变跳转的问题 2022-03-24 09:52:47 +08:00
@changcode
e2e7eaec2a fix: 修复 exploreItem 分页报错,projects 点击列表跳转页面, 初始获取路由为null报错 2022-03-24 09:46:14 +08:00
zhangyu
13b52158fd fix:修稿 endpoint 路由 2022-03-23 18:10:26 +08:00
zhangyu
bd259fd291 fix:修改 project module endpoint 的路由 2022-03-23 18:08:00 +08:00
zhangyu
be54a0d868 NEZ-1729 fix:开启2FA登录后再次开启第二个窗口后界面出错 2022-03-23 17:33:11 +08:00
@changcode
44c76c11b6 fix: asset ,endpoint 详情信息 info 列表,告警列统一 2022-03-23 16:27:59 +08:00
zhangyu
261b3369d9 Merge branch 'dev-3.2' of https://git.mesalab.cn/nezha/nezha-fronted into dev-3.3
# Conflicts:
#	nezha-fronted/src/components/common/bottomBox/tabs/alertMessageTabNew.vue
2022-03-23 15:18:55 +08:00
zhangyu
1e7b1da349 NEZ-1708 fix:Chart templates点击删除图表模板按钮后弹窗后点击取消浏览器报错,再次点击删除按钮失效 2022-03-23 15:06:36 +08:00
@changcode
8c26da6426 fix: asset Label国际化调整,MIB 下拉框样式调整 2022-03-23 14:15:57 +08:00
zhangyu
88e3553c51 NEZ-1692 fix:修改 state为All 时 删除接口报错的问题 2022-03-23 10:56:43 +08:00
zhangyu
b629ef4d89 NEZ-1708 fix:Chart templates点击删除图表模板按钮后弹窗后点击取消浏览器报错,再次点击删除按钮失效 2022-03-22 15:42:50 +08:00
zhangyu
907f361813 NEZ-1705 fix:告警图表同时开启之前时间与堆栈图后查看图表界面显示数据出错 2022-03-22 15:32:07 +08:00
zhangyu
ae02ca76c9 fix: web terminal connect 页面按钮点击无效 2022-03-22 15:10:16 +08:00
zhangyu
9f328129cc NEZ-1713 fix:web terminal connect 页面按钮点击无效 2022-03-22 15:07:22 +08:00
zhangyu
ebfe1a3294 feat: 上传图标 2022-03-18 18:21:43 +08:00
zhangyu
8ae0bd5554 Merge branch 'dev-3.2' of https://git.mesalab.cn/nezha/nezha-fronted into dev-3.3 2022-03-18 18:10:15 +08:00
@changcode
838c2a68e9 fix: IPAM 和 IPAM IP 二级页面列表默认排序高亮 2022-03-18 17:17:06 +08:00
@changcode
01e1c5dcc7 fix: 补充默认排序高亮选中 2022-03-18 17:11:49 +08:00
zhangyu
c832255f16 Merge branch 'dev-3.2' of https://git.mesalab.cn/nezha/nezha-fronted into dev-3.3 2022-03-18 14:17:16 +08:00
zhangyu
6b7762723b NEZ-1702 fix:alert silence 时间选择出错 2022-03-18 14:15:46 +08:00
zhangyu
628c20745d Merge branch 'dev-3.2' of https://git.mesalab.cn/nezha/nezha-fronted into dev-3.3 2022-03-18 10:35:41 +08:00
zhangyu
59caca3416 fix:修改 lincense。id报错的问题 2022-03-18 10:26:36 +08:00
zhangyu
1fd9595a83 Merge branch 'dev-3.2' of https://git.mesalab.cn/nezha/nezha-fronted into dev-3.3 2022-03-18 09:39:48 +08:00
zhangyu
fb6f94b666 NEZ-1695 fix: Explore保存图表后无法实现跳转 2022-03-18 09:39:04 +08:00
zhangyu
430b8b1dce fix:aseet 添加关系图(20%) 2022-03-17 16:42:56 +08:00
@changcode
95dbe1ad95 NEZ-1691 fix: 个人详情页面报错 2022-03-16 16:11:06 +08:00
@changcode
4a7cd59b66 style: licenseGen页面样式调整 2022-03-16 14:30:25 +08:00
@changcode
d4849d6d9c fix: licenseGen 页面增加表单验证,修复生产证书报错问题 2022-03-16 14:18:22 +08:00
zhangyu
d2b5edf2ec fix:修改上传 2022-03-16 09:45:59 +08:00
@changcode
e0b4224068 fix: 修复model列表页 type 数据为空时报错 2022-03-15 18:43:22 +08:00
@changcode
3d81733d7a NEZ-1675 feat: license签发界面开发 2022-03-15 18:40:13 +08:00
@changcode
ce8e3e8b74 feat: license签发界面 2022-03-15 18:06:40 +08:00
zhangyu
274015ecf1 Merge branch 'dev-3.2' of https://git.mesalab.cn/nezha/nezha-fronted into dev-3.3 2022-03-14 16:23:16 +08:00
zhangyu
26a1999bf5 fix:登录页面样式调整, ‘sys/license/token’ 接口导出的文件名 从返回头部获取 2022-03-14 13:47:37 +08:00
@changcode
8b0a334dde NEZ-1664 feat: asset model 新增补充 2022-03-11 18:16:07 +08:00
zhangyu
370158176c NEZ-1658 fix:Explore导出logs日志时,选择不同条数导出数量是一样的 2022-03-11 14:51:59 +08:00
@changcode
878207d722 feat: asset model 增加 type,sysObjectId 2022-03-11 14:26:14 +08:00
zhangyu
5a478fbffe fix:修改panel lock 刷新就panel 就重置的问题 2022-03-11 10:45:19 +08:00
zhangyu
b0c23d1f03 fix:处理控制台报错 2022-03-10 16:55:49 +08:00
zhangyu
dfec693d0f fix:修改 同步 group内的图表 未刷新页面的问题 2022-03-10 16:51:51 +08:00
zhangyu
c503d90326 fix:修改 同步功能的无效的问题 2022-03-10 11:31:48 +08:00
zhangyu
fed995571b fix:页面报错处理 2022-03-10 11:08:40 +08:00