From 2ae303912d600743111f7a30312d75681cb477de 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: Thu, 20 Jun 2024 22:50:57 +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/menu/index.ts                    |  48 ++++++
 src/views/manage/calculate/edit.vue      |   2 +-
 src/views/manage/calculateParam/edit.vue |   2 +-
 src/views/manage/datas/index.vue         |   2 -
 src/views/manage/equipment/edit.vue      | 188 ++++++++++++++---------
 src/views/manage/equipment/editNet.vue   | 165 ++++++++++++++++++++
 src/views/manage/equipment/editPcie.vue  | 165 ++++++++++++++++++++
 src/views/manage/equipment/index.vue     |  33 +++-
 src/views/manage/equipment/view.vue      | 165 ++++++++++++++++++++
 src/views/manage/otherTool/edit.vue      |   5 +-
 src/views/manage/otherTool/index.vue     |   7 +-
 src/views/manage/otherTool/view.vue      | 152 ++++++++++++++++++
 12 files changed, 847 insertions(+), 87 deletions(-)
 create mode 100644 src/views/manage/equipment/editNet.vue
 create mode 100644 src/views/manage/equipment/editPcie.vue
 create mode 100644 src/views/manage/equipment/view.vue
 create mode 100644 src/views/manage/otherTool/view.vue

diff --git a/src/api/menu/index.ts b/src/api/menu/index.ts
index 63e1b5b..8930f44 100644
--- a/src/api/menu/index.ts
+++ b/src/api/menu/index.ts
@@ -286,6 +286,42 @@ class MenuAPI {
                 alwaysShow: false,
               },
             },
+            {
+              path: "equipmentEditPcie",
+              component: "manage/equipment/editPcie",
+              name: "equipmentEditPcie",
+              meta: {
+                title: "计算PCIE设备",
+                hidden: true,
+                roles: ["ADMIN", "GUEST"],
+                keepAlive: true,
+                alwaysShow: false,
+              },
+            },
+            {
+              path: "equipmentEditNet",
+              component: "manage/equipment/editNet",
+              name: "equipmentEditNet",
+              meta: {
+                title: "计算网络设备",
+                hidden: true,
+                roles: ["ADMIN", "GUEST"],
+                keepAlive: true,
+                alwaysShow: false,
+              },
+            },
+            {
+              path: "equipmentView",
+              component: "manage/equipment/view",
+              name: "equipmentView",
+              meta: {
+                title: "计算设备查看",
+                hidden: true,
+                roles: ["ADMIN", "GUEST"],
+                keepAlive: true,
+                alwaysShow: false,
+              },
+            },
             {
               path: "otherTool",
               component: "manage/otherTool/index",
@@ -311,6 +347,18 @@ class MenuAPI {
                 alwaysShow: false,
               }
             },
+            {
+              path: "otherToolView",
+              component: "manage/otherTool/view",
+              name: "otherToolView",
+              meta: {
+                title: "查看第三方工具",
+                hidden: true,
+                roles: ["ADMIN6", "GUEST", "ADMIN"],
+                keepAlive: true,
+                alwaysShow: false,
+              }
+            },
           ],
         },
         {
diff --git a/src/views/manage/calculate/edit.vue b/src/views/manage/calculate/edit.vue
index e312bfd..2029b52 100644
--- a/src/views/manage/calculate/edit.vue
+++ b/src/views/manage/calculate/edit.vue
@@ -172,7 +172,7 @@ const list = [
 const handleSubmit = useThrottleFn(() => {
   loading.value = true;
   setTimeout(() => {
-    ElMessage.success("修改用户成功");
+    ElMessage.success("保存成功");
     loading.value = false;
     closeBack();
   }, 1000);
diff --git a/src/views/manage/calculateParam/edit.vue b/src/views/manage/calculateParam/edit.vue
index 4a97926..9ea19c4 100644
--- a/src/views/manage/calculateParam/edit.vue
+++ b/src/views/manage/calculateParam/edit.vue
@@ -141,7 +141,7 @@ const rules = reactive({
 const handleSubmit = useThrottleFn(() => {
   loading.value = true;
   setTimeout(() => {
-    ElMessage.success("修改用户成功");
+    ElMessage.success("保存成功");
     loading.value = false;
     closeBack();
   }, 1000);
diff --git a/src/views/manage/datas/index.vue b/src/views/manage/datas/index.vue
index c644423..f0212b5 100644
--- a/src/views/manage/datas/index.vue
+++ b/src/views/manage/datas/index.vue
@@ -1,8 +1,6 @@
 <!-- 用户管理 -->
 <template>
   <div class="app-container">
-    <div class="search-container"></div>
-
     <el-card shadow="never" class="table-container">
       <template #header>
         <div class="flex justify-between">
diff --git a/src/views/manage/equipment/edit.vue b/src/views/manage/equipment/edit.vue
index 4a97926..c3f39f1 100644
--- a/src/views/manage/equipment/edit.vue
+++ b/src/views/manage/equipment/edit.vue
@@ -2,89 +2,103 @@
 <template>
   <div class="app-container">
     <!-- 用户新增/编辑表单 -->
-    <el-card shadow="never" class="form-container">
-      <template #header> 新增算子参数 </template>
+    <el-card shadow="never" class="form-container" v-loading="loading">
+      <template #header>升级计算设备信息</template>
       <el-row>
         <el-col :lg="12" :xs="24">
           <el-form
             ref="userFormRef"
             :model="formData"
-            :rules="rules"
-            v-loading="loading"
-            label-width="80px"
+            label-width="100px"
+            size="small"
           >
-            <el-form-item label="参数名称" prop="username">
-              <el-input
-                v-model="formData.username"
-                :readonly="!!formData.id"
-                placeholder="请输入算子参数名称"
-              />
+            <el-divider content-position="left"
+              ><strong style="color: #409eff">计算设备基本信息</strong></el-divider
+            >
+            <el-form-item label="设备名称" prop="username"> 目标分类模型 </el-form-item>
+            <el-form-item label="设备型号" prop="nickname">
+              前置算子/缩放算子
             </el-form-item>
-            <el-form-item label="参数类型" prop="roleIds">
-              <el-row style="width:100%">
-                <el-col :span="12">
-                  <el-select
-                    v-model="formData.roleIds"
-                    multiple
-                    placeholder="请选择参数主类型"
-                  >
-                    <el-option
-                      v-for="item in calTypeList"
-                      :key="item.value"
-                      :label="item.label"
-                      :value="item.value"
-                    />
-                  </el-select>
-                </el-col>
-                <el-col :span="12">
-                  <el-select
-                    v-model="formData.roleIds"
-                    multiple
-                    placeholder="请选择参数子类型"
-                  >
-                    <el-option
-                      v-for="item in calTypeList"
-                      :key="item.value"
-                      :label="item.label"
-                      :value="item.value"
-                    />
-                  </el-select>
-                </el-col>
-              </el-row>
+            <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-tag type="success">已连接</el-tag>
             </el-form-item>
-            <el-form-item label="参数说明" prop="mobile">
+            <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.mobile"
-                :rows="2"
+                v-model="formData.usernamedd"
+                :disabled="true"
+                placeholder="请输入数据集名称"
+                :rows="5"
                 type="textarea"
-                placeholder="请输入参数说明"
-                maxlength="11"
               />
             </el-form-item>
-            <el-form-item label="参数文件" prop="email">
-              <el-upload
-                v-model:file-list="fileList"
-                class="upload-demo"
-                action="https://run.mocky.io/v3/9d059bf9-4660-45f2-925d-ce80ad6c4d15"
-                multiple
-                :on-preview="handlePreview"
-                :on-remove="handleRemove"
-                :before-remove="beforeRemove"
-                :limit="3"
-                :on-exceed="handleExceed"
-              >
-                <el-button type="primary"
-                  ><el-icon class="el-icon--upload"> <i-ep-upload-filled /> </el-icon
-                  >选择文件</el-button
-                >
-                <template #tip>
-                  <div class="el-upload__tip">json files with a size less than 10M.</div>
-                </template>
-              </el-upload>
-            </el-form-item>
           </el-form>
         </el-col>
-        <el-col :lg="12" :xs="24"></el-col>
+        <el-col :lg="12" :xs="24">
+          <div style="padding-left: 35px">
+            <el-form
+              ref="userFormRef"
+              :model="formData"
+              v-loading="loading"
+              label-width="100px"
+              size="small"
+            >
+              <el-divider content-position="left"
+                ><strong style="color: #409eff">升级文件信息</strong></el-divider
+              >
+              <el-form-item label="升级文件" prop="username">
+                <el-upload
+                  v-model:file-list="fileList"
+                  class="upload-demo"
+                  action="https://run.mocky.io/v3/9d059bf9-4660-45f2-925d-ce80ad6c4d15"
+                  multiple
+                  :on-preview="handlePreview"
+                  :on-remove="handleRemove"
+                  :before-remove="beforeRemove"
+                  :limit="3"
+                  :on-exceed="handleExceed"
+                >
+                  <el-button type="primary"
+                    ><el-icon class="el-icon--upload"> <i-ep-upload-filled /> </el-icon
+                    >选择文件</el-button
+                  >
+                  <template #tip>
+                    <div class="el-upload__tip">
+                      请上传大小不超过 <strong style="color: red">10M</strong>，格式为
+                      <strong style="color: red">tar</strong> 的文件
+                    </div>
+                  </template>
+                </el-upload>
+              </el-form-item>
+              <el-form-item label="检查结果" prop="nickname">
+                <div style="max-width: 80%">
+                  <el-alert
+                    show-icon
+                    title="文件检查通过，可升级设备服务程序"
+                    type="success"
+                    :closable="false"
+                    style="margin-top: -8px;"
+                  />
+                </div>
+              </el-form-item>
+            </el-form>
+          </div>
+        </el-col>
       </el-row>
     </el-card>
     <el-card class="button-scope">
@@ -113,6 +127,8 @@ 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",
 });
 
 // 校验规则
@@ -137,11 +153,41 @@ const rules = reactive({
   ],
 });
 
+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(() => {
   loading.value = true;
   setTimeout(() => {
-    ElMessage.success("修改用户成功");
+    ElMessage.success("保存成功");
     loading.value = false;
     closeBack();
   }, 1000);
@@ -149,7 +195,7 @@ const handleSubmit = useThrottleFn(() => {
 
 /** 返回默认页面 */
 function closeBack() {
-  router.replace({ path: "/operatorLibrary/calculateParam" });
+  router.replace({ path: "/tester/equipment" });
 }
 
 onMounted(() => {
diff --git a/src/views/manage/equipment/editNet.vue b/src/views/manage/equipment/editNet.vue
new file mode 100644
index 0000000..41f7b58
--- /dev/null
+++ b/src/views/manage/equipment/editNet.vue
@@ -0,0 +1,165 @@
+<!-- 用户管理 -->
+<template>
+  <div class="app-container">
+    <!-- 用户新增/编辑表单 -->
+    <el-card shadow="never" class="form-container" v-loading="loading">
+      <template #header>添加网络设备</template>
+      <el-row>
+        <el-col :lg="16" :xs="24">
+          <el-form
+            ref="userFormRef"
+            :model="formData"
+            :rules="rules"
+            label-width="100px"
+          >
+            <el-divider content-position="left"
+              ><strong style="color: #409eff">未注册网络设备</strong></el-divider
+            >
+            <el-table :data="list" style="width: 100%" stripe>
+              <el-table-column type="selection" width="55"> </el-table-column>
+              <el-table-column prop="csmc" label="IP地址" align="left" />
+              <el-table-column prop="csms" label="芯片信息" align="left" />
+              <el-table-column prop="csmc1" label="设备型号" align="left" />
+              <el-table-column prop="csmc2" label="设备类型" align="left" />
+              <el-table-column prop="csmc3" label="厂商名称" align="left" />
+              <el-table-column prop="csmc4" label="服务程序版本" align="left" />
+              <el-table-column prop="csmc5" label="连接状态" align="left" />
+            </el-table>
+            <el-divider content-position="left"
+              ><strong style="color: #409eff">设备信息</strong></el-divider
+            >
+            <el-form-item label="设备ID号" prop="username">
+              <el-input
+                v-model="formData.username"
+                :readonly="!!formData.id"
+                placeholder="请输入设备ID号"
+              />
+            </el-form-item>
+            <el-form-item label="设备名称" prop="nickname">
+              <el-input v-model="formData.nickname" placeholder="请输入设备名称" />
+            </el-form-item>
+            <el-form-item label="设备标签" prop="nickname22">
+              <el-input v-model="formData.nickname22" placeholder="请输入设备标签" />
+            </el-form-item>
+            <el-form-item label="详细信息" prop="nickname33">
+              <el-input
+                v-model="formData.nickname33"
+                :rows="2"
+                type="textarea"
+                placeholder="请输入详细信息"
+              />
+            </el-form-item>
+          </el-form>
+        </el-col>
+        <el-col :lg="12" :xs="24"> </el-col>
+      </el-row>
+    </el-card>
+    <el-card class="button-scope">
+      <div class="buttonml-55">
+        <el-button type="primary" @click="handleSubmit"><i-ep-check />确 定</el-button>
+        <el-button @click="closeBack"><i-ep-close />取 消</el-button>
+      </div>
+    </el-card>
+  </div>
+</template>
+
+<script setup lang="ts">
+defineOptions({
+  name: "User",
+  inheritAttrs: false,
+});
+
+import UserAPI from "@/api/user";
+import { UserForm } from "@/api/user/model";
+
+const router = useRouter();
+const loading = ref(false); //  加载状态
+
+const calTypeList = ref<OptionType[]>(); // 角色下拉数据源
+
+// 用户表单数据
+const formData = reactive<UserForm>({
+  status: 1,
+});
+
+// 校验规则
+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(() => {
+  loading.value = true;
+  setTimeout(() => {
+    ElMessage.success("保存成功");
+    loading.value = false;
+    closeBack();
+  }, 1000);
+}, 3000);
+
+/** 返回默认页面 */
+function closeBack() {
+  router.replace({ path: "/tester/equipment" });
+}
+
+onMounted(() => {
+  //handleQuery();
+});
+</script>
+<style scope>
+.button-scope {
+  position: fixed;
+  width: calc(100% - 220px);
+  bottom: 0px;
+}
+.buttonml-55 {
+  margin-left: 55px;
+}
+</style>
diff --git a/src/views/manage/equipment/editPcie.vue b/src/views/manage/equipment/editPcie.vue
new file mode 100644
index 0000000..ece9010
--- /dev/null
+++ b/src/views/manage/equipment/editPcie.vue
@@ -0,0 +1,165 @@
+<!-- 用户管理 -->
+<template>
+  <div class="app-container">
+    <!-- 用户新增/编辑表单 -->
+    <el-card shadow="never" class="form-container" v-loading="loading">
+      <template #header>添加PCIE设备</template>
+      <el-row>
+        <el-col :lg="16" :xs="24">
+          <el-form
+            ref="userFormRef"
+            :model="formData"
+            :rules="rules"
+            label-width="100px"
+          >
+            <el-divider content-position="left"
+              ><strong style="color: #409eff">未注册PCIE设备</strong></el-divider
+            >
+            <el-table :data="list" style="width: 100%" stripe>
+              <el-table-column type="selection" width="55"> </el-table-column>
+              <el-table-column prop="csmc" label="PCLE设备序号" align="left" />
+              <el-table-column prop="csms" label="芯片信息" align="left" />
+              <el-table-column prop="csmc1" label="设备型号" align="left" />
+              <el-table-column prop="csmc2" label="设备类型" align="left" />
+              <el-table-column prop="csmc3" label="厂商名称" align="left" />
+              <el-table-column prop="csmc4" label="服务程序版本" align="left" />
+              <el-table-column prop="csmc5" label="连接状态" align="left" />
+            </el-table>
+            <el-divider content-position="left"
+              ><strong style="color: #409eff">设备信息</strong></el-divider
+            >
+            <el-form-item label="设备ID号" prop="username">
+              <el-input
+                v-model="formData.username"
+                :readonly="!!formData.id"
+                placeholder="请输入设备ID号"
+              />
+            </el-form-item>
+            <el-form-item label="设备名称" prop="nickname">
+              <el-input v-model="formData.nickname" placeholder="请输入设备名称" />
+            </el-form-item>
+            <el-form-item label="设备标签" prop="nickname22">
+              <el-input v-model="formData.nickname22" placeholder="请输入设备标签" />
+            </el-form-item>
+            <el-form-item label="详细信息" prop="nickname33">
+              <el-input
+                v-model="formData.nickname33"
+                :rows="2"
+                type="textarea"
+                placeholder="请输入详细信息"
+              />
+            </el-form-item>
+          </el-form>
+        </el-col>
+        <el-col :lg="12" :xs="24"> </el-col>
+      </el-row>
+    </el-card>
+    <el-card class="button-scope">
+      <div class="buttonml-55">
+        <el-button type="primary" @click="handleSubmit"><i-ep-check />确 定</el-button>
+        <el-button @click="closeBack"><i-ep-close />取 消</el-button>
+      </div>
+    </el-card>
+  </div>
+</template>
+
+<script setup lang="ts">
+defineOptions({
+  name: "User",
+  inheritAttrs: false,
+});
+
+import UserAPI from "@/api/user";
+import { UserForm } from "@/api/user/model";
+
+const router = useRouter();
+const loading = ref(false); //  加载状态
+
+const calTypeList = ref<OptionType[]>(); // 角色下拉数据源
+
+// 用户表单数据
+const formData = reactive<UserForm>({
+  status: 1,
+});
+
+// 校验规则
+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: "DOCKER112",
+    csms: "异腾310",
+    csmc1: "Atlas 2000 DK A2",
+    csmc2: "PCIE-AI-NPU	",
+    csmc3: "华为",
+    csmc4: "1.21",
+    csmc5: "已连接",
+  },
+  {
+    csmc: "DOCKER452-12",
+    csms: "思源220",
+    csmc1: "Atlas 2000 DK A2",
+    csmc2: "PCIE-AI-NPU	",
+    csmc3: "华为",
+    csmc4: "1.21",
+    csmc5: "已连接",
+  },
+  {
+    csmc: "DOCKER666",
+    csms: "ETL",
+    csmc1: "At772las 1999 DR",
+    csmc2: "PCIE-AI-NPU	",
+    csmc3: "华为",
+    csmc4: "1.21",
+    csmc5: "已连接",
+  },
+];
+
+/** 表单提交 */
+const handleSubmit = useThrottleFn(() => {
+  loading.value = true;
+  setTimeout(() => {
+    ElMessage.success("保存成功");
+    loading.value = false;
+    closeBack();
+  }, 1000);
+}, 3000);
+
+/** 返回默认页面 */
+function closeBack() {
+  router.replace({ path: "/tester/equipment" });
+}
+
+onMounted(() => {
+  //handleQuery();
+});
+</script>
+<style scope>
+.button-scope {
+  position: fixed;
+  width: calc(100% - 220px);
+  bottom: 0px;
+}
+.buttonml-55 {
+  margin-left: 55px;
+}
+</style>
diff --git a/src/views/manage/equipment/index.vue b/src/views/manage/equipment/index.vue
index 72347e2..bc911f4 100644
--- a/src/views/manage/equipment/index.vue
+++ b/src/views/manage/equipment/index.vue
@@ -5,10 +5,10 @@
       <template #header>
         <div class="flex justify-between">
           <div>
-            <el-button type="primary" @click="openDialog('user-form')"
+            <el-button type="primary" @click="openDialog1('user-form')"
               ><i-ep-plus />PCLE设备</el-button
             >
-            <el-button type="primary" @click="openDialog('user-form')"
+            <el-button type="primary" @click="openDialog2('user-form')"
               ><i-ep-plus />网络设备</el-button
             >
           </div>
@@ -43,6 +43,7 @@
         @selection-change="handleSelectionChange"
       >
         <el-table-column label="设备名称" align="left" prop="szmc" width="250" />
+        <el-table-column label="设备类型" align="left" prop="sblx" />
         <el-table-column label="芯片信息" align="left" prop="szlx" />
         <el-table-column label="标签" align="left" prop="szzlx" />
         <el-table-column label="连接状态" width="180" align="left" prop="bb" />
@@ -54,14 +55,14 @@
               text
               type="primary"
               size="small"
-              @click="openDialog('user-form', scope.row.id)"
+              @click="openDialog3('user-form', scope.row.id)"
               ><i-ep-view />详细</el-button
             >
             <el-button
               text
               type="primary"
               size="small"
-              @click="openDialog('user-form', scope.row.id)"
+              @click="openDialog4('user-form', scope.row)"
               ><i-ep-edit />修改</el-button
             >
             <el-button
@@ -121,6 +122,7 @@ const tableData = [
   {
     id: 1,
     szmc: "Atlas200I智能模组",
+    sblx: "PCIE设备",
     szlx: "昇腾310",
     szzlx: "扫描",
     bb: "已连接",
@@ -130,6 +132,7 @@ const tableData = [
   {
     id: 2,
     szmc: "思元220智能模组",
+    sblx: "PCIE设备",
     szlx: "思元220",
     szzlx: "扫描",
     bb: "已断开",
@@ -139,6 +142,7 @@ const tableData = [
   {
     id: 3,
     szmc: "RTX 4090ti 显卡",
+    sblx: "网络设备",
     szlx: "RTX 4090ti",
     szzlx: "轮询",
     bb: "已连接",
@@ -181,7 +185,7 @@ function handleSelectionChange(selection: any) {
 
 /** 删除数据 */
 function handleDelete(row: { [key: string]: any }) {
-  ElMessageBox.confirm("确认删除算子参数?", "警告", {
+  ElMessageBox.confirm("确认删除计算设备信息?", "警告", {
     confirmButtonText: "确定",
     cancelButtonText: "取消",
     type: "warning",
@@ -197,9 +201,24 @@ function handleDelete(row: { [key: string]: any }) {
  * @param id 用户ID
  */
 async function openDialog(type: string, id?: number) {
-  router.replace({ path: "/operatorLibrary/calculateParamEdit" });
+  router.replace({ path: "/tester/equipmentEdit" });
+}
+async function openDialog1(type: string, id?: number) {
+  router.replace({ path: "/tester/equipmentEditPcie" });
+}
+async function openDialog2(type: string, id?: number) {
+  router.replace({ path: "/tester/equipmentEditNet" });
+}
+async function openDialog3(type: string, id?: number) {
+  router.replace({ path: "/tester/equipmentView" });
+}
+async function openDialog4(type: string, row) {
+  if(row.sblx=='网络设备'){
+    router.replace({ path: "/tester/equipmentEditNet" });
+  }else{
+    router.replace({ path: "/tester/equipmentEditPcie" });
+  }
 }
-
 /** 下载导入模板 */
 function downloadTemplate() {
   ElMessage.success("下载模板成功");
diff --git a/src/views/manage/equipment/view.vue b/src/views/manage/equipment/view.vue
new file mode 100644
index 0000000..f838515
--- /dev/null
+++ b/src/views/manage/equipment/view.vue
@@ -0,0 +1,165 @@
+<!-- 用户管理 -->
+<template>
+  <div class="app-container">
+    <!-- 用户新增/编辑表单 -->
+    <el-card shadow="never" class="form-container">
+      <template #header>查看计算设备信息</template>
+      <el-row>
+        <el-col :lg="12" :xs="24">
+          <el-form
+            ref="userFormRef"
+            :model="formData"
+            v-loading="loading"
+            label-width="100px"
+            size="small"
+          >
+            <el-divider content-position="left"
+              ><strong style="color: #409eff">计算设备基本信息</strong></el-divider
+            >
+            <el-form-item label="设备名称" prop="username"> 目标分类模型 </el-form-item>
+            <el-form-item label="设备型号" prop="nickname">
+              前置算子/缩放算子
+            </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-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>
+          </el-form>
+        </el-col>
+        <el-col :lg="12" :xs="24"> </el-col>
+      </el-row>
+    </el-card>
+    <el-card class="button-scope">
+      <div class="buttonml-55">
+        <el-button @click="closeBack"><i-ep-close />取 消</el-button>
+      </div>
+    </el-card>
+  </div>
+</template>
+
+<script setup lang="ts">
+defineOptions({
+  name: "User",
+  inheritAttrs: false,
+});
+
+import UserAPI from "@/api/user";
+import { UserForm } from "@/api/user/model";
+
+const router = useRouter();
+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(() => {
+  loading.value = true;
+  setTimeout(() => {
+    ElMessage.success("修改用户成功");
+    loading.value = false;
+    closeBack();
+  }, 1000);
+}, 3000);
+
+/** 返回默认页面 */
+function closeBack() {
+  router.replace({ path: "/tester/equipment" });
+}
+
+onMounted(() => {
+  //handleQuery();
+});
+</script>
+<style scope>
+.button-scope {
+  position: fixed;
+  width: calc(100% - 220px);
+  bottom: 0px;
+}
+.buttonml-55 {
+  margin-left: 55px;
+}
+</style>
diff --git a/src/views/manage/otherTool/edit.vue b/src/views/manage/otherTool/edit.vue
index 5a663ba..12cd1c9 100644
--- a/src/views/manage/otherTool/edit.vue
+++ b/src/views/manage/otherTool/edit.vue
@@ -2,7 +2,7 @@
 <template>
   <div class="app-container">
     <!-- 用户新增/编辑表单 -->
-    <el-card shadow="never" class="form-container">
+    <el-card shadow="never" class="form-container" v-loading="loading">
       <template #header>添加工具链</template>
       <el-row>
         <el-col :lg="12" :xs="24">
@@ -10,7 +10,6 @@
             ref="userFormRef"
             :model="formData"
             :rules="rules"
-            v-loading="loading"
             label-width="100px"
           >
           <el-divider content-position="left"
@@ -120,7 +119,7 @@ const list = [
 const handleSubmit = useThrottleFn(() => {
   loading.value = true;
   setTimeout(() => {
-    ElMessage.success("修改用户成功");
+    ElMessage.success("保存成功");
     loading.value = false;
     closeBack();
   }, 1000);
diff --git a/src/views/manage/otherTool/index.vue b/src/views/manage/otherTool/index.vue
index 9884c4d..5ab5811 100644
--- a/src/views/manage/otherTool/index.vue
+++ b/src/views/manage/otherTool/index.vue
@@ -50,7 +50,7 @@
               text
               type="primary"
               size="small"
-              @click="openDialog('user-form', scope.row.id)"
+              @click="openDialogView('user-form', scope.row.id)"
               ><i-ep-view />查看</el-button
             >
             <el-button
@@ -156,7 +156,7 @@ function handleSelectionChange(selection: any) {
 
 /** 删除数据 */
 function handleDelete(row: { [key: string]: any }) {
-  ElMessageBox.confirm("确认删除算子参数?", "警告", {
+  ElMessageBox.confirm("确认删除工具链信息?", "警告", {
     confirmButtonText: "确定",
     cancelButtonText: "取消",
     type: "warning",
@@ -174,6 +174,9 @@ function handleDelete(row: { [key: string]: any }) {
 async function openDialog(type: string, id?: number) {
   router.replace({ path: "/tester/otherToolEdit" });
 }
+async function openDialogView(type: string, id?: number) {
+  router.replace({ path: "/tester/otherToolView" });
+}
 
 /** 下载导入模板 */
 function downloadTemplate() {
diff --git a/src/views/manage/otherTool/view.vue b/src/views/manage/otherTool/view.vue
new file mode 100644
index 0000000..82cc240
--- /dev/null
+++ b/src/views/manage/otherTool/view.vue
@@ -0,0 +1,152 @@
+<!-- 用户管理 -->
+<template>
+  <div class="app-container">
+    <!-- 用户新增/编辑表单 -->
+    <el-card shadow="never" class="form-container">
+      <template #header>查看第三方工具信息</template>
+      <el-row>
+        <el-col :lg="12" :xs="24">
+          <el-form
+            ref="userFormRef"
+            :model="formData"
+            v-loading="loading"
+            label-width="100px"
+            size="small"
+          >
+            <el-divider content-position="left"
+              ><strong style="color: #409eff">工具链基本信息</strong></el-divider
+            >
+            <el-form-item label="工具链名称" prop="username"> 目标分类模型 </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="nickname">
+              <el-tag type="success">已连接</el-tag>
+            </el-form-item>
+            <el-form-item label="工作状态" prop="nickname">
+              <el-tag type="success">空闲</el-tag>
+            </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"> HUAWEI </el-form-item>
+            <el-form-item label="程序版本" prop="nickname33"> V3.0 </el-form-item>
+          </el-form>
+        </el-col>
+        <el-col :lg="12" :xs="24"> </el-col>
+      </el-row>
+    </el-card>
+    <el-card class="button-scope">
+      <div class="buttonml-55">
+        <el-button @click="closeBack"><i-ep-close />取 消</el-button>
+      </div>
+    </el-card>
+  </div>
+</template>
+
+<script setup lang="ts">
+defineOptions({
+  name: "User",
+  inheritAttrs: false,
+});
+
+import UserAPI from "@/api/user";
+import { UserForm } from "@/api/user/model";
+
+const router = useRouter();
+const loading = ref(false); //  加载状态
+
+const calTypeList = ref<OptionType[]>(); // 角色下拉数据源
+
+// 用户表单数据
+const formData = reactive<UserForm>({
+  status: 1,
+});
+
+// 校验规则
+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(() => {
+  loading.value = true;
+  setTimeout(() => {
+    ElMessage.success("修改用户成功");
+    loading.value = false;
+    closeBack();
+  }, 1000);
+}, 3000);
+
+/** 返回默认页面 */
+function closeBack() {
+  router.replace({ path: "/tester/otherTool" });
+}
+
+onMounted(() => {
+  //handleQuery();
+});
+</script>
+<style scope>
+.button-scope {
+  position: fixed;
+  width: calc(100% - 220px);
+  bottom: 0px;
+}
+.buttonml-55 {
+  margin-left: 55px;
+}
+</style>