Commit Graph

37 Commits

Author SHA1 Message Date
zhangyu
53e5ad91a7 fix:补充中文国际化 2022-03-24 16:27:20 +08:00
zhangyu
1fc96f2c75 NEZ-1680 fix:Asset批量修改时保存成功,查看界面显示部分数据修改失败 2022-03-14 17:59:14 +08:00
zhangyu
beee6c53be fix:修改国际化 2022-02-17 17:23:34 +08:00
zhangyu
95366a23c8 Merge branch 'dev-3.1' of https://git.mesalab.cn/nezha/nezha-fronted into dev-3.2 2022-01-11 16:22:35 +08:00
@changcode
31eeccafae NEZ-1490 fix: 修复Label有数量限制,新添加的Label无法进行选择 2022-01-10 18:30:19 +08:00
@changcode
2864718932 NEZ-1490 fix: 修复Label有数量限制,新添加的Label无法进行选择 2022-01-10 17:47:36 +08:00
@changcode
a869739fbd NEZ-1489 fix: 修复type类型切换后数据未同步 2022-01-10 17:13:37 +08:00
@changcode
452d5573be fix: 去除无用时间格式 2022-01-04 16:26:15 +08:00
zhangyu
f50db242d4 fix:时间选择器组件 统一使用format 2022-01-04 14:57:59 +08:00
@changcode
2dc4591956 style: 主题样式调整 2021-12-07 10:37:40 +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
zhangyu
897fb7673c fix: 处理国际化的问题 2021-11-04 18:21:20 +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
@changcode
5a831004f5 NEZ-1080 style: 鼠标悬浮样式调整 2021-10-26 17:47:49 +08:00
@changcode
90d51840c7 fix: 修复批量修改 label 级联选择器 ,下拉框及复选框,选择报错问题 2021-09-27 17:36:12 +08:00
@changcode
2bf2ca0504 style: asset 批量修改样式调整 2021-09-27 17:11:08 +08:00
@changcode
9542e1a63a style: Box 样式调整 2021-09-26 18:14:47 +08:00
@changcode
1e80a05033 style: 下拉样式调整 2021-09-26 09:14:07 +08:00
@changcode
025ae13877 NEZ-1023 style: 下拉列表 样式调整 2021-09-24 17:07:16 +08:00
@changcode
7a4bbfee4a NEZ-992 fix: 修复 asset 批量修改 label 显示问题 2021-09-14 10:52:54 +08:00
@changcode
4191c8113f NEZ-835 fix: 新增页面添加标签页关闭提示功能 2021-07-15 11:56:25 +08:00
@changcode
d33f6ff598 NEZ-807 fix: 标签关闭 提示功能 2021-07-05 14:43:47 +08:00
zhangyu
132b5f927c NEZ-789 fix: 添加报错提示 2021-07-02 14:03:17 +08:00
zhangyu
03f3c69142 fix:修改批量修改的密码显示明文的问题 , asset cahrt 导入显示不正确的问题 2021-05-25 10:26:13 +08:00
chenjinsong
a202a88785 fix: 修复add-endpoint时会自动补全port问题 2021-05-21 18:29:40 +08:00
chenjinsong
94c35fd985 NEZ-656 fix: 穿梭框asset列表数据改正 2021-05-21 17:14:58 +08:00
chenjinsong
e9dd18c0d8 NEZ-656 fix: 穿梭框问题 2021-05-21 16:34:22 +08:00
zhangyu
e2636bee95 fix:修改asset 顶部按钮,修改assetModel 上滑,修改module endpoint上滑编辑页面 2021-05-14 17:09:57 +08:00
zhangyu
801180443f fix:修复 alertMessage 图表不显示的问题 以及 查看图表后 分页查询带了时间参数的问题 2021-05-14 15:24:32 +08:00
zhangyu
4b43934743 feat:本地重构element-ui的时间选择器 2021-04-28 15:18:21 +08:00
zhangyu
d0a011c292 fix:修改 i18n的password 为key 时 替换为pin 2021-04-27 10:50:44 +08:00
zhangyu
f70ae799ab fix:修改公用穿梭框 2021-04-26 10:28:01 +08:00
zhangyu
de5fe9f1c6 fix:解决asset。tableTitle 删除后的影响 2021-04-25 16:28:09 +08:00
chenjinsong
5cce046423 feat: asset基本功能 2021-04-23 19:58:08 +08:00
chenjinsong
978049999e feat: asset相关先提交一部分,公共样式 2021-04-22 12:25:23 +08:00