Commit Graph

57 Commits

Author SHA1 Message Date
@changcode
460906e0b4 fix: 统一explore table 分页字体 2021-12-24 16:31:31 +08:00
zhangyu
3d1d21ac66 fix: 修改 el-input-number 输入就校验的问题 2021-12-03 16:58:25 +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
chenjinsong
56077e2fc2 NEZ-1365 fix: 修复explore-log更换语句重新搜索后,log-table的筛选条件没有重置的问题 2021-11-27 19:28:01 +08:00
zhangyu
38d012dfb3 NEZ-1350 fix:当用户另外开启标签时,不用再次登陆 2021-11-26 18:47:00 +08:00
zhangyu
1fb059926a fix: panel请求保存的问题 2021-11-25 13:51:06 +08:00
zhangyu
7cf4a696e9 NEZ-1332 feat: alert message 查看请求参数调整(metrics,logs) 2021-11-24 20:27:15 +08:00
zhangyu
f6b5e49009 NEZ-1316 fix:Dastboard explore 查询指标数据过多,后端返回错误码 413 ,并返回错误信息,前端无提示 2021-11-22 15:39:30 +08:00
zhangyu
dcb58b3f9f NEZ-1315 fix:修改 Datacenter exporter 更新 表达式 查询后 pageno没有回到第一页的问题 2021-11-22 14:42:17 +08:00
chenjinsong
0a49fc4e28 Merge remote-tracking branch 'origin/dev-3.1.1_theme' into dev-3.2 2021-11-19 09:57:44 +08:00
@changcode
4109baa6ee style: explore 主题颜色调整 2021-11-17 18:21:56 +08:00
@changcode
26d71dca07 style: explore 主题颜色调整 2021-11-17 18:12:03 +08:00
chenjinsong
721c290739 Merge remote-tracking branch 'origin/dev-3.1' into dev-3.1.1_theme 2021-11-16 09:43:06 +08:00
zhangyu
0a717bc0df NEZ-1241 fix:dashboard explore 预览内容有误 2021-11-15 16:54:33 +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
@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
a2eaa35dea fix: 修复logTab页面no data无法正常展示问题 2021-10-28 09:53:24 +08:00
@changcode
4a4106d9ec Merge branch 'dev-3.1' of https://git.mesalab.cn/nezha/nezha-fronted into dev-3.1
# Conflicts:
#	nezha-fronted/src/components/page/dashboard/explore/exploreItem.vue
2021-10-27 10:19:12 +08:00
@changcode
5fa7833656 fix: 修复explore页面和log二级bottomBox页面的使用同一组件的条件冲突 2021-10-27 10:17:09 +08:00
zhangyu
d4bf32ee0a NEZ-1094 fix:explore 翻页功能单页展示数量选项被遮挡 2021-10-27 09:55:18 +08:00
zhangyu
6df389d390 Merge branch 'dev-3.1' of https://git.mesalab.cn/nezha/nezha-fronted into dev-3.1 2021-10-25 15:06:19 +08:00
zhangyu
80ce91752d fix:修改explore 分页器的 bug 2021-10-25 15:05:50 +08:00
@changcode
bbe760999d style: 样式调整 2021-10-25 14:45:28 +08:00
@changcode
05c837be66 NEZ-1077 fix: panel 输入搜索条件 ,没有符合条件chart nodata样式 2021-10-25 14:38:43 +08:00
zhangyu
cd72fad4b7 fix: 优化 metrics 的数据 不再频繁调用接口 2021-09-28 16:54:07 +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
@changcode
74e089a820 style: explore => metrics 列表样式调整 2021-09-24 10:16:29 +08:00
zhangyu
89334b6f98 NEZ-1022 fix: logs 日志条数限制修改 2021-09-23 10:51:53 +08:00
zhangyu
1b947faf5d NEZ-1014 fix: 去除 explore metrics 的自定义列 2021-09-18 15:41:07 +08:00
zhangyu
11c9a38355 NEZ-1013 fix: 增加logs的loading 2021-09-17 15:49:15 +08:00
zhangyu
32f89f90da fix:Explore 折叠时查询 图表样式错误的问题 2021-09-13 15:06:54 +08:00
@changcode
79174e8d2d style: explorItem 样式调整 2021-09-10 18:16:56 +08:00
@changcode
3febac9501 style: explore 样式调整 2021-09-10 16:44:04 +08:00
@changcode
34a38a708a style: chartBox,roleBox,exploreItem 页面样式调整 2021-09-10 14:13:10 +08:00
zhangyu
d75ae40c19 feat:alertMessage 添加 Trouble shooting按钮 2021-09-09 16:00:37 +08:00
zhangyu
b395e3b936 fix:修改chartTepm logs显示错误的问题 以及图标的替换 2021-09-06 16:22:05 +08:00
zhangyu
de502fa4d9 NEZ-956 feat: panel 添加logs 2021-09-03 16:30:55 +08:00
zhangyu
9e666584b6 Merge branch 'dev-2.0' of https://git.mesalab.cn/nezha/nezha-fronted into dev-2.0 2021-09-02 17:31:43 +08:00
zhangyu
23e924a8ac feat: 修改 asset bottom 不显示 tooltip的问题 2021-09-02 17:31:03 +08:00
@changcode
bb5f8cfd0a fix: 样式调整 2021-09-02 15:37:01 +08:00
@changcode
24ead781dc fix: 样式调整 2021-08-27 17:13:26 +08:00
@changcode
faa6a330d1 fix: 修复样式,补充国际化,清除console 2021-08-25 16:19:44 +08:00
@changcode
4dd6754e1b fix: 解决冲突 2021-08-25 13:57:04 +08:00
@changcode
0711d2fd1c Merge branch 'dev-2.0' of https://git.mesalab.cn/nezha/nezha-fronted into dev-2.0 2021-08-25 10:39:32 +08:00
@changcode
fa237b9723 NEZ-929 fix: explore metrics,logs 切换 样式调整 2021-08-25 10:39:26 +08:00
chenjinsong
c0728a5f5a NEZ-917 fix: 解决时区、log-chart有时不能显示的问题 2021-08-24 18:33:32 +08:00