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 |
|
@changcode
|
7dfc34f9c2
|
NEZ-1145 fix: System node exporter alert nums页面存在两个悬浮框
|
2021-11-01 16:35:58 +08:00 |
|
@changcode
|
47d1863111
|
style: 优化select公用样式，及类名
|
2021-10-29 12:02:34 +08:00 |
|
@changcode
|
ab87e01394
|
style: table列表样式调整
|
2021-10-28 17:53:27 +08:00 |
|
@changcode
|
5a831004f5
|
NEZ-1080 style: 鼠标悬浮样式调整
|
2021-10-26 17:47:49 +08:00 |
|
@changcode
|
9e82c52436
|
NEZ-1079 perf: 将各处列表、dashboard等页面中多处下拉框的弹出触发方式统一为点击触发
|
2021-10-25 17:16:40 +08:00 |
|
@changcode
|
bbe760999d
|
style: 样式调整
|
2021-10-25 14:45:28 +08:00 |
|
@changcode
|
2351baa8f3
|
fix: 列表no data样式展示异常问题
|
2021-10-22 19:39:49 +08:00 |
|
@changcode
|
ad8bef81ec
|
NEZ-1075 feat: state 样式调整
|
2021-10-22 17:47:42 +08:00 |
|
@changcode
|
9542e1a63a
|
style: Box 样式调整
|
2021-09-26 18:14:47 +08:00 |
|
@changcode
|
5879ca0c8a
|
style:下拉选择器样式统一
|
2021-09-26 11:56:36 +08:00 |
|
zhangyu
|
278c91338b
|
fix； 处理啊alertRule 删除时alertMessage有时会空白的问题
|
2021-09-22 17:47:17 +08:00 |
|
zhangyu
|
37e95e1518
|
NEZ-997 fix：NEZHA 搜索框 删除子选项时 会导致其他选项重复 以及 alertMeaasge dc不显示详情的问题
|
2021-09-14 15:36:55 +08:00 |
|
zhangyu
|
e6a35e3fc9
|
NEZ-994 fix： alert message label x修改
|
2021-09-14 14:19:38 +08:00 |
|
zhangyu
|
b829effcae
|
feat： alertRuletooltip 样式调整
|
2021-09-10 11:00:37 +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 |
|
chenjinsong
|
61d8e0df1c
|
NEZ-894 feat: endpoint-logTab
|
2021-08-05 22:25:55 +08:00 |
|
@changcode
|
aae5b4cb8e
|
NEZ-864 fix: 修复alert message列表 lables展示问题
|
2021-07-23 16:16:01 +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
|
f9279496f5
|
fix：修改告警级别颜色显示不对的问题
|
2021-06-16 22:08:01 -04:00 |
|
zhangyu
|
630e117573
|
fix：修改 告警信息的告警级别的排序字段
|
2021-06-16 22:06:02 -04:00 |
|
@changcode
|
e26b8c68eb
|
fix: 统一所有 description 中文国际化为 描述
|
2021-06-07 18:28:07 +08:00 |
|
zhangyu
|
2ee081df1a
|
NEZ-699： 增加告警静默一键配置功能
|
2021-06-01 14:26:09 +08:00 |
|
@changcode
|
98ed947742
|
NEZ-681 fix: 页面列表样式调整
|
2021-05-27 13:53:42 +08:00 |
|
@changcode
|
b65cb0625e
|
Merge branch 'dev-2.0' of https://git.mesalab.cn/nezha/nezha-fronted into dev-2.0
|
2021-05-25 17:58:49 +08:00 |
|
@changcode
|
7bb2975867
|
NEZ-662 fix : 解决因全局css样式的影响
|
2021-05-25 17:58:38 +08:00 |
|
chenjinsong
|
80cd3d94d5
|
Merge branch 'dev-2.0' of https://git.mesalab.cn/nezha/nezha-fronted into dev-2.0
|
2021-05-25 16:34:34 +08:00 |
|
chenjinsong
|
41fca73cad
|
NEZ-665 fix: 列宽调整
|
2021-05-25 16:13:59 +08:00 |
|
zhangyu
|
807b0aecea
|
feat：添加表格双击点击事件
|
2021-05-25 15:37:33 +08:00 |
|
chenjinsong
|
13b0454d00
|
fix: 修复alertmsg的rule弹框不显示的问题
|
2021-05-21 19:28:50 +08:00 |
|
zhangyu
|
4f8a191224
|
Merge branch 'dev-2.0' of https://git.mesalab.cn/nezha/nezha-fronted into dev-2.0
|
2021-05-20 16:38:45 +08:00 |
|
zhangyu
|
bfab789bef
|
feat：修改 chart创建 alertList时的相关更改
|
2021-05-20 16:38:39 +08:00 |
|
chenjinsong
|
9ff0686fc8
|
NEZ-601 perf: endpoint-detail和add-chart-by-template
|
2021-05-20 16:27:46 +08:00 |
|
zhangyu
|
0f5176cd48
|
fix：修改 alertMessage endTIme 显示不正确的问题
|
2021-05-19 18:41:00 +08:00 |
|
@changcode
|
727378c2f7
|
NEZ-640 fix: 按钮权限 无效
|
2021-05-19 14:26:09 +08:00 |
|
@changcode
|
a471050185
|
NEZ-628 fix: 使用向导页面 按钮权限控制问题
|
2021-05-19 14:04:16 +08:00 |
|
zhangyu
|
b1b784b67a
|
fix：修改alert Message Tooltip 显示不正常的问题
|
2021-05-14 17:50:06 +08:00 |
|
zhangyu
|
801180443f
|
fix：修复 alertMessage 图表不显示的问题 以及 查看图表后 分页查询带了时间参数的问题
|
2021-05-14 15:24:32 +08:00 |
|
zhangyu
|
b3a3e18a04
|
fix：删除 alert message的 remark
|
2021-05-11 19:46:12 +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
|
f56ca0fac5
|
fix:修改所有关于表格的时间显示问题
|
2021-05-10 13:49:27 +08:00 |
|
songjingcheng
|
04c6b8c0a5
|
alert message 修改
|
2021-05-08 15:04:17 +08:00 |
|
songjingcheng
|
1ad9301aae
|
NEZ-598 alert message 页面修改
|
2021-05-08 11:25:40 +08:00 |
|
songjingcheng
|
a8ced7e52b
|
NEZ-598 alert message 页面修改
|
2021-05-08 09:40:53 +08:00 |
|
songjingcheng
|
d8f727e542
|
NEZ-598 alert message 页面修改
|
2021-05-08 09:29:25 +08:00 |
|
zhangyu
|
c89e5315e1
|
feat： 添加alertrule 新增条件 修改silence的mathers样式
|
2021-05-07 21:27:47 +08:00 |
|