From b3c4fc50edca8af7b46d3a89ea5ff158ea8b3a8c Mon Sep 17 00:00:00 2001 From: zhangyu Date: Thu, 21 Oct 2021 14:04:07 +0800 Subject: [PATCH] =?UTF-8?q?feat:=20terminalog=E6=B7=BB=E5=8A=A0=E8=AF=A6?= =?UTF-8?q?=E7=BB=86=E8=A7=86=E5=9B=BE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../common/detailView/list/dc/dcDetail.vue | 61 +++-- .../terminalLogDetail/terminalLogDetail.vue | 234 ++++++++++++++++++ .../detailView/view/detailViewRight.vue | 2 + .../src/components/page/config/dc.vue | 1 + .../components/page/config/terminalLog.vue | 72 +++++- .../page/monitor/module/moduleList.vue | 1 + 6 files changed, 347 insertions(+), 24 deletions(-) create mode 100644 nezha-fronted/src/components/common/detailView/list/terminalLogDetail/terminalLogDetail.vue diff --git a/nezha-fronted/src/components/common/detailView/list/dc/dcDetail.vue b/nezha-fronted/src/components/common/detailView/list/dc/dcDetail.vue index 4f4e831e2..b4f1ad040 100644 --- a/nezha-fronted/src/components/common/detailView/list/dc/dcDetail.vue +++ b/nezha-fronted/src/components/common/detailView/list/dc/dcDetail.vue @@ -57,7 +57,7 @@ export default { }, data () { return { - tableTitle: [ // 原始table列 + tableTitle: [ { label: 'ID', prop: 'id', @@ -65,36 +65,57 @@ export default { width: 80, sortable: 'custom' }, { - label: this.$t('project.module.moduleName'), + label: this.$t('overall.name'), prop: 'name', show: true, minWidth: 200, sortable: 'custom' }, { - label: this.$t('project.project.projectName'), - prop: 'project', + label: this.$t('asset.location'), + prop: 'location', + show: true + }, { + label: this.$t('config.dc.cabinetNum'), + prop: 'cabinetNum', show: true, - width: 200, - sortable: 'custom' - }, - { - label: this.$t('project.endpoint.endpoint'), - prop: 'endpointNum', - show: true, - width: 200, + minWidth: 100, sortable: 'custom' }, { - label: this.$t('project.module.alerts'), - prop: 'alertNum', + label: this.$t('config.dc.assets'), + prop: 'assetNum', show: true, - width: 200, + minWidth: 90, sortable: 'custom' - }, - { - label: this.$t('overall.remark'), - prop: 'remark', + }, { + label: this.$t('config.dc.alert'), + prop: 'alertNum', + show: true + }, { + label: this.$t('asset.tel'), + prop: 'tel', + show: false, + minWidth: 100 + }, { + label: this.$t('asset.principal'), + prop: 'principal', + show: false, + minWidth: 120 + }, { + label: this.$t('config.dc.longitude'), + prop: 'longitude', + show: false, + minWidth: 100 + }, { + label: this.$t('config.dc.latitude'), + prop: 'latitude', + show: false, + minWidth: 100 + }, { + label: this.$t('config.dc.state'), + prop: 'state', show: true, - minWidth: 150 + minWidth: 100, + sortable: 'custom' } ] } diff --git a/nezha-fronted/src/components/common/detailView/list/terminalLogDetail/terminalLogDetail.vue b/nezha-fronted/src/components/common/detailView/list/terminalLogDetail/terminalLogDetail.vue new file mode 100644 index 000000000..aaa1bd810 --- /dev/null +++ b/nezha-fronted/src/components/common/detailView/list/terminalLogDetail/terminalLogDetail.vue @@ -0,0 +1,234 @@ + + + + + diff --git a/nezha-fronted/src/components/common/detailView/view/detailViewRight.vue b/nezha-fronted/src/components/common/detailView/view/detailViewRight.vue index 97dfb18bb..5896cc37f 100644 --- a/nezha-fronted/src/components/common/detailView/view/detailViewRight.vue +++ b/nezha-fronted/src/components/common/detailView/view/detailViewRight.vue @@ -299,6 +299,8 @@ export default { this.targetTab = 'alertRuleAlertMessage' } else if (this.from === fromRoute.dc) { this.targetTab = 'cabinet' + } else if (this.from === fromRoute.terminalLog) { + this.targetTab = 'cmdTab' } } } diff --git a/nezha-fronted/src/components/page/config/dc.vue b/nezha-fronted/src/components/page/config/dc.vue index e101eede9..2e38bab0b 100644 --- a/nezha-fronted/src/components/page/config/dc.vue +++ b/nezha-fronted/src/components/page/config/dc.vue @@ -72,6 +72,7 @@
+ + + + + + + + :search-msg="searchMsg" + :detailType="detailType" + @changeDetailType="changeDetailType" + @getTableData="getTableData" + >