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:
wangwenrui
2020-10-30 12:30:49 +08:00
parent 3c78ba1ded
commit bf9da3b4ca
6 changed files with 25 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
nezha-fronted/src/assets/stylus/main.scss
View File

@@ -673,7 +673,7 @@ li{
margin-top: -2px;
}*/
.top-tool-main-right-to-left {
right: calc(100% - 341px) !important;
right: calc(100% - 390px) !important;
/*transform: translateX(100%);*/
}
/* end--顶部工具栏*/

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

@@ -5,8 +5,8 @@
<i class="nz-icon nz-icon-arrow-down"></i>
<transition name="el-zoom-in-top">
<ul class="el-dropdown-menu el-popper el-dropdown-menu--mini export-dropdown" v-show="exportShow">
<li @click="showImportBox(1)" class="el-dropdown-menu__item dropdown-content"><i class="nz-icon nz-icon-upload"></i>import</li>
<li @click="showImportBox(2)" class="el-dropdown-menu__item dropdown-content"><i class="nz-icon nz-icon-download1"></i>export</li>
<li @click="showImportBox(1)" class="el-dropdown-menu__item dropdown-content"><i class="nz-icon nz-icon-upload"></i>{{$t('overall.importExcel')}}</li>
<li @click="showImportBox(2)" class="el-dropdown-menu__item dropdown-content"><i class="nz-icon nz-icon-download1"></i>{{$t('overall.exportExcel')}}</li>
</ul>
</transition>
</button>

30
nezha-fronted/src/components/common/language/cn.js
View File

@@ -41,8 +41,8 @@ const cn = {
createAsset: "新增资产",
createAlertRule: "新增告警规则",
createAccount: "新增用户名",
createPrometheusServer: "新增 prometheus server",
createDatacenter: "新增DC",
createPrometheusServer: "新增prometheus服务",
createDatacenter: "新增数据中心",
active: "活跃",
type: "类别",
preview: "预览",
@@ -72,7 +72,7 @@ const cn = {
failedDetail: "失败详情"
},
reset: "重置",
submit: "提交",
submit: "保存",
noData:'没有数据',
tag: '标签',
syncChart:'同步图表',
@@ -213,7 +213,7 @@ const cn = {
recOneMonth: "最近1月",
curMonth: "本月",
lastMonth: "上月",
customTimeRange: "Custom time range",
customTimeRange: "自定义时间区间",
noDate:'无',
lastFiveMin: "最近5分钟",
lastFifteenMin: "最近15分钟",
@@ -415,18 +415,18 @@ const cn = {
},
purchaseDate: "购买日期",
dataSelectTip: "请选择日期",
dc: "DC",
dcName: "DC名称",
dc: "数据中心",
dcName: "数据中心名称",
AddIdcTab: {
title: "新增DC",
dcName: "DC名称",
title: "新增数据中心",
dcName: "数据中心名称",
location: "地区",
principal: "负责人",
tel: "电话"
},
editIdcTab: {
title: "编辑DC",
dcName: "DC名称",
title: "编辑数据中心",
dcName: "数据中心名称",
location: "地区",
principal: "负责人",
tel: "电话"
@@ -440,14 +440,14 @@ const cn = {
name: "名称",
uSize: "U位",
remark: "描述",
DC: "DC"
DC: "数据中心"
},
editCabinetTab: {
title: "编辑机柜",
name: "名称",
uSize: "U位",
remark: "描述",
DC: "DC"
DC: "数据中心"
},
uSize: "U位",
remark: "描述",
@@ -468,7 +468,7 @@ const cn = {
assetState: "状态",
modules: "Endpoint",
alerts: "告警信息",
dataCenter: "DC",
dataCenter: "数据中心",
cabinet: "机柜",
model: "型号",
manufacturer: "厂商",
@@ -601,7 +601,7 @@ const cn = {
dc: {
dc: "数据中心",
area: "地区",
dcName: 'DC名称',
dcName: '数据中心名称',
selectArea: "选择地区",
cabinetNum: "机柜数量",
assets: "资产",
@@ -845,7 +845,7 @@ const cn = {
port: "端口",
param: "参数",
path: "路径",
asset: "设备",
asset: "资产",
lastUpdate: "最后更新时间",
moduleParameter: "模块参数",
addGraph: "查看图表",

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

@@ -76,7 +76,7 @@ const en = {
failedDetail:'Failed Detail'
},
reset:'Reset',
submit:'Submit',
submit:'Save',
noData:'No data',
tag: 'Tag',
placeHolder:'Please enter',

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

@@ -828,7 +828,7 @@
max-width: calc(100% - 40px); min-width: 20px; overflow: hidden; white-space: nowrap; text-overflow: ellipsis;
}
.tag-mark{
color:orange; width: 40px;
color:orange; width: 42px;
}
}
/*/deep/ .sidebar-info-item .el-checkbox__label{*/

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

@@ -37,7 +37,7 @@
</el-form-item>
<el-form-item>
<button type="button" class="nz-btn nz-btn-size-normal-new nz-btn-style-light-new" @click="resetForm('basicForm','basic')" style="top:2px">{{$t('overall.reset')}}</button>
<button type="primary" @click="saveSetInfo('basic','basicForm')" class="nz-btn nz-btn-size-normal-new nz-btn-style-normal-new">{{$t('overall.submit')}}</button>
<button type="button" @click="saveSetInfo('basic','basicForm')" class="nz-btn nz-btn-size-normal-new nz-btn-style-normal-new">{{$t('overall.submit')}}</button>
</el-form-item>
</el-form>
</div>
@@ -84,7 +84,7 @@
<el-form-item>
<button type="button" class="nz-btn nz-btn-size-normal-new nz-btn-style-light-new" @click="resetForm('emailForm','email')" style="top:2px">{{$t('overall.reset')}}</button>
<button type="button" class="nz-btn nz-btn-size-normal-new nz-btn-style-light-new" :class="{'nz-btn-disabled':email.email_enable == 'off'}" :disabled="email.email_enable == 'off'" @click="testSetInfo('email','emailForm')" style="top:2px">{{$t('config.system.email.testConnection')}}</button>
<button type="primary" @click="saveSetInfo('email','emailForm')" class="nz-btn nz-btn-size-normal-new nz-btn-style-normal-new">{{$t('overall.submit')}}</button>
<button type="button" @click="saveSetInfo('email','emailForm')" class="nz-btn nz-btn-size-normal-new nz-btn-style-normal-new">{{$t('overall.submit')}}</button>
</el-form-item>
</el-form>
</div>
@@ -96,7 +96,7 @@
<el-input-number v-model="terminal.max_terminal_num" controls-position="right" :min="1" :max="50"></el-input-number>
</el-form-item>
<el-form-item>
<button type="primary" @click="saveSetInfo('terminal','terminalForm')" class="nz-btn nz-btn-size-normal-new nz-btn-style-normal-new">{{$t('overall.submit')}}</button>
<button type="button" @click="saveSetInfo('terminal','terminalForm')" class="nz-btn nz-btn-size-normal-new nz-btn-style-normal-new">{{$t('overall.submit')}}</button>
</el-form-item>
</el-form>
</div>
@@ -128,7 +128,7 @@
<el-form-item>
<button type="button" class="nz-btn nz-btn-size-normal-new nz-btn-style-light-new" @click="resetForm('ldapForm','ldap')" style="top:2px">{{$t('overall.reset')}}</button>
<button type="button" class="nz-btn nz-btn-size-normal-new nz-btn-style-light-new" @click="testSetInfo('ldap','ldapForm')" style="top:2px">{{$t('config.system.email.testConnection')}}</button>
<button type="primary" @click="saveSetInfo('ldap','ldapForm')" class="nz-btn nz-btn-size-normal-new nz-btn-style-normal-new">{{$t('overall.submit')}}</button>
<button type="button" @click="saveSetInfo('ldap','ldapForm')" class="nz-btn nz-btn-size-normal-new nz-btn-style-normal-new">{{$t('overall.submit')}}</button>
</el-form-item>
</el-form>
</div>
@@ -177,7 +177,7 @@
<el-input v-model="item.url" width="460px" />
</el-form-item>
<el-form-item prop="btn">
<button type="primary" class="linkBtn nz-btn nz-btn-size-small-new nz-btn-style-normal-new" @click="linkUpdate(item)">Update</button>
<button type="button" class="linkBtn nz-btn nz-btn-size-small-new nz-btn-style-normal-new" @click="linkUpdate(item)">Update</button>
<button type="button" class="linkBtn nz-btn nz-btn-size-small-new nz-btn-style-light-new" @click="linkCancel(item)">Cancel</button>
</el-form-item>
</el-form>