Commit Graph

383 Commits

Author SHA1 Message Date
@changcode
1f0fc53526 style: 调整 switch 开关主题颜色 2021-11-30 14:36:51 +08:00
chenjinsong
339e437a6e merge: 删除无用文件 2021-11-29 16:36:43 +08:00
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
zhangyu
5078715039 fix: panel 以及下弹窗panel 同步时添加loading 2021-11-27 12:07:25 +08:00
zhangyu
38d012dfb3 NEZ-1350 fix:当用户另外开启标签时,不用再次登陆 2021-11-26 18:47:00 +08:00
zhangyu
7ca733dfe1 fix: 修改正则 \s 为 \r|\n 2021-11-25 16:29:56 +08:00
@changcode
ed8d78b12f style:主题样式调整 2021-11-25 16:05:16 +08:00
zhangyu
8c45811a78 fix: 修改查询参数 endpoint 改为 endpoint_id 2021-11-25 15:20:00 +08:00
zhangyu
0e35349926 NEZ-1352 fix: 修改部分底部弹窗 漏传参数的问题 2021-11-25 14:39:45 +08:00
zhangyu
1fb059926a fix: panel请求保存的问题 2021-11-25 13:51:06 +08:00
zhangyu
857392eef3 fix: 修改同步接口参数 2021-11-25 10:55:46 +08:00
zhangyu
7cf4a696e9 NEZ-1332 feat: alert message 查看请求参数调整(metrics,logs) 2021-11-24 20:27:15 +08:00
zhangyu
7c595fc9fe fix: 修改底部弹窗panel 以及预览页面的时间参数问题 2021-11-24 09:41:48 +08:00
zhangyu
c19f8436e6 NEZ-1258 fix: Asset查看详情时,多个功能点的搜索记录同步 2021-11-17 13:51:28 +08:00
zhangyu
f9ca30d92f NEZ-1257 fix: 去除表达是所有空白字符 2021-11-17 11:29:18 +08:00
zhangyu
0d190d6b9e NEZ-1257 fix: 接口返回报错事 左上角显示对应报错信息 2021-11-17 10:08:21 +08:00
zhangyu
81e62990f9 NEZ-1243 fix: asset endpint 底部弹窗添加同步按钮 2021-11-16 17:30:01 +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
f4284e062a fix: 修改 asset model 下滑页面 状态搜索不可用的问题 2021-11-09 11:22:52 +08:00
@changcode
d2f9afebcb fix: 修复国际化错误 2021-11-05 17:25:41 +08:00
@changcode
2cbb1d64a9 fix: 修复重复请求 2021-11-05 15:22:36 +08:00
@changcode
6958aac93a fix: 修复详情视图,机柜重复请求问题 2021-11-05 15:22:05 +08:00
@changcode
163f5deb36 NEZ-1176 fix: Datacenter 页面添加 cabinet 后,上方 datacenter cabinet 列未更新,没有调用后端接口 2021-11-05 12:48:19 +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
zhangyu
219e71f7e0 fix: 修改 alertRule evalLog 时间错误的问题 2021-11-04 14:24:01 +08:00
chenjinsong
561313d68c NEZ-1072 feat: 主题内容 2021-11-04 09:29:01 +08:00
zhangyu
dc7a102bf7 NEZ-1155 feat:添加 evallog页面 2021-11-02 18:34:00 +08:00
zhangyu
7999f06d60 fix: 修改下弹框 panel 的报错的问题 2021-11-02 17:01:13 +08:00
zhangyu
f6ac483d33 NEZ-1137 fix; 导出样式调整 2021-11-02 15:47:17 +08:00
chenjinsong
d1efdde2ba NEZ-1072 feat: 主题切换冲突解决 2021-11-01 23:05:28 +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
@changcode
91605a24db NEZ-1144 fix: 修复endpoint - logs 有数据,显示 no data 2021-11-01 10:18:33 +08:00
zhangyu
f5ba781413 NEZ-1139 fix: Alert rule页面,Default snmptrap报警规则,查看报警页面一直显示加载中 2021-10-29 18:19:49 +08:00
@changcode
950b54381b style: select 选择器样式调整 2021-10-29 14:25:59 +08:00
zhangyu
7108810a36 Merge branch 'dev-3.1' of https://git.mesalab.cn/nezha/nezha-fronted into dev-3.1 2021-10-29 14:16:19 +08:00
zhangyu
ed40692867 NEZ-1127 fix: 添加未选中的置灰效果 2021-10-29 14:16:04 +08:00
@changcode
47d1863111 style: 优化select公用样式,及类名 2021-10-29 12:02:34 +08:00
zhangyu
4ad34eebf1 fix: Endpoint页面显示的为“|-”和“!-”,选中之后显示的为“|~”和“!~” 2021-10-28 15:10:56 +08:00
zhangyu
a6dc8e5d45 NEZ-1117 fix; Endpoint页面显示的为 “ |- ” 和 “ !- ”,选中之后显示的为 “ |~ ” 和 “ !~ ” 2021-10-28 15:06:47 +08:00
@changcode
c7adcd531b NEZ-1109 fix: 修复Endpoint页面时间选择框没有下边框 2021-10-28 11:42:59 +08:00
@changcode
d9c7196768 style: 调整element,popover组件弹出效果 2021-10-27 14:32:26 +08:00
@changcode
5fa7833656 fix: 修复explore页面和log二级bottomBox页面的使用同一组件的条件冲突 2021-10-27 10:17:09 +08:00
@changcode
062bbaf58f style: Metrics 二级底部Box样式调整 2021-10-26 09:40:35 +08:00
@changcode
9e82c52436 NEZ-1079 perf: 将各处列表、dashboard等页面中多处下拉框的弹出触发方式统一为点击触发 2021-10-25 17:16:40 +08:00
@changcode
05c837be66 NEZ-1077 fix: panel 输入搜索条件 ,没有符合条件chart nodata样式 2021-10-25 14:38:43 +08:00
@changcode
2351baa8f3 fix: 列表no data样式展示异常问题 2021-10-22 19:39:49 +08:00
zhangyu
d29a3dd3c9 Merge branch 'dev-2.0' of https://git.mesalab.cn/nezha/nezha-fronted into dev-3.1
# Conflicts:
#	nezha-fronted/src/components/common/bottomBox/tabs/endpointQuery.vue
#	nezha-fronted/src/components/common/bottomBox/tabs/panelTabNew.vue
2021-10-21 10:05:37 +08:00
zhangyu
1e017d3060 feat:dc添加详细视图 优化module 以及 alertRule的显示 2021-10-21 10:04:01 +08:00
@changcode
cf1f83dcba style: asset,endpoint 底部二级菜单,detail,Metrcs 样式调整 2021-10-20 16:22:19 +08:00