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
|
f7ba3bec13
|
NEZ-1205 fix： 英文状态下选择框内的提示语是中文 修改
|
2021-11-09 10:17:12 +08:00 |
|
zhangyu
|
e79a3ac165
|
NEZ-1205 fix： 开启两个窗口 一个中文一个英文 v-select组件 显示不对的问题
|
2021-11-08 15:55:51 +08:00 |
|
zhangyu
|
968a03c316
|
fix： 去除导入language 的参数
|
2021-11-04 17:18:37 +08:00 |
|
zhangyu
|
bf96ab737b
|
NEZ-1171 fix：alert message 导出样式修改
|
2021-11-04 17:00:58 +08:00 |
|
chenjinsong
|
a709585a9f
|
Merge remote-tracking branch 'origin/dev-3.1' into dev-3.1.1_theme
# Conflicts:
# nezha-fronted/src/components/common/alert/alertLabel.vue
# nezha-fronted/src/components/common/detailView/detailViewTopSearch.vue
# nezha-fronted/src/components/common/i18n.js
# nezha-fronted/src/components/common/labelFilter/clickSearch.vue
# nezha-fronted/src/components/common/login.vue
# nezha-fronted/src/components/common/popBox/topToolMoreOptions.vue
|
2021-11-04 14:49:40 +08:00 |
|
chenjinsong
|
561313d68c
|
NEZ-1072 feat: 主题内容
|
2021-11-04 09:29:01 +08:00 |
|
zhangyu
|
f6ac483d33
|
NEZ-1137 fix； 导出样式调整
|
2021-11-02 15:47:17 +08:00 |
|
chenjinsong
|
ef664be5ef
|
Merge remote-tracking branch 'origin/dev-3.1' into dev-3.1.1_theme
# Conflicts:
# nezha-fronted/src/assets/css/common.scss
# nezha-fronted/src/assets/css/common/tableCommon.scss
# nezha-fronted/src/assets/stylus/main.scss
# nezha-fronted/src/components/charts/chart-list.vue
# nezha-fronted/src/components/charts/logs.vue
# nezha-fronted/src/components/common/alert/alertLabel.vue
# nezha-fronted/src/components/common/alert/alertRuleInfo.vue
# nezha-fronted/src/components/common/bottomBox/bottomBox.vue
# nezha-fronted/src/components/common/bottomBox/tabs/endpointQuery.vue
# nezha-fronted/src/components/common/bottomBox/tabs/endpointQueryTab.vue
# nezha-fronted/src/components/common/bottomBox/tabs/logBottomTab.vue
# nezha-fronted/src/components/common/bottomBox/tabs/panelTabNew.vue
# nezha-fronted/src/components/common/detailView/list/alertRule/alertRuleDetail.vue
# nezha-fronted/src/components/common/detailView/list/asset/assetDetail.vue
# nezha-fronted/src/components/common/detailView/list/dc/dcDetail.vue
# nezha-fronted/src/components/common/detailView/list/endpoint/endpointDetail.vue
# nezha-fronted/src/components/common/detailView/list/module/moduleDetail.vue
# nezha-fronted/src/components/common/detailView/nzDetailView.vue
# nezha-fronted/src/components/common/detailView/view/detailViewRight.vue
# nezha-fronted/src/components/common/labelFilter/clickSearch.vue
# nezha-fronted/src/components/common/multipleTime.vue
# nezha-fronted/src/components/common/pickTime.vue
# nezha-fronted/src/components/common/popBox/topToolMoreOptions.vue
# nezha-fronted/src/components/common/project/L5/topoTooltip.vue
# nezha-fronted/src/components/common/project/popData/Info.vue
# nezha-fronted/src/components/common/rightBox/alertRuleBox.vue
# nezha-fronted/src/components/common/table/alert/alertRuleTable.vue
# nezha-fronted/src/components/common/table/alert/alertSilenceTable.vue
# nezha-fronted/src/components/common/table/settings/userTable.vue
# nezha-fronted/src/components/layout/header.vue
# nezha-fronted/src/components/page/alert/alertMessage.vue
# nezha-fronted/src/components/page/alert/nzAlertTag.vue
# nezha-fronted/src/components/page/asset/components/operation.vue
# nezha-fronted/src/components/page/config/mibBrowser.vue
# nezha-fronted/src/components/page/dashboard/explore/exploreItem.vue
# nezha-fronted/src/components/page/dashboard/explore/logTab.vue
# nezha-fronted/src/components/page/dashboard/explore/promqlInput.vue
# nezha-fronted/src/components/page/dashboard/overview/overview2.vue
# nezha-fronted/src/components/page/dashboard/panel.vue
|
2021-11-01 18:24:01 +08:00 |
|
chenjinsong
|
914c096463
|
NEZ-1072 feat: 主题切换
|
2021-11-01 17:23:01 +08:00 |
|
zhangyu
|
5d5106825b
|
NEZ-1108 fix：修改导入成功的样式
|
2021-11-01 16:46:12 +08:00 |
|
@changcode
|
47d1863111
|
style: 优化select公用样式，及类名
|
2021-10-29 12:02:34 +08:00 |
|
@changcode
|
9e82c52436
|
NEZ-1079 perf: 将各处列表、dashboard等页面中多处下拉框的弹出触发方式统一为点击触发
|
2021-10-25 17:16:40 +08:00 |
|
chenjinsong
|
7e01f31923
|
feat: icon文件更新
|
2021-10-15 11:55:29 +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
|
fa237b9723
|
NEZ-929 fix: explore metrics,logs 切换 样式调整
|
2021-08-25 10:39:26 +08:00 |
|
zhangyu
|
78efa5b642
|
fix：调整module的导入导出
|
2021-08-03 15:32:22 +08:00 |
|
zhangyu
|
2048640321
|
NEZ-845 feat： chart template 增加导入导出按钮，修改topo下拉框显示不全的问题 以及 diagram loging 隐藏时机的变更
|
2021-07-20 10:16:28 +08:00 |
|
zhangyu
|
63ba940d2a
|
NEZ-843 fix：asset，endpoint chart 导入模板接口错误
|
2021-07-19 17:04:46 +08:00 |
|
zhangyu
|
45e0523189
|
fix：修改 alertRule导出模板的问题
|
2021-06-30 16:42:54 +08:00 |
|
zhangyu
|
ed853172f9
|
fix： 修改 endpoint 导出时 未带checkBox的参数
|
2021-06-17 15:01:13 +08:00 |
|
@changcode
|
7e0083d0df
|
NEZ-678 fix: icon图标更新
|
2021-05-26 18:26:54 +08:00 |
|
zhangyu
|
03f3c69142
|
fix：修改批量修改的密码显示明文的问题 ， asset cahrt 导入显示不正确的问题
|
2021-05-25 10:26:13 +08:00 |
|
chenjinsong
|
4d35150acf
|
fix: endpoint templete下载、chart导入 type&link、导出文件名
|
2021-05-21 23:10:15 +08:00 |
|
chenjinsong
|
a3a9daf982
|
fix: template下载参数、endpoint导出文件名
|
2021-05-21 22:55:51 +08:00 |
|
chenjinsong
|
190e7669b2
|
NEZ-601 feat: 使用temp添加图表
|
2021-05-19 23:17:24 +08:00 |
|
zhangyu
|
74ee237ab0
|
fix：修改 asset chart样式错乱的问题 以及 asset chart 导出 参数错乱的问题
|
2021-05-18 10:12:47 +08:00 |
|
@changcode
|
edd082216d
|
Merge branch 'dev-2.0' of https://git.mesalab.cn/nezha/nezha-fronted into dev-2.0
|
2021-05-14 17:51:14 +08:00 |
|
@changcode
|
b68ac91ea9
|
feat： 国际化修改
|
2021-05-14 17:51:02 +08:00 |
|
zhangyu
|
e2636bee95
|
fix：修改asset 顶部按钮，修改assetModel 上滑，修改module endpoint上滑编辑页面
|
2021-05-14 17:09:57 +08:00 |
|
zhangyu
|
d937dd1666
|
fix：修改 asset chart相关bug
|
2021-05-13 19:02:23 +08:00 |
|
zhangyu
|
68deb0eee5
|
fix：修改panel 到处的参数
|
2021-05-13 15:26:25 +08:00 |
|
zhangyu
|
56e69ac919
|
fix：修改panel chart 模板导出 以及导出撤销的接口
|
2021-05-12 11:39:21 +08:00 |
|
chenjinsong
|
ee9d15b230
|
NZ-584 feat: panel顶部工具栏改版
|
2021-04-27 16:26:22 +08:00 |
|