Merge remote-tracking branch 'origin/dev' into dev

# Conflicts:
#	src/components/charts/panel.scss
This commit is contained in:
admin
2021-07-05 10:00:21 +08:00
39 changed files with 305 additions and 6117 deletions

View File

@@ -4,8 +4,12 @@
<div class="single-value__icon"><i class="el-icon-apple"></i></div>
</div>
<div class="single-value__content" v-if="type === 51">
<div class="content__data">11112</div>
<div class="content__title">{{$t('common.save')}}</div>
<div class="content__data">
<slot name="data"></slot>
</div>
<div class="content__title">
<slot name="title"></slot>
</div>
</div>
<div class="single-value__content" v-if="type === 53">
<div class="content__title">嘻嘻</div>