Commit Graph

3086 Commits

Author SHA1 Message Date
zhangyu
b0f366f292 fix:修改 endpoint 详细视图页面 下方显示 asset的manageIp 2021-10-20 13:46:14 +08:00
zhangyu
73d8dda215 style:endpoint 样式调整 2021-10-19 18:11:03 +08:00
zhangyu
448b0f7adc fix: 切换详细视图时 未默认选中第一条的问题 2021-10-19 14:54:35 +08:00
zhangyu
15f8ab4a40 fix:修改 chart-group 默认折叠 打开后 图表x轴刻度不对的问题 2021-10-19 11:37:09 +08:00
zhangyu
0d6ca0015a feat:endpoint 复用详细视图 2021-10-19 10:55:54 +08:00
zhangyu
c4183fddbf fix: 修改endpoint 的搜索条件 2021-10-19 10:18:11 +08:00
zhangyu
c362cf7a2d Merge branch 'dev-2.0' of https://git.mesalab.cn/nezha/nezha-fronted into dev-3.1 2021-10-19 09:48:26 +08:00
zhangyu
ab61f75347 Merge branch 'dev-2.0' of https://git.mesalab.cn/nezha/nezha-fronted into dev-3.1 2021-10-19 09:47:35 +08:00
@changcode
945332a931 style: endpointBox 页面select选择器样式调整 2021-10-18 17:51:32 +08:00
zhangyu
52e2b262fa Merge branch 'dev-3.1' of https://git.mesalab.cn/nezha/nezha-fronted into dev-3.1
# Conflicts:
#	nezha-fronted/src/components/common/detailView/nzDetailView.vue
2021-10-18 17:41:24 +08:00
zhangyu
42854089b9 fix: 修改 顶部搜索样式 2021-10-18 17:40:21 +08:00
@changcode
a2a0565bfe NEZ-1064 fix: module & endpoint protocol字段 http,https 可以相互切换 2021-10-18 17:06:08 +08:00
@changcode
ab23aaab3b style: 新增asset deail页面select下拉选择器样式调整 2021-10-18 16:34:37 +08:00
zhangyu
2c0d6dbf93 fix:修改 切换选中的详细视图时 tab选中未切换为detail的问题 2021-10-18 15:19:46 +08:00
zhangyu
b540623a98 Merge branch 'dev-2.0' of https://git.mesalab.cn/nezha/nezha-fronted into dev-3.1 2021-10-18 14:55:37 +08:00
zhangyu
c2267a983d fix:修改asset 详细视图切换时 没有保存分页信息,修改endpoint 搜索部分的数据来源 2021-10-18 14:55:16 +08:00
@changcode
8649ccd9c0 style: 底部box去除多余样式 2021-10-18 11:53:34 +08:00
@changcode
e5b0cc7be4 style: 底部Box样式调整 2021-10-18 11:10:34 +08:00
zhangyu
c8ec5b48ea Merge branch 'dev-2.0' of https://git.mesalab.cn/nezha/nezha-fronted into dev-3.1 2021-10-15 18:12:34 +08:00
@changcode
13baea54b4 style cabinet 样式调整 2021-10-15 18:08:35 +08:00
zhangyu
b7b05b0004 Merge branch 'dev-2.0' of https://git.mesalab.cn/nezha/nezha-fronted into dev-3.1 2021-10-15 16:59:03 +08:00
zhangyu
e878dabfe8 feat:asset 自定义label显示图标 2021-10-15 16:57:17 +08:00
zhangyu
08f0733052 fix: 修改打开asset Bottom的下弹框 切换详细视图 图表显示错误的问题 2021-10-15 16:41:14 +08:00
@changcode
db25c666c2 style: 底部弹框样式调整 2021-10-15 16:39:47 +08:00
zhangyu
ebd8baf38b Merge branch 'dev-2.0' of https://git.mesalab.cn/nezha/nezha-fronted into dev-3.1
# Conflicts:
#	nezha-fronted/src/assets/css/font/iconfont.css
#	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
2021-10-15 16:02:26 +08:00
zhangyu
f635c87740 fix: 样式调整 2021-10-15 15:59:46 +08:00
@changcode
e66b503291 NEZ-1061 fix: cabinet 编辑页面样式 不统一 2021-10-15 15:07:52 +08:00
@changcode
66a4c6ac00 fix: 个人中心语言图标夜色调整 2021-10-15 14:29:05 +08:00
chenjinsong
7e01f31923 feat: icon文件更新 2021-10-15 11:55:29 +08:00
chenjinsong
51c5cb0e21 feat: icon文件更新 2021-10-15 10:58:43 +08:00
@changcode
38993e2edc fix: 引入样式错误 2021-10-15 10:56:10 +08:00
@changcode
5ec4dba861 fix: 修复编辑数据返回延迟导致报错 2021-10-15 10:46:07 +08:00
zhangyu
07c8acf92f Merge branch 'dev-2.0' of https://git.mesalab.cn/nezha/nezha-fronted into dev-3.1 2021-10-15 10:30:59 +08:00
zhangyu
ed24261c5e fix:修改assetCilckSearch的样式 2021-10-15 10:22:02 +08:00
chenjinsong
3465211ab5 NEZ-1061 perf: 調整登錄框 2021-10-14 21:33:57 +08:00
@changcode
f09fd1285e fix: 修复profile接口一直请求问题 2021-10-14 18:14:36 +08:00
@changcode
379d355621 fix: 个人中心页面,编辑功能输入框权限调整 2021-10-14 17:03:23 +08:00
zhangyu
bf38f47b16 style; asset详细视图 样式调整 2021-10-14 16:46:19 +08:00
zhangyu
aaae74c01a fix;处理冲突 2021-10-14 14:54:00 +08:00
zhangyu
0558619ad6 Merge branch 'dev-2.1' of https://git.mesalab.cn/nezha/nezha-fronted into dev-3.1
# Conflicts:
#	nezha-fronted/src/components/common/ChartDiagram/diagram.vue
#	nezha-fronted/src/components/common/project/L5/CanvasProps.vue
#	nezha-fronted/src/components/layout/header.vue
2021-10-14 14:52:52 +08:00
zhangyu
d387aa0288 fix;补充国际化 2021-10-14 14:45:06 +08:00
zhangyu
4e501cfc11 feat:asset 详细视图添加 2021-10-14 14:14:25 +08:00
@changcode
72665f1bcb NEZ-1059 feat: 个人中心 增加 编辑按钮,用户可以编辑个人信息 2021-10-14 13:40:13 +08:00
zhangyu
cfca72366c feat: asset详细视图 基本功能实现 2021-10-13 18:24:09 +08:00
@changcode
6838c990c6 fix: 修复 select 占位符,未国际化 2021-10-13 15:47:56 +08:00
@changcode
fb75689518 style: 模板添加图标box样式调整 2021-10-13 15:13:42 +08:00
zhangyu
3029a0db41 feat: asset详细视图的回显完成 2021-10-13 14:44:34 +08:00
@changcode
d8cf47501b fix: userTable列表页面,language列展示内容调整 2021-10-13 14:37:21 +08:00
zhangyu
24d6e7a218 fix:搜索内容调整 modeil以及more未完善 2021-10-13 11:12:26 +08:00
@changcode
69f31a5a53 fix: 修复user页面默认字段错误问题 2021-10-13 10:55:22 +08:00