gfwleak/nezha-nezha-fronted
Archived
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
4,487 Commits 31 Branches 139 Tags
9781bf619c1f0abfcff4f9fa4d534ffdb3709e32
Commit Graph

145 Commits

Author SHA1 Message Date
zhangyu
9781bf619c fix：添加导出html的按钮 2022-05-27 09:29:59 +08:00
zhangyu
1f8c93a703 fix：删除无用代码 2022-05-24 15:05:57 +08:00
zhangyu
f14d2a5bb8 NEZ-1788 feat：联调后端接口 2022-05-24 15:04:46 +08:00
zhangyu
5ccaa3f453 fix：修改panel edit 权限码错误的问题 2022-05-19 11:22:01 +08:00
zhangyu
12970ab5a2 Merge branch 'dev-3.2' of https://git.mesalab.cn/nezha/nezha-fronted into dev-3.3 2022-03-25 17:43:17 +08:00
zhangyu
4e343d7137 fix: 修改 值为 “0” 对取最大值的影响 2022-03-25 16:37:24 +08:00
zhangyu
69f061d868 Merge branch 'dev-3.2' of https://git.mesalab.cn/nezha/nezha-fronted into dev-3.3 
# Conflicts:
#	nezha-fronted/src/components/charts/chartDataFormat.js
 2022-03-25 14:28:07 +08:00
zhangyu
f2b055f20f fix：assetBox 补充国际化 2022-03-25 14:25:13 +08:00
zhangyu
9e00d50795 Merge branch 'dev-3.2' of https://git.mesalab.cn/nezha/nezha-fronted into dev-3.3 
# Conflicts:
#	nezha-fronted/src/components/chart/chart/chartGauge.vue
#	nezha-fronted/src/components/chart/chart/chartHexagonD3.vue
 2022-03-24 13:40:37 +08:00
zhangyu
bd259fd291 fix：修改 project module endpoint 的路由 2022-03-23 18:08:00 +08:00
@changcode
72435b9581 fix: 修复ipam type 下拉重复内容 2022-03-21 18:05:33 +08:00
@changcode
61972c0472 NEZ-1690 feat : IPAM IP 二级列表详情页面开饭 2022-03-18 16:23:41 +08:00
zhangyu
274015ecf1 Merge branch 'dev-3.2' of https://git.mesalab.cn/nezha/nezha-fronted into dev-3.3 2022-03-14 16:23:16 +08:00
@changcode
1d05148360 NEZ-1647 fix: Roles设置权限时Dashboards内的View无法选中 2022-03-10 11:35:37 +08:00
zhangyu
b44ceec0ca NEZ-1621 fix： Data Centers链接Open terminal时界面无法复位 2022-03-09 11:01:17 +08:00
zhangyu
d0726092c3 NEZ-1633 fix：Messages内查看告警图表时，点击自定义时间没有弹出修改框 2022-03-08 11:22:26 +08:00
@changcode
cc4f5698ec NEZ-1617 feat: IPAM 页面开发 2022-03-03 10:33:29 +08:00
zhangyu
1a4c5922d2 NEZ-1585 fix：Dashboards标题无法删除 前端权限配置错误的问题 2022-02-22 14:12:29 +08:00
@changcode
caef757c04 fix: v-has权限调整 2022-01-11 17:05:21 +08:00
@changcode
a28bf47bf9 fix: v-has权限调整 2022-01-11 11:00:03 +08:00
zhangyu
8b2e144e59 fix： 修改 panelLock 的 相关文案 2021-12-30 09:54:17 +08:00
@changcode
05582063bd fix: 优化导入提示，优化坐标判断 2021-12-20 16:58:58 +08:00
@changcode
83b6751d5b NEZ-1401 fix: 修复导入信息错误时，弹出导入正确提示 2021-12-20 11:05:41 +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
7a3299f608 NEZ-1313 fix： Panel 编辑时，鼠标放到 Edit 行光标变成 超链接，但必须点击文字才弹出编辑框 2021-11-22 09:44:05 +08:00
@changcode
fe161d1be0 style: 主题颜色调整 2021-11-17 11:12:06 +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
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
9acb8c0b5d fix: 修复el-popover trigger 触发 2021-10-28 16:54:03 +08:00
@changcode
9e82c52436 NEZ-1079 perf: 将各处列表、dashboard等页面中多处下拉框的弹出触发方式统一为点击触发 2021-10-25 17:16:40 +08:00
@changcode
b05240855a style: explore页面，chartBox 下拉 select-panel 选择器样式调整 2021-10-20 09:40:52 +08:00
chenjinsong
7e01f31923 feat: icon文件更新 2021-10-15 11:55:29 +08:00
@changcode
ff57b661f7 NEZ-1047 feat: endpoint metrics 增加 https 选项 2021-10-11 10:18:45 +08:00
@changcode
8388a0593f style: selectPanel, selectAssetMetaGroup 样式调整 2021-09-28 14:23:51 +08:00
@changcode
9a07b6e454 style: select 样式调整 2021-09-27 10:25:19 +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
zhangyu
eddf5e2b85 docs： 删除多余空格 2021-09-24 17:57:24 +08:00
zhangyu
05f994e00d docs ： 修改panel页面 title的文案 2021-09-24 17:38:26 +08:00
@changcode
8a06ca608e Merge branch 'dev-2.0' of https://git.mesalab.cn/nezha/nezha-fronted into dev-2.0 
# Conflicts:
#	nezha-fronted/src/components/common/rightBox/dcBox.vue
 2021-09-24 17:09:40 +08:00