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-16 15:58:17 +08:00
parent c5976c83ee
commit e65f37b5b5
159 changed files with 1194 additions and 599 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
nezha-fronted/README.md
View File

@@ -20,19 +20,19 @@ npm run build --report
For a detailed explanation on how things work, check out the [guide](http://vuejs-templates.github.io/webpack/) and [docs for vue-loader](http://vuejs.github.io/vue-loader). For a detailed explanation on how things work, check out the [guide](http://vuejs-templates.github.io/webpack/) and [docs for vue-loader](http://vuejs.github.io/vue-loader).
#启动项目 # 启动项目
需要配置 config.json 为 {"baseUrl":"http://192.168.40.42:8080/", "version": "21.04"} 需要配置 config.json 为 {"baseUrl":"http://192.168.40.42:8080/", "version": "21.04"}
#自动化测试 # 自动化测试
npm run unit npm run unit
根目录下 /test/jest.conf.js collectCoverageFrom 变量配置需要测试报告的文件 （因为暂时不测所有 只能一个个引入） 根目录下 /test/jest.conf.js collectCoverageFrom 变量配置需要测试报告的文件 （因为暂时不测所有 只能一个个引入）
specs 配置对应的测试用例 （https://docs.geedge.net/pages/viewpage.action?pageId=58310079 参考匹配器） specs 配置对应的测试用例 （https://docs.geedge.net/pages/viewpage.action?pageId=58310079 参考匹配器）
#思维导图 # 思维导图
https://docs.geedge.net/pages/viewpage.action?pageId=67209306 https://docs.geedge.net/pages/viewpage.action?pageId=67209306
#配置多入口 # 配置多入口
dev 正常启动 dev 正常启动
dev:html 导出为html dev:html 导出为html

5
nezha-fronted/build/webpack.dev.conf.js
View File

@@ -9,7 +9,7 @@ const CopyWebpackPlugin = require('copy-webpack-plugin')
const HtmlWebpackPlugin = require('html-webpack-plugin') const HtmlWebpackPlugin = require('html-webpack-plugin')
const FriendlyErrorsPlugin = require('friendly-errors-webpack-plugin') const FriendlyErrorsPlugin = require('friendly-errors-webpack-plugin')
const portfinder = require('portfinder') const portfinder = require('portfinder')
const intro = require('intro.js')
const HOST = process.env.HOST const HOST = process.env.HOST
const PORT = process.env.PORT && Number(process.env.PORT) const PORT = process.env.PORT && Number(process.env.PORT)
const devStart = process.env.npm_lifecycle_event const devStart = process.env.npm_lifecycle_event
@@ -49,6 +49,9 @@ devWebpackConfig = merge(baseWebpackConfig, {
} }
}, },
plugins: [ plugins: [
new webpack.ProvidePlugin({
introJs: ['intro.js']
}),
new webpack.DefinePlugin({ new webpack.DefinePlugin({
'process.env': require('../config/dev.env') 'process.env': require('../config/dev.env')
}), }),

6
nezha-fronted/build/webpack.prod.conf.js
View File

@@ -49,6 +49,9 @@ if (arg === 'html') {
chunkFilename: utils.assetsPath('js/[name].[chunkhash].js') chunkFilename: utils.assetsPath('js/[name].[chunkhash].js')
}, },
plugins: [ plugins: [
new webpack.ProvidePlugin({
introJs: ['intro.js'],
}),
/* new GenerateAssetPlugin({ /* new GenerateAssetPlugin({
filename: 'config.json', filename: 'config.json',
fn: (compilation, cb) => { fn: (compilation, cb) => {
@@ -198,6 +201,9 @@ if (arg === 'html') {
extraFiles: [] extraFiles: []
}), */ }), */
// http://vuejs.github.io/vue-loader/en/workflow/production.html // http://vuejs.github.io/vue-loader/en/workflow/production.html
new webpack.ProvidePlugin({
introJs: ['intro.js']
}),
new webpack.DefinePlugin({ new webpack.DefinePlugin({
'process.env': env 'process.env': env
}), }),

10
nezha-fronted/package-lock.json generated
View File

@@ -9097,6 +9097,11 @@
"p-is-promise": "^1.1.0" "p-is-promise": "^1.1.0"
} }
}, },
"intro.js": {
"version": "5.1.0",
"resolved": "https://registry.npmjs.org/intro.js/-/intro.js-5.1.0.tgz",
"integrity": "sha512-zwWl/duTh00eeNcZRU4o4/xxloNYPFKs4n4lMRDNx59jZr+qRI0jSOnzqYMOuVftD4beGrmxBHz4k8qp9/dCMA=="
},
"invariant": { "invariant": {
"version": "2.2.4", "version": "2.2.4",
"resolved": "https://registry.npmjs.org/invariant/-/invariant-2.2.4.tgz", "resolved": "https://registry.npmjs.org/invariant/-/invariant-2.2.4.tgz",
@@ -18584,6 +18589,11 @@
"resolved": "https://registry.npmjs.org/vue-i18n/-/vue-i18n-8.15.1.tgz", "resolved": "https://registry.npmjs.org/vue-i18n/-/vue-i18n-8.15.1.tgz",
"integrity": "sha512-GBbz8qYCu0U2LNu4IcuFLZiuyninG4k26knvhL7GZG5Ncp4RR2VKDEH6g8gQ6I+UUBCvH2MBQVPSdxWe4DBkPw==" "integrity": "sha512-GBbz8qYCu0U2LNu4IcuFLZiuyninG4k26knvhL7GZG5Ncp4RR2VKDEH6g8gQ6I+UUBCvH2MBQVPSdxWe4DBkPw=="
}, },
"vue-introjs": {
"version": "1.3.2",
"resolved": "https://registry.npmjs.org/vue-introjs/-/vue-introjs-1.3.2.tgz",
"integrity": "sha512-Bj27iGimO6VKr/Ngxs5hr/Fh8ONSHmvTUj2gh1f5CGZC5vfF1Vb5VyetjXiDdMXhLsqeGSIhac6SbVNHwUh9yQ=="
},
"vue-jest": { "vue-jest": {
"version": "1.4.0", "version": "1.4.0",
"resolved": "https://registry.npmjs.org/vue-jest/-/vue-jest-1.4.0.tgz", "resolved": "https://registry.npmjs.org/vue-jest/-/vue-jest-1.4.0.tgz",

2
nezha-fronted/package.json
View File

@@ -43,6 +43,7 @@
"file-saver": "^2.0.2", "file-saver": "^2.0.2",
"html-webpack-inline-source-plugin": "0.0.10", "html-webpack-inline-source-plugin": "0.0.10",
"html2canvas": "^1.4.1", "html2canvas": "^1.4.1",
"intro.js": "^5.1.0",
"jspdf": "^2.5.1", "jspdf": "^2.5.1",
"jszip": "^3.9.1", "jszip": "^3.9.1",
"leaflet": "^1.7.1", "leaflet": "^1.7.1",
@@ -60,6 +61,7 @@
"vue-draggable-resizable": "^2.3.0", "vue-draggable-resizable": "^2.3.0",
"vue-grid-layout": "^2.3.12", "vue-grid-layout": "^2.3.12",
"vue-i18n": "^8.15.1", "vue-i18n": "^8.15.1",
"vue-introjs": "^1.3.2",
"vue-quill-editor": "^3.0.6", "vue-quill-editor": "^3.0.6",
"vue-resource": "^1.5.1", "vue-resource": "^1.5.1",
"vue-router": "^3.0.1", "vue-router": "^3.0.1",

243
nezha-fronted/src/assets/css/components/introjs/introjs-dark.scss Normal file
View File

@@ -0,0 +1,243 @@
/*
Dark theme for IntroJs
By: Khashayar Pourdeilami (http://kpourdeilami.github.io)
for: IntroJs (https://github.com/usablica/intro.js)
*/
.introjs-overlay {
position: absolute;
z-index: 999999;
background:#fff;
-webkit-transition: all 0.3s ease-out;
-moz-transition: all 0.3s ease-out;
-ms-transition: all 0.3s ease-out;
-o-transition: all 0.3s ease-out;
transition: all 0.3s ease-out;
}
.introjs-fixParent {
z-index: auto !important;
opacity: 1.0 !important;
}
.introjs-showElement,
tr.introjs-showElement > td,
tr.introjs-showElement > th {
z-index: 9999999 !important;
}
.introjs-relativePosition,
tr.introjs-showElement > td,
tr.introjs-showElement > th {
position: relative;
}
.introjs-helperLayer {
position: absolute;
z-index: 9999998;
background:#656D78;
-webkit-transition: all 0.3s ease-out;
-moz-transition: all 0.3s ease-out;
-ms-transition: all 0.3s ease-out;
-o-transition: all 0.3s ease-out;
transition: all 0.3s ease-out;
}
.introjs-helperNumberLayer {
position: absolute;
z-index: 9999999999 !important;
padding: 10px;
font-family: Arial, verdana, tahoma;
font-size: 13px;
top:-40px;
font-weight: bold;
color: white;
text-align: center;
background:#434A54;
width: 20px;
height:20px;
line-height: 20px;
}
.introjs-arrow {
border: 5px solid #434A54;
content:'';
position: absolute;
}
.introjs-arrow.top {
top: -10px;
border-top-color:transparent;
border-right-color:transparent;
border-bottom-color:#434A54;
border-left-color:transparent;
}
.introjs-arrow.top-right {
top: -10px;
right: 10px;
border-top-color:transparent;
border-right-color:transparent;
border-bottom-color:#434A54;
border-left-color:transparent;
}
.introjs-arrow.top-middle {
top: -10px;
left: 50%;
margin-left: -5px;
border-top-color:transparent;
border-right-color:transparent;
border-bottom-color:#434A54;
border-left-color:transparent;
}
.introjs-arrow.right {
right: -10px;
top: 10px;
border-top-color:transparent;
border-right-color:transparent;
border-bottom-color:transparent;
border-left-color:#434A54;
}
.introjs-arrow.bottom {
bottom: -10px;
border-top-color:#434A54;
border-right-color:transparent;
border-bottom-color:transparent;
border-left-color:transparent;
}
.introjs-arrow.left {
left: -10px;
top: 10px;
border-top-color:transparent;
border-right-color:#434A54;
border-bottom-color:transparent;
border-left-color:transparent;
}
.introjs-tooltip {
position: absolute;
padding: 10px;
background-color: #434A54;
min-width: 200px;
padding-top:30px;
max-width: 300px;
color:#fff;
-webkit-transition: opacity 0.1s ease-out;
-moz-transition: opacity 0.1s ease-out;
-ms-transition: opacity 0.1s ease-out;
-o-transition: opacity 0.1s ease-out;
transition: opacity 0.1s ease-out;
}
.introjs-tooltipbuttons {
text-align: right;
position:relative;
bottom:-44px;
margin-left:-10px;
margin-right:-10px;
padding:5px;
background:#656D78;
}
/*
Buttons style by http://nicolasgallagher.com/lab/css3-github-buttons/
Changed by Afshin Mehrabani
Further modified by: Khashayar P.
*/
.introjs-button {
position: relative;
overflow: visible;
display: inline-block;
padding: 0.3em 0.8em;
border: 2px solid #fff;
margin: 0;
text-decoration: none;
font: 11px/normal sans-serif;
color: #fff !important;
white-space: nowrap;
cursor: pointer;
outline: none;
-webkit-background-clip: padding;
-moz-background-clip: padding;
-o-background-clip: padding-box;
/*background-clip: padding-box;*/ /* commented out due to Opera 11.10 bug */
/* IE hacks */
zoom: 1;
*display: inline;
margin-top: 10px;
}
.introjs-button:hover {
text-decoration: none;
color:#434A54 !important;
background:#fff;
}
.introjs-button:focus,
.introjs-button:active {
background:#fff !important;
color:#434A54 !important;
}
/* overrides extra padding on button elements in Firefox */
.introjs-button::-moz-focus-inner {
padding: 0;
border: 0;
}
.introjs-skipbutton {
margin-right: 5px;
color: #fff;
}
.introjs-prevbutton {
border-right: none;
}
.introjs-disabled, .introjs-disabled:hover, .introjs-disabled:focus {
color: #fff;
box-shadow: none;
cursor: default;
background:transparent;
border-color:transparent;
}
.introjs-bullets {
text-align: center;
display:none;
}
.introjs-bullets ul {
clear: both;
margin: 15px auto 0;
padding: 0;
display: inline-block;
}
.introjs-bullets ul li {
list-style: none;
float: left;
margin: 0 2px;
}
.introjs-bullets ul li a {
display: block;
width: 8px;
height: 8px;
background: rgba(255,255,255,0.1);
border-radius: 10px;
-moz-border-radius: 10px;
-webkit-border-radius: 10px;
text-decoration: none;
}
.introjs-bullets ul li a:hover {
background: rgba(255,255,255,0.2);
}
.introjs-bullets ul li a.active {
background: rgba(255,255,255,0.2);
}
.introjsFloatingElement {
position: absolute;
height: 0;
width: 0;
left: 50%;
top: 50%;
}

2
nezha-fronted/src/assets/css/components/introjs/introjs.scss Normal file
View File

File diff suppressed because one or more lines are too long

3
nezha-fronted/src/assets/css/index.scss
View File

@@ -32,6 +32,7 @@ html {
@import './common/index.scss'; // 加载通用样式 @import './common/index.scss'; // 加载通用样式
@import './common.scss'; @import './common.scss';
@import '../stylus/main.scss'; @import '../stylus/main.scss';
@import './components/introjs/introjs.scss';
} }
.theme-dark { .theme-dark {
@@ -42,4 +43,6 @@ html {
@import './common/index.scss'; // 加载通用样式 @import './common/index.scss'; // 加载通用样式
@import './common.scss'; @import './common.scss';
@import '../stylus/main.scss'; @import '../stylus/main.scss';
@import './components/introjs/introjs.scss';
@import './components/introjs/introjs-dark.scss';
} }

16
nezha-fronted/src/components/chart/chart/chart-table.vue
View File

@@ -43,11 +43,11 @@
</span> </span>
<ul slot="dropdown" v-show="dropdownMenuShow" :id="'dropdownUl'+chartIndex" class="el-dropdown-menu nz-chart-dropdown" style="" > <ul slot="dropdown" v-show="dropdownMenuShow" :id="'dropdownUl'+chartIndex" class="el-dropdown-menu nz-chart-dropdown" style="" >
<li @click="editChart" class="el-dropdown-menu__item"> <li @click="editChart" class="el-dropdown-menu__item">
<i class="nz-icon nz-icon-edit" style="font-size: 16px;"></i><span>{{$t('dashboard.edit')}}</span></li> <i class="nz-icon nz-icon-edit" style="font-size: 16px;"></i><span>{{$t('overall.edit')}}</span></li>
<li v-has="'main_delete'" class="el-dropdown-menu__item" @click="removeChart"> <li v-has="'main_delete'" class="el-dropdown-menu__item" @click="removeChart">
<i class="nz-icon nz-icon-delete" style="font-size: 16px;"></i>{{$t('overall.delete')}}</li> <i class="nz-icon nz-icon-delete" style="font-size: 16px;"></i>{{$t('overall.delete')}}</li>
<li v-has="'main_add'" class="el-dropdown-menu__item" @click="duplicate"> <li v-has="'main_add'" class="el-dropdown-menu__item" @click="duplicate">
<i class="el-icon-copy-document" style="font-size: 16px;"></i>{{$t('dashboard.duplicate')}}</li> <i class="el-icon-copy-document" style="font-size: 16px;"></i>{{$t('overall.duplicate')}}</li>
<li v-has="'main_edit'" v-if="from !== 'chartTemp'&&chartData.pid" class="el-dropdown-menu__item" @click="$emit('sync')"> <li v-has="'main_edit'" v-if="from !== 'chartTemp'&&chartData.pid" class="el-dropdown-menu__item" @click="$emit('sync')">
<i class="nz-icon nz-icon-sync" style="font-size: 16px;"></i>{{$t('overall.syncChart')}}</li> <i class="nz-icon nz-icon-sync" style="font-size: 16px;"></i>{{$t('overall.syncChart')}}</li>
</ul> </ul>
@@ -57,16 +57,16 @@
<el-table :id="'tableContainer'+chartIndex" ref="tableContainer" :height="tableHeight" class="chart-table" <el-table :id="'tableContainer'+chartIndex" ref="tableContainer" :height="tableHeight" class="chart-table"
:data="seriesItem" border tooltip-effect="light" v-cloak :data="seriesItem" border tooltip-effect="light" v-cloak
@sort-change="tableDataSort" > @sort-change="tableDataSort" >
<el-table-column :label="$t('dashboard.panel.chartTableColumn.time')" min-width="100" prop="time" <el-table-column :label="$t('overall.time')" min-width="100" prop="time"
:sort-orders="['ascending', 'descending']" :sortable="'custom'"></el-table-column> :sort-orders="['ascending', 'descending']" :sortable="'custom'"></el-table-column>
<el-table-column :show-overflow-tooltip="true" prop="element" <el-table-column :show-overflow-tooltip="true" prop="element"
:label="$t('dashboard.panel.chartTableColumn.element')" min-width="260" :label="$t('dashboard.panel.chartForm.element')" min-width="260"
:sort-orders="['ascending', 'descending']" :sortable="'custom'"> :sort-orders="['ascending', 'descending']" :sortable="'custom'">
<template slot-scope="scope"> <template slot-scope="scope">
{{ scope.row.element.alias?scope.row.element.alias:scope.row.element.element}} {{ scope.row.element.alias?scope.row.element.alias:scope.row.element.element}}
</template> </template>
</el-table-column> </el-table-column>
<el-table-column :label="$t('dashboard.panel.chartTableColumn.value')" class-name="costom-value" min-width="90" prop="value" <el-table-column :label="$t('overall.value')" class-name="costom-value" min-width="90" prop="value"
:resizable="false" :sort-orders="['ascending', 'descending']" :sortable="'custom'"> :resizable="false" :sort-orders="['ascending', 'descending']" :sortable="'custom'">
<template slot-scope="scope"> <template slot-scope="scope">
<div :style="{color:scope.row.mapping?scope.row.mapping.color.text:'#000',background:scope.row.mapping?scope.row.mapping.color.bac:'#fff'}" > <div :style="{color:scope.row.mapping?scope.row.mapping.color.text:'#000',background:scope.row.mapping?scope.row.mapping.color.bac:'#fff'}" >
@@ -90,16 +90,16 @@
<el-table :data="seriesItemScreen" border height="95%" style="margin-top: 10px;" <el-table :data="seriesItemScreen" border height="95%" style="margin-top: 10px;"
ref="tableScreen" ref="tableScreen"
@sort-change="tableDataSortScreen" tooltip-effect="light"> @sort-change="tableDataSortScreen" tooltip-effect="light">
<el-table-column :label="$t('dashboard.panel.chartTableColumn.time')" min-width="100" prop="time" <el-table-column :label="$t('overall.time')" min-width="100" prop="time"
:sort-orders="['ascending', 'descending']" :sortable="'custom'"></el-table-column> :sort-orders="['ascending', 'descending']" :sortable="'custom'"></el-table-column>
<el-table-column :show-overflow-tooltip="true" prop="element" <el-table-column :show-overflow-tooltip="true" prop="element"
:label="$t('dashboard.panel.chartTableColumn.element')" min-width="420" :label="$t('dashboard.panel.chartForm.element')" min-width="420"
:sort-orders="['ascending', 'descending']" :sortable="'custom'"> :sort-orders="['ascending', 'descending']" :sortable="'custom'">
<template slot-scope="scope"> <template slot-scope="scope">
{{ scope.row.element.alias?scope.row.element.alias:scope.row.element.element}} {{ scope.row.element.alias?scope.row.element.alias:scope.row.element.element}}
</template> </template>
</el-table-column> </el-table-column>
<el-table-column :label="$t('dashboard.panel.chartTableColumn.value')" class-name="costom-value" min-width="90" prop="value" <el-table-column :label="$t('overall.value')" class-name="costom-value" min-width="90" prop="value"
:resizable="false" :sort-orders="['ascending', 'descending']" :sortable="'custom'"> :resizable="false" :sort-orders="['ascending', 'descending']" :sortable="'custom'">
<template slot-scope="scope"> <template slot-scope="scope">
<div :style="{color:scope.row.mapping?scope.row.mapping.color.text:'#000',background:scope.row.mapping?scope.row.mapping.color.bac:'#fff'}" > <div :style="{color:scope.row.mapping?scope.row.mapping.color.text:'#000',background:scope.row.mapping?scope.row.mapping.color.bac:'#fff'}" >

4
nezha-fronted/src/components/chart/chart/line-chart-block.vue
View File

@@ -56,11 +56,11 @@
</span> </span>
<ul slot="dropdown" v-show="dropdownMenuShow" :id="'dropdownUl'+chartIndex" class="el-dropdown-menu nz-chart-dropdown" style="" > <ul slot="dropdown" v-show="dropdownMenuShow" :id="'dropdownUl'+chartIndex" class="el-dropdown-menu nz-chart-dropdown" style="" >
<li @click="editChart" class="el-dropdown-menu__item"> <li @click="editChart" class="el-dropdown-menu__item">
<i class="nz-icon nz-icon-edit" style="font-size: 16px;"></i><span>{{$t('dashboard.edit')}}</span></li> <i class="nz-icon nz-icon-edit" style="font-size: 16px;"></i><span>{{$t('overall.edit')}}</span></li>
<li v-has="'main_delete'" class="el-dropdown-menu__item" @click="removeChart"> <li v-has="'main_delete'" class="el-dropdown-menu__item" @click="removeChart">
<i class="nz-icon nz-icon-delete" style="font-size: 16px;"></i>{{$t('overall.delete')}}</li> <i class="nz-icon nz-icon-delete" style="font-size: 16px;"></i>{{$t('overall.delete')}}</li>
<li v-has="'main_add'" class="el-dropdown-menu__item" @click="duplicate"> <li v-has="'main_add'" class="el-dropdown-menu__item" @click="duplicate">
<i class="el-icon-copy-document" style="font-size: 16px;"></i>{{$t('dashboard.duplicate')}}</li> <i class="el-icon-copy-document" style="font-size: 16px;"></i>{{$t('overall.duplicate')}}</li>
<li v-has="'main_edit'" v-if="from !== 'chartTemp'&&chartData.pid" class="el-dropdown-menu__item" @click="$emit('sync')"> <li v-has="'main_edit'" v-if="from !== 'chartTemp'&&chartData.pid" class="el-dropdown-menu__item" @click="$emit('sync')">
<i class="nz-icon nz-icon-sync" style="font-size: 16px;"></i>{{$t('overall.syncChart')}}</li> <i class="nz-icon nz-icon-sync" style="font-size: 16px;"></i>{{$t('overall.syncChart')}}</li>
</ul> </ul>

12
nezha-fronted/src/components/chart/chartDetail.vue
View File

@@ -17,7 +17,7 @@
<div class="basic-info-table-value">{{chartDetail? chartDetail.name : '--' }}</div> <div class="basic-info-table-value">{{chartDetail? chartDetail.name : '--' }}</div>
</div> </div>
<div class="basic-info-table-list"> <div class="basic-info-table-list">
<div class="basic-info-table-title">{{$t('overall.manageIp')}}</div> <div class="basic-info-table-title">{{$t('asset.manageIp')}}</div>
<div class="basic-info-table-value">{{chartDetail ? chartDetail.manageIp : '--'}}</div> <div class="basic-info-table-value">{{chartDetail ? chartDetail.manageIp : '--'}}</div>
</div> </div>
<div class="basic-info-table-list"> <div class="basic-info-table-list">
@@ -40,15 +40,15 @@
<div class="basic-info-table-value">{{chartDetail.dc ? chartDetail.dc.name : '--'}}</div> <div class="basic-info-table-value">{{chartDetail.dc ? chartDetail.dc.name : '--'}}</div>
</div> </div>
<div class="basic-info-table-list"> <div class="basic-info-table-list">
<div class="basic-info-table-title">{{$t('overall.cabinet')}}</div> <div class="basic-info-table-title">{{$t('asset.cabinet')}}</div>
<div class="basic-info-table-value">{{chartDetail.cabinet ? chartDetail.cabinet.name : '--'}}</div> <div class="basic-info-table-value">{{chartDetail.cabinet ? chartDetail.cabinet.name : '--'}}</div>
</div> </div>
<div class="basic-info-table-list"> <div class="basic-info-table-list">
<div class="basic-info-table-title">{{$t('overall.brand')}}</div> <div class="basic-info-table-title">{{$t('asset.brand')}}</div>
<div class="basic-info-table-value">{{chartDetail.brand ? chartDetail.brand.name : '--'}}</div> <div class="basic-info-table-value">{{chartDetail.brand ? chartDetail.brand.name : '--'}}</div>
</div> </div>
<div class="basic-info-table-list"> <div class="basic-info-table-list">
<div class="basic-info-table-title">{{$t('overall.model')}}</div> <div class="basic-info-table-title">{{$t('asset.model')}}</div>
<div class="basic-info-table-value">{{chartDetail.model ? chartDetail.model.name : '--'}}</div> <div class="basic-info-table-value">{{chartDetail.model ? chartDetail.model.name : '--'}}</div>
</div> </div>
<div class="basic-info-table-list"> <div class="basic-info-table-list">
@@ -131,7 +131,7 @@
<div class="basic-info-table-title">{{$t('overall.state')}}</div> <div class="basic-info-table-title">{{$t('overall.state')}}</div>
<div class="basic-info-table-value"> <div class="basic-info-table-value">
<span style="width: auto"> <span style="width: auto">
<span class="endpoint-cell-left"><i class="nz-icon nz-icon-Metrics active" /> {{$t('project.endpoint.metrics')}} </span> <span class="endpoint-cell-left"><i class="nz-icon nz-icon-Metrics active" /> {{$t('project.metrics.metrics')}} </span>
<span v-if="chartDetail && chartDetail.configs[0].state === 0"> <span v-if="chartDetail && chartDetail.configs[0].state === 0">
<span class="active-icon red-bg inline-block"></span> <span class="active-icon red-bg inline-block"></span>
</span> </span>
@@ -143,7 +143,7 @@
</span> </span>
</span> </span>
<span style="width: auto"> <span style="width: auto">
<span class="endpoint-cell-left" style="margin-left: 10px"><i class="nz-icon nz-icon-logs active" /> {{$t('project.endpoint.logs')}} </span> <span class="endpoint-cell-left" style="margin-left: 10px"><i class="nz-icon nz-icon-logs active" /> {{$t('overall.logs')}} </span>
<span v-if="chartDetail && chartDetail.configs[1].state === 0"> <span v-if="chartDetail && chartDetail.configs[1].state === 0">
<span class="active-icon red-bg inline-block"></span> <span class="active-icon red-bg inline-block"></span>
</span> </span>

4
nezha-fronted/src/components/chart/chartHeader.vue
View File

@@ -64,7 +64,7 @@
<ul v-show="dropdownMenuShow" slot="dropdown" class="el-dropdown-menu nz-chart-dropdown"> <ul v-show="dropdownMenuShow" slot="dropdown" class="el-dropdown-menu nz-chart-dropdown">
<li class="el-dropdown-menu__item" v-has="'main_edit'" @click="editChart"> <li class="el-dropdown-menu__item" v-has="'main_edit'" @click="editChart">
<i class="nz-icon nz-icon-edit" style="font-size: 16px;"></i> <i class="nz-icon nz-icon-edit" style="font-size: 16px;"></i>
<span>{{$t('dashboard.edit')}}</span> <span>{{$t('overall.edit')}}</span>
</li> </li>
<li v-has="'main_delete'" class="el-dropdown-menu__item" @click="removeChart"> <li v-has="'main_delete'" class="el-dropdown-menu__item" @click="removeChart">
<i class="nz-icon nz-icon-delete" style="font-size: 16px;"></i> <i class="nz-icon nz-icon-delete" style="font-size: 16px;"></i>
@@ -72,7 +72,7 @@
</li> </li>
<li v-has="'main_add'" class="el-dropdown-menu__item" @click="duplicate"> <li v-has="'main_add'" class="el-dropdown-menu__item" @click="duplicate">
<i class="el-icon-copy-document" style="font-size: 16px;"></i> <i class="el-icon-copy-document" style="font-size: 16px;"></i>
<span>{{$t('dashboard.duplicate')}}</span> <span>{{$t('overall.duplicate')}}</span>
</li> </li>
<li v-if="from !== this.$CONSTANTS.fromRoute.chartTemp && chartInfo.pid" v-has="'main_edit'" class="el-dropdown-menu__item" @click="sync"> <li v-if="from !== this.$CONSTANTS.fromRoute.chartTemp && chartInfo.pid" v-has="'main_edit'" class="el-dropdown-menu__item" @click="sync">
<i class="nz-icon nz-icon-sync" style="font-size: 16px;"></i> <i class="nz-icon nz-icon-sync" style="font-size: 16px;"></i>

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

@@ -95,7 +95,7 @@
<div class="footer" slot="footer"> <div class="footer" slot="footer">
<div class="el-message-box__btns" style="text-align: right;margin-top: 20px;"> <div class="el-message-box__btns" style="text-align: right;margin-top: 20px;">
<button @click="upload" class="el-button el-button--default el-button--small"> <button @click="upload" class="el-button el-button--default el-button--small">
<span>{{$t('webshell.uploadButtonTitle')}}</span> <span>{{$t('asset.upload')}}</span>
</button> </button>
<button @click="closeDialog" class="el-button el-button--default el-button--small" > <button @click="closeDialog" class="el-button el-button--default el-button--small" >
<span>{{$t('overall.cancel')}}</span> <span>{{$t('overall.cancel')}}</span>
@@ -119,7 +119,7 @@
<div class="footer" slot="footer"> <div class="footer" slot="footer">
<div class="el-message-box__btns" style="text-align: right;margin-top: 20px;"> <div class="el-message-box__btns" style="text-align: right;margin-top: 20px;">
<button @click="download" class="el-button el-button--default el-button--small"> <button @click="download" class="el-button el-button--default el-button--small">
<span>{{$t('webshell.downloadButtonTitle')}}</span> <span>{{$t('overall.download')}}</span>
</button> </button>
<button @click="closeDownloadDialog" class="el-button el-button--default el-button--small"> <button @click="closeDownloadDialog" class="el-button el-button--default el-button--small">
<span>{{$t('overall.cancel')}}</span> <span>{{$t('overall.cancel')}}</span>
@@ -203,13 +203,13 @@
<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>
</el-form-item> </el-form-item>
<el-form-item :label='$t("webshell.host")' prop="host"> <el-form-item :label='$t("asset.host")' prop="host">
<el-input v-model="customConnect.host" size="small"/> <el-input v-model="customConnect.host" size="small"/>
</el-form-item> </el-form-item>
<el-form-item :label='$t("webshell.port")' prop="port"> <el-form-item :label='$t("webshell.port")' prop="port">
<el-input v-model="customConnect.port" size="small"/> <el-input v-model="customConnect.port" size="small"/>
</el-form-item> </el-form-item>
<el-form-item :label='$t("webshell.authUsername")' prop="authUsername"> <el-form-item :label='$t("asset.username")' prop="authUsername">
<el-input v-model="customConnect.authUsername" size="small" autocomplete="new-password"/> <el-input v-model="customConnect.authUsername" size="small" autocomplete="new-password"/>
</el-form-item> </el-form-item>
<el-form-item <el-form-item
@@ -219,7 +219,7 @@
> >
<el-input v-model="customConnect.authPriKey" size="small" autocomplete="new-password"/> <el-input v-model="customConnect.authPriKey" size="small" autocomplete="new-password"/>
</el-form-item> </el-form-item>
<el-form-item :label='$t("webshell.authPin")' prop="authPin" <el-form-item :label='$t("login.pin")' prop="authPin"
:rules="[ :rules="[
{ required: customConnect.authType ===1, message:$t('validate.required'), trigger: 'change'}, { required: customConnect.authType ===1, message:$t('validate.required'), trigger: 'change'},
]"> ]">
@@ -227,13 +227,13 @@
</el-form-item> </el-form-item>
<el-form-item <el-form-item
v-if="customConnect.authProtocol === 2" v-if="customConnect.authProtocol === 2"
:label='$t("webshell.authUserTip")' :label='$t("asset.usernamePrompt")'
prop="authUserTip"> prop="authUserTip">
<el-input v-model="customConnect.authUserTip" size="small"/> <el-input v-model="customConnect.authUserTip" size="small"/>
</el-form-item> </el-form-item>
<el-form-item <el-form-item
v-if="customConnect.authProtocol === 2" v-if="customConnect.authProtocol === 2"
:label='$t("webshell.authPinTip")' :label='$t("asset.pinPrompt")'
prop="authPinTip" prop="authPinTip"
> >
<el-input v-model="customConnect.authPinTip" size="small"/> <el-input v-model="customConnect.authPinTip" size="small"/>
@@ -318,7 +318,7 @@ export default {
// upoload-download // upoload-download
currentUuid: '', currentUuid: '',
uploadBox: { showUpload: false, title: this.$t('webshell.uploadTitle') }, uploadBox: { showUpload: false, title: this.$t('asset.upload') },
uploadFile: { file: '', path: '', uuid: '' }, uploadFile: { file: '', path: '', uuid: '' },
uploadFileList: [], uploadFileList: [],
uploadResult: null, uploadResult: null,

6
nezha-fronted/src/components/common/ChartDiagram/diagram.vue
View File

@@ -102,7 +102,7 @@
<button type="button" @click="previewTopology" v-if="!isPreview" class="nz-btn nz-btn-size-normal nz-btn-style-light" <button type="button" @click="previewTopology" v-if="!isPreview" class="nz-btn nz-btn-size-normal nz-btn-style-light"
style="margin-right: 20px" style="margin-right: 20px"
> >
{{$t('project.topology.preview')}} {{$t('overall.preview')}}
</button> </button>
<button type="button" v-if="isPreview" class="nz-btn nz-btn-size-normal nz-btn-style-light" @click="previewExit" <button type="button" v-if="isPreview" class="nz-btn nz-btn-size-normal nz-btn-style-light" @click="previewExit"
style="margin-right: 20px" style="margin-right: 20px"
@@ -113,7 +113,7 @@
:disabled="prevent_opt.save" :disabled="prevent_opt.save"
:class="{'nz-btn-disabled':prevent_opt.save}" :class="{'nz-btn-disabled':prevent_opt.save}"
style="margin-right: 20px"> style="margin-right: 20px">
{{$t('project.topology.save')}} {{$t('overall.save')}}
</button> </button>
<button type="button" class="nz-btn nz-btn-size-normal nz-btn-style-normal" style="margin-right: 20px" @click="cancelTopology"> <button type="button" class="nz-btn nz-btn-size-normal nz-btn-style-normal" style="margin-right: 20px" @click="cancelTopology">
{{$t('project.topology.exit')}} {{$t('project.topology.exit')}}
@@ -302,7 +302,7 @@
v-has="'topo_icon_save'" :disabled="prevent_opt.save" v-has="'topo_icon_save'" :disabled="prevent_opt.save"
:class="{'nz-btn-disabled':prevent_opt.save}" :class="{'nz-btn-disabled':prevent_opt.save}"
style="margin-right: 20px"> style="margin-right: 20px">
{{$t('project.topology.save')}} {{$t('overall.save')}}
</button> </button>
</span> </span>
</div> </div>

16
nezha-fronted/src/components/common/alert/alertLabel.vue
View File

@@ -38,7 +38,7 @@
</div> </div>
</div> --> </div> -->
<div class="alert-label-box"> <div class="alert-label-box">
<div class="alert-label-title">{{ $t("overall.manageIp") }}</div> <div class="alert-label-title">{{ $t("asset.manageIp") }}</div>
<div class="alert-label-value"> <div class="alert-label-value">
{{ {{
alertLabelData && alertLabelData.manageIp alertLabelData && alertLabelData.manageIp
@@ -104,7 +104,7 @@
</div> </div>
</div> </div>
<div class="alert-label-box"> <div class="alert-label-box">
<div class="alert-label-title">{{ $t("overall.cabinet") }}</div> <div class="alert-label-title">{{ $t("asset.cabinet") }}</div>
<div class="alert-label-value"> <div class="alert-label-value">
{{ {{
alertLabelData && alertLabelData &&
@@ -116,7 +116,7 @@
</div> </div>
</div> </div>
<div class="alert-label-box"> <div class="alert-label-box">
<div class="alert-label-title">{{ $t("overall.brand") }}</div> <div class="alert-label-title">{{ $t("asset.brand") }}</div>
<div class="alert-label-value"> <div class="alert-label-value">
{{ {{
alertLabelData && alertLabelData.brand && alertLabelData.brand.name alertLabelData && alertLabelData.brand && alertLabelData.brand.name
@@ -126,7 +126,7 @@
</div> </div>
</div> </div>
<div class="alert-label-box"> <div class="alert-label-box">
<div class="alert-label-title">{{ $t("overall.model") }}</div> <div class="alert-label-title">{{ $t("asset.model") }}</div>
<div class="alert-label-value"> <div class="alert-label-value">
{{ {{
alertLabelData && alertLabelData.model && alertLabelData.model.name alertLabelData && alertLabelData.model && alertLabelData.model.name
@@ -457,7 +457,7 @@
<span style="width: auto"> <span style="width: auto">
<span class="endpoint-cell-left" <span class="endpoint-cell-left"
><i class="nz-icon nz-icon-Metrics active" /> ><i class="nz-icon nz-icon-Metrics active" />
{{ $t("project.endpoint.metrics") }} {{ $t("project.metrics.metrics") }}
</span> </span>
<span <span
v-if="alertLabelData && alertLabelData.configs[0].state === 0" v-if="alertLabelData && alertLabelData.configs[0].state === 0"
@@ -478,7 +478,7 @@
<span style="width: auto"> <span style="width: auto">
<span class="endpoint-cell-left" style="margin-left: 10px" <span class="endpoint-cell-left" style="margin-left: 10px"
><i class="nz-icon nz-icon-logs active" /> ><i class="nz-icon nz-icon-logs active" />
{{ $t("project.endpoint.logs") }} {{ $t("overall.logs") }}
</span> </span>
<span <span
v-if="alertLabelData && alertLabelData.configs[1].state === 0" v-if="alertLabelData && alertLabelData.configs[1].state === 0"
@@ -514,7 +514,7 @@
</div> </div>
</div> </div>
<div class="alert-label-box"> <div class="alert-label-box">
<div class="alert-label-title">{{ $t("overall.location") }}</div> <div class="alert-label-title">{{ $t("asset.location") }}</div>
<div class="alert-label-value"> <div class="alert-label-value">
{{ {{
alertLabelData && alertLabelData.location && alertLabelData.location alertLabelData && alertLabelData.location && alertLabelData.location
@@ -524,7 +524,7 @@
</div> </div>
</div> </div>
<div class="alert-label-box"> <div class="alert-label-box">
<div class="alert-label-title">{{ $t("overall.cabinet") }}</div> <div class="alert-label-title">{{ $t("asset.cabinet") }}</div>
<div class="alert-label-value"> <div class="alert-label-value">
<i <i
v-if="alertLabelData" v-if="alertLabelData"

16
nezha-fronted/src/components/common/alert/alertLabel2.vue
View File

@@ -17,7 +17,7 @@
<div class="alert-label-value">{{alertLabelData && alertLabelData.name ? alertLabelData.name : '--'}}</div> <div class="alert-label-value">{{alertLabelData && alertLabelData.name ? alertLabelData.name : '--'}}</div>
</div> </div>
<div class="alert-label-box"> <div class="alert-label-box">
<div class="alert-label-title">{{$t('overall.manageIp')}}</div> <div class="alert-label-title">{{$t('asset.manageIp')}}</div>
<div class="alert-label-value">{{alertLabelData && alertLabelData.manageIp ? alertLabelData.manageIp : '--'}}</div> <div class="alert-label-value">{{alertLabelData && alertLabelData.manageIp ? alertLabelData.manageIp : '--'}}</div>
</div> </div>
<div class="alert-label-box"> <div class="alert-label-box">
@@ -40,15 +40,15 @@
<div class="alert-label-value">{{alertLabelData && alertLabelData.dc && alertLabelData.dc.name ? alertLabelData.dc.name:'--'}}</div> <div class="alert-label-value">{{alertLabelData && alertLabelData.dc && alertLabelData.dc.name ? alertLabelData.dc.name:'--'}}</div>
</div> </div>
<div class="alert-label-box"> <div class="alert-label-box">
<div class="alert-label-title">{{$t('overall.cabinet')}}</div> <div class="alert-label-title">{{$t('asset.cabinet')}}</div>
<div class="alert-label-value">{{alertLabelData && alertLabelData.cabinet && alertLabelData.cabinet.name ? alertLabelData.cabinet.name : '--'}}</div> <div class="alert-label-value">{{alertLabelData && alertLabelData.cabinet && alertLabelData.cabinet.name ? alertLabelData.cabinet.name : '--'}}</div>
</div> </div>
<div class="alert-label-box"> <div class="alert-label-box">
<div class="alert-label-title">{{$t('overall.brand')}}</div> <div class="alert-label-title">{{$t('asset.brand')}}</div>
<div class="alert-label-value">{{alertLabelData && alertLabelData.brand && alertLabelData.brand.name ? alertLabelData.brand.name : '--'}}</div> <div class="alert-label-value">{{alertLabelData && alertLabelData.brand && alertLabelData.brand.name ? alertLabelData.brand.name : '--'}}</div>
</div> </div>
<div class="alert-label-box"> <div class="alert-label-box">
<div class="alert-label-title">{{$t('overall.model')}}</div> <div class="alert-label-title">{{$t('asset.model')}}</div>
<div class="alert-label-value">{{alertLabelData && alertLabelData.model && alertLabelData.model.name ? alertLabelData.model.name : '--'}}</div> <div class="alert-label-value">{{alertLabelData && alertLabelData.model && alertLabelData.model.name ? alertLabelData.model.name : '--'}}</div>
</div> </div>
<div class="alert-label-box"> <div class="alert-label-box">
@@ -224,7 +224,7 @@
<div class="alert-label-title">{{$t('overall.state')}}</div> <div class="alert-label-title">{{$t('overall.state')}}</div>
<div class="alert-label-value"> <div class="alert-label-value">
<span style="width: auto"> <span style="width: auto">
<span class="endpoint-cell-left"><i class="nz-icon nz-icon-Metrics colorFA901C" /> {{$t('project.endpoint.metrics')}} </span> <span class="endpoint-cell-left"><i class="nz-icon nz-icon-Metrics colorFA901C" /> {{$t('project.metrics.metrics')}} </span>
<span v-if="alertLabelData && alertLabelData.configs[0].state === 0"> <span v-if="alertLabelData && alertLabelData.configs[0].state === 0">
<span class="active-icon red-bg inline-block"></span> <span class="active-icon red-bg inline-block"></span>
</span> </span>
@@ -236,7 +236,7 @@
</span> </span>
</span> </span>
<span style="width: auto"> <span style="width: auto">
<span class="endpoint-cell-left" style="margin-left: 10px"><i class="nz-icon nz-icon-logs colorFA901C" /> {{$t('project.endpoint.logs')}} </span> <span class="endpoint-cell-left" style="margin-left: 10px"><i class="nz-icon nz-icon-logs colorFA901C" /> {{$t('overall.logs')}} </span>
<span v-if="alertLabelData && alertLabelData.configs[1].state === 0"> <span v-if="alertLabelData && alertLabelData.configs[1].state === 0">
<span class="active-icon red-bg inline-block"></span> <span class="active-icon red-bg inline-block"></span>
</span> </span>
@@ -261,11 +261,11 @@
<div class="alert-label-value">{{alertLabelData && alertLabelData.name ? alertLabelData.name : '--'}}</div> <div class="alert-label-value">{{alertLabelData && alertLabelData.name ? alertLabelData.name : '--'}}</div>
</div> </div>
<div class="alert-label-box"> <div class="alert-label-box">
<div class="alert-label-title">{{$t('overall.location')}}</div> <div class="alert-label-title">{{$t('asset.location')}}</div>
<div class="alert-label-value">{{alertLabelData && alertLabelData.location && alertLabelData.location ? alertLabelData.location : '--'}}</div> <div class="alert-label-value">{{alertLabelData && alertLabelData.location && alertLabelData.location ? alertLabelData.location : '--'}}</div>
</div> </div>
<div class="alert-label-box"> <div class="alert-label-box">
<div class="alert-label-title">{{$t('overall.cabinet')}}</div> <div class="alert-label-title">{{$t('asset.cabinet')}}</div>
<div class="alert-label-value"> <div class="alert-label-value">
<i v-if="alertLabelData" class="nz-icon nz-icon-cabinet monitorColor" :class="alertLabelData && alertLabelData.cabinetNum> 0 ? 'color23BF9A' : 'colorEF7458'"/>&nbsp; <i v-if="alertLabelData" class="nz-icon nz-icon-cabinet monitorColor" :class="alertLabelData && alertLabelData.cabinetNum> 0 ? 'color23BF9A' : 'colorEF7458'"/>&nbsp;
<span>{{alertLabelData && alertLabelData.cabinetNum ? alertLabelData.cabinetNum : 0}}</span></div> <span>{{alertLabelData && alertLabelData.cabinetNum ? alertLabelData.cabinetNum : 0}}</span></div>

16
nezha-fronted/src/components/common/alert/alertLabel3.vue
View File

@@ -38,7 +38,7 @@
</div> </div>
</div> --> </div> -->
<div class="alert-label-box"> <div class="alert-label-box">
<div class="alert-label-title">{{ $t("overall.manageIp") }}</div> <div class="alert-label-title">{{ $t("asset.manageIp") }}</div>
<div class="alert-label-value"> <div class="alert-label-value">
{{ {{
alertLabelData && alertLabelData.manageIp alertLabelData && alertLabelData.manageIp
@@ -104,7 +104,7 @@
</div> </div>
</div> </div>
<div class="alert-label-box"> <div class="alert-label-box">
<div class="alert-label-title">{{ $t("overall.cabinet") }}</div> <div class="alert-label-title">{{ $t("asset.cabinet") }}</div>
<div class="alert-label-value"> <div class="alert-label-value">
{{ {{
alertLabelData && alertLabelData &&
@@ -116,7 +116,7 @@
</div> </div>
</div> </div>
<div class="alert-label-box"> <div class="alert-label-box">
<div class="alert-label-title">{{ $t("overall.brand") }}</div> <div class="alert-label-title">{{ $t("asset.brand") }}</div>
<div class="alert-label-value"> <div class="alert-label-value">
{{ {{
alertLabelData && alertLabelData.brand && alertLabelData.brand.name alertLabelData && alertLabelData.brand && alertLabelData.brand.name
@@ -126,7 +126,7 @@
</div> </div>
</div> </div>
<div class="alert-label-box"> <div class="alert-label-box">
<div class="alert-label-title">{{ $t("overall.model") }}</div> <div class="alert-label-title">{{ $t("asset.model") }}</div>
<div class="alert-label-value"> <div class="alert-label-value">
{{ {{
alertLabelData && alertLabelData.model && alertLabelData.model.name alertLabelData && alertLabelData.model && alertLabelData.model.name
@@ -457,7 +457,7 @@
<span style="width: auto"> <span style="width: auto">
<span class="endpoint-cell-left" <span class="endpoint-cell-left"
><i class="nz-icon nz-icon-Metrics active" /> ><i class="nz-icon nz-icon-Metrics active" />
{{ $t("project.endpoint.metrics") }} {{ $t("project.metrics.metrics") }}
</span> </span>
<span <span
v-if="alertLabelData && alertLabelData.configs[0].state === 0" v-if="alertLabelData && alertLabelData.configs[0].state === 0"
@@ -478,7 +478,7 @@
<span style="width: auto"> <span style="width: auto">
<span class="endpoint-cell-left" style="margin-left: 10px" <span class="endpoint-cell-left" style="margin-left: 10px"
><i class="nz-icon nz-icon-logs active" /> ><i class="nz-icon nz-icon-logs active" />
{{ $t("project.endpoint.logs") }} {{ $t("overall.logs") }}
</span> </span>
<span <span
v-if="alertLabelData && alertLabelData.configs[1].state === 0" v-if="alertLabelData && alertLabelData.configs[1].state === 0"
@@ -514,7 +514,7 @@
</div> </div>
</div> </div>
<div class="alert-label-box"> <div class="alert-label-box">
<div class="alert-label-title">{{ $t("overall.location") }}</div> <div class="alert-label-title">{{ $t("asset.location") }}</div>
<div class="alert-label-value"> <div class="alert-label-value">
{{ {{
alertLabelData && alertLabelData.location && alertLabelData.location alertLabelData && alertLabelData.location && alertLabelData.location
@@ -524,7 +524,7 @@
</div> </div>
</div> </div>
<div class="alert-label-box"> <div class="alert-label-box">
<div class="alert-label-title">{{ $t("overall.cabinet") }}</div> <div class="alert-label-title">{{ $t("asset.cabinet") }}</div>
<div class="alert-label-value"> <div class="alert-label-value">
<i <i
v-if="alertLabelData" v-if="alertLabelData"

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

@@ -52,7 +52,7 @@ export default {
{ key: 'summary', label: this.$t('alert.summary') }, { key: 'summary', label: this.$t('alert.summary') },
{ key: 'description', label: this.$t('overall.remark') }, { key: 'description', label: this.$t('overall.remark') },
{ key: 'labels', label: this.$t('alert.list.labels') }, { key: 'labels', label: this.$t('alert.list.labels') },
{ key: 'startAt', label: this.$t('alert.startAt') } { key: 'startAt', label: this.$t('overall.startTime') }
] ]
} }
} }

6
nezha-fronted/src/components/common/alert/alertRuleInfo.vue
View File

@@ -18,11 +18,11 @@
<div class="alert-rule-value">{{alertRuleData.name ? alertRuleData.name : '--'}}</div> <div class="alert-rule-value">{{alertRuleData.name ? alertRuleData.name : '--'}}</div>
</div> </div>
<!-- <div class="alert-rule-box">--> <!-- <div class="alert-rule-box">-->
<!-- <div class="alert-rule-title">{{$t('alert.name')}}</div>--> <!-- <div class="alert-rule-title">{{$t('overall.name')}}</div>-->
<!-- <div class="alert-rule-value">{{alertRuleData.name ? alertRuleData.name : '&#45;&#45;'}}</div>--> <!-- <div class="alert-rule-value">{{alertRuleData.name ? alertRuleData.name : '&#45;&#45;'}}</div>-->
<!-- </div>--> <!-- </div>-->
<div class="alert-rule-box"> <div class="alert-rule-box">
<div class="alert-rule-title">{{$t('alert.type')}}</div> <div class="alert-rule-title">{{$t('overall.type')}}</div>
<div class="alert-rule-value"> <div class="alert-rule-value">
<span v-if="alertRuleData.type === 1"> <span v-if="alertRuleData.type === 1">
{{$t('project.metrics.metrics')}} {{$t('project.metrics.metrics')}}
@@ -64,7 +64,7 @@
<div class="alert-rule-value" @click="trbShotShow"><i class="nz-icon nz-icon-guzhangshuju"></i></div> <div class="alert-rule-value" @click="trbShotShow"><i class="nz-icon nz-icon-guzhangshuju"></i></div>
</div> </div>
<div class="alert-rule-box"> <div class="alert-rule-box">
<div class="alert-rule-title">{{$t('alert.state')}}</div> <div class="alert-rule-title">{{$t('overall.state')}}</div>
<div class="alert-rule-value" style="margin-left: 3px"> <div class="alert-rule-value" style="margin-left: 3px">
<div v-if="alertRuleData.state === 1"> <div v-if="alertRuleData.state === 1">
<i class="active-icon green-bg inline-block"></i> <i class="active-icon green-bg inline-block"></i>

6
nezha-fronted/src/components/common/alert/alertRuleInfo2.vue
View File

@@ -18,11 +18,11 @@
<div class="alert-rule-value">{{alertRuleData.name ? alertRuleData.name : '--'}}</div> <div class="alert-rule-value">{{alertRuleData.name ? alertRuleData.name : '--'}}</div>
</div> </div>
<!-- <div class="alert-rule-box">--> <!-- <div class="alert-rule-box">-->
<!-- <div class="alert-rule-title">{{$t('alert.name')}}</div>--> <!-- <div class="alert-rule-title">{{$t('overall.name')}}</div>-->
<!-- <div class="alert-rule-value">{{alertRuleData.name ? alertRuleData.name : '&#45;&#45;'}}</div>--> <!-- <div class="alert-rule-value">{{alertRuleData.name ? alertRuleData.name : '&#45;&#45;'}}</div>-->
<!-- </div>--> <!-- </div>-->
<div class="alert-rule-box"> <div class="alert-rule-box">
<div class="alert-rule-title">{{$t('alert.type')}}</div> <div class="alert-rule-title">{{$t('overall.type')}}</div>
<div class="alert-rule-value"> <div class="alert-rule-value">
<span v-if="alertRuleData.type === 1"> <span v-if="alertRuleData.type === 1">
{{$t('project.metrics.metrics')}} {{$t('project.metrics.metrics')}}
@@ -64,7 +64,7 @@
<div class="alert-rule-value" @click="trbShotShow"><i class="nz-icon nz-icon-guzhangshuju"></i></div> <div class="alert-rule-value" @click="trbShotShow"><i class="nz-icon nz-icon-guzhangshuju"></i></div>
</div> </div>
<div class="alert-rule-box"> <div class="alert-rule-box">
<div class="alert-rule-title">{{$t('alert.state')}}</div> <div class="alert-rule-title">{{$t('overall.state')}}</div>
<div class="alert-rule-value" style="margin-left: 3px"> <div class="alert-rule-value" style="margin-left: 3px">
<div v-if="alertRuleData.state === 1"> <div v-if="alertRuleData.state === 1">
<i class="active-icon green-bg inline-block"></i> <i class="active-icon green-bg inline-block"></i>

14
nezha-fronted/src/components/common/bottomBox/bottomBox.vue
View File

@@ -232,22 +232,22 @@ export default {
] ]
}, },
model: [ model: [
{ prop: 'asset', name: this.$t('asset.assets'), active: true } { prop: 'asset', name: this.$t('guide.asset'), active: true }
], ],
dc: { dc: {
cabinet: [ cabinet: [
{ prop: 'cabinet', name: this.$t('config.dc.cabinets'), active: true }, { prop: 'cabinet', name: this.$t('asset.cabinet'), active: true },
{ prop: 'asset', name: this.$t('asset.assets'), active: false }, { prop: 'asset', name: this.$t('guide.asset'), active: false },
{ prop: 'alertMessageTab', name: this.$t('overall.alert'), active: false } { prop: 'alertMessageTab', name: this.$t('overall.alert'), active: false }
], ],
asset: [ asset: [
{ prop: 'cabinet', name: this.$t('config.dc.cabinets'), active: false }, { prop: 'cabinet', name: this.$t('asset.cabinet'), active: false },
{ prop: 'asset', name: this.$t('asset.assets'), active: true }, { prop: 'asset', name: this.$t('guide.asset'), active: true },
{ prop: 'alertMessageTab', name: this.$t('overall.alert'), active: false } { prop: 'alertMessageTab', name: this.$t('overall.alert'), active: false }
], ],
alertMessage: [ alertMessage: [
{ prop: 'cabinet', name: this.$t('config.dc.cabinets'), active: false }, { prop: 'cabinet', name: this.$t('asset.cabinet'), active: false },
{ prop: 'asset', name: this.$t('asset.assets'), active: false }, { prop: 'asset', name: this.$t('guide.asset'), active: false },
{ prop: 'alertMessageTab', name: this.$t('overall.alert'), active: true } { prop: 'alertMessageTab', name: this.$t('overall.alert'), active: true }
] ]
}, },

2
nezha-fronted/src/components/common/bottomBox/tabs/IpDetails.vue
View File

@@ -121,7 +121,7 @@ export default {
label: 'addr', label: 'addr',
disabled: false disabled: false
}, { }, {
name: this.$t('asset.state'), name: this.$t('overall.state'),
type: 'input', type: 'input',
label: 'state', label: 'state',
disabled: false disabled: false

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

@@ -3,7 +3,7 @@
<div class="sub-top-tools"> <div class="sub-top-tools">
<div class="sub-list-tabs" v-if="from===fromRoute.module"> <div class="sub-list-tabs" v-if="from===fromRoute.module">
<div class="sub-list-tab-title">{{obj.name}}</div> <div class="sub-list-tab-title">{{obj.name}}</div>
<div @click="changeTab('endpoint')" class="sub-list-tab" id="endpoint-tab-change-endpoint">{{$t("asset.modules")}}</div> <div @click="changeTab('endpoint')" class="sub-list-tab" id="endpoint-tab-change-endpoint">{{$t("overall.endpoint")}}</div>
<div class="sub-list-tab sub-list-tab-active" >{{$t("asset.alerts")}}</div> <div class="sub-list-tab sub-list-tab-active" >{{$t("asset.alerts")}}</div>
</div> </div>
<div class="sub-list-tabs" v-else> <div class="sub-list-tabs" v-else>
@@ -14,7 +14,7 @@
</div><div :id="from+'-change-panelordetail'" </div><div :id="from+'-change-panelordetail'"
@click="changeTab(from == $CONSTANTS.fromRoute.asset || from == $CONSTANTS.fromRoute.rule || from == $CONSTANTS.fromRoute.endpoint? 'panel' : 'detail')" class="sub-list-tab">{{$t("overall.detail")}}</div><div @click="changeTab(from == $CONSTANTS.fromRoute.asset || from == $CONSTANTS.fromRoute.rule || from == $CONSTANTS.fromRoute.endpoint? 'panel' : 'detail')" class="sub-list-tab">{{$t("overall.detail")}}</div><div
class="sub-list-tab sub-list-tab-active">{{$t("asset.alerts")}}</div><div v-if="from == $CONSTANTS.fromRoute.asset" :id="from+'-change-modules'" class="sub-list-tab sub-list-tab-active">{{$t("asset.alerts")}}</div><div v-if="from == $CONSTANTS.fromRoute.asset" :id="from+'-change-modules'"
@click="changeTab('endpoint')" class="sub-list-tab" v-has="'asset_endpoint_view'">{{$t("asset.modules")}}</div> @click="changeTab('endpoint')" class="sub-list-tab" v-has="'asset_endpoint_view'">{{$t("overall.endpoint")}}</div>
<div @click="changeTab('endpointQuery')" class="sub-list-tab" v-has="'project_endpoint_query_chart_view'" v-if="from == $CONSTANTS.fromRoute.endpoint" :id="from+'-change-endpoint'">{{$t("overall.query")}}</div> <div @click="changeTab('endpointQuery')" class="sub-list-tab" v-has="'project_endpoint_query_chart_view'" v-if="from == $CONSTANTS.fromRoute.endpoint" :id="from+'-change-endpoint'">{{$t("overall.query")}}</div>
</div> </div>
<div class="top-tool-right"> <div class="top-tool-right">
@@ -168,16 +168,16 @@ export default {
prop: 'description', prop: 'description',
show: true show: true
}, { }, {
label: this.$t('alert.list.state'), label: this.$t('overall.state'),
prop: 'state', prop: 'state',
show: true, show: true,
width: 100 width: 100
}, { }, {
label: this.$t('alert.startAt'), label: this.$t('overall.startTime'),
prop: 'startAt', prop: 'startAt',
show: true show: true
}, { }, {
label: this.$t('alert.endAt'), label: this.$t('overall.endTime'),
prop: 'endAt', prop: 'endAt',
show: true show: true
}, { }, {
@@ -231,14 +231,14 @@ export default {
disabled: false disabled: false
}, { }, {
id: 12, id: 12,
name: this.$t('alert.list.state'), name: this.$t('overall.state'),
type: 'select', type: 'select',
label: 'alertMessageState', label: 'alertMessageState',
disabled: false disabled: false
}, },
{ {
id: 26, id: 26,
name: this.$t('alert.list.id'), name: this.$t('asset.id'),
type: 'id', type: 'id',
label: 'id', label: 'id',
disabled: false disabled: false

2
nezha-fronted/src/components/common/bottomBox/tabs/alertMessageTabNew.vue
View File

@@ -203,7 +203,7 @@ export default {
searchLabelList: [ searchLabelList: [
{ {
id: 26, id: 26,
name: this.$t('alert.list.id'), name: this.$t('asset.id'),
type: 'input', type: 'input',
label: 'ids', label: 'ids',
disabled: false disabled: false

2
nezha-fronted/src/components/common/bottomBox/tabs/assetSubTab.vue
View File

@@ -104,7 +104,7 @@ export default {
label: 'manageIp', label: 'manageIp',
disabled: false disabled: false
}, { }, {
name: this.$t('asset.state'), name: this.$t('overall.state'),
type: 'assetState', type: 'assetState',
label: 'assetState', label: 'assetState',
id: 'stateIds', id: 'stateIds',

2
nezha-fronted/src/components/common/bottomBox/tabs/assetTab.vue
View File

@@ -104,7 +104,7 @@ export default {
label: 'manageIp', label: 'manageIp',
disabled: false disabled: false
}, { }, {
name: this.$t('asset.state'), name: this.$t('overall.state'),
type: 'assetState', type: 'assetState',
label: 'assetState', label: 'assetState',
id: 'stateIds', id: 'stateIds',

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

@@ -80,7 +80,7 @@
:min-width="1000" :min-width="1000"
column-key="element" column-key="element"
:show-overflow-tooltip="true" :show-overflow-tooltip="true"
:label="$t('project.endpoint.element')"> :label="$t('dashboard.panel.chartForm.element')">
<template v-slot="scope"> <template v-slot="scope">
<el-popover trigger="hover" placement="right" v-if="typeof scope.row.metricTip != 'undefined' && scope.row.metricTip != null"> <el-popover trigger="hover" placement="right" v-if="typeof scope.row.metricTip != 'undefined' && scope.row.metricTip != null">
<div> <div>
@@ -100,7 +100,7 @@
:resizable="false" :resizable="false"
prop="value" prop="value"
column-key="value" column-key="value"
:label="$t('project.endpoint.value')" :label="$t('overall.value')"
min-width="180"> min-width="180">
</pl-table-column> </pl-table-column>
</pl-table> </pl-table>

20
nezha-fronted/src/components/common/bottomBox/tabs/endpointTab.vue
View File

@@ -5,11 +5,11 @@
<div class="sub-list-tab-title">{{obj.host}}</div> <div class="sub-list-tab-title">{{obj.host}}</div>
<div class="sub-list-tab" @click="changeTab('panel')" id="endpoint-tab-change-panel">{{$t("overall.detail")}}</div> <div class="sub-list-tab" @click="changeTab('panel')" id="endpoint-tab-change-panel">{{$t("overall.detail")}}</div>
<div @click="changeTab('alertMessage')" class="sub-list-tab" v-has="'asset_alerts_view'" id="endpoint-tab-change-alertmsg">{{$t("asset.alerts")}}</div> <div @click="changeTab('alertMessage')" class="sub-list-tab" v-has="'asset_alerts_view'" id="endpoint-tab-change-alertmsg">{{$t("asset.alerts")}}</div>
<div class="sub-list-tab sub-list-tab-active">{{$t("asset.modules")}}</div> <div class="sub-list-tab sub-list-tab-active">{{$t("overall.endpoint")}}</div>
</div> </div>
<div class="sub-list-tabs" v-if="from===fromRoute.module"> <div class="sub-list-tabs" v-if="from===fromRoute.module">
<div class="sub-list-tab-title">{{obj.name}}</div> <div class="sub-list-tab-title">{{obj.name}}</div>
<div class="sub-list-tab sub-list-tab-active">{{$t("asset.modules")}}</div> <div class="sub-list-tab sub-list-tab-active">{{$t("overall.endpoint")}}</div>
<div @click="changeTab('alertMessage')" class="sub-list-tab" id="endpoint-tab-change-alertmsg">{{$t("asset.alerts")}}</div> <div @click="changeTab('alertMessage')" class="sub-list-tab" id="endpoint-tab-change-alertmsg">{{$t("asset.alerts")}}</div>
</div> </div>
<div class="top-tool-right"> <div class="top-tool-right">
@@ -206,7 +206,7 @@ export default {
show: true, show: true,
width: '120' width: '120'
}, { }, {
label: this.$t('project.endpoint.asset'), label: this.$t('guide.asset'),
prop: 'asset', prop: 'asset',
show: true, show: true,
minWidth: '400' minWidth: '400'
@@ -216,7 +216,7 @@ export default {
show: true, show: true,
width: 120 width: 120
}, { }, {
label: this.$t('project.endpoint.port'), label: this.$t('asset.port'),
prop: 'port', prop: 'port',
show: true, show: true,
width: '120' width: '120'
@@ -226,7 +226,7 @@ export default {
show: false, show: false,
width: 120 width: 120
}, { }, {
label: this.$t('project.endpoint.labels'), label: this.$t('alert.list.labels'),
prop: 'labels', prop: 'labels',
show: true, show: true,
width: 200 width: 200
@@ -236,17 +236,17 @@ export default {
show: true, show: true,
width: 200 width: 200
}, { }, {
label: this.$t('project.endpoint.path'), label: this.$t('config.terminallog.path'),
prop: 'path', prop: 'path',
show: true, show: true,
width: 200 width: 200
}, { }, {
label: this.$t('alert.list.state'), label: this.$t('overall.state'),
prop: 'state', prop: 'state',
show: true, show: true,
width: '80' width: '80'
}, { }, {
label: this.$t('project.endpoint.alerts'), label: this.$t('overall.alert'),
prop: 'alerts', prop: 'alerts',
show: true, show: true,
width: 180 width: 180
@@ -283,7 +283,7 @@ export default {
disabled: false disabled: false
}, { }, {
id: 33, id: 33,
name: this.$t('asset.state'), name: this.$t('overall.state'),
// name: this.$t('asset.asset'), // name: this.$t('asset.asset'),
type: 'select', type: 'select',
label: 'endpointState', label: 'endpointState',
@@ -499,7 +499,7 @@ export default {
this.getTableData() this.getTableData()
}, },
messageStyle (e) { messageStyle (e) {
if (e.column.label == 'Alerts' || e.column.label == this.$t('project.endpoint.alerts')) { if (e.column.label == 'Alerts' || e.column.label == this.$t('overall.alert')) {
if (e.row.alertNum > 0) { if (e.row.alertNum > 0) {
return 'danger' return 'danger'
} else { } else {

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

@@ -65,7 +65,7 @@ export default {
searchLabelList: [ searchLabelList: [
{ {
id: 11, id: 11,
name: this.$t('config.operationlog.type'), name: this.$t('overall.type'),
type: 'input', type: 'input',
label: 'type', label: 'type',
disabled: false disabled: false
@@ -77,7 +77,7 @@ export default {
disabled: false disabled: false
}, { }, {
id: 13, id: 13,
name: this.$t('config.operationlog.operation'), name: this.$t('overall.option'),
type: 'selectString', type: 'selectString',
label: 'operation', label: 'operation',
readonly: true, readonly: true,

2
nezha-fronted/src/components/common/bottomBox/tabs/terminalLogMonitorTab.vue
View File

@@ -235,7 +235,7 @@ export default {
}).then(() => { }).then(() => {
this.$put('/terminal/kill', { uuid: this.obj.uuid }).then(res => { this.$put('/terminal/kill', { uuid: this.obj.uuid }).then(res => {
if (res.code === 200) { if (res.code === 200) {
this.$message.success(this.$t('config.terminallog.success')) this.$message.success(this.$t('overall.result.success'))
this.$emit('exit') this.$emit('exit')
} else { } else {
this.$message.error(this.$t('config.terminallog.killErrorTip')) this.$message.error(this.$t('config.terminallog.killErrorTip'))

6
nezha-fronted/src/components/common/bottomBox/tabs/terminalLogTab.vue
View File

@@ -102,14 +102,14 @@ export default {
disabled: false disabled: false
}, { }, {
id: 16, id: 16,
name: this.$t('config.terminallog.protocol'), name: this.$t('webshell.protocol'),
type: 'selectString', type: 'selectString',
label: 'protocol', label: 'protocol',
readonly: true, readonly: true,
disabled: false disabled: false
}, { }, {
id: 17, id: 17,
name: this.$t('config.terminallog.status'), name: this.$t('overall.state'),
type: 'terminalStatus', type: 'terminalStatus',
label: 'state', label: 'state',
readonly: true, readonly: true,
@@ -164,7 +164,7 @@ export default {
}).then(() => { }).then(() => {
this.$put('/terminal/kill', { uuid: record.uuid }).then(res => { this.$put('/terminal/kill', { uuid: record.uuid }).then(res => {
if (res.code === 200) { if (res.code === 200) {
this.$message.success(this.$t('config.terminallog.success')) this.$message.success(this.$t('overall.result.success'))
this.bottomBox.showSubList = false this.bottomBox.showSubList = false
this.getTableData() this.getTableData()
} else { } else {

4
nezha-fronted/src/components/common/detailView/detailViewTopSearch.vue
View File

@@ -18,7 +18,7 @@
</span> </span>
</div> </div>
<div class="detail-top-search" style="text-align: center" v-else> <div class="detail-top-search" style="text-align: center" v-else>
{{$t('config.assetLabel.all')}} {{$t('overall.exportAll')}}
</div> </div>
<i class="nz-icon nz-icon-arrow-down search-value"/> <i class="nz-icon nz-icon-arrow-down search-value"/>
</div> </div>
@@ -50,7 +50,7 @@
</span> </span>
</div> </div>
<div class="detail-top-search" style="text-align: center" v-else> <div class="detail-top-search" style="text-align: center" v-else>
{{$t('config.assetLabel.all')}} {{$t('overall.exportAll')}}
</div> </div>
<i class="nz-icon nz-icon-arrow-down search-value"/> <i class="nz-icon nz-icon-arrow-down search-value"/>
</div> </div>

2
nezha-fronted/src/components/common/detailView/list/alertRule/alertRuleDetail.vue
View File

@@ -148,7 +148,7 @@ export default {
show: false, show: false,
minWidth: 100 minWidth: 100
}, { }, {
label: this.$t('config.dc.state'), label: this.$t('overall.state'),
prop: 'state', prop: 'state',
show: true, show: true,
minWidth: 100, minWidth: 100,

8
nezha-fronted/src/components/common/detailView/list/asset/assetDetail.vue
View File

@@ -77,12 +77,12 @@ export default {
minWidth: 140, minWidth: 140,
sortable: 'custom' sortable: 'custom'
}, { }, {
label: this.$t('overall.parent'), label: this.$t('asset.parent'),
prop: 'parent', prop: 'parent',
show: false, show: false,
minWidth: 110 minWidth: 110
}, { }, {
label: this.$t('overall.children'), label: this.$t('overall.assetSubTab'),
prop: 'children', prop: 'children',
show: false, show: false,
minWidth: 120 minWidth: 120
@@ -93,7 +93,7 @@ export default {
minWidth: 140, minWidth: 140,
sortable: 'custom' sortable: 'custom'
}, { }, {
label: this.$t('asset.state'), label: this.$t('overall.state'),
prop: 'state', prop: 'state',
show: true, show: true,
minWidth: 110, minWidth: 110,
@@ -116,7 +116,7 @@ export default {
minWidth: 110, minWidth: 110,
sortable: 'custom' sortable: 'custom'
}, { }, {
label: this.$t('asset.alertNum'), label: this.$t('overall.alert'),
prop: 'alertNum', prop: 'alertNum',
show: true, show: true,
width: 120, width: 120,

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

@@ -83,7 +83,7 @@ export default {
minWidth: 100, minWidth: 100,
sortable: 'custom' sortable: 'custom'
}, { }, {
label: this.$t('config.dc.assets'), label: this.$t('guide.asset'),
prop: 'assetNum', prop: 'assetNum',
show: true, show: true,
minWidth: 90, minWidth: 90,
@@ -94,12 +94,12 @@ export default {
width: 120, width: 120,
show: true show: true
}, { }, {
label: this.$t('asset.tel'), label: this.$t('config.dc.tel'),
prop: 'tel', prop: 'tel',
show: false, show: false,
minWidth: 100 minWidth: 100
}, { }, {
label: this.$t('asset.principal'), label: this.$t('config.dc.principal'),
prop: 'principal', prop: 'principal',
show: false, show: false,
minWidth: 120 minWidth: 120
@@ -114,7 +114,7 @@ export default {
show: false, show: false,
minWidth: 100 minWidth: 100
}, { }, {
label: this.$t('config.dc.state'), label: this.$t('overall.state'),
prop: 'state', prop: 'state',
show: true, show: true,
minWidth: 100, minWidth: 100,

10
nezha-fronted/src/components/common/detailView/list/endpoint/endpointDetail.vue
View File

@@ -67,7 +67,7 @@ export default {
width: 80, width: 80,
sortable: 'custom' sortable: 'custom'
}, { }, {
label: this.$t('project.endpoint.name'), label: this.$t('overall.name'),
prop: 'name', prop: 'name',
show: true, show: true,
minWidth: 200, minWidth: 200,
@@ -80,7 +80,7 @@ export default {
sortable: 'custom' sortable: 'custom'
}, },
{ {
label: this.$t('project.endpoint.asset'), label: this.$t('guide.asset'),
prop: 'asset', prop: 'asset',
show: true, show: true,
minWidth: 90, minWidth: 90,
@@ -92,20 +92,20 @@ export default {
show: true show: true
}, },
{ {
label: this.$t('project.endpoint.configs'), label: this.$t('project.module.configs'),
prop: 'configs', prop: 'configs',
minWidth: 150, minWidth: 150,
show: false show: false
}, },
{ {
label: this.$t('project.endpoint.alerts'), label: this.$t('overall.alert'),
prop: 'alerts', prop: 'alerts',
show: true, show: true,
minWidth: 180, minWidth: 180,
sortable: 'custom' sortable: 'custom'
}, },
{ {
label: this.$t('project.endpoint.state'), label: this.$t('overall.state'),
prop: 'state', prop: 'state',
show: true, show: true,
minWidth: 200 minWidth: 200

4
nezha-fronted/src/components/common/detailView/list/module/moduleDetail.vue
View File

@@ -67,7 +67,7 @@ export default {
width: 80, width: 80,
sortable: 'custom' sortable: 'custom'
}, { }, {
label: this.$t('project.module.moduleName'), label: this.$t('overall.name'),
prop: 'name', prop: 'name',
show: true, show: true,
minWidth: 200, minWidth: 200,
@@ -86,7 +86,7 @@ export default {
width: 200, width: 200,
sortable: 'custom' sortable: 'custom'
}, { }, {
label: this.$t('project.module.alerts'), label: this.$t('overall.alert'),
prop: 'alertNum', prop: 'alertNum',
show: true, show: true,
width: 120, width: 120,

12
nezha-fronted/src/components/common/detailView/list/terminalLogDetail/terminalLogDetail.vue
View File

@@ -92,7 +92,7 @@ export default {
return { return {
tableTitle: [ tableTitle: [
{ {
label: this.$t('config.terminallog.id'), label: this.$t('asset.id'),
prop: 'id', prop: 'id',
show: true, show: true,
width: 80, width: 80,
@@ -103,13 +103,13 @@ export default {
minWidth: 200, minWidth: 200,
show: true show: true
}, { }, {
label: this.$t('config.terminallog.username'), label: this.$t('config.operationlog.username'),
prop: 'username', prop: 'username',
minWidth: 200, minWidth: 200,
show: true show: true
}, },
{ {
label: this.$t('config.terminallog.source'), label: this.$t('config.terminallog.sourceIp'),
prop: 'sourceIp', prop: 'sourceIp',
minWidth: 115, minWidth: 115,
show: true, show: true,
@@ -121,12 +121,12 @@ export default {
show: true show: true
}, },
{ {
label: this.$t('config.terminallog.protocol'), label: this.$t('webshell.protocol'),
prop: 'protocol', prop: 'protocol',
show: true show: true
}, },
{ {
label: this.$t('config.terminallog.startTime'), label: this.$t('overall.startTime'),
prop: 'startTime', prop: 'startTime',
minWidth: 100, minWidth: 100,
show: true show: true
@@ -143,7 +143,7 @@ export default {
show: false show: false
}, },
{ {
label: this.$t('config.terminallog.status'), // killusername鼠标悬停形式 label: this.$t('overall.state'), // killusername鼠标悬停形式
prop: 'state', prop: 'state',
show: true, show: true,
width: 150, width: 150,

10
nezha-fronted/src/components/common/detailView/list/userDetail/userDetail.vue
View File

@@ -73,13 +73,13 @@ export default {
sortable: 'custom' sortable: 'custom'
}, },
// { // {
// label: this.$t('config.user.username'), // label: this.$t('login.username'),
// prop: 'username', // prop: 'username',
// show: true, // show: true,
// width: 150 // width: 150
// }, // },
{ {
label: this.$t('config.user.roles'), label: this.$t('profile.role'),
prop: 'roles', prop: 'roles',
show: true, show: true,
width: 150 width: 150
@@ -89,17 +89,17 @@ export default {
show: true, show: true,
minWidth: 150 minWidth: 150
}, { }, {
label: this.$t('config.user.lastLoginTime'), label: this.$t('profile.lastLoginTime'),
prop: 'lastLoginTime', prop: 'lastLoginTime',
show: true, show: true,
width: 200 width: 200
}, { }, {
label: this.$t('config.user.lastLoginIp'), label: this.$t('profile.lastLoginIp'),
prop: 'lastLoginIp', prop: 'lastLoginIp',
show: true, show: true,
width: 150 width: 150
}, { }, {
label: this.$t('config.user.source'), label: this.$t('profile.source'),
prop: 'source', prop: 'source',
show: true, show: true,
width: 150 width: 150

14
nezha-fronted/src/components/common/detailView/view/detailViewRight.vue
View File

@@ -216,22 +216,22 @@ export default {
] ]
}, },
model: [ model: [
{ prop: 'asset', name: this.$t('asset.assets'), active: true } { prop: 'asset', name: this.$t('guide.asset'), active: true }
], ],
dc: { dc: {
cabinet: [ cabinet: [
{ prop: 'cabinet', name: this.$t('config.dc.cabinets'), active: true }, { prop: 'cabinet', name: this.$t('asset.cabinet'), active: true },
{ prop: 'asset', name: this.$t('asset.assets'), active: false }, { prop: 'asset', name: this.$t('guide.asset'), active: false },
{ prop: 'alertMessageTab', name: this.$t('overall.alert'), active: false } { prop: 'alertMessageTab', name: this.$t('overall.alert'), active: false }
], ],
asset: [ asset: [
{ prop: 'cabinet', name: this.$t('config.dc.cabinets'), active: false }, { prop: 'cabinet', name: this.$t('asset.cabinet'), active: false },
{ prop: 'asset', name: this.$t('asset.assets'), active: true }, { prop: 'asset', name: this.$t('guide.asset'), active: true },
{ prop: 'alertMessageTab', name: this.$t('overall.alert'), active: false } { prop: 'alertMessageTab', name: this.$t('overall.alert'), active: false }
], ],
alertMessage: [ alertMessage: [
{ prop: 'cabinet', name: this.$t('config.dc.cabinets'), active: false }, { prop: 'cabinet', name: this.$t('asset.cabinet'), active: false },
{ prop: 'asset', name: this.$t('asset.assets'), active: false }, { prop: 'asset', name: this.$t('guide.asset'), active: false },
{ prop: 'alertMessageTab', name: this.$t('overall.alert'), active: true } { prop: 'alertMessageTab', name: this.$t('overall.alert'), active: true }
] ]
} }

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

@@ -28,7 +28,7 @@
</button> </button>
<div> <div>
<button :id="tableId+'-element-set-esc'" class="nz-btn nz-btn-size-small nz-btn-style-light" type="button" @click.stop="esc"> <button :id="tableId+'-element-set-esc'" class="nz-btn nz-btn-size-small nz-btn-style-light" type="button" @click.stop="esc">
<span class="top-tool-btn-txt">{{$t('overall.esc')}}</span> <span class="top-tool-btn-txt">{{$t('overall.cancel')}}</span>
</button> </button>
<button :id="tableId+'-element-set-save'" class="nz-btn nz-btn-size-small nz-btn-style-normal" type="button" @click.stop="save"> <button :id="tableId+'-element-set-save'" class="nz-btn nz-btn-size-small nz-btn-style-normal" type="button" @click.stop="save">
<span class="top-tool-btn-txt">{{$t('overall.save')}}</span> <span class="top-tool-btn-txt">{{$t('overall.save')}}</span>

24
nezha-fronted/src/components/common/globalSearch/searchItemInfo.vue
View File

@@ -29,7 +29,7 @@
</div> </div>
<div class="search-item-value-box" v-if="obj.type === 'endpoint'&&item.key==='state'&&alertLabelData && alertLabelData.configs"> <div class="search-item-value-box" v-if="obj.type === 'endpoint'&&item.key==='state'&&alertLabelData && alertLabelData.configs">
<span style="width: auto"> <span style="width: auto">
<span class="endpoint-cell-left"><i class="nz-icon nz-icon-Metrics active" /> {{$t('project.endpoint.metrics')}} </span> <span class="endpoint-cell-left"><i class="nz-icon nz-icon-Metrics active" /> {{$t('project.metrics.metrics')}} </span>
<span v-if="alertLabelData && alertLabelData.configs[0].state === 0"> <span v-if="alertLabelData && alertLabelData.configs[0].state === 0">
<span class="active-icon red-bg inline-block"></span> <span class="active-icon red-bg inline-block"></span>
</span> </span>
@@ -41,7 +41,7 @@
</span> </span>
</span> </span>
<span style="width: auto"> <span style="width: auto">
<span class="endpoint-cell-left" style="margin-left: 10px"><i class="nz-icon nz-icon-logs active" /> {{$t('project.endpoint.logs')}} </span> <span class="endpoint-cell-left" style="margin-left: 10px"><i class="nz-icon nz-icon-logs active" /> {{$t('overall.logs')}} </span>
<span v-if="alertLabelData && alertLabelData.configs[1].state === 0"> <span v-if="alertLabelData && alertLabelData.configs[1].state === 0">
<span class="active-icon red-bg inline-block"></span> <span class="active-icon red-bg inline-block"></span>
</span> </span>
@@ -136,7 +136,7 @@ export default {
label: this.$t('overall.name') label: this.$t('overall.name')
}, { }, {
key: 'manageIp', key: 'manageIp',
label: this.$t('overall.manageIp') label: this.$t('asset.manageIp')
}, { }, {
key: 'type.name', key: 'type.name',
label: this.$t('overall.type') label: this.$t('overall.type')
@@ -152,13 +152,13 @@ export default {
label: this.$t('overall.dc') label: this.$t('overall.dc')
}, { }, {
key: 'cabinet.name', key: 'cabinet.name',
label: this.$t('overall.cabinet') label: this.$t('asset.cabinet')
}, { }, {
key: 'brand.name', key: 'brand.name',
label: this.$t('overall.brand') label: this.$t('asset.brand')
}, { }, {
key: 'model.name', key: 'model.name',
label: this.$t('overall.model') label: this.$t('asset.model')
}, { }, {
key: 'alertNum', key: 'alertNum',
icon: 'nz-icon-overview-alert', icon: 'nz-icon-overview-alert',
@@ -174,11 +174,11 @@ export default {
label: this.$t('overall.name') label: this.$t('overall.name')
}, { }, {
key: 'location', key: 'location',
label: this.$t('overall.location') label: this.$t('asset.location')
}, { }, {
key: 'cabinetNum', key: 'cabinetNum',
icon: 'nz-icon-cabinet monitorColor', icon: 'nz-icon-cabinet monitorColor',
label: this.$t('overall.cabinet') label: this.$t('asset.cabinet')
}, { }, {
key: 'assetNum', key: 'assetNum',
icon: 'nz-icon-overview-project monitorColor', icon: 'nz-icon-overview-project monitorColor',
@@ -279,10 +279,10 @@ export default {
label: 'Id' label: 'Id'
}, { }, {
key: 'name', key: 'name',
label: this.$t('alert.name') label: this.$t('overall.name')
}, { }, {
key: 'type', key: 'type',
label: this.$t('alert.type') label: this.$t('overall.type')
}, { }, {
key: 'severityId', key: 'severityId',
label: this.$t('alert.severity'), label: this.$t('alert.severity'),
@@ -505,10 +505,10 @@ export default {
switch (item.type) { switch (item.type) {
case 'asset' : str += `<span>${this.$t('overall.asset')}</span> <span>/</span> <span>${this.$t('overall.asset')}</span>`; break case 'asset' : str += `<span>${this.$t('overall.asset')}</span> <span>/</span> <span>${this.$t('overall.asset')}</span>`; break
case 'datacenter' : str += `<span>${this.$t('config.config')}</span> <span>/</span> <span>${this.$t('overall.dc')}</span>`; break case 'datacenter' : str += `<span>${this.$t('config.config')}</span> <span>/</span> <span>${this.$t('overall.dc')}</span>`; break
case 'project' : str += `<span>${this.$t('config.system.monitor.monitor')}</span> <span>/</span> <span>${this.$t('dashboard.overview.project.project')}</span>`; break case 'project' : str += `<span>${this.$t('config.system.monitor.monitor')}</span> <span>/</span> <span>${this.$t('project.project.projectName')}</span>`; break
case 'module' :str += `<span>${this.$t('config.system.monitor.monitor')}</span> <span>/</span> <span>${this.$t('overall.module')}</span>`; break case 'module' :str += `<span>${this.$t('config.system.monitor.monitor')}</span> <span>/</span> <span>${this.$t('overall.module')}</span>`; break
case 'endpoint' : str += `<span>${this.$t('config.system.monitor.monitor')}</span> <span>/</span> <span>${this.$t('asset.endpoint')}</span>`; break case 'endpoint' : str += `<span>${this.$t('config.system.monitor.monitor')}</span> <span>/</span> <span>${this.$t('asset.endpoint')}</span>`; break
case 'alertrule' : str += `<span>${this.$t('overall.alert')}</span> <span>/</span> <span>${this.$t('dashboard.overview.alert.alertRule')}</span>`; break case 'alertrule' : str += `<span>${this.$t('overall.alert')}</span> <span>/</span> <span>${this.$t('alert.config.alertConfig')}</span>`; break
} }
return str return str
}, },

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

@@ -157,7 +157,7 @@ export const asset = {
editTypeOptions: [ editTypeOptions: [
{ value: 1, label: i18n.t('overall.account') }, { value: 1, label: i18n.t('overall.account') },
{ value: 2, label: i18n.t('overall.labels') }, { value: 2, label: i18n.t('overall.labels') },
{ value: 3, label: i18n.t('asset.state') }, { value: 3, label: i18n.t('overall.state') },
{ value: 4, label: i18n.t('asset.snmpCredential') } { value: 4, label: i18n.t('asset.snmpCredential') }
], ],
editTypeData: { editTypeData: {
@@ -198,8 +198,8 @@ export const alertMessage = {
{ value: 'P3', label: i18n.t('alert.config.P3') } { value: 'P3', label: i18n.t('alert.config.P3') }
], ],
typeData: [ typeData: [
{ value: 1, label: i18n.t('alert.config.typeOption.project') }, { value: 1, label: i18n.t('project.project.projectName') },
{ value: 2, label: i18n.t('alert.config.typeOption.module') }, { value: 2, label: i18n.t('overall.module') },
{ value: 3, label: i18n.t('alert.config.typeOption.asset') } { value: 3, label: i18n.t('alert.config.typeOption.asset') }
], ],
levels: [ levels: [
@@ -216,13 +216,13 @@ export const alertMessage = {
} }
export const statisticsList = [ export const statisticsList = [
{ value: 'min', label: i18n.t('dashboard.panel.chartForm.statisticsVal.min') }, { value: 'min', label: i18n.t('dashboard.panel.chartForm.min') },
{ value: 'max', label: i18n.t('dashboard.panel.chartForm.statisticsVal.max') }, { value: 'max', label: i18n.t('dashboard.panel.chartForm.max') },
{ value: 'avg', label: i18n.t('dashboard.panel.chartForm.statisticsVal.average') }, { value: 'avg', label: i18n.t('dashboard.panel.chartForm.statisticsVal.average') },
{ value: 'total', label: i18n.t('dashboard.panel.chartForm.statisticsVal.total') }, { value: 'total', label: i18n.t('dashboard.panel.chartForm.statisticsVal.total') },
{ value: 'first', label: i18n.t('dashboard.panel.chartForm.statisticsVal.first') }, { value: 'first', label: i18n.t('dashboard.panel.chartForm.statisticsVal.first') },
{ value: 'last', label: i18n.t('dashboard.panel.chartForm.statisticsVal.last') }, { value: 'last', label: i18n.t('dashboard.panel.chartForm.statisticsVal.last') },
{ value: 'range', label: i18n.t('dashboard.panel.chartForm.statisticsVal.range') }, { value: 'range', label: i18n.t('dashboard.panel.chartForm.valMapping.range') },
{ value: 'different', label: i18n.t('dashboard.panel.chartForm.statisticsVal.different') } { value: 'different', label: i18n.t('dashboard.panel.chartForm.statisticsVal.different') }
] ]
@@ -277,15 +277,15 @@ export const chart = {
}, },
{ {
value: 'url', value: 'url',
label: i18n.t('dashboard.panel.chartForm.typeVal.url.label') label: i18n.t('dashboard.panel.chartForm.url')
}, },
{ {
value: 'group', value: 'group',
label: i18n.t('dashboard.panel.chartForm.typeVal.group.label') label: i18n.t('dashboard.panel.chartForm.group')
}, },
{ {
value: 'logs', value: 'logs',
label: i18n.t('dashboard.panel.chartForm.typeVal.logs.label') label: i18n.t('overall.logs')
}, },
{ {
value: 'diagram', value: 'diagram',
@@ -306,7 +306,7 @@ export const intervalList = [
export const setting = { export const setting = {
DcState: [ DcState: [
{ value: 'ON', label: i18n.t('config.dc.usable') }, { value: 'ON', label: i18n.t('config.dc.usable') },
{ value: 'OFF', label: i18n.t('config.dc.suspended') } { value: 'OFF', label: i18n.t('asset.suspended') }
] ]
} }
export const snmpProtocolTypes = [ export const snmpProtocolTypes = [

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

@@ -14,7 +14,7 @@
<i class="nz-icon nz-icon-password"></i> <i class="nz-icon nz-icon-password"></i>
<input v-model="loginData.pin" autocomplete="on" name="password" placeholder="Password" type="password" @keydown.enter="login"></input> <input v-model="loginData.pin" autocomplete="on" name="password" placeholder="Password" type="password" @keydown.enter="login"></input>
</div> </div>
<div class="login-label" v-if="verifyShow">{{$t('login.verifyTitle')}}</div> <div class="login-label" v-if="verifyShow">{{$t('profile.twoFactorAuthentication')}}</div>
<div class="login-input" v-if="verifyShow"> <div class="login-input" v-if="verifyShow">
<i class="nz-icon nz-icon-yanzhengma"></i> <i class="nz-icon nz-icon-yanzhengma"></i>
<input v-model="loginData.authCode" name="newPassword" autocomplete="off" :placeholder="$t('login.verifyPlaceholder')" @keydown.enter="verify"></input> <input v-model="loginData.authCode" name="newPassword" autocomplete="off" :placeholder="$t('login.verifyPlaceholder')" @keydown.enter="verify"></input>

4
nezha-fronted/src/components/common/mixin/system/systemMixin.js
View File

@@ -178,11 +178,11 @@ export default {
}, },
resetOptions: [ resetOptions: [
{ {
label: this.$t('config.system.reset.metric'), label: this.$t('overall.metric'),
value: 'metric' value: 'metric'
}, },
{ {
label: this.$t('config.system.reset.alert'), label: this.$t('overall.alert'),
value: 'alert' value: 'alert'
}, },
{ {

2
nezha-fronted/src/components/common/project/L5/CanvasContextMenu.vue
View File

@@ -19,7 +19,7 @@
</div> </div>
<div> <div>
<a @click="canvascopy()" class="flex"> <a @click="canvascopy()" class="flex">
<span class="full">{{$t('project.topology.copy')}}</span> <span class="full">{{$t('overall.copy')}}</span>
<span class="ml50">Ctrl + C</span> <span class="ml50">Ctrl + C</span>
</a> </a>
</div> </div>

16
nezha-fronted/src/components/common/project/L5/CanvasProps.vue
View File

@@ -22,7 +22,7 @@
<!--value mapping--> <!--value mapping-->
<el-row class="form-row-title"> <el-row class="form-row-title">
{{ $t('dashboard.panel.chartForm.thresholds') }} {{ $t('alert.config.thresholds') }}
<span v-if="selection.pen.data.valueMappingSort !=='desc'" class="title__label" <span v-if="selection.pen.data.valueMappingSort !=='desc'" class="title__label"
>（0:Ok > … >{{ >（0:Ok > … >{{
selection.pen.data.valueMapping.length selection.pen.data.valueMapping.length
@@ -90,7 +90,7 @@
</span> </span>
</el-col> </el-col>
<el-col :span="4" class="thresholds-cell">{{ $t('project.topology.color') }}</el-col> <el-col :span="4" class="thresholds-cell">{{ $t('project.topology.color') }}</el-col>
<el-col :span="6" class="thresholds-cell">{{ $t('project.topology.value') }}</el-col> <el-col :span="6" class="thresholds-cell">{{ $t('overall.value') }}</el-col>
<el-col :span="8" class="thresholds-cell">{{ $t('project.topology.animation') }}</el-col> <el-col :span="8" class="thresholds-cell">{{ $t('project.topology.animation') }}</el-col>
<el-col :span="2" class="thresholds-cell"></el-col> <el-col :span="2" class="thresholds-cell"></el-col>
</el-row> </el-row>
@@ -206,7 +206,7 @@
> >
</el-cascader> </el-cascader>
</el-form-item> </el-form-item>
<el-form-item :label="$t('dashboard.panel.chartForm.type')" class="half-form-item half-form-item--end" <el-form-item :label="$t('overall.type')" class="half-form-item half-form-item--end"
prop="type"> prop="type">
<el-select v-model="selection.pen.data.type" :placeholder="$t('el.select.placeholder')" <el-select v-model="selection.pen.data.type" :placeholder="$t('el.select.placeholder')"
:popper-append-to-body="true" class="right-box-row-with-btn" :popper-append-to-body="true" class="right-box-row-with-btn"
@@ -322,7 +322,7 @@
</div> </div>
<div class="props-pen-item" v-if="selection.pen&&!selection.pen.type"> <div class="props-pen-item" v-if="selection.pen&&!selection.pen.type">
<div>{{ $t('project.topology.width') }}</div> <div>{{ $t('dashboard.panel.chartForm.width') }}</div>
<div class="p10 pl0"> <div class="p10 pl0">
<el-input-number <el-input-number
@focus="inputFocus" @focus="inputFocus"
@@ -343,7 +343,7 @@
</div> </div>
<div class="props-pen-item" v-if="selection.pen&&!selection.pen.type"> <div class="props-pen-item" v-if="selection.pen&&!selection.pen.type">
<div>{{ $t('project.topology.height') }}</div> <div>{{ $t('dashboard.panel.chartForm.high') }}</div>
<div class="p10 pl0"> <div class="p10 pl0">
<el-input-number <el-input-number
@focus="inputFocus" @focus="inputFocus"
@@ -836,7 +836,7 @@
<!-- <div class="project-content-box" style="width: 100%">--> <!-- <div class="project-content-box" style="width: 100%">-->
<!-- <div class="project-content-item">--> <!-- <div class="project-content-item">-->
<!-- <label>{{$t('project.topology.name')}}</label>--> <!-- <label>{{$t('overall.name')}}</label>-->
<!-- <div class="full pr10">--> <!-- <div class="full pr10">-->
<!-- <el-input class="input" size="small" v-model="topologyData.data.name" :placeholder="$t('el.select.placeholder')"--> <!-- <el-input class="input" size="small" v-model="topologyData.data.name" :placeholder="$t('el.select.placeholder')"-->
<!-- @change="changeTopologyOpt"></el-input>--> <!-- @change="changeTopologyOpt"></el-input>-->
@@ -905,7 +905,7 @@
<!-- <div class="project-content-title">--> <!-- <div class="project-content-title">-->
<!-- Appearance--> <!-- Appearance-->
<!-- &lt;!&ndash;{{$t('project.topology.name')}}&ndash;&gt;--> <!-- &lt;!&ndash;{{$t('overall.name')}}&ndash;&gt;-->
<!-- </div>--> <!-- </div>-->
<div class="project-content-box" style="width: 100%"> <div class="project-content-box" style="width: 100%">
@@ -1073,7 +1073,7 @@
<!-- </div>--> <!-- </div>-->
<!-- <div class="project-content-title">{{$t('project.topology.link')}}</div>--> <!-- <div class="project-content-title">{{$t('overall.link')}}</div>-->
<!-- <div class="project-content-box" style="width: 100%">--> <!-- <div class="project-content-box" style="width: 100%">-->

8
nezha-fronted/src/components/common/project/popData/Main.vue
View File

@@ -116,18 +116,18 @@ export default {
endpointOption.series[0].label.formatter = this.moduleInfo.endpointStat.down + this.moduleInfo.endpointStat.up + '' endpointOption.series[0].label.formatter = this.moduleInfo.endpointStat.down + this.moduleInfo.endpointStat.up + ''
endpointOption.series[0].data = [ endpointOption.series[0].data = [
{ name: this.$t('dashboard.overview.asset.pingUp'), value: this.moduleInfo.endpointStat.up ? this.moduleInfo.endpointStat.up : 0 }, { name: this.$t('dashboard.overview.asset.pingUp'), value: this.moduleInfo.endpointStat.up ? this.moduleInfo.endpointStat.up : 0 },
{ name: this.$t('dashboard.overview.asset.pingDown'), value: this.moduleInfo.endpointStat.down ? this.moduleInfo.endpointStat.down : 0 }, { name: this.$t('asset.down'), value: this.moduleInfo.endpointStat.down ? this.moduleInfo.endpointStat.down : 0 },
{ name: this.$t('asset.suspended'), value: this.moduleInfo.endpointStat.suspended ? this.moduleInfo.endpointStat.suspended : 0 } { name: this.$t('asset.suspended'), value: this.moduleInfo.endpointStat.suspended ? this.moduleInfo.endpointStat.suspended : 0 }
] ]
endpointOption.title.show = false endpointOption.title.show = false
endpointOption.legend.data = [this.$t('dashboard.overview.asset.pingUp'), this.$t('dashboard.overview.asset.pingDown'), this.$t('asset.suspended')] endpointOption.legend.data = [this.$t('dashboard.overview.asset.pingUp'), this.$t('asset.down'), this.$t('asset.suspended')]
assetOption.series[0].label.formatter = this.moduleInfo.assetStat.up + this.moduleInfo.assetStat.down + '' assetOption.series[0].label.formatter = this.moduleInfo.assetStat.up + this.moduleInfo.assetStat.down + ''
assetOption.series[0].data = [ assetOption.series[0].data = [
{ name: this.$t('dashboard.overview.asset.pingUp'), value: this.moduleInfo.assetStat.up ? this.moduleInfo.assetStat.up : 0 }, { name: this.$t('dashboard.overview.asset.pingUp'), value: this.moduleInfo.assetStat.up ? this.moduleInfo.assetStat.up : 0 },
{ name: this.$t('dashboard.overview.asset.pingDown'), value: this.moduleInfo.assetStat.down ? this.moduleInfo.assetStat.down : 0 } { name: this.$t('asset.down'), value: this.moduleInfo.assetStat.down ? this.moduleInfo.assetStat.down : 0 }
] ]
assetOption.title.show = false assetOption.title.show = false
assetOption.legend.data = [this.$t('dashboard.overview.asset.pingUp'), this.$t('dashboard.overview.asset.pingDown')] assetOption.legend.data = [this.$t('dashboard.overview.asset.pingUp'), this.$t('asset.down')]
endpointChart.setOption(endpointOption, true) endpointChart.setOption(endpointOption, true)
assetChart.setOption(assetOption, true) assetChart.setOption(assetOption, true)
}) })

4
nezha-fronted/src/components/common/project/popData/alertTable.vue
View File

@@ -126,12 +126,12 @@ export default {
show: true, show: true,
minWidth: 100 minWidth: 100
}, { }, {
label: this.$t('alert.list.state'), label: this.$t('overall.state'),
prop: 'state', prop: 'state',
show: true, show: true,
width: 100 width: 100
}, { }, {
label: this.$t('alert.startAt'), label: this.$t('overall.startTime'),
prop: 'startAt', prop: 'startAt',
show: true, show: true,
width: 150 width: 150

2
nezha-fronted/src/components/common/project/popData/assetTable.vue
View File

@@ -111,7 +111,7 @@ export default {
show: true, show: true,
width: 110 width: 110
}, { }, {
label: this.$t('asset.alertNum'), label: this.$t('overall.alert'),
prop: 'alertNum', prop: 'alertNum',
show: true, show: true,
width: 120 width: 120

8
nezha-fronted/src/components/common/project/popData/endpointTable.vue
View File

@@ -1,7 +1,7 @@
<template> <template>
<div class="mc" @click.self="clickOutside"> <div class="mc" @click.self="clickOutside">
<div class="right-box right-box-project-endpoint"> <div class="right-box right-box-project-endpoint">
<div class="right-box-title">{{ moduleName }} / {{$t('project.endpoint.endpoints')}}</div> <div class="right-box-title">{{ moduleName }} / {{$t('overall.endpoint')}}</div>
<nz-data-list <nz-data-list
ref="dataList" ref="dataList"
:api="url" :api="url"
@@ -97,16 +97,16 @@ export default {
show: true, show: true,
width: 100 width: 100
}, { }, {
label: this.$t('project.endpoint.asset'), label: this.$t('guide.asset'),
prop: 'asset', prop: 'asset',
show: true, show: true,
width: 150 width: 150
}, { }, {
label: this.$t('project.endpoint.port'), label: this.$t('asset.port'),
prop: 'port', prop: 'port',
show: true show: true
}, { }, {
label: this.$t('alert.list.state'), label: this.$t('overall.state'),
prop: 'state', prop: 'state',
width: 200, width: 200,
show: true show: true

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

@@ -103,7 +103,7 @@
<button @click="previewTopology" v-if="!isPreview" class="nz-btn nz-btn-size-normal nz-btn-style-light" <button @click="previewTopology" v-if="!isPreview" class="nz-btn nz-btn-size-normal nz-btn-style-light"
style="margin-right: 20px" style="margin-right: 20px"
> >
{{$t('project.topology.preview')}} {{$t('overall.preview')}}
</button> </button>
<button v-if="isPreview" class="nz-btn nz-btn-size-normal nz-btn-style-light" @click="previewExit" <button v-if="isPreview" class="nz-btn nz-btn-size-normal nz-btn-style-light" @click="previewExit"
style="margin-right: 20px" style="margin-right: 20px"
@@ -114,7 +114,7 @@
:disabled="prevent_opt.save" :disabled="prevent_opt.save"
:class="{'nz-btn-disabled':prevent_opt.save}" :class="{'nz-btn-disabled':prevent_opt.save}"
style="margin-right: 20px"> style="margin-right: 20px">
{{$t('project.topology.save')}} {{$t('overall.save')}}
</button> </button>
<button class="nz-btn nz-btn-size-normal nz-btn-style-normal" style="margin-right: 20px" @click="cancelTopology"> <button class="nz-btn nz-btn-size-normal nz-btn-style-normal" style="margin-right: 20px" @click="cancelTopology">
{{$t('project.topology.exit')}} {{$t('project.topology.exit')}}
@@ -326,7 +326,7 @@
<button class="nz-btn nz-btn-size-normal nz-btn-style-normal" @click="imgUpload" :disabled="prevent_opt.save" <button class="nz-btn nz-btn-size-normal nz-btn-style-normal" @click="imgUpload" :disabled="prevent_opt.save"
:class="{'nz-btn-disabled':prevent_opt.save}" :class="{'nz-btn-disabled':prevent_opt.save}"
style="margin-right: 20px"> style="margin-right: 20px">
{{$t('project.topology.save')}} {{$t('overall.save')}}
</button> </button>
</span> </span>
</div> </div>

16
nezha-fronted/src/components/common/rightBox/addEndpointBox.vue
View File

@@ -244,7 +244,7 @@ export default {
tempEndpoint: {}, tempEndpoint: {},
tempEndpoint2: {}, tempEndpoint2: {},
assetLoading: true, assetLoading: true,
rightBox: { show: false, title: this.$t('project.endpoint.createEndpoint'), isEdit: false }, rightBox: { show: false, title: this.$t('overall.createEndpoin'), isEdit: false },
optionType: 'batch', optionType: 'batch',
blankEndpoint: { blankEndpoint: {
id: '', id: '',
@@ -292,17 +292,17 @@ export default {
endpointList: [], endpointList: [],
endpointTableTitle: [ endpointTableTitle: [
{ {
label: this.$t('project.endpoint.name'), label: this.$t('overall.name'),
prop: 'name', prop: 'name',
width: 150, width: 150,
show: true show: true
}, { }, {
label: this.$t('project.endpoint.asset'), label: this.$t('guide.asset'),
prop: 'asset', prop: 'asset',
width: 80, width: 80,
show: true show: true
}, { }, {
label: this.$t('project.endpoint.configs'), label: this.$t('project.module.configs'),
prop: 'configs', prop: 'configs',
width: 80, width: 80,
show: true show: true
@@ -313,7 +313,7 @@ export default {
assetListHalf: false, assetListHalf: false,
assetTableTitle: [ assetTableTitle: [
{ {
label: this.$t('asset.name'), label: this.$t('overall.name'),
prop: 'name', prop: 'name',
show: false, show: false,
allowed: true, allowed: true,
@@ -356,7 +356,7 @@ export default {
show: true, show: true,
minWidth: '100' minWidth: '100'
}, { }, {
label: this.$t('asset.state'), label: this.$t('overall.state'),
prop: 'state', prop: 'state',
show: true, show: true,
minWidth: '100' minWidth: '100'
@@ -381,7 +381,7 @@ export default {
}, },
{ {
id: 11, id: 11,
name: this.$t('asset.name'), name: this.$t('overall.name'),
type: 'input', type: 'input',
label: 'name', label: 'name',
disabled: false disabled: false
@@ -430,7 +430,7 @@ export default {
}, },
{ {
id: 11, id: 11,
name: this.$t('asset.state'), name: this.$t('overall.state'),
type: 'input', type: 'input',
label: 'state', label: 'state',
disabled: false disabled: false

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

@@ -10,7 +10,7 @@
<div class="container__form"> <div class="container__form">
<el-form ref="assetTypeForm" :model="editAssetType" :rules="rules" label-position="top" label-width="120px"> <el-form ref="assetTypeForm" :model="editAssetType" :rules="rules" label-position="top" label-width="120px">
<!--name--> <!--name-->
<el-form-item :label="$t('config.assetType.name')" prop="name"> <el-form-item :label="$t('overall.name')" prop="name">
<el-input maxlength="64" show-word-limit v-model="editAssetType.name" size="small" type="text"></el-input> <el-input maxlength="64" show-word-limit v-model="editAssetType.name" size="small" type="text"></el-input>
</el-form-item> </el-form-item>
<!--vm--> <!--vm-->

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

@@ -127,7 +127,7 @@
</el-form-item> </el-form-item>
<el-form-item <el-form-item
:label="$t('backup.Enable')" :label="$t('asset.talon.enable')"
prop="status" prop="status"
class="form-item__switch" class="form-item__switch"
> >

10
nezha-fronted/src/components/common/rightBox/administration/modelBox.vue
View File

@@ -1,7 +1,7 @@
<template> <template>
<div v-clickoutside="{obj: editModel, func: esc}" class="right-box right-box-model"> <div v-clickoutside="{obj: editModel, func: esc}" class="right-box right-box-model">
<div class="right-box__header"> <div class="right-box__header">
<div class="header__title">{{editModel.id ? $t('config.model.editModel') : $t('config.model.createModel')}}</div> <div class="header__title">{{editModel.id ? $t('config.model.editModel') : $t('overall.createModel')}}</div>
<div class="header__operation"> <div class="header__operation">
<span v-cancel="{obj: editModel, func: esc}"><i class="nz-icon nz-icon-close"></i></span> <span v-cancel="{obj: editModel, func: esc}"><i class="nz-icon nz-icon-close"></i></span>
</div> </div>
@@ -14,7 +14,7 @@
<el-input maxlength="64" show-word-limit v-model="editModel.name" size="small" type="text"></el-input> <el-input maxlength="64" show-word-limit v-model="editModel.name" size="small" type="text"></el-input>
</el-form-item> </el-form-item>
<!--brand--> <!--brand-->
<el-form-item :label='$t("config.model.brand")' prop="brandId"> <el-form-item :label='$t("asset.brand")' prop="brandId">
<el-select value-key="id" allow-create class="right-box__select" popper-class="right-box-select-top prevent-clickoutside" :filterable="true" v-model="editModel.brandId" placeholder="" size="small" id="module-box-input-project"> <el-select value-key="id" allow-create class="right-box__select" popper-class="right-box-select-top prevent-clickoutside" :filterable="true" v-model="editModel.brandId" placeholder="" size="small" id="module-box-input-project">
<el-option :id="'module-project-'+item.id" v-for="item in brandList" :key="item.id" :label="item.name" :value="item.id"></el-option> <el-option :id="'module-project-'+item.id" v-for="item in brandList" :key="item.id" :label="item.name" :value="item.id"></el-option>
</el-select> </el-select>
@@ -26,7 +26,7 @@
</el-select> </el-select>
</el-form-item> </el-form-item>
<!-- ChartTemplate --> <!-- ChartTemplate -->
<el-form-item :label="$t('config.model.ChartTemplate')" prop="ChartTemplate"> <el-form-item :label="$t('project.module.ChartTemplate')" prop="ChartTemplate">
<v-selectpage <v-selectpage
:data="chartlList" :data="chartlList"
:tb-columns="ChartSearchShowFields" :tb-columns="ChartSearchShowFields"
@@ -102,8 +102,8 @@ export default {
chartlList: [], // chart 列表数据 chartlList: [], // chart 列表数据
ChartSearchShowFields: [ // ChartSearch 下拉搜索表头 ChartSearchShowFields: [ // ChartSearch 下拉搜索表头
{ title: 'ID', data: 'id' }, { title: 'ID', data: 'id' },
{ title: this.$t('config.model.titleName'), data: 'name', key: 'name' }, { title: this.$t('overall.name'), data: 'name', key: 'name' },
{ title: this.$t('config.model.titleType'), data: 'type', key: 'type' }, { title: this.$t('overall.type'), data: 'type', key: 'type' },
{ title: this.$t('overall.remark'), data: 'remark', key: 'remark' } { title: this.$t('overall.remark'), data: 'remark', key: 'remark' }
], ],
url: 'asset/model', url: 'asset/model',

6
nezha-fronted/src/components/common/rightBox/administration/roleBox.vue
View File

@@ -1,7 +1,7 @@
<template> <template>
<div v-clickoutside="{obj: editRole, func: esc}" class="right-box right-box-role"> <div v-clickoutside="{obj: editRole, func: esc}" class="right-box right-box-role">
<div class="right-box__header"> <div class="right-box__header">
<div class="header__title">{{editRole.id ? $t('config.roles.editRole') : $t('config.roles.createRole')}}</div> <div class="header__title">{{editRole.id ? $t('config.roles.editRole') : $t('overall.createRole')}}</div>
<div class="header__operation"> <div class="header__operation">
<span v-cancel="{obj: editRole, func: esc}"><i class="nz-icon nz-icon-close"></i></span> <span v-cancel="{obj: editRole, func: esc}"><i class="nz-icon nz-icon-close"></i></span>
</div> </div>
@@ -10,7 +10,7 @@
<div class="container__form"> <div class="container__form">
<el-form :disabled="detail" :model="editRole" :rules="rules" label-position="top" label-width="120px" ref="roleForm"> <el-form :disabled="detail" :model="editRole" :rules="rules" label-position="top" label-width="120px" ref="roleForm">
<!--name--> <!--name-->
<el-form-item :label="$t('config.roles.name')" prop="name"> <el-form-item :label="$t('overall.name')" prop="name">
<el-input maxlength="64" placeholder="" id="role-box-input-name" <el-input maxlength="64" placeholder="" id="role-box-input-name"
show-word-limit size="small" type="text" v-model="editRole.name"></el-input> show-word-limit size="small" type="text" v-model="editRole.name"></el-input>
</el-form-item> </el-form-item>
@@ -18,7 +18,7 @@
<el-input maxlength="256" show-word-limit :rows="2" size='small' type="textarea" v-model="editRole.remark" id="role-box-input-remark"/> <el-input maxlength="256" show-word-limit :rows="2" size='small' type="textarea" v-model="editRole.remark" id="role-box-input-remark"/>
</el-form-item> </el-form-item>
<el-form-item :label="$t('config.roles.permission')"> <el-form-item :label="$t('config.menus.perms')">
<!--<div class="tree-option"> <!--<div class="tree-option">
<button type="button" class="nz-btn nz-btn-size-small-new nz-btn-style-light option-btn" style="margin-left: 0px;" @click="expandAllOrNone" :class="{'btn-active':expandAllFlag}">展开/收缩</button> <button type="button" class="nz-btn nz-btn-size-small-new nz-btn-style-light option-btn" style="margin-left: 0px;" @click="expandAllOrNone" :class="{'btn-active':expandAllFlag}">展开/收缩</button>
<button type="button" class="nz-btn nz-btn-size-small-new nz-btn-style-light option-btn" @click="selectAllOrNone" :class="{'btn-active':selectAllFlag}"><span ><i class="nz-icon nz-icon-delete"></i></span></button> <button type="button" class="nz-btn nz-btn-size-small-new nz-btn-style-light option-btn" @click="selectAllOrNone" :class="{'btn-active':selectAllFlag}"><span ><i class="nz-icon nz-icon-delete"></i></span></button>

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

@@ -1,7 +1,7 @@
<template> <template>
<div v-clickoutside="{obj: editUser, func: esc}" class="right-box right-box-user"> <div v-clickoutside="{obj: editUser, func: esc}" class="right-box right-box-user">
<div class="right-box__header"> <div class="right-box__header">
<div class="header__title">{{editUser.id ? $t('config.user.editUser') : $t('config.user.createUser')}}</div> <div class="header__title">{{editUser.id ? $t('config.user.editUser') : $t('overall.createUser')}}</div>
<div class="header__operation"> <div class="header__operation">
<span v-cancel="{obj: editUser, func: esc}"><i class="nz-icon nz-icon-close"></i></span> <span v-cancel="{obj: editUser, func: esc}"><i class="nz-icon nz-icon-close"></i></span>
</div> </div>
@@ -15,22 +15,22 @@
maxlength="64" placeholder="" show-word-limit size="small" type="text"></el-input> maxlength="64" placeholder="" show-word-limit size="small" type="text"></el-input>
</el-form-item> </el-form-item>
<!--username--> <!--username-->
<el-form-item :label="$t('config.user.username')" prop="username"> <el-form-item :label="$t('login.username')" prop="username">
<el-input id="account-input-username" v-model="editUser.username" :disabled="editUser.username==='admin' && editUser.id==1" <el-input id="account-input-username" v-model="editUser.username" :disabled="editUser.username==='admin' && editUser.id==1"
maxlength="64" placeholder="" show-word-limit size="small" type="text"></el-input> maxlength="64" placeholder="" show-word-limit size="small" type="text"></el-input>
</el-form-item> </el-form-item>
<!--password--> <!--password-->
<el-form-item :label="$t('config.user.pin')" prop="pin"> <el-form-item :label="$t('login.pin')" prop="pin">
<el-input id="account-input-password" v-model="editUser.pin" maxlength="64" placeholder="" <el-input id="account-input-password" v-model="editUser.pin" maxlength="64" placeholder=""
show-word-limit size="small" type="password" @blur="pinBlur" autocomplete="new-password"></el-input> show-word-limit size="small" type="password" @blur="pinBlur" autocomplete="new-password"></el-input>
</el-form-item> </el-form-item>
<!--pinChange--> <!--pinChange-->
<el-form-item :label="$t('config.user.confirmPin')" label-width="200px" prop="pinChange"> <el-form-item :label="$t('profile.confirmPassword')" label-width="200px" prop="pinChange">
<el-input id="account-input-pinChange" v-model="editUser.pinChange" maxlength="64" placeholder="" <el-input id="account-input-pinChange" v-model="editUser.pinChange" maxlength="64" placeholder=""
show-word-limit size="small" type="password"></el-input> show-word-limit size="small" type="password"></el-input>
</el-form-item> </el-form-item>
<!--mfaLevel--> <!--mfaLevel-->
<el-form-item :label="$t('config.user.mfaTitle')" label-width="200px" prop="mfaTitle"> <el-form-item :label="$t('profile.twoFactorAuthentication')" label-width="200px" prop="mfaTitle">
<el-select id="account-input-mfaLevel" <el-select id="account-input-mfaLevel"
v-model="editUser.mfaLevel" v-model="editUser.mfaLevel"
class="right-box__select" class="right-box__select"
@@ -68,7 +68,7 @@
</el-select> </el-select>
</el-form-item> </el-form-item>
<!--roles--> <!--roles-->
<el-form-item :label="$t('config.user.roles')" prop="roleIds"> <el-form-item :label="$t('profile.role')" prop="roleIds">
<el-select id="account-input-roleIds" <el-select id="account-input-roleIds"
v-model="editUser.roleIds" v-model="editUser.roleIds"
:disabled="(editUser.username==='admin') && editUser.id==1" :disabled="(editUser.username==='admin') && editUser.id==1"
@@ -86,7 +86,7 @@
</el-select> </el-select>
</el-form-item> </el-form-item>
<!--enable--> <!--enable-->
<el-form-item :label="$t('config.user.state')"> <el-form-item :label="$t('overall.state')">
<el-switch id="account-input-status" v-model="editUser.status" :disabled="isCurrentUser(editUser.username) || (editUser.username==='admin' && editUser.id==1) " active-value="1" <el-switch id="account-input-status" v-model="editUser.status" :disabled="isCurrentUser(editUser.username) || (editUser.username==='admin' && editUser.id==1) " active-value="1"
inactive-value="0"> inactive-value="0">
</el-switch> </el-switch>
@@ -137,7 +137,7 @@ export default {
if (value === '' && this.editUser.pin) { if (value === '' && this.editUser.pin) {
callback(new Error(this.$t('config.user.inputConfirmPin'))) callback(new Error(this.$t('config.user.inputConfirmPin')))
} else if (value !== this.editUser.pin) { } else if (value !== this.editUser.pin) {
callback(new Error(this.$t('config.user.confirmPinErr'))) callback(new Error(this.$t('profile.confirmPasswordErr')))
} else { } else {
callback() callback()
} }
@@ -183,8 +183,8 @@ export default {
}, },
roles: [], roles: [],
mfaLevelList: [ mfaLevelList: [
{ value: 0, label: this.$t('config.user.disable') }, { value: 0, label: this.$t('project.endpoint.disable') },
{ value: 1, label: this.$t('config.user.enableMfa') }, { value: 1, label: this.$t('project.endpoint.enable') },
{ value: 2, label: this.$t('config.user.forceEnable') } { value: 2, label: this.$t('config.user.forceEnable') }
], ],
languageList: [ languageList: [

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

@@ -31,11 +31,11 @@
<el-input id="prom-box-input-host" maxlength="64" show-word-limit v-model="editPromServer.host" placeholder="" size="small" type="text"></el-input> <el-input id="prom-box-input-host" maxlength="64" show-word-limit v-model="editPromServer.host" placeholder="" size="small" type="text"></el-input>
</el-form-item> </el-form-item>
<!--Port--> <!--Port-->
<el-form-item :label="$t('config.agent.port')" prop="port"> <el-form-item :label="$t('asset.port')" prop="port">
<el-input id="prom-box-input-port" maxlength="10" show-word-limit v-model.number="editPromServer.port" placeholder="" size="small" type="text"></el-input> <el-input id="prom-box-input-port" maxlength="10" show-word-limit v-model.number="editPromServer.port" placeholder="" size="small" type="text"></el-input>
</el-form-item> </el-form-item>
<!--type--> <!--type-->
<el-form-item :label="$t('config.agent.type')" prop="type"> <el-form-item :label="$t('overall.type')" prop="type">
<!-- <el-cascader--> <!-- <el-cascader-->
<!-- id="prom-box-input-type"--> <!-- id="prom-box-input-type"-->
<!-- style="width: 100%"--> <!-- style="width: 100%"-->
@@ -62,7 +62,7 @@
<!-- <i slot="suffix" class="nz-icon nz-icon-refresh" @click="refreshToken"></i>--> <!-- <i slot="suffix" class="nz-icon nz-icon-refresh" @click="refreshToken"></i>-->
</el-input> </el-input>
</el-form-item> </el-form-item>
<el-form-item :label="$t('config.agent.protocol')" prop="protocol"> <el-form-item :label="$t('webshell.protocol')" prop="protocol">
<el-select v-model="editPromServer.protocol" placeholder="" class="right-box__select" popper-class="right-box-select-top prevent-clickoutside" size="small" value-key="value"> <el-select v-model="editPromServer.protocol" placeholder="" class="right-box__select" popper-class="right-box-select-top prevent-clickoutside" size="small" value-key="value">
<el-option v-for="item in agent2.protocol" :key="item.value" :label="item.label" :value="item.value"> <el-option v-for="item in agent2.protocol" :key="item.value" :label="item.label" :value="item.value">
<span class="panel-dropdown-label-txt" >{{item.label}}</span> <span class="panel-dropdown-label-txt" >{{item.label}}</span>

10
nezha-fronted/src/components/common/rightBox/alertRuleBox.vue
View File

@@ -2,7 +2,7 @@
<div v-clickoutside="{obj: editAlertRule, func: clickOutside}" class="right-box right-box-alert-rule"> <div v-clickoutside="{obj: editAlertRule, func: clickOutside}" class="right-box right-box-alert-rule">
<div class="right-box__header"> <div class="right-box__header">
<!-- begin--标题--> <!-- begin--标题-->
<div class="header__title">{{alertRule.id ? $t("alert.config.editAlertConfig") : $t("alert.config.createAlertConfig")}}</div> <div class="header__title">{{alertRule.id ? $t("alert.config.editAlertConfig") : $t("overall.createAlertRule")}}</div>
<!-- end--标题--> <!-- end--标题-->
<div class="header__operation"> <div class="header__operation">
<span v-cancel="{obj: editAlertRule, func: esc}"><i class="nz-icon nz-icon-close"></i></span> <span v-cancel="{obj: editAlertRule, func: esc}"><i class="nz-icon nz-icon-close"></i></span>
@@ -14,7 +14,7 @@
<div class="container__form"> <div class="container__form">
<el-form ref="alertRuleForm" :model="editAlertRule" :rules="rules" label-position = "top" label-width="120px"> <el-form ref="alertRuleForm" :model="editAlertRule" :rules="rules" label-position = "top" label-width="120px">
<!--name--> <!--name-->
<el-form-item :label='$t("alert.config.name")' prop="name"> <el-form-item :label='$t("overall.name")' prop="name">
<el-input id="alert-box-input-name" ref="alertName" v-model="editAlertRule.name" maxlength="64" placeholder="" show-word-limit size="small"></el-input> <el-input id="alert-box-input-name" ref="alertName" v-model="editAlertRule.name" maxlength="64" placeholder="" show-word-limit size="small"></el-input>
</el-form-item> </el-form-item>
<!--type--> <!--type-->
@@ -46,7 +46,7 @@
<i v-if="editAlertRule.severityId" :style="{color:severityData.length > 0 && severityData.find(severity => severity.id === editAlertRule.severityId).color,'font-size':'12px'}" class="nz-icon nz-icon-circle severity-circle"></i> <i v-if="editAlertRule.severityId" :style="{color:severityData.length > 0 && severityData.find(severity => severity.id === editAlertRule.severityId).color,'font-size':'12px'}" class="nz-icon nz-icon-circle severity-circle"></i>
</el-form-item> </el-form-item>
<!--expr--> <!--expr-->
<el-form-item v-if="showSnmpTrap" :label='$t("alert.config.exprBox")' prop="expr"> <el-form-item v-if="showSnmpTrap" :label='$t("config.exprTemp.expression")' prop="expr">
<template v-if="showMetrics"> <template v-if="showMetrics">
<el-row style="line-height: 32px;"> <el-row style="line-height: 32px;">
<promql-input <promql-input
@@ -157,7 +157,7 @@
</el-form-item> </el-form-item>
<div class="alert-rule-split-title">{{ $t('alert.config.effectiveConfig') }}</div> <div class="alert-rule-split-title">{{ $t('alert.config.effectiveConfig') }}</div>
<!--state--> <!--state-->
<el-form-item :label="$t('alert.config.state')" prop="state" class="half-form-item"> <el-form-item :label="$t('overall.state')" prop="state" class="half-form-item">
<el-select <el-select
id="alert-box-input-state" id="alert-box-input-state"
v-model="editAlertRule.state" v-model="editAlertRule.state"
@@ -290,7 +290,7 @@
</el-select> </el-select>
</el-form-item> </el-form-item>
<!--receiver--> <!--receiver-->
<el-form-item :label="$t('config.user.receiver')" prop="receiver" :rules="[{ required: editAlertRule.notifyExpired || editAlertRule.notifyActive, message: this.$t('validate.required'), trigger: 'blur' }]"> <el-form-item :label="$t('alert.receiver')" prop="receiver" :rules="[{ required: editAlertRule.notifyExpired || editAlertRule.notifyActive, message: this.$t('validate.required'), trigger: 'blur' }]">
<el-select <el-select
id="alert-box-input-receiver" id="alert-box-input-receiver"
v-model.trim="editAlertRule.receiverShow" v-model.trim="editAlertRule.receiverShow"

8
nezha-fronted/src/components/common/rightBox/alertSilenceBox.vue
View File

@@ -14,7 +14,7 @@
<div class="container__form"> <div class="container__form">
<el-form ref="alertSilenceForm" :model="editAlertSilence" <el-form ref="alertSilenceForm" :model="editAlertSilence"
:rules="rules" label-position="top" label-width="120px"> :rules="rules" label-position="top" label-width="120px">
<el-form-item :label='$t("alert.silence.name")' class="range-name" prop="name"> <el-form-item :label='$t("overall.name")' class="range-name" prop="name">
<el-input <el-input
v-model="editAlertSilence.name" :placeholder="''" v-model="editAlertSilence.name" :placeholder="''"
maxlength="64" maxlength="64"
@@ -22,7 +22,7 @@
size="small"> size="small">
</el-input> </el-input>
</el-form-item> </el-form-item>
<el-form-item :label='$t("alert.silence.time")' class="range-time" prop="time"> <el-form-item :label='$t("overall.time")' class="range-time" prop="time">
<div> <div>
<el-radio-group v-model="rangeTime" size="small" @change="rangeTimeChange"> <el-radio-group v-model="rangeTime" size="small" @change="rangeTimeChange">
<el-radio-button label="1">{{ $t("overall.oneHour") }}</el-radio-button> <el-radio-button label="1">{{ $t("overall.oneHour") }}</el-radio-button>
@@ -37,7 +37,7 @@
<div class="datepicker"> <div class="datepicker">
<div class="datepicker-box"> <div class="datepicker-box">
<span class="datepicker-title">{{ $t("overall.startTime") }}</span> <span class="datepicker-title">{{ $t("overall.startTime") }}</span>
<my-date-picker ref="calendar" v-model="editAlertSilence.startAt" :clearable="false" :placeholder="$t('dashboard.panel.startTime')" <my-date-picker ref="calendar" v-model="editAlertSilence.startAt" :clearable="false" :placeholder="$t('overall.startTime')"
align="right" class=" " align="right" class=" "
:format="timeFormatStrToDatePickFormat(timeFormatMain)" :format="timeFormatStrToDatePickFormat(timeFormatMain)"
popper-class="panel-time-picker-popper right-box-select-top" popper-class="panel-time-picker-popper right-box-select-top"
@@ -50,7 +50,7 @@
</div> </div>
<div class="datepicker-box"> <div class="datepicker-box">
<span class="datepicker-title">{{ $t("overall.endTime") }}</span> <span class="datepicker-title">{{ $t("overall.endTime") }}</span>
<my-date-picker ref="calendar" v-model="editAlertSilence.endAt" :clearable="false" :placeholder="$t('dashboard.panel.startTime')" <my-date-picker ref="calendar" v-model="editAlertSilence.endAt" :clearable="false" :placeholder="$t('overall.startTime')"
align="right" class=" " align="right" class=" "
:format="timeFormatStrToDatePickFormat(timeFormatMain)" :format="timeFormatStrToDatePickFormat(timeFormatMain)"
popper-class="panel-time-picker-popper right-box-select-top" popper-class="panel-time-picker-popper right-box-select-top"

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

@@ -9,7 +9,7 @@
<div class="right-box__container"> <div class="right-box__container">
<div class="container__form"> <div class="container__form">
<el-form ref="apiKeyBoxForm" :model="apiKeyBox" :rules="rules" label-position="top" label-width="120px"> <el-form ref="apiKeyBoxForm" :model="apiKeyBox" :rules="rules" label-position="top" label-width="120px">
<el-form-item :label="$t('profile.name')" prop="name"> <el-form-item :label="$t('overall.name')" prop="name">
<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

16
nezha-fronted/src/components/common/rightBox/asset/assetBatchEditBox.vue
View File

@@ -10,7 +10,7 @@
<div class="container__form"> <div class="container__form">
<!-- Edit type --> <!-- Edit type -->
<el-form ref="assetEditForm" :model="editData" :rules="rules" label-position="top" label-width="120px"> <el-form ref="assetEditForm" :model="editData" :rules="rules" label-position="top" label-width="120px">
<el-form-item :label="$t('overall.editType')" prop="editType"> <el-form-item :label="$t('overall.type')" prop="editType">
<el-select v-model="editData.editType" @change="assetBatch" class="right-box__select" popper-class="right-box-select-top prevent-clickoutside" size="small" value-key="value"> <el-select v-model="editData.editType" @change="assetBatch" class="right-box__select" popper-class="right-box-select-top prevent-clickoutside" size="small" value-key="value">
<el-option v-for="type in assetConstants.editTypeOptions" :key="type.value" :label="$t(type.label)" :value="type.value"/> <el-option v-for="type in assetConstants.editTypeOptions" :key="type.value" :label="$t(type.label)" :value="type.value"/>
</el-select> </el-select>
@@ -31,7 +31,7 @@
</el-select> </el-select>
</el-form-item> </el-form-item>
<!-- 第三级：Auth type = username | key --> <!-- 第三级：Auth type = username | key -->
<el-form-item :label="$t('asset.userName')" prop="authUsername"> <el-form-item :label="$t('profile.username')" prop="authUsername">
<el-input v-model="editData.authUsername" size="small"/> <el-input v-model="editData.authUsername" size="small"/>
</el-form-item> </el-form-item>
<template v-if="editData.authType === assetConstants.authTypeData.key"> <template v-if="editData.authType === assetConstants.authTypeData.key">
@@ -40,7 +40,7 @@
<el-input v-model="editData.authPriKey" size="small" type="password" autocomplete="new-password"/> <el-input v-model="editData.authPriKey" size="small" type="password" autocomplete="new-password"/>
</el-form-item> </el-form-item>
</template> </template>
<el-form-item :label="$t('asset.pin')" prop="authPin"> <el-form-item :label="$t('login.pin')" prop="authPin">
<el-input v-model="editData.authPin" size="small" type="password" autocomplete="new-password"/> <el-input v-model="editData.authPin" size="small" type="password" autocomplete="new-password"/>
</el-form-item> </el-form-item>
<el-form-item :label="$t('asset.port')" prop="authProtocolPort"> <el-form-item :label="$t('asset.port')" prop="authProtocolPort">
@@ -51,10 +51,10 @@
<!-- 第二级：Protocol type = TELNET --> <!-- 第二级：Protocol type = TELNET -->
<template v-if="editData.authProtocol === assetConstants.authProtocolData.telnet"> <template v-if="editData.authProtocol === assetConstants.authProtocolData.telnet">
<div class="form__sub-title">TELNET</div> <div class="form__sub-title">TELNET</div>
<el-form-item :label="$t('asset.userName')" prop="authUsername"> <el-form-item :label="$t('profile.username')" prop="authUsername">
<el-input v-model="editData.authUsername" size="small"/> <el-input v-model="editData.authUsername" size="small"/>
</el-form-item> </el-form-item>
<el-form-item :label="$t('asset.pin')" prop="authPin"> <el-form-item :label="$t('login.pin')" prop="authPin">
<el-input v-model="editData.authPin" size="small"/> <el-input v-model="editData.authPin" size="small"/>
</el-form-item> </el-form-item>
<el-form-item :label="$t('asset.usernamePrompt')" prop="authUserTip"> <el-form-item :label="$t('asset.usernamePrompt')" prop="authUserTip">
@@ -175,7 +175,7 @@
<!-- 第一级：Edit type = state --> <!-- 第一级：Edit type = state -->
<template v-if="editData.editType === assetConstants.editTypeData.state"> <template v-if="editData.editType === assetConstants.editTypeData.state">
<el-form-item :label="$t('asset.state')" prop="stateId"> <el-form-item :label="$t('overall.state')" prop="stateId">
<el-select v-model="editData.stateId" class="right-box__select" :placeholder="$t('overall.select')" popper-class="right-box-select-top prevent-clickoutside" size="small" value-key="id"> <el-select v-model="editData.stateId" class="right-box__select" :placeholder="$t('overall.select')" popper-class="right-box-select-top prevent-clickoutside" size="small" value-key="id">
<el-option v-for="state in stateData" :key="state.id" :label="state.name" :value="state.id"></el-option> <el-option v-for="state in stateData" :key="state.id" :label="state.name" :value="state.id"></el-option>
</el-select> </el-select>
@@ -302,7 +302,7 @@ export default {
id: 'sn', id: 'sn',
disabled: false disabled: false
}, { }, {
name: this.$t('dashboard.overview.dataCenter.dataCenter'), name: this.$t('overall.dc'),
type: 'dc', type: 'dc',
label: 'dcIds', label: 'dcIds',
readonly: true, readonly: true,
@@ -314,7 +314,7 @@ export default {
id: 'manageIp', id: 'manageIp',
disabled: false disabled: false
}, { }, {
name: this.$t('asset.state'), name: this.$t('overall.state'),
type: 'assetState', type: 'assetState',
label: 'assetState', label: 'assetState',
id: 'stateIds', id: 'stateIds',

16
nezha-fronted/src/components/common/rightBox/asset/assetBox.vue
View File

@@ -20,7 +20,7 @@
</template> </template>
</select-asset-type> </select-asset-type>
</el-form-item> </el-form-item>
<el-form-item v-if="editAsset.type && editAsset.type.vm === 1" :label="$t('overall.parent')" prop="pid"> <el-form-item v-if="editAsset.type && editAsset.type.vm === 1" :label="$t('asset.parent')" prop="pid">
<el-select <el-select
v-model="editAsset.pid" v-model="editAsset.pid"
class="right-box__select" class="right-box__select"
@@ -31,7 +31,7 @@
<el-option v-for="p in options.parentAssetOptions" :key="p.id" :label="p.name" :value="p.id"></el-option> <el-option v-for="p in options.parentAssetOptions" :key="p.id" :label="p.name" :value="p.id"></el-option>
</el-select> </el-select>
</el-form-item> </el-form-item>
<el-form-item :label="$t('asset.state')" prop="stateId"> <el-form-item :label="$t('overall.state')" prop="stateId">
<el-select v-model="editAsset.stateId" class="right-box__select" :placeholder="$t('el.select.placeholder')" popper-class="right-box-select-top prevent-clickoutside" size="small" value-key="id"> <el-select v-model="editAsset.stateId" class="right-box__select" :placeholder="$t('el.select.placeholder')" popper-class="right-box-select-top prevent-clickoutside" size="small" value-key="id">
<el-option v-for="state in options.stateOptions" :key="state.id" :label="state.name" :value="state.id"> <el-option v-for="state in options.stateOptions" :key="state.id" :label="state.name" :value="state.id">
<div style="display: flex;justify-content: space-between;padding: 5px;"> <div style="display: flex;justify-content: space-between;padding: 5px;">
@@ -198,7 +198,7 @@
<el-option v-for="type in assetConstants.authTypeOptions" :key="type.value" :label="type.label" :value="type.value"/> <el-option v-for="type in assetConstants.authTypeOptions" :key="type.value" :label="type.label" :value="type.value"/>
</el-select> </el-select>
</el-form-item> </el-form-item>
<el-form-item :label="$t('asset.userName')" prop="authUsername"> <el-form-item :label="$t('profile.username')" prop="authUsername">
<el-input maxlength="64" show-word-limit v-model="editAsset.authUsername" size="small"/> <el-input maxlength="64" show-word-limit v-model="editAsset.authUsername" size="small"/>
</el-form-item> </el-form-item>
<!-- Key支持私钥 --> <!-- Key支持私钥 -->
@@ -207,7 +207,7 @@
<el-input v-model="editAsset.authPriKey" size="small"/> <el-input v-model="editAsset.authPriKey" size="small"/>
</el-form-item> </el-form-item>
</template> </template>
<el-form-item :label="$t('asset.pin')" prop="authPin"> <el-form-item :label="$t('login.pin')" prop="authPin">
<el-input maxlength="256" show-word-limit v-model="editAsset.authPin" size="small" type="password"/> <el-input maxlength="256" show-word-limit v-model="editAsset.authPin" size="small" type="password"/>
</el-form-item> </el-form-item>
<el-form-item :label="$t('asset.port')" prop="authProtocolPort"> <el-form-item :label="$t('asset.port')" prop="authProtocolPort">
@@ -218,10 +218,10 @@
<!-- TELNET --> <!-- TELNET -->
<template v-if="editAsset.type && editAsset.type.authProtocol === assetConstants.authProtocolData.telnet"> <template v-if="editAsset.type && editAsset.type.authProtocol === assetConstants.authProtocolData.telnet">
<div class="form__sub-title">TELNET</div> <div class="form__sub-title">TELNET</div>
<el-form-item :label="$t('asset.userName')" prop="authUsername"> <el-form-item :label="$t('profile.username')" prop="authUsername">
<el-input maxlength="64" show-word-limit v-model="editAsset.authUsername" size="small"/> <el-input maxlength="64" show-word-limit v-model="editAsset.authUsername" size="small"/>
</el-form-item> </el-form-item>
<el-form-item :label="$t('asset.pin')" prop="authPin"> <el-form-item :label="$t('login.pin')" prop="authPin">
<el-input maxlength="256" show-word-limit v-model="editAsset.authPin" size="small" type="password"/> <el-input maxlength="256" show-word-limit v-model="editAsset.authPin" size="small" type="password"/>
</el-form-item> </el-form-item>
<el-form-item :label="$t('asset.usernamePrompt')" prop="authUserTip"> <el-form-item :label="$t('asset.usernamePrompt')" prop="authUserTip">
@@ -264,10 +264,10 @@
</div> </div>
</div> </div>
<transition name="el-zoom-in-top"> <transition name="el-zoom-in-top">
<!-- <el-form-item :label="$t('asset.userName')" prop="clientUser"> <!-- <el-form-item :label="$t('profile.username')" prop="clientUser">
<el-input maxlength="64" show-word-limit v-model="editAsset.clientUser" size="small"/> <el-input maxlength="64" show-word-limit v-model="editAsset.clientUser" size="small"/>
</el-form-item> </el-form-item>
<el-form-item :label="$t('asset.pin')" prop="clientPin"> <el-form-item :label="$t('login.pin')" prop="clientPin">
<el-input type="password" show-word-limit v-model="editAsset.clientPin" size="small"/> <el-input type="password" show-word-limit v-model="editAsset.clientPin" size="small"/>
</el-form-item> --> </el-form-item> -->
<div v-if="editAsset.clientEnable === 1" v-show="talonShowTow"> <div v-if="editAsset.clientEnable === 1" v-show="talonShowTow">

12
nezha-fronted/src/components/common/rightBox/assetMetaBox.vue
View File

@@ -13,18 +13,18 @@
<div class="right-box__container"> <div class="right-box__container">
<div class="container__form"> <div class="container__form">
<el-form label-width="120px" :model="editAssetMeta" label-position = "top" ref="editAssetMetaForm" :rules="rules"> <el-form label-width="120px" :model="editAssetMeta" label-position = "top" ref="editAssetMetaForm" :rules="rules">
<el-form-item :label='$t("config.assetLabel.name")' prop="name"> <el-form-item :label='$t("overall.name")' prop="name">
<el-input placeholder="" maxlength="64" show-word-limit v-model="editAssetMeta.name" size="small" id="editAssetMeta-box-input-name"></el-input> <el-input placeholder="" maxlength="64" show-word-limit v-model="editAssetMeta.name" size="small" id="editAssetMeta-box-input-name"></el-input>
</el-form-item> </el-form-item>
<el-form-item :label='$t("config.assetLabel.key")' prop="metaKey"> <el-form-item :label='$t("overall.key")' prop="metaKey">
<el-input placeholder="" maxlength="128" show-word-limit v-model="editAssetMeta.metaKey" size="small" id="editAssetMeta-box-input-key"></el-input> <el-input placeholder="" maxlength="128" show-word-limit v-model="editAssetMeta.metaKey" size="small" id="editAssetMeta-box-input-key"></el-input>
</el-form-item> </el-form-item>
<el-form-item :label='$t("config.assetLabel.group")' prop="groupId"> <el-form-item :label='$t("dashboard.panel.chartForm.group")' prop="groupId">
<el-select v-model="editAssetMeta.groupId" size="small" class="right-box__select" :placeholder="$t('el.select.placeholder')" popper-class="right-box-select-top prevent-clickoutside" :popper-append-to-body="false"> <el-select v-model="editAssetMeta.groupId" size="small" class="right-box__select" :placeholder="$t('el.select.placeholder')" popper-class="right-box-select-top prevent-clickoutside" :popper-append-to-body="false">
<el-option v-for="(item, index) in groupData" :key="index" :value="item.id" :label="item.name"></el-option> <el-option v-for="(item, index) in groupData" :key="index" :value="item.id" :label="item.name"></el-option>
</el-select> </el-select>
</el-form-item> </el-form-item>
<el-form-item :label='$t("config.assetLabel.search")' prop="search"> <el-form-item :label='$t("overall.search")' prop="search">
<el-switch <el-switch
@change="switchSearch" @change="switchSearch"
v-model="editAssetMeta.search" v-model="editAssetMeta.search"
@@ -39,7 +39,7 @@
inactive-value="0"> inactive-value="0">
</el-switch> </el-switch>
</el-form-item> </el-form-item>
<el-form-item :label='$t("config.assetLabel.type")' prop="type"> <el-form-item :label='$t("overall.type")' prop="type">
<el-select v-model="editAssetMeta.type" :popper-append-to-body="false" class="right-box__select" popper-class="right-box-select-top prevent-clickoutside" size="small" @change="selectType"> <el-select v-model="editAssetMeta.type" :popper-append-to-body="false" class="right-box__select" popper-class="right-box-select-top prevent-clickoutside" size="small" @change="selectType">
<el-option v-for="(item, index) in typeData" :key="index" :value="item.value" :disabled="item.disabled"> <el-option v-for="(item, index) in typeData" :key="index" :value="item.value" :disabled="item.disabled">
<div><i :class="item.icon"></i>&nbsp;&nbsp;<span>{{item.name}}</span></div> <div><i :class="item.icon"></i>&nbsp;&nbsp;<span>{{item.name}}</span></div>
@@ -92,7 +92,7 @@
<span class="datetime-header">{{$t('config.assetLabel.dateType')}}: </span> <span class="datetime-header">{{$t('config.assetLabel.dateType')}}: </span>
<el-radio-group v-model="editAssetMeta.param.subType"> <el-radio-group v-model="editAssetMeta.param.subType">
<el-radio :label="'date'">{{$t('config.assetLabel.date')}}</el-radio> <el-radio :label="'date'">{{$t('config.assetLabel.date')}}</el-radio>
<el-radio :label="'time'">{{$t('config.assetLabel.time')}}</el-radio> <el-radio :label="'time'">{{$t('overall.time')}}</el-radio>
<el-radio :label="'datetime'">{{$t('config.assetLabel.datetimes')}}</el-radio> <el-radio :label="'datetime'">{{$t('config.assetLabel.datetimes')}}</el-radio>
</el-radio-group> </el-radio-group>
</el-row> </el-row>

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

@@ -35,7 +35,7 @@
</el-switch> </el-switch>
</el-form-item> </el-form-item>
<!--alert--> <!--alert-->
<el-form-item :label="$t('config.assetState.alert')"> <el-form-item :label="$t('overall.alert')">
<el-switch :active-value="1" :inactive-value="0" id="asset-state-alert-status" <el-switch :active-value="1" :inactive-value="0" id="asset-state-alert-status"
v-model="editAssetState.alert"> v-model="editAssetState.alert">
</el-switch> </el-switch>

14
nezha-fronted/src/components/common/rightBox/batchAddEndpoint.vue
View File

@@ -185,7 +185,7 @@ export default {
ChartSearchShowFields: [ // ChartSearch 下拉搜索表头 ChartSearchShowFields: [ // ChartSearch 下拉搜索表头
{ title: 'ID', data: 'id' }, { title: 'ID', data: 'id' },
{ {
title: this.$t('config.model.titleName'), title: this.$t('overall.name'),
data: function (row) { data: function (row) {
if (row.name.length > 15) { if (row.name.length > 15) {
return row.name.substring(0, 12) + '...' return row.name.substring(0, 12) + '...'
@@ -220,7 +220,7 @@ export default {
columns: [ columns: [
{ title: 'id', data: 'id' }, { title: 'id', data: 'id' },
{ {
title: this.$t('config.model.titleName'), title: this.$t('overall.name'),
data: function (row) { data: function (row) {
if (row.name.length > 15) { if (row.name.length > 15) {
return row.name.substring(0, 12) + '...' return row.name.substring(0, 12) + '...'
@@ -239,7 +239,7 @@ export default {
orjinNME: 'type' orjinNME: 'type'
}, },
{ {
title: this.$t('overall.model'), title: this.$t('asset.model'),
data: (row) => { data: (row) => {
return row.model ? row.model.name : '' return row.model ? row.model.name : ''
}, },
@@ -268,11 +268,11 @@ export default {
tempEndpoint: {}, tempEndpoint: {},
tempEndpoint2: {}, tempEndpoint2: {},
assetLoading: true, assetLoading: true,
rightBox: { show: false, title: this.$t('project.endpoint.createEndpoint'), isEdit: false }, rightBox: { show: false, title: this.$t('overall.createEndpoin'), isEdit: false },
optionType: 'batchAdd', optionType: 'batchAdd',
endpointTableTitle: [ // 原始table列 endpointTableTitle: [ // 原始table列
{ {
label: this.$t('project.endpoint.name'), label: this.$t('overall.name'),
prop: 'name', prop: 'name',
show: true show: true
}, },
@@ -287,12 +287,12 @@ export default {
show: true show: true
}, },
{ {
label: this.$t('project.endpoint.asset'), label: this.$t('guide.asset'),
prop: 'asset', prop: 'asset',
show: true show: true
}, },
{ {
label: this.$t('project.endpoint.configs'), label: this.$t('project.module.configs'),
prop: 'configs', prop: 'configs',
show: true, show: true,
width: 150 width: 150

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

@@ -10,7 +10,7 @@
<div class="container__form"> <div class="container__form">
<!-- Edit type --> <!-- Edit type -->
<el-form ref="endpointEditForm" :model="editData" :rules="rules" label-position="top" label-width="120px"> <el-form ref="endpointEditForm" :model="editData" :rules="rules" label-position="top" label-width="120px">
<el-form-item :label="$t('overall.editType')" prop="editType"> <el-form-item :label="$t('overall.type')" prop="editType">
<el-select v-model="editData.editType" @change="endpointBatch" class="right-box__select" popper-class="right-box-select-top prevent-clickoutside" size="small" value-key="value"> <el-select v-model="editData.editType" @change="endpointBatch" class="right-box__select" popper-class="right-box-select-top prevent-clickoutside" size="small" value-key="value">
<el-option v-for="type in endpointConfig.editTypeOptions" :key="type.value" :label="$t(type.label)" :value="type.value"/> <el-option v-for="type in endpointConfig.editTypeOptions" :key="type.value" :label="$t(type.label)" :value="type.value"/>
</el-select> </el-select>

10
nezha-fronted/src/components/common/rightBox/batchModifyEndpoint.vue
View File

@@ -157,7 +157,7 @@ export default {
tempEndpoint: {}, tempEndpoint: {},
tempEndpoint2: {}, tempEndpoint2: {},
assetLoading: true, assetLoading: true,
rightBox: { show: false, title: this.$t('project.endpoint.createEndpoint'), isEdit: false }, rightBox: { show: false, title: this.$t('overall.createEndpoin'), isEdit: false },
blankEndpoint: { blankEndpoint: {
id: '', id: '',
projectId: '', projectId: '',
@@ -203,12 +203,12 @@ export default {
endpointList: [], endpointList: [],
endpointTableTitle: [ // 原始table列 endpointTableTitle: [ // 原始table列
{ {
label: this.$t('project.endpoint.name'), label: this.$t('overall.name'),
prop: 'name', prop: 'name',
show: true show: true
}, },
{ {
label: this.$t('project.endpoint.asset'), label: this.$t('guide.asset'),
prop: 'asset', prop: 'asset',
show: true show: true
}, },
@@ -218,12 +218,12 @@ export default {
show: true show: true
}, },
{ {
label: this.$t('project.endpoint.port'), label: this.$t('asset.port'),
prop: 'port', prop: 'port',
show: true show: true
}, },
{ {
label: this.$t('project.endpoint.configs'), label: this.$t('project.module.configs'),
prop: 'configs', prop: 'configs',
show: true show: true
} }

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

@@ -22,7 +22,7 @@
<el-option v-for="dc in dcData" :key="dc.id" :value="dc.id" :label="dc.name"></el-option> <el-option v-for="dc in dcData" :key="dc.id" :value="dc.id" :label="dc.name"></el-option>
</el-select> </el-select>
</el-form-item> </el-form-item>
<el-form-item :label="$t('asset.uSize')" prop="uSize"> <el-form-item :label="$t('config.cab.uSize')" prop="uSize">
<el-input v-model.number="editCabinet.uSize" :max="47" size="small" id="cabinet-box-input-uSize"></el-input> <el-input v-model.number="editCabinet.uSize" :max="47" size="small" id="cabinet-box-input-uSize"></el-input>
</el-form-item> </el-form-item>
<el-form-item :label="$t('overall.remark')"> <el-form-item :label="$t('overall.remark')">

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

@@ -109,7 +109,7 @@
<div class="form-items--half-width-group"> <div class="form-items--half-width-group">
<!-- type --> <!-- type -->
<el-form-item <el-form-item
:label="$t('dashboard.panel.chartForm.type')" :label="$t('overall.type')"
class="form-item--half-width" class="form-item--half-width"
prop="type" prop="type"
> >
@@ -174,7 +174,7 @@
<!-- limit --> <!-- limit -->
<el-form-item <el-form-item
v-show="isLog(chartConfig.type)" v-show="isLog(chartConfig.type)"
:label="$t('dashboard.panel.chartForm.limit')" :label="$t('overall.limit')"
class="form-item--half-width" class="form-item--half-width"
prop="param.limit"> prop="param.limit">
<el-input-number <el-input-number
@@ -364,7 +364,7 @@
<div v-if="isShowLegend(chartConfig.type)"> <div v-if="isShowLegend(chartConfig.type)">
<!--legendConfig--> <!--legendConfig-->
<div class="form__sub-title"> <div class="form__sub-title">
<span>{{$t('dashboard.panel.chartForm.legendConfig')}}</span> <span>{{$t('dashboard.panel.chartForm.legend')}}</span>
<el-switch v-model="chartConfig.param.enable.legend" size="small" @change="change"></el-switch> <el-switch v-model="chartConfig.param.enable.legend" size="small" @change="change"></el-switch>
</div> </div>
<transition name="el-zoom-in-top"> <transition name="el-zoom-in-top">
@@ -423,7 +423,7 @@
<!--thresholdConfig--> <!--thresholdConfig-->
<div class="form__sub-title" v-if="isThresholdConfig(chartConfig.type)"> <div class="form__sub-title" v-if="isThresholdConfig(chartConfig.type)">
<span>{{$t('dashboard.panel.chartForm.threshold')}}</span> <span>{{$t('alert.config.threshold')}}</span>
<el-switch <el-switch
v-model="chartConfig.param.enable.thresholds" v-model="chartConfig.param.enable.thresholds"
size="small" size="small"

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

@@ -5,7 +5,7 @@
</transition> </transition>
<div class="right-box__header"> <div class="right-box__header">
<div class="header__title" v-if="from !== 'chartTemp'">{{editChart.id ? $t("dashboard.panel.editChartTitle") : $t("dashboard.panel.createChartTitle")}}</div> <div class="header__title" v-if="from !== 'chartTemp'">{{editChart.id ? $t("dashboard.panel.editChartTitle") : $t("overall.createChart")}}</div>
<div class="header__title" v-if="from === 'chartTemp'">{{editChart.id ? $t("dashboard.panel.editChartTempTitle") : $t("dashboard.panel.createChartTempTitle")}}</div> <div class="header__title" v-if="from === 'chartTemp'">{{editChart.id ? $t("dashboard.panel.editChartTempTitle") : $t("dashboard.panel.createChartTempTitle")}}</div>
<div class="header__operation"> <div class="header__operation">
<span v-cancel="{obj: editChart, func: clickOutside}"><i class="nz-icon nz-icon-close"></i></span> <span v-cancel="{obj: editChart, func: clickOutside}"><i class="nz-icon nz-icon-close"></i></span>
@@ -15,7 +15,7 @@
<!-- begin--表单--> <!-- begin--表单-->
<div class="right-box-form-box right-box__container chart-right-box"> <div class="right-box-form-box right-box__container chart-right-box">
<el-form ref="chartForm" :model="editChart" :rules="rules" label-position= "top" label-width="120px"> <el-form ref="chartForm" :model="editChart" :rules="rules" label-position= "top" label-width="120px">
<el-form-item :label='$t("dashboard.panel.chartForm.name")' prop="name"> <el-form-item :label='$t("overall.name")' prop="name">
<div style="display:flex;align-items:center"> <div style="display:flex;align-items:center">
<el-input style="flex:1;margin-right:10px" maxlength="64" show-word-limit size="small" v-model="editChart.name" id="chart-box-title"></el-input> <el-input style="flex:1;margin-right:10px" maxlength="64" show-word-limit size="small" v-model="editChart.name" id="chart-box-title"></el-input>
<!-- 显示头部 --> <!-- 显示头部 -->

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

@@ -14,7 +14,7 @@
<div class="form-items--half-width-group"> <div class="form-items--half-width-group">
<!-- type --> <!-- type -->
<el-form-item <el-form-item
:label="$t('dashboard.panel.chartForm.type')" :label="$t('overall.type')"
class="form-item--half-width" class="form-item--half-width"
prop="type" prop="type"
> >
@@ -179,7 +179,7 @@ export default {
chartTypeList: [ chartTypeList: [
{ {
id: 'url', id: 'url',
name: this.$t('dashboard.panel.chartForm.typeVal.url.label') name: this.$t('dashboard.panel.chartForm.url')
}, },
{ {
id: 'text', id: 'text',
@@ -191,7 +191,7 @@ export default {
}, },
{ {
id: 'group', id: 'group',
name: this.$t('dashboard.panel.chartForm.typeVal.group.label') name: this.$t('dashboard.panel.chartForm.group')
}, },
{ {
id: 'map', id: 'map',

2
nezha-fronted/src/components/common/rightBox/chart/publicConfig.js
View File

@@ -277,7 +277,7 @@ export default {
], ],
textList: [ textList: [
{ {
label: this.$t('config.assetLabel.all'), label: this.$t('overall.exportAll'),
value: 'all' value: 'all'
}, { }, {
label: this.$t('overall.value'), label: this.$t('overall.value'),

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

@@ -85,7 +85,7 @@
</el-select> </el-select>
</el-form-item> </el-form-item>
<el-form-item <el-form-item
:label="$t('dashboard.panel.chartForm.limit')" :label="$t('overall.limit')"
class="form-item--half-width" class="form-item--half-width"
prop="param.limit" prop="param.limit"
> >
@@ -133,7 +133,7 @@
<div class="form-items--half-width-group"> <div class="form-items--half-width-group">
<!-- type --> <!-- type -->
<el-form-item <el-form-item
:label="$t('dashboard.panel.chartForm.type')" :label="$t('overall.type')"
class="form-item--half-width" class="form-item--half-width"
prop="type" prop="type"
> >
@@ -326,7 +326,7 @@
<div v-if="isShowLegend(chartConfig.type)"> <div v-if="isShowLegend(chartConfig.type)">
<!--legendConfig--> <!--legendConfig-->
<div class="form__sub-title"> <div class="form__sub-title">
<span>{{$t('dashboard.panel.chartForm.legendConfig')}}</span> <span>{{$t('dashboard.panel.chartForm.legend')}}</span>
<el-switch v-model="chartConfig.param.enable.legend" size="small" @change="change"></el-switch> <el-switch v-model="chartConfig.param.enable.legend" size="small" @change="change"></el-switch>
</div> </div>
<transition name="el-zoom-in-top"> <transition name="el-zoom-in-top">
@@ -385,7 +385,7 @@
<!--thresholdConfig--> <!--thresholdConfig-->
<div class="form__sub-title" v-if="isThresholdConfig(chartConfig.type)"> <div class="form__sub-title" v-if="isThresholdConfig(chartConfig.type)">
<span>{{$t('dashboard.panel.chartForm.threshold')}}</span> <span>{{$t('alert.config.threshold')}}</span>
<el-switch <el-switch
v-model="chartConfig.param.enable.thresholds" v-model="chartConfig.param.enable.thresholds"
size="small" size="small"

8
nezha-fronted/src/components/common/rightBox/chartTempBox.vue
View File

@@ -26,7 +26,7 @@
</el-select> </el-select>
</el-form-item> </el-form-item>
<!--chartTemp list--> <!--chartTemp list-->
<el-form-item :label="$t('dashboard.panel.chartForm.pid')" prop="pid"> <el-form-item :label="$t('project.module.ChartTemplate')" prop="pid">
<el-select id="chart-box-group" <el-select id="chart-box-group"
v-model="editChartTemp.pid" v-model="editChartTemp.pid"
class="right-box__select" clearable class="right-box__select" clearable
@@ -134,7 +134,7 @@ export default {
disabled: false disabled: false
}, { }, {
id: 22, id: 22,
name: this.$t('asset.state'), name: this.$t('overall.state'),
type: 'select', type: 'select',
label: 'assetState', label: 'assetState',
disabled: false disabled: false
@@ -366,7 +366,7 @@ export default {
disabled: false disabled: false
}, { }, {
id: 22, id: 22,
name: this.$t('asset.state'), name: this.$t('overall.state'),
type: 'select', type: 'select',
label: 'assetState', label: 'assetState',
disabled: false disabled: false
@@ -392,7 +392,7 @@ export default {
show: true show: true
}, },
{ {
label: this.$t('project.endpoint.name'), label: this.$t('overall.name'),
prop: 'name', prop: 'name',
show: true show: true
} }

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

@@ -17,10 +17,10 @@
<el-form-item :label='$t("asset.location")' prop="location"> <el-form-item :label='$t("asset.location")' prop="location">
<el-input placeholder="" maxlength="256" show-word-limit v-model="editDc.location" size="small" id="dc-box-input-location"></el-input> <el-input placeholder="" maxlength="256" show-word-limit v-model="editDc.location" size="small" id="dc-box-input-location"></el-input>
</el-form-item> </el-form-item>
<el-form-item :label='$t("asset.tel")' prop="tel"> <el-form-item :label='$t("config.dc.tel")' prop="tel">
<el-input placeholder="" maxlength="128" show-word-limit v-model="editDc.tel" size="small" id="dc-box-input-tel"></el-input> <el-input placeholder="" maxlength="128" show-word-limit v-model="editDc.tel" size="small" id="dc-box-input-tel"></el-input>
</el-form-item> </el-form-item>
<el-form-item :label='$t("asset.principal")' prop="principal"> <el-form-item :label='$t("config.dc.principal")' prop="principal">
<el-select value-key="id" class="right-box__select" popper-class="right-box-select-top right-public-box-dropdown-top prevent-clickoutside" v-model="editDc.principal" placeholder="" size="small" id="dc-box-input-principal"> <el-select value-key="id" class="right-box__select" popper-class="right-box-select-top right-public-box-dropdown-top prevent-clickoutside" v-model="editDc.principal" placeholder="" size="small" id="dc-box-input-principal">
<el-option v-for="item in userData" :key="item.id" :label="item.name" :value="item.id" style="width: 620px"> <el-option v-for="item in userData" :key="item.id" :label="item.name" :value="item.id" style="width: 620px">
<span class="user-name" :title="item.name">{{item.name}}</span><span class="user-username" :title="item.username">@{{item.username}}</span> <span class="user-name" :title="item.name">{{item.name}}</span><span class="user-username" :title="item.username">@{{item.username}}</span>
@@ -39,7 +39,7 @@
></latlng-picker> ></latlng-picker>
</div> </div>
</el-form-item> </el-form-item>
<el-form-item :label='$t("config.dc.state")' prop="state"> <el-form-item :label='$t("overall.state")' prop="state">
<el-switch <el-switch
id="dc-box-input-name" id="dc-box-input-name"
v-model="editDc.state" v-model="editDc.state"

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

@@ -10,10 +10,10 @@
{{ $t("project.module.batchEndpoint")}} {{ $t("project.module.batchEndpoint")}}
</span> </span>
<span v-if="optionType === 'add'"> <span v-if="optionType === 'add'">
{{ $t("project.module.createEndpoint")}} {{ $t("overall.createEndpoin")}}
</span> </span>
<span v-if="optionType === 'batchAdd'"> <span v-if="optionType === 'batchAdd'">
{{ $t("project.module.createEndpoint")}} {{ $t("overall.createEndpoin")}}
</span> </span>
</div> </div>
<!-- end--标题--> <!-- end--标题-->
@@ -39,7 +39,7 @@
</el-select> </el-select>
</el-form-item> </el-form-item>
<!--asset--> <!--asset-->
<el-form-item :label='$t("project.module.asset")' label-width="125px" prop="assetId" v-if="!disabled"> <el-form-item :label='$t("guide.asset")' label-width="125px" prop="assetId" v-if="!disabled">
<!-- <el-select id="module-box-input-asset" @change="renderEndpoint" v-model="editEndpoint.assetId" :disabled="disabled" class="right-box__select" placeholder="" popper-class="right-box-select-top right-public-box-dropdown-top prevent-clickoutside" size="small" value-key="id">--> <!-- <el-select id="module-box-input-asset" @change="renderEndpoint" v-model="editEndpoint.assetId" :disabled="disabled" class="right-box__select" placeholder="" popper-class="right-box-select-top right-public-box-dropdown-top prevent-clickoutside" size="small" value-key="id">-->
<!-- <el-option v-for="item in assetList" :id="'asset-'+item.id" :key="item.id" :label="item.name" :value="item.id"></el-option>--> <!-- <el-option v-for="item in assetList" :id="'asset-'+item.id" :key="item.id" :label="item.name" :value="item.id"></el-option>-->
<!-- </el-select>--> <!-- </el-select>-->
@@ -62,11 +62,11 @@
:result-format="resultFormat" :result-format="resultFormat"
></v-selectpage> ></v-selectpage>
</el-form-item> </el-form-item>
<el-form-item :label='$t("project.module.asset")' label-width="125px" prop="assetName" v-if="disabled"> <el-form-item :label='$t("guide.asset")' label-width="125px" prop="assetName" v-if="disabled">
<el-input id="module-box-input-assetName" v-model="editEndpoint.assetName" :disabled="disabled" placeholder="" show-word-limit size="small"></el-input> <el-input id="module-box-input-assetName" v-model="editEndpoint.assetName" :disabled="disabled" placeholder="" show-word-limit size="small"></el-input>
</el-form-item> </el-form-item>
<!--name--> <!--name-->
<el-form-item v-if="optionType!=='batch'" :label='$t("project.module.name")' label-width="125px" prop="name"> <el-form-item v-if="optionType!=='batch'" :label='$t("overall.name")' label-width="125px" prop="name">
<el-input id="module-box-input-name" v-model="editEndpoint.name" maxlength="64" placeholder="" show-word-limit size="small"></el-input> <el-input id="module-box-input-name" v-model="editEndpoint.name" maxlength="64" placeholder="" show-word-limit size="small"></el-input>
</el-form-item> </el-form-item>
<!--Enpoint template--> <!--Enpoint template-->
@@ -82,7 +82,7 @@
</div> </div>
<div class="right-box-line"></div> <div class="right-box-line"></div>
<!-- ChartTemplate --> <!-- ChartTemplate -->
<!-- <el-form-item :label="$t('config.model.ChartTemplate')" prop="ChartTemplate">--> <!-- <el-form-item :label="$t('project.module.ChartTemplate')" prop="ChartTemplate">-->
<!-- <v-selectpage--> <!-- <v-selectpage-->
<!-- v-model="editEndpoint.chartIds"--> <!-- v-model="editEndpoint.chartIds"-->
<!-- :data="chartTempList"--> <!-- :data="chartTempList"-->
@@ -103,7 +103,7 @@
<div class="endpoint-title"> <div class="endpoint-title">
<span class="endpoint-title-content"> <span class="endpoint-title-content">
<i class="nz-icon nz-icon-arrow-down" :class="metricsShow?'':'is-active'" @click="metricsShow = !metricsShow"></i> <i class="nz-icon nz-icon-arrow-down" :class="metricsShow?'':'is-active'" @click="metricsShow = !metricsShow"></i>
{{$t('project.endpoint.metrics')}} {{$t('project.metrics.metrics')}}
</span> </span>
<el-switch v-model="editEndpoint.configs[0].enable" size="small" :active-value="1" :inactive-value="0"></el-switch> <el-switch v-model="editEndpoint.configs[0].enable" size="small" :active-value="1" :inactive-value="0"></el-switch>
</div> </div>
@@ -111,7 +111,7 @@
<el-tabs v-model="activeName" v-show="metricsShow" v-if="editEndpoint.configs[0].enable"> <el-tabs v-model="activeName" v-show="metricsShow" v-if="editEndpoint.configs[0].enable">
<el-tab-pane :label="$t('project.endpoint.basic')" name="Basic"> <el-tab-pane :label="$t('project.endpoint.basic')" name="Basic">
<!--type--> <!--type-->
<el-form-item :label='$t("project.endpoint.protocol")' class="half-form-item" prop="type"> <el-form-item :label='$t("webshell.protocol")' class="half-form-item" prop="type">
<el-select id="module-box-input-type" v-model="editEndpoint.configs[0].config.protocol" :disabled="!!editEndpoint.id && editEndpoint.configs[0].config.protocol === 'snmp'" class="right-box__select" placeholder="" popper-class="right-box-select-top prevent-clickoutside" size="small" value-key="id"> <el-select id="module-box-input-type" v-model="editEndpoint.configs[0].config.protocol" :disabled="!!editEndpoint.id && editEndpoint.configs[0].config.protocol === 'snmp'" class="right-box__select" placeholder="" popper-class="right-box-select-top prevent-clickoutside" size="small" value-key="id">
<el-option v-for="item in typeList" :id="'module-type-'+item.id" :key="item.value" :label="item.name" :value="item.value" :disabled="item.disabled && !!editEndpoint.id"></el-option> <el-option v-for="item in typeList" :id="'module-type-'+item.id" :key="item.value" :label="item.name" :value="item.value" :disabled="item.disabled && !!editEndpoint.id"></el-option>
</el-select> </el-select>
@@ -121,11 +121,11 @@
<el-input id="module-box-input-host" v-model="editEndpoint.configs[0].config.host" placeholder="" size="small"></el-input> <el-input id="module-box-input-host" v-model="editEndpoint.configs[0].config.host" placeholder="" size="small"></el-input>
</el-form-item> </el-form-item>
<!--path--> <!--path-->
<el-form-item :label='$t("project.endpoint.path")' class="half-form-item" prop="configs.metrics_path"> <el-form-item :label='$t("config.terminallog.path")' class="half-form-item" prop="configs.metrics_path">
<el-input id="module-box-input-path" v-model="editEndpoint.configs[0].config.metrics_path" placeholder="" size="small" :disabled="editEndpoint.configs[0].config.protocol === 'snmp'"></el-input> <el-input id="module-box-input-path" v-model="editEndpoint.configs[0].config.metrics_path" placeholder="" size="small" :disabled="editEndpoint.configs[0].config.protocol === 'snmp'"></el-input>
</el-form-item> </el-form-item>
<!--port--> <!--port-->
<el-form-item :label='$t("project.endpoint.port")' class="half-form-item" prop="configs.0.config.port" :rules="[ <el-form-item :label='$t("asset.port")' class="half-form-item" prop="configs.0.config.port" :rules="[
{ validator: port, trigger: 'blur' }, { validator: port, trigger: 'blur' },
{ required: true, message: $t('validate.required'), trigger: 'blur' } { required: true, message: $t('validate.required'), trigger: 'blur' }
]"> ]">
@@ -193,7 +193,7 @@
</span> </span>
</div> </div>
</el-tab-pane> </el-tab-pane>
<el-tab-pane :label="$t('project.endpoint.parameter')" name="Parameter" class="el-tab-pane-height"> <el-tab-pane :label="$t('project.endpoint.param')" name="Parameter" class="el-tab-pane-height">
<div id="module-box-params" ref="labelBoxScrollbar" style="height: 100%; overflow: auto;"> <div id="module-box-params" ref="labelBoxScrollbar" style="height: 100%; overflow: auto;">
<div v-for="(item, index) in editEndpoint.paramObj" :key="index" class="param-box-row"> <div v-for="(item, index) in editEndpoint.paramObj" :key="index" class="param-box-row">
<el-form-item :prop="'paramObj.' + index + '.key'" class="param-box-row-key" :rules="[{ pattern: /[a-zA-Z_][a-zA-Z0-9_]*/, message: $t('overall.ASCIIKey') ,trigger: 'blur'}]"> <el-form-item :prop="'paramObj.' + index + '.key'" class="param-box-row-key" :rules="[{ pattern: /[a-zA-Z_][a-zA-Z0-9_]*/, message: $t('overall.ASCIIKey') ,trigger: 'blur'}]">
@@ -316,25 +316,25 @@
</span> </span>
</div> </div>
</el-tab-pane> </el-tab-pane>
<el-tab-pane v-if="editEndpoint.configs[0].config.protocol !== 'snmp'" :label="$t('project.endpoint.auth')" name="Auth"> <el-tab-pane v-if="editEndpoint.configs[0].config.protocol !== 'snmp'" :label="$t('config.mib.credential.auth')" name="Auth">
<!--authtype--> <!--authtype-->
<el-form-item :label='$t("project.endpoint.type")' prop="authtype"> <el-form-item :label='$t("overall.type")' prop="authtype">
<el-select id="module-box-input-auth-type" v-model="authType" class="right-box__select" placeholder="" popper-class="right-box-select-top prevent-clickoutside" size="small" value-key="id" @change="changeAuthType"> <el-select id="module-box-input-auth-type" v-model="authType" class="right-box__select" placeholder="" popper-class="right-box-select-top prevent-clickoutside" size="small" value-key="id" @change="changeAuthType">
<el-option v-for="item in authTypeList" :id="'module-type-'+item.id" :key="item.value" :label="item.name" :value="item.value"></el-option> <el-option v-for="item in authTypeList" :id="'module-type-'+item.id" :key="item.value" :label="item.name" :value="item.value"></el-option>
</el-select> </el-select>
</el-form-item> </el-form-item>
<!--authtype 1--> <!--authtype 1-->
<el-form-item v-if="authType === 1" :label='$t("project.endpoint.username")' class="half-form-item" prop="configs.0.config.basic_auth.username" :rules="[{ required: true, message: $t('validate.required'), trigger: 'blur' }]"> <el-form-item v-if="authType === 1" :label='$t("asset.username")' class="half-form-item" prop="configs.0.config.basic_auth.username" :rules="[{ required: true, message: $t('validate.required'), trigger: 'blur' }]">
<el-input id="module-box-input-uername" v-model="editEndpoint.configs[0].config.basic_auth.username" placeholder='' size="small"></el-input> <el-input id="module-box-input-uername" v-model="editEndpoint.configs[0].config.basic_auth.username" placeholder='' size="small"></el-input>
</el-form-item> </el-form-item>
<el-form-item v-if="authType === 1" :label='$t("project.endpoint.pin")' class="half-form-item" prop="configs.0.config.basic_auth.pin" :rules="[{ required: true, message: $t('validate.required'), trigger: 'blur' }]"> <el-form-item v-if="authType === 1" :label='$t("login.pin")' class="half-form-item" prop="configs.0.config.basic_auth.pin" :rules="[{ required: true, message: $t('validate.required'), trigger: 'blur' }]">
<el-input id="module-box-input-password" v-model="editEndpoint.configs[0].config.basic_auth.pin" type="password" autocomplete="new-password" placeholder='' size="small"></el-input> <el-input id="module-box-input-password" v-model="editEndpoint.configs[0].config.basic_auth.pin" type="password" autocomplete="new-password" placeholder='' size="small"></el-input>
</el-form-item> </el-form-item>
<!--authtype 2--> <!--authtype 2-->
<el-form-item v-if="authType === 2" :label='$t("project.endpoint.bearer_token")' prop="configs.0.config.bearer_token" :rules="[{ required: true, message: $t('validate.required'), trigger: 'blur' }]"> <el-form-item v-if="authType === 2" :label='$t("project.endpoint.authTypeToken")' prop="configs.0.config.bearer_token" :rules="[{ required: true, message: $t('validate.required'), trigger: 'blur' }]">
<el-input id="module-box-input-bearer_token" v-model="editEndpoint.configs[0].config.bearer_token" placeholder='' size="small"></el-input> <el-input id="module-box-input-bearer_token" v-model="editEndpoint.configs[0].config.bearer_token" placeholder='' size="small"></el-input>
</el-form-item> </el-form-item>
@@ -344,7 +344,7 @@
<div class="endpoint-title" style="margin-top: 10px"> <div class="endpoint-title" style="margin-top: 10px">
<span class="endpoint-title-content"> <span class="endpoint-title-content">
<i class="nz-icon nz-icon-arrow-down" :class="logsShow?'':'is-active'" @click="logsShow = !logsShow"></i> <i class="nz-icon nz-icon-arrow-down" :class="logsShow?'':'is-active'" @click="logsShow = !logsShow"></i>
{{$t('project.endpoint.logs')}} {{$t('overall.logs')}}
</span> </span>
<el-switch v-model="editEndpoint.configs[1].enable" size="small" :active-value="1" :inactive-value="0"></el-switch> <el-switch v-model="editEndpoint.configs[1].enable" size="small" :active-value="1" :inactive-value="0"></el-switch>
</div> </div>
@@ -354,14 +354,14 @@
<el-tabs v-model="activeNameLogs[index]" class="special-tabs" @tab-click="()=>{tabClick(index)}"> <el-tabs v-model="activeNameLogs[index]" class="special-tabs" @tab-click="()=>{tabClick(index)}">
<el-tab-pane :label="$t('project.endpoint.basic')" name="Basic"> <el-tab-pane :label="$t('project.endpoint.basic')" name="Basic">
<!--type--> <!--type-->
<el-form-item :label='$t("project.endpoint.type")' class="half-form-item"> <el-form-item :label='$t("overall.type")' class="half-form-item">
<el-select id="module-box-input-type" v-model="item.type" class="right-box__select" placeholder="" popper-class="right-box-select-top prevent-clickoutside" size="small" @change="logsBasicTypeChange(index)"> <el-select id="module-box-input-type" v-model="item.type" class="right-box__select" placeholder="" popper-class="right-box-select-top prevent-clickoutside" size="small" @change="logsBasicTypeChange(index)">
<el-option v-for="item in logsBasicList" :id="'module-type-'+item.id" :key="item.value" :label="item.name" :value="item.value"></el-option> <el-option v-for="item in logsBasicList" :id="'module-type-'+item.id" :key="item.value" :label="item.name" :value="item.value"></el-option>
</el-select> </el-select>
</el-form-item> </el-form-item>
<el-form-item <el-form-item
v-if='item.type === "file"' v-if='item.type === "file"'
:label='item.type === "file" ? $t("project.endpoint.basicTypeFile"):( item.type === "journal" ? $t("project.endpoint.basicTypeJournal") : $t("project.endpoint.basicTypeSyslog"))' class="half-form-item" :label='item.type === "file" ? $t("config.terminallog.path"):( item.type === "journal" ? $t("dashboard.panel.chartForm.unit") : $t("project.endpoint.basicTypeSyslog"))' class="half-form-item"
:prop="'configs.1.config.'+ index +'.fileName'" :prop="'configs.1.config.'+ index +'.fileName'"
:rules="[ { required: true, message: $t('validate.required'), trigger: 'blur' }]" :rules="[ { required: true, message: $t('validate.required'), trigger: 'blur' }]"
> >
@@ -369,7 +369,7 @@
</el-form-item> </el-form-item>
<el-form-item <el-form-item
v-if='item.type === "journal"' v-if='item.type === "journal"'
:label='item.type === "file" ? $t("project.endpoint.basicTypeFile"):( item.type === "journal" ? $t("project.endpoint.basicTypeJournal") : $t("project.endpoint.basicTypeSyslog"))' class="half-form-item" :label='item.type === "file" ? $t("config.terminallog.path"):( item.type === "journal" ? $t("dashboard.panel.chartForm.unit") : $t("project.endpoint.basicTypeSyslog"))' class="half-form-item"
:prop="'configs.1.config.'+ index +'.unit'" :prop="'configs.1.config.'+ index +'.unit'"
:rules="[ { required: true, message: $t('validate.required'), trigger: 'blur' }]" :rules="[ { required: true, message: $t('validate.required'), trigger: 'blur' }]"
> >
@@ -377,7 +377,7 @@
</el-form-item> </el-form-item>
<el-form-item <el-form-item
v-if='item.type === "syslog"' v-if='item.type === "syslog"'
:label='item.type === "file" ? $t("project.endpoint.basicTypeFile"):( item.type === "journal" ? $t("project.endpoint.basicTypeJournal") : $t("project.endpoint.basicTypeSyslog"))' class="half-form-item" :label='item.type === "file" ? $t("config.terminallog.path"):( item.type === "journal" ? $t("dashboard.panel.chartForm.unit") : $t("project.endpoint.basicTypeSyslog"))' class="half-form-item"
:prop="'configs.1.config.'+ index +'.listenAddress'" :prop="'configs.1.config.'+ index +'.listenAddress'"
:rules="[ { required: true, message: $t('validate.required'), trigger: 'blur' }]" :rules="[ { required: true, message: $t('validate.required'), trigger: 'blur' }]"
> >
@@ -631,7 +631,7 @@ export default {
ChartSearchShowFields: [ // ChartSearch 下拉搜索表头 ChartSearchShowFields: [ // ChartSearch 下拉搜索表头
{ title: 'ID', data: 'id' }, { title: 'ID', data: 'id' },
{ {
title: this.$t('config.model.titleName'), title: this.$t('overall.name'),
data: function (row) { data: function (row) {
if (row.name.length > 15) { if (row.name.length > 15) {
return row.name.substring(0, 12) + '...' return row.name.substring(0, 12) + '...'
@@ -639,7 +639,7 @@ export default {
return row.name return row.name
} }
}, },
{ title: this.$t('config.model.titleType'), data: 'type' }, { title: this.$t('overall.type'), data: 'type' },
{ {
title: this.$t('overall.remark'), title: this.$t('overall.remark'),
data: function (row) { data: function (row) {
@@ -710,7 +710,7 @@ export default {
], ],
authType: 0, authType: 0,
authTypeList: [ authTypeList: [
{ name: this.$t('project.endpoint.authTypeNull'), value: 0 }, { name: this.$t('project.topology.none'), value: 0 },
{ name: this.$t('project.endpoint.authTypeWord'), value: 1 }, { name: this.$t('project.endpoint.authTypeWord'), value: 1 },
{ name: this.$t('project.endpoint.authTypeToken'), value: 2 } { name: this.$t('project.endpoint.authTypeToken'), value: 2 }
], ],

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

@@ -13,7 +13,7 @@
<div class="right-box__container"> <div class="right-box__container">
<div class="container__form container__form-width"> <div class="container__form container__form-width">
<el-form ref="ExprTempForm" :model="editExprTemp" :rules="rules" label-position="top" label-width="120px"> <el-form ref="ExprTempForm" :model="editExprTemp" :rules="rules" label-position="top" label-width="120px">
<el-form-item :label="$t('config.exprTemp.name')" prop="name"> <el-form-item :label="$t('overall.name')" prop="name">
<el-input maxlength="64" show-word-limit v-model="editExprTemp.name" :placeholder="$t('overall.placeHolder')" size="small"></el-input> <el-input maxlength="64" show-word-limit v-model="editExprTemp.name" :placeholder="$t('overall.placeHolder')" size="small"></el-input>
</el-form-item> </el-form-item>
<el-form-item :label="$t('config.exprTemp.gname')" prop="gname"> <el-form-item :label="$t('config.exprTemp.gname')" prop="gname">

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

@@ -21,7 +21,7 @@
<el-form-item :label="$t('config.menus.parent')" prop="parentId"> <el-form-item :label="$t('config.menus.parent')" prop="parentId">
<tree-select :multiple="false" :options="menus" label="id" noChildrenText="" noOptionsText="" placeholder="" v-model="editMenu.parentId" id="menu-box-input-parent"></tree-select> <tree-select :multiple="false" :options="menus" label="id" noChildrenText="" noOptionsText="" placeholder="" v-model="editMenu.parentId" id="menu-box-input-parent"></tree-select>
</el-form-item> </el-form-item>
<el-form-item :label="$t('config.menus.type')" prop="type"> <el-form-item :label="$t('overall.type')" prop="type">
<el-radio-group v-model="editMenu.type" id="menu-box-input-type"> <el-radio-group v-model="editMenu.type" id="menu-box-input-type">
<el-radio :label="1">{{$t('config.menus.menu')}}</el-radio> <el-radio :label="1">{{$t('config.menus.menu')}}</el-radio>
<el-radio :label="2">{{$t('config.menus.button')}}</el-radio> <el-radio :label="2">{{$t('config.menus.button')}}</el-radio>
@@ -29,7 +29,7 @@
</el-radio-group> </el-radio-group>
</el-form-item> </el-form-item>
<!--name--> <!--name-->
<el-form-item :label="$t('config.menus.name')" prop="name"> <el-form-item :label="$t('overall.name')" prop="name">
<el-input placeholder="" type="text" v-model="editMenu.name" id="menu-box-input-name"></el-input> <el-input placeholder="" type="text" v-model="editMenu.name" id="menu-box-input-name"></el-input>
</el-form-item> </el-form-item>
<el-form-item :label="$t('config.menus.code')" prop="code"> <el-form-item :label="$t('config.menus.code')" prop="code">

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

@@ -2,7 +2,7 @@
<div class="right-box right-box-mib" v-clickoutside="{obj:editMib,func:clickOutside}" > <div class="right-box right-box-mib" v-clickoutside="{obj:editMib,func:clickOutside}" >
<!-- begin--标题--> <!-- begin--标题-->
<div class="right-box__header"> <div class="right-box__header">
<div class="header__title">{{editMib.id ? ($t("config.mib.editMib")) : $t("config.mib.createMib")}}</div> <div class="header__title">{{editMib.id ? ($t("config.mib.editMib")) : $t("overall.createMib")}}</div>
<div class="header__operation"> <div class="header__operation">
<span v-cancel="{obj: editMib, func: esc}"><i class="nz-icon nz-icon-close"></i></span> <span v-cancel="{obj: editMib, func: esc}"><i class="nz-icon nz-icon-close"></i></span>
</div> </div>
@@ -11,7 +11,7 @@
<div class="right-box__container"> <div class="right-box__container">
<div class="container__form"> <div class="container__form">
<el-form :model="editMib" label-position = "top" label-width="120px" :rules="rules" ref="mibForm"> <el-form :model="editMib" label-position = "top" label-width="120px" :rules="rules" ref="mibForm">
<el-form-item :label='$t("config.mib.models")' prop="models" :rules="[{validator:checkModels,trigger:'change'}]" > <el-form-item :label='$t("asset.model")' prop="models" :rules="[{validator:checkModels,trigger:'change'}]" >
<el-cascader <el-cascader
id="mib-input-selected-models" id="mib-input-selected-models"
:options="modelOptions" :options="modelOptions"

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

@@ -2,7 +2,7 @@
<div class="right-box right-box-module" v-clickoutside="{obj:editModule,func:clickOutside}"> <div class="right-box right-box-module" v-clickoutside="{obj:editModule,func:clickOutside}">
<div class="right-box__header"> <div class="right-box__header">
<!-- begin--标题--> <!-- begin--标题-->
<div class="header__title">{{editModule.id ? $t("project.module.editModule") : $t("project.module.createModule")}}</div> <div class="header__title">{{editModule.id ? $t("project.module.editModule") : $t("overall.createModule")}}</div>
<!-- end--标题--> <!-- end--标题-->
<div class="header__operation"> <div class="header__operation">
<span v-cancel="{obj: editModule, func: esc}"><i class="nz-icon nz-icon-close"></i></span> <span v-cancel="{obj: editModule, func: esc}"><i class="nz-icon nz-icon-close"></i></span>
@@ -14,7 +14,7 @@
<div class="container__form"> <div class="container__form">
<el-form ref="moduleForm" :model="editModule" :rules="rules" label-position="top" label-width="120px"> <el-form ref="moduleForm" :model="editModule" :rules="rules" label-position="top" label-width="120px">
<!--name--> <!--name-->
<el-form-item :label='$t("project.module.moduleName")' label-width="125px" prop="name"> <el-form-item :label='$t("overall.name")' label-width="125px" prop="name">
<el-input id="module-box-input-name" v-model="editModule.name" maxlength="64" placeholder="" show-word-limit size="small"></el-input> <el-input id="module-box-input-name" v-model="editModule.name" maxlength="64" placeholder="" show-word-limit size="small"></el-input>
</el-form-item> </el-form-item>
<!--project--> <!--project-->
@@ -61,7 +61,7 @@
></el-autocomplete> ></el-autocomplete>
</el-form-item> </el-form-item>
<!-- ChartTemplate --> <!-- ChartTemplate -->
<el-form-item :label="$t('config.model.ChartTemplate')" prop="ChartTemplate"> <el-form-item :label="$t('project.module.ChartTemplate')" prop="ChartTemplate">
<v-selectpage <v-selectpage
:data="chartTempList" :data="chartTempList"
:tb-columns="ChartSearchShowFields" :tb-columns="ChartSearchShowFields"
@@ -83,7 +83,7 @@
<div class="endpoint-title"> <div class="endpoint-title">
<span class="endpoint-title-content"> <span class="endpoint-title-content">
<i class="nz-icon nz-icon-arrow-down" :class="metricsShow?'':'is-active'" @click="metricsShow = !metricsShow"></i> <i class="nz-icon nz-icon-arrow-down" :class="metricsShow?'':'is-active'" @click="metricsShow = !metricsShow"></i>
{{$t('project.endpoint.metrics')}} {{$t('project.metrics.metrics')}}
</span> </span>
<el-switch v-model="editModule.configs[0].enable" size="small" :active-value="1" :inactive-value="0"></el-switch> <el-switch v-model="editModule.configs[0].enable" size="small" :active-value="1" :inactive-value="0"></el-switch>
</div> </div>
@@ -91,7 +91,7 @@
<el-tabs v-model="activeName" v-show="metricsShow" v-if="editModule.configs[0].enable"> <el-tabs v-model="activeName" v-show="metricsShow" v-if="editModule.configs[0].enable">
<el-tab-pane :label="$t('project.endpoint.basic')" name="Basic"> <el-tab-pane :label="$t('project.endpoint.basic')" name="Basic">
<!--type--> <!--type-->
<el-form-item :label='$t("project.endpoint.protocol")' class="half-form-item" prop="type"> <el-form-item :label='$t("webshell.protocol")' class="half-form-item" prop="type">
<el-select id="module-box-input-type" v-model="editModule.configs[0].config.protocol" :disabled="!!editModule.id && editModule.configs[0].config.protocol === 'snmp'" class="right-box__select" placeholder="" popper-class="right-box-select-top prevent-clickoutside" size="small" value-key="id" @change="changeBasicType"> <el-select id="module-box-input-type" v-model="editModule.configs[0].config.protocol" :disabled="!!editModule.id && editModule.configs[0].config.protocol === 'snmp'" class="right-box__select" placeholder="" popper-class="right-box-select-top prevent-clickoutside" size="small" value-key="id" @change="changeBasicType">
<el-option v-for="item in typeList" :id="'module-type-'+item.id" :key="item.value" :label="item.name" :value="item.value" :disabled="item.disabled && !!editModule.id"></el-option> <el-option v-for="item in typeList" :id="'module-type-'+item.id" :key="item.value" :label="item.name" :value="item.value" :disabled="item.disabled && !!editModule.id"></el-option>
</el-select> </el-select>
@@ -101,11 +101,11 @@
<el-input id="module-box-input-host" v-model="editModule.configs[0].config.host" placeholder="" size="small"></el-input> <el-input id="module-box-input-host" v-model="editModule.configs[0].config.host" placeholder="" size="small"></el-input>
</el-form-item> </el-form-item>
<!--path--> <!--path-->
<el-form-item :label='$t("project.endpoint.path")' class="half-form-item" prop="configs.metrics_path" :disabled="editModule.configs[0].config.protocol === 'snmp'"> <el-form-item :label='$t("config.terminallog.path")' class="half-form-item" prop="configs.metrics_path" :disabled="editModule.configs[0].config.protocol === 'snmp'">
<el-input id="module-box-input-path" v-model="editModule.configs[0].config.metrics_path" placeholder="" size="small" :disabled="editModule.configs[0].config.protocol === 'snmp'"></el-input> <el-input id="module-box-input-path" v-model="editModule.configs[0].config.metrics_path" placeholder="" size="small" :disabled="editModule.configs[0].config.protocol === 'snmp'"></el-input>
</el-form-item> </el-form-item>
<!--port--> <!--port-->
<el-form-item :label='$t("project.endpoint.port")' class="half-form-item" prop="configs.0.config.port" :rules="[ <el-form-item :label='$t("asset.port")' class="half-form-item" prop="configs.0.config.port" :rules="[
{ validator: port, trigger: 'blur' }, { validator: port, trigger: 'blur' },
{ required: true, message: $t('validate.required'), trigger: 'blur' } { required: true, message: $t('validate.required'), trigger: 'blur' }
]"> ]">
@@ -173,7 +173,7 @@
</span> </span>
</div> </div>
</el-tab-pane> </el-tab-pane>
<el-tab-pane :label="$t('project.endpoint.parameter')" name="Parameter"> <el-tab-pane :label="$t('project.endpoint.param')" name="Parameter">
<div id="module-box-params" ref="labelBoxScrollbar" style="height: 100%; overflow: auto;"> <div id="module-box-params" ref="labelBoxScrollbar" style="height: 100%; overflow: auto;">
<div v-for="(item, index) in editModule.paramObj" :key="index" class="param-box-row"> <div v-for="(item, index) in editModule.paramObj" :key="index" class="param-box-row">
<el-form-item :prop="'paramObj.' + index + '.key'" class="param-box-row-key"> <el-form-item :prop="'paramObj.' + index + '.key'" class="param-box-row-key">
@@ -295,25 +295,25 @@
</span> </span>
</div> </div>
</el-tab-pane> </el-tab-pane>
<el-tab-pane v-if="editModule.configs[0].config.protocol !== 'snmp'" :label="$t('project.endpoint.auth')" name="Auth"> <el-tab-pane v-if="editModule.configs[0].config.protocol !== 'snmp'" :label="$t('config.mib.credential.auth')" name="Auth">
<!--authtype--> <!--authtype-->
<el-form-item :label='$t("project.endpoint.type")' prop="authtype"> <el-form-item :label='$t("overall.type")' prop="authtype">
<el-select id="module-box-input-auth-type" v-model="authType" class="right-box__select" placeholder="" popper-class="right-box-select-top prevent-clickoutside" size="small" value-key="id" @change="changeAuthType"> <el-select id="module-box-input-auth-type" v-model="authType" class="right-box__select" placeholder="" popper-class="right-box-select-top prevent-clickoutside" size="small" value-key="id" @change="changeAuthType">
<el-option v-for="item in authTypeList" :id="'module-type-'+item.id" :key="item.value" :label="item.name" :value="item.value"></el-option> <el-option v-for="item in authTypeList" :id="'module-type-'+item.id" :key="item.value" :label="item.name" :value="item.value"></el-option>
</el-select> </el-select>
</el-form-item> </el-form-item>
<!--authtype 1--> <!--authtype 1-->
<el-form-item v-if="authType === 1" :label='$t("project.endpoint.username")' class="half-form-item" prop="configs.0.config.basic_auth.username" :rules="[{ required: true, message: $t('validate.required'), trigger: 'blur' }]"> <el-form-item v-if="authType === 1" :label='$t("asset.username")' class="half-form-item" prop="configs.0.config.basic_auth.username" :rules="[{ required: true, message: $t('validate.required'), trigger: 'blur' }]">
<el-input id="module-box-input-uername" v-model="editModule.configs[0].config.basic_auth.username" placeholder='' size="small"></el-input> <el-input id="module-box-input-uername" v-model="editModule.configs[0].config.basic_auth.username" placeholder='' size="small"></el-input>
</el-form-item> </el-form-item>
<el-form-item v-if="authType === 1" :label='$t("project.endpoint.pin")' class="half-form-item" prop="configs.0.config.basic_auth.pin" :rules="[{ required: true, message: $t('validate.required'), trigger: 'blur' }]"> <el-form-item v-if="authType === 1" :label='$t("login.pin")' class="half-form-item" prop="configs.0.config.basic_auth.pin" :rules="[{ required: true, message: $t('validate.required'), trigger: 'blur' }]">
<el-input id="module-box-input-password" v-model="editModule.configs[0].config.basic_auth.pin" type="password" autocomplete="new-password" placeholder='' size="small"></el-input> <el-input id="module-box-input-password" v-model="editModule.configs[0].config.basic_auth.pin" type="password" autocomplete="new-password" placeholder='' size="small"></el-input>
</el-form-item> </el-form-item>
<!--authtype 2--> <!--authtype 2-->
<el-form-item v-if="authType === 2" :label='$t("project.endpoint.bearer_token")' prop="configs.0.config.bearer_token" :rules="[{ required: true, message: $t('validate.required'), trigger: 'blur' }]"> <el-form-item v-if="authType === 2" :label='$t("project.endpoint.authTypeToken")' prop="configs.0.config.bearer_token" :rules="[{ required: true, message: $t('validate.required'), trigger: 'blur' }]">
<el-input id="module-box-input-bearer_token" v-model="editModule.configs[0].config.bearer_token" placeholder='' size="small"></el-input> <el-input id="module-box-input-bearer_token" v-model="editModule.configs[0].config.bearer_token" placeholder='' size="small"></el-input>
</el-form-item> </el-form-item>
@@ -323,7 +323,7 @@
<div class="endpoint-title" style="margin-top: 10px"> <div class="endpoint-title" style="margin-top: 10px">
<span class="endpoint-title-content"> <span class="endpoint-title-content">
<i class="nz-icon nz-icon-arrow-down" :class="logsShow?'':'is-active'" @click="logsShow = !logsShow"></i> <i class="nz-icon nz-icon-arrow-down" :class="logsShow?'':'is-active'" @click="logsShow = !logsShow"></i>
{{$t('project.endpoint.logs')}} {{$t('overall.logs')}}
</span> </span>
<el-switch v-model="editModule.configs[1].enable" size="small" :active-value="1" :inactive-value="0"></el-switch> <el-switch v-model="editModule.configs[1].enable" size="small" :active-value="1" :inactive-value="0"></el-switch>
</div> </div>
@@ -333,14 +333,14 @@
<el-tabs v-model="activeNameLogs[index]" class="special-tabs" @tab-click="()=>{tabClick(index)}" :ref="'logsTabs' + index"> <el-tabs v-model="activeNameLogs[index]" class="special-tabs" @tab-click="()=>{tabClick(index)}" :ref="'logsTabs' + index">
<el-tab-pane :label="$t('project.endpoint.basic')" name="Basic"> <el-tab-pane :label="$t('project.endpoint.basic')" name="Basic">
<!--type--> <!--type-->
<el-form-item :label='$t("project.endpoint.type")' class="half-form-item"> <el-form-item :label='$t("overall.type")' class="half-form-item">
<el-select id="module-box-input-type" v-model="item.type" class="right-box__select" placeholder="" popper-class="right-box-select-top prevent-clickoutside" size="small" @change="logsBasicTypeChange(index)"> <el-select id="module-box-input-type" v-model="item.type" class="right-box__select" placeholder="" popper-class="right-box-select-top prevent-clickoutside" size="small" @change="logsBasicTypeChange(index)">
<el-option v-for="item in logsBasicList" :id="'module-type-'+item.id" :key="item.value" :label="item.name" :value="item.value"></el-option> <el-option v-for="item in logsBasicList" :id="'module-type-'+item.id" :key="item.value" :label="item.name" :value="item.value"></el-option>
</el-select> </el-select>
</el-form-item> </el-form-item>
<el-form-item <el-form-item
v-if='item.type === "file"' v-if='item.type === "file"'
:label='item.type === "file" ? $t("project.endpoint.basicTypeFile"):( item.type === "journal" ? $t("project.endpoint.basicTypeJournal") : $t("project.endpoint.basicTypeSyslog"))' class="half-form-item" :label='item.type === "file" ? $t("config.terminallog.path"):( item.type === "journal" ? $t("dashboard.panel.chartForm.unit") : $t("project.endpoint.basicTypeSyslog"))' class="half-form-item"
:prop="'configs.1.config.'+ index +'.fileName'" :prop="'configs.1.config.'+ index +'.fileName'"
:rules="[ { required: true, message: $t('validate.required'), trigger: 'blur' }]" :rules="[ { required: true, message: $t('validate.required'), trigger: 'blur' }]"
> >
@@ -348,7 +348,7 @@
</el-form-item> </el-form-item>
<el-form-item <el-form-item
v-if='item.type === "journal"' v-if='item.type === "journal"'
:label='item.type === "file" ? $t("project.endpoint.basicTypeFile"):( item.type === "journal" ? $t("project.endpoint.basicTypeJournal") : $t("project.endpoint.basicTypeSyslog"))' class="half-form-item" :label='item.type === "file" ? $t("config.terminallog.path"):( item.type === "journal" ? $t("dashboard.panel.chartForm.unit") : $t("project.endpoint.basicTypeSyslog"))' class="half-form-item"
:prop="'configs.1.config.'+ index +'.unit'" :prop="'configs.1.config.'+ index +'.unit'"
:rules="[ { required: true, message: $t('validate.required'), trigger: 'blur' }]" :rules="[ { required: true, message: $t('validate.required'), trigger: 'blur' }]"
> >
@@ -356,7 +356,7 @@
</el-form-item> </el-form-item>
<el-form-item <el-form-item
v-if='item.type === "syslog"' v-if='item.type === "syslog"'
:label='item.type === "file" ? $t("project.endpoint.basicTypeFile"):( item.type === "journal" ? $t("project.endpoint.basicTypeJournal") : $t("project.endpoint.basicTypeSyslog"))' class="half-form-item" :label='item.type === "file" ? $t("config.terminallog.path"):( item.type === "journal" ? $t("dashboard.panel.chartForm.unit") : $t("project.endpoint.basicTypeSyslog"))' class="half-form-item"
:prop="'configs.1.config.'+ index +'.listenAddress'" :prop="'configs.1.config.'+ index +'.listenAddress'"
:rules="[ { required: true, message: $t('validate.required'), trigger: 'blur' }]" :rules="[ { required: true, message: $t('validate.required'), trigger: 'blur' }]"
> >
@@ -598,7 +598,7 @@ export default {
ChartSearchShowFields: [ // ChartSearch 下拉搜索表头 ChartSearchShowFields: [ // ChartSearch 下拉搜索表头
{ title: 'ID', data: 'id' }, { title: 'ID', data: 'id' },
{ {
title: this.$t('config.model.titleName'), title: this.$t('overall.name'),
data: function (row) { data: function (row) {
if (row.name.length > 15) { if (row.name.length > 15) {
return row.name.substring(0, 12) + '...' return row.name.substring(0, 12) + '...'
@@ -607,7 +607,7 @@ export default {
}, },
key: 'name' key: 'name'
}, },
{ title: this.$t('config.model.titleType'), data: 'type', key: 'type' }, { title: this.$t('overall.type'), data: 'type', key: 'type' },
{ {
title: this.$t('overall.remark'), title: this.$t('overall.remark'),
data: function (row) { data: function (row) {
@@ -685,7 +685,7 @@ export default {
], ],
authType: 0, authType: 0,
authTypeList: [ authTypeList: [
{ name: this.$t('project.endpoint.authTypeNull'), value: 0 }, { name: this.$t('project.topology.none'), value: 0 },
{ name: this.$t('project.endpoint.authTypeWord'), value: 1 }, { name: this.$t('project.endpoint.authTypeWord'), value: 1 },
{ name: this.$t('project.endpoint.authTypeToken'), value: 2 } { name: this.$t('project.endpoint.authTypeToken'), value: 2 }
], ],

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

@@ -9,8 +9,8 @@
<div class="right-box__container"> <div class="right-box__container">
<div class="container__form"> <div class="container__form">
<el-form ref="profileForm" :model="editProfile" :rules="rules" label-position="top" label-width="120px"> <el-form ref="profileForm" :model="editProfile" :rules="rules" label-position="top" label-width="120px">
<el-form-item :label="$t('profile.name')" prop="name"> <el-form-item :label="$t('overall.name')" prop="name">
<el-input maxlength="64" show-word-limit v-model="editProfile.name" size="small" type="text"></el-input> <el-input maxlength="64" show-word-limit v-model="editoverall.name" size="small" type="text"></el-input>
</el-form-item> </el-form-item>
<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>

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

@@ -12,7 +12,7 @@
<div class="right-box__container right-box-container__left"> <div class="right-box__container right-box-container__left">
<div class="container__form"> <div class="container__form">
<el-form ref="projectForm" :model="editProject" :rules="rules" label-position = "top" label-width="120px"> <el-form ref="projectForm" :model="editProject" :rules="rules" label-position = "top" label-width="120px">
<el-form-item :label='$t("project.project.project")' prop="name"> <el-form-item :label='$t("overall.name")' prop="name">
<el-input id="project-box-input-name" v-model="editProject.name" maxlength="64" show-word-limit size="small"></el-input> <el-input id="project-box-input-name" v-model="editProject.name" maxlength="64" show-word-limit size="small"></el-input>
</el-form-item> </el-form-item>
<el-form-item :label='$t("overall.remark")'> <el-form-item :label='$t("overall.remark")'>

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

@@ -15,7 +15,7 @@
<el-form-item :label="$t('config.dc.dc')" prop="idcId"> <el-form-item :label="$t('config.dc.dc')" prop="idcId">
<el-input size='mini' v-model="currentDc.name" disabled id="cabinet-box-input-dc"/> <el-input size='mini' v-model="currentDc.name" disabled id="cabinet-box-input-dc"/>
</el-form-item> </el-form-item>
<el-form-item :label="$t('asset.uSize')" prop="uSize"> <el-form-item :label="$t('config.cab.uSize')" prop="uSize">
<el-input v-model.number="editCabinet.uSize" :max="47" id="cabinet-box-input-uSize" size="small"></el-input> <el-input v-model.number="editCabinet.uSize" :max="47" id="cabinet-box-input-uSize" size="small"></el-input>
</el-form-item> </el-form-item>
<el-form-item :label="$t('overall.remark')"> <el-form-item :label="$t('overall.remark')">

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

@@ -11,7 +11,7 @@
<div class="right-box__container"> <div class="right-box__container">
<div class="container__form"> <div class="container__form">
<el-form label-width="120px" size="small" :model="editGlobalization" label-position = "top" ref="globalizationForm"> <el-form label-width="120px" size="small" :model="editGlobalization" label-position = "top" ref="globalizationForm">
<el-form-item :label='$t("config.menus.name")' prop="name"> <el-form-item :label='$t("overall.name")' prop="name">
<el-input placeholder="" maxlength="64" show-word-limit v-model="editGlobalization.name" size="small" id="dc-box-input-name"></el-input> <el-input placeholder="" maxlength="64" show-word-limit v-model="editGlobalization.name" size="small" id="dc-box-input-name"></el-input>
</el-form-item> </el-form-item>
<el-form-item :label='$t("config.menus.code")' prop="code"> <el-form-item :label='$t("config.menus.code")' prop="code">

8
nezha-fronted/src/components/common/rightBox/snmpCredentialBox.vue
View File

@@ -24,7 +24,7 @@
</el-option> </el-option>
</el-select> </el-select>
</el-form-item> </el-form-item>
<el-form-item :label='$t("config.mib.credential.port")' prop="port" > <el-form-item :label='$t("asset.port")' prop="port" >
<el-input placeholder="" v-model.number="editCredential.port" size="small" id="credential-box-input-port"></el-input> <el-input placeholder="" v-model.number="editCredential.port" size="small" id="credential-box-input-port"></el-input>
</el-form-item> </el-form-item>
<el-form-item :label='$t("config.mib.credential.ReadCommunity")' prop="readCommunity" v-if="editCredential.type ===1 || editCredential.type === 2"> <el-form-item :label='$t("config.mib.credential.ReadCommunity")' prop="readCommunity" v-if="editCredential.type ===1 || editCredential.type === 2">
@@ -33,7 +33,7 @@
<el-form-item :label='$t("config.mib.credential.writeCommunity")' prop="writeCommunity" v-if="editCredential.type ===1 || editCredential.type === 2"> <el-form-item :label='$t("config.mib.credential.writeCommunity")' prop="writeCommunity" v-if="editCredential.type ===1 || editCredential.type === 2">
<el-input placeholder="" autocomplete="new-password" maxlength="64" show-word-limit v-model="editCredential.config.writeCommunity" size="small" id="credential-box-input-writeCommunity" type="password" show-password></el-input> <el-input placeholder="" autocomplete="new-password" maxlength="64" show-word-limit v-model="editCredential.config.writeCommunity" size="small" id="credential-box-input-writeCommunity" type="password" show-password></el-input>
</el-form-item> </el-form-item>
<el-form-item :label='$t("config.mib.credential.username")' prop="username" v-if="editCredential.type === 3"> <el-form-item :label='$t("asset.username")' prop="username" v-if="editCredential.type === 3">
<el-input placeholder="" maxlength="64" show-word-limit v-model="editCredential.config.username" size="small" id="credential-box-input-username"></el-input> <el-input placeholder="" maxlength="64" show-word-limit v-model="editCredential.config.username" size="small" id="credential-box-input-username"></el-input>
</el-form-item> </el-form-item>
<el-form-item :label='$t("config.mib.credential.contextName")' prop="contextname" v-if="editCredential.type === 3"> <el-form-item :label='$t("config.mib.credential.contextName")' prop="contextname" v-if="editCredential.type === 3">
@@ -50,7 +50,7 @@
</el-option> </el-option>
</el-select> </el-select>
</el-form-item> </el-form-item>
<el-form-item :label='$t("config.mib.credential.pin")' prop="authPin" v-if="editCredential.type === 3"> <el-form-item :label='$t("login.pin")' prop="authPin" v-if="editCredential.type === 3">
<el-input placeholder="" autocomplete="new-password" v-model="editCredential.config.authPin" size="small" id="credential-box-input-authPin" type="password" show-password></el-input> <el-input placeholder="" autocomplete="new-password" v-model="editCredential.config.authPin" size="small" id="credential-box-input-authPin" type="password" show-password></el-input>
</el-form-item> </el-form-item>
@@ -64,7 +64,7 @@
</el-option> </el-option>
</el-select> </el-select>
</el-form-item> </el-form-item>
<el-form-item :label='$t("config.mib.credential.pin")' prop="privPin" v-if="editCredential.type === 3"> <el-form-item :label='$t("login.pin")' prop="privPin" v-if="editCredential.type === 3">
<el-input placeholder="" autocomplete="new-password" v-model="editCredential.config.privPin" size="small" id="credential-box-input-privPin" :disabled="!editCredential.config.authProtocol || editCredential.config.authProtocol === ''" type="password" show-password></el-input> <el-input placeholder="" autocomplete="new-password" v-model="editCredential.config.privPin" size="small" id="credential-box-input-privPin" :disabled="!editCredential.config.authProtocol || editCredential.config.authProtocol === ''" type="password" show-password></el-input>
</el-form-item> </el-form-item>
</el-form> </el-form>

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

@@ -10,7 +10,7 @@
<el-input :disabled="true" v-model="dc.name" id="traffic-setting-name"></el-input> <el-input :disabled="true" v-model="dc.name" id="traffic-setting-name"></el-input>
</el-form-item> </el-form-item>
<traffic-setting-tab ref="trafficSetting" :post-asset-list="assetList" v-for="(item,index) in traffic.setting" :index="index" :asset-setting="item" :key="uuids[index]" :id="uuids[index]" @delSelf="delAssetSetting" :validate-repeat-func="valiateRepeatFunc"></traffic-setting-tab> <traffic-setting-tab ref="trafficSetting" :post-asset-list="assetList" v-for="(item,index) in traffic.setting" :index="index" :asset-setting="item" :key="uuids[index]" :id="uuids[index]" @delSelf="delAssetSetting" :validate-repeat-func="valiateRepeatFunc"></traffic-setting-tab>
<button @click="addAssetSetting" class="nz-btn nz-btn-size-normal nz-btn-style-light" id="traffic-setting-add" style="margin:15px 1px 15px 15px" type="button">{{$t('config.dc.traffic.add')}}</button> <button @click="addAssetSetting" class="nz-btn nz-btn-size-normal nz-btn-style-light" id="traffic-setting-add" style="margin:15px 1px 15px 15px" type="button">{{$t('project.topology.add')}}</button>
</el-form> </el-form>
</div> </div>

6
nezha-fronted/src/components/common/rightBox/trafficSetting/trafficSettingTab.vue
View File

@@ -22,7 +22,7 @@
<div class="mib-browser-ad-search"> <div class="mib-browser-ad-search">
<el-row class="mib-browser-ad-search-item" style="font-weight: bold">{{$t('config.dc.traffic.snmpSetting')}}</el-row> <el-row class="mib-browser-ad-search-item" style="font-weight: bold">{{$t('config.dc.traffic.snmpSetting')}}</el-row>
<el-row class="mib-browser-ad-search-item"> <el-row class="mib-browser-ad-search-item">
<el-col :span="6"><div class="mib-browser-ad-search-label">{{$t("project.endpoint.port")}}</div></el-col> <el-col :span="6"><div class="mib-browser-ad-search-label">{{$t("asset.port")}}</div></el-col>
<el-col :span="17"> <el-col :span="17">
<el-input class="input-x-mini-24" v-model.number="assetSetting.port" id="traffic-setting-port"></el-input> <el-input class="input-x-mini-24" v-model.number="assetSetting.port" id="traffic-setting-port"></el-input>
</el-col> </el-col>
@@ -34,7 +34,7 @@
</el-col> </el-col>
</el-row> </el-row>
<el-row class="mib-browser-ad-search-item"> <el-row class="mib-browser-ad-search-item">
<el-col :span="6"><div class="mib-browser-ad-search-label">{{$t('project.module.version')}}</div></el-col> <el-col :span="6"><div class="mib-browser-ad-search-label">{{$t('overall.version')}}</div></el-col>
<el-col :span="17"> <el-col :span="17">
<el-radio-group v-model.number="assetSetting.version" id="traffic-setting-version"> <el-radio-group v-model.number="assetSetting.version" id="traffic-setting-version">
<el-radio-button :label="2"></el-radio-button> <el-radio-button :label="2"></el-radio-button>
@@ -77,7 +77,7 @@
<el-row class="mib-browser-ad-search-item same-label-width" v-if="assetSetting.auth.securityLevel == 'authNoPriv' || assetSetting.auth.securityLevel == 'authPriv'"> <el-row class="mib-browser-ad-search-item same-label-width" v-if="assetSetting.auth.securityLevel == 'authNoPriv' || assetSetting.auth.securityLevel == 'authPriv'">
<el-col :span="6"> <el-col :span="6">
<div class="mib-browser-ad-search-label">{{$t('project.module.authProtocol')}}</div> <div class="mib-browser-ad-search-label">{{$t('asset.authProtocol')}}</div>
</el-col> </el-col>
<el-col :span="17"> <el-col :span="17">
<el-radio-group v-model="assetSetting.auth.authProtocol" id="traffic-setting-authProtocol"> <el-radio-group v-model="assetSetting.auth.authProtocol" id="traffic-setting-authProtocol">

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

@@ -344,7 +344,7 @@ export default {
} }
}) })
this.select_list.push({ this.select_list.push({
name: this.$t('alert.list.state'), name: this.$t('overall.state'),
type: 'select', type: 'select',
label: 'state', label: 'state',
disabled: false, disabled: false,

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

@@ -28,11 +28,11 @@ const searchSelectInfo = { // value: 传给后台的值；label：显示给用
alertType: [ // 告警类型 alertType: [ // 告警类型
{ {
value: 1, value: 1,
label: i18n.t('alert.config.typeOption.project') label: i18n.t('project.project.projectName')
}, },
{ {
value: 2, value: 2,
label: i18n.t('alert.config.typeOption.module') label: i18n.t('overall.module')
}, },
{ {
value: 3, value: 3,
@@ -57,10 +57,10 @@ const searchSelectInfo = { // value: 传给后台的值；label：显示给用
label: i18n.t('config.agent.up') label: i18n.t('config.agent.up')
}, { }, {
value: 0, value: 0,
label: i18n.t('config.agent.down') label: i18n.t('asset.down')
}, { }, {
value: 2, value: 2,
label: i18n.t('cconfig.dc.suspended') label: i18n.t('asset.suspended')
} }
], ],
promState: [ promState: [
@@ -69,7 +69,7 @@ const searchSelectInfo = { // value: 传给后台的值；label：显示给用
label: i18n.t('config.agent.up') label: i18n.t('config.agent.up')
}, { }, {
value: '0,-1', value: '0,-1',
label: i18n.t('config.agent.down') label: i18n.t('asset.down')
} }
], ],
pingStatus: [ pingStatus: [
@@ -176,11 +176,11 @@ const searchSelectInfo = { // value: 传给后台的值；label：显示给用
ack: [ ack: [
{ {
value: '1', value: '1',
label: i18n.t('config.system.reset.yes') label: i18n.t('tip.yes')
}, },
{ {
value: '0', value: '0',
label: i18n.t('config.system.reset.no') label: i18n.t('tip.no')
} }
], ],
varType: [ varType: [
@@ -222,11 +222,11 @@ const searchSelectInfo = { // value: 传给后台的值；label：显示给用
}, },
{ {
value: 'url', value: 'url',
label: i18n.t('dashboard.panel.chartForm.typeVal.url.label') label: i18n.t('dashboard.panel.chartForm.url')
}, },
{ {
value: 'group', value: 'group',
label: i18n.t('dashboard.panel.chartForm.typeVal.group.label') label: i18n.t('dashboard.panel.chartForm.group')
} }
], ],
terminalStatus: [ terminalStatus: [

6
nezha-fronted/src/components/common/table/alert/alertMessageTable.vue
View File

@@ -218,13 +218,13 @@ export default {
show: true, show: true,
minWidth: 200 minWidth: 200
}, { }, {
label: this.$t('alert.list.state'), label: this.$t('overall.state'),
prop: 'state', prop: 'state',
show: true, show: true,
width: 100 width: 100
// sortable: 'custom' // sortable: 'custom'
}, { }, {
label: this.$t('alert.startAt'), label: this.$t('overall.startTime'),
prop: 'startAt', prop: 'startAt',
show: true, show: true,
width: 150, width: 150,
@@ -499,7 +499,7 @@ export default {
labelsClassName (row) { labelsClassName (row) {
if (row.column.label == this.$t('alert.list.labels')) { if (row.column.label == this.$t('alert.list.labels')) {
return 'alert-message-list-labels' return 'alert-message-list-labels'
} else if (row.column.label == this.$t('alert.list.state')) { } else if (row.column.label == this.$t('overall.state')) {
if (row.row.state == 1) { if (row.row.state == 1) {
return '' return ''
} else if (row.row.state == 2) { } else if (row.row.state == 2) {

4
nezha-fronted/src/components/common/table/alert/alertRuleEvalLogTable.vue
View File

@@ -86,7 +86,7 @@ export default {
return { return {
tableTitle: [ tableTitle: [
{ {
label: this.$t('config.dc.state'), label: this.$t('overall.state'),
prop: 'state', prop: 'state',
show: true, show: true,
minWidth: 100 minWidth: 100
@@ -96,7 +96,7 @@ export default {
show: true, show: true,
minWidth: 100 minWidth: 100
}, { }, {
label: this.$t('alert.silence.startTime'), label: this.$t('overall.startTime'),
prop: 'stts', prop: 'stts',
show: true, show: true,
minWidth: 300 minWidth: 300

2
nezha-fronted/src/components/common/table/alert/alertRuleTable.vue
View File

@@ -242,7 +242,7 @@ export default {
show: false, show: false,
minWidth: 100 minWidth: 100
}, { }, {
label: this.$t('config.dc.state'), label: this.$t('overall.state'),
prop: 'state', prop: 'state',
show: true, show: true,
minWidth: 100, minWidth: 100,

8
nezha-fronted/src/components/common/table/alert/alertSilenceTable.vue
View File

@@ -199,7 +199,7 @@ export default {
sortable: "custom", sortable: "custom",
}, },
{ {
label: this.$t("alert.silence.name"), label: this.$t("overall.name"),
prop: "name", prop: "name",
show: true, show: true,
minWidth: 150, minWidth: 150,
@@ -212,7 +212,7 @@ export default {
sortable: "custom", sortable: "custom",
}, },
{ {
label: this.$t("alert.silence.startTime"), label: this.$t("overall.startTime"),
prop: "startAt", prop: "startAt",
show: true, show: true,
width: 300, width: 300,
@@ -225,7 +225,7 @@ export default {
width: 120, width: 120,
}, },
{ {
label: this.$t("alert.silence.remark"), label: this.$t("overall.remark"),
prop: "remark", prop: "remark",
show: true, show: true,
width: 120, width: 120,
@@ -244,7 +244,7 @@ export default {
sortable: "custom", sortable: "custom",
}, },
{ {
label: this.$t("alert.silence.state"), label: this.$t("overall.state"),
prop: "state", prop: "state",
show: true, show: true,
width: 120, width: 120,

10
nezha-fronted/src/components/common/table/asset/assetMetaTable.vue
View File

@@ -112,25 +112,25 @@ export default {
width: 80, width: 80,
sortable: 'custom' sortable: 'custom'
}, { }, {
label: this.$t('config.assetLabel.name'), label: this.$t('overall.name'),
prop: 'name', prop: 'name',
show: true, show: true,
minWidth: 250, minWidth: 250,
sortable: 'custom' sortable: 'custom'
}, { }, {
label: this.$t('config.assetLabel.key'), label: this.$t('overall.key'),
prop: 'metaKey', prop: 'metaKey',
show: true, show: true,
width: 200, width: 200,
sortable: 'custom' sortable: 'custom'
}, { }, {
label: this.$t('config.assetLabel.group'), label: this.$t('dashboard.panel.chartForm.group'),
prop: 'group', prop: 'group',
show: true, show: true,
width: 200, width: 200,
sortable: 'custom' sortable: 'custom'
}, { }, {
label: this.$t('config.assetLabel.search'), label: this.$t('overall.search'),
prop: 'search', prop: 'search',
width: 120, width: 120,
show: true show: true
@@ -140,7 +140,7 @@ export default {
width: 120, width: 120,
show: true show: true
}, { }, {
label: this.$t('config.assetLabel.type'), label: this.$t('overall.type'),
prop: 'type', prop: 'type',
width: 150, width: 150,
show: true show: true

12
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('config.user.disable') }} <div class="active-icon gray-bg inline-block"></div> {{ $t('project.endpoint.disable') }}
</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') }}
@@ -139,7 +139,7 @@
<el-dropdown-menu slot="dropdown" class="right-box-select-top right-public-box-dropdown-top"> <el-dropdown-menu slot="dropdown" class="right-box-select-top right-public-box-dropdown-top">
<el-dropdown-item v-if="!assetTab" v-has="'asset_edit'" :command="['edit', scope.row]"><i class="nz-icon nz-icon-edit"></i><span class="operation-dropdown-text">{{$t('overall.edit')}}</span></el-dropdown-item> <el-dropdown-item v-if="!assetTab" v-has="'asset_edit'" :command="['edit', scope.row]"><i class="nz-icon nz-icon-edit"></i><span class="operation-dropdown-text">{{$t('overall.edit')}}</span></el-dropdown-item>
<el-dropdown-item v-has="'asset_connect'" :command="['cli', scope.row]" :disabled="!scope.row.authUsername"><i class="nz-icon nz-icon-cli"></i><span class="operation-dropdown-text">{{$t('dashboard.connect')}}</span></el-dropdown-item> <el-dropdown-item v-has="'asset_connect'" :command="['cli', scope.row]" :disabled="!scope.row.authUsername"><i class="nz-icon nz-icon-cli"></i><span class="operation-dropdown-text">{{$t('dashboard.connect')}}</span></el-dropdown-item>
<el-dropdown-item v-has="'asset_add'" :command="['duplicate', scope.row]"><i class="nz-icon nz-icon-override"></i><span class="operation-dropdown-text">{{$t('dashboard.duplicate')}}</span></el-dropdown-item> <el-dropdown-item v-has="'asset_add'" :command="['duplicate', scope.row]"><i class="nz-icon nz-icon-override"></i><span class="operation-dropdown-text">{{$t('overall.duplicate')}}</span></el-dropdown-item>
<el-dropdown-item v-has="'asset_delete'" :command="['delete', scope.row]"><i class="nz-icon nz-icon-delete"></i><span class="operation-dropdown-text">{{$t('overall.delete')}}</span></el-dropdown-item> <el-dropdown-item v-has="'asset_delete'" :command="['delete', scope.row]"><i class="nz-icon nz-icon-delete"></i><span class="operation-dropdown-text">{{$t('overall.delete')}}</span></el-dropdown-item>
<el-dropdown-item v-has="'alertSilence_add'" :command="['fastSilence', scope.row, 'asset']"><i class="nz-icon nz-icon-fast-silence"></i><span class="operation-dropdown-text">{{$t('overall.silenceAlert')}}</span></el-dropdown-item> <el-dropdown-item v-has="'alertSilence_add'" :command="['fastSilence', scope.row, 'asset']"><i class="nz-icon nz-icon-fast-silence"></i><span class="operation-dropdown-text">{{$t('overall.silenceAlert')}}</span></el-dropdown-item>
<el-dropdown-item v-has="'asset_add'" :command="['topology', scope.row, 'asset']"><i class="nz-icon nz-icon-Topology"></i><span class="operation-dropdown-text">{{$t('overall.topology')}}</span></el-dropdown-item> <el-dropdown-item v-has="'asset_add'" :command="['topology', scope.row, 'asset']"><i class="nz-icon nz-icon-Topology"></i><span class="operation-dropdown-text">{{$t('overall.topology')}}</span></el-dropdown-item>
@@ -212,12 +212,12 @@ export default {
minWidth: 140, minWidth: 140,
sortable: 'custom' sortable: 'custom'
}, { }, {
label: this.$t('overall.parent'), label: this.$t('asset.parent'),
prop: 'parent', prop: 'parent',
show: false, show: false,
minWidth: 110 minWidth: 110
}, { }, {
label: this.$t('overall.children'), label: this.$t('overall.assetSubTab'),
prop: 'children', prop: 'children',
show: false, show: false,
minWidth: 120 minWidth: 120
@@ -228,7 +228,7 @@ export default {
minWidth: 140, minWidth: 140,
sortable: 'custom' sortable: 'custom'
}, { }, {
label: this.$t('asset.state'), label: this.$t('overall.state'),
prop: 'state', prop: 'state',
show: true, show: true,
minWidth: 110, minWidth: 110,
@@ -251,7 +251,7 @@ export default {
minWidth: 110, minWidth: 110,
sortable: 'custom' sortable: 'custom'
}, { }, {
label: this.$t('asset.alertNum'), label: this.$t('overall.alert'),
prop: 'alertNum', prop: 'alertNum',
show: true, show: true,
width: 120, width: 120,

10
nezha-fronted/src/components/common/table/settings/agentTable.vue
View File

@@ -113,7 +113,7 @@ export default {
minWidth: 200, minWidth: 200,
sortable: 'custom' sortable: 'custom'
}, { }, {
label: this.$t('config.agent.dataCenter'), label: this.$t('overall.dc'),
prop: 'dc', prop: 'dc',
show: true, show: true,
minWidth: 200, minWidth: 200,
@@ -123,17 +123,17 @@ export default {
prop: 'host', prop: 'host',
show: true show: true
}, { }, {
label: this.$t('config.agent.port'), label: this.$t('asset.port'),
prop: 'port', prop: 'port',
show: true show: true
}, { }, {
label: this.$t('config.agent.type'), label: this.$t('overall.type'),
prop: 'type', prop: 'type',
show: true, show: true,
minWidth: 100, minWidth: 100,
sortable: 'custom' sortable: 'custom'
}, { }, {
label: this.$t('asset.state'), label: this.$t('overall.state'),
prop: 'status', prop: 'status',
show: true, show: true,
minWidth: 100, minWidth: 100,
@@ -144,7 +144,7 @@ export default {
show: false, show: false,
minWidth: 150 minWidth: 150
}, { }, {
label: this.$t('config.agent.protocol'), label: this.$t('webshell.protocol'),
prop: 'protocol', prop: 'protocol',
show: false, show: false,
minWidth: 150 minWidth: 150

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

@@ -113,7 +113,7 @@ export default {
width: 80, width: 80,
sortable: 'custom' sortable: 'custom'
}, { }, {
label: this.$t('config.assetType.name'), label: this.$t('overall.name'),
prop: 'name', prop: 'name',
show: true, show: true,
width: 120, width: 120,

4
nezha-fronted/src/components/common/table/settings/cabinetTable.vue
View File

@@ -82,12 +82,12 @@ export default {
show: true show: true
}, },
{ {
label: this.$t('asset.uSize'), label: this.$t('config.cab.uSize'),
prop: 'uSize', prop: 'uSize',
show: true show: true
}, },
{ {
label: this.$t('config.dc.assets'), label: this.$t('guide.asset'),
prop: 'assetNum', prop: 'assetNum',
show: true show: true
}, },

Some files were not shown because too many files have changed in this diff Show More