diff --git a/appStore/testMachine/models.py b/appStore/testMachine/models.py index 341c78962d7c54ce9bccda3f2b0684705b41dfa5..e29f91f81ccbed2c89f009f9dbfc16e20b38ddc6 100644 --- a/appStore/testMachine/models.py +++ b/appStore/testMachine/models.py @@ -11,15 +11,28 @@ from django.db import models # Create your models here. class TestMachine(models.Model): """测试机器表""" + Link_Status_Type = ( + ("在线", "在线"), + ("离线", "离线"), + ) + Task_Status_Type = ( + ("空闲", "空闲"), + ("繁忙", "繁忙"), + ) machine_name = models.CharField(max_length=50, verbose_name='设备名称') - cpu_module_name = models.CharField(max_length=100, verbose_name='cpu型号') + cpu_module_name = models.CharField(max_length=50, verbose_name='cpu型号') 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='创建时间') + + owner = models.CharField(max_length=50, verbose_name='当前操作系统负责人', default=None) + server_IP = models.CharField(max_length=50, verbose_name='server_IP', null=True, blank=True) 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) + link_status = models.CharField(choices=Link_Status_Type, max_length=50, verbose_name='链接状态', null=True, blank=True) + task_status = models.CharField(choices=Task_Status_Type, max_length=50, verbose_name='任务状态', null=True, blank=True) + queue_user = models.CharField(max_length=50, verbose_name='排队人员', null=True, blank=True) update_time = models.DateTimeField(auto_now=True, verbose_name='更新时间') class Meta: diff --git a/templates/front-project/src/router/index.js b/templates/front-project/src/router/index.js index fe7c37b45d461bc75e2c7914d9579bbf06318670..bbb6e1aaa860f36f61d3c71a930b30c28ea460ef 100644 --- a/templates/front-project/src/router/index.js +++ b/templates/front-project/src/router/index.js @@ -22,11 +22,19 @@ const routes = [ component: () => import('@/components/KytuningHome'), children: [ { - name: '设备中心', + name: '注册设备', path: '/machine/list', component: () => import('@/views/machineViews/MachineList'), children: [] - },] + }, + { + name: '设备中心', + path: '/server/list', + component: () => import('@/views/machineViews/ServerList.vue'), + children: [] + }, + + ] }, { path: '/test/list', diff --git a/templates/front-project/src/views/machineViews/ServerList.vue b/templates/front-project/src/views/machineViews/ServerList.vue new file mode 100644 index 0000000000000000000000000000000000000000..b730b339e3c2daa411d879b43ea19ad924b814a7 --- /dev/null +++ b/templates/front-project/src/views/machineViews/ServerList.vue @@ -0,0 +1,189 @@ + + + + + + + + + + + + + + + + + + 重构 + 申请使用 + + + + + + + + + + + + +