From 746ddfaf563a34695178bb74e256047b9340a8c9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=A7=9C=E7=8E=89=E7=90=A6?=
 <7507756+jiang_yuqi@user.noreply.gitee.com>
Date: Tue, 23 Jul 2024 23:40:14 +0800
Subject: [PATCH] =?UTF-8?q?=E6=8F=90=E4=BA=A4=E4=BB=A3=E7=A0=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/dataSet/index.js               |   9 +-
 src/views/manage/datas/edit.vue        |  11 +-
 src/views/manage/equipment/addNet.vue  |   6 +-
 src/views/manage/equipment/addPcie.vue |   6 +-
 src/views/manage/equipment/view.vue    | 160 +++++++------------------
 5 files changed, 64 insertions(+), 128 deletions(-)

diff --git a/src/api/dataSet/index.js b/src/api/dataSet/index.js
index f7237cf..824621f 100644
--- a/src/api/dataSet/index.js
+++ b/src/api/dataSet/index.js
@@ -31,7 +31,7 @@ const dataSetInfo = (id) => {
     });
 }
 //更新指定数据集的内容
-const updateDataSet = (id,data) => {
+const updateDataSet = (id, data) => {
     return request({
         url: `/dataset/raw/${id}`,
         method: "put",
@@ -47,7 +47,7 @@ const downloadFile = (id) => {
     })
 }
 //删除指定的图像文件
-const deleteFile = (id,data) => {
+const deleteFile = (id, data) => {
     return request({
         url: `/dataset/raw/${id}/files`,
         method: "delete",
@@ -66,7 +66,10 @@ const rawUpload = (id, data) => {
     return request({
         url: `/dataset/raw/${id}/upload`,
         method: "post",
-        data: data
+        data: data,
+        headers: {
+            "Content-Type": "multipart/form-data",
+        },
     });
 }
 
diff --git a/src/views/manage/datas/edit.vue b/src/views/manage/datas/edit.vue
index e546d61..7d73c19 100644
--- a/src/views/manage/datas/edit.vue
+++ b/src/views/manage/datas/edit.vue
@@ -375,13 +375,12 @@ function startUploadFiles() {
   }
   uploadImgFileList.value.forEach((item) => {
     let json = uploadJsonList.value.filter((it) => disName(item.name, it.name));
-    let data = {
-      image_file_name: item.name,
-      image_file: item.raw,
-      label_file: json.length > 0 ? json[0].raw : null,
-    };
+    const formData = new FormData();
+    formData.append("image_file_name", item.name);
+    formData.append("image_file", item.raw);
+    formData.append("label_file", json.length > 0 ? json[0].raw : null);
     uploadLoading.value = true;
-    DataSetApi.rawUpload(form.value.dataset_id, data)
+    DataSetApi.rawUpload(form.value.dataset_id, formData)
       .then((res) => {
         if (res.data.code == 0) {
           uploadImgFileList.value = uploadImgFileList.value.filter(
diff --git a/src/views/manage/equipment/addNet.vue b/src/views/manage/equipment/addNet.vue
index 30e853b..0c11607 100644
--- a/src/views/manage/equipment/addNet.vue
+++ b/src/views/manage/equipment/addNet.vue
@@ -37,8 +37,8 @@
       <el-row>
         <el-col :lg="12" :xs="24">
           <el-form ref="formRef" :model="form" :rules="rules" label-width="80px">
-            <el-form-item label="设备ID" prop="device_id">
-              <el-input v-model="form.device_id" placeholder="请输入设备ID" />
+            <el-form-item label="设备ID" prop="uuid">
+              <el-input v-model="form.uuid" disabled placeholder="请输入设备ID" />
             </el-form-item>
             <el-form-item label="设备名称" prop="device_name">
               <el-input v-model="form.device_name" placeholder="请输入设备名称" />
@@ -55,6 +55,7 @@
               <el-input
                 v-model="form.infomation"
                 :rows="3"
+                disabled
                 type="textarea"
                 placeholder="请输入详细信息"
               />
@@ -96,6 +97,7 @@ const queryParams = reactive({
 /** 选中未注册设备 */
 function getCurrentRow(row: { [key: string]: any }) {
   form.uuid = row.uuid;
+  form.infomation = row.manufacturer;
   form.manufacturer = row.manufacturer;
   form.hardware_chip = row.hardware_chip;
   form.hardware_model = row.hardware_model;
diff --git a/src/views/manage/equipment/addPcie.vue b/src/views/manage/equipment/addPcie.vue
index 7a0bed4..e405538 100644
--- a/src/views/manage/equipment/addPcie.vue
+++ b/src/views/manage/equipment/addPcie.vue
@@ -38,8 +38,8 @@
       <el-row>
         <el-col :lg="12" :xs="24">
           <el-form ref="formRef" :model="form" :rules="rules" label-width="80px">
-            <el-form-item label="设备ID" prop="device_id">
-              <el-input v-model="form.device_id" placeholder="请输入设备ID" />
+            <el-form-item label="设备ID" prop="uuid">
+              <el-input v-model="form.uuid" disabled placeholder="请输入设备ID" />
             </el-form-item>
             <el-form-item label="设备名称" prop="device_name">
               <el-input v-model="form.device_name" placeholder="请输入设备名称" />
@@ -56,6 +56,7 @@
               <el-input
                 v-model="form.infomation"
                 :rows="3"
+                disabled
                 type="textarea"
                 placeholder="请输入详细信息"
               />
@@ -98,6 +99,7 @@ const queryParams = reactive({
 function getCurrentRow(row: { [key: string]: any }) {
   form.uuid = row.uuid;
   form.pcie_index = row.pcie_index;
+  form.infomation = row.manufacturer;
   form.manufacturer = row.manufacturer;
   form.hardware_chip = row.hardware_chip;
   form.hardware_model = row.hardware_model;
diff --git a/src/views/manage/equipment/view.vue b/src/views/manage/equipment/view.vue
index 527e250..29b2f34 100644
--- a/src/views/manage/equipment/view.vue
+++ b/src/views/manage/equipment/view.vue
@@ -2,7 +2,7 @@
 <template>
   <div class="app-container model-detail">
     <!-- 用户新增/编辑表单 -->
-    <el-card>
+    <el-card v-loading="loading">
       <template #header
         ><svg-icon
           icon-class="pause"
@@ -11,146 +11,76 @@
       >
       <el-row>
         <el-col :lg="12" :xs="24">
-          <el-form
-            ref="userFormRef"
-            :model="formData"
-            v-loading="loading"
-            label-width="100px"
-            size="small"
-          >
-            <el-form-item label="设备名称" prop="username"> 目标分类模型 </el-form-item>
-            <el-form-item label="设备型号" prop="nickname">
-              前置算子/缩放算子
+          <el-form label-width="100px" size="small">
+            <el-form-item label="设备名称"> {{ form.data.device_name }} </el-form-item>
+            <el-form-item label="设备型号">
+              {{ form.data.cmpt_hardware_type }}
             </el-form-item>
-            <el-form-item label="芯片信息" prop="nickname22"> 昇腾310 </el-form-item>
-            <el-form-item label="厂商名称" prop="nickname33"> 华为 </el-form-item>
-            <el-form-item label="接口类型" prop="username"> Pcie </el-form-item>
-            <el-form-item label="设备状态" prop="nickname">
+            <el-form-item label="设备类型">
+              <el-tag effect="plain">
+                {{ form.data.hardware_model }}
+              </el-tag>
+            </el-form-item>
+            <el-form-item label="芯片信息"> {{ form.data.hardware_chip }} </el-form-item>
+            <el-form-item label="厂商名称"> {{ form.data.manufacturer }} </el-form-item>
+            <el-form-item label="接口类型">
+              {{ form.data.cmpt_interface_type }}
+            </el-form-item>
+            <el-form-item label="设备状态">
               <el-tag type="success">已连接</el-tag>
             </el-form-item>
-            <el-form-item label="设备标签" prop="nickname22">
-              <div class="flex gap-2">
-                <el-tag type="info">设备标签</el-tag>
-                <el-tag type="info">对讲机</el-tag>
-                <el-tag type="info">头像识别</el-tag>
-              </div>
-            </el-form-item>
-            <el-form-item label="设备类型" prop="nickname33"> PCIE-AI-NPU </el-form-item>
-            <el-form-item label="IP地址" prop="nickname33"> 192.168.1.32 </el-form-item>
-            <el-form-item label="ID编号" prop="nickname33">
-              6c647c8d-774j-sdjksk-fdof67
-            </el-form-item>
-            <el-form-item label="程序版本" prop="nickname33"> V3.0 </el-form-item>
-            <el-form-item label="详细信息" prop="nickname33">
-              <el-input
-                v-model="formData.usernamedd"
-                :disabled="true"
-                placeholder="请输入数据集名称"
-                :rows="5"
-                type="textarea"
-              />
+            <el-form-item label="ID编号">
+              {{ form.data.uuid }}
             </el-form-item>
+            <el-form-item label="程序版本"
+              ><el-tag type="success" effect="dark">
+                {{ form.data.software_version }}
+              </el-tag></el-form-item
+            >
+            <el-form-item label="设备描述"> {{ form.data.dataset_desc }} </el-form-item>
+            <el-form-item label="详细信息"> {{ form.data.infomation }} </el-form-item>
           </el-form>
         </el-col>
         <el-col :lg="12" :xs="24"> </el-col>
       </el-row>
     </el-card>
     <el-card class="card-footer">
-        <el-button @click="closeBack"><i-ep-close />取 消</el-button>
+      <el-button @click="closeBack"><i-ep-close />取 消</el-button>
     </el-card>
   </div>
 </template>
 
 <script setup lang="ts">
-defineOptions({
-  name: "User",
-  inheritAttrs: false,
-});
-
-import UserAPI from "@/api/user";
-import { UserForm } from "@/api/user/model";
+import DeviceApi from "@/api/device";
 
+const route = useRoute();
 const router = useRouter();
+
+const form = reactive({
+  data: {},
+});
 const loading = ref(false); //  加载状态
 
-const calTypeList = ref<OptionType[]>(); // 角色下拉数据源
-
-// 用户表单数据
-const formData = reactive<UserForm>({
-  status: 1,
-  usernamedd:
-    "1个DaVinciV300 A core，主频1.224GHZ\r\n4个TAISHANV200M处理器核，主频1.6GHz\r\n半精度(FP16):10TFLOPS\r\n整数精度(INT8):20TOPS\r\n内存:LPDDR4X 8GB典型功耗:24.5W",
-});
-
-// 校验规则
-const rules = reactive({
-  username: [{ required: true, message: "用户名不能为空", trigger: "blur" }],
-  nickname: [{ required: true, message: "用户昵称不能为空", trigger: "blur" }],
-  deptId: [{ required: true, message: "所属部门不能为空", trigger: "blur" }],
-  roleIds: [{ required: true, message: "用户角色不能为空", trigger: "blur" }],
-  email: [
-    {
-      pattern: /\w[-\w.+]*@([A-Za-z0-9][-A-Za-z0-9]+\.)+[A-Za-z]{2,14}/,
-      message: "请输入正确的邮箱地址",
-      trigger: "blur",
-    },
-  ],
-  mobile: [
-    {
-      pattern: /^1[3|4|5|6|7|8|9][0-9]\d{8}$/,
-      message: "请输入正确的手机号码",
-      trigger: "blur",
-    },
-  ],
-});
-
-const list = [
-  {
-    csmc: "10.0.8.12",
-    csms: "异腾310",
-    csmc1: "Atlas 2000 DK A2",
-    csmc2: "PCIE-AI-NPU",
-    csmc3: "华为",
-    csmc4: "1.2",
-    csmc5: "已连接",
-  },
-  {
-    csmc: "192.168.1.44",
-    csms: "思源220",
-    csmc1: "Atlas 2000 DK A2",
-    csmc2: "PCIE-AI-NPU",
-    csmc3: "华为",
-    csmc4: "1.2",
-    csmc5: "已连接",
-  },
-  {
-    csmc: "192.168.1.66",
-    csms: "RTX4090",
-    csmc1: "Atlas 2000 DK A2",
-    csmc2: "PCIE-AI-NPU",
-    csmc3: "华为",
-    csmc4: "1.2",
-    csmc5: "已连接",
-  },
-];
-
-/** 表单提交 */
-const handleSubmit = useThrottleFn(() => {
+/** 初始化数据 */
+function initPage() {
+  let id = route.query.id;
   loading.value = true;
-  setTimeout(() => {
-    ElMessage.success("修改用户成功");
-    loading.value = false;
-    closeBack();
-  }, 1000);
-}, 3000);
+  DeviceApi.devicesInfo(id)
+    .then((res) => {
+      form.data = res.data.data.device_info;
+    })
+    .finally(() => {
+      loading.value = false;
+    });
+}
 
-/** 返回默认页面 */
+/** 返回列表页面 */
 function closeBack() {
   router.push({ path: "/tester/equipment" });
 }
 
 onMounted(() => {
-  //handleQuery();
+  initPage();
 });
 </script>
 <style scoped lang="scss">