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
|
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
|
2351baa8f3
|
fix: 列表no data样式展示异常问题
|
2021-10-22 19:39:49 +08:00 |
|
zhangyu
|
b7b05b0004
|
Merge branch 'dev-2.0' of https://git.mesalab.cn/nezha/nezha-fronted into dev-3.1
|
2021-10-15 16:59:03 +08:00 |
|
@changcode
|
db25c666c2
|
style: 底部弹框样式调整
|
2021-10-15 16:39:47 +08:00 |
|
zhangyu
|
cfca72366c
|
feat： asset详细视图 基本功能实现
|
2021-10-13 18:24:09 +08:00 |
|
zhangyu
|
13bd9a0d8d
|
NEZ-1048 feat：asset详细视图 右侧内容区域 以及部分优化
|
2021-10-11 14:05:07 +08:00 |
|
zhangyu
|
e4b998f5ee
|
fix： 修改 endpoint state的参数名
|
2021-08-27 11:05:02 +08:00 |
|
zhangyu
|
63a18d7576
|
NEZ-938 fix:二级页面 endpoint编辑按钮点击console 报错
|
2021-08-26 15:38:45 +08:00 |
|
zhangyu
|
d829cb432e
|
feat： endpoint 批量新增微调
|
2021-08-05 15:07:45 +08:00 |
|
zhangyu
|
48cc2ae1fe
|
NEZ-863 fix：修改panel 页面 搜素后样式错乱的问题
|
2021-07-23 15:49:18 +08:00 |
|
@changcode
|
c715a96321
|
NEZ-787 fix: 修复Asset model页面，点击Open terminal，Duplicate，Silence alert按钮无反应
|
2021-07-01 17:56:01 +08:00 |
|
@changcode
|
31c3792c14
|
fix: 去除 bottomBox 列表页面无效按钮，替换为编辑按钮
|
2021-06-25 14:09:18 +08:00 |
|
@changcode
|
26da64a0c2
|
fix: 修复底部弹框搜索字段参数错误问题
|
2021-06-11 10:20:53 +08:00 |
|
@changcode
|
4fccb89651
|
fix: 1 补充页面 bottomBox 搜索字段国际化 2补充终端日资搜索字段国际化
|
2021-06-08 10:31:05 +08:00 |
|
chenjinsong
|
acc1e2a94a
|
NEZ-727 fix: 部分二级列表搜索异常问题
|
2021-06-07 17:31:17 +08:00 |
|
zhangyu
|
e2636bee95
|
fix：修改asset 顶部按钮，修改assetModel 上滑，修改module endpoint上滑编辑页面
|
2021-05-14 17:09:57 +08:00 |
|
zhangyu
|
135c6bbfbb
|
fix：将展开收起按钮 抽至header组件内 ，解决 termail 拖动蒙层显示不全的问题
|
2021-05-14 10:14:02 +08:00 |
|
chenjinsong
|
3f348e3624
|
fix: 恢复project修改，修复overview/asset接口
|
2021-04-30 11:45:22 +08:00 |
|
zhangyu
|
d65c0ed30b
|
feat：module上滑添加 message tab
|
2021-04-20 15:31:57 +08:00 |
|
zhangyu
|
538d1a76e0
|
feat：module添加下拉弹窗
fix：修改panel chart不可移动的bug
|
2021-04-20 14:38:24 +08:00 |
|