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

Merge branch 'dev-2.0' of https://git.mesalab.cn/nezha/nezha-fronted into dev-3.1

Browse Source 
# Conflicts:
#	nezha-fronted/src/assets/css/font/iconfont.css
#	nezha-fronted/src/assets/css/font/iconfont.ttf
#	nezha-fronted/src/assets/css/font/iconfont.woff
#	nezha-fronted/src/assets/css/font/iconfont.woff2
#	nezha-fronted/src/assets/css/nzIcon.css
This commit is contained in:
zhangyu
2021-10-15 16:02:26 +08:00
parent f635c87740 e66b503291
commit ebd8baf38b
10 changed files with 40 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
nezha-fronted/src/assets/css/font/iconfont.css
View File

@@ -1,8 +1,8 @@
@font-face {
font-family: "nz-icon"; /* Project id 2030432 */
src: url('iconfont.woff2?t=1634200870921') format('woff2'),
url('iconfont.woff?t=1634200870921') format('woff'),
url('iconfont.ttf?t=1634200870921') format('truetype');
src: url('iconfont.woff2?t=1634284850064') format('woff2'),
url('iconfont.woff?t=1634284850064') format('woff'),
url('iconfont.ttf?t=1634284850064') format('truetype');
}
.nz-icon {
@@ -13,23 +13,23 @@
-moz-osx-font-smoothing: grayscale;
}
.nz-icon-yuyan:before {
.nz-icon-language-change:before {
content: "\e746";
}
.nz-icon-guide1:before {
.nz-icon-guide:before {
content: "\e744";
}
.nz-icon-wailian:before {
.nz-icon-more-app:before {
content: "\e745";
}
.nz-icon-liebiao:before {
.nz-icon-list-view:before {
content: "\e742";
}
.nz-icon-xiangxishitu:before {
.nz-icon-detail-view:before {
content: "\e743";
}
@@ -133,7 +133,7 @@
content: "\e725";
}
.nz-icon-more2:before {
.nz-icon-more4:before {
content: "\e72d";
}
@@ -313,7 +313,7 @@
content: "\e6ff";
}
.nz-icon-more-app:before {
.nz-icon-more2:before {
content: "\e700";
}
@@ -325,7 +325,7 @@
content: "\e702";
}
.nz-icon-language-change:before {
.nz-icon-language-change1:before {
content: "\e703";
}

BIN
nezha-fronted/src/assets/css/font/iconfont.ttf
View File

Binary file not shown.

BIN
nezha-fronted/src/assets/css/font/iconfont.woff
View File

Binary file not shown.

BIN
nezha-fronted/src/assets/css/font/iconfont.woff2
View File

Binary file not shown.

22
nezha-fronted/src/assets/css/nzIcon.css
View File

@@ -1,8 +1,8 @@
@font-face {
font-family: "nz-icon"; /* Project id 2030432 */
src: url('./font/iconfont.woff2?t=1634200870921') format('woff2'),
url('./font/iconfont.woff?t=1634200870921') format('woff'),
url('./font/iconfont.ttf?t=1634200870921') format('truetype');
src: url('./font/iconfont.woff2?t=1634284850064') format('woff2'),
url('./font/iconfont.woff?t=1634284850064') format('woff'),
url('./font/iconfont.ttf?t=1634284850064') format('truetype');
}
.nz-icon {
@@ -13,23 +13,23 @@
-moz-osx-font-smoothing: grayscale;
}
.nz-icon-yuyan:before {
.nz-icon-language-change:before {
content: "\e746";
}
.nz-icon-guide1:before {
.nz-icon-guide:before {
content: "\e744";
}
.nz-icon-wailian:before {
.nz-icon-more-app:before {
content: "\e745";
}
.nz-icon-liebiao:before {
.nz-icon-list-view:before {
content: "\e742";
}
.nz-icon-xiangxishitu:before {
.nz-icon-detail-view:before {
content: "\e743";
}
@@ -133,7 +133,7 @@
content: "\e725";
}
.nz-icon-more2:before {
.nz-icon-more4:before {
content: "\e72d";
}
@@ -313,7 +313,7 @@
content: "\e6ff";
}
.nz-icon-more-app:before {
.nz-icon-more2:before {
content: "\e700";
}
@@ -325,7 +325,7 @@
content: "\e702";
}
.nz-icon-language-change:before {
.nz-icon-language-change1:before {
content: "\e703";
}

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

@@ -1,7 +1,7 @@
<template>
<el-dropdown :size="size">
<button id="more" :class="triggerButtonClass" title="more...">
<i class="nz-icon nz-icon-more2" style="font-size: 12px;"></i>
<i class="nz-icon nz-icon-more2"></i>
</button>
<el-dropdown-menu slot="dropdown" class="right-public-box-select-top right-public-box-dropdown-top">
<el-dropdown-item v-if="showLock">

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

@@ -21,7 +21,7 @@
<el-form-item :label="$t('profile.mobile')" prop="mobile">
<el-input maxlength="64" show-word-limit v-model="editProfile.mobile" size="small" type="text"></el-input>
</el-form-item>
<el-form-item :label="$t('profile.role')" v-if="editProfile.roles[0].i18n != ''" prop="roles">
<el-form-item :label="$t('profile.role')" v-if="editProfile.roles[0].i18n !== ''" prop="roles">
<el-input maxlength="64" show-word-limit v-model="editProfile.roles[0].i18n" disabled size="small" type="text"></el-input>
</el-form-item>
<el-form-item :label="$t('profile.role')" v-else prop="roles">
@@ -82,7 +82,6 @@ export default {
{ value: 'en', label: 'English' },
{ value: 'cn', label: '简体中文' }
],
roles: [],
rules: {
name: [
{ required: true, message: this.$t('validate.required'), trigger: 'blur' }
@@ -136,5 +135,5 @@ export default {
}
</script>
<style lang="scss">
@import '@/assets/css/common/rightboxcommon.scss';
@import '@/assets/css/common/rightBoxCommon.scss';
</style>

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

@@ -8,7 +8,7 @@
</div>
<div class="right-box__container">
<div class="container__form">
<el-form class="right-box-form right-box-form-left" label-width="120px" label-position = "top" :model="editCabinet" ref="cabinetForm" :rules="rules">
<el-form label-width="120px" label-position = "top" :model="editCabinet" ref="cabinetForm" :rules="rules">
<el-form-item :label="$t('overall.name')" prop="name">
<el-input size='mini' maxlength="64" show-word-limit v-model="editCabinet.name" id="cabinet-box-input-name"/>
</el-form-item>
@@ -16,7 +16,7 @@
<el-input size='mini' v-model="currentDc.name" disabled id="cabinet-box-input-dc"/>
</el-form-item>
<el-form-item :label="$t('asset.uSize')" prop="uSize">
<el-input v-model.number="editCabinet.uSize" :max="47" id="cabinet-box-input-uSize"></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 :label="$t('overall.remark')">
<el-input size='mini' maxlength="256" show-word-limit v-model="editCabinet.remark" type="textarea" :rows="2" id="cabinet-box-input-remark"/>

5
nezha-fronted/src/components/layout/header.vue
View File

@@ -116,7 +116,6 @@ export default {
permission: 'header_add_rule'
}
],
showChangePin: false,
showGuide: false
}
},
@@ -165,7 +164,6 @@ export default {
// })
// },
showPinDialog () {
// this.showChangePin = true
this.$router.push({
path: '/profile',
query: {
@@ -174,7 +172,6 @@ export default {
})
},
dialogClosed () {
this.showChangePin = false
this.showGuide = false
},
cancel () {
@@ -332,7 +329,7 @@ export default {
.personal {
display: flex;
.el-dropdown {
margin: 0 10px 0 30px;
margin: 0 20px;
height: 36px;
line-height: 50px;
text-align: center;

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

@@ -142,7 +142,6 @@ import QRCode from "qrcodejs2"
import MessageBox from "element-ui/packages/message-box/src/main"
import i18n from "@/components/common/i18n"
import profileBox from '@/components/common/rightBox/profileBox'
import dataList from '@/components/common/mixin/dataList'
export default {
name: 'profile',
@@ -150,7 +149,6 @@ export default {
operationRecord,
profileBox
},
mixins: [dataList],
data () {
return {
username: sessionStorage.getItem('nz-username'),
@@ -165,6 +163,10 @@ export default {
authToken: '',
url: 'sys/user/profile',
object: {},
// 侧滑
rightBox: {
show: false
},
blankObject: { // 空白对象
id: '',
name: '',
@@ -196,7 +198,7 @@ export default {
id: 4,
label: this.$t('config.user.language'),
prop: '',
icon: 'nz-icon nz-icon-language-change'
icon: 'nz-icon nz-icon-language-change profile-lang'
}, {
id: 5,
label: this.$t('profile.source'),
@@ -306,11 +308,14 @@ export default {
})
},
profileBox () {
this.rightBox.show = true
this.$get(this.url).then(res => {
this.object = res.user
this.rightBox.show = true
})
},
closeRightBox () {
this.rightBox.show = false
},
clickProfile () {
this.personalCenter()
},
@@ -515,6 +520,9 @@ export default {
.profile-laiyuan {
color: #8871DB;
}
.profile-lang {
color: #6F7CD2;
}
.profile-left__center-title {
margin-top: 1px;
div:nth-of-type(1) {