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
|
ff57b661f7
|
NEZ-1047 feat: endpoint metrics 增加 https 选项
|
2021-10-11 10:18:45 +08:00 |
|
zhangyu
|
416a14dccc
|
NEZ-943 feat：module endpoint 编辑页面 metric snmp 类型输入校验修改
|
2021-08-27 16:15:05 +08:00 |
|
zhangyu
|
6dd7c9c279
|
feat： 添加批量新增的页面
|
2021-08-04 16:55:11 +08:00 |
|
zhangyu
|
e980a7e303
|
feat：alertMessage 上滑框 state 暂时默认给1
|
2021-05-08 18:22:18 +08:00 |
|
zhangyu
|
783f22b880
|
feat：修改endpoint 搜索asset列表的接口
|
2021-04-15 11:47:44 +08:00 |
|
zhangyu
|
e3729418cb
|
feat：创建module弹窗根据接口修改（60%）
|
2021-04-13 19:06:34 +08:00 |
|
chenjinsong
|
337ee9a938
|
feat: 引入eslint
|
2021-03-19 18:52:19 +08:00 |
|
陈劲松
|
0764dcdd56
|
perf: 滚动条替换和toTop替换
|
2020-12-14 20:25:24 +08:00 |
|
zhangyu
|
c3ac72e483
|
feat：添加beforeDestroy生命周期，解绑bus.$on 以及。on事件
|
2020-11-20 11:19:25 +08:00 |
|
zhangyu
|
5d01a7401d
|
feat：使用1.2的icon
|
2020-09-10 17:00:32 +08:00 |
|
chenjinsong
|
efd7408215
|
fix: 修复walk框不见了的问题
|
2020-09-03 18:34:19 +08:00 |
|
陈劲松
|
fcc269b8e2
|
feat: alert-message导出
|
2020-04-08 20:27:07 +08:00 |
|
陈劲松
|
dd1d97a0ee
|
perf: modulebox-walk-tree提示信息交互优化
|
2020-04-08 18:57:14 +08:00 |
|
陈劲松
|
e924c22f6f
|
perf: modulebox-walk-tree提示信息交互优化等
1.modulebox-walk-tree提示信息交互优化
2.alert-message列表labels不显示alertname和等级
|
2020-04-08 18:50:00 +08:00 |
|
陈劲松
|
f74f852470
|
feat: alertMessage-labels等
1.alertMessage-labels
2.退出登录切换语言再重登后国际化不对的bug
3.修复切换左侧菜单后顶部菜单显示不对的问题
|
2020-04-06 22:11:25 +08:00 |
|
陈劲松
|
a549f5c197
|
perf: mib提示改为点击触发
|
2020-04-04 21:13:26 +08:00 |
|
陈劲松
|
c98e587dfc
|
feat: module新增、修改增加snmp类型等
1.module新增、修改增加snmp类型等
2.取消滚动条拖动延迟
|
2020-04-04 21:10:52 +08:00 |
|
陈劲松
|
cf279dd11f
|
perf: 更改module-walk交互方式，已实现回显
|
2020-04-02 20:23:52 +08:00 |
|