diff --git a/appStore/api/router.py b/appStore/api/router.py index cffd6813085ffa1368ce5e78cd45471236e39a69..e0ce3a61d4101334a5b683e08b8f1e8726d67a72 100644 --- a/appStore/api/router.py +++ b/appStore/api/router.py @@ -17,6 +17,7 @@ from appStore.jvm2008.views import Jvm2008ViewSet from appStore.lmbench.views import LmbenchViewSet from appStore.project.views import ProjectViewSet from appStore.stream.views import StreamViewSet +from appStore.testCase.views import TestCaseViewSet from appStore.unixbench.views import UnixbenchViewSet from appStore.users.views import UserProfileViewSet @@ -35,12 +36,13 @@ router.register(r'project', ProjectViewSet, basename='project') router.register(r'stream', StreamViewSet, basename='stream') router.register(r'unixbench', UnixbenchViewSet, basename='unixbench') router.register(r'users', UserProfileViewSet, basename='users') +router.register(r'test_case', TestCaseViewSet, basename='testcase') urlpatterns = [ - # url(r'^y_upload_file/', y_upload_file), # upload_file url(r'', include(router.urls)), url('^get_filter_name/', ProjectViewSet.as_view({'get': 'get_filter_name'}), name='get_filter_name'), url('^merge_data/', ProjectViewSet.as_view({'post': 'merge_data'}), name='merge_data'), url('^download_excel/', ProjectViewSet.as_view({'get': 'download_excel'}), name='download_excel'), url('^change_password/', UserProfileViewSet.as_view({'put': 'change_password'}), name='change_password'), + url('^do_test_case/', TestCaseViewSet.as_view({'post': 'do_test_case'}), name='do_test_case'), ] diff --git a/appStore/project/models.py b/appStore/project/models.py index 7a05e514a15fa118f715394127abf246e56f3736..e23e9f2e727060185185183a58a7c08a2a80ef6d 100644 --- a/appStore/project/models.py +++ b/appStore/project/models.py @@ -22,13 +22,13 @@ class Project(models.Model): times = models.IntegerField(verbose_name='第几次测试') ip = models.CharField(max_length=50,verbose_name='测试机器ip',null=True,blank=True) stream = models.IntegerField(default=0, verbose_name='几组stream数据') - cpu2006 = models.IntegerField(default=0, verbose_name='几组cpu2006数据') - cpu2017 = models.IntegerField(default=0, verbose_name='几组cpu2017数据') + lmbench = models.IntegerField(default=0, verbose_name='几组lmbench数据') + unixbench = models.IntegerField(default=0, verbose_name='几组unxibench数据') fio = models.IntegerField(default=0, verbose_name='几组fio数据') iozone = models.IntegerField(default=0, verbose_name='几组iozone数据') jvm2008 = models.IntegerField(default=0, verbose_name='几组jvm2008数据') - lmbench = models.IntegerField(default=0, verbose_name='几组lmbench数据') - unixbench = models.IntegerField(default=0, verbose_name='几组unxibench数据') + cpu2006 = models.IntegerField(default=0, verbose_name='几组cpu2006数据') + cpu2017 = models.IntegerField(default=0, verbose_name='几组cpu2017数据') test_time = models.DateTimeField(verbose_name="记录时间", default=timezone.now) message = models.CharField(max_length=255, verbose_name='项目描述',null=True,blank=True) diff --git a/appStore/stream/models.py b/appStore/stream/models.py index 27b5dd0f1fea72c3ac0ff8f77dd299065a4aaf3a..8febd5100796c5ce5e61f2c85a206ab4cc2ae4d7 100644 --- a/appStore/stream/models.py +++ b/appStore/stream/models.py @@ -17,21 +17,21 @@ class Stream(models.Model): ("多线程", "多线程"), ) env_id = models.IntegerField(verbose_name='环境id') - execute_cmd = models.CharField(max_length=255, verbose_name='执行命令',null=True,blank=True) - modify_parameters = models.CharField(max_length=255, verbose_name='修改参数',null=True,blank=True) + execute_cmd = models.CharField(max_length=255, verbose_name='执行命令', null=True, blank=True) + modify_parameters = models.CharField(max_length=255, verbose_name='修改参数', null=True, blank=True) # modify_parameters = models.TextField(null=True, blank=True, verbose_name='修改参数') #如果是很多的化可以使用text文本类型 - single_thread = models.CharField(choices=ThreadType, max_length=10, verbose_name='单线程',null=True,blank=True) - single_array_size = models.IntegerField(verbose_name='single_array_size',null=True,blank=True) - single_copy = models.FloatField(verbose_name='single_copy',null=True,blank=True) - single_scale = models.FloatField(verbose_name='single_scale',null=True,blank=True) - single_add = models.FloatField(verbose_name='single_add',null=True,blank=True) - single_triad = models.FloatField(verbose_name='single_triad',null=True,blank=True) - multi_threading = models.CharField(choices=ThreadType, max_length=10, verbose_name='多线程',null=True,blank=True) - multi_array_size = models.IntegerField(verbose_name='multi_array_size',null=True,blank=True) - multi_copy = models.FloatField(verbose_name='multi_copy',null=True,blank=True) - multi_scale = models.FloatField(verbose_name='multi_scale',null=True,blank=True) - multi_add = models.FloatField(verbose_name='multi_add',null=True,blank=True) - multi_triad = models.FloatField(verbose_name='multi_triad',null=True,blank=True) + single_thread = models.CharField(choices=ThreadType, max_length=10, verbose_name='单线程', null=True, blank=True) + single_array_size = models.IntegerField(verbose_name='single_array_size', null=True, blank=True) + single_copy = models.FloatField(verbose_name='single_copy', null=True, blank=True) + single_scale = models.FloatField(verbose_name='single_scale', null=True, blank=True) + single_add = models.FloatField(verbose_name='single_add', null=True, blank=True) + single_triad = models.FloatField(verbose_name='single_triad', null=True, blank=True) + multi_threading = models.CharField(choices=ThreadType, max_length=10, verbose_name='多线程', null=True, blank=True) + multi_array_size = models.IntegerField(verbose_name='multi_array_size', null=True, blank=True) + multi_copy = models.FloatField(verbose_name='multi_copy', null=True, blank=True) + multi_scale = models.FloatField(verbose_name='multi_scale', null=True, blank=True) + multi_add = models.FloatField(verbose_name='multi_add', null=True, blank=True) + multi_triad = models.FloatField(verbose_name='multi_triad', null=True, blank=True) class Meta: db_table = 'stream' diff --git a/appStore/unixbench/models.py b/appStore/unixbench/models.py index 8da3d18cebe39f0b449aad70e8c1b8c2f378a707..a83d5ca62502330e616fb9c7ebc13574b7bdce7b 100644 --- a/appStore/unixbench/models.py +++ b/appStore/unixbench/models.py @@ -6,11 +6,10 @@ * Date: Mon Mar 4 09:58:41 2024 +0800 """ from django.db import models -import django.utils.timezone as timezone # Create your models here. class Unixbench(models.Model): - """cpu_2006表""" + """unixbench表""" ThreadType = ( ("单线程", "单线程"), ("多线程", "多线程"), diff --git a/templates/front-project/src/views/testViews/TestList.vue b/templates/front-project/src/views/testViews/TestList.vue new file mode 100644 index 0000000000000000000000000000000000000000..4f4a49eac42a3bbc10b7b1e5a25c08865a2181c9 --- /dev/null +++ b/templates/front-project/src/views/testViews/TestList.vue @@ -0,0 +1,198 @@ + + + + + + + + +