diff --git a/appStore/cpu2017/views.py b/appStore/cpu2017/views.py index 22ecf85b6de3974cd3ac907aed3e27044d3abbba..0eaa2a56eeef883d96aa7aedf935a8c072c2fcef 100644 --- a/appStore/cpu2017/views.py +++ b/appStore/cpu2017/views.py @@ -41,7 +41,7 @@ class Cpu2017ViewSet(CusModelViewSet): datas[2]['column' + str(column_index)] = serializer.data[0]['execute_cmd'] datas[3]['column' + str(column_index)] = serializer.data[0]['modify_parameters'] # 初始化所有数据为None - for i in range(6, 104): + for i in range(4, 104): datas[i]['column' + str(column_index)] = None for data in serializer.data: # 判断数据的TuneType确定是base还是peak @@ -389,7 +389,7 @@ class Cpu2017ViewSet(CusModelViewSet): datas[3]['column' + str(column_index)] = temp_datas[0].modify_parameters # 基准数据和对比数据的全部数据 # 初始化所有数据为None - for i in range(6, 104): + for i in range(4, 104): datas[i]['column' + str(column_index)] = None for data in temp_datas: if data.tuneType == 'base': diff --git a/appStore/project/views.py b/appStore/project/views.py index 62f9bf936b37e3d79604ec25e23ef82f4ea24086..1fa2ee4bf5243fa2f47ff15e2bbab22f2913571d 100644 --- a/appStore/project/views.py +++ b/appStore/project/views.py @@ -55,7 +55,7 @@ class ProjectViewSet(CusModelViewSet): if baseId: project_queryset = Project.objects.filter(env_id__in=(baseId.split(','))) else: - project_queryset = Project.objects.all() + project_queryset = Project.objects.all().order_by("-id") if not project_queryset: return json_response({}, status.HTTP_204_NO_CONTENT, '未查询到project') serializer = self.get_serializer(project_queryset, many=True) diff --git a/templates/front-project/src/router/index.js b/templates/front-project/src/router/index.js index bc3c454c9dbcd67ac3303d6c1dbb6282e19c8f95..3ade19b18fd8c2b7005de8aef09a9649f271f609 100644 --- a/templates/front-project/src/router/index.js +++ b/templates/front-project/src/router/index.js @@ -25,12 +25,6 @@ const routes = [ component: () => import('@/views/EnvTable'), props: true, }, - { - name: 'unixbench', - path: '/unixbench/:baseId/:comparsionIds?', - component: () => import('@/views/UnxibenchTable'), - props: true, - }, { name: 'stream', path: '/stream/:baseId/:comparsionIds?', @@ -41,6 +35,12 @@ const routes = [ path: '/lmbench/:baseId/:comparsionIds?', component: () => import('@/views/LmbenchTable'), }, + { + name: 'unixbench', + path: '/unixbench/:baseId/:comparsionIds?', + component: () => import('@/views/UnxibenchTable'), + props: true, + }, { name: 'fio', path: '/fio/:baseId/:comparsionIds?', diff --git a/templates/front-project/src/views/Cpu2006Table.vue b/templates/front-project/src/views/Cpu2006Table.vue index 1482aea7820d9641c144f40a9b6f1ce8b1ac48fd..e0f21e0bc411149098916f13bb429e0148129b97 100644 --- a/templates/front-project/src/views/Cpu2006Table.vue +++ b/templates/front-project/src/views/Cpu2006Table.vue @@ -7,7 +7,9 @@ -->