fix:修复冲突

This commit is contained in:
zyh
2023-03-21 16:54:45 +08:00
82 changed files with 719 additions and 482 deletions

View File

@@ -35,7 +35,7 @@
<i class="nz-icon nz-icon-create-square"></i>&nbsp;{{$t('overall.addDashboard')}}
</span>
<!-- 通过dashboard模板创建 -->
<span v-has="'main_add'" @click="addByTemplate" :title='$t("dashboard.panel.addByTemplate")' class="dashboard-addBy-template">
<span v-has="'main_add'" @click="addByTemplate" :title='$t("dashboard.dashboard.addByTemplate")' class="dashboard-addBy-template">
<i class="nz-icon nz-icon-template1"></i>
</span>
</template>
@@ -303,7 +303,7 @@ export default {
disabled: false
},
{
name: this.$t('dashboard.panel.chartForm.varType'),
name: this.$t('dashboard.dashboard.chartForm.varType'),
type: 'select',
label: 'varType',
disabled: false