diff --git a/nezha-fronted/src/assets/css/common.scss b/nezha-fronted/src/assets/css/common.scss index c123b22e8..795170e7b 100644 --- a/nezha-fronted/src/assets/css/common.scss +++ b/nezha-fronted/src/assets/css/common.scss @@ -124,3 +124,8 @@ display: inline-block; margin-right: 5px; } +span:first-letter,div:first-letter{ + text-transform: capitalize; +} + + diff --git a/nezha-fronted/src/components/charts/chart-list-group.vue b/nezha-fronted/src/components/charts/chart-list-group.vue index 389088c32..0d5279e32 100644 --- a/nezha-fronted/src/components/charts/chart-list-group.vue +++ b/nezha-fronted/src/components/charts/chart-list-group.vue @@ -643,7 +643,7 @@ export default { this.modelStaticData(chartInfo, filterType) } else { // 没有数据的设置提示信息暂无数据-针对每一个图 - const len = chartItem.elements.length + const len = chartItem.elements ? chartItem.elements.length : 0 if (len === 0) { this.$nextTick(() => { if (this.$refs['editChart' + chartItem.id] && this.$refs['editChart' + chartItem.id].length > 0) { @@ -693,7 +693,6 @@ export default { }) // 一个图表的所有element单独获取数据 axios.all(axiosArr).then((res) => { - if (res.length > 0) { const series = [] let singleStatRlt = '' diff --git a/nezha-fronted/src/components/charts/chart-list.vue b/nezha-fronted/src/components/charts/chart-list.vue index 5f2b26992..c85a176be 100644 --- a/nezha-fronted/src/components/charts/chart-list.vue +++ b/nezha-fronted/src/components/charts/chart-list.vue @@ -315,7 +315,6 @@ export default { this.tempDom.width = span.offsetWidth }, start (event) { - // console.log('start', event, this.dataList); event.item.querySelector('.chartTitle').style.background = '#d8dce1' const projectAndAssetFeatureInfos = event.item.querySelectorAll('.feature-content') if (projectAndAssetFeatureInfos && projectAndAssetFeatureInfos.length > 0) { @@ -611,9 +610,11 @@ export default { return } if (param.from == fromRoute.chartTemp) { // 模板列表 - this.panelDataList[0].children.forEach((item1, i) => { - item1.chartIndex = i - }) + if (this.panelDataList[0] && this.panelDataList[0].children) { + this.panelDataList[0].children.forEach((item1, i) => { + item1.chartIndex = i + }) + } this.dataList = this.panelDataList this.$nextTick(() => { this.dataList.forEach((item, index) => { diff --git a/nezha-fronted/src/components/cli/webSSH.vue b/nezha-fronted/src/components/cli/webSSH.vue index 10122b0fc..744869aad 100644 --- a/nezha-fronted/src/components/cli/webSSH.vue +++ b/nezha-fronted/src/components/cli/webSSH.vue @@ -515,7 +515,7 @@ export default { // this.$store.commit('addConsole'); }, show (id, host, accountId, port) { - this.addConsole(id, host, accountId, port) + this.addConsole(id, host, accountId, port,'asset') this.consoleShow = true }, initDialog () { diff --git a/nezha-fronted/src/components/common/bottomBox/tabs/terminalLogRecordTab.vue b/nezha-fronted/src/components/common/bottomBox/tabs/terminalLogRecordTab.vue index 6a3c7c2d9..3208d2c39 100644 --- a/nezha-fronted/src/components/common/bottomBox/tabs/terminalLogRecordTab.vue +++ b/nezha-fronted/src/components/common/bottomBox/tabs/terminalLogRecordTab.vue @@ -357,7 +357,7 @@ export default { .record-console { padding: 10px 4px 10px 10px; background-color: black; - height: calc(100% - 80px); + height: calc(100% - 65px); } .terminal-replay-progress { height: 20px; diff --git a/nezha-fronted/src/components/common/language/cn.js b/nezha-fronted/src/components/common/language/cn.js index 9fd66e931..03dd64b97 100644 --- a/nezha-fronted/src/components/common/language/cn.js +++ b/nezha-fronted/src/components/common/language/cn.js @@ -457,7 +457,7 @@ const cn = { module: '模块' }, endpoint: { - endpoint: 'Endpoints' + endpoint: 'Endpoint' }, dataCenter: { dataCenter: '数据中心', diff --git a/nezha-fronted/src/components/common/language/en.js b/nezha-fronted/src/components/common/language/en.js index 725c83800..af66ce812 100644 --- a/nezha-fronted/src/components/common/language/en.js +++ b/nezha-fronted/src/components/common/language/en.js @@ -458,16 +458,16 @@ const en = { total: 'Total' }, project: { - project: 'Projects', + project: 'Project', name: 'Name', module: 'Module', endpoint: 'Endpoint' }, module: { - module: 'Modules' + module: 'Module' }, endpoint: { - endpoint: 'Endpoints' + endpoint: 'Endpoint' }, dataCenter: { dataCenter: 'Data center', @@ -475,7 +475,7 @@ const en = { promServer: 'Prom server' }, alert: { - alertMessage: 'Alert messages', + alertMessage: 'Module name / Alert Message', level: 'Priority', alertRule: 'Alert rule', ruleNum: 'Rule num', @@ -562,7 +562,7 @@ const en = { copySuccess: 'Copy success' }, asset: { - asset: 'Asset', + asset: 'Module name / Asset ', assets: 'Asset', // '资产' editAsset: 'Edit asset', // '编辑资产' createAsset: 'New asset', // '编辑资产' @@ -1267,7 +1267,8 @@ const en = { endpoint: { createEndpoint: 'New endpoint', // "新增Endpoint" editEndpoint: 'Edit endpoint', // "编辑Endpoint" - endpoint: 'Endpoint', // "Endpoint" + endpoint: 'Endpoint ', // "Endpoint" + endpoints: 'Module name / Endpoint', endpointId: 'Endpoint ID', // "Endpoint ID" list: 'List', host: 'Host', // "Host" diff --git a/nezha-fronted/src/components/common/popBox/topToolMoreOptions.vue b/nezha-fronted/src/components/common/popBox/topToolMoreOptions.vue index e5e8643f9..9b41efe9d 100644 --- a/nezha-fronted/src/components/common/popBox/topToolMoreOptions.vue +++ b/nezha-fronted/src/components/common/popBox/topToolMoreOptions.vue @@ -160,8 +160,9 @@ export default { } this.$delete(url + '?seq=' + this.importResult.seq).then(response => { if (response.code == 200) { + const linkId = this.link ? this.link.id : '' this.$message({ duration: 2000, type: 'success', message: this.$t('tip.saveSuccess') }) - this.$emit('afterImport') + this.$emit('afterImport', linkId) } else { this.$message.error(response.msg) } @@ -183,7 +184,8 @@ export default { this.$post(this.importUrl, form, { 'Content-Type': 'multipart/form-data' }).then(response => { if (response.code == 200 && response.msg == 'success') { this.importResult = response.data - this.$emit('afterImport') + const linkId = this.link ? this.link.id : '' + this.$emit('afterImport', linkId) this.importBox.type = 3 this.importBox.width = '600px' } else { diff --git a/nezha-fronted/src/components/common/project/popData/endpointTable.vue b/nezha-fronted/src/components/common/project/popData/endpointTable.vue index c1060e97a..50399936f 100644 --- a/nezha-fronted/src/components/common/project/popData/endpointTable.vue +++ b/nezha-fronted/src/components/common/project/popData/endpointTable.vue @@ -1,7 +1,7 @@ - + diff --git a/nezha-fronted/src/components/common/rightBox/chartTempBox.vue b/nezha-fronted/src/components/common/rightBox/chartTempBox.vue index f8dd74a70..e00f55266 100644 --- a/nezha-fronted/src/components/common/rightBox/chartTempBox.vue +++ b/nezha-fronted/src/components/common/rightBox/chartTempBox.vue @@ -228,7 +228,7 @@ export default { } else if (this.from === fromRoute.endpoint) { // 来自endpoint时取endpointId this.editChartTemp.varIds = this.obj.varIds } else { - this.editChartTemp.varIds = this.transfer.selectedData.map(item => item.id) + this.editChartTemp.varIds = this.$refs.transfer.selectedData.map(item => item.id) } this.$refs.userForm.validate((valid) => { if (valid) { diff --git a/nezha-fronted/src/components/common/rightBox/editEndpointBoxNew.vue b/nezha-fronted/src/components/common/rightBox/editEndpointBoxNew.vue index 62b311f7d..ebe0fa1ff 100644 --- a/nezha-fronted/src/components/common/rightBox/editEndpointBoxNew.vue +++ b/nezha-fronted/src/components/common/rightBox/editEndpointBoxNew.vue @@ -155,7 +155,7 @@ - +
diff --git a/nezha-fronted/src/components/common/rightBox/moduleBox.vue b/nezha-fronted/src/components/common/rightBox/moduleBox.vue index dd2fb0ae8..f3dcba1c9 100644 --- a/nezha-fronted/src/components/common/rightBox/moduleBox.vue +++ b/nezha-fronted/src/components/common/rightBox/moduleBox.vue @@ -88,7 +88,7 @@
{{$t('overall.option')}}
- +
diff --git a/nezha-fronted/src/components/common/table/settings/terminalLogTable.vue b/nezha-fronted/src/components/common/table/settings/terminalLogTable.vue index f8629714b..1b5644df9 100644 --- a/nezha-fronted/src/components/common/table/settings/terminalLogTable.vue +++ b/nezha-fronted/src/components/common/table/settings/terminalLogTable.vue @@ -8,6 +8,7 @@ @header-dragend="dragend" @sort-change="tableDataSort" @selection-change="selectionChange" + @row-dblclick="(row)=>{showBottomBox(row.status==0 ? 'monitorTab' : 'cmdTab', row)}" > diff --git a/nezha-fronted/src/components/page/asset/asset.vue b/nezha-fronted/src/components/page/asset/asset.vue index 967e278da..f839cd7b5 100644 --- a/nezha-fronted/src/components/page/asset/asset.vue +++ b/nezha-fronted/src/components/page/asset/asset.vue @@ -251,12 +251,11 @@ export default { } }, methods: { - cli ([id, host, account]) { + cli (row) { const consoleParam = { - id: id, - host: host, - accountId: account.id, - port: account.port + id: row.id, + host: row.manageIp, + port: row.authProtocolPort } this.$store.commit('addConsole', consoleParam) },