Commit Graph

162 Commits

Author SHA1 Message Date
likexuan
8af4f22941 fix : 国际化更改 2022-08-01 16:32:29 +08:00
likexuan
4f65ad4e4b fix : agent提示框更改(全英文) 2022-07-21 17:05:51 +08:00
likexuan
5d43060453 NEZ-2008 fix : 界面 国际化 更改 2022-07-12 14:06:14 +08:00
likexuan
6872818144 Merge branch 'dev-3.4' of https://git.mesalab.cn/nezha/nezha-fronted into dev-3.4 2022-07-11 10:10:33 +08:00
likexuan
bbfad7106d NEZ-2008 fix : 界面 国际化 检查 2022-07-11 10:10:26 +08:00
zhangyu
716ff64eb3 style: 黑色主题下的样式调整 2022-07-06 17:35:45 +08:00
zhangyu
782c7341d2 fix:删除重复国际化 2022-06-22 10:13:55 +08:00
zhangyu
8010406cd1 fix:删除重复国际化数据 2022-06-21 18:14:21 +08:00
zhangyu
0a6aa58ad3 fix:删除部分重复国际化 2022-06-21 11:29:55 +08:00
zhangyu
c935039807 fix:国际化修改 2022-06-17 10:39:36 +08:00
zhangyu
e65f37b5b5 fix:处理中英文完全一样的国际化为一个 2022-06-16 15:58:17 +08:00
zhangyu
f0b5f13a70 fix: 修改未执行eslint的代码 2022-04-11 17:24:10 +08:00
zhangyu
e47e353566 Merge branch 'dev-3.2' of https://git.mesalab.cn/nezha/nezha-fronted into dev-3.3
# Conflicts:
#	nezha-fronted/src/components/common/project/popData/Info.vue
2022-04-01 13:33:16 +08:00
zhangyu
7db7e39a47 NEZ-1735 fix:国际化补充 2022-04-01 11:03:31 +08:00
zhangyu
08274e4cbf NEZ-1760 fix:拓扑图内查看endpoint时,内容未满一页时,下方边框位置有误 2022-04-01 10:56:06 +08:00
zhangyu
b2ec953c95 Merge branch 'dev-3.2' of https://git.mesalab.cn/nezha/nezha-fronted into dev-3.3 2022-03-28 14:24:34 +08:00
zhangyu
c42ddd6e24 NEZ-1740 feat:告警列 最近告警柱形图 根据 告警数量显示不同高度 2022-03-28 12:30:51 +08:00
zhangyu
5c4b263809 NEZ-1740 fix:告警列 最近告警柱形图 根据 告警数量显示不同高度 2022-03-28 10:42:31 +08:00
@changcode
b1e4745909 NEZ-1739 feat: 补充loading 动画 2022-03-25 15:40:05 +08:00
@changcode
34a6a92031 fix: 修复projects 左侧图,弹框Box报错 2022-03-23 17:47:27 +08:00
zhangyu
24ed289135 fix:修改详情页面报错的问题 2022-03-07 09:37:27 +08:00
zhangyu
b3664b7d71 fix:详情页面优化 2022-03-01 15:19:43 +08:00
zhangyu
68ac416c3e fix: 修改projet页面 显示悬浮窗 topo不断刷新的问题 2022-02-25 16:36:40 +08:00
zhangyu
45b6e953d2 fix: 修改 日期格式 2021-12-31 16:41:30 +08:00
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
@changcode
dcd1474b85 fix: info 页面增加判断条件,防止数据为空时出现弹框 2021-11-26 17:37:20 +08:00
chenjinsong
f27b6c2606 Merge remote-tracking branch 'origin/dev-3.1' into dev-3.1.1_theme
# Conflicts:
#	nezha-fronted/src/components/common/i18n.js
#	nezha-fronted/src/components/common/pagination.vue
#	nezha-fronted/src/components/common/searchInput.vue
#	nezha-fronted/src/components/common/table/settings/endpointTable.vue
#	nezha-fronted/src/components/page/dashboard/overview/overview2.vue
2021-11-15 14:06:42 +08:00
@changcode
6ee703d2c3 style: project 页面 右侧图表 alertTable Box select 样式调整 2021-11-12 15:35:38 +08:00
chenjinsong
a0dcb8d877 Merge remote-tracking branch 'origin/dev-3.1' into dev-3.1.1_theme
# Conflicts:
#	nezha-fronted/src/components/cli/webSSH.vue
#	nezha-fronted/src/components/common/alert/alertLabel2.vue
#	nezha-fronted/src/components/common/detailView/list/asset/assetDetail.vue
#	nezha-fronted/src/components/common/popBox/topToolMoreOptions.vue
#	nezha-fronted/src/components/common/rightBox/editEndpointBoxNew.vue
#	nezha-fronted/src/components/common/rightBox/moduleBox.vue
#	nezha-fronted/src/components/page/config/system.vue
#	nezha-fronted/src/components/page/monitor/project/index.vue
2021-11-11 11:28:19 +08:00
@changcode
a504354f60 fix: 修复 info 页面数据返回错误 2021-11-10 14:20:38 +08:00
zhangyu
897fb7673c fix: 处理国际化的问题 2021-11-04 18:21:20 +08:00
chenjinsong
d1efdde2ba NEZ-1072 feat: 主题切换冲突解决 2021-11-01 23:05: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
7d1bef73a1 fix: module info鼠标悬浮框,没有数据时不展示悬浮框,增加报错提示 2021-10-29 09:52:17 +08:00
@changcode
09aaf4c787 NEZ-1105 fix: module info 页面调整 2021-10-28 16:03:32 +08:00
@changcode
2351baa8f3 fix: 列表no data样式展示异常问题 2021-10-22 19:39:49 +08:00
@changcode
cb3ed0fcdc fix: asset label type列 与 Box 统一 icon 图标 2021-09-23 09:56:26 +08:00
@changcode
371dc687db NEZ-1020 fix:project topology module info显示内容优化 2021-09-22 18:06:42 +08:00
@changcode
65c07e5a43 fix: 修复 project页面侧滑样式问题,system页面列表样式问题 2021-09-08 16:22:49 +08:00
@changcode
ab7e092c70 fix: panel 下拉框样式调整,project页面 Endpoint侧滑数据处理错误问题 2021-09-08 11:37:41 +08:00
@changcode
17addd5a02 fix: 修复列表高度问题,补充国际化 2021-08-27 13:54:04 +08:00
@changcode
d46b8eaaf5 fix: 分页增加判断条件 2021-08-23 18:50:08 +08:00
zhangyu
0fb427fc00 fix: endpoint table调整 2021-08-10 09:30:12 +08:00
zhangyu
6269b5f659 fix: 处理 project endpoint列表不显示的问题 2021-08-06 18:30:30 +08:00
zhangyu
48cc2ae1fe NEZ-863 fix:修改panel 页面 搜素后样式错乱的问题 2021-07-23 15:49:18 +08:00
@changcode
44b29b38d8 fix: 1. 修复系统右侧图片按钮弹框显示问题
2. 修复页面排序请求错误问题
2021-07-07 16:57:26 +08:00
@changcode
7c96bd148c fix: 修复组件 Project => Bifang 弹框Box不显示问题 2021-07-02 09:53:43 +08:00
@changcode
c5c025bf09 fix: 去除系统页面左侧 Bifang 侧滑BOX的排序功能 2021-06-17 15:23:18 +08:00
@changcode
06ee4eb3c2 fix: 修复因数据变化导致数据展示不正确问题 2021-06-17 15:11:11 +08:00