diff --git a/appStore/fio/views.py b/appStore/fio/views.py index 714fa6d237daa84e99bb2f4f507ed642d4e090b2..251eecc90e2a87db478b877be4fd98626fdcabb7 100644 --- a/appStore/fio/views.py +++ b/appStore/fio/views.py @@ -208,16 +208,15 @@ class FioViewSet(CusModelViewSet): datas[1]['column' + str(column_index)] = '' datas[2]['column' + str(column_index)] = '' # 获取到最后一组数据、处理数据 - for i in range(len(datas)): - if i > 2: - value = datas[i]['column' + str(column_index - 1)] # 最后一组数据 - base_value = datas[i]['column' + str(base_column_index)] # base数据 - if value is not None and base_value is not None: - value = float("".join(filter(lambda s: s in '0123456789.', value.split('(')[0]))) - base_value = float("".join(filter(lambda s: s in '0123456789.', base_value.split('(')[0]))) - datas[i]['column' + str(column_index)] = "%.2f%%" % ((value - base_value) / base_value * 100) if value is not None and base_value is not None else None - else: - datas[i]['column' + str(column_index)] = None + for i in range(3, len(datas)): + value = datas[i]['column' + str(column_index - 1)] # 最后一组数据 + base_value = datas[i]['column' + str(base_column_index)] # base数据 + if value is not None and base_value is not None: + value = float("".join(filter(lambda s: s in '0123456789.', value.split('(')[0]))) + base_value = float("".join(filter(lambda s: s in '0123456789.', base_value.split('(')[0]))) + datas[i]['column' + str(column_index)] = "%.2f%%" % ((value - base_value) / base_value * 100) if value is not None and base_value is not None else None + else: + datas[i]['column' + str(column_index)] = None column_index += 1 return datas, title_index, column_index, base_column_index diff --git a/appStore/lmbench/views.py b/appStore/lmbench/views.py index c954c28a99f832171539e2af27fa94900fb8461f..b2c46c4ce79e0b2986d6beaa1e0fb0c947eb0600 100644 --- a/appStore/lmbench/views.py +++ b/appStore/lmbench/views.py @@ -434,12 +434,19 @@ class LmbenchViewSet(CusModelViewSet): datas[1]['column' + str(column_index)] = '' datas[2]['column' + str(column_index)] = '' for i in range(3, 74): - datas[i]['column' + str(column_index)] = \ - "%.2f%%" % ((datas[i]['column' + str(column_index - 1)] - datas[i][ - 'column' + str(base_column_index)]) / datas[i][ - 'column' + str(base_column_index)] * 100) if datas[i]['column' + str( - column_index - 1)] is not None and datas[i]['column' + str( - base_column_index)] is not None else None + if 59 < i < 69: + datas[i]['column' + str(column_index)] = \ + "%.2f%%" % ((datas[i]['column' + str(column_index - 1)] - datas[i][ + 'column' + str(base_column_index)]) / datas[i][ + 'column' + str(base_column_index)] * 100) if datas[i]['column' + str( + column_index - 1)] is not None and datas[i]['column' + str( + base_column_index)] is not None else None + else: + datas[i]['column' + str(column_index)] = \ + "%.2f%%" % ((datas[i]['column' + str(base_column_index)] - datas[i][ + 'column' + str(column_index - 1)]) / datas[i]['column' + str(base_column_index)] * 100) if \ + datas[i]['column' + str(column_index - 1)] is not None and datas[i][ + 'column' + str(base_column_index)] is not None else None column_index += 1 return datas, title_index, column_index, base_column_index