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

fix:1.explore图表tooltip统一 2.修改密码弹框调整 3.project左侧菜单交互bug修复

Browse Source
This commit is contained in:
wangwenrui
2020-05-20 15:55:02 +08:00
parent fa957563c8
commit a04255f7e1
3 changed files with 7 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
nezha-fronted/src/components/page/config/changePwd.vue
View File

@@ -1,8 +1,8 @@
<template> <template>
<div> <div>
<el-dialog class="nz-dialog" :title="$t('overall.changePwd')" :visible.sync="visible" @open="dialogOpened" :modal-append-to-body='false' @closed="dialogClosed" width="600px" :show-close="false" > <el-dialog class="nz-dialog" :title="$t('overall.changePwd')" :visible.sync="visible" @open="dialogOpened" :modal-append-to-body='false' @closed="dialogClosed" width="600px" :show-close="false" >
<el-form :model="user" label-position="right" label-width="135px" :rules="rules" ref="changePwdForm" size="mini"> <el-form :model="user" label-position="right" label-width="150px" :rules="rules" ref="changePwdForm" size="mini">
<el-form-item :label="$t('config.account.account')" prop="username"> <el-form-item :label="$t('config.account.account')" prop="username" v-show="curUser != sysUser">
<el-input type="text" autocomplete="false" v-model="user.username" disabled></el-input> <el-input type="text" autocomplete="false" v-model="user.username" disabled></el-input>
</el-form-item> </el-form-item>
<el-form-item :label="$t('config.account.oldPwd')" prop="pwd"> <el-form-item :label="$t('config.account.oldPwd')" prop="pwd">
@@ -63,6 +63,7 @@
newPwd:'', newPwd:'',
confirmPwd:'' confirmPwd:''
}, },
sysUser:sessionStorage.getItem("nz-username"),
rules:{ rules:{
pwd:[{required:true,message: this.$t('validate.required'), trigger: 'blur'}], pwd:[{required:true,message: this.$t('validate.required'), trigger: 'blur'}],
newPwd:[{required:true,message: this.$t('validate.required'), trigger: 'blur'},{validator:validatePass,trigger: 'blur'}], newPwd:[{required:true,message: this.$t('validate.required'), trigger: 'blur'},{validator:validatePass,trigger: 'blur'}],

3
nezha-fronted/src/components/page/dashboard/overview/chartConfig.vue
View File

@@ -48,6 +48,9 @@
trigger: 'axis', trigger: 'axis',
confine:false, confine:false,
extraCssText:'z-index:1000;', extraCssText:'z-index:1000;',
backgroundColor:'rgba(221,228,237,1)',
borderColor:'rgba(221,228,237,1)',
textStyle:{color: "#000"}
// formatter:null, // formatter:null,
// position:null, // position:null,
}, },

1
nezha-fronted/src/components/page/project/project.vue
View File

@@ -821,6 +821,7 @@
}, },
watch: { watch: {
currentProjectChange:{ currentProjectChange:{
immediate:true,
handler(n, o) { handler(n, o) {
this.currentProject = Object.assign({}, n); this.currentProject = Object.assign({}, n);
this.detailProjectInfo(); this.detailProjectInfo();