gfwleak/nezha-nezha-fronted
Archived
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix： 去除 重复国际化

Browse Source
This commit is contained in:
zhangyu
2022-06-21 14:17:46 +08:00
parent 0a6aa58ad3
commit a874bfa87b
35 changed files with 52 additions and 62 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
nezha-fronted/src/components/cli/webSSH.vue
View File

@@ -198,7 +198,7 @@
<el-option v-for="item in authProtocol" :id="'dc-principal-op-'+item.value" :key="item.value" :label="item.name" :value="item.value"></el-option> <el-option v-for="item in authProtocol" :id="'dc-principal-op-'+item.value" :key="item.value" :label="item.name" :value="item.value"></el-option>
</el-select> </el-select>
</el-form-item> </el-form-item>
<el-form-item :label='$t("webshell.authType")' prop="authType" @change="authTypeChange" > <el-form-item :label='$t("asset.authType")' prop="authType" @change="authTypeChange" >
<el-select value-key="id" popper-class="config-dropdown w260 right-box-select-top right-public-box-dropdown-top" v-model="customConnect.authType" :disabled="customConnect.authProtocol === 2" placeholder="" size="small" id="webshell-box-input-protocol"> <el-select value-key="id" popper-class="config-dropdown w260 right-box-select-top right-public-box-dropdown-top" v-model="customConnect.authType" :disabled="customConnect.authProtocol === 2" placeholder="" size="small" id="webshell-box-input-protocol">
<el-option v-for="item in authType" :id="'dc-principal-op-'+item.value" :key="item.value" :label="item.name" :value="item.value"></el-option> <el-option v-for="item in authType" :id="'dc-principal-op-'+item.value" :key="item.value" :label="item.name" :value="item.value"></el-option>
</el-select> </el-select>
@@ -322,7 +322,7 @@ export default {
uploadFile: { file: '', path: '', uuid: '' }, uploadFile: { file: '', path: '', uuid: '' },
uploadFileList: [], uploadFileList: [],
uploadResult: null, uploadResult: null,
downloadBox: { showDownload: false, title: this.$t('webshell.downloadTitle') }, downloadBox: { showDownload: false, title: this.$t('overall.download') },
downloadFile: { path: '', uuid: '' }, downloadFile: { path: '', uuid: '' },
downloadFileList: [], downloadFileList: [],
downloadResult: null, downloadResult: null,

4
nezha-fronted/src/components/common/bottomBox/tabs/alertMessageTab.vue
View File

@@ -22,7 +22,7 @@
<div class="top-tool-search"> <div class="top-tool-search">
<search-input :default-item="'alertMessageState'" :default-value="defaultSearchValue" :searchMsg="searchMsg" @search="search" position="alert-bottom"></search-input> <search-input :default-item="'alertMessageState'" :default-value="defaultSearchValue" :searchMsg="searchMsg" @search="search" position="alert-bottom"></search-input>
</div> </div>
<button :title="$t('overall.exportExcelLower')" @click="importBox.show = true" type="button" v-has="['rule_alerts_export', 'project_endpoint_alerts_export', 'asset_alerts_export']" <button :title="$t('overall.exportExcel')" @click="importBox.show = true" type="button" v-has="['rule_alerts_export', 'project_endpoint_alerts_export', 'asset_alerts_export']"
class="nz-btn nz-btn-size-normal nz-btn-style-light margin-l-20" id="alert-list-export"> class="nz-btn nz-btn-size-normal nz-btn-style-light margin-l-20" id="alert-list-export">
<i class="nz-icon nz-icon-download1"></i> <i class="nz-icon nz-icon-download1"></i>
</button> </button>
@@ -49,7 +49,7 @@
<el-dialog :visible.sync="importBox.show" :title="importBox.title" :modal-append-to-body='false' :show-close="true" width="300px" @close="importBox.show = false" class="nz-dialog"> <el-dialog :visible.sync="importBox.show" :title="importBox.title" :modal-append-to-body='false' :show-close="true" width="300px" @close="importBox.show = false" class="nz-dialog">
<div class="upload-body"> <div class="upload-body">
<button @click="exportCur" class="el-button el-button--default el-button--small"> <button @click="exportCur" class="el-button el-button--default el-button--small">
<span>{{$t('overall.exportCur')}}</span> <span>{{$t('overall.current')}}</span>
</button> </button>
<button @click="exportAll" class="el-button el-button--default el-button--small"> <button @click="exportAll" class="el-button el-button--default el-button--small">
<span>{{$t('overall.exportAll')}}</span> <span>{{$t('overall.exportAll')}}</span>

2
nezha-fronted/src/components/common/detailView/list/dc/dcDetail.vue
View File

@@ -77,7 +77,7 @@ export default {
prop: 'location', prop: 'location',
show: true show: true
}, { }, {
label: this.$t('config.dc.cabinetNum'), label: this.$t('asset.cabinet'),
prop: 'cabinetNum', prop: 'cabinetNum',
show: true, show: true,
minWidth: 100, minWidth: 100,

2
nezha-fronted/src/components/common/exportXLSX.vue
View File

@@ -42,7 +42,7 @@
<div v-if="importBox.type == 2"> <div v-if="importBox.type == 2">
<div class="upload-body"> <div class="upload-body">
<button @click="exportCur" class="el-button el-button--default el-button--small" :id="id+'-xlsx-export-current'"> <button @click="exportCur" class="el-button el-button--default el-button--small" :id="id+'-xlsx-export-current'">
<span>{{$t('overall.exportCur')}}</span> <span>{{$t('overall.current')}}</span>
</button> </button>
<button @click="exportAll" class="el-button el-button--default el-button--small" :id="id+'-xlsx-export-all'"> <button @click="exportAll" class="el-button el-button--default el-button--small" :id="id+'-xlsx-export-all'">
<span>{{$t('overall.exportAll')}}</span> <span>{{$t('overall.exportAll')}}</span>

2
nezha-fronted/src/components/common/js/constants.js
View File

@@ -228,7 +228,7 @@ export const statisticsList = [
export const alignList = [ export const alignList = [
{ value: 'left', label: i18n.t('dashboard.panel.chartForm.alignList.left') }, { value: 'left', label: i18n.t('dashboard.panel.chartForm.alignList.left') },
{ value: 'center', label: i18n.t('dashboard.panel.chartForm.alignList.center') }, { value: 'center', label: i18n.t('project.topology.center') },
{ value: 'right', label: i18n.t('dashboard.panel.chartForm.alignList.right') } { value: 'right', label: i18n.t('dashboard.panel.chartForm.alignList.right') }
] ]

2
nezha-fronted/src/components/common/latlngPicker.vue
View File

@@ -3,7 +3,7 @@
<div class="input-box"> <div class="input-box">
<div class="input-box-item" style="display: none;"> <div class="input-box-item" style="display: none;">
<el-input v-model="lnglat" @blur="setLatlng" @change="setLatlng"> <el-input v-model="lnglat" @blur="setLatlng" @change="setLatlng">
<template slot="prepend" v-if="showZoom">{{$t('config.system.basic.lnglat')}}</template> <template slot="prepend" v-if="showZoom">{{$t('config.dc.lnglat')}}</template>
</el-input> </el-input>
</div> </div>
<div class="input-box-item" v-if="showZoom"> <div class="input-box-item" v-if="showZoom">

2
nezha-fronted/src/components/common/myDatePicker/src/panel/date-range.vue
View File

@@ -69,7 +69,7 @@
size="small" size="small"
class="el-date-range-picker__editor" class="el-date-range-picker__editor"
:disabled="rangeState.selecting" :disabled="rangeState.selecting"
:placeholder="t('el.datepicker.endTime')" :placeholder="t('overall.endTime')"
:value="maxVisibleTime" :value="maxVisibleTime"
:readonly="!minDate" :readonly="!minDate"
@focus="minDate && (maxTimePickerVisible = true)" @focus="minDate && (maxTimePickerVisible = true)"

2
nezha-fronted/src/components/common/myDatePicker/src/panel/time-range.vue
View File

@@ -24,7 +24,7 @@
</div> </div>
</div> </div>
<div class="el-time-range-picker__cell"> <div class="el-time-range-picker__cell">
<div class="el-time-range-picker__header">{{ t('el.datepicker.endTime') }}</div> <div class="el-time-range-picker__header">{{ t('overall.endTime') }}</div>
<div <div
:class="{ 'has-seconds': showSeconds, 'is-arrow': arrowControl }" :class="{ 'has-seconds': showSeconds, 'is-arrow': arrowControl }"
class="el-time-range-picker__body el-time-panel__content"> class="el-time-range-picker__body el-time-panel__content">

2
nezha-fronted/src/components/common/popBox/guide.vue
View File

@@ -80,7 +80,7 @@ export default {
guideList: [ guideList: [
{ {
route: '/dc', route: '/dc',
title: this.$t('guide.dc'), title: this.$t('asset.dc'),
icon: 'nz-icon nz-icon-datacenter1', icon: 'nz-icon nz-icon-datacenter1',
tip: this.$t('guide.dcTip'), tip: this.$t('guide.dcTip'),
permissionCode: 'dc_view' permissionCode: 'dc_view'

12
nezha-fronted/src/components/common/project/topologyL5.vue
View File

@@ -374,17 +374,7 @@ const canvasOptions = {
autoExpandDistance: 0, autoExpandDistance: 0,
minScale: 0.2, minScale: 0.2,
scaleKey: -1, scaleKey: -1,
keydown (e) { keydown: 1
console.log(e)
// if (e.target.className === 'cm-content cm-lineWrapping' && e.keyCode === 8) {
// if (e & e.stopPropagation) {
// e.stopPropagation() // iie 6, 7, 8
// } else {
// window.event.cancleBubble = true
// }
// return false
// }
}
} }
export default { export default {
name: 'topologyL5', name: 'topologyL5',

2
nezha-fronted/src/components/common/rightBox/administration/userBox.vue
View File

@@ -183,7 +183,7 @@ export default {
}, },
roles: [], roles: [],
mfaLevelList: [ mfaLevelList: [
{ value: 0, label: this.$t('project.endpoint.disable') }, { value: 0, label: this.$t('profile.close') },
{ value: 1, label: this.$t('asset.talon.enable') }, { value: 1, label: this.$t('asset.talon.enable') },
{ value: 2, label: this.$t('config.user.forceEnable') } { value: 2, label: this.$t('config.user.forceEnable') }
], ],

2
nezha-fronted/src/components/common/rightBox/apiKeyBox.vue
View File

@@ -13,7 +13,7 @@
<el-input maxlength="64" show-word-limit v-model="apiKeyBox.name" size="small" type="text"></el-input> <el-input maxlength="64" show-word-limit v-model="apiKeyBox.name" size="small" type="text"></el-input>
</el-form-item> </el-form-item>
<el-form-item <el-form-item
:label="$t('profile.apiKey.box.expiredAt')" :label="$t('config.system.apiKey.expireAt')"
class="start_at" class="start_at"
> >
<my-date-picker <my-date-picker

6
nezha-fronted/src/components/common/rightBox/chart/chartConfig.vue
View File

@@ -306,7 +306,7 @@
</el-form-item> </el-form-item>
<!-- text --> <!-- text -->
<el-form-item <el-form-item
:label="$t('dashboard.panel.chartForm.display')" :label="$t('config.assetLabel.display')"
class="form-item--half-width" class="form-item--half-width"
prop="param.nullType" prop="param.nullType"
v-if="isShowText(chartConfig.type)" v-if="isShowText(chartConfig.type)"
@@ -517,7 +517,7 @@
</el-row> </el-row>
<el-row class="thresholds-item" v-show="item.show" :key="2"> <el-row class="thresholds-item" v-show="item.show" :key="2">
<div> <div>
<div class='mapping-display'>{{$t('dashboard.panel.chartForm.display')}}</div> <div class='mapping-display'>{{$t('config.assetLabel.display')}}</div>
</div> </div>
<el-form-item :prop="'param.columns.' + index + '.display'" :rules="{ required: true, message: $t('validate.required'), trigger: 'blur'}" class="thresholds-from-item"> <el-form-item :prop="'param.columns.' + index + '.display'" :rules="{ required: true, message: $t('validate.required'), trigger: 'blur'}" class="thresholds-from-item">
<el-input v-model="item.display" style="margin-right: 10px" size="small" @change="change('columns',index)"/> <el-input v-model="item.display" style="margin-right: 10px" size="small" @change="change('columns',index)"/>
@@ -666,7 +666,7 @@
<el-input v-model="item.column" style="margin-right: 10px" :placeholder="$t('placeholder.chart.column')" size="small" @change="change('valueMapping', index)"/> <el-input v-model="item.column" style="margin-right: 10px" :placeholder="$t('placeholder.chart.column')" size="small" @change="change('valueMapping', index)"/>
</el-form-item> </el-form-item>
<div> <div>
<div class='mapping-display'>{{$t('dashboard.panel.chartForm.display')}}</div> <div class='mapping-display'>{{$t('config.assetLabel.display')}}</div>
</div> </div>
<el-form-item :prop="'param.valueMapping.' + index + '.display'" :rules="{ required: true, message: $t('validate.required'), trigger: 'blur'}" class="thresholds-from-item"> <el-form-item :prop="'param.valueMapping.' + index + '.display'" :rules="{ required: true, message: $t('validate.required'), trigger: 'blur'}" class="thresholds-from-item">
<el-input v-model="item.display" style="margin-right: 10px" :placeholder="$t('placeholder.chart.display')" size="small" @change="change('valueMapping', index)" class="mapping-display-input"> <el-input v-model="item.display" style="margin-right: 10px" :placeholder="$t('placeholder.chart.display')" size="small" @change="change('valueMapping', index)" class="mapping-display-input">

6
nezha-fronted/src/components/common/rightBox/chart/systemChartConfig.vue
View File

@@ -290,7 +290,7 @@
<div class="form-items--half-width-group"> <div class="form-items--half-width-group">
<!-- text --> <!-- text -->
<el-form-item <el-form-item
:label="$t('dashboard.panel.chartForm.display')" :label="$t('config.assetLabel.display')"
class="form-item--half-width" class="form-item--half-width"
prop="param.nullType" prop="param.nullType"
v-if="isShowText(chartConfig.type)" v-if="isShowText(chartConfig.type)"
@@ -479,7 +479,7 @@
</el-row> </el-row>
<el-row class="thresholds-item" v-show="item.show" :key="2"> <el-row class="thresholds-item" v-show="item.show" :key="2">
<div> <div>
<div class='mapping-display'>{{$t('dashboard.panel.chartForm.display')}}</div> <div class='mapping-display'>{{$t('config.assetLabel.display')}}</div>
</div> </div>
<el-form-item :prop="'param.columns.' + index + '.display'" :rules="{ required: true, message: $t('validate.required'), trigger: 'blur'}" class="thresholds-from-item"> <el-form-item :prop="'param.columns.' + index + '.display'" :rules="{ required: true, message: $t('validate.required'), trigger: 'blur'}" class="thresholds-from-item">
<el-input v-model="item.display" style="margin-right: 10px" size="small" @change="change('columns',index)"/> <el-input v-model="item.display" style="margin-right: 10px" size="small" @change="change('columns',index)"/>
@@ -628,7 +628,7 @@
<el-input v-model="item.column" style="margin-right: 10px" :placeholder="$t('placeholder.chart.column')" size="small" @change="change('valueMapping', index)"/> <el-input v-model="item.column" style="margin-right: 10px" :placeholder="$t('placeholder.chart.column')" size="small" @change="change('valueMapping', index)"/>
</el-form-item> </el-form-item>
<div> <div>
<div class='mapping-display'>{{$t('dashboard.panel.chartForm.display')}}</div> <div class='mapping-display'>{{$t('config.assetLabel.display')}}</div>
</div> </div>
<el-form-item :prop="'param.valueMapping.' + index + '.display'" :rules="{ required: true, message: $t('validate.required'), trigger: 'blur'}" class="thresholds-from-item"> <el-form-item :prop="'param.valueMapping.' + index + '.display'" :rules="{ required: true, message: $t('validate.required'), trigger: 'blur'}" class="thresholds-from-item">
<el-input v-model="item.display" style="margin-right: 10px" :placeholder="$t('placeholder.chart.display')" size="small" @change="change('valueMapping', index)" class="mapping-display-input"> <el-input v-model="item.display" style="margin-right: 10px" :placeholder="$t('placeholder.chart.display')" size="small" @change="change('valueMapping', index)" class="mapping-display-input">

4
nezha-fronted/src/components/common/rightBox/editEndpointBoxNew.vue
View File

@@ -173,7 +173,7 @@
<div v-show="showAllBasicOption" > <div v-show="showAllBasicOption" >
<!--scrape_interval--> <!--scrape_interval-->
<el-form-item :label='$t("project.endpoint.scrape_interval")' class="half-form-item" prop="scrape_interval"> <el-form-item :label='$t("project.endpoint.scrape_interval")' class="half-form-item" prop="scrape_interval">
<el-input id="module-box-input-scrape_interval" v-model.number="editEndpoint.configs[0].config.scrape_interval" :placeholder='$t("project.endpoint.scrape_interval_placeholder")' size="small"> <el-input id="module-box-input-scrape_interval" v-model.number="editEndpoint.configs[0].config.scrape_interval" :placeholder='$t("alert.config.inrPlaceholder")' size="small">
<template slot="append">s</template> <template slot="append">s</template>
</el-input> </el-input>
</el-form-item> </el-form-item>
@@ -716,7 +716,7 @@ export default {
], ],
endpointStateList: [ endpointStateList: [
{ name: this.$t('asset.talon.enable'), value: 1 }, { name: this.$t('asset.talon.enable'), value: 1 },
{ name: this.$t('project.endpoint.disable'), value: 0 } { name: this.$t('profile.close'), value: 0 }
], ],
configsCopyValue: '', configsCopyValue: '',
pipelineOption: [ pipelineOption: [

2
nezha-fronted/src/components/common/rightBox/moduleBox.vue
View File

@@ -153,7 +153,7 @@
<div v-show="showAllBasicOption" > <div v-show="showAllBasicOption" >
<!--scrape_interval--> <!--scrape_interval-->
<el-form-item :label='$t("project.endpoint.scrape_interval")' class="half-form-item" prop="configs.0.config.scrape_interval"> <el-form-item :label='$t("project.endpoint.scrape_interval")' class="half-form-item" prop="configs.0.config.scrape_interval">
<el-input id="module-box-input-scrape_interval" v-model.number="editModule.configs[0].config.scrape_interval" :placeholder='$t("project.endpoint.scrape_interval_placeholder")' size="small"> <el-input id="module-box-input-scrape_interval" v-model.number="editModule.configs[0].config.scrape_interval" :placeholder='$t("alert.config.inrPlaceholder")' size="small">
<template slot="append">s</template> <template slot="append">s</template>
</el-input> </el-input>
</el-form-item> </el-form-item>

2
nezha-fronted/src/components/common/rightBox/profileBox.vue
View File

@@ -15,7 +15,7 @@
<el-form-item :label="$t('profile.username')" prop="username"> <el-form-item :label="$t('profile.username')" prop="username">
<el-input maxlength="64" show-word-limit v-model="editProfile.username" disabled size="small" type="text"></el-input> <el-input maxlength="64" show-word-limit v-model="editProfile.username" disabled size="small" type="text"></el-input>
</el-form-item> </el-form-item>
<el-form-item :label="$t('profile.email')" prop="email"> <el-form-item :label="$t('config.system.email.email')" prop="email">
<el-input maxlength="64" show-word-limit v-model="editProfile.email" size="small" type="text"></el-input> <el-input maxlength="64" show-word-limit v-model="editProfile.email" size="small" type="text"></el-input>
</el-form-item> </el-form-item>
<el-form-item :label="$t('profile.mobile')" prop="mobile"> <el-form-item :label="$t('profile.mobile')" prop="mobile">

2
nezha-fronted/src/components/common/rightBox/setting/cabinetBox.vue
View File

@@ -1,7 +1,7 @@
<template> <template>
<div v-clickoutside="{obj: editCabinet, func: esc}" class="right-box right-setting-box-cabinet"> <div v-clickoutside="{obj: editCabinet, func: esc}" class="right-box right-setting-box-cabinet">
<div class="right-box__header"> <div class="right-box__header">
<div class="header__title">{{editCabinet.id ? $t('config.cabinet.editCabinet') : $t('config.cabinet.createCabinet')}}</div> <div class="header__title">{{editCabinet.id ? $t('config.dc.editCabinet') : $t('config.cabinet.createCabinet')}}</div>
<div class="header__operation"> <div class="header__operation">
<span v-cancel="{obj: editCabinet, func: esc}"><i class="nz-icon nz-icon-close"></i></span> <span v-cancel="{obj: editCabinet, func: esc}"><i class="nz-icon nz-icon-close"></i></span>
</div> </div>

2
nezha-fronted/src/components/common/searchSelectInfo.vue
View File

@@ -114,7 +114,7 @@ const searchSelectInfo = { // value: 传给后台的值；label：显示给用
}, },
{ {
value: 'delete', value: 'delete',
label: i18n.t('config.operationlog.operations.delete') label: i18n.t('overall.delete')
}, },
{ {
value: 'reset', value: 'reset',

2
nezha-fronted/src/components/common/table/asset/assetTable.vue
View File

@@ -97,7 +97,7 @@
OK OK
</div> </div>
<div v-else-if="scope.row['clientState']===0"> <div v-else-if="scope.row['clientState']===0">
<div class="active-icon gray-bg inline-block"></div> {{ $t('project.endpoint.disable') }} <div class="active-icon gray-bg inline-block"></div> {{ $t('profile.close') }}
</div> </div>
<div v-else-if="scope.row['clientState']===2"> <div v-else-if="scope.row['clientState']===2">
<div class="active-icon red-bg inline-block"></div> {{ $t('asset.connectionTimedOut') }} <div class="active-icon red-bg inline-block"></div> {{ $t('asset.connectionTimedOut') }}

2
nezha-fronted/src/components/common/table/settings/dcTable.vue
View File

@@ -160,7 +160,7 @@ export default {
prop: 'location', prop: 'location',
show: true show: true
}, { }, {
label: this.$t('config.dc.cabinetNum'), label: this.$t('asset.cabinet'),
prop: 'cabinetNum', prop: 'cabinetNum',
show: true, show: true,
minWidth: 110, minWidth: 110,

2
nezha-fronted/src/components/common/table/settings/endpointTable.vue
View File

@@ -147,7 +147,7 @@
</template> </template>
<template v-else-if="item.prop === 'enabled'"> <template v-else-if="item.prop === 'enabled'">
<span v-if="scope.row[item.prop] === 1">{{$t('asset.talon.enable')}}</span> <span v-if="scope.row[item.prop] === 1">{{$t('asset.talon.enable')}}</span>
<span v-else>{{$t('project.endpoint.disable')}}</span> <span v-else>{{$t('profile.close')}}</span>
</template> </template>
<span v-else-if="item.prop === 'id'" :id="'globalSearch' + scope.row.id">{{scope.row[item.prop]}}</span> <span v-else-if="item.prop === 'id'" :id="'globalSearch' + scope.row.id">{{scope.row[item.prop]}}</span>
<span v-else>{{scope.row[item.prop] ? scope.row[item.prop] : ''}}</span> <span v-else>{{scope.row[item.prop] ? scope.row[item.prop] : ''}}</span>

2
nezha-fronted/src/components/common/table/settings/scrapeEndpointTable.vue
View File

@@ -132,7 +132,7 @@ export default {
prop: 'health', prop: 'health',
show: true show: true
}, { }, {
label: this.$t('config.scrapeEndpoint.error'), label: this.$t('ERROR'),
prop: 'lastError', prop: 'lastError',
show: true show: true
} }

2
nezha-fronted/src/components/page/alert/alertMessage.vue
View File

@@ -19,7 +19,7 @@
<i class="nz-icon nz-icon-funnel"></i> <i class="nz-icon nz-icon-funnel"></i>
</button> </button>
<pick-time v-model="searchTime" sign="message" :default-pick="10" :refresh-data-func="getTableData" :show-empty="true" :use-chart-unit="false" :use-refresh="false"></pick-time> <pick-time v-model="searchTime" sign="message" :default-pick="10" :refresh-data-func="getTableData" :show-empty="true" :use-chart-unit="false" :use-refresh="false"></pick-time>
<button id="roles-add" v-has="'alertMessage_view'" :title="$t('overall.exportExcelLower')" class="top-tool-btn margin-r-10" <button id="roles-add" v-has="'alertMessage_view'" :title="$t('overall.exportExcel')" class="top-tool-btn margin-r-10"
type="button" @click="showExportDialog"> type="button" @click="showExportDialog">
<i class="nz-icon-download1 nz-icon"></i> <i class="nz-icon-download1 nz-icon"></i>
</button> </button>

2
nezha-fronted/src/components/page/alert/alertSilence.vue
View File

@@ -89,7 +89,7 @@
class="el-button el-button--default el-button--small" class="el-button el-button--default el-button--small"
@click="exportCur" @click="exportCur"
> >
<span>{{ $t("overall.exportCur") }}</span> <span>{{ $t("overall.current") }}</span>
</button> </button>
<button <button
id="alert-msg-exportall" id="alert-msg-exportall"

4
nezha-fronted/src/components/page/config/basic.vue
View File

@@ -2,7 +2,7 @@
<div class="system"> <div class="system">
<div class="system-config-form basicForm"> <div class="system-config-form basicForm">
<el-form :model="basic" label-width="180px" size="small" ref="basicForm" :rules="basicRules" :validate-on-rule-change="false"> <el-form :model="basic" label-width="180px" size="small" ref="basicForm" :rules="basicRules" :validate-on-rule-change="false">
<div class="system-title">{{$t('config.system.basic.title')}}</div> <div class="system-title">{{$t('overall.basicInfo')}}</div>
<el-form-item :label="$t('config.system.basic.systemName')" prop="system_name"> <el-form-item :label="$t('config.system.basic.systemName')" prop="system_name">
<el-input v-model="basic.system_name"></el-input> <el-input v-model="basic.system_name"></el-input>
</el-form-item> </el-form-item>
@@ -60,7 +60,7 @@
<el-form-item :label="$t('config.system.basic.mapConfig')" class="basic-lnglat" prop="lnglat"> <el-form-item :label="$t('config.system.basic.mapConfig')" class="basic-lnglat" prop="lnglat">
<div style="display: flex"> <div style="display: flex">
<el-input v-model="basic.lnglat" maxlength="256" placeholder="" style="width: calc(100% - 50px); padding-right: 50px;"> <el-input v-model="basic.lnglat" maxlength="256" placeholder="" style="width: calc(100% - 50px); padding-right: 50px;">
<template slot="prepend">{{$t('config.system.basic.lnglat')}}</template> <template slot="prepend">{{$t('config.dc.lnglat')}}</template>
</el-input> </el-input>
<latlng-picker ref="latlngPicker" :init-data="basic.lnglat" :show-zoom="true" @lnglatChange="lnglatChange"></latlng-picker> <latlng-picker ref="latlngPicker" :init-data="basic.lnglat" :show-zoom="true" @lnglatChange="lnglatChange"></latlng-picker>
</div> </div>

2
nezha-fronted/src/components/page/config/email.vue
View File

@@ -1,7 +1,7 @@
<template> <template>
<div class="system"> <div class="system">
<div class="system-config-form"> <div class="system-config-form">
<div class="system-title">{{$t('config.system.basic.title')}}</div> <div class="system-title">{{$t('overall.basicInfo')}}</div>
<el-form :model="email" label-width="180px" size="small" ref="emailForm" :rules="email.email_enable=='on'?emailRules:{}" :validate-on-rule-change="false"> <el-form :model="email" label-width="180px" size="small" ref="emailForm" :rules="email.email_enable=='on'?emailRules:{}" :validate-on-rule-change="false">
<el-form-item :label="$t('config.system.email.enable')" prop="email_enable"> <el-form-item :label="$t('config.system.email.enable')" prop="email_enable">
<el-checkbox v-model="email.email_enable" true-label="on" false-label="off" @change="switchChange('emailForm')" id="system-email-email_enable"></el-checkbox> <el-checkbox v-model="email.email_enable" true-label="on" false-label="off" @change="switchChange('emailForm')" id="system-email-email_enable"></el-checkbox>

2
nezha-fronted/src/components/page/config/ldap.vue
View File

@@ -1,7 +1,7 @@
<template> <template>
<div class="system"> <div class="system">
<div class="system-config-form"> <div class="system-config-form">
<div class="system-title">{{$t('config.system.basic.title')}}</div> <div class="system-title">{{$t('overall.basicInfo')}}</div>
<el-form :model="ldap" label-width="180px" size="small" ref="ldapForm" :rules="ldap.ldap_enable == 'on'?ldapRules:{}" :validate-on-rule-change="false"> <el-form :model="ldap" label-width="180px" size="small" ref="ldapForm" :rules="ldap.ldap_enable == 'on'?ldapRules:{}" :validate-on-rule-change="false">
<el-form-item :label="$t('config.system.ldap.active')" prop="ldap_enable"> <el-form-item :label="$t('config.system.ldap.active')" prop="ldap_enable">
<el-checkbox v-model="ldap.ldap_enable" true-label='on' false-label='off' @change="switchChange('ldapForm')" id="system-ldap-ldap_enable"></el-checkbox> <el-checkbox v-model="ldap.ldap_enable" true-label='on' false-label='off' @change="switchChange('ldapForm')" id="system-ldap-ldap_enable"></el-checkbox>

4
nezha-fronted/src/components/page/config/monitor.vue
View File

@@ -1,7 +1,7 @@
<template> <template>
<div class="system"> <div class="system">
<div class="system-config-form basicForm"> <div class="system-config-form basicForm">
<div class="system-title">{{$t('config.system.basic.title')}}</div> <div class="system-title">{{$t('overall.basicInfo')}}</div>
<el-form :model="monitor" label-width="180px" size="small" ref="monitorForm" :rules="monitorRules" :validate-on-rule-change="false"> <el-form :model="monitor" label-width="180px" size="small" ref="monitorForm" :rules="monitorRules" :validate-on-rule-change="false">
<el-form-item :label="$t('config.system.monitor.prometheusFederation')" prop="prometheus_federation_enabled"> <el-form-item :label="$t('config.system.monitor.prometheusFederation')" prop="prometheus_federation_enabled">
<el-checkbox v-model="monitor.prometheus_federation_enabled" true-label="1" false-label="0" id="system-monitor-prometheus_federation_enabled"></el-checkbox> <el-checkbox v-model="monitor.prometheus_federation_enabled" true-label="1" false-label="0" id="system-monitor-prometheus_federation_enabled"></el-checkbox>
@@ -82,7 +82,7 @@
<el-input v-model="monitor.logs_storage_s3_endpoint" id="monitor-logs_storage_s3_endpoint"> <el-input v-model="monitor.logs_storage_s3_endpoint" id="monitor-logs_storage_s3_endpoint">
</el-input> </el-input>
</el-form-item> </el-form-item>
<el-form-item :label="$t('config.system.monitor.logs_storage_s3_bucket')" prop="logs_storage_s3_bucket" :rules=" [ { required: monitor.logs_storage_type == 2, message: this.$t('validate.required'), trigger: 'blur' }]"> <el-form-item :label="$t('config.system.monitor.metrics_storage_s3_bucket')" prop="logs_storage_s3_bucket" :rules=" [ { required: monitor.logs_storage_type == 2, message: this.$t('validate.required'), trigger: 'blur' }]">
<el-input v-model="monitor.logs_storage_s3_bucket" id="monitor-logs_storage_s3_bucket"> <el-input v-model="monitor.logs_storage_s3_bucket" id="monitor-logs_storage_s3_bucket">
</el-input> </el-input>
</el-form-item> </el-form-item>

4
nezha-fronted/src/components/page/config/profile.vue
View File

@@ -32,7 +32,7 @@
</div> </div>
<button id="asset-edit-cancel" class="profile-left__btn" @click="profileBox"> <button id="asset-edit-cancel" class="profile-left__btn" @click="profileBox">
<span><i class="nz-icon nz-icon-edit"></i></span> <span><i class="nz-icon nz-icon-edit"></i></span>
<span>{{$t('profile.edit')}}</span> <span>{{$t('profile.editProfile')}}</span>
</button> </button>
<div v-for="item in tableProfile" :key="item.id" class="profile-left__center"> <div v-for="item in tableProfile" :key="item.id" class="profile-left__center">
<span style="margin:0 18px 0 0"><i :class="item.icon"></i></span> <span style="margin:0 18px 0 0"><i :class="item.icon"></i></span>
@@ -194,7 +194,7 @@ export default {
icon: 'nz-icon nz-icon-role profile-role' icon: 'nz-icon nz-icon-role profile-role'
}, { }, {
id: 2, id: 2,
label: this.$t('profile.email'), label: this.$t('config.system.email.email'),
prop: '', prop: '',
icon: 'nz-icon nz-icon-email profile-email' icon: 'nz-icon nz-icon-email profile-email'
}, { }, {

16
nezha-fronted/src/components/page/config/system.vue
View File

@@ -4,7 +4,7 @@
<el-tab-pane v-if="systemHasTab('system_basic_view')" :label="$t('config.system.basic.basic')" name="basic"> <el-tab-pane v-if="systemHasTab('system_basic_view')" :label="$t('config.system.basic.basic')" name="basic">
<div class="system-config-form basicForm" v-if="switchTab === 'basic'"> <div class="system-config-form basicForm" v-if="switchTab === 'basic'">
<el-form :model="basic" label-width="180px" size="small" ref="basicForm" :rules="basicRules" :validate-on-rule-change="false"> <el-form :model="basic" label-width="180px" size="small" ref="basicForm" :rules="basicRules" :validate-on-rule-change="false">
<div class="system-title">{{$t('config.system.basic.title')}}</div> <div class="system-title">{{$t('overall.basicInfo')}}</div>
<el-form-item :label="$t('config.system.basic.language')" prop="language"> <el-form-item :label="$t('config.system.basic.language')" prop="language">
<el-select id="account-input-language" <el-select id="account-input-language"
class="right-box__select" class="right-box__select"
@@ -56,7 +56,7 @@
<el-form-item :label="$t('config.system.basic.mapConfig')" class="basic-lnglat" prop="lnglat"> <el-form-item :label="$t('config.system.basic.mapConfig')" class="basic-lnglat" prop="lnglat">
<div style="display: flex"> <div style="display: flex">
<el-input v-model="basic.lnglat" maxlength="256" placeholder="" style="width: calc(100% - 50px); padding-right: 50px;"> <el-input v-model="basic.lnglat" maxlength="256" placeholder="" style="width: calc(100% - 50px); padding-right: 50px;">
<template slot="prepend">{{$t('config.system.basic.lnglat')}}</template> <template slot="prepend">{{$t('config.dc.lnglat')}}</template>
</el-input> </el-input>
<latlng-picker ref="latlngPicker" :init-data="basic.lnglat" :show-zoom="true" @lnglatChange="lnglatChange"></latlng-picker> <latlng-picker ref="latlngPicker" :init-data="basic.lnglat" :show-zoom="true" @lnglatChange="lnglatChange"></latlng-picker>
</div> </div>
@@ -119,7 +119,7 @@
</el-tab-pane> </el-tab-pane>
<el-tab-pane v-if="systemHasTab('system_monitor_view')" :label="$t('config.system.monitor.monitor')" name="monitor"> <el-tab-pane v-if="systemHasTab('system_monitor_view')" :label="$t('config.system.monitor.monitor')" name="monitor">
<div class="system-config-form basicForm" v-if="switchTab === 'monitor'"> <div class="system-config-form basicForm" v-if="switchTab === 'monitor'">
<div class="system-title">{{$t('config.system.basic.title')}}</div> <div class="system-title">{{$t('overall.basicInfo')}}</div>
<el-form :model="monitor" label-width="180px" size="small" ref="monitorForm" :rules="monitorRules" :validate-on-rule-change="false"> <el-form :model="monitor" label-width="180px" size="small" ref="monitorForm" :rules="monitorRules" :validate-on-rule-change="false">
<el-form-item :label="$t('config.system.monitor.prometheusFederation')" prop="prometheus_federation_enabled"> <el-form-item :label="$t('config.system.monitor.prometheusFederation')" prop="prometheus_federation_enabled">
<el-checkbox v-model="monitor.prometheus_federation_enabled" true-label="1" false-label="0" id="system-monitor-prometheus_federation_enabled"></el-checkbox> <el-checkbox v-model="monitor.prometheus_federation_enabled" true-label="1" false-label="0" id="system-monitor-prometheus_federation_enabled"></el-checkbox>
@@ -201,7 +201,7 @@
<el-input v-model="monitor.logs_storage_s3_endpoint" id="monitor-logs_storage_s3_endpoint"> <el-input v-model="monitor.logs_storage_s3_endpoint" id="monitor-logs_storage_s3_endpoint">
</el-input> </el-input>
</el-form-item> </el-form-item>
<el-form-item :label="$t('config.system.monitor.logs_storage_s3_bucket')" prop="logs_storage_s3_bucket" :rules=" [ { required: monitor.logs_storage_type == 2, message: this.$t('validate.required'), trigger: 'blur' }]"> <el-form-item :label="$t('config.system.monitor.metrics_storage_s3_bucket')" prop="logs_storage_s3_bucket" :rules=" [ { required: monitor.logs_storage_type == 2, message: this.$t('validate.required'), trigger: 'blur' }]">
<el-input v-model="monitor.logs_storage_s3_bucket" id="monitor-logs_storage_s3_bucket"> <el-input v-model="monitor.logs_storage_s3_bucket" id="monitor-logs_storage_s3_bucket">
</el-input> </el-input>
</el-form-item> </el-form-item>
@@ -231,7 +231,7 @@
</el-tab-pane> </el-tab-pane>
<el-tab-pane v-if="systemHasTab('system_email_view')" :label="$t('config.system.email.email')" name="email" > <el-tab-pane v-if="systemHasTab('system_email_view')" :label="$t('config.system.email.email')" name="email" >
<div class="system-config-form" v-if="switchTab === 'email'"> <div class="system-config-form" v-if="switchTab === 'email'">
<div class="system-title">{{$t('config.system.basic.title')}}</div> <div class="system-title">{{$t('overall.basicInfo')}}</div>
<el-form :model="email" label-width="180px" size="small" ref="emailForm" :rules="email.email_enable=='on'?emailRules:{}" :validate-on-rule-change="false"> <el-form :model="email" label-width="180px" size="small" ref="emailForm" :rules="email.email_enable=='on'?emailRules:{}" :validate-on-rule-change="false">
<el-form-item :label="$t('config.system.email.enable')" prop="email_enable"> <el-form-item :label="$t('config.system.email.enable')" prop="email_enable">
<el-checkbox v-model="email.email_enable" true-label="on" false-label="off" @change="switchChange('emailForm')" id="system-email-email_enable"></el-checkbox> <el-checkbox v-model="email.email_enable" true-label="on" false-label="off" @change="switchChange('emailForm')" id="system-email-email_enable"></el-checkbox>
@@ -279,7 +279,7 @@
</el-tab-pane> </el-tab-pane>
<el-tab-pane v-if="systemHasTab('system_terminal_view')" :label="$t('config.system.terminal.terminal')" name="terminal"> <el-tab-pane v-if="systemHasTab('system_terminal_view')" :label="$t('config.system.terminal.terminal')" name="terminal">
<div class="system-config-form terminal" v-if="switchTab === 'terminal'"> <div class="system-config-form terminal" v-if="switchTab === 'terminal'">
<div class="system-title">{{$t('config.system.basic.title')}}</div> <div class="system-title">{{$t('overall.basicInfo')}}</div>
<el-form :model="terminal" label-width="180px" size="small" ref="terminalForm" :rules="terminalRules"> <el-form :model="terminal" label-width="180px" size="small" ref="terminalForm" :rules="terminalRules">
<!-- <el-form-item :label="$t('config.system.ldap.timeout')" prop="terminal_timeout">--> <!-- <el-form-item :label="$t('config.system.ldap.timeout')" prop="terminal_timeout">-->
<!-- <el-input v-model="terminal.terminal_timeout" controls-position="right" :min="1" id="system-terminal-max_terminal_num">--> <!-- <el-input v-model="terminal.terminal_timeout" controls-position="right" :min="1" id="system-terminal-max_terminal_num">-->
@@ -305,7 +305,7 @@
</el-tab-pane> </el-tab-pane>
<el-tab-pane v-if="systemHasTab('system_ldap_view')" :label="$t('config.system.ldap.ldap')" name="ldap"> <el-tab-pane v-if="systemHasTab('system_ldap_view')" :label="$t('config.system.ldap.ldap')" name="ldap">
<div class="system-config-form" v-if="switchTab === 'ldap'"> <div class="system-config-form" v-if="switchTab === 'ldap'">
<div class="system-title">{{$t('config.system.basic.title')}}</div> <div class="system-title">{{$t('overall.basicInfo')}}</div>
<el-form :model="ldap" label-width="180px" size="small" ref="ldapForm" :rules="ldap.ldap_enable == 'on'?ldapRules:{}" :validate-on-rule-change="false"> <el-form :model="ldap" label-width="180px" size="small" ref="ldapForm" :rules="ldap.ldap_enable == 'on'?ldapRules:{}" :validate-on-rule-change="false">
<el-form-item :label="$t('config.system.ldap.active')" prop="ldap_enable"> <el-form-item :label="$t('config.system.ldap.active')" prop="ldap_enable">
<el-checkbox v-model="ldap.ldap_enable" true-label='on' false-label='off' @change="switchChange('ldapForm')" id="system-ldap-ldap_enable"></el-checkbox> <el-checkbox v-model="ldap.ldap_enable" true-label='on' false-label='off' @change="switchChange('ldapForm')" id="system-ldap-ldap_enable"></el-checkbox>
@@ -356,7 +356,7 @@
</el-tab-pane> </el-tab-pane>
<el-tab-pane v-if="systemHasTab('system_reset_view')" :label="$t('config.overall.reset')" name="reset"> <el-tab-pane v-if="systemHasTab('system_reset_view')" :label="$t('config.overall.reset')" name="reset">
<div class="system-config-form" v-if="switchTab === 'reset'"> <div class="system-config-form" v-if="switchTab === 'reset'">
<div class="system-title">{{$t('config.system.basic.title')}}</div> <div class="system-title">{{$t('overall.basicInfo')}}</div>
<el-form :model="reset" label-width="180px" size="small" ref="resetForm" :rules="resetRules" :validate-on-rule-change="false" class="reset-form"> <el-form :model="reset" label-width="180px" size="small" ref="resetForm" :rules="resetRules" :validate-on-rule-change="false" class="reset-form">
<el-form-item prop="type" :label="$t('overall.type')"> <el-form-item prop="type" :label="$t('overall.type')">
<el-select v-model="reset.type" :placeholder="$t('el.select.placeholder')" multiple popper-class="right-box-select-top right-public-box-dropdown-top"> <el-select v-model="reset.type" :placeholder="$t('el.select.placeholder')" multiple popper-class="right-box-select-top right-public-box-dropdown-top">

2
nezha-fronted/src/components/page/config/template/exprTemp.vue
View File

@@ -67,7 +67,7 @@
:show-close="true" width="300px" @close="closeDialog" class="nz-dialog"> :show-close="true" width="300px" @close="closeDialog" class="nz-dialog">
<div class="upload-body"> <div class="upload-body">
<button @click="exportCur" class="el-button el-button--default el-button--small" id="alert-msg-exportcur"> <button @click="exportCur" class="el-button el-button--default el-button--small" id="alert-msg-exportcur">
<span>{{$t('overall.exportCur')}}</span> <span>{{$t('overall.current')}}</span>
</button> </button>
<button @click="exportAll" class="el-button el-button--default el-button--small" id="alert-msg-exportall"> <button @click="exportAll" class="el-button el-button--default el-button--small" id="alert-msg-exportall">
<span>{{$t('overall.exportAll')}}</span> <span>{{$t('overall.exportAll')}}</span>

2
nezha-fronted/src/components/page/config/terminal.vue
View File

@@ -1,7 +1,7 @@
<template> <template>
<div class="system"> <div class="system">
<div class="system-config-form terminal"> <div class="system-config-form terminal">
<div class="system-title">{{$t('config.system.basic.title')}}</div> <div class="system-title">{{$t('overall.basicInfo')}}</div>
<el-form :model="terminal" label-width="180px" size="small" ref="terminalForm" :rules="terminalRules"> <el-form :model="terminal" label-width="180px" size="small" ref="terminalForm" :rules="terminalRules">
<!-- <el-form-item :label="$t('config.system.ldap.timeout')" prop="terminal_timeout">--> <!-- <el-form-item :label="$t('config.system.ldap.timeout')" prop="terminal_timeout">-->
<!-- <el-input v-model="terminal.terminal_timeout" controls-position="right" :min="1" id="system-terminal-max_terminal_num">--> <!-- <el-input v-model="terminal.terminal_timeout" controls-position="right" :min="1" id="system-terminal-max_terminal_num">-->

2
nezha-fronted/src/components/page/tool/ping.vue
View File

@@ -24,7 +24,7 @@
<div class="tools-header-center"> <div class="tools-header-center">
<el-form size="small" ref="ruleForm" :model="ruleForm" :rules="formRules" label-position="right" label-width="150px"> <el-form size="small" ref="ruleForm" :model="ruleForm" :rules="formRules" label-position="right" label-width="150px">
<el-form-item style="margin-bottom:10px" :label="$t('ping.dcs')"> <el-form-item style="margin-bottom:10px" :label="$t('config.dc.dc')">
<!-- <el-select v-model="checked" multiple @change="checkedChange" >--> <!-- <el-select v-model="checked" multiple @change="checkedChange" >-->
<!-- <el-option--> <!-- <el-option-->
<!-- :key="item.id"--> <!-- :key="item.id"-->

2
nezha-fronted/src/components/page/tool/trace.vue
View File

@@ -23,7 +23,7 @@
<div class="tools-header-center"> <div class="tools-header-center">
<el-form size="small" ref="ruleForm" :model="ruleForm" :rules="formRules" label-position="right" label-width="150px"> <el-form size="small" ref="ruleForm" :model="ruleForm" :rules="formRules" label-position="right" label-width="150px">
<el-form-item style="margin-bottom:10px" :label="$t('ping.dcs')"> <el-form-item style="margin-bottom:10px" :label="$t('config.dc.dc')">
<!-- <el-select v-model="checked" multiple @change="checkedChange" >--> <!-- <el-select v-model="checked" multiple @change="checkedChange" >-->
<!-- <el-option--> <!-- <el-option-->
<!-- :key="item.id"--> <!-- :key="item.id"-->