chenjinsong
|
e7273d0be0
|
NEZ-1072 fix: 主题调整
|
2021-11-04 19:11:44 +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 |
|
zhangyu
|
219e71f7e0
|
fix: 修改 alertRule evalLog 时间错误的问题
|
2021-11-04 14:24:01 +08:00 |
|
chenjinsong
|
7262a32fa1
|
Merge remote-tracking branch 'origin/dev-3.1' into dev-3.1
|
2021-11-04 12:13:45 +08:00 |
|
chenjinsong
|
f87c8d4c53
|
NEZ-1164 fix: 登录页支持国际化
|
2021-11-04 12:13:36 +08:00 |
|
zhangyu
|
f3667a6fd6
|
fix： 修改不返回num 默认展示为0
|
2021-11-04 11:53:58 +08:00 |
|
@changcode
|
ab211e91ef
|
style: 调整I18N列表页面表头最小宽度
|
2021-11-04 11:23:08 +08:00 |
|
zhangyu
|
6cb602218e
|
NEZ-1168 fix； Endpoint relabel 配置修改，前端校验错误
|
2021-11-04 10:08:54 +08:00 |
|
chenjinsong
|
561313d68c
|
NEZ-1072 feat: 主题内容
|
2021-11-04 09:29:01 +08:00 |
|
@changcode
|
cb2ec828b9
|
Merge branch 'dev-3.1' of https://git.mesalab.cn/nezha/nezha-fronted into dev-3.1
|
2021-11-03 18:10:04 +08:00 |
|
@changcode
|
bedbfae434
|
fix: 修复 asset 批量修改点击后隐藏问题
|
2021-11-03 18:09:56 +08:00 |
|
zhangyu
|
d1e38477ee
|
fixl 修改panel alertlist snmp 双击打开弹窗的问题
|
2021-11-03 17:30:20 +08:00 |
|
zhangyu
|
6c1340cecf
|
NEZ-1163 feat： 组合筛选 增加显示 数量
|
2021-11-03 17:21:22 +08:00 |
|
@changcode
|
f5c4901598
|
fix: 去除多余代码
|
2021-11-03 16:02:11 +08:00 |
|
@changcode
|
1cac99f208
|
fix： i18n调整
|
2021-11-03 15:36:54 +08:00 |
|
@changcode
|
14dc417a8a
|
fix: 修复 i18n页面，lang选择问题
|
2021-11-03 14:31:00 +08:00 |
|
@changcode
|
d40988674f
|
style: i18n新增默认lang en高亮
|
2021-11-03 13:53:46 +08:00 |
|
@changcode
|
7ecf2b9ecd
|
NEZ-1158 feat: 国际化列表 页面& 编辑页面
|
2021-11-03 11:47:25 +08:00 |
|
zhangyu
|
246560acb4
|
NEZ-1151 style: 组合筛选框 Skeleton 未居中显
|
2021-11-03 10:07:31 +08:00 |
|
zhangyu
|
08817f726f
|
NEZ-1165 fix；alert rule 评估日志列表不需要 字段排序
|
2021-11-03 09:14:08 +08:00 |
|
zhangyu
|
d8321f4df3
|
Merge branch 'dev-3.1' of https://git.mesalab.cn/nezha/nezha-fronted into dev-3.1
|
2021-11-02 18:34:47 +08:00 |
|
chenjinsong
|
17bdd7aba3
|
NEZ-1157 feat: 国际化内容改为后端控制
|
2021-11-02 18:34:01 +08:00 |
|
zhangyu
|
dc7a102bf7
|
NEZ-1155 feat：添加 evallog页面
|
2021-11-02 18:34:00 +08:00 |
|
@changcode
|
3094e94b0c
|
NEZ-1160 fix: 修复Endpoint页面鼠标悬浮在Project字段元素超出边框
|
2021-11-02 17:19:33 +08:00 |
|
zhangyu
|
7999f06d60
|
fix: 修改下弹框 panel 的报错的问题
|
2021-11-02 17:01:13 +08:00 |
|
@changcode
|
8abb1e0980
|
fix: 修复 alertLable 页面，因定位问题超出浏览器窗口
|
2021-11-02 16:07:50 +08:00 |
|
zhangyu
|
f6ac483d33
|
NEZ-1137 fix； 导出样式调整
|
2021-11-02 15:47:17 +08:00 |
|
chenjinsong
|
543503c571
|
NEZ-1072 feat: 主题切换冲突解决
|
2021-11-02 14:05:16 +08:00 |
|
@changcode
|
e38bdd4e19
|
NEZ-1156 fix: 修复alert rule type字段未正确翻译为 metrics.logs.snmp trap
|
2021-11-02 11:04:06 +08:00 |
|
@changcode
|
efb0996777
|
fix: alertLabel页面增加判断，区分alertMessage页面，和chart-alert-lis全屏t页面
|
2021-11-02 10:17:26 +08:00 |
|
chenjinsong
|
d1efdde2ba
|
NEZ-1072 feat: 主题切换冲突解决
|
2021-11-01 23:05:28 +08:00 |
|
chenjinsong
|
35a0b8d75a
|
NEZ-1072 feat: 主题切换冲突解决
|
2021-11-01 18:42:46 +08:00 |
|
chenjinsong
|
6ebeeeacd1
|
Merge remote-tracking branch 'origin/dev-3.1' into dev-3.1.1_theme
# Conflicts:
# nezha-fronted/src/components/common/labelFilter/clickSearch.vue
|
2021-11-01 18:32:30 +08:00 |
|
zhangyu
|
f72eee081a
|
NEZ-1151 style： 组合筛选框 Skeleton 未居中显示
|
2021-11-01 18:28:13 +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 |
|
@changcode
|
853807fafd
|
fix: 修复cahrt-alert-list页面全屏问题
|
2021-11-01 17:59:32 +08:00 |
|
chenjinsong
|
914c096463
|
NEZ-1072 feat: 主题切换
|
2021-11-01 17:23:01 +08:00 |
|
zhangyu
|
1decda6833
|
Merge branch 'dev-3.1' of https://git.mesalab.cn/nezha/nezha-fronted into dev-3.1
|
2021-11-01 16:47:27 +08:00 |
|
zhangyu
|
5d5106825b
|
NEZ-1108 fix：修改导入成功的样式
|
2021-11-01 16:46:12 +08:00 |
|
@changcode
|
7dfc34f9c2
|
NEZ-1145 fix: System node exporter alert nums页面存在两个悬浮框
|
2021-11-01 16:35:58 +08:00 |
|
zhangyu
|
de04725d50
|
NEZ-1103 fix；修改unkonw图例的颜色
|
2021-11-01 14:34:11 +08:00 |
|
zhangyu
|
03621ed884
|
fix：全屏 显示两个弹出层的问题
|
2021-11-01 14:27:10 +08:00 |
|
zhangyu
|
18d89a0917
|
Merge branch 'dev-3.1' of https://git.mesalab.cn/nezha/nezha-fronted into dev-3.1
|
2021-11-01 10:21:07 +08:00 |
|
zhangyu
|
8f1fc02629
|
fix： detail Log页面 添加滚动条
|
2021-11-01 10:20:47 +08:00 |
|
@changcode
|
91605a24db
|
NEZ-1144 fix: 修复endpoint - logs 有数据，显示 no data
|
2021-11-01 10:18:33 +08:00 |
|
zhangyu
|
0b99acc067
|
Merge branch 'dev-3.1' of https://git.mesalab.cn/nezha/nezha-fronted into dev-3.1
|
2021-11-01 09:57:54 +08:00 |
|
zhangyu
|
709f60062a
|
NEZ-1143 fix： Alert rule页面Expression输入框元素位置错误
|
2021-11-01 09:57:30 +08:00 |
|
@changcode
|
d52f671261
|
NEZ-1142 fix: 修复Asset页面元素超出边框
|
2021-11-01 09:39:42 +08:00 |
|
@changcode
|
d32811dc52
|
fix: 修复chartBox样式问题
|
2021-10-29 18:57:24 +08:00 |
|