Browse Source

✨ feat: 展示乐跑进度

Pchen. 2 months ago
parent
commit
7ae8333153

+ 7 - 0
src/pages/admin/lepaoRecords/lepaoRecords.vue

@@ -113,6 +113,9 @@
                   :class="recordDisplay(record).statusLevel"
                 ></div>
                 {{ recordDisplay(record).statusText }}
+                <div class="progress" v-if="record.state === 0 && record.lepao_schedule">
+                  <a-progress size="mini" :percent="record.lepao_schedule.current / record.lepao_schedule.total"/>
+                </div>
               </div>
             </template>
           </a-table-column>
@@ -278,6 +281,10 @@ onMounted(() => {
     display: flex;
     align-items: center;
 
+    .progress {
+      margin-left: 5px;
+    }
+
     .circle {
       border-radius: 50%;
       height: 8px;

+ 7 - 0
src/pages/lepao/lepaoRecords/index.vue

@@ -110,6 +110,9 @@
                   :class="recordDisplay(record).statusLevel"
                 ></div>
                 {{ recordDisplay(record).statusText }}
+                <div class="progress" v-if="record.state === 0 && record.lepao_schedule">
+                  <a-progress size="mini" :percent="record.lepao_schedule.current / record.lepao_schedule.total"/>
+                </div>
               </div>
             </template>
           </a-table-column>
@@ -330,6 +333,10 @@ onUnmounted(() => {
     display: flex;
     align-items: center;
 
+    .progress {
+      margin-left: 5px;
+    }
+
     .circle {
       border-radius: 50%;
       height: 8px;

+ 1 - 1
src/pages/lepao/lepaoRecords/recordDetail.vue

@@ -10,7 +10,7 @@
             </a-skeleton>
             <a-descriptions :data="info" :column="2" />
             <MapContainer
-                v-if="showMap"
+                v-if="showMap && pathForMap.length > 0"
                 :point_list="pointListForMap"
                 :log_list="logListForMap"
                 :pathData="pathForMap"

+ 0 - 12
src/utils/lepaoRecord.js

@@ -215,12 +215,6 @@ export function buildRecordDetailInfo(data, options = {}) {
       })
     }
     lines.push({ label: '跑步状态', value: row.statusText })
-    if (isAdmin) {
-      lines.push({
-        label: '打卡点数量',
-        value: String(row.pointList.length)
-      })
-    }
   } else {
     const r = normalizeResult(data)
     if (r.start_time) {
@@ -230,12 +224,6 @@ export function buildRecordDetailInfo(data, options = {}) {
       })
     }
     lines.push({ label: '乐跑状态', value: row.statusText })
-    if (isAdmin) {
-      lines.push({
-        label: '打卡点数量',
-        value: String(row.pointList.length)
-      })
-    }
   }
 
   lines.push({ label: '跑步距离', value: formatKm(row.distance) })