Commit Graph

56 Commits

Author SHA1 Message Date
zhangyu
8010406cd1 fix:删除重复国际化数据 2022-06-21 18:14:21 +08:00
zhangyu
0a6aa58ad3 fix:删除部分重复国际化 2022-06-21 11:29:55 +08:00
zhangyu
e65f37b5b5 fix:处理中英文完全一样的国际化为一个 2022-06-16 15:58:17 +08:00
zhangyu
06ce77f48c style: 样式修改 2022-05-30 16:16:14 +08:00
zhangyu
c525634e58 NEZ-1856 style:样式调整 2022-05-26 16:32:20 +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
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
zhangyu
ebfe1a3294 feat: 上传图标 2022-03-18 18:21:43 +08:00
zhangyu
24ed289135 fix:修改详情页面报错的问题 2022-03-07 09:37:27 +08:00
zhangyu
be959ad26b NEZ-1631 fix:列表页面 默认排序字段 初始化状态修复 2022-03-04 13:59:25 +08:00
zhangyu
5e8964932f fix:修改 表格排序 无法取消选中的问题 2022-03-03 17:35:42 +08:00
zhangyu
b3664b7d71 fix:详情页面优化 2022-03-01 15:19:43 +08:00
zhangyu
f90bf99b45 fix:project-alert列显示悬浮 刷新 topo图的问题 2022-02-25 17:06:47 +08:00
zhangyu
95926fcf6f feat: 所有表格的 alert列调整 2022-02-25 14:31:36 +08:00
@changcode
a28bf47bf9 fix: v-has权限调整 2022-01-11 11:00:03 +08:00
zhangyu
18cd4d8cfd fix:修改topoList的层级 2022-01-11 10:19:26 +08:00
zhangyu
b6c046efb1 fix:修复部分页面 searchInput不回显的问题 2022-01-05 10:34:22 +08:00
@changcode
390e7b8ed0 feat: 补充页面路由使用 url path 传递参数 2021-12-22 19:54:51 +08:00
@changcode
74521c5d1f NEZ-1400 feat: 初始版本页面路由使用 url path 传递参数 2021-12-22 14:20:13 +08:00
chenjinsong
122a5f9495 perf: 样式调整 2021-11-15 14:00:54 +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
30ddb294f5 NEZ-1203 style : project 添加小窗口下的横向滚动条 2021-11-08 10:46:05 +08:00
zhangyu
501ec7807a NEZ-1192 fix:Project topo 全屏后再次点击左侧 project 链接后,右侧依旧为 全屏 2021-11-08 09:23:40 +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
zhangyu
fa2da5a3c1 Merge branch 'dev-2.0' of https://git.mesalab.cn/nezha/nezha-fronted into dev-3.1
# Conflicts:
#	nezha-fronted/src/components/common/language/cn.js
#	nezha-fronted/src/components/common/language/en.js
2021-10-22 18:08:37 +08:00
@changcode
ad8bef81ec NEZ-1075 feat: state 样式调整 2021-10-22 17:47:42 +08:00
zhangyu
cfca72366c feat: asset详细视图 基本功能实现 2021-10-13 18:24:09 +08:00
zhangyu
7afc73effc NEZ-938 feat:列表页面增加 duplicate按钮 2021-08-26 14:51:38 +08:00
zhangyu
1af455f864 NEZ-934 style:样式调整 2021-08-26 10:43:08 +08:00
@changcode
d46b8eaaf5 fix: 分页增加判断条件 2021-08-23 18:50:08 +08:00
@changcode
35873de962 fix: 修复新增弹框 title 错误问题 2021-07-19 11:18:13 +08:00
zhangyu
3a36dccf18 fix:修改 弹窗为右滑框 2021-06-01 15:19:47 +08:00
zhangyu
2ee081df1a NEZ-699: 增加告警静默一键配置功能 2021-06-01 14:26:09 +08:00
@changcode
9488eef644 fix: 搜索条件列表国际化补充 2021-05-20 11:39:12 +08:00
zhangyu
fd77ced048 feat: 所有表格 添加 loading 2021-05-18 19:18:14 +08:00
zhangyu
135c6bbfbb fix:将展开收起按钮 抽至header组件内 ,解决 termail 拖动蒙层显示不全的问题 2021-05-14 10:14:02 +08:00
zhangyu
d8c07bca23 feat:使用向导完善 2021-05-12 16:19:43 +08:00
chenjinsong
b23b0d347a NEZ-602 perf: 向导大部分内容 2021-05-11 22:29:14 +08:00
chenjinsong
5c3b058907 NEZ-600 fix: 各页面搜索框功能 2021-05-10 15:59:39 +08:00
chenjinsong
24c6f8d052 perf: project样式调整 2021-04-30 17:11:34 +08:00
chenjinsong
3f348e3624 fix: 恢复project修改,修复overview/asset接口 2021-04-30 11:45:22 +08:00
zhangyu
06584204ae fix:endpoint 显示bug修改 以及修改 chart 参数 2021-04-27 17:38:58 +08:00
zhangyu
d0a011c292 fix:修改 i18n的password 为key 时 替换为pin 2021-04-27 10:50:44 +08:00
zhangyu
43436e5cbe feat:Add chart by Temp 实现 50%
fix:修改endpointList 出现下弹窗时样式错乱的问题
2021-04-25 18:35:35 +08:00
zhangyu
9490f5c309 feat:修改 panel页面 pageSize未传的问题 以及chartTemp的预览 2021-04-25 14:58:03 +08:00
zhangyu
b4aafcd78f feat:添加权限 2021-04-22 15:52:32 +08:00
zhangyu
2803cbe695 style: project modue endpoint 样式微调 2021-04-21 16:35:48 +08:00
zhangyu
538d1a76e0 feat:module添加下拉弹窗
fix:修改panel chart不可移动的bug
2021-04-20 14:38:24 +08:00