up

LIB/MIDDLE/InfoChrgDrive/Charge/main_V0.py

@@ -72,14 +72,10 @@ def diag_cal():
                     df_diag_ram_sn=df_diag_ram[df_diag_ram['sn']==sn]
                     if not df_diag_ram_sn.empty:   #该sn相关结果非空
                         df_diag_ram_sn.reset_index(inplace=True,drop=True)
-<<<<<<< HEAD
-                        df_diag_ram_sn=df_diag_ram_sn.iloc[-1]
-=======
                         df_diag_ram_sn['time_end']=list(map(lambda x: datetime.datetime.strptime(x,'%Y-%m-%d %H:%M:%S'),list(df_diag_ram_sn['time_end'])))
                         df_diag_ram_sn = df_diag_ram_sn.sort_values(by = 'time_end')
                         df_diag_ram_sn=df_diag_ram_sn.iloc[-1]
                         time_end =df_diag_ram_sn['time_end']
->>>>>>> f5e9b82c209c00251722abc6e4c4e8e94e7c130f
                         df_diag_ram_sn.reset_index(inplace=True,drop=True)
                 df_diag_new,df_diag_change=pro_output(df_merge,sn,gpscity,df_diag_ram_sn)
                 kmeans1 = joblib.load('kmeans1.pkl')