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 |
|
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
|
c19f8436e6
|
NEZ-1258 fix: Asset查看详情时，多个功能点的搜索记录同步
|
2021-11-17 13:51: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
|
91605a24db
|
NEZ-1144 fix: 修复endpoint - logs 有数据，显示 no data
|
2021-11-01 10:18:33 +08:00 |
|
zhangyu
|
4ad34eebf1
|
fix： Endpoint页面显示的为“|-”和“!-”，选中之后显示的为“|~”和“!~”
|
2021-10-28 15:10:56 +08:00 |
|
zhangyu
|
a6dc8e5d45
|
NEZ-1117 fix; Endpoint页面显示的为 “ |- ” 和 “ !- ”，选中之后显示的为 “ |~ ” 和 “ !~ ”
|
2021-10-28 15:06:47 +08:00 |
|
@changcode
|
5fa7833656
|
fix: 修复explore页面和log二级bottomBox页面的使用同一组件的条件冲突
|
2021-10-27 10:17:09 +08:00 |
|
@changcode
|
05c837be66
|
NEZ-1077 fix: panel 输入搜索条件 ，没有符合条件chart nodata样式
|
2021-10-25 14:38:43 +08:00 |
|
zhangyu
|
f635c87740
|
fix： 样式调整
|
2021-10-15 15:59:46 +08:00 |
|
zhangyu
|
13bd9a0d8d
|
NEZ-1048 feat：asset详细视图 右侧内容区域 以及部分优化
|
2021-10-11 14:05:07 +08:00 |
|
zhangyu
|
d4f459860c
|
NEZ-1005 fix： 下弹框的logs noData 样式修改
|
2021-09-26 18:01:10 +08:00 |
|
chenjinsong
|
95877b8848
|
NEZ-927 fix: 优化logtab-nodata提示，并增加加载动画
|
2021-08-31 18:13:15 +08:00 |
|
zhangyu
|
e381ff7717
|
NEZ-935 fix:monitor endpoint 页面 删除 qiery，bottom boxQuery 改为 metrics ，以及 查询参数的问题
|
2021-08-25 16:05:33 +08:00 |
|
chenjinsong
|
637155fee3
|
NEZ-895 fix: 修复不出数据的问题
|
2021-08-06 17:06:52 +08:00 |
|
chenjinsong
|
a8ab1cc62e
|
NEZ-895 feat: asset-logTab
|
2021-08-05 22:31:36 +08:00 |
|
chenjinsong
|
61d8e0df1c
|
NEZ-894 feat: endpoint-logTab
|
2021-08-05 22:25:55 +08:00 |
|