diff --git a/nezha-fronted/src/components/common/language/cn.js b/nezha-fronted/src/components/common/language/cn.js index cbea3f475..f0bee87fd 100644 --- a/nezha-fronted/src/components/common/language/cn.js +++ b/nezha-fronted/src/components/common/language/cn.js @@ -61,12 +61,12 @@ const cn = { type: '类别', detail: '详细信息', changePin: '修改密码', - createCabinet: '创建机柜', - createModel: '创建型号', - createModule: '创建模块', - createMib: '创建MIB', - createAssetType: '创建设备类型', - createAssetState: '创建设备状态', + createCabinet: '新增机柜', + createModel: '新增型号', + createModule: '新增模块', + createMib: '新增MIB', + createAssetType: '新增设备类型', + createAssetState: '新增设备状态', exportExcel: '导出', importExcel: '导入', importExcelLower: '导入', @@ -1463,6 +1463,35 @@ const cn = { cancelButtonText: '取消' } }, + guide: { + title: '6步开始使用', + dc: '数据中心', + dcTip: '数据中心包含机柜和资产,与Prometheus服务相关联;机柜是资产的容器', + addDc: '新增数据中心', + addCabinet: '新增机柜', + agent: 'Agent', + agentTip: 'Prometheus(agent)是本系统的核心,包含“Global”和“Per-datacenter”两种类型,前者汇总数据并发出告警消息,后者从Endpoint中采集监控数据。两者都必须配置', + addAgent: '新增agent', + downloadAgent: '下载agent', + asset: '资产', + assetTip: '资产是被系统监控的主要部分', + addAsset: '新增资产', + importAsset: '导入资产', + webTerminal: '打开终端', + monitor: '监控', + monitorTip: '帮助用户根据系统需求监控组件', + addProject: '新增系统', + addModule: '新增模块', + addEndpoint: '新增endpoint', + importEndpoint: '导入endpoint', + visualization: '可视化', + visualizationTip: '面板由不同组的自定义图表组成,您可以创建多个面板并在它们之间切换', + addPanel: '新增面板', + addChart: '新增图表', + alert: '告警', + alertTip: '用户可以通过配置表达式,阈值,持续时间等来创建告警规则', + addAlertRule: '新增告警规则' + }, buttons: { view: '查看', add: '新增', diff --git a/nezha-fronted/src/components/common/language/en.js b/nezha-fronted/src/components/common/language/en.js index f019afff9..9e4a4f1c3 100644 --- a/nezha-fronted/src/components/common/language/en.js +++ b/nezha-fronted/src/components/common/language/en.js @@ -1364,6 +1364,35 @@ const en = { seven: 'SUN' } }, + guide: { + title: 'Get started in 6 steps', + dc: 'Datacenter', + dcTip: 'Data center associated with Prometheus servers contains cabinets and assets; cabinet is a container for assets.', + addDc: 'Add datacenter', + addCabinet: 'Add cabinet', + agent: 'Agent', + agentTip: 'The Prometheus service (agent) is the core of the system, including two types: "Global" and "Per-datacenter". The former collects data and sends out alert messages, while the latter collects data from Endpoint. You must configure both.', + addAgent: 'Add agent', + downloadAgent: 'Download agent', + asset: 'Asset', + assetTip: 'Assets are the main part monitored by the system', + addAsset: 'Add asset', + importAsset: 'Import asset', + webTerminal: 'Web terminal', + monitor: 'Monitor', + monitorTip: 'Help user to monitor components and contents based on project requirement', + addProject: 'Add project', + addModule: 'Add module', + addEndpoint: 'Add endpoint', + importEndpoint: 'Import endpoint', + visualization: 'Visualization', + visualizationTip: 'Panels consist of different sets of customized charts. You can create several panels and switch between them.', + addPanel: 'Add panel', + addChart: 'Add chart', + alert: 'Alert', + alertTip: 'User can create alert rule by configuring expression, threshold, duration, etc.', + addAlertRule: 'Add alert rule' + }, buttons: { view: 'View', add: 'Add', diff --git a/nezha-fronted/src/components/common/popBox/guide.vue b/nezha-fronted/src/components/common/popBox/guide.vue new file mode 100644 index 000000000..73c1b3a88 --- /dev/null +++ b/nezha-fronted/src/components/common/popBox/guide.vue @@ -0,0 +1,441 @@ + + + + + + + {{guide.title}} + + + + + + {{$t('guide.dcTip')}} + + {{$t('guide.addDc')}} + {{$t('guide.addCabinet')}} + + + + {{$t('guide.agentTip')}} + + {{$t('guide.addAgent')}} + {{$t('guide.downloadAgent')}} + + + + {{$t('guide.assetTip')}} + + {{$t('guide.addAsset')}} + {{$t('guide.importAsset')}} + {{$t('guide.webTerminal')}} + + + + {{$t('guide.monitorTip')}} + + {{$t('guide.addProject')}} + {{$t('guide.addModule')}} + {{$t('guide.addEndpoint')}} + {{$t('guide.importEndpoint')}} + + + + {{$t('guide.visualizationTip')}} + + {{$t('guide.addPanel')}} + {{$t('guide.addChart')}} + + + + {{$t('guide.alertTip')}} + + {{$t('guide.addAlertRule')}} + + + + + + + + + + diff --git a/nezha-fronted/src/components/common/rightBox/dcBox.vue b/nezha-fronted/src/components/common/rightBox/dcBox.vue index cbd199054..6378b119e 100644 --- a/nezha-fronted/src/components/common/rightBox/dcBox.vue +++ b/nezha-fronted/src/components/common/rightBox/dcBox.vue @@ -88,9 +88,6 @@ export default { areaData: [], coordinateFlag: false } - }, - created() { - }, methods: { /* 关闭弹框 */ @@ -198,10 +195,6 @@ export default { } } }, - mounted () { - // this.getAreaData(); - // console.log(this.editDc) - }, watch: { obj: { immediate: true, diff --git a/nezha-fronted/src/components/common/rightBox/panelBox.vue b/nezha-fronted/src/components/common/rightBox/panelBox.vue index 330686181..fb240cdac 100644 --- a/nezha-fronted/src/components/common/rightBox/panelBox.vue +++ b/nezha-fronted/src/components/common/rightBox/panelBox.vue @@ -1,126 +1,130 @@ - - - - {{rightBox.title}} - - - - - - - + + + + {{editPanel.id ? ($t("config.dc.editPanel")) : $t("config.dc.createDc")}} + + + + + + + + + + - - - - - - - + + + + + - - diff --git a/nezha-fronted/src/components/layout/header.vue b/nezha-fronted/src/components/layout/header.vue index 9158ee9cf..de11427e2 100644 --- a/nezha-fronted/src/components/layout/header.vue +++ b/nezha-fronted/src/components/layout/header.vue @@ -22,11 +22,10 @@ {{$store.state.consoleCount<=10?$store.state.consoleCount:'10+'}} - + + @@ -56,6 +55,7 @@ + @@ -63,12 +63,12 @@ import bus from '../../libs/bus' import { mapActions } from 'vuex' import changePin from '../page/config/changePin' -import PathNavigation from './path_navigation/PathNavigation' +import guide from '@/components/common/popBox/guide' export default { name: 'Header', components: { 'change-password': changePin, - PathNavigation + guide }, data () { return { @@ -109,7 +109,7 @@ export default { } ], showChangePin: false, - centerDialogVisible: false + showGuide: false } }, methods: { @@ -162,6 +162,7 @@ export default { }, dialogClosed () { this.showChangePin = false + this.showGuide = false }, cancel () { this.jumpTo(this.$route.path.slice(1, this.$route.path.length)) diff --git a/nezha-fronted/src/components/page/alert/alertRule.vue b/nezha-fronted/src/components/page/alert/alertRule.vue index 3b23a36a6..98bfdc00f 100644 --- a/nezha-fronted/src/components/page/alert/alertRule.vue +++ b/nezha-fronted/src/components/page/alert/alertRule.vue @@ -158,26 +158,16 @@ export default { this.rightBox.show = true } }) - }, - initEvent () { - bus.$on('alert-rule-list-change', () => { - this.getTableData() - }) - bus.$on('dc-list-change', () => { - this.getTableData() - }) - bus.$on('alert-message-change', () => { - this.getTableData() - }) } }, - beforeDestroy () { - bus.$off('alert-rule-list-change') - bus.$off('dc-list-change') - bus.$off('alert-message-change') - }, mounted () { - this.initEvent() + // 是否弹出侧滑 + const add = this.$route.query.add + if (add) { + if (add === 'alertRule') { + this.add() + } + } } } diff --git a/nezha-fronted/src/components/page/asset/asset.vue b/nezha-fronted/src/components/page/asset/asset.vue index 4f1cb680d..dfb4ab11e 100644 --- a/nezha-fronted/src/components/page/asset/asset.vue +++ b/nezha-fronted/src/components/page/asset/asset.vue @@ -434,6 +434,14 @@ export default { this.getSearchableMetaData() this.getSnmpCredentialData() this.getFieldGroupData() + + // 是否弹出侧滑 + const add = this.$route.query.add + if (add) { + if (add === 'asset') { + this.add() + } + } } } diff --git a/nezha-fronted/src/components/page/config/agent.vue b/nezha-fronted/src/components/page/config/agent.vue index 438326baf..a9acc2833 100644 --- a/nezha-fronted/src/components/page/config/agent.vue +++ b/nezha-fronted/src/components/page/config/agent.vue @@ -270,6 +270,13 @@ export default { } }, mounted () { + // 是否弹出侧滑 + const add = this.$route.query.add + if (add) { + if (add === 'agent') { + this.add() + } + } } } diff --git a/nezha-fronted/src/components/page/config/dc.vue b/nezha-fronted/src/components/page/config/dc.vue index c822e57c6..6bfc1159e 100644 --- a/nezha-fronted/src/components/page/config/dc.vue +++ b/nezha-fronted/src/components/page/config/dc.vue @@ -42,7 +42,6 @@ diff --git a/nezha-fronted/src/components/page/dashboard/panel.vue b/nezha-fronted/src/components/page/dashboard/panel.vue index 44a4e0a6e..ac178709b 100644 --- a/nezha-fronted/src/components/page/dashboard/panel.vue +++ b/nezha-fronted/src/components/page/dashboard/panel.vue @@ -83,7 +83,7 @@ - + @@ -779,6 +779,14 @@ export default { this.onScroll() document.querySelector('#tableList').addEventListener('mouseenter', this.tableListEnter) document.querySelector('#tableList').addEventListener('mouseleave', this.tableListLeave) + + // 是否弹出侧滑 + const add = this.$route.query.add + if (add) { + if (add === 'chart') { + this.addChart() + } + } }, watch: { 'filter.searchName': function (n, o) { diff --git a/nezha-fronted/src/components/page/monitor/endpoint/endpointList.vue b/nezha-fronted/src/components/page/monitor/endpoint/endpointList.vue index a0784d9bf..3f5e81070 100644 --- a/nezha-fronted/src/components/page/monitor/endpoint/endpointList.vue +++ b/nezha-fronted/src/components/page/monitor/endpoint/endpointList.vue @@ -319,6 +319,14 @@ export default { }) this.$refs.dataList.$refs.searchInput.sreach_num = 1 } + + // 是否弹出侧滑 + const add = this.$route.query.add + if (add) { + if (add === 'endpoint') { + this.add() + } + } } } diff --git a/nezha-fronted/src/components/page/monitor/module/moduleList.vue b/nezha-fronted/src/components/page/monitor/module/moduleList.vue index 65ab10578..506bf7967 100644 --- a/nezha-fronted/src/components/page/monitor/module/moduleList.vue +++ b/nezha-fronted/src/components/page/monitor/module/moduleList.vue @@ -213,6 +213,13 @@ export default { } }, mounted () { + // 是否弹出侧滑 + const add = this.$route.query.add + if (add) { + if (add === 'module') { + this.add() + } + } } } diff --git a/nezha-fronted/src/components/page/monitor/project/index.vue b/nezha-fronted/src/components/page/monitor/project/index.vue index 4175417d0..48e26d0b1 100644 --- a/nezha-fronted/src/components/page/monitor/project/index.vue +++ b/nezha-fronted/src/components/page/monitor/project/index.vue @@ -1,6 +1,6 @@ - + @@ -25,6 +25,13 @@ export default { }, watch: {}, mounted () { + // 是否弹出侧滑 + const add = this.$route.query.add + if (add) { + if (add === 'project') { + this.$refs.dataList.add() + } + } }, methods: {} }