diff --git a/nezha-fronted/src/assets/stylus/main.scss b/nezha-fronted/src/assets/stylus/main.scss index 368785ffc..a59c0c64f 100644 --- a/nezha-fronted/src/assets/stylus/main.scss +++ b/nezha-fronted/src/assets/stylus/main.scss @@ -1094,6 +1094,8 @@ li{ width:10px; height:10px; border-radius:50%; + display: inline-block; + margin-right: 5px; } .red { background-color:#ff6347; diff --git a/nezha-fronted/src/components/common/exportXLSX.vue b/nezha-fronted/src/components/common/exportXLSX.vue new file mode 100644 index 000000000..d500a4aac --- /dev/null +++ b/nezha-fronted/src/components/common/exportXLSX.vue @@ -0,0 +1,325 @@ + + + + + + diff --git a/nezha-fronted/src/components/common/header.vue b/nezha-fronted/src/components/common/header.vue index 4acb18c2a..4cbbe7824 100644 --- a/nezha-fronted/src/components/common/header.vue +++ b/nezha-fronted/src/components/common/header.vue @@ -280,11 +280,13 @@ }, jumpToAsset(id) { let index = this.indOf(this.activeItemIndexes, id); - if (index > -1) { - this.activeItemIndexes.splice(index, 1); - } else { - this.activeItemIndexes.push(id); - } + this.activeItemIndexes=[];//2020-02-25 修改为单选 + this.activeItemIndexes.push(id); + // if (index > -1) { + // this.activeItemIndexes.splice(index, 1); + // } else { + // this.activeItemIndexes.push(id); + // } this.$store.state.assetData = {selectedData: this.activeItemIndexes, step: this.$store.state.assetData.step+1, type: 1}; this.jumpTo('asset'); }, diff --git a/nezha-fronted/src/components/common/language/en.js b/nezha-fronted/src/components/common/language/en.js index fa2958e5c..6ece3d69a 100644 --- a/nezha-fronted/src/components/common/language/en.js +++ b/nezha-fronted/src/components/common/language/en.js @@ -42,7 +42,24 @@ const en = { createAlertRule:'create alert rule', createAccount:'create account', createPrometheusServer:'create prometheus server', - createDatacenter:'create datacenter' + createDatacenter:'create datacenter', + exportExcel:'Export', + importExcel:'Import', + importExcelLower:'import', + exportExcelLower:'export', + rollbackImport:'rollback', + exportCur:'current page', + exportAll:'all', + importFile:'please upload file', + importTip:'only allowed xlsx/xls file', + upload:'upload', + template:'Template', + result:{ + total:'Total', + failed:'Failed', + success:'Success', + failedDetail:'Failed Detail' + } }, dashboard:{ title:'Dashboard', diff --git a/nezha-fronted/src/components/page/asset/asset.vue b/nezha-fronted/src/components/page/asset/asset.vue index b99193ce7..1d89294ea 100644 --- a/nezha-fronted/src/components/page/asset/asset.vue +++ b/nezha-fronted/src/components/page/asset/asset.vue @@ -33,11 +33,19 @@
- - + + + + +
@@ -75,14 +83,15 @@
{{scope.row.state==1 ? $t('asset.createAssetTab.inStock') : $t('asset.createAssetTab.notInStock')}}
+
+ :content="formatPingTime(scope.row.pingLastUpdate)">
-
+
{{scope.row.pingRtt?scope.row.pingRtt+'ms':''}}
@@ -186,8 +195,10 @@