-
+
{{scope.row[item.prop] && scope.row[item.prop].msg ? scope.row[item.prop].msg : '-'}}
@@ -103,13 +104,15 @@ export default {
label: this.$t('asset.vsysId'),
prop: 'vsysId',
show: true,
- minWidth: 120
+ minWidth: 120,
+ sortable: 'custom'
},
{
label: this.$t('overall.state'),
prop: 'state',
show: true,
- minWidth: 120
+ minWidth: 120,
+ sortable: 'custom'
}, {
label: this.$t('project.module.configs'),
prop: 'vsysInfo',
@@ -124,7 +127,8 @@ export default {
label: this.$t('overall.time'),
prop: 'uts',
show: true,
- minWidth: 120
+ minWidth: 120,
+ sortable: 'custom'
}
]
}
@@ -152,14 +156,19 @@ export default {
}
// this.$set(this.tableData,index,item);// 调用父组件
},
- copyValue (txt) {
- const str = `{
- "deviceTag": "${txt.deviceTag || ''}",
- "params": "${txt.params || ''}"
-}`
- this.$copyText(str).then(() => {
+ copyValue (item) {
+ const str = {
+ deviceTag: item.deviceTag || '',
+ params: item.params || ''
+ }
+ this.$copyText(JSON.stringify(str)).then(() => {
this.$message.success({ message: this.$t('overall.copySuccess') })
})
+ },
+ // 数据排序
+ tableDataSort (item) {
+ const orderBy = { order: item.order, prop: item.prop }
+ this.$emit('tableDataSort', orderBy)
}
}
}
diff --git a/nezha-fronted/src/components/common/table/settings/backupsTable.vue b/nezha-fronted/src/components/common/table/settings/backupsTable.vue
index dcf9554b7..5b88b4952 100644
--- a/nezha-fronted/src/components/common/table/settings/backupsTable.vue
+++ b/nezha-fronted/src/components/common/table/settings/backupsTable.vue
@@ -50,26 +50,30 @@
-
-
-
-
+
+
+
+
+
-
+
+ {{$t('backup.RestoreNow')}}
+
+
+
+
+
-
diff --git a/nezha-fronted/src/components/page/config/backups.vue b/nezha-fronted/src/components/page/config/backups.vue
index d5206f3ee..bb3aede66 100644
--- a/nezha-fronted/src/components/page/config/backups.vue
+++ b/nezha-fronted/src/components/page/config/backups.vue
@@ -1,5 +1,5 @@
-
+
diff --git a/nezha-fronted/src/components/page/config/profile.vue b/nezha-fronted/src/components/page/config/profile.vue
index 7042f0da9..f9c5321da 100644
--- a/nezha-fronted/src/components/page/config/profile.vue
+++ b/nezha-fronted/src/components/page/config/profile.vue
@@ -384,15 +384,9 @@ export default {
element.click()
},
copyValue () {
- const domUrl = document.createElement('input')
- domUrl.value = this.fileContent
- domUrl.id = 'creatDom'
- document.body.appendChild(domUrl)
- domUrl.select() // 选择对象
- document.execCommand('Copy') // 执行浏览器复制命令
- const creatDom = document.getElementById('creatDom')
- creatDom.parentNode.removeChild(creatDom)
- this.$message.success(this.$t('overall.copySuccess'))
+ this.$copyText(this.fileContent).then(() => {
+ this.$message.success({ message: this.$t('overall.copySuccess') })
+ })
},
fileClosed () {
this.personalCenter()
diff --git a/nezha-fronted/src/components/page/config/recordRule.vue b/nezha-fronted/src/components/page/config/recordRule.vue
index 9c942a9e1..51781b1a2 100644
--- a/nezha-fronted/src/components/page/config/recordRule.vue
+++ b/nezha-fronted/src/components/page/config/recordRule.vue
@@ -118,6 +118,7 @@ export default {
return {
url: 'record/rule',
tableId: 'recordRuleTable',
+ detailType: 'list',
searchMsg: { // 给搜索框子组件传递的信息
searchLabelList: [
{
diff --git a/nezha-fronted/src/components/page/config/template/chartTemp.vue b/nezha-fronted/src/components/page/config/template/chartTemp.vue
index 29781bec2..dd3d5e95e 100644
--- a/nezha-fronted/src/components/page/config/template/chartTemp.vue
+++ b/nezha-fronted/src/components/page/config/template/chartTemp.vue
@@ -263,6 +263,22 @@ export default {
})
}
},
+ copy (u, copyParams) {
+ const copyName = this.$loadsh.get(copyParams, 'copyName', '-copy')
+ this.object = { ...u, name: u.name + copyName, id: '' }
+ if (this.object.name.length > 64) {
+ const length = this.object.name.length - 64
+ this.object.name = u.name.substring(0, u.name.length - length) + '-copy'
+ }
+ if (this.object.type !== 'group') {
+ this.object.elements = this.object.elements.map(item => {
+ item.id = ''
+ return item
+ })
+ }
+
+ this.rightBox.show = true
+ },
chartBySync (row) {
this.$store.dispatch('dispatchHomeLoading', true)
this.$post('visual/panel/chart/syncTmpl', { pid: row.id }).then(res => {
diff --git a/nezha-fronted/src/components/page/config/terminal.vue b/nezha-fronted/src/components/page/config/terminal.vue
index 514bdebd9..7d12161da 100644
--- a/nezha-fronted/src/components/page/config/terminal.vue
+++ b/nezha-fronted/src/components/page/config/terminal.vue
@@ -19,7 +19,33 @@
{{$t('config.system.basic.day')}}
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -42,12 +68,18 @@ export default {
terminal_timeout: 30,
terminal_telnet_user_tip: 'ogin:',
terminal_telnet_pin_tip: 'assword:',
- terminal_record_local_retention: 365
+ terminal_record_local_retention: 365,
+ terminal_storage_type: '',
+ terminal_storage_s3_endpoint: '',
+ terminal_storage_s3_bucket: '',
+ terminal_storage_s3_access_key: '',
+ terminal_storage_s3_secret_access_key: ''
},
terminalCopy: null,
terminalRules: {
terminal_timeout: [{ validator: positiveInteger, trigger: 'blur' }],
- terminal_record_local_retention: [{ required: true, message: this.$t('validate.required'), trigger: 'blur' }, { validator: positiveInteger, trigger: 'blur' }]
+ terminal_record_local_retention: [{ required: true, message: this.$t('validate.required'), trigger: 'blur' }, { validator: positiveInteger, trigger: 'blur' }],
+ terminal_storage_type: [{ required: true, message: this.$t('validate.required'), trigger: 'blur' }]
}
}
},
diff --git a/nezha-fronted/src/components/page/dashboard/explore/exploreItem.vue b/nezha-fronted/src/components/page/dashboard/explore/exploreItem.vue
index 8b4b75727..312c928cf 100644
--- a/nezha-fronted/src/components/page/dashboard/explore/exploreItem.vue
+++ b/nezha-fronted/src/components/page/dashboard/explore/exploreItem.vue
@@ -4253,6 +4253,7 @@ export default {
}
if (!this.showMetrics) {
params.limit = this.$refs.logDetail ? this.$refs.logDetail.getLimit() : 100
+ params.direction = this.$refs.logDetail ? this.$refs.logDetail.getDescending() : 'backward'
}
this.$store.dispatch('dispatchHomeLoading', true)
this.$get('/visual/explore/snapshot', params, 'blob').then(res => {
@@ -4287,7 +4288,6 @@ export default {
document.body.removeChild(link) // 下载完成移除元素
window.URL.revokeObjectURL(href) // 释放blob对象
}
- this.$refs.topTool.closeDialog()
}, () => {
this.$message.error('123')
})
diff --git a/nezha-fronted/src/components/page/dashboard/explore/exploreItemHtml.vue b/nezha-fronted/src/components/page/dashboard/explore/exploreItemHtml.vue
index fcca3daf1..de1df4053 100644
--- a/nezha-fronted/src/components/page/dashboard/explore/exploreItemHtml.vue
+++ b/nezha-fronted/src/components/page/dashboard/explore/exploreItemHtml.vue
@@ -28,12 +28,13 @@
{{$t('dashboard.panel.chartForm.typeVal.table.label')}}
-
-
-
-
-
-
+
+
-
+
-
+
@@ -97,7 +98,7 @@
@@ -26,7 +27,7 @@
{{$t('overall.limit')}}:
-
+
@@ -34,7 +35,7 @@
Result:
{{tableData.length}}
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- {{assetData | unitFormat}}
- +
-
-
-
{{$t("asset.asset")}}
-
-
-
-
-
-
-
-
-
-
- {{projectData.total | unitFormat}}
- +
-
-
-
{{$t("project.project.projectName")}}
-
-
-
-
-
-
-
-
-
-
- {{moduleData.total | unitFormat}}
- +
-
-
-
{{$t("overall.module")}}
-
-
-
-
-
-
-
-
-
-
- {{endpointData.num | unitFormat}}
- +
-
-
-
{{$t("asset.endpoint")}}
-
-
-
-
-
-
-
-
-
-
- {{alertMessageData.num | unitFormat}}
- +
-
-
-
{{$t("overall.alert")}}
-
-
{{$t("dashboard.overview.alert.ruleNum")}} : {{(alertRuleData ? alertRuleData : "") | numberFormat}}
-
-
-
-
-
-
-
- {{$t("dashboard.panel.chartForm.typeVal.topology.label")}}
-
-
-
-
-
-
-
- {{item.name}}
-
-
-
-
-
No Data
-
-
-
-
{{$t("overall.dc")}}
-
-
-
-
-
-
-
-
- {{$t("dashboard.overview.overall.state")}}
-
-
-
-
-
-
-
-
- {{$t("dashboard.overview.alert.assetTopN")}}
- {{$t("dashboard.overview.alert.moduleTopN")}}
-
-
-
-
-
-
-
- {{$t("dashboard.overview.alert.moduleTopN")}}
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- {{(assetData ? assetData.totalStat.total : '') | unitFormat}}
- +
-
-
-
{{$t("asset.asset")}}
-
-
-
-
-
-
-
-
-
-
- {{(projectData ? projectData.projectStat.length : '') | unitFormat}}
- +
-
-
-
{{$t("project.project.projectName")}}
-
-
-
-
-
-
-
-
-
-
- {{(moduleData ? moduleData.moduleStat.length : '') | unitFormat}}
- +
-
-
-
{{$t("overall.module")}}
-
-
-
-
-
-
-
-
-
-
- {{(endpointData ? endpointData.total : '') | unitFormat}}
- +
-
-
-
{{$t("asset.endpoint")}}
-
-
-
-
-
-
-
-
-
-
- {{(alertMessageData ? alertMessageData.alertMessageTotal : '') | unitFormat}}
- +
-
-
-
{{$t("overall.alert")}}
-
-
{{$t("dashboard.overview.alert.ruleNum")}} : {{(alertRuleData ? alertRuleData.alertRuleTotal : "") | numberFormat}}
-
-
-
-
-
-
-
- {{$t("dashboard.panel.chartForm.typeVal.topology.label")}}
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- {{item.name}}
-
-
-
-
-
No Data
-
-
-
-
{{$t("overall.dc")}}
-
-
-
-
-
-
-
-
- {{$t("dashboard.overview.asset.assetType")}}
-
-
-
-
-
-
-
-
- {{$t("dashboard.overview.alert.assetTopN")}}
- {{$t("dashboard.overview.alert.moduleTopN")}}
-
-
-
-
-
-
-
-
- {{$t("dashboard.overview.alert.moduleTopN")}}
-
-
-
-
-
-
-
-
-
-
-
-
-