From 9495859960a86387c741be5536b063d1f3948dd0 Mon Sep 17 00:00:00 2001 From: qz_cx Date: Mon, 22 Sep 2025 15:24:35 +0800 Subject: [PATCH] Modify parameter display fields in Excel spreadsheets --- appStore/cpu2006/views.py | 4 ++-- appStore/cpu2017/views.py | 4 ++-- appStore/fio/views.py | 3 +-- appStore/iozone/views.py | 2 +- appStore/jvm2008/views.py | 2 +- appStore/lmbench/views.py | 2 +- appStore/stream/views.py | 3 +-- appStore/unixbench/views.py | 3 +-- 8 files changed, 10 insertions(+), 13 deletions(-) diff --git a/appStore/cpu2006/views.py b/appStore/cpu2006/views.py index b6c456e..dbe99cd 100644 --- a/appStore/cpu2006/views.py +++ b/appStore/cpu2006/views.py @@ -916,7 +916,7 @@ class Cpu2006ViewSet(CusModelViewSet): if key.split("_")[1] == "fp": for key1 in value: data_cpu2006['execute_cmd'] = cpu2006_json.get('execute_cmd') - data_cpu2006['modify_parameters'] = str(cpu2006_json.get('modify_parameters'))[1:-2] if cpu2006_json.get('modify_parameters') else None + data_cpu2006['modify_parameters'] = cpu2006_json.get('modify_parameters') data_cpu2006['dtype'] = "fp" data_cpu2006['tuneType'] = key1 data_cpu2006['fp_410_bwaves'] = value[key1]['410.bwaves'] @@ -948,7 +948,7 @@ class Cpu2006ViewSet(CusModelViewSet): elif key.split("_")[1] == "int": for key1 in value: data_cpu2006['execute_cmd'] = cpu2006_json.get('execute_cmd') - data_cpu2006['modify_parameters'] = str(cpu2006_json.get('modify_parameters'))[1:-2] if cpu2006_json.get('modify_parameters') else None + data_cpu2006['modify_parameters'] = cpu2006_json.get('modify_parameters') data_cpu2006['dtype'] = "int" data_cpu2006['tuneType'] = key1 data_cpu2006['int_400_perlbench'] = value[key1]['400.perlbench'] diff --git a/appStore/cpu2017/views.py b/appStore/cpu2017/views.py index 946b230..6fc7908 100644 --- a/appStore/cpu2017/views.py +++ b/appStore/cpu2017/views.py @@ -775,7 +775,7 @@ class Cpu2017ViewSet(CusModelViewSet): if key.split("_")[1] == "fp": for key1 in value: data_cpu2017['execute_cmd'] = cpu2017_json.get('execute_cmd') - data_cpu2017['modify_parameters'] = str(cpu2017_json.get('modify_parameters'))[1:-2] if cpu2017_json.get('modify_parameters') else None + data_cpu2017['modify_parameters'] = cpu2017_json.get('modify_parameters') data_cpu2017['dtype'] = "fp" data_cpu2017['tuneType'] = key1 data_cpu2017['fp_503_bwaves_r'] = value[key1]['503.bwaves_r'] @@ -803,7 +803,7 @@ class Cpu2017ViewSet(CusModelViewSet): elif key.split("_")[1] == "int": for key1 in value: data_cpu2017['execute_cmd'] = cpu2017_json.get('execute_cmd') - data_cpu2017['modify_parameters'] = str(cpu2017_json.get('modify_parameters'))[1:-2] if cpu2017_json.get('modify_parameters') else None + data_cpu2017['modify_parameters'] = cpu2017_json.get('modify_parameters') data_cpu2017['dtype'] = "int" data_cpu2017['tuneType'] = key1 data_cpu2017['int_500_perlbench_r'] = value[key1]['500.perlbench_r'] diff --git a/appStore/fio/views.py b/appStore/fio/views.py index 0ddc78b..bd526b1 100644 --- a/appStore/fio/views.py +++ b/appStore/fio/views.py @@ -74,7 +74,6 @@ class FioViewSet(CusModelViewSet): datas[3]['column' + str(column_index)] = serializer.data[0]['modify_parameters'] # 增加数据部分 # 先初始化所有数据为空 - # todo 后期查看之前代码是如何实现的 for i in range(4,len(datas)): datas[i]['column' + str(column_index)] = None for value in temp_datas: @@ -286,7 +285,7 @@ class FioViewSet(CusModelViewSet): if k.lower().startswith('fio'): data_fio['env_id'] = request.__dict__['data_fio']['env_id'] data_fio['execute_cmd'] = fio_json.get('execute_cmd') - data_fio['modify_parameters'] = str(fio_json.get('modify_parameters'))[1:-2] if fio_json.get('modify_parameters') else None + data_fio['modify_parameters'] = fio_json.get('modify_parameters') data_fio['mark_name'] = k[-3:] data_fio['rw'] = fio_json['rw'] data_fio['bs'] = fio_json['items']['bs'] diff --git a/appStore/iozone/views.py b/appStore/iozone/views.py index af82546..b7a2ace 100644 --- a/appStore/iozone/views.py +++ b/appStore/iozone/views.py @@ -336,7 +336,7 @@ class IozoneViewSet(CusModelViewSet): data_iozone = {} data_iozone['env_id'] = request.__dict__['data_iozone']['env_id'] data_iozone['execute_cmd'] = iozone_json.get('execute_cmd') - data_iozone['modify_parameters'] = str(iozone_json.get('modify_parameters'))[1:-2] if iozone_json.get('modify_parameters') else None + data_iozone['modify_parameters'] = iozone_json.get('modify_parameters') data_iozone['testcase_name'] = k.split('-')[-3] data_iozone['mark_name'] = k[-3:] data_iozone['file_size'] = iozone_json['测试记录'][0]['文件大小'] diff --git a/appStore/jvm2008/views.py b/appStore/jvm2008/views.py index aa1f02a..ae452f1 100644 --- a/appStore/jvm2008/views.py +++ b/appStore/jvm2008/views.py @@ -299,7 +299,7 @@ class Jvm2008ViewSet(CusModelViewSet): data_jvm2008['env_id'] = request.__dict__['data_jvm2008']['env_id'] data_jvm2008['tune_type'] = tune_type data_jvm2008['execute_cmd'] = jvm2008_json.get('execute_cmd') - data_jvm2008['modify_parameters'] = str(jvm2008_json.get('modify_parameters'))[1:-2] if jvm2008_json.get('modify_parameters') else None + data_jvm2008['modify_parameters'] = jvm2008_json.get('modify_parameters') data_jvm2008['mark_name'] = k[-3:] data_jvm2008['compiler'] = jvm2008_json['items'][tune_type]['compiler'] data_jvm2008['compress'] = jvm2008_json['items'][tune_type]['compress'] diff --git a/appStore/lmbench/views.py b/appStore/lmbench/views.py index c3ba184..5756ded 100644 --- a/appStore/lmbench/views.py +++ b/appStore/lmbench/views.py @@ -570,7 +570,7 @@ class LmbenchViewSet(CusModelViewSet): lmbench = {} lmbench['env_id'] = request.__dict__['data_lmbench']['env_id'] lmbench['execute_cmd'] = request.__dict__['data_lmbench'][lmbench_keys].get('execute_cmd') - lmbench['modify_parameters'] = str(request.__dict__['data_lmbench'][lmbench_keys].get('modify_parameters'))[1:-2] if request.__dict__['data_lmbench'][lmbench_keys].get('modify_parameters') else None + lmbench['modify_parameters'] = request.__dict__['data_lmbench'][lmbench_keys].get('modify_parameters') # 处理数据，原始数据每个一级标就是一个json，把所有以及字段放到一个json中 new_lmbench = {} for i in lmbench_json: diff --git a/appStore/stream/views.py b/appStore/stream/views.py index 88496f5..1667253 100644 --- a/appStore/stream/views.py +++ b/appStore/stream/views.py @@ -176,11 +176,10 @@ class StreamViewSet(CusModelViewSet): if k.lower().startswith('stream'): data_stream = {} data_stream['env_id'] = request.__dict__['data_stream']['env_id'] - # todo 所有的参数 、 cmd 是在哪里保存的 data_stream['single_thread'] = '单线程' data_stream['multi_threading'] = '多线程' data_stream['execute_cmd'] = stream_json.get('execute_cmd') - data_stream['modify_parameters'] = str(stream_json.get('modify_parameters'))[1:-2] if stream_json.get('modify_parameters') else None + data_stream['modify_parameters'] = stream_json.get('modify_parameters') data_stream['single_array_size'] = stream_json['单线程']['Array size'] data_stream['single_copy'] = stream_json['单线程']['Copy'] data_stream['single_scale'] = stream_json['单线程']['Scale'] diff --git a/appStore/unixbench/views.py b/appStore/unixbench/views.py index 6a7ab68..9f9a863 100644 --- a/appStore/unixbench/views.py +++ b/appStore/unixbench/views.py @@ -399,10 +399,9 @@ class UnixbenchViewSet(CusModelViewSet): thread = "单线程" elif k.split('-')[-3] == 'multi': thread = "多线程" - # todo 所有的参数 、 cmd 是在哪里保存的 data_unixbench['thread'] = thread data_unixbench['execute_cmd'] = unixbench_json.get('execute_cmd') - data_unixbench['modify_parameters'] = str(unixbench_json.get('modify_parameters'))[1:-2] if unixbench_json.get('modify_parameters') else None + data_unixbench['modify_parameters'] = unixbench_json.get('modify_parameters') data_unixbench['mark_name'] = k[-3:] data_unixbench['Dhrystone'] = unixbench_json[thread]['Dhrystone 2 using register variables(lps)'] data_unixbench['Double_Precision'] = unixbench_json[thread]['Double-Precision Whetstone(MWIPS)'] -- Gitee