重新提交

2026-05-09 17:21:10 +08:00
parent 8c8029c933
commit f2562f4e1f
1 changed files with 3 additions and 3 deletions
--- a/wuye-manager-uniapp/pages/index/index.vue
+++ b/wuye-manager-uniapp/pages/index/index.vue
@@ -75,7 +75,7 @@
      <view class="statistics-wrap">
        <view class="statistics-item" @click="goToInspectionRecord">
          <text class="num">25</text>
-<<<<<<< HEAD
+          <<<<<<< HEAD
          <text class="label">全部巡检</text>
        </view>
        <view class="statistics-item" @click="goToDaysInspection">
@@ -85,7 +85,7 @@
        <view class="statistics-item">
          <text class="num">25</text>
          <text class="label">已巡检</text>
-=======
+          =======
          <text class="label">巡检点</text>
        </view>
        <view class="statistics-item" @click="goToDaysInspection">
@@ -95,7 +95,7 @@
        <view class="statistics-item">
          <text class="num">25</text>
          <text class="label">巡检点</text>
->>>>>>> ac8b4c380134ed183aa6f67c4ed3497e07b82b51
+          >>>>>>> ac8b4c380134ed183aa6f67c4ed3497e07b82b51
        </view>
      </view>
    </view>