chenjinsong
|
f27b6c2606
|
Merge remote-tracking branch 'origin/dev-3.1' into dev-3.1.1_theme
# Conflicts:
# nezha-fronted/src/components/common/i18n.js
# nezha-fronted/src/components/common/pagination.vue
# nezha-fronted/src/components/common/searchInput.vue
# nezha-fronted/src/components/common/table/settings/endpointTable.vue
# nezha-fronted/src/components/page/dashboard/overview/overview2.vue
|
2021-11-15 14:06:42 +08:00 |
|
zhangyu
|
bbc48bbdbe
|
NEZ-1236 fix： 点击筛选条件后，列表下方分页位置未更新
|
2021-11-15 10:25:30 +08:00 |
|
@changcode
|
d4dd85ee8e
|
NEZ-1218 fix: alert message 查看按钮 增加判断条件 当 rule_type 未logs时禁用
|
2021-11-11 13:55:04 +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 |
|
zhangyu
|
f7ba3bec13
|
NEZ-1205 fix： 英文状态下选择框内的提示语是中文 修改
|
2021-11-09 10:17:12 +08:00 |
|
zhangyu
|
897fb7673c
|
fix： 处理国际化的问题
|
2021-11-04 18:21:20 +08:00 |
|
zhangyu
|
bf96ab737b
|
NEZ-1171 fix：alert message 导出样式修改
|
2021-11-04 17:00:58 +08:00 |
|
chenjinsong
|
d1efdde2ba
|
NEZ-1072 feat: 主题切换冲突解决
|
2021-11-01 23:05:28 +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
|
df9e3bfb56
|
fix： 修改 snmp trap 双击显示图表的问题
|
2021-10-29 18:16:11 +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 |
|
zhangyu
|
38383e5174
|
NEZ-1090 fix：Line Chart 按钮悬停信息被遮挡
|
2021-10-27 13:58:25 +08:00 |
|
zhangyu
|
ffb6cb23ea
|
NEZ-1088 fix：Project页面点击Alert字段不能跳转到Alert message页面
|
2021-10-27 10:49:53 +08:00 |
|
zhangyu
|
c51d1293bd
|
fix：记录组合筛选的状态
|
2021-10-26 15:55:57 +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 |
|
zhangyu
|
cfca72366c
|
feat： asset详细视图 基本功能实现
|
2021-10-13 18:24:09 +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
|
47b74659bd
|
fix：alertRuleBox 调整
|
2021-09-10 14:46:08 +08:00 |
|
zhangyu
|
ed688b7ea8
|
feat：alertMessage 支持 logs（50%）
|
2021-09-09 17:23:53 +08:00 |
|
zhangyu
|
d75ae40c19
|
feat：alertMessage 添加 Trouble shooting按钮
|
2021-09-09 16:00:37 +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
|
17addd5a02
|
fix: 修复列表高度问题，补充国际化
|
2021-08-27 13:54:04 +08:00 |
|
@changcode
|
d46b8eaaf5
|
fix: 分页增加判断条件
|
2021-08-23 18:50:08 +08:00 |
|
@changcode
|
aae5b4cb8e
|
NEZ-864 fix: 修复alert message列表 lables展示问题
|
2021-07-23 16:16:01 +08:00 |
|
zhangyu
|
3adb337934
|
NEZ=824 fix；修改切换时间后报错的问题
|
2021-07-14 10:37:20 +08:00 |
|
@changcode
|
57c77a8679
|
fix: 修复组件指定name重复问题
|
2021-06-17 11:24:38 +08:00 |
|
@changcode
|
afe82f2c03
|
fix: 统一国际化
|
2021-06-08 09:44:32 +08:00 |
|
@changcode
|
e26b8c68eb
|
fix: 统一所有 description 中文国际化为 描述
|
2021-06-07 18:28:07 +08:00 |
|
chenjinsong
|
5f5f94bc0b
|
NEZ-698 perf: 过滤筛选框调整
|
2021-06-07 15:09:11 +08:00 |
|
zhangyu
|
48986a7437
|
fix： 修改alertMessage图表显示错误的问题
|
2021-06-03 16:50:47 +08:00 |
|
zhangyu
|
3a36dccf18
|
fix：修改 弹窗为右滑框
|
2021-06-01 15:19:47 +08:00 |
|
zhangyu
|
2ee081df1a
|
NEZ-699： 增加告警静默一键配置功能
|
2021-06-01 14:26:09 +08:00 |
|
zhangyu
|
6ec63ff6f3
|
fix：修改asset connect点击报错 ，panel-addByTemplate穿梭框,varIds传参不正确,以及assetmodel编辑框中chart-template回显问题
|
2021-05-25 14:21:14 +08:00 |
|
chenjinsong
|
9ff0686fc8
|
NEZ-601 perf: endpoint-detail和add-chart-by-template
|
2021-05-20 16:27:46 +08:00 |
|
@changcode
|
9488eef644
|
fix: 搜索条件列表国际化补充
|
2021-05-20 11:39:12 +08:00 |
|
chenjinsong
|
8676ce648b
|
NEZ-641 fix: alert-msg删除增加参数
|
2021-05-20 09:18:05 +08:00 |
|
zhangyu
|
0f5176cd48
|
fix：修改 alertMessage endTIme 显示不正确的问题
|
2021-05-19 18:41:00 +08:00 |
|
zhangyu
|
f2ae0c9717
|
fix：修改 alertMessage 查看图表不显示的问题
|
2021-05-19 18:14:27 +08:00 |
|
zhangyu
|
8f530c6c0f
|
fix：修改表格loading bug
|
2021-05-19 11:32:41 +08:00 |
|
zhangyu
|
fd77ced048
|
feat： 所有表格 添加 loading
|
2021-05-18 19:18:14 +08:00 |
|
zhangyu
|
801180443f
|
fix：修复 alertMessage 图表不显示的问题 以及 查看图表后 分页查询带了时间参数的问题
|
2021-05-14 15:24:32 +08:00 |
|
zhangyu
|
fbe346a332
|
fix：处理 alertMessage 查询图表不显示的问题
|
2021-05-14 12:32:47 +08:00 |
|
zhangyu
|
cd505a0d05
|
fix：修改 alertRule的相关bug
|
2021-05-12 19:07:07 +08:00 |
|