zhangyu
|
5b276cf845
|
NEZ-1735 fix： 部分内容未进行国际化显示
|
2022-03-25 14:12:03 +08:00 |
|
@changcode
|
3ca8fa34e1
|
fix: 修复登陆成功后跳转路由错误问题，project 编辑图片 box 主题样式调整
|
2021-12-29 17:49:19 +08:00 |
|
chenjinsong
|
a709585a9f
|
Merge remote-tracking branch 'origin/dev-3.1' into dev-3.1.1_theme
# Conflicts:
# nezha-fronted/src/components/common/alert/alertLabel.vue
# nezha-fronted/src/components/common/detailView/detailViewTopSearch.vue
# nezha-fronted/src/components/common/i18n.js
# nezha-fronted/src/components/common/labelFilter/clickSearch.vue
# nezha-fronted/src/components/common/login.vue
# nezha-fronted/src/components/common/popBox/topToolMoreOptions.vue
|
2021-11-04 14:49:40 +08:00 |
|
zhangyu
|
219e71f7e0
|
fix: 修改 alertRule evalLog 时间错误的问题
|
2021-11-04 14:24:01 +08:00 |
|
zhangyu
|
6c1340cecf
|
NEZ-1163 feat： 组合筛选 增加显示 数量
|
2021-11-03 17:21:22 +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 |
|
zhangyu
|
448b0f7adc
|
fix： 切换详细视图时 未默认选中第一条的问题
|
2021-10-19 14:54:35 +08:00 |
|
zhangyu
|
52e2b262fa
|
Merge branch 'dev-3.1' of https://git.mesalab.cn/nezha/nezha-fronted into dev-3.1
# Conflicts:
# nezha-fronted/src/components/common/detailView/nzDetailView.vue
|
2021-10-18 17:41:24 +08:00 |
|
zhangyu
|
42854089b9
|
fix： 修改 顶部搜索样式
|
2021-10-18 17:40:21 +08:00 |
|
@changcode
|
ab23aaab3b
|
style: 新增asset deail页面select下拉选择器样式调整
|
2021-10-18 16:34:37 +08:00 |
|
zhangyu
|
f635c87740
|
fix： 样式调整
|
2021-10-15 15:59:46 +08:00 |
|
zhangyu
|
ed24261c5e
|
fix：修改assetCilckSearch的样式
|
2021-10-15 10:22:02 +08:00 |
|
zhangyu
|
4e501cfc11
|
feat：asset 详细视图添加
|
2021-10-14 14:14:25 +08:00 |
|
zhangyu
|
cfca72366c
|
feat： asset详细视图 基本功能实现
|
2021-10-13 18:24:09 +08:00 |
|
zhangyu
|
3029a0db41
|
feat： asset详细视图的回显完成
|
2021-10-13 14:44:34 +08:00 |
|
zhangyu
|
24d6e7a218
|
fix：搜索内容调整 modeil以及more未完善
|
2021-10-13 11:12:26 +08:00 |
|
zhangyu
|
2733502697
|
style：修改样式
|
2021-10-12 17:09:59 +08:00 |
|
zhangyu
|
133275d66d
|
feat：添加顶部搜索选择
|
2021-10-12 16:53:59 +08:00 |
|