Commit Graph

57 Commits

Author SHA1 Message Date
zhangyu
fae3c0ab0c NEZ-1734 fix:页面 国际化的问题 2022-03-24 15:59:05 +08:00
zhangyu
4f08857354 NEZ-1696 fix:Asset切换视图后选择Talon进行排序浏览器报错 2022-03-18 15:37:43 +08:00
zhangyu
bb3e330d97 fix:处理 表格tooltip 调用两次接口的问题 2022-03-09 19:32:04 +08:00
zhangyu
2bd1fe4df4 feat:dc , bottom-asset 以及 bootom-cabinet 替换 alert列 2022-02-25 14:07:17 +08:00
zhangyu
1d769d66ff feat: alert列 调整 2022-02-25 10:53:43 +08:00
zhangyu
35825451a9 NEZ-1592 feat: asset等列表页面增加 最近告警趋势 图表 2022-02-24 17:43:34 +08:00
zhangyu
0c6dab781d NEZ-1592 feat:asset等列表页面增加 最近告警趋势 图表(70%) 2022-02-24 13:43:20 +08:00
zhangyu
cc73e85860 NEZ-1514 feat:全局搜索功能 2022-01-17 16:32:00 +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
chenjinsong
93aed78d3f NEZ-1356 fix: asset列表talon状态修改 2021-11-25 18:23:51 +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
5d7d6c664e fix: 列表页面增加 v-has 权限 2021-11-10 18:09:05 +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
ab87e01394 style: table列表样式调整 2021-10-28 17:53:27 +08:00
@changcode
9e82c52436 NEZ-1079 perf: 将各处列表、dashboard等页面中多处下拉框的弹出触发方式统一为点击触发 2021-10-25 17:16:40 +08:00
@changcode
bbe760999d style: 样式调整 2021-10-25 14:45:28 +08:00
@changcode
2351baa8f3 fix: 列表no data样式展示异常问题 2021-10-22 19:39:49 +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
e878dabfe8 feat:asset 自定义label显示图标 2021-10-15 16:57:17 +08:00
zhangyu
cfca72366c feat: asset详细视图 基本功能实现 2021-10-13 18:24:09 +08:00
zhangyu
24d6e7a218 fix:搜索内容调整 modeil以及more未完善 2021-10-13 11:12:26 +08:00
zhangyu
2aab2cb550 feat:优化视图与列表的切换速度 2021-10-11 16:12:09 +08:00
@changcode
9542e1a63a style: Box 样式调整 2021-09-26 18:14:47 +08:00
@changcode
5879ca0c8a style:下拉选择器样式统一 2021-09-26 11:56:36 +08:00
@changcode
9a4c09de8d NEZ-972 fix: 支持 配置 snmp trap 告警规则 2021-09-06 18:58:35 +08:00
@changcode
add53d7146 fix: 修复样式问题,缩放功能优化 2021-08-12 14:28:23 +08:00
@changcode
6d8da439df fix: 解决冲突 2021-07-28 14:19:08 +08:00
@changcode
79b1b94171 NEZ-871 feat: asset支持talon配置,列表增加talon列 2021-07-28 14:12:58 +08:00
zhangyu
4a8cc7b0d6 fix: 修改 asset children 和parant的位置 以及文案修改 2021-07-16 14:43:20 +08:00
zhangyu
9ae70267bf fix:处理 asset Sub 切换底部选项 出现多个subAsset的问题 2021-07-16 09:56:18 +08:00
zhangyu
c2cf06b485 fix: 修改assetBox vm=1时 位置可以编辑的问题 2021-07-15 15:30:23 +08:00
zhangyu
cfccac90e7 NEZ-829 feat:aseet添加子集表格 2021-07-15 14:38:55 +08:00
@changcode
95af9160a7 fix: 列表数据为空时统一占位字符 2021-07-09 15:35:58 +08:00
@changcode
44b29b38d8 fix: 1. 修复系统右侧图片按钮弹框显示问题
2. 修复页面排序请求错误问题
2021-07-07 16:57:26 +08:00
@changcode
4af650ca63 fix: assetTab 页面 operation 加判断条件,替换无效按钮 2021-06-28 09:57:57 +08:00
zhangyu
9ee8b0f7ba NEX-717 fix:bug修改 2021-06-02 16:55:17 +08:00
zhangyu
2ee081df1a NEZ-699: 增加告警静默一键配置功能 2021-06-01 14:26:09 +08:00
zhangyu
a90fa14ef0 fix:隐藏 project 右滑表格的操作列 2021-05-27 17:58:29 +08:00
@changcode
98ed947742 NEZ-681 fix: 页面列表样式调整 2021-05-27 13:53:42 +08:00
@changcode
b65cb0625e Merge branch 'dev-2.0' of https://git.mesalab.cn/nezha/nezha-fronted into dev-2.0 2021-05-25 17:58:49 +08:00
@changcode
7bb2975867 NEZ-662 fix : 解决因全局css样式的影响 2021-05-25 17:58:38 +08:00
zhangyu
807b0aecea feat:添加表格双击点击事件 2021-05-25 15:37:33 +08:00
chenjinsong
9f73a5eb33 fix: duplicate图表时去掉一些参数 2021-05-24 17:46:21 +08:00
@changcode
d67db3945f fix: 国际化补充 2021-05-24 10:12:01 +08:00
@changcode
727378c2f7 NEZ-640 fix: 按钮权限 无效 2021-05-19 14:26:09 +08:00
@changcode
a471050185 NEZ-628 fix: 使用向导页面 按钮权限控制问题 2021-05-19 14:04:16 +08:00
@changcode
985e6521f2 fix: 国际化修改 2021-05-18 17:34:36 +08:00