From 9f2e2d7d003668cfe1692dcbef15442d61f13d00 Mon Sep 17 00:00:00 2001 From: qz_cx Date: Tue, 14 Oct 2025 09:50:33 +0800 Subject: [PATCH 1/2] Equipment center page display completed --- appStore/testMachine/models.py | 14 +-- appStore/testMachine/serializers.py | 3 +- appStore/testMachine/views.py | 5 +- .../src/views/machineViews/MachineList.vue | 101 +++++------------- 4 files changed, 37 insertions(+), 86 deletions(-) diff --git a/appStore/testMachine/models.py b/appStore/testMachine/models.py index 573a69e..341c789 100644 --- a/appStore/testMachine/models.py +++ b/appStore/testMachine/models.py @@ -12,13 +12,15 @@ from django.db import models class TestMachine(models.Model): """测试机器表""" machine_name = models.CharField(max_length=50, verbose_name='设备名称') - arch_name = models.CharField(max_length=50, verbose_name='架构') cpu_module_name = models.CharField(max_length=100, verbose_name='cpu型号') - ip = models.CharField(max_length=50, verbose_name='IP') - os_version = models.CharField(max_length=50, verbose_name='操作系统版本') - test_user = models.CharField(max_length=255, verbose_name='当前操作系统负责人', ) - use_time = models.DateTimeField(verbose_name='接手时间', auto_now=True) - + arch_name = models.CharField(max_length=50, verbose_name='架构') + BMC_IP = models.CharField(max_length=50, verbose_name='BMC_IP') + BMC_user_name = models.CharField(max_length=50, verbose_name='BMC用户名') + BMC_password = models.CharField(max_length=50, verbose_name='BMC密码') + create_time = models.DateTimeField(auto_now_add=True, verbose_name='创建时间') + os_version = models.CharField(max_length=50, verbose_name='操作系统版本', null=True, blank=True) + test_user = models.CharField(max_length=255, verbose_name='当前操作系统负责人', null=True, blank=True) + update_time = models.DateTimeField(auto_now=True, verbose_name='更新时间') class Meta: db_table = 'testMachine' diff --git a/appStore/testMachine/serializers.py b/appStore/testMachine/serializers.py index 8176adb..18819ca 100644 --- a/appStore/testMachine/serializers.py +++ b/appStore/testMachine/serializers.py @@ -14,7 +14,8 @@ class TestMachineSerializer(serializers.ModelSerializer): """ testMachine数据序列化 """ - use_time = serializers.DateTimeField(format='%Y-%m-%d %H:%M:%S', read_only=True) + create_time = serializers.DateTimeField(format='%Y-%m-%d %H:%M:%S', read_only=True) + update_time = serializers.DateTimeField(format='%Y-%m-%d %H:%M:%S', read_only=True) class Meta: model = TestMachine diff --git a/appStore/testMachine/views.py b/appStore/testMachine/views.py index 4725589..cf1c087 100644 --- a/appStore/testMachine/views.py +++ b/appStore/testMachine/views.py @@ -33,8 +33,9 @@ class TestMachineViewSet(viewsets.ModelViewSet): machine_data['machine_name'] = request.data.get('machine_name') machine_data['arch_name'] = request.data.get('arch_name') machine_data['cpu_module_name'] = request.data.get('cpu_module_name') - machine_data['ip'] = request.data.get('ip') - machine_data['os_version'] = request.data.get('os_version') + machine_data['BMC_IP'] = request.data.get('BMC_IP') + machine_data['BMC_user_name'] = request.data.get('BMC_user_name') + machine_data['BMC_password'] = request.data.get('BMC_password') config_serializer = TestMachineSerializer(data=machine_data) if config_serializer.is_valid(): self.perform_create(config_serializer) diff --git a/templates/front-project/src/views/machineViews/MachineList.vue b/templates/front-project/src/views/machineViews/MachineList.vue index 158571c..de02ad9 100644 --- a/templates/front-project/src/views/machineViews/MachineList.vue +++ b/templates/front-project/src/views/machineViews/MachineList.vue @@ -13,15 +13,15 @@ - - - - - + + + + + @@ -31,22 +31,25 @@
- + + + + - - + + - - + + - - + +