Commit Graph

87 Commits

Author SHA1 Message Date
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
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
zhangxiaolong
52fbff49e2 fix : 时间选择器历史记录绑定修改 2022-04-13 17:09:59 +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
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
@changcode
b1e4745909 NEZ-1739 feat: 补充loading 动画 2022-03-25 15:40:05 +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
88e3553c51 NEZ-1692 fix:修改 state为All 时 删除接口报错的问题 2022-03-23 10:56:43 +08:00
zhangyu
907f361813 NEZ-1705 fix:告警图表同时开启之前时间与堆栈图后查看图表界面显示数据出错 2022-03-22 15:32:07 +08:00
@changcode
ce4817ea42 fix: 修复ipam 二级页面 搜索排序传参错误问题 2022-03-22 10:04:30 +08:00
@changcode
ed5eae3489 fix: 完善修复 ipam ip 二级菜单列表 2022-03-21 18:07:26 +08:00
@changcode
b4257bde8f feat: alertSilences 二级列表页面 2022-03-18 09:20:44 +08:00
@changcode
b2cf271a40 fix: 去除 console.log 2022-03-10 13:50:29 +08:00
zhangyu
72b16c9b5e fix:修改 底部弹窗接口调用路由参数的问题 2022-03-10 10:20:08 +08:00
zhangyu
2e7d217f0e fix:修改 alertMessage 默认时间为7天 隐藏lastAt 2022-03-09 18:59:29 +08:00
zhangyu
36cd9af819 fix:修改底部弹窗 alertMessage 时间错误的问题 2022-03-09 14:26:11 +08:00
zhangyu
b44ceec0ca NEZ-1621 fix: Data Centers链接Open terminal时界面无法复位 2022-03-09 11:01:17 +08:00
zhangyu
384154c99f fix: 修改alertMessage 查看chart 多encodeURI一次的问题 2022-03-09 10:16:56 +08:00
zhangyu
d0726092c3 NEZ-1633 fix:Messages内查看告警图表时,点击自定义时间没有弹出修改框 2022-03-08 11:22:26 +08:00
zhangyu
24ed289135 fix:修改详情页面报错的问题 2022-03-07 09:37:27 +08:00
zhangyu
5e8964932f fix:修改 表格排序 无法取消选中的问题 2022-03-03 17:35:42 +08:00
zhangyu
c429a830f2 fix:alertMessage 页面初始状态修改 2022-03-03 09:54:59 +08:00
zhangyu
7428575686 NEZ-1618 fix:alert message 列表页面修改 2022-03-02 18:23:42 +08:00
zhangyu
0a5209971d fix:alertMessage 添加 lastAt 2022-03-02 17:26:40 +08:00
zhangyu
677e14a7a9 NEZ-1618 feat: alert message 列表页面修改 2022-03-02 16:05:27 +08:00
zhangyu
69b71805ec NEZ-1602 fix:鼠标悬浮详情页面参照 列表页面 alert 列实现 2022-03-01 11:04:16 +08:00
zhangyu
5d895aa09a fix:修改 alertMessage 阈值没有显示的问题 2021-12-30 18:30:34 +08:00
zhangyu
f6225f3fe1 fix:修改alertMes 点击查看不显示的问题 2021-12-30 15:18:38 +08:00
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