leon 1 سال پیش
والد
کامیت
99551e5bfc

+ 2 - 1
src/features/trackTimeDuration/components/CircadianDetailPopup.tsx

@@ -236,7 +236,8 @@ export default function CircadianDetailPopup(props: { record: any, schedule?: an
             return t('feature.track_time_duration.console.no_duration_available')
             // return '-' + TimeFormatter.durationFormate2(start, end)
         }
-        return TimeFormatter.calculateTimeDifference(start, end)
+        return TimeFormatter.durationFormate(start, end)
+        // return TimeFormatter.calculateTimeDifference(start, end)
     }
 
     function completedOverView() {

+ 1 - 1
src/features/trackTimeDuration/components/RecordFastSleep.tsx

@@ -233,7 +233,7 @@ const RecordFastSleep = memo((props: { data: any, type: string, index: number, d
 
     function getDuration(obj) {
         if (obj.status == 'NOT_STARTED' || obj.status == 'NOT_COMPLETED') {
-            return ''
+            return '' 
         }
         var start = obj.real_start_time
         var end = obj.real_end_time

+ 2 - 1
src/services/http/request.ts

@@ -90,7 +90,8 @@ export async function request<T>(param: RequestParam): Promise<T> {
         header['X-Timestamp'] = new Date().getTime()
         if (token.length > 0) {
             header['Authorization'] = `Bearer ${token}`;
-            // header['Authorization'] = 'Bearer eyJ0eXAiOiJKV1QiLCJhbGciOiJIUzI1NiJ9.eyJhdWQiOiJhY2NvdW50Iiwic3ViIjoiZTQ3M2RlZDI4YzgwNzY3ZDZiOTBkYzAzMDg5YzRhYzEiLCJpc3MiOiJmYXN0Iiwibmlja25hbWUiOiLmtYvor5UiLCJ0eXAiOiJCZWFyZXIiLCJzZXNzaW9uX3N0YXRlIjoiNDE1NTZkODNiM2QyODRmYzNhODY1NmI3YzdhOTBjODQiLCJleHAiOjIwMzM3ODU4MTcsImlhdCI6MTcxODI1MzAxN30.JBbFZhmckizGqblsFFB3ee3u_CivwTR8w-0VoUcph2w';
+
+            header['Authorization'] = 'Bearer eyJ0eXAiOiJKV1QiLCJhbGciOiJIUzI1NiJ9.eyJhdWQiOiJhY2NvdW50Iiwic3ViIjoiZTQ3M2RlZDI4YzgwNzY3ZDZiOTBkYzAzMDg5YzRhYzEiLCJpc3MiOiJmYXN0Iiwibmlja25hbWUiOiLmtYvor5UiLCJ0eXAiOiJCZWFyZXIiLCJzZXNzaW9uX3N0YXRlIjoiYzdhYmE2MzJjNThmZTJlODllYTRhM2Y2OTZhMzdhN2YiLCJleHAiOjIwMzM3OTQyODIsImlhdCI6MTcxODI2MTQ4Mn0.P5tVYnyDWqiPM8TgXDicqQob0v1wO14D7QyfvJUs8ns';
             // header['Authorization'] = 'Bearer eyJ0eXAiOiJKV1QiLCJhbGciOiJIUzI1NiJ9.eyJhdWQiOiJhY2NvdW50Iiwic3ViIjoiMjZkOGE1YTg0MDMyYmExN2Q4NDk3MTlkNTljNGY1NzgiLCJpc3MiOiJmYXN0Iiwibmlja25hbWUiOiJCSyIsInR5cCI6IkJlYXJlciIsInNlc3Npb25fc3RhdGUiOiI1ZDU2NTkzYmNjNWFmNzM0OWNlZTMwZjlkNGYzMWIyMCIsImV4cCI6MTc0ODE3MDg5NSwiaWF0IjoxNzE2NjM0ODk1fQ.uaRm2vSNCX8fkFS63Oe-WNWIDHG_cRM-nQ5EGyUMaBg';
         }