diff --git a/nezha-fronted/src/components/common/language/cn.js b/nezha-fronted/src/components/common/language/cn.js index f0bee87fd..adb780046 100644 --- a/nezha-fronted/src/components/common/language/cn.js +++ b/nezha-fronted/src/components/common/language/cn.js @@ -1148,7 +1148,7 @@ const cn = { endpointInfo: 'Endpoint信息' }, project: { - project: '系统', + project: '名称', projectName: '系统名称', editProject: '编辑系统', description: '描述', @@ -1175,7 +1175,7 @@ const cn = { authProtocol: '认证协议', privProtocol: '隐私协议', contextName: '内容名称', - alerts: 'Alerts', + alerts: '告警', privpin: '隐私密码', asset: 'Asset', editEndpoint: '编辑 Endpoint', diff --git a/nezha-fronted/src/components/common/language/en.js b/nezha-fronted/src/components/common/language/en.js index 9e4a4f1c3..e09f527b8 100644 --- a/nezha-fronted/src/components/common/language/en.js +++ b/nezha-fronted/src/components/common/language/en.js @@ -1194,7 +1194,7 @@ const en = { privProtocol: 'Priv protocol', contextName: 'Context name', privpin: 'Priv password', - alerts: 'Alerts', + alerts: 'Alert', asset: 'Asset', editEndpoint: 'Edit endpoint', createEndpoint: 'New endpoint', diff --git a/nezha-fronted/src/components/common/table/alert/alertSilenceTable.vue b/nezha-fronted/src/components/common/table/alert/alertSilenceTable.vue index 1422be980..a216f59a6 100644 --- a/nezha-fronted/src/components/common/table/alert/alertSilenceTable.vue +++ b/nezha-fronted/src/components/common/table/alert/alertSilenceTable.vue @@ -127,7 +127,7 @@ export default { sortable: 'custom' }, { - label: 'Name', + label: this.$t('alert.silence.name'), prop: 'name', show: true, width: 150 diff --git a/nezha-fronted/src/components/common/table/settings/projectTable.vue b/nezha-fronted/src/components/common/table/settings/projectTable.vue index 0ad228ca9..94bc292d6 100644 --- a/nezha-fronted/src/components/common/table/settings/projectTable.vue +++ b/nezha-fronted/src/components/common/table/settings/projectTable.vue @@ -95,31 +95,31 @@ export default { prop: 'id', show: true, width: 80, - sortable:'custom' + sortable: 'custom' }, { label: this.$t('project.project.project'), prop: 'name', show: true, minWidth: 150, - sortable:'custom' + sortable: 'custom' }, { label: this.$t('project.module.module'), prop: 'moduleNum', show: true, width: 150, - sortable:'custom' + sortable: 'custom' }, { label: this.$t('project.endpoint.endpoint'), prop: 'endpointNum', show: true, width: 150, - sortable:'custom' + sortable: 'custom' }, { label: this.$t('project.endpoint.alerts'), prop: 'alertNum', show: true, width: 150, - sortable:'custom' + sortable: 'custom' }, { label: this.$t('overall.remark'), diff --git a/nezha-fronted/src/components/page/config/menus.vue b/nezha-fronted/src/components/page/config/menus.vue index 1f44d300a..104c87e3b 100644 --- a/nezha-fronted/src/components/page/config/menus.vue +++ b/nezha-fronted/src/components/page/config/menus.vue @@ -125,6 +125,12 @@ export default { }] } } + }, + methods: { + edit (u) { + this.object ={...u} + this.rightBox.show = true + }, } } diff --git a/nezha-fronted/src/components/page/config/template/exprTemp.vue b/nezha-fronted/src/components/page/config/template/exprTemp.vue index 5f0d5889b..8c5ebc8ed 100644 --- a/nezha-fronted/src/components/page/config/template/exprTemp.vue +++ b/nezha-fronted/src/components/page/config/template/exprTemp.vue @@ -1,6 +1,6 @@ + id="alert-msg-batch-delete" v-has="'expressionTemplate_delete'" :api="url"> + - + @@ -84,7 +85,6 @@ import bus from '@/libs/bus' import exportXLSX from '@/components/common/exportXLSX' import exprTmplBox from '@/components/common/rightBox/exprTmplBox' import deleteButton from '@/components/common/deleteButton' -import nzDataList from '@/components/common/table/nzDataList' import dataListMixin from '@/components/common/mixin/dataList' import exprTmplTable from '@/components/common/table/settings/exprTmplTable' @@ -93,7 +93,6 @@ export default { components: { deleteButton, exprTmplBox, - nzDataList, exprTmplTable, 'export-excel': exportXLSX }, diff --git a/nezha-fronted/src/components/page/config/template/index.vue b/nezha-fronted/src/components/page/config/template/index.vue index 01a8d2b05..8cbdc8af5 100644 --- a/nezha-fronted/src/components/page/config/template/index.vue +++ b/nezha-fronted/src/components/page/config/template/index.vue @@ -1,7 +1,7 @@ @@ -9,14 +9,14 @@ import exprTemp from './exprTemp' import chartTemp from './chartTemp' export default { - name: 'template', + name: 'v-template', components: { exprTemp, chartTemp }, data () { return { - showTab: 'exprTemp' + showTab: '' } }, methods: { @@ -45,16 +45,10 @@ export default { this.showTab = showTab } }, - watch: { - $routePath: { - - immediate: true, - handler (n, o) { - if (n.indexOf('mib') != -1 && this.$route.params.tab) { - this.$set(this, 'showTab', this.$route.params.tab) - } - } - } + mounted () { + this.$nextTick(()=>{ + this.showTab = 'exprTemp' + }) } } diff --git a/nezha-fronted/src/main.js b/nezha-fronted/src/main.js index 283b00eec..af4312f9d 100644 --- a/nezha-fronted/src/main.js +++ b/nezha-fronted/src/main.js @@ -33,6 +33,7 @@ import bus from '@/libs/bus' import theme from '@/assets/css/theme.scss' import myDatePicker from '@/components/common/myDatePicker' import vSelectPage from 'v-selectpage' +import nzDataList from '@/components/common/table/nzDataList' Vue.use(vSelectPage, { dataLoad: function (vue, url, params) { if (params.pageNumber) { @@ -52,6 +53,7 @@ Vue.component('element-set', elementSet) Vue.component('loading', loading) Vue.component('pick-time', pickTime) Vue.component('myDatePicker', myDatePicker) +Vue.component('nzDataList', nzDataList) Vue.prototype.$axios = axios Vue.prototype.$post = post