|
@@ -1,7 +1,7 @@
|
|
|
import numpy as np
|
|
|
import pandas as pd
|
|
|
-from MIDDLE.SaftyCenter.Common import FeiShuData
|
|
|
-from MIDDLE.SaftyCenter.Common import DBDownload
|
|
|
+from USER.eric.Common import FeiShuData
|
|
|
+from USER.eric.Common import DBDownload
|
|
|
import time, datetime
|
|
|
from datetime import timedelta
|
|
|
from pandas.core.frame import DataFrame
|
|
@@ -113,7 +113,7 @@ class DataSta():
|
|
|
df_FirstDataTime.loc[i,'first_data_time']=df_FirstDataTime.loc[i,'first_data_time'].strftime('%Y-%m-%d')
|
|
|
df_FirstDataTime.loc[i,'first_data_time']=datetime.datetime.strptime(df_FirstDataTime.loc[i,'first_data_time'],'%Y-%m-%d')
|
|
|
deltatime.loc[i,'runningdate']=(End_time-df_FirstDataTime.loc[i,'first_data_time'])
|
|
|
- deltatime.loc[i,'runningdate']= deltatime.loc[i,'runningdate'].total_seconds()/60
|
|
|
+ deltatime.loc[i,'runningdate']= deltatime.loc[i,'runningdate'].total_seconds()/3600
|
|
|
MaxRunningHour=int(deltatime['runningdate'].max())
|
|
|
TotalRunHour=int(deltatime['runningdate'].sum())
|
|
|
return MaxAccumAh,TotalAccumAh,MaxCycle,MaxRunningHour,TotalRunHour
|