diff --git a/appStore/env/views.py b/appStore/env/views.py index 6c2d043cdd5dc9683ed6804ead63b119cdc678fb..a3585ec05f01bb31da2e9ddf26bdf4097fbd3bc7 100644 --- a/appStore/env/views.py +++ b/appStore/env/views.py @@ -404,6 +404,7 @@ class EnvViewSet(viewsets.ModelViewSet): from appStore.project.views import ProjectViewSet request_project = HttpRequest() request_project.method = 'POST' + request.data['chinese_name']=request.user.chinese_name request_project.data_project = request.data request_project.project_message = project_message ProjectViewSet = ProjectViewSet() diff --git a/appStore/errorList/views.py b/appStore/errorList/views.py index 0547ecebaaeb0e5071f3a1ffb704a87c28d96bf0..94f231aeefdc484609268745cd549f46a4d38065 100644 --- a/appStore/errorList/views.py +++ b/appStore/errorList/views.py @@ -43,7 +43,7 @@ class ErrorListViewSet(viewsets.ModelViewSet): def create(self, request, *args, **kwargs): error_data = {} error_data['error_type'] = request.data.get('error_type') - error_data['user_name'] = request.user.username + error_data['user_name'] = request.user.chinese_name error_data['test_type'] = request.data.get('test_type') error_data['error_description'] = request.data.get('error_description') error_data['error_log_excerpt'] = request.data.get('error_log_excerpt') @@ -60,7 +60,7 @@ class ErrorListViewSet(viewsets.ModelViewSet): if not id or not KytuningError.objects.filter(id=id): return json_response({}, status.HTTP_205_RESET_CONTENT, '请传递正确的测试id') user_name = KytuningError.objects.filter(id=id).first().user_name - if request.user.is_superuser or request.user.username == user_name: + if request.user.is_superuser or request.user.chinese_name == user_name: error_data = KytuningError.objects.get(id=id) if not error_data: return json_response({}, status.HTTP_205_RESET_CONTENT, '没有该数据') @@ -80,7 +80,7 @@ class ErrorListViewSet(viewsets.ModelViewSet): if not id or not KytuningError.objects.filter(id=id): return json_response({}, status.HTTP_205_RESET_CONTENT, '请传递正确的测试id') user_name = KytuningError.objects.filter(id=id).first().user_name - if request.user.is_superuser or request.user.username == user_name: + if request.user.is_superuser or request.user.chinese_name == user_name: test_case_data = KytuningError.objects.filter(id=id).first() if not test_case_data: return json_response({}, status.HTTP_205_RESET_CONTENT, '没有该数据') diff --git a/appStore/testCase/views.py b/appStore/testCase/views.py index 5e4e3b73a4d026ccf35eaa323bb3199dbd9697bb..56c69a204cb3ca05a104c45523c4ddfbc946826a 100644 --- a/appStore/testCase/views.py +++ b/appStore/testCase/views.py @@ -90,8 +90,7 @@ class TestCaseViewSet(viewsets.ModelViewSet): configfile.write('rk_benchmark="{}"\n'.format(' '.join(test_case_names))) configfile.write('project_name={}\n'.format(data_test_case['project_name'])) configfile.write('upload=true\n') - configfile.write('username={}\n'.format(str(request.user))) - configfile.write('password={}\n'.format(request.data.get('user_password'))) + configfile.write('token={}\n'.format(request.META.get('HTTP_AUTHORIZATION'))) # 将配置数据写入YAML文件 if int(data_test_case['stream']): diff --git a/appStore/userConfig/models.py b/appStore/userConfig/models.py index d447127e767cffa3140bf2166b2f0db2c6f0bec9..27038505ab66c759dbd5b0f263a1a13af49e230f 100644 --- a/appStore/userConfig/models.py +++ b/appStore/userConfig/models.py @@ -12,7 +12,6 @@ class UserConfig(models.Model): """用户配置表""" config_name = models.CharField(max_length=50, verbose_name='配置文件名称') user_name = models.CharField(max_length=50, verbose_name='用户名称') - user_password = models.CharField(max_length=50, verbose_name='用户密码') project_name = models.CharField(max_length=50, verbose_name='测试项目名称') test_ip = models.CharField(max_length=50, verbose_name='测试机器IP') test_password = models.CharField(max_length=50, verbose_name='测试机器密码') diff --git a/appStore/userConfig/views.py b/appStore/userConfig/views.py index 0310e19d290914dbb47778ae83340e474cfadf14..a47d79b1fbde41dd660b25227aa95583d7e8d495 100644 --- a/appStore/userConfig/views.py +++ b/appStore/userConfig/views.py @@ -21,7 +21,7 @@ class UserConfigViewSet(viewsets.ModelViewSet): serializer_class = UserConfigSerializer def list(self, request, *args, **kwargs): - queryset = UserConfig.objects.filter(user_name=request.user.username).all().order_by('-id') + queryset = UserConfig.objects.filter(user_name=request.user.chinese_name).all().order_by('-id') id = request.GET.get('configID') if not queryset: return json_response({}, status.HTTP_200_OK, '列表') @@ -35,8 +35,7 @@ class UserConfigViewSet(viewsets.ModelViewSet): def create(self, request, *args, **kwargs): user_config_data = {} - user_config_data['user_name'] = request.user.username - user_config_data['user_password'] = request.data.get('user_password') + user_config_data['user_name'] = request.user.chinese_name user_config_data['config_name'] = request.data.get('config_name') user_config_data['project_name'] = request.data.get('project_name') user_config_data['test_ip'] = request.data.get('test_ip') @@ -74,12 +73,11 @@ class UserConfigViewSet(viewsets.ModelViewSet): if not id or not UserConfig.objects.filter(id=id): return json_response({}, status.HTTP_205_RESET_CONTENT, '请传递正确的测试id') user_name = UserConfig.objects.filter(id=id).first().user_name - if request.user.is_superuser or request.user.username == user_name: + if request.user.is_superuser or request.user.chinese_name == user_name: config_data = UserConfig.objects.get(id=id) # get=filter.first() if not config_data: return json_response({}, status.HTTP_205_RESET_CONTENT, '没有该数据') config_data.config_name = request.data.get('config_name') - config_data.user_password = request.data.get('user_password') config_data.project_name = request.data.get('project_name') config_data.test_ip = request.data.get('test_ip') config_data.test_password = request.data.get('test_password') @@ -111,7 +109,7 @@ class UserConfigViewSet(viewsets.ModelViewSet): if not id or not UserConfig.objects.filter(id=id): return json_response({}, status.HTTP_205_RESET_CONTENT, '请传递正确的测试id') user_name = UserConfig.objects.filter(id=id).first().user_name - if request.user.is_superuser or request.user.username == user_name: + if request.user.is_superuser or request.user.chinese_name == user_name: test_case_data = UserConfig.objects.filter(id=id).first() if not test_case_data: return json_response({}, status.HTTP_205_RESET_CONTENT, '没有该数据') diff --git a/templates/front-project/src/components/TableHeader.vue b/templates/front-project/src/components/TableHeader.vue new file mode 100644 index 0000000000000000000000000000000000000000..a71b30c6a657a0a4b2b6c1cf81d77e79be5c5555 --- /dev/null +++ b/templates/front-project/src/components/TableHeader.vue @@ -0,0 +1,55 @@ + + + \ No newline at end of file diff --git a/templates/front-project/src/router/index.js b/templates/front-project/src/router/index.js index 627b71748bff9baf95750b41a54d12beff010aeb..e7da05b5122590c3bc825b876882ae29f9b25c85 100644 --- a/templates/front-project/src/router/index.js +++ b/templates/front-project/src/router/index.js @@ -32,8 +32,8 @@ const routes = [ component: () => import('@/views/testViews/TestList') }, { - // path: '/test/do_test/:userConfig?', - path: '/test/do_test/:configID?', + // path: '/test/do_test/:configID?', + path: '/test/do_test', name: '发起测试', component: () => import('@/views/testViews/DoTest'), // props:true // 如果props设置为true，$route.params将被设置为组件属性记对象 diff --git a/templates/front-project/src/views/testViews/DoTest.vue b/templates/front-project/src/views/testViews/DoTest.vue index 98f3f784a3f7e13647144ac4c694109e52826a01..b448f8bd39dba127541d5eb2bcaf61fa46dda6b5 100644 --- a/templates/front-project/src/views/testViews/DoTest.vue +++ b/templates/front-project/src/views/testViews/DoTest.vue @@ -11,16 +11,13 @@
- + - - - @@ -147,7 +144,6 @@ export default { formData: { configName: '', projectName: '', - userPassword: '', yamlData: baseYamlData, testIP: '', testPassword: '', @@ -167,18 +163,23 @@ export default { yamlDialog: false, configDialog: false, - configNameDialog: false, yamlType: '', configID: 0, configData: '', configDatas: [], + rules: { + configName: [{required: true, message: 'configName不能为空', trigger: 'blur'}], + projectName: [{required: true, message: 'projectName不能为空', trigger: 'blur'}], + yamlData: [{required: true, message: 'yamlData不能为空', trigger: 'blur'}], + }, }; }, created() { this.getData() }, methods: { - getData() {}, + getData() { + }, //展示yaml文件 showYaml(yamlType) { this.yamlDialog = true @@ -213,7 +214,6 @@ export default { this.configID = config.id this.formData.configName = config.config_name this.formData.projectName = config.project_name - this.formData.userPassword = config.user_password this.formData.iterations.stream = config.stream_number this.formData.iterations.lmbench = config.lmbench_number this.formData.iterations.unixbench = config.unixbench_number @@ -258,7 +258,6 @@ export default { this.configID = this.configData.id this.formData.configName = this.configData.config_name this.formData.projectName = this.configData.project_name - this.formData.userPassword = this.configData.user_password this.formData.iterations.stream = this.configData.stream_number this.formData.iterations.lmbench = this.configData.lmbench_number this.formData.iterations.unixbench = this.configData.unixbench_number @@ -283,7 +282,6 @@ export default { //更新配置 update() { if (this.check()) { - console.log(this.configID) if (this.configID) { const formData = { id: this.configID, @@ -291,7 +289,6 @@ export default { project_name: this.formData.projectName, test_ip: this.formData.testIP, test_password: this.formData.testPassword, - user_password: this.formData.userPassword, stream: this.formData.iterations.stream, lmbench: this.formData.iterations.lmbench, unixbench: this.formData.iterations.unixbench, @@ -312,13 +309,11 @@ export default { //新增配置 add() { if (this.check()) { - this.configNameDialog = true const formData = { config_name: this.formData.configName, project_name: this.formData.projectName, test_ip: this.formData.testIP, test_password: this.formData.testPassword, - user_password: this.formData.userPassword, stream: this.formData.iterations.stream, lmbench: this.formData.iterations.lmbench, unixbench: this.formData.iterations.unixbench, @@ -343,7 +338,6 @@ export default { project_name: this.formData.projectName, test_ip: this.formData.testIP, test_password: this.formData.testPassword, - user_password: this.formData.userPassword, stream: this.formData.iterations.stream, lmbench: this.formData.iterations.lmbench, unixbench: this.formData.iterations.unixbench, @@ -356,12 +350,11 @@ export default { message: this.formData.message } do_test_case(formData).then(response => { - console.log(response.data) + console.log(response.data.code) this.formData.configName = '' this.formData.projectName = '' this.formData.testIP = '' this.formData.testPassword = '' - this.formData.userPassword = '' this.formData.iterations.stream = '' this.formData.iterations.lmbench = '' this.formData.iterations.unixbench = '' @@ -382,10 +375,6 @@ export default { ElMessage({message: "项目名称不能为空", type: 'error'}); return false; } - if (!this.formData.userPassword) { - ElMessage({message: "kytuning用户密码不能为空", type: 'error'}); - return false; - } const iterations = { stream: this.formData.iterations.stream !== '' ? parseInt(this.formData.iterations.stream) : 0, lmbench: this.formData.iterations.lmbench !== '' ? parseInt(this.formData.iterations.lmbench) : 0,