Skip to content

Commit 209f45d

Browse files
committed
fix: conflict
1 parent 2cc38ee commit 209f45d

File tree

2 files changed

+10
-9
lines changed

2 files changed

+10
-9
lines changed

package.json

+1
Original file line numberDiff line numberDiff line change
@@ -58,6 +58,7 @@
5858
"@wangeditor/editor-for-vue": "5.1.10",
5959
"animate.css": "^4.1.1",
6060
"axios": "^1.7.2",
61+
"bootstrap": "^5.3.3",
6162
"codemirror": "^5",
6263
"codemirror-editor-vue3": "^2.7.0",
6364
"color": "^4.2.3",

src/views/house/components/BarChart.vue

+9-9
Original file line numberDiff line numberDiff line change
@@ -6,15 +6,15 @@
66
<b>{{ chartData.title.text }}</b>
77
</div>
88
<div class="title">
9-
<el-text v-if="displayTitle"
10-
>七日:{{ chartData.sevenDayAverage }}</el-text
11-
>
12-
<el-text v-if="displayTitle"
13-
>半月:{{ chartData.fifteenDayAverage }}</el-text
14-
>
15-
<el-text v-if="displayTitle"
16-
>近月:{{ chartData.thirtyDayAverage }}</el-text
17-
>
9+
<el-text v-if="displayTitle">
10+
七日:{{ chartData.sevenDayAverage }}
11+
</el-text>
12+
<el-text v-if="displayTitle">
13+
半月:{{ chartData.fifteenDayAverage }}
14+
</el-text>
15+
<el-text v-if="displayTitle">
16+
近月:{{ chartData.thirtyDayAverage }}
17+
</el-text>
1818
<el-text>单位:{{ chartData.title.unit }}</el-text>
1919
</div>
2020
</template>

0 commit comments

Comments
 (0)