Commit Graph

3566 Commits

Author SHA1 Message Date
@changcode
bbe760999d style: 样式调整 2021-10-25 14:45:28 +08:00
zhangyu
5c4f98fb2b Merge branch 'dev-3.1' of https://git.mesalab.cn/nezha/nezha-fronted into dev-3.1 2021-10-25 14:42:33 +08:00
zhangyu
60740b3e2b feat:alertMessage 添加组合筛选 2021-10-25 14:42:21 +08:00
@changcode
05c837be66 NEZ-1077 fix: panel 输入搜索条件 ,没有符合条件chart nodata样式 2021-10-25 14:38:43 +08:00
@changcode
989d464e8f fix: Metrics 补充nodata样式 2021-10-25 11:09:34 +08:00
@changcode
2351baa8f3 fix: 列表no data样式展示异常问题 2021-10-22 19:39:49 +08:00
zhangyu
fa2da5a3c1 Merge branch 'dev-2.0' of https://git.mesalab.cn/nezha/nezha-fronted into dev-3.1
# Conflicts:
#	nezha-fronted/src/components/common/language/cn.js
#	nezha-fronted/src/components/common/language/en.js
2021-10-22 18:08:37 +08:00
@changcode
015edf87af Merge branch 'dev-2.0' of https://git.mesalab.cn/nezha/nezha-fronted into dev-2.0
# Conflicts:
#	nezha-fronted/src/components/common/project/topologyL5.vue
2021-10-22 17:50:15 +08:00
@changcode
ad8bef81ec NEZ-1075 feat: state 样式调整 2021-10-22 17:47:42 +08:00
zhangyu
ea17306e22 style: propject Nodata 样式调整 2021-10-22 15:59:32 +08:00
zhangyu
789a5b8787 feat: project Topo 添加 noData 2021-10-22 15:16:06 +08:00
zhangyu
9974d42038 fix: 刷新事件添加防抖 2021-10-22 10:32:04 +08:00
zhangyu
ede38e6627 fix:修改 termailLog的图标 以及显示 2021-10-22 09:55:57 +08:00
zhangyu
f7f7c8bb5e Merge branch 'dev-2.0' of https://git.mesalab.cn/nezha/nezha-fronted into dev-3.1 2021-10-22 09:47:57 +08:00
@changcode
8d0f1cd5ba NEZ-1073 feat: asset 编辑页面 state 下拉框显示 remark 内容 2021-10-21 18:37:35 +08:00
zhangyu
1eb9a59bd4 NEZ-1071 feat:terminal log state 改为图标 2021-10-21 18:12:07 +08:00
zhangyu
b1d1c74c9e feat:user 添加详细视图 2021-10-21 14:20:48 +08:00
zhangyu
b3c4fc50ed feat: terminalog添加详细视图 2021-10-21 14:04:07 +08:00
zhangyu
d29a3dd3c9 Merge branch 'dev-2.0' of https://git.mesalab.cn/nezha/nezha-fronted into dev-3.1
# Conflicts:
#	nezha-fronted/src/components/common/bottomBox/tabs/endpointQuery.vue
#	nezha-fronted/src/components/common/bottomBox/tabs/panelTabNew.vue
2021-10-21 10:05:37 +08:00
zhangyu
1e017d3060 feat:dc添加详细视图 优化module 以及 alertRule的显示 2021-10-21 10:04:01 +08:00
@changcode
cf1f83dcba style: asset,endpoint 底部二级菜单,detail,Metrcs 样式调整 2021-10-20 16:22:19 +08:00
zhangyu
1e75f7bc70 Merge branch 'dev-2.0' of https://git.mesalab.cn/nezha/nezha-fronted into dev-3.1 2021-10-20 14:53:28 +08:00
zhangyu
4894e2665d fix;修改 module 详细视图的显示 2021-10-20 14:45:35 +08:00
@changcode
e7b7f5ef8f fix: 折叠问题恢复 2021-10-20 14:40:53 +08:00
@changcode
4c8bb83fea style: panel,折叠调整 2021-10-20 14:33:01 +08:00
zhangyu
3e6b7c0c14 Merge branch 'dev-2.0' of https://git.mesalab.cn/nezha/nezha-fronted into dev-3.1 2021-10-20 14:06:22 +08:00
zhangyu
0af8411ae6 feat;module 添加详细视图 2021-10-20 14:05:41 +08:00
@changcode
db2b34e40c fix: asset 二级detail折叠展示问题 2021-10-20 13:59:21 +08:00
zhangyu
b0f366f292 fix:修改 endpoint 详细视图页面 下方显示 asset的manageIp 2021-10-20 13:46:14 +08:00
chenjinsong
5f6b8ae550 NEZ-1069 perf: detail图表空数据的tab不显示 2021-10-20 11:45:31 +08:00
@changcode
b05240855a style: explore页面,chartBox 下拉 select-panel 选择器样式调整 2021-10-20 09:40:52 +08:00
zhangyu
73d8dda215 style:endpoint 样式调整 2021-10-19 18:11:03 +08:00
zhangyu
448b0f7adc fix: 切换详细视图时 未默认选中第一条的问题 2021-10-19 14:54:35 +08:00
zhangyu
15f8ab4a40 fix:修改 chart-group 默认折叠 打开后 图表x轴刻度不对的问题 2021-10-19 11:37:09 +08:00
zhangyu
0d6ca0015a feat:endpoint 复用详细视图 2021-10-19 10:55:54 +08:00
zhangyu
c4183fddbf fix: 修改endpoint 的搜索条件 2021-10-19 10:18:11 +08:00
zhangyu
c362cf7a2d Merge branch 'dev-2.0' of https://git.mesalab.cn/nezha/nezha-fronted into dev-3.1 2021-10-19 09:48:26 +08:00
zhangyu
ab61f75347 Merge branch 'dev-2.0' of https://git.mesalab.cn/nezha/nezha-fronted into dev-3.1 2021-10-19 09:47:35 +08:00
@changcode
945332a931 style: endpointBox 页面select选择器样式调整 2021-10-18 17:51:32 +08:00
zhangyu
52e2b262fa Merge branch 'dev-3.1' of https://git.mesalab.cn/nezha/nezha-fronted into dev-3.1
# Conflicts:
#	nezha-fronted/src/components/common/detailView/nzDetailView.vue
2021-10-18 17:41:24 +08:00
zhangyu
42854089b9 fix: 修改 顶部搜索样式 2021-10-18 17:40:21 +08:00
@changcode
a2a0565bfe NEZ-1064 fix: module & endpoint protocol字段 http,https 可以相互切换 2021-10-18 17:06:08 +08:00
@changcode
ab23aaab3b style: 新增asset deail页面select下拉选择器样式调整 2021-10-18 16:34:37 +08:00
zhangyu
2c0d6dbf93 fix:修改 切换选中的详细视图时 tab选中未切换为detail的问题 2021-10-18 15:19:46 +08:00
zhangyu
b540623a98 Merge branch 'dev-2.0' of https://git.mesalab.cn/nezha/nezha-fronted into dev-3.1 2021-10-18 14:55:37 +08:00
zhangyu
c2267a983d fix:修改asset 详细视图切换时 没有保存分页信息,修改endpoint 搜索部分的数据来源 2021-10-18 14:55:16 +08:00
@changcode
8649ccd9c0 style: 底部box去除多余样式 2021-10-18 11:53:34 +08:00
@changcode
e5b0cc7be4 style: 底部Box样式调整 2021-10-18 11:10:34 +08:00
zhangyu
c8ec5b48ea Merge branch 'dev-2.0' of https://git.mesalab.cn/nezha/nezha-fronted into dev-3.1 2021-10-15 18:12:34 +08:00
@changcode
13baea54b4 style cabinet 样式调整 2021-10-15 18:08:35 +08:00