gfwleak/nezha-nezha-fronted
Archived
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
4,724 Commits 31 Branches 139 Tags
2c91184bb0421d4e9d42734675ea2ca8a0fee3d7
Commit Graph

505 Commits

Author SHA1 Message Date
zhangyu
2c91184bb0 Merge branch 'dev-3.2' of https://git.mesalab.cn/nezha/nezha-fronted into dev-3.3 
# Conflicts:
#	.gitignore
#	nezha-fronted/src/assets/css/font/iconfont.js
#	nezha-fronted/src/components/chart/chart/chartAutotopology.vue
#	nezha-fronted/src/components/common/ChartDiagram/diagram.vue
#	nezha-fronted/src/components/common/detailView/view/detailViewRight.vue
#	nezha-fronted/src/components/common/js/common.js
#	nezha-fronted/src/components/common/js/tools.js
#	nezha-fronted/src/components/common/project/topologyL5.vue
#	nezha-fronted/static/config.json
 2022-07-14 10:19:06 +08:00
zhangyu
73b71d578f fix：修改 topology 源码 删除创建的节点以及给节点创建的对应的事件 2022-07-14 09:55:10 +08:00
zhangyu
44ce3beabd fix：详细视图 鼠标滑过被选中的item 右侧闪烁的问题 2022-07-06 17:49:53 +08:00
zhangyu
9f932b5c4c NEZ-1984 fix： 限制 alertRule Evaluation interval 为 15 s - 24h 2022-06-27 17:35:24 +08:00
zhangyu
8010406cd1 fix：删除重复国际化数据 2022-06-21 18:14:21 +08:00
zhangyu
a874bfa87b fix： 去除 重复国际化 2022-06-21 14:17:46 +08:00
zhangyu
0a6aa58ad3 fix：删除部分重复国际化 2022-06-21 11:29:55 +08:00
zhangyu
0202f5f3c4 fix：黑色主题下 禁用样式优化 2022-06-17 16:32:37 +08:00
zhangyu
ce2c78f6af NEZ-1946 fix：添加退出底部弹窗的事件 2022-06-17 14:02:55 +08:00
zhangyu
6bbb441769 fix：chartTemp 删空后 最后一个元素未正确删除 以及 底部弹窗不消失 2022-06-17 13:58:36 +08:00
zhangyu
c935039807 fix：国际化修改 2022-06-17 10:39:36 +08:00
zhangyu
e65f37b5b5 fix：处理中英文完全一样的国际化为一个 2022-06-16 15:58:17 +08:00
zhangyu
4008b96d36 NEZ-1930 fix： 底弹框 切换数据源未删除搜索条件 2022-06-15 14:04:03 +08:00
zhangyu
4b8edd2f12 NEZ-1913 fix：Data Centers模块使用Asset的Graph功能没有效果 2022-06-09 17:28:25 +08:00
zhangyu
86018c5be5 NEZ-1901 fix：Models内对asset利用State条件搜索时无法搜索到内容 2022-06-08 14:18:09 +08:00
zhangyu
9e00620e12 style:快照图标更换 2022-06-06 10:38:57 +08:00
zhangyu
b06f8bc962 fix：添加国际化 以及添加导出html的功能 2022-05-27 09:37:57 +08:00
zhangyu
9781bf619c fix：添加导出html的按钮 2022-05-27 09:29:59 +08:00
zhangyu
f14d2a5bb8 NEZ-1788 feat：联调后端接口 2022-05-24 15:04:46 +08:00
zhangyu
ab7fbbc1a2 fix：alertMessage 添加 allTime 2022-05-13 10:50:31 +08:00
likexuan
c32683b173 NEZ-1849 feat ：alert message列表页面 增加 acknowledge 状态及按钮 2022-05-07 11:16:17 +08:00
zhangyu
9914919747 NEZ-1787 feat： 时间选择器组件 优化 2022-04-24 18:02:26 +08:00
zhangyu
ca432d5962 NEZ-1832 f ix：修改asset logs 二级页面 时间参数错误 2022-04-22 10:04:59 +08:00
zhangyu
07accb61c0 Merge branch 'dev-3.2' of https://git.mesalab.cn/nezha/nezha-fronted into dev-3.3 
# Conflicts:
#	nezha-fronted/src/components/chart/panelChart.vue
 2022-04-20 09:38:03 +08:00
zhangyu
12f996555f fix： 删除console 2022-04-20 09:35:27 +08:00
zhangyu
8a822b94d7 Merge branch 'dev-3.2' of https://git.mesalab.cn/nezha/nezha-fronted into dev-3.3 
# Conflicts:
#	.gitlab-ci.yml
 2022-04-15 16:30:28 +08:00
zhangyu
9c5df8a354 fix：修改导出pdf的文件名 2022-04-15 16:29:23 +08:00
zhangyu
e0aed5d4f8 fix：修改 底部弹窗 传递id的方法 2022-04-13 18:14:08 +08:00
zhangxiaolong
52fbff49e2 fix : 时间选择器历史记录绑定修改 2022-04-13 17:09:59 +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
8f4df97372 style：修改 导出pdf的图标 2022-04-12 18:07:42 +08:00
zhangyu
c56b81f1c7 style：修改导出pdf的图标 2022-04-12 17:19:51 +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
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
03ebb14aff feat：panel底弹窗添加导出pdf 2022-04-11 17:54:38 +08:00
zhangyu
5db1c00f13 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
#	nezha-fronted/src/components/page/alert/alertMessage.vue
 2022-04-01 17:58:57 +08:00
zhangyu
6b52404d47 fix：修改 告警类型为日志的查看不了的问题 2022-04-01 16:21:47 +08:00
zhangyu
9c4e2a9525 feat：alertMessage 添加 info 2022-04-01 15:43:14 +08:00
zhangyu
b2ec953c95 Merge branch 'dev-3.2' of https://git.mesalab.cn/nezha/nezha-fronted into dev-3.3 2022-03-28 14:24:34 +08:00
zhangyu
5c4b263809 NEZ-1740 fix：告警列 最近告警柱形图 根据 告警数量显示不同高度 2022-03-28 10:42:31 +08:00
zhangyu
12970ab5a2 Merge branch 'dev-3.2' of https://git.mesalab.cn/nezha/nezha-fronted into dev-3.3 2022-03-25 17:43:17 +08:00
zhangyu
4e343d7137 fix: 修改 值为 “0” 对取最大值的影响 2022-03-25 16:37:24 +08:00
@changcode
b1e4745909 NEZ-1739 feat: 补充loading 动画 2022-03-25 15:40:05 +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
@changcode
44c76c11b6 fix: asset ，endpoint 详情信息 info 列表,告警列统一 2022-03-23 16:27:59 +08:00
zhangyu
5ab9c33ddd fix：解决冲突 2022-03-23 15:20:58 +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