diff --git a/nezha-fronted/src/components/charts/chart-detail.vue b/nezha-fronted/src/components/charts/chart-detail.vue index d07a35dfb..3054b35ee 100644 --- a/nezha-fronted/src/components/charts/chart-detail.vue +++ b/nezha-fronted/src/components/charts/chart-detail.vue @@ -319,23 +319,23 @@ export default { oldSearchTime: [], assetKey: { - host: this.$t('asset.tableTitle.host'), + host: this.$t('asset.host'), id: 'Id', - assetType: this.$t('asset.tableTitle.assetType'), - sn: this.$t('asset.tableTitle.device'), - state: this.$t('asset.tableTitle.assetState'), - pingRtt: this.$t('asset.tableTitle.assetPing'), - dataCenter: this.$t('asset.tableTitle.dataCenter'), - cabinet: this.$t('asset.tableTitle.cabinet'), - model: this.$t('asset.tableTitle.model'), - vendor: this.$t('asset.tableTitle.vendor'), - purchaseDate: this.$t('asset.tableTitle.procurementDate'), - principal: this.$t('asset.tableTitle.principal'), - tel: this.$t('asset.tableTitle.principalTel'), - pingStatus: this.$t('asset.tableTitle.assetPing'), - pingLastReply: this.$t('asset.tableTitle.lastReply'), - endpoint: this.$t('asset.tableTitle.modules'), - alert: this.$t('asset.tableTitle.alerts'), + assetType: this.$t('asset.assetType'), + sn: this.$t('asset.device'), + state: this.$t('asset.assetState'), + pingRtt: this.$t('asset.assetPing'), + dataCenter: this.$t('asset.dataCenter'), + cabinet: this.$t('asset.cabinet'), + model: this.$t('asset.model'), + vendor: this.$t('asset.vendor'), + purchaseDate: this.$t('asset.procurementDate'), + principal: this.$t('asset.principal'), + tel: this.$t('asset.principalTel'), + pingStatus: this.$t('asset.assetPing'), + pingLastReply: this.$t('asset.lastReply'), + endpoint: this.$t('asset.modules'), + alert: this.$t('asset.alerts'), tags: this.$t('overall.tag') }, projectKey: { diff --git a/nezha-fronted/src/components/charts/chart-list.vue b/nezha-fronted/src/components/charts/chart-list.vue index 0e320c972..6252aeb86 100644 --- a/nezha-fronted/src/components/charts/chart-list.vue +++ b/nezha-fronted/src/components/charts/chart-list.vue @@ -288,7 +288,6 @@ export default { }, watch: { panelDataList (n) { - console.log(n) this.getData(this.filter) } }, @@ -672,7 +671,6 @@ export default { return } if (param.from == this.$CONSTANTS.fromRoute.chartTemp) { - console.log(this.panelDataList) this.dataList = this.panelDataList this.$nextTick(() => { this.dataList.forEach((item, index) => { @@ -762,7 +760,6 @@ export default { }) }, loadChartData (scrollTop) { - console.log(scrollTop) if (this.dataList.length > 0) { this.dataList.forEach((item, index) => { if (!item.isLoaded) { @@ -1751,7 +1748,6 @@ export default { }, // 懒加载,判断网页区域,加载可见区的prom数据 handleElementInViewport (ele, scrollTop, item, index, isSearch) { - console.log(ele, scrollTop, item, index) /* 网页被卷去的高:document.body.scrollTop 网页正文全文高:document.body.scrollHeight diff --git a/nezha-fronted/src/components/common/bottomBox/bottomBox.vue b/nezha-fronted/src/components/common/bottomBox/bottomBox.vue index b1972669a..d201561ed 100644 --- a/nezha-fronted/src/components/common/bottomBox/bottomBox.vue +++ b/nezha-fronted/src/components/common/bottomBox/bottomBox.vue @@ -122,7 +122,7 @@ export default { }, module: { moduleTabTitle: [ - { prop: 'endpoint', name: this.$t('asset.tableTitle.endpoint') }, + { prop: 'endpoint', name: this.$t('asset.endpoint') }, { prop: 'moduleAlertMessage', name: 'Alerts' }, { prop: 'panel', name: 'Detail' } ] diff --git a/nezha-fronted/src/components/common/bottomBox/tabs/alertMessageTab.vue b/nezha-fronted/src/components/common/bottomBox/tabs/alertMessageTab.vue index 58151e96a..db493664b 100644 --- a/nezha-fronted/src/components/common/bottomBox/tabs/alertMessageTab.vue +++ b/nezha-fronted/src/components/common/bottomBox/tabs/alertMessageTab.vue @@ -3,8 +3,8 @@
{{obj.name}}
-
{{$t("asset.tableTitle.modules")}}
-
{{$t("asset.tableTitle.alerts")}}
+
{{$t("asset.modules")}}
+
{{$t("asset.alerts")}}
@@ -13,8 +13,8 @@
{{$t("overall.detail")}}
{{$t("asset.tableTitle.alerts")}}
{{$t("asset.tableTitle.modules")}}
+ class="sub-list-tab sub-list-tab-active">{{$t("asset.alerts")}}
{{$t("asset.modules")}}
{{$t("overall.query")}}
diff --git a/nezha-fronted/src/components/common/bottomBox/tabs/assetTab.vue b/nezha-fronted/src/components/common/bottomBox/tabs/assetTab.vue index d592839cb..8968c79d8 100644 --- a/nezha-fronted/src/components/common/bottomBox/tabs/assetTab.vue +++ b/nezha-fronted/src/components/common/bottomBox/tabs/assetTab.vue @@ -98,7 +98,7 @@ export default { disabled: false }, { id: 23, - name: this.$t('asset.tableTitle.cabinet'), + name: this.$t('asset.cabinet'), type: 'input', label: 'cabinetName', disabled: false diff --git a/nezha-fronted/src/components/common/bottomBox/tabs/endpointQueryTab.vue b/nezha-fronted/src/components/common/bottomBox/tabs/endpointQueryTab.vue index 2982b1950..891063900 100644 --- a/nezha-fronted/src/components/common/bottomBox/tabs/endpointQueryTab.vue +++ b/nezha-fronted/src/components/common/bottomBox/tabs/endpointQueryTab.vue @@ -22,7 +22,7 @@
{{$t("project.endpoint.endpointId")}}: {{currentEndpoint ? currentEndpoint.id : ''}}
{{$t("overall.detail")}}
-
{{$t("asset.tableTitle.alerts")}}
+
{{$t("asset.alerts")}}
{{$t("overall.query")}}
diff --git a/nezha-fronted/src/components/common/bottomBox/tabs/endpointTab.vue b/nezha-fronted/src/components/common/bottomBox/tabs/endpointTab.vue index bb00172e6..f3730dc9f 100644 --- a/nezha-fronted/src/components/common/bottomBox/tabs/endpointTab.vue +++ b/nezha-fronted/src/components/common/bottomBox/tabs/endpointTab.vue @@ -4,13 +4,13 @@
{{obj.host}}
{{$t("overall.detail")}}
-
{{$t("asset.tableTitle.alerts")}}
-
{{$t("asset.tableTitle.modules")}}
+
{{$t("asset.alerts")}}
+
{{$t("asset.modules")}}
{{obj.name}}
-
{{$t("asset.tableTitle.modules")}}
-
{{$t("asset.tableTitle.alerts")}}
+
{{$t("asset.modules")}}
+
{{$t("asset.alerts")}}
{{$t("dashboard.panel.title")}}
diff --git a/nezha-fronted/src/components/common/language/cn.js b/nezha-fronted/src/components/common/language/cn.js index f0e16b1a9..aa2286d27 100644 --- a/nezha-fronted/src/components/common/language/cn.js +++ b/nezha-fronted/src/components/common/language/cn.js @@ -545,6 +545,7 @@ const cn = { principal: '负责人', tel: '电话', featureTitle: '属性', + endpoint: 'Endpoint', endpointUpNum: '代表正常的数量', endpointNum: '代表总的数量', active: '存活', // "存活", diff --git a/nezha-fronted/src/components/common/language/en.js b/nezha-fronted/src/components/common/language/en.js index c1fbe19a6..f25ed0a2c 100644 --- a/nezha-fronted/src/components/common/language/en.js +++ b/nezha-fronted/src/components/common/language/en.js @@ -552,6 +552,7 @@ const en = { principal: 'Administrator', // '负责人' tel: 'Telephone', // '电话' featureTitle: 'Attribute', + endpoint: 'Endpoint', endpointUpNum: 'It\'s a normal number', endpointNum: 'Represents the total quantity', active: 'Alive', // "存活", diff --git a/nezha-fronted/src/components/common/pickTime.vue b/nezha-fronted/src/components/common/pickTime.vue index 0be120aa2..2ee8b2805 100644 --- a/nezha-fronted/src/components/common/pickTime.vue +++ b/nezha-fronted/src/components/common/pickTime.vue @@ -9,6 +9,7 @@