Commit Graph

50 Commits

Author SHA1 Message Date
zhangyu
8010406cd1 fix:删除重复国际化数据 2022-06-21 18:14:21 +08:00
zhangyu
e65f37b5b5 fix:处理中英文完全一样的国际化为一个 2022-06-16 15:58:17 +08:00
zhangyu
b12c61e1dd fix:删除部分重复的国际化 2022-06-15 16:14:03 +08:00
likexuan
5f4f8f0e3d fix:alert silence 列表页面增加 alerts 列、告警详情页面 样式优化 2022-04-20 17:16:07 +08:00
likexuan
170ad4e7e7 perf:调整Alerts位置 2022-04-15 18:48:30 +08:00
likexuan
4f5e25bfb6 feat:alert silence 列表页面增加 alerts 列 2022-04-15 13:06:02 +08:00
@changcode
b4257bde8f feat: alertSilences 二级列表页面 2022-03-18 09:20:44 +08:00
zhangyu
be959ad26b NEZ-1631 fix:列表页面 默认排序字段 初始化状态修复 2022-03-04 13:59:25 +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
5d7d6c664e fix: 列表页面增加 v-has 权限 2021-11-10 18:09:05 +08:00
chenjinsong
a709585a9f Merge remote-tracking branch 'origin/dev-3.1' into dev-3.1.1_theme
# Conflicts:
#	nezha-fronted/src/components/common/alert/alertLabel.vue
#	nezha-fronted/src/components/common/detailView/detailViewTopSearch.vue
#	nezha-fronted/src/components/common/i18n.js
#	nezha-fronted/src/components/common/labelFilter/clickSearch.vue
#	nezha-fronted/src/components/common/login.vue
#	nezha-fronted/src/components/common/popBox/topToolMoreOptions.vue
2021-11-04 14:49:40 +08:00
zhangyu
dc7a102bf7 NEZ-1155 feat:添加 evallog页面 2021-11-02 18:34:00 +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
@changcode
47d1863111 style: 优化select公用样式,及类名 2021-10-29 12:02:34 +08:00
@changcode
ab87e01394 style: table列表样式调整 2021-10-28 17:53:27 +08:00
zhangyu
5c58986971 NEZ-1115 fix:Alert silence页面设置默认列设置后页面有空白 2021-10-28 14:13:14 +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
7afc73effc NEZ-938 feat:列表页面增加 duplicate按钮 2021-08-26 14:51:38 +08:00
@changcode
17c28cd4ec fix: 修复列表错位 2021-08-02 15:41:43 +08:00
@changcode
5dc9b7571c NEZ-771 fix: 修复图表错位问题 2021-07-22 10:00:29 +08:00
@changcode
eeb75acc9c fix : NEZ-715 Alert silence operation下得expired按钮 改为 Delete 2021-06-21 09:56:02 +08:00
@changcode
98ed947742 NEZ-681 fix: 页面列表样式调整 2021-05-27 13:53:42 +08:00
@changcode
7bb2975867 NEZ-662 fix : 解决因全局css样式的影响 2021-05-25 17:58:38 +08:00
@changcode
6e6c849db0 fix: 多余class去除 2021-05-21 11:33:01 +08:00
@changcode
af402c4083 fix: edit 禁用时样式修改 2021-05-21 11:31:14 +08:00
@changcode
1beab79d7f NEZ-649 fix: alert silence 列表页面,当 state = 3 (expired) 禁用 edit 按钮 2021-05-20 18:45:27 +08:00
zhangyu
bfab789bef feat:修改 chart创建 alertList时的相关更改 2021-05-20 16:38:39 +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
chenjinsong
8e3bbce9a5 NEZ-627 feat: chart高度改为span形式 2021-05-18 17:59:43 +08:00
zhangyu
6cd3febd5a fix:补充国际化 修改 表达式模板表格 首次加载的问题 2021-05-12 10:59:21 +08:00
zhangyu
920d9e2b36 fix: 修复切换中英文的问题 2021-05-12 09:47:28 +08:00
zhangyu
d1fa2284a9 fix:修改alert rule methods receiver 的显示 2021-05-11 19:43:59 +08:00
zhangyu
70da98a2aa fix : 修改silence reson 为remark 2021-05-11 17:20:22 +08:00
zhangyu
8985c42789 fix;修改 silence的时间问题 2021-05-10 19:04:39 +08:00
zhangyu
1477c3cffc fix:修改silence 状态的显示 2021-05-10 17:41:54 +08:00
zhangyu
f56ca0fac5 fix:修改所有关于表格的时间显示问题 2021-05-10 13:49:27 +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
zhangyu
3e12acaddb fix:处理 下拉框无法收回的问题 以及 alertRule 校验规则的添加 2021-05-08 11:25:05 +08:00
zhangyu
c89e5315e1 feat: 添加alertrule 新增条件 修改silence的mathers样式 2021-05-07 21:27:47 +08:00
@changcode
fbf4de1c69 NEZ-597 perf: 列表页面排序细分设置 2021-05-07 19:10:28 +08:00
zhangyu
1e1c52fb6b feat:修改alert silence的创建方式
fix: 修改chart type 为group children为null的是问题 以及更换icon图标
2021-04-29 17:35:07 +08:00
chenjinsong
124d69688f perf: 数据列表样式统一 2021-04-13 20:33:12 +08:00