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 |
|
@changcode
|
c75c84156e
|
style: endpointTable 页面去除多余样式
|
2021-11-11 17:48:59 +08:00 |
|
@changcode
|
e616322f05
|
Merge branch 'dev-3.1' of https://git.mesalab.cn/nezha/nezha-fronted into dev-3.1
|
2021-11-11 17:12:24 +08:00 |
|
@changcode
|
5e7f21c9f8
|
style: nzTooltip页面样式调整
|
2021-11-11 17:12:15 +08:00 |
|
zhangyu
|
11a05c0505
|
NEZ-1220 fix： license 默认隐藏，查询后若有需要再出现
|
2021-11-11 17:01:04 +08:00 |
|
zhangyu
|
b82cbedd22
|
fix： 划入 清除定时器
|
2021-11-11 16:46:54 +08:00 |
|
zhangyu
|
f9f2cb8a9e
|
NEZ-1224 fix： 首次进入 Endpoint 页面加载缓慢
|
2021-11-11 16:43:17 +08:00 |
|
@changcode
|
22c5120bf7
|
style: endpoint config 弹框样式调整
|
2021-11-11 15:01:48 +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 |
|
@changcode
|
5d7d6c664e
|
fix: 列表页面增加 v-has 权限
|
2021-11-10 18:09:05 +08:00 |
|
chenjinsong
|
d1efdde2ba
|
NEZ-1072 feat: 主题切换冲突解决
|
2021-11-01 23:05:28 +08:00 |
|
@changcode
|
47d1863111
|
style: 优化select公用样式，及类名
|
2021-10-29 12:02:34 +08:00 |
|
@changcode
|
ab87e01394
|
style: table列表样式调整
|
2021-10-28 17:53:27 +08:00 |
|
@changcode
|
586246d34f
|
style: endpoint Configuration列，鼠标移入弹框样式调整
|
2021-10-27 10:59:54 +08:00 |
|
@changcode
|
5fa7833656
|
fix: 修复explore页面和log二级bottomBox页面的使用同一组件的条件冲突
|
2021-10-27 10:17:09 +08:00 |
|
@changcode
|
5a831004f5
|
NEZ-1080 style: 鼠标悬浮样式调整
|
2021-10-26 17:47:49 +08:00 |
|
@changcode
|
9e82c52436
|
NEZ-1079 perf: 将各处列表、dashboard等页面中多处下拉框的弹出触发方式统一为点击触发
|
2021-10-25 17:16:40 +08:00 |
|
@changcode
|
bbe760999d
|
style: 样式调整
|
2021-10-25 14:45:28 +08:00 |
|
@changcode
|
2351baa8f3
|
fix: 列表no data样式展示异常问题
|
2021-10-22 19:39:49 +08:00 |
|
@changcode
|
ad8bef81ec
|
NEZ-1075 feat: state 样式调整
|
2021-10-22 17:47:42 +08:00 |
|
@changcode
|
9542e1a63a
|
style: Box 样式调整
|
2021-09-26 18:14:47 +08:00 |
|
@changcode
|
5879ca0c8a
|
style:下拉选择器样式统一
|
2021-09-26 11:56:36 +08:00 |
|
@changcode
|
9e50d7b389
|
fix: 修复新增或复制时 endpoint state 字段展示不全
|
2021-09-15 16:58:27 +08:00 |
|
@changcode
|
afdfbd74d3
|
style: credentials,endpoin,apiKey,页面 table 列表样式调整
|
2021-09-13 15:07:14 +08:00 |
|
zhangyu
|
7afc73effc
|
NEZ-938 feat:列表页面增加 duplicate按钮
|
2021-08-26 14:51:38 +08:00 |
|
zhangyu
|
039404b451
|
fix： 删除页面console
|
2021-08-26 09:49:01 +08:00 |
|
@changcode
|
83621db245
|
Merge branch 'dev-2.0' of https://git.mesalab.cn/nezha/nezha-fronted into dev-2.0
|
2021-08-25 16:19:52 +08:00 |
|
@changcode
|
faa6a330d1
|
fix: 修复样式，补充国际化，清除console
|
2021-08-25 16:19:44 +08:00 |
|
zhangyu
|
e381ff7717
|
NEZ-935 fix:monitor endpoint 页面 删除 qiery，bottom boxQuery 改为 metrics ，以及 查询参数的问题
|
2021-08-25 16:05:33 +08:00 |
|
zhangyu
|
d54d2abe03
|
fix： 修改 chart-list-group里面的图表 resize时的问题
|
2021-08-24 17:22:09 +08:00 |
|
zhangyu
|
8c21e51c89
|
style： 修改endpointTable的state的展示
|
2021-08-24 15:11:34 +08:00 |
|
zhangyu
|
0771dd1437
|
fix： 修改endpoint Configuration无法复制的问题
|
2021-08-24 09:56:04 +08:00 |
|
zhangyu
|
0fb427fc00
|
fix： endpoint table调整
|
2021-08-10 09:30:12 +08:00 |
|
zhangyu
|
cea63d4743
|
fix：保存时 必填项的选项卡的切换的问题
|
2021-08-05 16:11:46 +08:00 |
|
zhangyu
|
d829cb432e
|
feat： endpoint 批量新增微调
|
2021-08-05 15:07:45 +08:00 |
|
zhangyu
|
9104317279
|
feat：联调endpoint的接口
|
2021-08-05 14:50:29 +08:00 |
|
@changcode
|
8dd6fa475d
|
fix: panel 面板图表错位样式调整，dc，endpoint列表样式调整
|
2021-07-23 10:53:54 +08:00 |
|
@changcode
|
5dc9b7571c
|
NEZ-771 fix: 修复图表错位问题
|
2021-07-22 10:00:29 +08:00 |
|
@changcode
|
c715a96321
|
NEZ-787 fix: 修复Asset model页面，点击Open terminal，Duplicate，Silence alert按钮无反应
|
2021-07-01 17:56:01 +08:00 |
|
@changcode
|
31c3792c14
|
fix: 去除 bottomBox 列表页面无效按钮，替换为编辑按钮
|
2021-06-25 14:09:18 +08:00 |
|
chenjinsong
|
f135c671c1
|
NEZ-717 fix: 修复param没回显的问题
|
2021-06-21 17:44:28 +08:00 |
|
@changcode
|
8530af2b80
|
fix: 只保留用户页面和角色页面，编辑与删除的 disabled 禁用方法
|
2021-06-16 17:17:18 +08:00 |
|
@changcode
|
fa876f686f
|
NEZ-737 fix: 修复部分table的二级列表按钮没有鼠标悬停提示
|
2021-06-07 17:45:13 +08:00 |
|
zhangyu
|
8a795ec96b
|
NEZ-705：状态显示去除promethrus
|
2021-06-01 17:25:44 +08:00 |
|
zhangyu
|
a6dfb7e510
|
NEZ-704： 创建 endponit 添加 state参数
|
2021-06-01 17:24:57 +08:00 |
|
zhangyu
|
2ee081df1a
|
NEZ-699： 增加告警静默一键配置功能
|
2021-06-01 14:26:09 +08:00 |
|
zhangyu
|
a90fa14ef0
|
fix：隐藏 project 右滑表格的操作列
|
2021-05-27 17:58:29 +08:00 |
|
@changcode
|
98ed947742
|
NEZ-681 fix: 页面列表样式调整
|
2021-05-27 13:53:42 +08:00 |
|