From 14db0c49ebe3f7f333b6e8c310bec7126dd521e7 Mon Sep 17 00:00:00 2001
From: qz_cx <wangqingzheng@kylinos.cn>
Date: Tue, 14 Oct 2025 15:52:22 +0800
Subject: [PATCH] Server application usage function completed

---
 appStore/api/router.py                        |   1 +
 appStore/testMachine/views.py                 |  14 +-
 templates/front-project/src/api/api.js        |  11 +-
 .../src/views/machineViews/MachineList.vue    |  12 +-
 .../src/views/machineViews/ServerList.vue     | 126 +-----------------
 5 files changed, 31 insertions(+), 133 deletions(-)

diff --git a/appStore/api/router.py b/appStore/api/router.py
index dbad63f..2f421db 100644
--- a/appStore/api/router.py
+++ b/appStore/api/router.py
@@ -46,6 +46,7 @@ router.register(r'machine_list', TestMachineViewSet, basename='machine_list')
 
 urlpatterns = [
     url(r'', include(router.urls)),
+    url('^apply_use_machine/', TestMachineViewSet.as_view({'post': 'apply_use_machine'}), name='apply_use_machine'),
     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'),
diff --git a/appStore/testMachine/views.py b/appStore/testMachine/views.py
index e435f61..ebf3b9d 100644
--- a/appStore/testMachine/views.py
+++ b/appStore/testMachine/views.py
@@ -29,7 +29,7 @@ class TestMachineViewSet(viewsets.ModelViewSet):
 
     def create(self, request, *args, **kwargs):
         machine_data = {}
-        machine_data['test_user'] = request.user.chinese_name
+        machine_data['owner'] = request.user.chinese_name
         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')
@@ -47,7 +47,7 @@ class TestMachineViewSet(viewsets.ModelViewSet):
         machine_data = TestMachine.objects.get(id=machine_id)
         if not machine_id or not machine_data:
             return json_response({}, status.HTTP_205_RESET_CONTENT, '没有该数据')
-        machine_data.test_user = request.user.chinese_name
+        machine_data.owner = request.user.chinese_name
         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')
@@ -57,6 +57,16 @@ class TestMachineViewSet(viewsets.ModelViewSet):
         machine_data.save()
         return json_response({}, status.HTTP_200_OK, '修改成功')
 
+    def apply_use_machine(self, request, *args, **kwargs):
+        machine_id = request.data.get('id')
+        machine_data = TestMachine.objects.get(id=machine_id)
+        if not machine_id or not machine_data:
+            return json_response({}, status.HTTP_205_RESET_CONTENT, '没有该数据')
+        machine_data.queue_user = request.user.chinese_name
+        machine_data.save()
+        return json_response({}, status.HTTP_200_OK, '申请成功')
+
+
 
     def delete(self, request, *args, **kwargs):
         id = request.data.get('id', None)
diff --git a/templates/front-project/src/api/api.js b/templates/front-project/src/api/api.js
index afc6ef6..eeca8cc 100644
--- a/templates/front-project/src/api/api.js
+++ b/templates/front-project/src/api/api.js
@@ -212,7 +212,7 @@ export function error_list(type, paramsOrData) {
   return service(commonConfig);
 }
 
-//错误数据管理
+//设备管理
 export function machine_list(type, paramsOrData) {
   const commonConfig = {
     method: type,
@@ -224,4 +224,13 @@ export function machine_list(type, paramsOrData) {
     commonConfig.data = paramsOrData;
   }
   return service(commonConfig);
+}
+
+//申请使用设备
+export function apply_use_machine(data) {
+    return service({
+        method: 'post',
+        url: '/apply_use_machine/',
+        data
+    })
 }
\ No newline at end of file
diff --git a/templates/front-project/src/views/machineViews/MachineList.vue b/templates/front-project/src/views/machineViews/MachineList.vue
index 69f910a..5bf4f2e 100644
--- a/templates/front-project/src/views/machineViews/MachineList.vue
+++ b/templates/front-project/src/views/machineViews/MachineList.vue
@@ -11,7 +11,7 @@
     <el-button type="success" @click="add" style="float: right;">新增</el-button>
     <div class="cont">
       <el-table :data="showData" :header-cell-style="{fontSize:'5px'}"
-                tooltip-effect="dark" border style="width: 100%" class="tableHead">
+                tooltip-effect="dark" border style="width: 100%">
         <el-table-column prop="machine_name" label="设备名称"></el-table-column>
         <el-table-column prop="cpu_module_name" label="CPU型号"></el-table-column>
         <el-table-column prop="arch_name" label="架构"></el-table-column>
@@ -79,12 +79,7 @@ export default {
         'BMC_password':'',
       },
       archTypes: ['x86', 'arm','mips','loongarch'],
-      rules: {
-        errType: [{required: true, message: '请选择错误类型', trigger: 'change'}],
-      },
       dialogAddMachine: false,
-      testData: '',
-      testDatas: [],
       modifyID: 0,
       dialogTitle:'新增设备',
     };
@@ -207,10 +202,5 @@ export default {
 
 
 <style scoped>
-.parent-container {
-  display: flex;
-  justify-content: center;
-  /*background-color: #f2f2f2;*/
-}
 </style>
 
diff --git a/templates/front-project/src/views/machineViews/ServerList.vue b/templates/front-project/src/views/machineViews/ServerList.vue
index b730b33..c655216 100644
--- a/templates/front-project/src/views/machineViews/ServerList.vue
+++ b/templates/front-project/src/views/machineViews/ServerList.vue
@@ -10,7 +10,7 @@
     <!-- 搜索 -->
     <div class="cont">
       <el-table :data="showData" :header-cell-style="{fontSize:'5px'}"
-                tooltip-effect="dark" border style="width: 100%" class="tableHead">
+                tooltip-effect="dark" border style="width: 100%">
         <el-table-column prop="machine_name" label="设备名称"></el-table-column>
         <el-table-column prop="cpu_module_name" label="CPU型号"></el-table-column>
         <el-table-column prop="owner" label="当前负责人"></el-table-column>
@@ -22,8 +22,8 @@
         <el-table-column prop="update_time" label="更新时间"></el-table-column>
         <el-table-column label="操作" width="200">
           <template #default="scope">
-            <el-button type="primary" @click="modify(scope.row)">重构</el-button>
-            <el-button type="success" @click="del(scope.row)">申请使用</el-button>
+            <el-button type="primary" @click="modify(scope.row)">编辑</el-button>
+            <el-button type="success" @click="applyUse(scope.row)">申请使用</el-button>
           </template>
         </el-table-column>
       </el-table>
@@ -34,7 +34,7 @@
 
 <script scoped>
 import {ElMessage} from 'element-plus';
-import {machine_list} from "@/api/api";
+import {apply_use_machine, machine_list} from "@/api/api";
 import utils from '@/utils/utils';
 
 export default {
@@ -43,23 +43,7 @@ export default {
   data() {
     return {
       allDatas: [],
-      machineData: {
-        'machine_name': '',
-        'cpu_module_name': '',
-        'arch_name': '',
-        'BMC_IP': '',
-        'BMC_user_name':'',
-        'BMC_password':'',
-      },
-      archTypes: ['x86', 'arm','mips','loongarch'],
-      rules: {
-        errType: [{required: true, message: '请选择错误类型', trigger: 'change'}],
-      },
-      dialogAddMachine: false,
-      testData: '',
-      testDatas: [],
       modifyID: 0,
-      dialogTitle:'新增设备',
     };
   },
   created() {
@@ -73,106 +57,15 @@ export default {
       });
     },
 
-    //新增
-    add() {
-      this.dialogAddMachine = true
-    },
-    //新增的取消
-    closeInfo() {
-      // 重置表单的验证状态
-      this.$refs.machineForm.resetFields();
-      this.dialogAddMachine = false
-    },
-
-    addSure() {
-      //machineForm这个是上面form表单中的ref对应的标记
-      this.$refs.machineForm.validate((valid) => {
-        if (valid) {
-          this.dialogAddMachine = false;
-          const machineData_ = {
-            machine_name: this.machineData.machine_name,
-            cpu_module_name: this.machineData.cpu_module_name,
-            arch_name: this.machineData.arch_name,
-            BMC_IP: this.machineData.BMC_IP,
-            BMC_user_name: this.machineData.BMC_user_name,
-            BMC_password: this.machineData.BMC_password,
-          };
-          machine_list('post', machineData_).then((response) => {
-            if (response.data.code === 200) {
-              ElMessage({message: response.data.message, type: 'success'});
-              this.getData();
-              this.reset()
-            }
-          });
-        } else {
-          ElMessage({message: '请填写正确信息', type: 'success'})
-          return false;
-        }
-      });
-    },
-
-    reset() {
-      this.machineData = {
-        machine_name: '',
-        cpu_module_name: '',
-        arch_name: '',
-        BMC_IP: '',
-        BMC_user_name: '',
-        BMC_password: '',
-      }
-      this.getData()
-    },
-
-    //修改数据
-    modify(row) {
-      this.dialogTitle='修改设备信息'
-      this.dialogAddMachine = true
-      this.modifyID = row.id
-      this.machineData = {
-        machine_name: row.machine_name,
-        cpu_module_name: row.cpu_module_name,
-        arch_name: row.arch_name,
-        BMC_IP: row.BMC_IP,
-        BMC_user_name: row.BMC_user_name,
-        BMC_password: row.BMC_password,
-      }
-    },
-    //确定修改数据
-    modifySure() {
-      this.dialogAddMachine = false;
-      const machineData_ = {
-        id: this.modifyID,
-        machine_name: this.machineData.machine_name,
-        cpu_module_name: this.machineData.cpu_module_name,
-        arch_name: this.machineData.arch_name,
-        BMC_IP: this.machineData.BMC_IP,
-        BMC_user_name: this.machineData.BMC_user_name,
-        BMC_password: this.machineData.BMC_password,
-      }
-
-      machine_list('put', machineData_).then(response => {
+    //申请使用
+    applyUse(row) {
+      apply_use_machine({id:row.id}).then(response => {
         if (response.data.code === 200) {
           ElMessage({message: response.data.message, type: 'success'})
           this.getData()
         }
       })
     },
-
-    //删除数据
-    del(row) {
-      this.$confirm(`确认删除此行数据吗？`, '提示', {
-        confirmButtonText: '确定',
-        cancelButtonText: '取消',
-        type: 'warning'
-      }).then(() => {
-        machine_list('delete', {id: row.id}).then(response => {
-          if (response.data.code === 200) {
-            ElMessage({message: response.data.message, type: 'success'})
-            this.getData()
-          }
-        })
-      })
-    },
   }
 }
 ;
@@ -180,10 +73,5 @@ export default {
 
 
 <style scoped>
-.parent-container {
-  display: flex;
-  justify-content: center;
-  /*background-color: #f2f2f2;*/
-}
 </style>
 
-- 
Gitee