Skip to content

E
ec-report-refactor
Commit 93115452 authored by leon's avatar leon
Browse files
Options

feat：daily

parent 185e9049
Hide whitespace changes
Inline Side-by-side
Showing with 0 additions and 3 deletions
pages/index/index.vue
View file @ 93115452
...@@ -22,15 +22,12 @@ ...@@ -22,15 +22,12 @@
<BarMixMap v-if="element.type == 'BarMixMap'" :elementInfo="element"></BarMixMap> <BarMixMap v-if="element.type == 'BarMixMap'" :elementInfo="element"></BarMixMap>
<!-- 雷达图 --> <!-- 雷达图 -->
<NormalRadar v-if="element.type == 'NormalRadar'" :elementInfo="element"></NormalRadar> <NormalRadar v-if="element.type == 'NormalRadar'" :elementInfo="element"></NormalRadar>
<<<<<<< HEAD
<!-- 普通数字滚动 --> <!-- 普通数字滚动 -->
<CountTo v-if="element.type == 'CountTo'" :elementInfo="element"></CountTo> <CountTo v-if="element.type == 'CountTo'" :elementInfo="element"></CountTo>
<!-- 数字滚动 --> <!-- 数字滚动 -->
<NumberScroll v-if="element.type == 'NumberScroll'" :elementInfo="element"></NumberScroll> <NumberScroll v-if="element.type == 'NumberScroll'" :elementInfo="element"></NumberScroll>
=======
<!-- 普通选项卡 --> <!-- 普通选项卡 -->
<NormalTabs v-if="element.type == 'NormalTabs'" :elementInfo="element"></NormalTabs> <NormalTabs v-if="element.type == 'NormalTabs'" :elementInfo="element"></NormalTabs>
>>>>>>> 4cfcbebdc7add01d46cf17248a41b752acef152b
<!-- 文本框 --> <!-- 文本框 -->
<BasicText v-if="element.type == 'BasicText'" :elementInfo="element"></BasicText> <BasicText v-if="element.type == 'BasicText'" :elementInfo="element"></BasicText>
<!-- 真实时间 --> <!-- 真实时间 -->
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment