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

fix：修改当单位是时间时 去吃最大刻度的设置项 修改systen的自动填入问题

Browse Source
This commit is contained in:
zhangyu
2020-10-16 16:44:41 +08:00
parent a2cf5d72ed
commit 0646bed43f
3 changed files with 8 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -759,7 +759,9 @@
useUTC: false,//使用本地时间 useUTC: false,//使用本地时间
series: dataArg series: dataArg
}; };
if(unit.type=='Time'){
delete option.yAxis.maxInterval;
}
// params.series = dataArg; // params.series = dataArg;
if (chartSite === 'local') { // 本地显示 if (chartSite === 'local') { // 本地显示
if(legend){ if(legend){

3
nezha-fronted/src/components/common/project/popData/lineChart.vue
View File

@@ -756,6 +756,9 @@
useUTC: false,//使用本地时间 useUTC: false,//使用本地时间
series: dataArg series: dataArg
}; };
if(unit.type=='Time'){
delete option.yAxis.maxInterval;
}
// params.series = dataArg; // params.series = dataArg;
if (chartSite === 'local') { // 本地显示 if (chartSite === 'local') { // 本地显示
if(legend){ if(legend){

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

@@ -55,10 +55,10 @@
<el-input v-model.number="email.email_smtp_port" :disabled="email.email_enable == 'off'"></el-input> <el-input v-model.number="email.email_smtp_port" :disabled="email.email_enable == 'off'"></el-input>
</el-form-item> </el-form-item>
<el-form-item :label="$t('config.system.email.smtpAccount')" prop="email_smtp_account"> <el-form-item :label="$t('config.system.email.smtpAccount')" prop="email_smtp_account">
<el-input v-model="email.email_smtp_account" :disabled="email.email_enable == 'off'"></el-input> <el-input v-model="email.email_smtp_account" :disabled="email.email_enable == 'off'"> autocomplete="off"</el-input>
</el-form-item> </el-form-item>
<el-form-item :label="$t('config.system.email.smtpPwd')" prop="email_smtp_password"> <el-form-item :label="$t('config.system.email.smtpPwd')" prop="email_smtp_password">
<el-input v-model="email.email_smtp_password" type="password" :show-password="false" :disabled="email.email_enable == 'off'"></el-input> <el-input v-model="email.email_smtp_password" type="password" :show-password="false" :disabled="email.email_enable == 'off'" autocomplete="off"></el-input>
<div><span>{{$t('config.system.email.pwdTip')}}</span></div> <div><span>{{$t('config.system.email.pwdTip')}}</span></div>
</el-form-item> </el-form-item>
<el-form-item :label="$t('config.system.email.sendAccount')" prop="email_send_account"> <el-form-item :label="$t('config.system.email.sendAccount')" prop="email_send_account">