Commit Graph

25 Commits

Author SHA1 Message Date
@changcode
b1e4745909 NEZ-1739 feat: 补充loading 动画 2022-03-25 15:40:05 +08:00
zhangyu
36cd9af819 fix:修改底部弹窗 alertMessage 时间错误的问题 2022-03-09 14:26:11 +08:00
zhangyu
24ed289135 fix:修改详情页面报错的问题 2022-03-07 09:37:27 +08:00
zhangyu
5e8964932f fix:修改 表格排序 无法取消选中的问题 2022-03-03 17:35:42 +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
zhangyu
0e35349926 NEZ-1352 fix: 修改部分底部弹窗 漏传参数的问题 2021-11-25 14:39:45 +08:00
zhangyu
c19f8436e6 NEZ-1258 fix: Asset查看详情时,多个功能点的搜索记录同步 2021-11-17 13:51:28 +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
d2f9afebcb fix: 修复国际化错误 2021-11-05 17:25:41 +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
2351baa8f3 fix: 列表no data样式展示异常问题 2021-10-22 19:39:49 +08:00
zhangyu
cfca72366c feat: asset详细视图 基本功能实现 2021-10-13 18:24:09 +08:00
zhangyu
13bd9a0d8d NEZ-1048 feat:asset详细视图 右侧内容区域 以及部分优化 2021-10-11 14:05:07 +08:00
zhangyu
cd72fad4b7 fix: 优化 metrics 的数据 不再频繁调用接口 2021-09-28 16:54:07 +08:00
zhangyu
fb7a7a349a fix; 搜索框 下拉类型 禁止输入 2021-09-27 18:06:41 +08:00
@changcode
15276d987a NEZ-777 fix: 修复点击查询按钮,输入查询,查询出来的数据是所有的操作数据 2021-06-30 17:56:37 +08:00
@changcode
31c3792c14 fix: 去除 bottomBox 列表页面无效按钮,替换为编辑按钮 2021-06-25 14:09:18 +08:00
zhangyu
4c6890cfe8 Nez-752 fix:修改切换数据源 数据没改变的问题 2021-06-21 19:12:25 +08:00
wangwenrui
5dcb0e740a NEZ-570 fix: terminal 审计日志搜索无效 && dc 上划页面 2021-04-23 20:06:58 +08:00
wangwenrui
4fe0b1356c fix:补充 eslint 格式化 2021-04-22 18:03:56 +08:00
wangwenrui
a28548cb39 NEZ-566 fix:Administration 页面bug修复 2021-04-22 17:43:13 +08:00
chenjinsong
9683eda3a9 perf: 上滑二级列表样式调整 2021-04-14 18:35:42 +08:00
chenjinsong
e15d8dff15 perf: panel样式;列表的table抽取 2021-04-12 13:00:59 +08:00
chenjinsong
527c189ced perf: settings列表改版(细节未调整) 2021-04-08 20:28:54 +08:00