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
|
9acb8c0b5d
|
fix: 修复el-popover trigger 触发
|
2021-10-28 16:54:03 +08:00 |
|
@changcode
|
57c77a8679
|
fix: 修复组件指定name重复问题
|
2021-06-17 11:24:38 +08:00 |
|
zhangyu
|
17ddaa3f64
|
feat：全局替换 key为password以及pwd的属性 换为 pin
|
2021-04-27 20:31:54 +08:00 |
|
zhangyu
|
d0a011c292
|
fix：修改 i18n的password 为key 时 替换为pin
|
2021-04-27 10:50:44 +08:00 |
|
chenjinsong
|
337ee9a938
|
feat: 引入eslint
|
2021-03-19 18:52:19 +08:00 |
|
chenjinsong
|
949f61d402
|
perf: 周五李娜文档除mibbrowser外的调整内容
|
2021-03-05 20:34:58 +08:00 |
|
wangwenrui
|
b18a3bfa11
|
feat:补充自动化测试所需id
|
2021-02-04 11:21:00 +08:00 |
|
王文睿
|
567f6f1d1f
|
Revert "EAL4:hardcode password修改"
This reverts commit d0b966013b
|
2021-01-05 11:54:33 +08:00 |
|
wangwenrui
|
d0b966013b
|
EAL4:hardcode password修改
|
2020-12-22 18:17:22 +08:00 |
|
陈劲松
|
91adb083fa
|
perf: 调整trafficSetting等样式
|
2020-12-16 16:27:06 +08:00 |
|
陈劲松
|
0764dcdd56
|
perf: 滚动条替换和toTop替换
|
2020-12-14 20:25:24 +08:00 |
|
zhangyu
|
9a4f25ae06
|
feat：topology添加展开收起的动画
|
2020-11-27 09:24:44 +08:00 |
|
zhangyu
|
0e96e1c811
|
feat：trafficSetting 添加标题
|
2020-10-23 11:00:48 +08:00 |
|
wangwenrui
|
2dc2b1ad5b
|
fix:修复traffic配置页面可能刷新页面的问题
|
2020-10-21 18:46:58 +08:00 |
|
wangwenrui
|
bce456af63
|
fix:修复asset编辑页面取消选择机柜未正确修改的bug & 调整traffic配置页面样式
|
2020-10-21 14:48:25 +08:00 |
|
zhangyu
|
77c336b7a7
|
featL修改所有侧滑框的样式
|
2020-10-15 14:27:46 +08:00 |
|
zhangyu
|
a774960f4d
|
fix:修改样式
|
2020-10-12 13:46:31 +08:00 |
|
zhangyu
|
494fedb4de
|
feat：添加连线的hover事件 修改图标库，添加国际化
|
2020-09-15 17:39:11 +08:00 |
|
zhangyu
|
5d01a7401d
|
feat：使用1.2的icon
|
2020-09-10 17:00:32 +08:00 |
|
wangwenrui
|
5851ed7067
|
style:调整traffic-setting的样式
|
2020-08-27 18:38:59 +08:00 |
|
wangwenrui
|
fac7af468a
|
perf:1.取消图表选择单位组件可输入 2.traffic setting tags为空时统一为空对象
|
2020-05-21 18:05:46 +08:00 |
|
wangwenrui
|
2e6a60db96
|
fix:1.alertMessage图表添加loading动画2.asset-telnet配置样式调整3.traffic修改协议不请求bug修复
|
2020-05-21 14:35:31 +08:00 |
|
wangwenrui
|
e8745745bc
|
perf:调整traffic配置tags显示颜色
|
2020-05-07 10:33:19 +08:00 |
|
wangwenrui
|
3e58bd4a41
|
perf:traffic setting 页面调整
|
2020-05-06 19:17:49 +08:00 |
|
wangwenrui
|
51b3401132
|
feat:traffic setting 交互调整
|
2020-05-06 13:59:00 +08:00 |
|
wangwenrui
|
ec91b6fc95
|
feat:traffic setting 功能修改
|
2020-04-30 19:55:41 +08:00 |
|
wangwenrui
|
78c30487a5
|
feat:traffic 配置初版
|
2020-04-28 17:39:54 +08:00 |
|