Commit Graph

336 Commits

Author SHA1 Message Date
zyh
6b357a4baa NEZ-2097 fix:点击筛选菜单页面自动回跳 2022-08-03 16:24:00 +08:00
likexuan
d5144373c2 fix : asset 页面骨架屏补充 2022-07-21 11:30:35 +08:00
zhangyu
2de5d3db0f Merge branch 'dev-3.3' of https://git.mesalab.cn/nezha/nezha-fronted into dev-3.4 2022-07-06 17:52:01 +08:00
zhangyu
44ce3beabd fix:详细视图 鼠标滑过被选中的item 右侧闪烁的问题 2022-07-06 17:49:53 +08:00
likexuan
4064987ef5 NEZ-1990 feat :补充 icon/button title 2022-07-01 09:39:20 +08:00
zhangyu
e65f37b5b5 fix:处理中英文完全一样的国际化为一个 2022-06-16 15:58:17 +08:00
likexuan
4502abb98f NEZ-1895 fix : profile 新增用户个人 api key 页面 2022-06-09 13:18:09 +08:00
zhangyu
86018c5be5 NEZ-1901 fix:Models内对asset利用State条件搜索时无法搜索到内容 2022-06-08 14:18:09 +08:00
zhangyu
4c64c41342 feat:修改 asset 的 loading 2022-03-25 14:30:24 +08:00
zhangyu
69f061d868 Merge branch 'dev-3.2' of https://git.mesalab.cn/nezha/nezha-fronted into dev-3.3
# Conflicts:
#	nezha-fronted/src/components/charts/chartDataFormat.js
2022-03-25 14:28:07 +08:00
zhangyu
5b276cf845 NEZ-1735 fix: 部分内容未进行国际化显示 2022-03-25 14:12:03 +08:00
@changcode
8c26da6426 fix: asset Label国际化调整,MIB 下拉框样式调整 2022-03-23 14:15:57 +08:00
zhangyu
430b8b1dce fix:aseet 添加关系图(20%) 2022-03-17 16:42:56 +08:00
zhangyu
b0c23d1f03 fix:处理控制台报错 2022-03-10 16:55:49 +08:00
zhangyu
367a95b78b fix:视图详情报错修改 2022-03-07 09:29:32 +08:00
zhangyu
be959ad26b NEZ-1631 fix:列表页面 默认排序字段 初始化状态修复 2022-03-04 13:59:25 +08:00
zhangyu
b3664b7d71 fix:详情页面优化 2022-03-01 15:19: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
@changcode
d3592a95f6 NEZ-1534 fix: 修复Asset新增数据时Number与Brand & Model冲突 2022-02-15 09:30:30 +08:00
zhangyu
123c60d5d8 fix:全局搜索 跳转 详细视图选中 2022-01-18 10:06:33 +08:00
zhangyu
44002bf222 NEZ-1514 feat:全局搜索功能(90%) 2022-01-17 14:25:39 +08:00
@changcode
caef757c04 fix: v-has权限调整 2022-01-11 17:05:21 +08:00
@changcode
02a3ba5d5e NEZ-1488 fix: 修复Asset新增数据时,SNMP credential选中后没效果 2022-01-10 17:15:09 +08:00
zhangyu
94bc57885c fix:修改 asset保存时 时间格式的相关问题以及 group隐藏全屏按钮 2022-01-05 18:01:30 +08:00
zhangyu
b6c046efb1 fix:修复部分页面 searchInput不回显的问题 2022-01-05 10:34:22 +08:00
@changcode
57f06c050d fix: 去除 asset,alertMessage,endpoint 路由 url path 中无用参数 2021-12-27 15:41:58 +08:00
@changcode
647dc230d7 feat: 补充搜索条件select内容回显 2021-12-24 14:44:04 +08:00
zhangyu
df7cdd72f4 feat:clickSearch回显 2021-12-23 19:53:17 +08:00
@changcode
52a92d05c8 NEZ-1422 feat: 新增字段,完善Date Expires,license_type=trial 2021-12-23 14:54:00 +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
@changcode
bf263b9eb4 fix: 主题样式调整,修复chart页面逻辑错误问题 2021-12-07 17:01: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
da71a64f14 NEZ-1252 fix: Asset通过筛选后,滑动未回到开始位置 2021-11-17 15:56:55 +08:00
zhangyu
02802062fd NEZ-1260 fix: Endpoint/Asset 上方导航栏未及时刷新 2021-11-17 10:08:57 +08:00
chenjinsong
f27b6c2606 Merge remote-tracking branch 'origin/dev-3.1' into dev-3.1.1_theme
# Conflicts:
#	nezha-fronted/src/components/common/i18n.js
#	nezha-fronted/src/components/common/pagination.vue
#	nezha-fronted/src/components/common/searchInput.vue
#	nezha-fronted/src/components/common/table/settings/endpointTable.vue
#	nezha-fronted/src/components/page/dashboard/overview/overview2.vue
2021-11-15 14:06:42 +08:00
zhangyu
bbc48bbdbe NEZ-1236 fix: 点击筛选条件后,列表下方分页位置未更新 2021-11-15 10:25:30 +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
e31314e852 fix: 国际化调整 2021-11-08 16:56:10 +08:00
@changcode
42a89724bb NEZ-1204 fix: 修复在中文界面下,部分内容不会进行转换 2021-11-08 16:48:12 +08:00
chenjinsong
a709585a9f Merge remote-tracking branch 'origin/dev-3.1' into dev-3.1.1_theme
# Conflicts:
#	nezha-fronted/src/components/common/alert/alertLabel.vue
#	nezha-fronted/src/components/common/detailView/detailViewTopSearch.vue
#	nezha-fronted/src/components/common/i18n.js
#	nezha-fronted/src/components/common/labelFilter/clickSearch.vue
#	nezha-fronted/src/components/common/login.vue
#	nezha-fronted/src/components/common/popBox/topToolMoreOptions.vue
2021-11-04 14:49:40 +08:00
@changcode
cb2ec828b9 Merge branch 'dev-3.1' of https://git.mesalab.cn/nezha/nezha-fronted into dev-3.1 2021-11-03 18:10:04 +08:00
@changcode
bedbfae434 fix: 修复 asset 批量修改点击后隐藏问题 2021-11-03 18:09:56 +08:00
zhangyu
d1e38477ee fixl 修改panel alertlist snmp 双击打开弹窗的问题 2021-11-03 17:30:20 +08:00
zhangyu
6c1340cecf NEZ-1163 feat: 组合筛选 增加显示 数量 2021-11-03 17:21:22 +08:00
zhangyu
f6ac483d33 NEZ-1137 fix; 导出样式调整 2021-11-02 15:47:17 +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
b93a586d79 fix: 修改cilckSearch 回显的问题 2021-10-27 17:36:59 +08:00