Commit Graph

53 Commits

Author SHA1 Message Date
zhangyu
e68546dc54 fix: 修改 仪表盘 不显示的问题,以及 endpointQuery的全屏的新增 2021-12-23 15:44:27 +08:00
zhangyu
18051f644d feat:bottom alertMessage 替换图表组件 2021-12-23 14:15:22 +08:00
chenjinsong
7581b30f2c Merge remote-tracking branch 'origin/dev-3.1' into dev-3.2
# Conflicts:
#	nezha-fronted/src/assets/css/common/rightBoxCommon.scss
#	nezha-fronted/src/assets/css/components/common/project/topology.scss
#	nezha-fronted/src/components/common/bottomBox/tabs/chartTempPreview.vue
#	nezha-fronted/src/components/common/bottomBox/tabs/panelTabNew.vue
#	nezha-fronted/src/components/common/bottomBox/tabs/terminalLogCMDTab.vue
#	nezha-fronted/src/components/common/bottomBox/tabs/terminalLogRecordTab.vue
#	nezha-fronted/src/components/common/bottomBox/tabs/terminalLogTab.vue
#	nezha-fronted/src/components/common/popBox/selectPanel.vue
#	nezha-fronted/src/components/common/project/popData/Info.vue
#	nezha-fronted/src/components/common/project/topologyL5.vue
#	nezha-fronted/src/components/common/rightBox/alertRuleBox.vue
#	nezha-fronted/src/components/common/rightBox/setting/globalizationBox.vue
#	nezha-fronted/src/components/page/config/changePin.vue
#	nezha-fronted/src/components/page/dashboard/explore/editor.vue
#	nezha-fronted/src/components/page/dashboard/metricPreview.vue
#	nezha-fronted/src/components/page/dashboard/panel.vue
#	nezha-fronted/src/permission.js
#	nezha-fronted/src/store/user.js
2021-11-29 16:19:13 +08:00
zhangyu
7ca733dfe1 fix: 修改正则 \s 为 \r|\n 2021-11-25 16:29:56 +08:00
zhangyu
1fb059926a fix: panel请求保存的问题 2021-11-25 13:51:06 +08:00
zhangyu
7cf4a696e9 NEZ-1332 feat: alert message 查看请求参数调整(metrics,logs) 2021-11-24 20:27:15 +08:00
zhangyu
c19f8436e6 NEZ-1258 fix: Asset查看详情时,多个功能点的搜索记录同步 2021-11-17 13:51:28 +08:00
zhangyu
f9ca30d92f NEZ-1257 fix: 去除表达是所有空白字符 2021-11-17 11:29:18 +08:00
zhangyu
0d190d6b9e NEZ-1257 fix: 接口返回报错事 左上角显示对应报错信息 2021-11-17 10:08:21 +08:00
chenjinsong
a0dcb8d877 Merge remote-tracking branch 'origin/dev-3.1' into dev-3.1.1_theme
# Conflicts:
#	nezha-fronted/src/components/cli/webSSH.vue
#	nezha-fronted/src/components/common/alert/alertLabel2.vue
#	nezha-fronted/src/components/common/detailView/list/asset/assetDetail.vue
#	nezha-fronted/src/components/common/popBox/topToolMoreOptions.vue
#	nezha-fronted/src/components/common/rightBox/editEndpointBoxNew.vue
#	nezha-fronted/src/components/common/rightBox/moduleBox.vue
#	nezha-fronted/src/components/page/config/system.vue
#	nezha-fronted/src/components/page/monitor/project/index.vue
2021-11-11 11:28:19 +08:00
@changcode
6958aac93a fix: 修复详情视图,机柜重复请求问题 2021-11-05 15:22:05 +08:00
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
f5ba781413 NEZ-1139 fix: Alert rule页面,Default snmptrap报警规则,查看报警页面一直显示加载中 2021-10-29 18:19:49 +08:00
@changcode
950b54381b style: select 选择器样式调整 2021-10-29 14:25:59 +08:00
@changcode
47d1863111 style: 优化select公用样式,及类名 2021-10-29 12:02:34 +08:00
@changcode
2351baa8f3 fix: 列表no data样式展示异常问题 2021-10-22 19:39:49 +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
@changcode
8649ccd9c0 style: 底部box去除多余样式 2021-10-18 11:53:34 +08:00
zhangyu
b7b05b0004 Merge branch 'dev-2.0' of https://git.mesalab.cn/nezha/nezha-fronted into dev-3.1 2021-10-15 16:59:03 +08:00
@changcode
db25c666c2 style: 底部弹框样式调整 2021-10-15 16:39:47 +08:00
zhangyu
cfca72366c feat: asset详细视图 基本功能实现 2021-10-13 18:24:09 +08:00
zhangyu
13bd9a0d8d NEZ-1048 feat:asset详细视图 右侧内容区域 以及部分优化 2021-10-11 14:05:07 +08:00
@changcode
9542e1a63a style: Box 样式调整 2021-09-26 18:14:47 +08:00
@changcode
1e80a05033 style: 下拉样式调整 2021-09-26 09:14:07 +08:00
zhangyu
268b9ac9c9 fix:修改下弹框 Trouble shooting 不显示的问题 2021-09-13 10:07:51 +08:00
zhangyu
38bac3e1f8 fix:修复 asset 下滑框 alertMessage 图表不显示的问题 2021-09-13 09:32:20 +08:00
zhangyu
5f03ec2ca3 feat:alertMessage 支持logs(100%) 2021-09-10 16:19:57 +08:00
zhangyu
07a1d6f234 fix; 修改 alertMessage 不显示图标的问题 , alert rule的校验问题以及 alertRuleTanle的翻页功能 2021-09-09 10:30:03 +08:00
zhangyu
86466ee4e6 NEZ-974 fix:修改alert message 默认时间不是一小时的问题 2021-09-07 11:03:58 +08:00
chenjinsong
dc8d5c2561 NEZ-944 fix: table高度修复 2021-08-29 21:35:27 +08:00
@changcode
aae5b4cb8e NEZ-864 fix: 修复alert message列表 lables展示问题 2021-07-23 16:16:01 +08:00
@changcode
f9c8e4000b NEZ-795 fix: 修复Alert rule中的二级界面相关问题 2021-07-19 17:26:45 +08:00
zhangyu
0e63e13259 NEZ-825 fix;修改 告警消息列表页面 分页按钮点击查询无数据 2021-07-14 10:39:44 +08:00
zhangyu
2b89e99f08 stye: 删除 console 2021-07-05 17:45:16 +08:00
@changcode
c715a96321 NEZ-787 fix: 修复Asset model页面,点击Open terminal,Duplicate,Silence alert按钮无反应 2021-07-01 17:56:01 +08:00
@changcode
eeaa3612af fix: 去除转义 replace 方法 2021-06-25 17:38:34 +08:00
zhangyu
0238eb9d46 fix: 底部alertMessage 弹窗不显示图表的问题 2021-06-25 17:32:19 +08:00
@changcode
6db2c7fb16 fix: 搜索字段参数类型错误 2021-06-17 18:22:32 +08:00
@changcode
e26b8c68eb fix: 统一所有 description 中文国际化为 描述 2021-06-07 18:28:07 +08:00
chenjinsong
acc1e2a94a NEZ-727 fix: 部分二级列表搜索异常问题 2021-06-07 17:31:17 +08:00
chenjinsong
5f5f94bc0b NEZ-698 perf: 过滤筛选框调整 2021-06-07 15:09:11 +08:00
chenjinsong
83000289e9 NEZ-655 fix: dc的alert列表参数补充 2021-05-21 16:36:41 +08:00
chenjinsong
9ff0686fc8 NEZ-601 perf: endpoint-detail和add-chart-by-template 2021-05-20 16:27:46 +08:00
chenjinsong
8676ce648b NEZ-641 fix: alert-msg删除增加参数 2021-05-20 09:18:05 +08:00
zhangyu
8f530c6c0f fix:修改表格loading bug 2021-05-19 11:32:41 +08:00
chenjinsong
bc90a4fdaa NEZ-604 fix: alert-message相关 2021-05-10 19:47:29 +08:00
chenjinsong
5c3b058907 NEZ-600 fix: 各页面搜索框功能 2021-05-10 15:59:39 +08:00
zhangyu
e980a7e303 feat:alertMessage 上滑框 state 暂时默认给1 2021-05-08 18:22:18 +08:00
zhangyu
7db2b77574 fix:修改 silence rule endpoint显示 以及添加 alertRule的上滑 2021-05-08 18:08:32 +08:00