gfwleak/nezha-nezha-fronted
Archived
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
4,217 Commits 31 Branches 139 Tags
9c4e2a95250faaf41b431f91a12f5f543f6fde41
Commit Graph

235 Commits

Author SHA1 Message Date
zhangyu
e47e353566 Merge branch 'dev-3.2' of https://git.mesalab.cn/nezha/nezha-fronted into dev-3.3 
# Conflicts:
#	nezha-fronted/src/components/common/project/popData/Info.vue
 2022-04-01 13:33:16 +08:00
zhangyu
7db7e39a47 NEZ-1735 fix：国际化补充 2022-04-01 11:03:31 +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
@changcode
21b6fa9db3 fix: 修复列表页面错位 2022-03-24 14:16:35 +08:00
zhangyu
9e00d50795 Merge branch 'dev-3.2' of https://git.mesalab.cn/nezha/nezha-fronted into dev-3.3 
# Conflicts:
#	nezha-fronted/src/components/chart/chart/chartGauge.vue
#	nezha-fronted/src/components/chart/chart/chartHexagonD3.vue
 2022-03-24 13:40:37 +08:00
zhangyu
bd259fd291 fix：修改 project module endpoint 的路由 2022-03-23 18:08:00 +08:00
@changcode
4bdee680c6 fix:修复 IPAM IP details页面表单验证和国际化 2022-03-22 17:43:56 +08:00
@changcode
ce4817ea42 fix: 修复ipam 二级页面 搜索排序传参错误问题 2022-03-22 10:04:30 +08:00
@changcode
ed5eae3489 fix: 完善修复 ipam ip 二级菜单列表 2022-03-21 18:07:26 +08:00
zhangyu
568b4a4e80 feat： 优化关系图 2022-03-21 11:17:53 +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
@changcode
838c2a68e9 fix: IPAM 和 IPAM IP 二级页面列表默认排序高亮 2022-03-18 17:17:06 +08:00
@changcode
01e1c5dcc7 fix: 补充默认排序高亮选中 2022-03-18 17:11:49 +08:00
@changcode
291562452a feat: ipam ip 二级菜单编辑页面 2022-03-17 09:46:56 +08:00
@changcode
e074264ea9 feat:ipam 二级菜单列表页面 2022-03-16 15:55:19 +08:00
@changcode
e0b4224068 fix: 修复model列表页 type 数据为空时报错 2022-03-15 18:43:22 +08:00
zhangyu
274015ecf1 Merge branch 'dev-3.2' of https://git.mesalab.cn/nezha/nezha-fronted into dev-3.3 2022-03-14 16:23:16 +08:00
@changcode
8b0a334dde NEZ-1664 feat: asset model 新增补充 2022-03-11 18:16:07 +08:00
@changcode
878207d722 feat: asset model 增加 type，sysObjectId 2022-03-11 14:26:14 +08:00
@changcode
9df259455f NEZ-1652 fix: 修复agent 二级页面 last scrape 时间格式化错误 2022-03-10 10:20:53 +08:00
zhangyu
bb3e330d97 fix：处理 表格tooltip 调用两次接口的问题 2022-03-09 19:32:04 +08:00
zhangyu
253bfcf883 NEZ-1629 fix： Explore内生成表达式后点击Save chart按钮保存图表时弹出侧滑框内没有表达式数据 2022-03-08 11:35:22 +08:00
zhangyu
be959ad26b NEZ-1631 fix：列表页面 默认排序字段 初始化状态修复 2022-03-04 13:59:25 +08:00
@changcode
c2e17dd325 fix: IPAM 页面列表展示顺序调整 2022-03-04 10:16:06 +08:00
@changcode
82b3ee216c feat: 补充 IPAM 页面 2022-03-03 18:06:45 +08:00
@changcode
cc4f5698ec NEZ-1617 feat: IPAM 页面开发 2022-03-03 10:33:29 +08:00
@changcode
3ab96aaf54 fix: 去除无用代码 2022-02-28 13:40:57 +08:00
@changcode
37cabb69bc NEZ-1603 fix: cabinet 列表页面 取消 alert 列 2022-02-28 09:42:05 +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
zhangyu
2bd1fe4df4 feat：dc ， bottom-asset 以及 bootom-cabinet 替换 alert列 2022-02-25 14:07:17 +08:00
zhangyu
3fbe06e638 fix：agent细节调整 2022-02-17 18:38:47 +08:00
zhangyu
beee6c53be fix：修改国际化 2022-02-17 17:23:34 +08:00
zhangyu
c0919ffdf1 NEZ-1572 feat： agent 页面增加 name 2022-02-17 15:07:24 +08:00
zhangyu
cc73e85860 NEZ-1514 feat:全局搜索功能 2022-01-17 16:32:00 +08:00
@changcode
e2535b7f32 NEZ-1515 feat: agent 增加 scrape endpoint 二级页面 2022-01-14 19:54:37 +08:00
zhangyu
59306f5bf8 fix：修改 tooltip不显示的问题 2022-01-14 10:04:01 +08:00
@changcode
c12dcfded7 feat: agent 增加 scrape endpoint 二级页面 2022-01-14 09:17:53 +08:00
@changcode
183a8c6749 fix: 去除多余tab切换代码 2022-01-13 17:57:20 +08:00
@changcode
7ed10d2de5 fix: 修复页面权限错误问题 2022-01-12 11:31:04 +08:00
@changcode
caef757c04 fix: v-has权限调整 2022-01-11 17:05:21 +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
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
e0d01d7ab4 fix: endpoint取消state排序 2021-11-25 20:17:04 +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