zhouyanli/property-manager-side
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

解决冲突

Browse Source
This commit is contained in:
Zy
2026-05-09 17:15:18 +08:00
parent b29e03ab4d ac8b4c3801
commit 8c8029c933
6 changed files with 46 additions and 46 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
wuye-manager-uniapp/pages/index/index.vue
View File

@@ -75,6 +75,7 @@
<view class="statistics-wrap">
<view class="statistics-item" @click="goToInspectionRecord">
<text class="num">25</text>
<<<<<<< HEAD
<text class="label">全部巡检</text>
</view>
<view class="statistics-item" @click="goToDaysInspection">
@@ -84,6 +85,17 @@
<view class="statistics-item">
<text class="num">25</text>
<text class="label">已巡检</text>
=======
<text class="label">巡检点</text>
</view>
<view class="statistics-item" @click="goToDaysInspection">
<text class="num">5</text>
<text class="label">巡检点</text>
</view>
<view class="statistics-item">
<text class="num">25</text>
<text class="label">巡检点</text>
>>>>>>> ac8b4c380134ed183aa6f67c4ed3497e07b82b51
</view>
</view>
</view>