Commit Graph

3566 Commits

Author SHA1 Message Date
zhangyu
6789846ff8 Merge branch 'dev-3.1' of https://git.mesalab.cn/nezha/nezha-fronted into dev-3.1
# Conflicts:
#	nezha-fronted/src/components/common/table/settings/endpointTable.vue
2021-11-11 16:44:38 +08:00
zhangyu
f9f2cb8a9e NEZ-1224 fix: 首次进入 Endpoint 页面加载缓慢 2021-11-11 16:43:17 +08:00
@changcode
b42e048952 style: endpoint 样式调整 2021-11-11 16:05:44 +08:00
@changcode
6e002ffd14 style: endpoint 列表样式调整 2021-11-11 15:34:33 +08:00
zhangyu
8183ab9242 Merge branch 'dev-3.1' of https://git.mesalab.cn/nezha/nezha-fronted into dev-3.1 2021-11-11 15:05:38 +08:00
zhangyu
70e3945dc4 NEZ-1220 fix:setup界面国际化 2021-11-11 15:05:16 +08:00
@changcode
22c5120bf7 style: endpoint config 弹框样式调整 2021-11-11 15:01:48 +08:00
@changcode
d4dd85ee8e NEZ-1218 fix: alert message 查看按钮 增加判断条件 当 rule_type 未logs时禁用 2021-11-11 13:55:04 +08:00
chenjinsong
4046814936 合并 2021-11-11 11:47:41 +08:00
zhangyu
ce18288599 NEZ-1221 fix: diagram 类型图 因为鼠标滚轮放大缩小导致悬浮展示有误的问题 2021-11-11 11:34:34 +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
zhangyu
6abf76db08 NEZ-1222 fix: Terminal 选择 asset 时,传参与接口文档不符 2021-11-11 09:42:03 +08:00
@changcode
5d7d6c664e fix: 列表页面增加 v-has 权限 2021-11-10 18:09:05 +08:00
@changcode
f18d60578f NEZ-1219 fix: 列表页面 自定义选择列 标题改为修改 2021-11-10 17:40:57 +08:00
zhangyu
891262c26c NEZ-1217 fix:Dashboard panel 删除图表后,下方 group chart 展开高度有问题 2021-11-10 16:45:50 +08:00
@changcode
a504354f60 fix: 修复 info 页面数据返回错误 2021-11-10 14:20:38 +08:00
@changcode
cccd18c6c2 fix: console页面 url路径调整 2021-11-10 10:44:13 +08:00
zhangyu
ae41015898 fix: 调整首页 tooltip的样式 2021-11-10 10:16:26 +08:00
zhangyu
19519849af style : module rghtbox 样式调整 2021-11-10 10:03:41 +08:00
zhangyu
a35f9d9496 fix : 修改 topo图 预览没有动画的问题 2021-11-10 09:43:21 +08:00
zhangyu
35becbe242 Merge branch 'dev-3.1' of https://git.mesalab.cn/nezha/nezha-fronted into dev-3.1 2021-11-09 17:02:12 +08:00
zhangyu
e3ce0d1c02 NEZ-1210 fix: 通过页面上方 terminal按钮,选择 asset 按钮,显示 asset 没有过滤 2021-11-09 17:01:43 +08:00
@changcode
826d0dc59d fix: agent wget/curl 方式安装,增加忽略证书校验参数 2021-11-09 16:55:38 +08:00
@changcode
60407e60a8 NEZ-1193 fix: agent wget/curl 方式安装 命令增加忽略证书校验参数 2021-11-09 16:54:27 +08:00
@changcode
687be810bd NEZ-897 fix: roleBox dashboard -overview 增加默认选中,且不可取消选中 2021-11-09 16:27:44 +08:00
zhangyu
a1caffa4f4 NEZ-1210 fix: module endpoint 的中文转化问题 2021-11-09 16:14:31 +08:00
zhangyu
97e1a263d2 NEZ-1207 fix: 全屏后自动刷新按钮无效 2021-11-09 15:11:20 +08:00
zhangyu
f4284e062a fix: 修改 asset model 下滑页面 状态搜索不可用的问题 2021-11-09 11:22:52 +08:00
zhangyu
17bc197e47 Merge branch 'dev-3.1' of https://git.mesalab.cn/nezha/nezha-fronted into dev-3.1 2021-11-09 10:17:40 +08:00
zhangyu
f7ba3bec13 NEZ-1205 fix: 英文状态下选择框内的提示语是中文 修改 2021-11-09 10:17:12 +08:00
@changcode
de52aab93f fix: 修复 endpoint basic info 报错问题 2021-11-09 10:09:10 +08:00
zhangyu
c38113fd49 fix: model relabel 检验 2021-11-09 09:58:36 +08:00
chenjinsong
772baaf65b Merge remote-tracking branch 'origin/dev-3.1' into dev-3.1 2021-11-08 18:27:28 +08:00
chenjinsong
8f56c0f666 NEZ-1194 fix: chart编辑框打不开的问题 2021-11-08 18:27:21 +08:00
@changcode
e31314e852 fix: 国际化调整 2021-11-08 16:56:10 +08:00
@changcode
af87507df1 Merge branch 'dev-3.1' of https://git.mesalab.cn/nezha/nezha-fronted into dev-3.1
# Conflicts:
#	nezha-fronted/src/components/common/labelFilter/clickSearch.vue
2021-11-08 16:49:17 +08:00
@changcode
42a89724bb NEZ-1204 fix: 修复在中文界面下,部分内容不会进行转换 2021-11-08 16:48:12 +08:00
zhangyu
e79a3ac165 NEZ-1205 fix: 开启两个窗口 一个中文一个英文 v-select组件 显示不对的问题 2021-11-08 15:55:51 +08:00
@changcode
3b131e96cd fix: 修复 asset详情视图ping图标颜色 2021-11-08 15:03:17 +08:00
@changcode
6cfe082c3f Merge branch 'dev-3.1' of https://git.mesalab.cn/nezha/nezha-fronted into dev-3.1 2021-11-08 14:57:04 +08:00
@changcode
fa1b6e4530 NEZ-1191 fix: 修复Endpoint 详情页面显示状态不正确 2021-11-08 14:56:50 +08:00
chenjinsong
d22ae60ec8 NEZ-1196 fix: terminal支持https 2021-11-08 14:51:07 +08:00
zhangyu
30ddb294f5 NEZ-1203 style : project 添加小窗口下的横向滚动条 2021-11-08 10:46:05 +08:00
@changcode
b3409f5797 NEZ-1187 fix: 修复系统列表翻页后,滚动条位置不变 2021-11-08 10:38:10 +08:00
zhangyu
a84772ad10 NEZ-1195 fix:Chart Template 预览空白,chart 导出报错 2021-11-08 10:19:35 +08:00
zhangyu
2f245fcefa NEZ-1200 fix: Project topo 全屏后,将左侧菜单栏收缩后,topo 右侧遮挡,没有全屏 2021-11-08 09:53:10 +08:00
zhangyu
9b8eb45542 NEZ-1201 fix: Dashboard panel 设置自动刷新后,然后将自动刷新关闭,页面依旧自动刷新 2021-11-08 09:32:25 +08:00
zhangyu
501ec7807a NEZ-1192 fix:Project topo 全屏后再次点击左侧 project 链接后,右侧依旧为 全屏 2021-11-08 09:23:40 +08:00
chenjinsong
479bcb4c87 NEZ-1174 fix: 地图问题 2021-11-05 20:19:26 +08:00
@changcode
3ec6838df7 style:去除浏览器打印 2021-11-05 17:29:34 +08:00