Commit Graph

75 Commits

Author SHA1 Message Date
likexuan
a094f651e3 perf : 统一 textarea样式 2022-06-10 14:55:46 +08:00
zhangyu
bc9359b691 fix: 補充main。js 2022-04-20 16:57:14 +08:00
zhangxiaolong
52181ff912 feat : codemirror 2022-04-19 11:57:55 +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
f0b5f13a70 fix: 修改未执行eslint的代码 2022-04-11 17:24:10 +08:00
zhangxiaolong
d287509948 NEZ-1778 NEZ-1779 feat: 系统备份 页面开发 2022-04-08 14:09:56 +08:00
@changcode
bf263b9eb4 fix: 主题样式调整,修复chart页面逻辑错误问题 2021-12-07 17:01:42 +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
@changcode
9009b715ae style: 主题颜色调整 2021-11-23 18:16:11 +08:00
zhangyu
d12051dd08 NEZ-1239 fix: Alert rule Evaluation interval 回显有误 2021-11-17 11:35:18 +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
dc407816ce NEZ-1167 fix:Endpoint 名称校验相关问题 2021-11-04 14:24:42 +08:00
chenjinsong
d1efdde2ba NEZ-1072 feat: 主题切换冲突解决 2021-11-01 23:05:28 +08:00
zhangyu
709f60062a NEZ-1143 fix: Alert rule页面Expression输入框元素位置错误 2021-11-01 09:57:30 +08:00
@changcode
1a80248344 NEZ-1134 fix: 修复告警规则,新增告警规则页面未国际化 2021-10-29 16:25:29 +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
ad8bef81ec NEZ-1075 feat: state 样式调整 2021-10-22 17:47:42 +08:00
zhangyu
cd72fad4b7 fix: 优化 metrics 的数据 不再频繁调用接口 2021-09-28 16:54:07 +08:00
@changcode
c1ed41785a style: alert Rule 下拉框样式调整 2021-09-27 15:39:23 +08:00
@changcode
9542e1a63a style: Box 样式调整 2021-09-26 18:14:47 +08:00
@changcode
8a06ca608e Merge branch 'dev-2.0' of https://git.mesalab.cn/nezha/nezha-fronted into dev-2.0
# Conflicts:
#	nezha-fronted/src/components/common/rightBox/dcBox.vue
2021-09-24 17:09:40 +08:00
@changcode
025ae13877 NEZ-1023 style: 下拉列表 样式调整 2021-09-24 17:07:16 +08:00
zhangyu
2a3d307902 style: alert rule & datacenter user.name调整 2021-09-24 14:29:19 +08:00
zhangyu
3f62634ccd NEZ-1027 feat: alert rule & datacenter 编辑页面 user 下拉列表修改 2021-09-24 14:10:50 +08:00
zhangyu
3cb7d18159 fix: 隐藏alertRule的置灰选项 2021-09-22 15:00:19 +08:00
zhangyu
33f3d00767 NEZ-1008 fix:alert rule snmp trap 编辑保存报错 2021-09-17 11:51:02 +08:00
zhangyu
e6a35e3fc9 NEZ-994 fix: alert message label x修改 2021-09-14 14:19:38 +08:00
zhangyu
9590596aef NEZ-993 fix:修复 Alert--Alert rule--New alert rule页面,Type选择logs,然后Type选择Metrics,Expression没有变回Metric 2021-09-14 10:00:58 +08:00
zhangyu
492214c6b2 fix: 修改 alert RuleBox type 为 snmpTarp时 Duration 应为非必填的问题 2021-09-10 17:47:39 +08:00
zhangyu
5f03ec2ca3 feat:alertMessage 支持logs(100%) 2021-09-10 16:19:57 +08:00
zhangyu
47b74659bd fix:alertRuleBox 调整 2021-09-10 14:46:08 +08:00
zhangyu
d75ae40c19 feat:alertMessage 添加 Trouble shooting按钮 2021-09-09 16:00:37 +08:00
@changcode
60099d66ac fix: 修复 type = 3 时 OID保存被清空 2021-09-09 11:04:33 +08:00
zhangyu
8f885fcf6f Merge branch 'dev-2.0' of https://git.mesalab.cn/nezha/nezha-fronted into dev-2.0
# Conflicts:
#	nezha-fronted/src/components/common/rightBox/alertRuleBox.vue
2021-09-09 10:46:36 +08:00
zhangyu
31d832a847 fix: alertRuleBox type 为 SNMP trap时Evaluation interval 为空 2021-09-09 10:43:42 +08:00
@changcode
059c37a35a Merge branch 'dev-2.0' of https://git.mesalab.cn/nezha/nezha-fronted into dev-2.0
# Conflicts:
#	nezha-fronted/src/components/common/rightBox/alertRuleBox.vue
2021-09-09 10:36:04 +08:00
@changcode
e8935693ab fix: 解决冲突 2021-09-09 10:33:03 +08:00
zhangyu
07a1d6f234 fix; 修改 alertMessage 不显示图标的问题 , alert rule的校验问题以及 alertRuleTanle的翻页功能 2021-09-09 10:30:03 +08:00
zhangyu
524e3297aa style: alert rule 样式微调 2021-09-08 17:49:32 +08:00
zhangyu
1933ab8229 NEZ-978 feat:alert rule 页面功能重构 2021-09-08 17:15:59 +08:00
@changcode
0bb7b5865e fix: 修复asset label 下拉框,当前选项删除后无占位字段 2021-09-07 17:02:20 +08:00
@changcode
62a30b7e43 fix: 修复 alert rule 部分问题 2021-09-07 15:06:48 +08:00
@changcode
d888611c24 fix: 优化 alertRuleBox 判断逻辑 2021-09-07 14:02:24 +08:00
@changcode
7bf22b0c79 fix: 修复 alertRule 保存问题 2021-09-07 10:46:39 +08:00
@changcode
9a4c09de8d NEZ-972 fix: 支持 配置 snmp trap 告警规则 2021-09-06 18:58:35 +08:00
@changcode
b203bc7faf NEZ-959 feat: 告警规则页面 列表新增type列,侧滑新增type下拉选择器 2021-09-03 16:37:11 +08:00
zhangyu
4fb2f0713d style: 修改alertRule box state的位置 2021-08-30 17:19:47 +08:00
zhangyu
8ce2075eb1 NEZ-947 feat;alert rule增加 state 页面开发 2021-08-30 15:02:44 +08:00