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

This commit is contained in:
zhangyu
2022-04-06 17:40:49 +08:00
2 changed files with 2 additions and 2 deletions

View File

@@ -78,7 +78,7 @@
</my-date-picker>
</el-form-item>
<!-- labels -->
<div class="form__sub-title">{{$t('overall.labels')}}</div>
<div class="form__sub-title">{{$t('config.assetLabel.assetLabel')}}</div>
<div v-for="(label, i) in editAsset.fields" :key="i" class="form__dotted-item">
<el-form-item :prop="'fields.' + i + '.value'">
<template v-slot:label>

View File

@@ -58,7 +58,7 @@
<el-table-column
v-if="time"
prop="date"
width="140"
width="160"
>
<template slot-scope="{ row }">{{utcTimeToTimezoneStr(row.date)}}</template>
</el-table-column>