Commit Graph

94 Commits

Author SHA1 Message Date
zyh
8c0d60ec8b fix:解决冲突 2023-03-15 16:11:44 +08:00
zyh
90692487f0 NEZ-2681 fix:panel更改为dashboard 2023-03-15 15:39:06 +08:00
likexuan
38737e1e73 NEZ-2570 feat: asset 故障诊断页面开发 2023-02-17 09:24:38 +08:00
likexuan
31d76d0e4d perf : deleteButton 删除功能代码优化 2023-01-04 11:10:03 +08:00
zhangyu
153268bd5d NEZ-2479 fix:选中提示范围与实际点击生效范围不一致 2022-12-27 15:43:38 +08:00
zhangyu
379f1c0ae4 NEZ-2479 fix:选中提示范围与实际点击生效范围不一致 2022-12-27 13:46:56 +08:00
Xiao Bai
449ec60067 NEZ-2435 fix : 其它页面补充 2022-11-30 10:54:16 +08:00
likexuan
ddb4fa4cc9 fix : 复制功能组件替换 2022-10-20 17:08:16 +08:00
likexuan
de3f4ccc3c fix : 复制功能组件化替换 2022-10-20 16:38:11 +08:00
zhangyu
0880ed24fa NEZ-2264 fix: 全局搜索跳转后 显著提示 搜索记录 2022-10-19 13:57:17 +08:00
likexuan
f2000f1a12 NEZ-2244 fix : 列表删除按钮样式 和 批量删除 confirm 样式统一 2022-10-14 15:43:11 +08:00
likexuan
946cd11249 perf : 复制功能组件化 2022-08-17 10:30:11 +08:00
zhangyu
36cc3487e0 Merge branch 'dev-3.3' of https://git.mesalab.cn/nezha/nezha-fronted into dev-3.4 2022-07-25 13:59:05 +08:00
zhangyu
9a9dc50938 fix:表格错位的问题 2022-07-25 13:56:41 +08:00
likexuan
18132f9a8c fix : 判断复制内容是否为空 2022-07-22 10:46:49 +08:00
likexuan
9d39d0231c NEZ-1965 feat : 补充 复制功能 2022-07-15 10:42:09 +08:00
likexuan
afef8a71f0 NEZ-1965 perf : 更改cursor 样式 2022-07-05 14:06:31 +08:00
likexuan
4064987ef5 NEZ-1990 feat :补充 icon/button title 2022-07-01 09:39:20 +08:00
likexuan
71a4a9ecfa Merge branch 'dev-3.4' of https://git.mesalab.cn/nezha/nezha-fronted into dev-3.4 2022-06-23 13:40:29 +08:00
likexuan
99595a2dab NEZ-1965 feat : 列表页面内容复制功能 2022-06-23 13:40:20 +08:00
zhangyu
2eba091b7a Merge branch 'dev-3.3' of https://git.mesalab.cn/nezha/nezha-fronted into dev-3.4
# Conflicts:
#	nezha-fronted/src/assets/css/common.scss
2022-06-23 09:33:35 +08:00
zhangyu
bf7b5f0bb3 NEZ-1962 fix:黑色主题下的样式问题 修改 2022-06-22 16:34:05 +08:00
likexuan
6507b23257 perf : onCopy 方法提取到 mainMixinFun.js文件 2022-06-22 16:25:25 +08:00
zhangyu
98decd29f9 Merge branch 'dev-3.3' of https://git.mesalab.cn/nezha/nezha-fronted into dev-3.4
# Conflicts:
#	nezha-fronted/src/components/common/table/settings/userTable.vue
2022-06-22 11:47:20 +08:00
zhangyu
8010406cd1 fix:删除重复国际化数据 2022-06-21 18:14:21 +08:00
likexuan
7281e194b7 perf : asset 列表复制功能样式优化 2022-06-21 16:08:18 +08:00
zhangyu
a874bfa87b fix: 去除 重复国际化 2022-06-21 14:17:46 +08:00
likexuan
28de62396f NEZ-1965 feat : asset列表页面内容复制功能 2022-06-21 13:59: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
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
zhangyu
235411cbe8 Merge branch 'dev-3.2' of https://git.mesalab.cn/nezha/nezha-fronted into dev-3.3 2022-03-25 09:22:18 +08:00
zhangyu
fae3c0ab0c NEZ-1734 fix:页面 国际化的问题 2022-03-24 15:59:05 +08:00
zhangyu
ebfe1a3294 feat: 上传图标 2022-03-18 18:21:43 +08:00
zhangyu
8ae0bd5554 Merge branch 'dev-3.2' of https://git.mesalab.cn/nezha/nezha-fronted into dev-3.3 2022-03-18 18:10:15 +08:00
zhangyu
4f08857354 NEZ-1696 fix:Asset切换视图后选择Talon进行排序浏览器报错 2022-03-18 15:37:43 +08:00
zhangyu
430b8b1dce fix:aseet 添加关系图(20%) 2022-03-17 16:42:56 +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