Commit Graph

4981 Commits

Author SHA1 Message Date
likexuan
e623431c99 Merge branch 'dev-3.4' of https://git.mesalab.cn/nezha/nezha-fronted into dev-3.4 2022-07-14 14:05:48 +08:00
likexuan
57cbc68873 fix : canvasProps 样式更改 2022-07-14 14:05:41 +08:00
zhangyu
9842b8a69c Merge branch 'dev-3.3' of https://git.mesalab.cn/nezha/nezha-fronted into dev-3.4 2022-07-14 14:00:17 +08:00
zhangyu
db7f526b1e NEZ-2024 fix:{{A.$labels}} 变量展示错误 2022-07-14 13:59:52 +08:00
zhangyu
5002a51051 fix:删除console 2022-07-14 13:59:22 +08:00
likexuan
4c9b207729 fix : alert Message 样式调整 2022-07-14 13:30:17 +08:00
zhangyu
a175997be5 Merge branch 'dev-3.3' of https://git.mesalab.cn/nezha/nezha-fronted into dev-3.4
# Conflicts:
#	nezha-fronted/src/components/page/dashboard/panel.vue
2022-07-14 11:36:45 +08:00
zhangyu
6644b111bf Merge branch 'dev-3.2' of https://git.mesalab.cn/nezha/nezha-fronted into dev-3.3
# Conflicts:
#	nezha-fronted/src/components/common/ChartDiagram/diagram.vue
2022-07-14 11:33:43 +08:00
zhangyu
5061a0dd37 fix: 补充注释的监听事件 以及 diagram组件修改 rel-22.02.36 2022-07-14 11:31:03 +08:00
zhangyu
2c91184bb0 Merge branch 'dev-3.2' of https://git.mesalab.cn/nezha/nezha-fronted into dev-3.3
# Conflicts:
#	.gitignore
#	nezha-fronted/src/assets/css/font/iconfont.js
#	nezha-fronted/src/components/chart/chart/chartAutotopology.vue
#	nezha-fronted/src/components/common/ChartDiagram/diagram.vue
#	nezha-fronted/src/components/common/detailView/view/detailViewRight.vue
#	nezha-fronted/src/components/common/js/common.js
#	nezha-fronted/src/components/common/js/tools.js
#	nezha-fronted/src/components/common/project/topologyL5.vue
#	nezha-fronted/static/config.json
2022-07-14 10:19:06 +08:00
zhangyu
73b71d578f fix:修改 topology 源码 删除创建的节点以及给节点创建的对应的事件 2022-07-14 09:55:10 +08:00
zhangyu
739fa3e82f fix:处理 topoLogy的缓存 2022-07-13 15:35:56 +08:00
zhangyu
878411720d fix:处理 topoLogy的缓存问题 2022-07-13 15:07:13 +08:00
zhangyu
d372a6b8e1 fix:topology 缓存处理 2022-07-13 14:38:10 +08:00
zhangyu
816b8c4efa fix:将 le5le 源码 移动至本地 2022-07-13 14:06:20 +08:00
likexuan
8c5ba62887 fix : chart title 修改 2022-07-13 13:34:45 +08:00
likexuan
b95bb8426e fix : backup 页面时间处理 2022-07-13 11:44:09 +08:00
likexuan
cc9bb9d7bf fix :agents 页面提示框样式调整 2022-07-13 11:21:06 +08:00
likexuan
1e69a7138d fix : 国际化 更改 2022-07-13 11:20:17 +08:00
likexuan
c2191a77e8 Merge branch 'dev-3.4' of https://git.mesalab.cn/nezha/nezha-fronted into dev-3.4 2022-07-12 18:07:04 +08:00
likexuan
25658f6c90 fix : 国际化更改 2022-07-12 18:06:59 +08:00
zhangyu
062e1f02f1 Merge branch 'dev-3.3' of https://git.mesalab.cn/nezha/nezha-fronted into dev-3.4 2022-07-12 17:43:30 +08:00
zhangyu
1b53f2beae fix:修改 alertMessage 打开 新增告警静默后 无法查看详情的问题 2022-07-12 17:42:01 +08:00
likexuan
1e09d6e618 fix : 国际化更改 2022-07-12 17:10:45 +08:00
likexuan
325e116535 Merge branch 'dev-3.4' of https://git.mesalab.cn/nezha/nezha-fronted into dev-3.4 2022-07-12 16:50:27 +08:00
likexuan
d003f48a70 fix : 国际化更改 2022-07-12 16:50:22 +08:00
方顺健
9ec38e826c build: 更换minio服务器 2022-07-12 07:38:01 +00:00
方顺健
704386dc21 build: 更换minio服务器 2022-07-12 07:37:30 +00:00
likexuan
92084915c2 NEZ-2022 fix : module 详情弹窗 未正确显示 name 2022-07-12 15:27:20 +08:00
likexuan
55b0f6b583 fix : chartTopology 提示框位置更改 2022-07-12 15:19:45 +08:00
likexuan
c9c3767d00 fix : asset list Box 页面打开时请求错误 2022-07-12 15:06:27 +08:00
likexuan
a4c1a235f0 fix : system 页面样式更改 2022-07-12 14:57:51 +08:00
likexuan
a07814dd52 fix : alertMeaaage 视图样式更改 2022-07-12 14:23:53 +08:00
likexuan
5d43060453 NEZ-2008 fix : 界面 国际化 更改 2022-07-12 14:06:14 +08:00
zhangyu
b0451e8eb5 fix:修改 diagram 泄露相关问题 2022-07-12 11:53:51 +08:00
zhangyu
f8e1657824 fix:修改 topology 内存溢出的问题 2022-07-12 11:51:12 +08:00
likexuan
2046d58bff Merge branch 'dev-3.4' of https://git.mesalab.cn/nezha/nezha-fronted into dev-3.4 2022-07-11 16:49:34 +08:00
likexuan
b34b28ed7a NEZ-2014 feat : agent 列表页面 state 列增加 hover 提示框 2022-07-11 16:49:29 +08:00
zhangyu
9ad9d881b0 Merge branch 'dev-3.3' of https://git.mesalab.cn/nezha/nezha-fronted into dev-3.4 2022-07-11 15:57:47 +08:00
zhangyu
1ac93fd7a4 NEZ-2018 fix:使用时间控件时选择最近使用时间出错,再次点击自定义日期按钮报错 2022-07-11 15:57:16 +08:00
zhangyu
45944ff3df Merge branch 'dev-3.3' of https://git.mesalab.cn/nezha/nezha-fronted into dev-3.4 2022-07-11 14:58:28 +08:00
zhangyu
e7bc257339 NEZ-2020 fix:修改 module endpoint basic_auth.pin 为 basic_auth.password 2022-07-11 14:58:05 +08:00
zhangyu
b69c27ea4a style:asset bottom-log 全屏后 样式调整 2022-07-11 13:59:53 +08:00
zhangyu
480adfee9b Merge branch 'dev-3.3' of https://git.mesalab.cn/nezha/nezha-fronted into dev-3.4 2022-07-11 13:49:11 +08:00
zhangyu
7363c3a227 fix:修改 alertRule tooltip的相关class名 2022-07-11 13:48:46 +08:00
zhangyu
681d10be5d Merge branch 'dev-3.3' of https://git.mesalab.cn/nezha/nezha-fronted into dev-3.4 2022-07-11 11:43:57 +08:00
zhangyu
fce041202b fix:修改 查询写死访问地址的问题 2022-07-11 11:35:37 +08:00
zhangyu
47f93231ea fix: 底弹窗 样式调整 国际化修改 2022-07-11 11:32:57 +08:00
likexuan
aded0eb261 fix : users 页面提示框 2022-07-11 10:14:06 +08:00
likexuan
6872818144 Merge branch 'dev-3.4' of https://git.mesalab.cn/nezha/nezha-fronted into dev-3.4 2022-07-11 10:10:33 +08:00