Commit Graph

86 Commits

Author SHA1 Message Date
zhangyu
07accb61c0 Merge branch 'dev-3.2' of https://git.mesalab.cn/nezha/nezha-fronted into dev-3.3
# Conflicts:
#	nezha-fronted/src/components/chart/panelChart.vue
2022-04-20 09:38:03 +08:00
zhangyu
12f996555f fix: 删除console 2022-04-20 09:35:27 +08:00
zhangyu
8a822b94d7 Merge branch 'dev-3.2' of https://git.mesalab.cn/nezha/nezha-fronted into dev-3.3
# Conflicts:
#	.gitlab-ci.yml
2022-04-15 16:30:28 +08:00
zhangyu
9c5df8a354 fix:修改导出pdf的文件名 2022-04-15 16:29:23 +08:00
zhangyu
e0aed5d4f8 fix:修改 底部弹窗 传递id的方法 2022-04-13 18:14:08 +08:00
zhangxiaolong
52fbff49e2 fix : 时间选择器历史记录绑定修改 2022-04-13 17:09:59 +08:00
zhangyu
501e7f5043 Merge branch 'dev-3.2' of https://git.mesalab.cn/nezha/nezha-fronted into dev-3.3
# Conflicts:
#	nezha-fronted/src/assets/css/font/iconfont.css
#	nezha-fronted/src/assets/css/font/iconfont.js
#	nezha-fronted/src/assets/css/font/iconfont.ttf
#	nezha-fronted/src/assets/css/font/iconfont.woff
#	nezha-fronted/src/assets/css/font/iconfont.woff2
#	nezha-fronted/src/assets/css/nzIcon.css
#	nezha-fronted/src/components/page/dashboard/panel.vue
2022-04-13 10:50:11 +08:00
zhangyu
b29d9f8489 feat:导出 pdf 添加时间 2022-04-13 10:48:00 +08:00
zhangyu
8f4df97372 style:修改 导出pdf的图标 2022-04-12 18:07:42 +08:00
zhangyu
c56b81f1c7 style:修改导出pdf的图标 2022-04-12 17:19:51 +08:00
zhangyu
257814f6b0 Merge branch 'dev-3.2' of https://git.mesalab.cn/nezha/nezha-fronted into dev-3.3
# Conflicts:
#	nezha-fronted/src/components/charts/chart-alert-list.vue
#	nezha-fronted/src/components/common/bottomBox/tabs/endpointQueryTab.vue
#	nezha-fronted/src/components/common/table/alert/alertMessageTable.vue
2022-04-12 10:46:19 +08:00
zhangyu
87c48a8f35 perf:删除没有用到的代码 2022-04-12 10:30:33 +08:00
zhangyu
8a2118f268 Merge branch 'dev-3.2' of https://git.mesalab.cn/nezha/nezha-fronted into dev-3.3
# Conflicts:
#	nezha-fronted/src/components/common/js/htmlToPdf.js
2022-04-12 09:29:21 +08:00
zhangyu
03ebb14aff feat:panel底弹窗添加导出pdf 2022-04-11 17:54:38 +08:00
zhangyu
12970ab5a2 Merge branch 'dev-3.2' of https://git.mesalab.cn/nezha/nezha-fronted into dev-3.3 2022-03-25 17:43:17 +08:00
zhangyu
4e343d7137 fix: 修改 值为 “0” 对取最大值的影响 2022-03-25 16:37:24 +08:00
@changcode
b1e4745909 NEZ-1739 feat: 补充loading 动画 2022-03-25 15:40:05 +08:00
zhangyu
1e7b1da349 NEZ-1708 fix:Chart templates点击删除图表模板按钮后弹窗后点击取消浏览器报错,再次点击删除按钮失效 2022-03-23 15:06:36 +08:00
zhangyu
b629ef4d89 NEZ-1708 fix:Chart templates点击删除图表模板按钮后弹窗后点击取消浏览器报错,再次点击删除按钮失效 2022-03-22 15:42:50 +08:00
zhangyu
5a478fbffe fix:修改panel lock 刷新就panel 就重置的问题 2022-03-11 10:45:19 +08:00
zhangyu
dfec693d0f fix:修改 同步 group内的图表 未刷新页面的问题 2022-03-10 16:51:51 +08:00
zhangyu
49042f83fd fix:修改 chartTemp 同步错误的问题 2022-03-10 15:27:01 +08:00
zhangyu
c503d90326 fix:修改 同步功能的无效的问题 2022-03-10 11:31:48 +08:00
zhangyu
ff32ea7dc1 fix:接口 visual/panel/chart/id 的返回数据格式变更 2022-03-02 10:46:57 +08:00
@changcode
3ab96aaf54 fix: 去除无用代码 2022-02-28 13:40:57 +08:00
@changcode
8e0bc07933 fix: panelTanNew 页面去除无用搜索框 2022-02-28 09:52:06 +08:00
zhangyu
e54c0ea67f NEZ-1586 fix:Chart templates内锁定解锁按钮点击没有效果 2022-02-22 14:11:47 +08:00
zhangyu
1b90f0f9ae NEZ-1537 fix:修改 asset 修改时间 group内的数据未更新的问题 2022-02-15 11:23:10 +08:00
zhangyu
0a02f01fae NEZ-1538 fix: Asset详情界面锁定后,图表依然可以移动 2022-02-14 17:46:54 +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
@changcode
7bbf078c84 NEZ-1480 fix: 修复license时间展示错误问题 2022-01-05 10:15:52 +08:00
zhangyu
d0a229492f fix:修改 chartTemp 新增组件使用错误的问题 2022-01-04 16:26:43 +08:00
zhangyu
55203ef0ea fix:修改时间格式的相关错误 2022-01-04 14:27:28 +08:00
zhangyu
45b6e953d2 fix: 修改 日期格式 2021-12-31 16:41:30 +08:00
zhangyu
2530b45430 fix:修改 bottom panel 懒加载失效的问题 2021-12-31 14:06:02 +08:00
zhangyu
8b2e144e59 fix: 修改 panelLock 的 相关文案 2021-12-30 09:54:17 +08:00
zhangyu
11ce32e73e fix: 修改 复制 groupId = 0 的问题 以及 删除other的hexagon 2021-12-29 18:12:40 +08:00
zhangyu
92a26b9cbe fix: 优化复制chart的逻辑 2021-12-29 16:18:46 +08:00
@changcode
08a177c9ed fix: panelTabNew 增加默认值 2021-12-21 18:42:17 +08:00
@changcode
3e749ce70c fix: 修复底部弹框 panel chartBox弹出错误问题 2021-12-21 18:36:22 +08:00
zhangyu
0e27bc6cc4 fix: 修改 system — chartType 不正确的问题 2021-12-16 20:54:00 +08:00
zhangyu
f20f5a502a feat: 样式调整 2021-12-16 19:53:46 +08:00
zhangyu
44bb4ab27c fix: 修改下弹窗显示错误的问题 2021-12-16 19:50:23 +08:00
@changcode
068d66e1f3 NEZ-1433 feat:chart-endpointInfo 组件开发 2021-12-16 18:15:52 +08:00
zhangyu
c4f7e2ede7 Merge branch 'dev-3.1' of https://git.mesalab.cn/nezha/nezha-fronted into dev-3.2 2021-12-08 15:15:50 +08:00
zhangyu
1a124dbf8b fix: 修改深拷贝失效的问题 2021-12-08 15:15:18 +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
5078715039 fix: panel 以及下弹窗panel 同步时添加loading 2021-11-27 12:07:25 +08:00
zhangyu
857392eef3 fix: 修改同步接口参数 2021-11-25 10:55:46 +08:00