chenjinsong
|
ef664be5ef
|
Merge remote-tracking branch 'origin/dev-3.1' into dev-3.1.1_theme
# Conflicts:
# nezha-fronted/src/assets/css/common.scss
# nezha-fronted/src/assets/css/common/tableCommon.scss
# nezha-fronted/src/assets/stylus/main.scss
# nezha-fronted/src/components/charts/chart-list.vue
# nezha-fronted/src/components/charts/logs.vue
# nezha-fronted/src/components/common/alert/alertLabel.vue
# nezha-fronted/src/components/common/alert/alertRuleInfo.vue
# nezha-fronted/src/components/common/bottomBox/bottomBox.vue
# nezha-fronted/src/components/common/bottomBox/tabs/endpointQuery.vue
# nezha-fronted/src/components/common/bottomBox/tabs/endpointQueryTab.vue
# nezha-fronted/src/components/common/bottomBox/tabs/logBottomTab.vue
# nezha-fronted/src/components/common/bottomBox/tabs/panelTabNew.vue
# nezha-fronted/src/components/common/detailView/list/alertRule/alertRuleDetail.vue
# nezha-fronted/src/components/common/detailView/list/asset/assetDetail.vue
# nezha-fronted/src/components/common/detailView/list/dc/dcDetail.vue
# nezha-fronted/src/components/common/detailView/list/endpoint/endpointDetail.vue
# nezha-fronted/src/components/common/detailView/list/module/moduleDetail.vue
# nezha-fronted/src/components/common/detailView/nzDetailView.vue
# nezha-fronted/src/components/common/detailView/view/detailViewRight.vue
# nezha-fronted/src/components/common/labelFilter/clickSearch.vue
# nezha-fronted/src/components/common/multipleTime.vue
# nezha-fronted/src/components/common/pickTime.vue
# nezha-fronted/src/components/common/popBox/topToolMoreOptions.vue
# nezha-fronted/src/components/common/project/L5/topoTooltip.vue
# nezha-fronted/src/components/common/project/popData/Info.vue
# nezha-fronted/src/components/common/rightBox/alertRuleBox.vue
# nezha-fronted/src/components/common/table/alert/alertRuleTable.vue
# nezha-fronted/src/components/common/table/alert/alertSilenceTable.vue
# nezha-fronted/src/components/common/table/settings/userTable.vue
# nezha-fronted/src/components/layout/header.vue
# nezha-fronted/src/components/page/alert/alertMessage.vue
# nezha-fronted/src/components/page/alert/nzAlertTag.vue
# nezha-fronted/src/components/page/asset/components/operation.vue
# nezha-fronted/src/components/page/config/mibBrowser.vue
# nezha-fronted/src/components/page/dashboard/explore/exploreItem.vue
# nezha-fronted/src/components/page/dashboard/explore/logTab.vue
# nezha-fronted/src/components/page/dashboard/explore/promqlInput.vue
# nezha-fronted/src/components/page/dashboard/overview/overview2.vue
# nezha-fronted/src/components/page/dashboard/panel.vue
|
2021-11-01 18:24:01 +08:00 |
|
chenjinsong
|
914c096463
|
NEZ-1072 feat: 主题切换
|
2021-11-01 17:23:01 +08:00 |
|
zhangyu
|
1decda6833
|
Merge branch 'dev-3.1' of https://git.mesalab.cn/nezha/nezha-fronted into dev-3.1
|
2021-11-01 16:47:27 +08:00 |
|
zhangyu
|
5d5106825b
|
NEZ-1108 fix：修改导入成功的样式
|
2021-11-01 16:46:12 +08:00 |
|
@changcode
|
7dfc34f9c2
|
NEZ-1145 fix: System node exporter alert nums页面存在两个悬浮框
|
2021-11-01 16:35:58 +08:00 |
|
zhangyu
|
de04725d50
|
NEZ-1103 fix；修改unkonw图例的颜色
|
2021-11-01 14:34:11 +08:00 |
|
zhangyu
|
03621ed884
|
fix：全屏 显示两个弹出层的问题
|
2021-11-01 14:27:10 +08:00 |
|
zhangyu
|
18d89a0917
|
Merge branch 'dev-3.1' of https://git.mesalab.cn/nezha/nezha-fronted into dev-3.1
|
2021-11-01 10:21:07 +08:00 |
|
zhangyu
|
8f1fc02629
|
fix： detail Log页面 添加滚动条
|
2021-11-01 10:20:47 +08:00 |
|
@changcode
|
91605a24db
|
NEZ-1144 fix: 修复endpoint - logs 有数据，显示 no data
|
2021-11-01 10:18:33 +08:00 |
|
zhangyu
|
0b99acc067
|
Merge branch 'dev-3.1' of https://git.mesalab.cn/nezha/nezha-fronted into dev-3.1
|
2021-11-01 09:57:54 +08:00 |
|
zhangyu
|
709f60062a
|
NEZ-1143 fix： Alert rule页面Expression输入框元素位置错误
|
2021-11-01 09:57:30 +08:00 |
|
@changcode
|
d52f671261
|
NEZ-1142 fix: 修复Asset页面元素超出边框
|
2021-11-01 09:39:42 +08:00 |
|
@changcode
|
d32811dc52
|
fix: 修复chartBox样式问题
|
2021-10-29 18:57:24 +08:00 |
|
@changcode
|
d89df0decd
|
NEZ-1138 style: 修复Module页面样式问题
|
2021-10-29 18:31:52 +08:00 |
|
zhangyu
|
f5ba781413
|
NEZ-1139 fix： Alert rule页面，Default snmptrap报警规则，查看报警页面一直显示加载中
|
2021-10-29 18:19:49 +08:00 |
|
zhangyu
|
df9e3bfb56
|
fix： 修改 snmp trap 双击显示图表的问题
|
2021-10-29 18:16:11 +08:00 |
|
zhangyu
|
0e23af525c
|
Merge branch 'dev-3.1' of https://git.mesalab.cn/nezha/nezha-fronted into dev-3.1
|
2021-10-29 18:12:56 +08:00 |
|
zhangyu
|
fc2cf74d1a
|
NEZ-1122 fix： Endpoint页面元素重合
|
2021-10-29 18:11:45 +08:00 |
|
@changcode
|
1a80248344
|
NEZ-1134 fix: 修复告警规则，新增告警规则页面未国际化
|
2021-10-29 16:25:29 +08:00 |
|
zhangyu
|
bde7b8708b
|
fix： 修复 panel 同比 时间显示错误的问题
|
2021-10-29 15:39:49 +08:00 |
|
zhangyu
|
20f423e2ab
|
NEZ-1135 fix； 图表中没有最下方的边框线
|
2021-10-29 15:24:03 +08:00 |
|
zhangyu
|
560c3c3a61
|
Merge branch 'dev-3.1' of https://git.mesalab.cn/nezha/nezha-fronted into dev-3.1
|
2021-10-29 14:54:11 +08:00 |
|
zhangyu
|
457370b743
|
NEZ-1128 fix: Alert message-报警信息查看页面，点击Custom time range，没有弹出选择时间控件
|
2021-10-29 14:53:38 +08:00 |
|
@changcode
|
7f461338f9
|
NEZ-1131 style: Disk partition free space页面元素不对齐
|
2021-10-29 14:53:31 +08:00 |
|
@changcode
|
950b54381b
|
style: select 选择器样式调整
|
2021-10-29 14:25:59 +08:00 |
|
zhangyu
|
7108810a36
|
Merge branch 'dev-3.1' of https://git.mesalab.cn/nezha/nezha-fronted into dev-3.1
|
2021-10-29 14:16:19 +08:00 |
|
zhangyu
|
ed40692867
|
NEZ-1127 fix： 添加未选中的置灰效果
|
2021-10-29 14:16:04 +08:00 |
|
@changcode
|
47d1863111
|
style: 优化select公用样式，及类名
|
2021-10-29 12:02:34 +08:00 |
|
@changcode
|
863d88d7d3
|
NEZ-1125 fix: 修复datacenter 详情 tooltip cabinet 显示错误
|
2021-10-29 12:01:35 +08:00 |
|
zhangyu
|
764e45c348
|
NEZ-1123 fix： Endpoint页面元素超出边框
|
2021-10-29 11:38:01 +08:00 |
|
zhangyu
|
e12e4eb4b6
|
NEZ-1132 fix: Alert silence页面，Matcher字段太长的数据显示问题
|
2021-10-29 11:17:11 +08:00 |
|
zhangyu
|
eb60e5dde0
|
NEZ-1124 fix:Endpoint英文页面提示信息为中文
|
2021-10-29 10:59:00 +08:00 |
|
zhangyu
|
1174dd58c2
|
NEZ-1122 fix：chanrtBox页面元素重合
|
2021-10-29 10:58:41 +08:00 |
|
@changcode
|
d0397a64eb
|
NEZ-986 fix: 修复分屏时Query和Save chart字段显示问题
|
2021-10-29 10:20:13 +08:00 |
|
@changcode
|
7d1bef73a1
|
fix: module info鼠标悬浮框，没有数据时不展示悬浮框，增加报错提示
|
2021-10-29 09:52:17 +08:00 |
|
@changcode
|
ab87e01394
|
style: table列表样式调整
|
2021-10-28 17:53:27 +08:00 |
|
zhangyu
|
43df1e0170
|
NEZ-1104 fix：根据当前所选择模块灵活分割
|
2021-10-28 16:59:46 +08:00 |
|
zhangyu
|
af5bfc6d47
|
Merge branch 'dev-3.1' of https://git.mesalab.cn/nezha/nezha-fronted into dev-3.1
# Conflicts:
# nezha-fronted/src/components/page/dashboard/chartBox.vue
|
2021-10-28 16:59:05 +08:00 |
|
zhangyu
|
90346ba198
|
NEZ-1121 fix；鼠标放在图例文字上，文字显示问题
|
2021-10-28 16:58:09 +08:00 |
|
@changcode
|
9acb8c0b5d
|
fix: 修复el-popover trigger 触发
|
2021-10-28 16:54:03 +08:00 |
|
@changcode
|
b0765eeb62
|
NEZ-1119 fix: 修复user 详细视图 - terminal log state 缺少图标
|
2021-10-28 16:43:57 +08:00 |
|
@changcode
|
09aaf4c787
|
NEZ-1105 fix: module info 页面调整
|
2021-10-28 16:03:32 +08:00 |
|
@changcode
|
6186a61295
|
NEZ-1112 fx: 修复panel loading 缺少样式
|
2021-10-28 15:16:57 +08:00 |
|
zhangyu
|
4ad34eebf1
|
fix： Endpoint页面显示的为“|-”和“!-”，选中之后显示的为“|~”和“!~”
|
2021-10-28 15:10:56 +08:00 |
|
zhangyu
|
a6dc8e5d45
|
NEZ-1117 fix; Endpoint页面显示的为 “ |- ” 和 “ !- ”，选中之后显示的为 “ |~ ” 和 “ !~ ”
|
2021-10-28 15:06:47 +08:00 |
|
zhangyu
|
5510b84b73
|
fix：roles name 显示保持原有逻辑
|
2021-10-28 14:21:52 +08:00 |
|
zhangyu
|
a4845f13e6
|
NEZ-1116 fix： Asset model页面设置默认列设置后页面有空白
|
2021-10-28 14:13:37 +08:00 |
|
zhangyu
|
5c58986971
|
NEZ-1115 fix：Alert silence页面设置默认列设置后页面有空白
|
2021-10-28 14:13:14 +08:00 |
|
zhangyu
|
27135d7cd9
|
Merge branch 'dev-3.1' of https://git.mesalab.cn/nezha/nezha-fronted into dev-3.1
|
2021-10-28 14:01:23 +08:00 |
|