提交代码

main
姜玉琦 2024-07-19 16:05:50 +08:00
parent 50e910ca1e
commit 9d96d2da6b
11 changed files with 808 additions and 705 deletions

View File

@ -23,10 +23,11 @@ const getSimple = () => {
})
}
//获取未注册设备列表
const unregisted = () => {
const unregisted = (data) => {
return request({
url: '/devices/unregisted',
method: 'get'
method: 'get',
params:data
})
}
//删除设备

View File

@ -389,11 +389,11 @@ class MenuAPI {
},
},
{
path: "equipmentEditPcie",
component: "manage/equipment/editPcie",
name: "equipmentEditPcie",
path: "equipmentUpgrades",
component: "manage/equipment/upgrades",
name: "equipmentUpgrades",
meta: {
title: "计算PCIE设备",
title: "计算设备升级",
hidden: true,
roles: ["ADMIN", "GUEST"],
keepAlive: true,
@ -401,9 +401,21 @@ class MenuAPI {
},
},
{
path: "equipmentEditNet",
component: "manage/equipment/editNet",
name: "equipmentEditNet",
path: "equipmentAddPcie",
component: "manage/equipment/addPcie",
name: "equipmentAddPcie",
meta: {
title: "计算PCIE设备新增",
hidden: true,
roles: ["ADMIN", "GUEST"],
keepAlive: true,
alwaysShow: false,
},
},
{
path: "equipmentAddNet",
component: "manage/equipment/addNet",
name: "equipmentAddNet",
meta: {
title: "计算网络设备",
hidden: true,

View File

@ -0,0 +1,176 @@
<!-- 用户管理 -->
<template>
<div class="app-container model-detail">
<!-- 用户新增/编辑表单 -->
<el-card v-loading="loading">
<template #header
><svg-icon
icon-class="pause"
style="width: 20px; height: 20px"
/></template
>
<el-table :data="unregistedList" stripe>
<el-table-column label="选择" width="60" align="center">
<template #default="scope">
<el-radio
v-model="form.unregisted"
:label="scope.row.uuid"
@change.native="getCurrentRow(scope.row)"
>{{ "" }}</el-radio
>
</template>
</el-table-column>
<el-table-column prop="hardware_chip" label="芯片信息" align="left" />
<el-table-column prop="hardware_model" label="设备型号" align="left" />
<el-table-column prop="cmpt_hardware_type" label="设备类型" align="left" />
<el-table-column prop="manufacturer" label="厂商名称" align="left" />
<el-table-column prop="software_version" label="服务程序版本" align="left" />
<el-table-column
prop="connection_state"
label="连接状态"
align="left"
v-if="false"
/>
</el-table>
</el-card>
<el-card v-loading="loading" style="margin-top: 12px">
<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>
<el-form-item label="设备名称" prop="device_name">
<el-input v-model="form.device_name" placeholder="请输入设备名称" />
</el-form-item>
<el-form-item label="设备描述" prop="device_desc">
<el-input
v-model="form.device_desc"
:rows="2"
type="textarea"
placeholder="请输入设备描述"
/>
</el-form-item>
<el-form-item label="详细信息" prop="infomation">
<el-input
v-model="form.infomation"
:rows="3"
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="card-footer">
<el-button type="primary" @click="handleSubmit"><i-ep-check /> </el-button>
<el-button @click="closeBack"><i-ep-close /> </el-button>
</el-card>
</div>
</template>
<script setup lang="ts">
import DeviceApi from "@/api/device";
const router = useRouter();
const form = reactive({
unregisted: null,
});
const formRef = ref(ElForm); //
const loading = ref(false); //
const unregistedList = ref([]); //
//
const rules = reactive({
device_id: [{ required: true, message: "设备ID不能为空", trigger: "blur" }],
device_name: [{ required: true, message: "设备名称不能为空", trigger: "blur" }],
device_desc: [{ required: false, message: "设备描述不能为空", trigger: "blur" }],
infomation: [{ required: false, message: "详细信息不能为空", trigger: "blur" }],
});
const queryParams = reactive({
cmpt_interface_type: "net",
});
/** 选中未注册设备 */
function getCurrentRow(row: { [key: string]: any }) {
form.uuid = row.uuid;
form.manufacturer = row.manufacturer;
form.hardware_chip = row.hardware_chip;
form.hardware_model = row.hardware_model;
form.software_version = row.software_version;
form.cmpt_hardware_type = row.cmpt_hardware_type;
form.cmpt_interface_type = row.cmpt_interface_type;
}
/** 表单提交 */
const handleSubmit = useThrottleFn(() => {
formRef.value.validate((valid: any) => {
if (valid) {
if (!form.unregisted) {
ElMessage.error("请选择要注册的设备");
return false;
}
loading.value = true;
DeviceApi.add(form)
.then((res) => {
if (res.data.code == 0) {
ElMessage.success("保存成功");
closeBack();
}
})
.finally(() => {
loading.value = false;
});
}
});
}, 3000);
/** 初始化未注册设备列表 */
function initUnregistedList() {
DeviceApi.unregisted(queryParams).then((res) => {
if (res.data.code == 0) {
unregistedList.value = res.data.data.UnregistedList;
}
});
}
/** 返回列表页面 */
function closeBack() {
router.push({ path: "/tester/equipment" });
}
onMounted(() => {
initUnregistedList();
});
</script>
<style scoped lang="scss">
.model-detail {
:deep(.el-card__header) {
padding: 8px 4px;
display: flex;
align-items: center;
}
}
.sp-file {
color: #29d;
}
.tb-base-info {
line-height: 30px;
}
:deep(.svg-icon) {
margin-right: 8px;
}
.card-footer {
position: fixed;
width: calc(100% - 215px);
bottom: 0px;
:deep(.el-card__body) {
padding: 10px;
.el-pagination {
justify-content: end;
}
}
}
</style>

View File

@ -0,0 +1,178 @@
<!-- 用户管理 -->
<template>
<div class="app-container model-detail">
<!-- 用户新增/编辑表单 -->
<el-card v-loading="loading">
<template #header
><svg-icon
icon-class="pause"
style="width: 20px; height: 20px"
/>PCIE</template
>
<el-table :data="unregistedList" stripe>
<el-table-column label="选择" width="60" align="center">
<template #default="scope">
<el-radio
v-model="form.unregisted"
:label="scope.row.uuid"
@change.native="getCurrentRow(scope.row)"
>{{ "" }}</el-radio
>
</template>
</el-table-column>
<el-table-column prop="pcie_index" label="PCLE序号" align="left" />
<el-table-column prop="hardware_chip" label="芯片信息" align="left" />
<el-table-column prop="hardware_model" label="设备型号" align="left" />
<el-table-column prop="cmpt_hardware_type" label="设备类型" align="left" />
<el-table-column prop="manufacturer" label="厂商名称" align="left" />
<el-table-column prop="software_version" label="服务程序版本" align="left" />
<el-table-column
prop="connection_state"
label="连接状态"
align="left"
v-if="false"
/>
</el-table>
</el-card>
<el-card v-loading="loading" style="margin-top: 12px">
<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>
<el-form-item label="设备名称" prop="device_name">
<el-input v-model="form.device_name" placeholder="请输入设备名称" />
</el-form-item>
<el-form-item label="设备描述" prop="device_desc">
<el-input
v-model="form.device_desc"
:rows="2"
type="textarea"
placeholder="请输入设备描述"
/>
</el-form-item>
<el-form-item label="详细信息" prop="infomation">
<el-input
v-model="form.infomation"
:rows="3"
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="card-footer">
<el-button type="primary" @click="handleSubmit"><i-ep-check /> </el-button>
<el-button @click="closeBack"><i-ep-close /> </el-button>
</el-card>
</div>
</template>
<script setup lang="ts">
import DeviceApi from "@/api/device";
const router = useRouter();
const form = reactive({
unregisted: null,
});
const formRef = ref(ElForm); //
const loading = ref(false); //
const unregistedList = ref([]); //
//
const rules = reactive({
device_id: [{ required: true, message: "设备ID不能为空", trigger: "blur" }],
device_name: [{ required: true, message: "设备名称不能为空", trigger: "blur" }],
device_desc: [{ required: false, message: "设备描述不能为空", trigger: "blur" }],
infomation: [{ required: false, message: "详细信息不能为空", trigger: "blur" }],
});
const queryParams = reactive({
cmpt_interface_type: "pcie",
});
/** 选中未注册设备 */
function getCurrentRow(row: { [key: string]: any }) {
form.uuid = row.uuid;
form.pcie_index = row.pcie_index;
form.manufacturer = row.manufacturer;
form.hardware_chip = row.hardware_chip;
form.hardware_model = row.hardware_model;
form.software_version = row.software_version;
form.cmpt_hardware_type = row.cmpt_hardware_type;
form.cmpt_interface_type = row.cmpt_interface_type;
}
/** 表单提交 */
const handleSubmit = useThrottleFn(() => {
formRef.value.validate((valid: any) => {
if (valid) {
if (!form.unregisted) {
ElMessage.error("请选择要注册的设备");
return false;
}
loading.value = true;
DeviceApi.add(form)
.then((res) => {
if (res.data.code == 0) {
ElMessage.success("保存成功");
closeBack();
}
})
.finally(() => {
loading.value = false;
});
}
});
}, 3000);
/** 初始化未注册设备列表 */
function initUnregistedList() {
DeviceApi.unregisted(queryParams).then((res) => {
if (res.data.code == 0) {
unregistedList.value = res.data.data.UnregistedList;
}
});
}
/** 返回列表页面 */
function closeBack() {
router.push({ path: "/tester/equipment" });
}
onMounted(() => {
initUnregistedList();
});
</script>
<style scoped lang="scss">
.model-detail {
:deep(.el-card__header) {
padding: 8px 4px;
display: flex;
align-items: center;
}
}
.sp-file {
color: #29d;
}
.tb-base-info {
line-height: 30px;
}
:deep(.svg-icon) {
margin-right: 8px;
}
.card-footer {
position: fixed;
width: calc(100% - 215px);
bottom: 0px;
:deep(.el-card__body) {
padding: 10px;
.el-pagination {
justify-content: end;
}
}
}
</style>

View File

@ -3,227 +3,158 @@
<div class="app-container model-detail">
<!-- 用户新增/编辑表单 -->
<el-card v-loading="loading">
<template #header><svg-icon icon-class="pause" style="width:20px;height:20px;" />计算设备基本信息</template>
<template #header
><svg-icon
icon-class="pause"
style="width: 20px; height: 20px"
/></template
>
<el-table :data="list">
<el-table-column prop="hardware_chip" label="芯片信息" align="left" />
<el-table-column prop="hardware_model" label="设备型号" align="left" />
<el-table-column prop="cmpt_hardware_type" label="设备类型" align="left" />
<el-table-column prop="manufacturer" label="厂商名称" align="left" />
<el-table-column prop="software_version" label="服务程序版本" align="left" />
</el-table>
</el-card>
<el-card v-loading="loading" style="margin-top: 12px">
<el-row>
<el-col :lg="12" :xs="24">
<el-form
ref="userFormRef"
:model="formData"
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 ref="formRef" :model="form" :rules="rules" label-width="80px">
<el-form-item label="设备ID号" prop="device_id">
<el-input v-model="form.device_id" disabled placeholder="请输入设备ID号" />
</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 label="设备名称" prop="device_name">
<el-input v-model="form.device_name" placeholder="请输入设备名称" />
</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-form-item label="设备描述" prop="device_desc">
<el-input
v-model="formData.usernamedd"
:disabled="true"
placeholder="请输入数据集名称"
:rows="5"
v-model="form.device_desc"
:rows="2"
type="textarea"
placeholder="请输入设备描述"
/>
</el-form-item>
<el-form-item label="详细信息" prop="infomation">
<el-input
v-model="form.infomation"
:rows="3"
type="textarea"
disabled
placeholder="请输入详细信息"
/>
</el-form-item>
</el-form>
</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-col :lg="12" :xs="24"> </el-col>
</el-row>
</el-card>
<el-card class="card-footer">
<el-button type="primary" @click="handleSubmit"><i-ep-check /> </el-button>
<el-button @click="closeBack"><i-ep-close /> </el-button>
<el-button type="primary" @click="handleSubmit"><i-ep-check /> </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({});
const formRef = ref(ElForm); //
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 list = ref([]); //
//
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",
},
],
device_id: [{ required: true, message: "设备ID不能为空", trigger: "blur" }],
device_name: [{ required: true, message: "设备名称不能为空", trigger: "blur" }],
device_desc: [{ required: false, message: "设备描述不能为空", trigger: "blur" }],
infomation: [{ required: false, 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);
formRef.value.validate((valid: any) => {
if (valid) {
loading.value = true;
DeviceApi.updateDevices(form)
.then((res) => {
if (res.data.code == 0) {
ElMessage.success("保存成功");
closeBack();
}
})
.finally(() => {
loading.value = false;
});
}
});
}, 3000);
/** 返回默认页面 */
/** 初始化数据 */
function initPage() {
let id = route.query.id;
loading.value = true;
DeviceApi.devicesInfo(id)
.then((res) => {
if (res.data.code == 0) {
let data = {};
let device_info = res.data.data.device_info;
data.uuid = device_info.uuid;
data.pcie_index = device_info.pcie_index;
data.manufacturer = device_info.manufacturer;
data.hardware_chip = device_info.hardware_chip;
data.hardware_model = device_info.hardware_model;
data.software_version = device_info.software_version;
data.cmpt_hardware_type = device_info.cmpt_hardware_type;
data.cmpt_interface_type = device_info.cmpt_interface_type;
list.value.push(data);
}
form.device_id = res.data.data.device_id || device_info.device_id;
form.device_name = device_info.device_name;
form.device_desc = device_info.device_desc;
form.infomation = device_info.infomation;
})
.finally(() => {
loading.value = false;
});
}
/** 返回列表页面 */
function closeBack() {
router.push({ path: "/tester/equipment" });
}
onMounted(() => {
//handleQuery();
initPage();
});
</script>
<style scoped lang='scss'>
.model-detail{
:deep(.el-card__header){
padding:8px 4px;
display: flex;
align-items: center
}
<style scoped lang="scss">
.model-detail {
:deep(.el-card__header) {
padding: 8px 4px;
display: flex;
align-items: center;
}
}
.sp-file{
color:#29d;
.sp-file {
color: #29d;
}
.tb-base-info{
line-height: 30px;
.tb-base-info {
line-height: 30px;
}
:deep(.svg-icon){
margin-right:8px;
:deep(.svg-icon) {
margin-right: 8px;
}
.card-footer{
.card-footer {
position: fixed;
width: calc(100% - 215px);
bottom: 0px;
:deep(.el-card__body){
padding:10px;
.el-pagination{
:deep(.el-card__body) {
padding: 10px;
.el-pagination {
justify-content: end;
}
}

View File

@ -1,225 +0,0 @@
<!-- 用户管理 -->
<template>
<div class="app-container model-detail">
<!-- 用户新增/编辑表单 -->
<el-card v-loading="loading">
<template #header><svg-icon icon-class="pause" style="width:20px;height:20px;" />未注册网络设备</template>
<el-row>
<el-col :lg="24" :xs="24">
<el-form
ref="userFormRef"
:model="formData"
:rules="rules"
label-width="100px"
>
<el-table :data="list" style="width: 100%" stripe>
<el-table-column label="选择" width="60" align="center">
<template #default="scope">
<el-radio v-model="radioSelected" :label="scope.row.csmc" @change.native="getCurrentRow(scope.row.csmc)">{{ '' }}</el-radio>
</template>
</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 v-loading="loading" style="margin-top: 12px;">
<el-row>
<el-col :lg="12" :xs="24">
<el-form
ref="userFormRef"
:model="formData"
:rules="rules"
label-width="100px"
>
<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="card-footer">
<el-button type="primary" @click="handleSubmit"><i-ep-check /> </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";
const router = useRouter();
const loading = ref(false); //
const calTypeList = ref<OptionType[]>(); //
//
const formData = reactive<UserForm>({
status: 1,
});
const radioSelected = ref('');
//
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.push({ path: "/tester/equipment" });
}
//
function getCurrentRow(row) {
radioSelected = row;//,radio
}
onMounted(() => {
//handleQuery();
});
</script>
<style scoped lang='scss'>
.model-detail{
:deep(.el-card__header){
padding:8px 4px;
display: flex;
align-items: center
}
}
.sp-file{
color:#29d;
}
.tb-base-info{
line-height: 30px;
}
:deep(.svg-icon){
margin-right:8px;
}
.card-footer{
position: fixed;
width: calc(100% - 215px);
bottom: 0px;
:deep(.el-card__body){
padding:10px;
.el-pagination{
justify-content: end;
}
}
}
</style>

View File

@ -1,196 +0,0 @@
<!-- 用户管理 -->
<template>
<div class="app-container model-detail">
<!-- 用户新增/编辑表单 -->
<el-card v-loading="loading">
<template #header><svg-icon icon-class="pause" style="width:20px;height:20px;" />添加PCIE设备</template>
<el-row>
<el-col :lg="24" :xs="24">
<el-form
ref="userFormRef"
:model="formData"
:rules="rules"
label-width="100px"
>
<el-table :data="list" style="width: 100%" stripe>
<el-table-column label="选择" width="60" align="center">
<template #default="scope">
<el-radio v-model="radioSelected" :label="scope.row.csmc" @change.native="getCurrentRow(scope.row.csmc)">{{ '' }}</el-radio>
</template>
</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-form>
</el-col>
<el-col :lg="12" :xs="24"> </el-col>
</el-row>
</el-card>
<el-card v-loading="loading" style="margin-top: 12px;">
<el-row>
<el-col :lg="12" :xs="24">
<el-form
ref="userFormRef"
:model="formData"
:rules="rules"
label-width="100px"
>
<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="card-footer">
<el-button type="primary" @click="handleSubmit"><i-ep-check /> </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";
const router = useRouter();
const loading = ref(false); //
const calTypeList = ref<OptionType[]>(); //
//
const formData = reactive<UserForm>({
status: 1,
});
const radioSelected = ref('');
//
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.push({ path: "/tester/equipment" });
}
onMounted(() => {
//handleQuery();
});
</script>
<style scoped lang='scss'>
.model-detail{
:deep(.el-card__header){
padding:8px 4px;
display: flex;
align-items: center
}
}
.sp-file{
color:#29d;
}
.tb-base-info{
line-height: 30px;
}
:deep(.svg-icon){
margin-right:8px;
}
.card-footer{
position: fixed;
width: calc(100% - 215px);
bottom: 0px;
:deep(.el-card__body){
padding:10px;
.el-pagination{
justify-content: end;
}
}
}
</style>

View File

@ -5,14 +5,14 @@
<template #header>
<div class="flex justify-between">
<div>
<el-button type="primary" @click="openDialog1('user-form')"
<el-button type="primary" @click="handleAddPcie()"
><i-ep-plus />PCLE设备</el-button
>
<el-button type="primary" @click="openDialog2('user-form')"
<el-button type="primary" @click="handleAddNet()"
><i-ep-plus />网络设备</el-button
>
</div>
<div>
<!-- <div>
<el-form ref="queryFormRef" :model="queryParams" :inline="true">
<el-form-item label="设备名称" prop="keywords">
<el-input
@ -33,22 +33,52 @@
>
</el-form-item>
</el-form>
</div>
</div> -->
</div>
</template>
<el-table
v-loading="loading"
:data="tableData"
:data="pageData"
stripe
@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" />
<el-table-column label="工作状态" width="180" align="left" prop="gzzz" />
<el-table-column label="创建时间" width="180" align="left" prop="hlcjsj" />
<el-table-column label="设备名称" align="left" prop="device_name" width="250" />
<el-table-column label="芯片信息" align="left" prop="modl_net_type" />
<el-table-column label="推理任务名称" align="left" prop="infer_task_name" />
<el-table-column label="模型名称" align="left" prop="model_name" />
<el-table-column label="模型类型" align="left" prop="modl_net_type" />
<el-table-column
label="连接状态"
width="180"
align="left"
prop="connection_state"
/>
<el-table-column
label="工作状态"
width="180"
align="left"
prop="working_state_name"
/>
<el-table-column label="CPU使用率" width="180" align="left" prop="cpu_usage">
<template #default="scope">
<el-tag
:type="scope.row.cpu_usage > 1024 ? 'danger' : 'success'"
effect="dark"
>
{{ scope.row.cpu_usage + " MB" }}
</el-tag>
</template>
</el-table-column>
<el-table-column label="内核温度" width="180" align="left" prop="tempurature">
<template #default="scope">
<el-tag
:type="scope.row.tempurature > 80 ? 'danger' : 'success'"
effect="plain"
>
{{ scope.row.tempurature + " °" }}
</el-tag>
</template>
</el-table-column>
<el-table-column label="操作" fixed="right" width="320">
<template #default="scope">
<el-button
@ -58,11 +88,7 @@
@click="openDialog3('user-form', scope.row.id)"
><i-ep-view />详细</el-button
>
<el-button
text
type="primary"
size="small"
@click="openDialog4('user-form', scope.row)"
<el-button text type="primary" size="small" @click="handleUpdate(scope.row)"
><i-ep-edit />修改</el-button
>
<el-button
@ -80,19 +106,19 @@
</el-table-column>
</el-table>
<pagination
<!-- <pagination
v-if="total > 0"
v-model:total="total"
v-model:page="queryParams.pageNum"
v-model:limit="queryParams.pageSize"
@pagination="handleQuery"
/>
/> -->
</el-card>
</div>
</template>
<script setup lang="ts">
import OperatorApi from '@/api/operator'
import DeviceApi from "@/api/device";
const router = useRouter();
@ -102,73 +128,29 @@ const pageData = ref([]); // 分页数据
const removeIds = ref([]); // ID
const queryFormRef = ref(ElForm); //
const queryParams = reactive({
page_num: 1,
page_size: 10,
operation_id: null,
oper_main_type: null,
oper_sub_type: null,
cmpt_hardware_type: null,
operator_name: null,
//page_num: 1,
//page_size: 10,
tool_type: null,
});
const tableData = [
{
id: 1,
szmc: "Atlas200I智能模组",
sblx: "PCIE设备",
szlx: "昇腾310",
szzlx: "扫描",
bb: "已连接",
gzzt: "空闲",
hlcjsj: "2024-05-03",
},
{
id: 2,
szmc: "思元220智能模组",
sblx: "PCIE设备",
szlx: "思元220",
szzlx: "扫描",
bb: "已断开",
gzzt: "- -",
hlcjsj: "2024-06-07",
},
{
id: 3,
szmc: "RTX 4090ti 显卡",
sblx: "网络设备",
szlx: "RTX 4090ti",
szzlx: "轮询",
bb: "已连接",
gzzt: "忙碌",
hlcjsj: "2024-06-08",
},
];
/** 查询 */
/** 设备状态列表 */
function handleQuery() {
loading.value = true;
ElMessage.success("查询成功");
loading.value = false;
// UserAPI.getPage(queryParams)
// .then((data) => {
// console.log("handleQuery", data);
// pageData.value = data.list;
// total.value = data.total;
// })
// .finally(() => {
// loading.value = false;
// });
DeviceApi.getStatus(queryParams)
.then((res) => {
pageData.value = res.data.data.device_status_list;
total.value = res.data.data.total;
})
.finally(() => {
loading.value = false;
});
}
/** 重置查询 */
function resetQuery() {
queryFormRef.value.resetFields();
dateTimeRange.value = "";
queryParams.pageNum = 1;
queryParams.deptId = undefined;
queryParams.startTime = undefined;
queryParams.endTime = undefined;
//queryParams.page_num = 1;
//queryParams.tool_type = null;
handleQuery();
}
@ -179,18 +161,39 @@ function handleSelectionChange(selection: any) {
/** 删除数据 */
function handleDelete(row: { [key: string]: any }) {
ElMessageBox.confirm("确认删除计算设备信息?", "警告", {
ElMessageBox.confirm("确认删除设备信息?", "警告", {
confirmButtonText: "确定",
cancelButtonText: "取消",
type: "warning",
}).then(function () {
// ToolChainshApi.deleteTool(row.tool_id).then((res) => {
ElMessage.success("删除成功");
// resetQuery();
// });
DeviceApi.deleteDevices(row.device_id).then((res) => {
if (res.data.code == 0) {
ElMessage.success("删除成功");
resetQuery();
}
});
});
}
/** 新增Pcie设备 */
function handleAddPcie() {
router.push({ path: "/tester/equipmentAddPcie" });
}
/** 新增网络设备 */
function handleAddNet() {
router.push({ path: "/tester/equipmentAddNet" });
}
/** 修改设备信息 */
function handleUpdate(row: { [key: string]: any }) {
router.push({ path: "/tester/equipmentAddNet", query: { id: row.device_id } });
}
onMounted(() => {
handleQuery();
});
/**
* 打开弹窗
*
@ -200,19 +203,14 @@ function handleDelete(row: { [key: string]: any }) {
async function openDialog(type: string, id?: number) {
router.push({ path: "/tester/equipmentEdit" });
}
async function openDialog1(type: string, id?: number) {
router.push({ path: "/tester/equipmentEditPcie" });
}
async function openDialog2(type: string, id?: number) {
router.push({ path: "/tester/equipmentEditNet" });
}
async function openDialog3(type: string, id?: number) {
router.push({ path: "/tester/equipmentView" });
}
async function openDialog4(type: string, row) {
if(row.sblx=='网络设备'){
if (row.sblx == "网络设备") {
router.push({ path: "/tester/equipmentEditNet" });
}else{
} else {
router.push({ path: "/tester/equipmentEditPcie" });
}
}

View File

@ -0,0 +1,228 @@
<!-- 用户管理 -->
<template>
<div class="app-container model-detail">
<!-- 用户新增/编辑表单 -->
<el-card v-loading="loading">
<template #header
><svg-icon
icon-class="pause"
style="width: 20px; height: 20px"
/></template
>
<el-row>
<el-col :lg="12" :xs="24">
<el-form ref="userFormRef" :model="formData" label-width="100px" size="small">
<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">
<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="card-footer">
<el-button type="primary" @click="handleSubmit"><i-ep-check /> </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";
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.error("即将上线");
loading.value = false;
closeBack();
}, 1000);
}, 3000);
/** 返回默认页面 */
function closeBack() {
router.push({ path: "/tester/equipment" });
}
onMounted(() => {
//handleQuery();
});
</script>
<style scoped lang="scss">
.model-detail {
:deep(.el-card__header) {
padding: 8px 4px;
display: flex;
align-items: center;
}
}
.sp-file {
color: #29d;
}
.tb-base-info {
line-height: 30px;
}
:deep(.svg-icon) {
margin-right: 8px;
}
.card-footer {
position: fixed;
width: calc(100% - 215px);
bottom: 0px;
:deep(.el-card__body) {
padding: 10px;
.el-pagination {
justify-content: end;
}
}
}
</style>

View File

@ -11,7 +11,7 @@
<el-row>
<el-col :lg="12" :xs="24">
<el-form ref="userFormRef" :model="formData" :rules="rules" label-width="100px">
<el-form-item label="用户名" prop="username">
<el-form-item label="用户名" prop="username">
<el-input
v-model="formData.username"
:readonly="!!formData.id"

View File

@ -15,7 +15,7 @@
<el-form-item label="用户信息" prop="keywords">
<el-input
v-model="queryParams.keywords"
placeholder="用户名/手机号码"
placeholder="用户名/手机号码"
clearable
style="width: 200px"
@keyup.enter="handleQuery"
@ -41,7 +41,7 @@
@selection-change="handleSelectionChange"
>
<el-table-column key="id" label="编号" align="left" prop="user_id" />
<el-table-column label="用户名" align="left" prop="user_name" />
<el-table-column label="用户名" align="left" prop="user_name" />
<el-table-column label="角色编号" align="left" prop="user_role" />
<el-table-column label="角色名称" align="left" prop="user_role_name" />
<el-table-column label="操作" fixed="right" width="320">
@ -82,11 +82,11 @@
:rules="rules"
label-width="80px"
>
<el-form-item label="用户名" prop="user_name">
<el-form-item label="用户名" prop="user_name">
<el-input
v-model="form.user_name"
:disabled="form.user_id != null"
placeholder="请输入用户名"
placeholder="请输入用户名"
/>
</el-form-item>
<el-form-item label="用户角色" prop="user_role">
@ -153,7 +153,7 @@ const formLoading = ref(false); // 加载状态
const formVisible = ref(false); //
//
const rules = reactive({
user_name: [{ required: true, message: "用户名不能为空", trigger: "blur" }],
user_name: [{ required: true, message: "用户名不能为空", trigger: "blur" }],
user_role: [{ required: true, message: "用户角色不能为空", trigger: "change" }],
user_password: [{ required: true, message: "登录密码不能为空", trigger: "blur" }],
password: [{ required: true, message: "确认密码不能为空", trigger: "blur" }],