提交代码

main
姜玉琦 2024-07-23 17:34:24 +08:00
parent 97e9012556
commit 373e5946a9
9 changed files with 28 additions and 20 deletions

View File

@ -402,7 +402,7 @@ class MenuAPI {
},
{
path: "equipmentUpgrades",
component: "manage/equipment/upgrades",
component: "manage/equipment/upGrades",
name: "equipmentUpgrades",
meta: {
title: "计算设备升级",

View File

@ -96,7 +96,7 @@
<el-table-column label="程序版本" align="left" prop="program_version" />
<el-table-column label="创建时间" align="left" prop="create_time" />
<el-table-column label="上传用户" align="left" prop="user_name" />
<el-table-column label="操作" fixed="right" align="center">
<el-table-column label="操作" fixed="right" align="center" width="150">
<template #default="scope">
<el-button text type="primary" size="small" @click="handleDelete(scope.row)"
><i-ep-delete />删除</el-button

View File

@ -188,8 +188,8 @@ const rules = reactive({
{ required: true, message: "数据集格式不能为空", trigger: "change" },
],
dats_label_type: [{ required: true, message: "标注类型不能为空", trigger: "change" }],
image_width: [{ required: true, message: "分辨率宽不能为空", trigger: "blur" }],
image_height: [{ required: true, message: "分辨率不能为空", trigger: "blur" }],
image_width: [{ required: true, message: "分辨率宽不能为空", trigger: "blur" }],
image_height: [{ required: true, message: "分辨率高不能为空", trigger: "blur" }],
dataset_desc: [{ required: false, message: "数据集描述不能为空", trigger: "blur" }],
dataset_parameters: [
{ required: true, message: "数据集参数文件不能为空", trigger: "blur" },
@ -205,7 +205,7 @@ const handleSubmit = useThrottleFn(() => {
return false;
}
loading.value = true;
DataSetApi.add(form)
DataSetApi.add(form.value)
.then((res) => {
if (res.data.code == 0) {
ElMessage.success("保存成功");

View File

@ -334,12 +334,12 @@ const doEquipmentFiles = () => {
if (disp.length > 0) {
item.insertAdjacentHTML(
"beforeend",
"<span class='el-tag el-tag--success el-tag--dark mylabel mylabel--success'><span class='el-tag__content'>已标注JSON</span></span>"
"<span class='el-tag el-tag--success el-tag--dark mylabel mylabel--success'><span class='el-tag__content'>已标注</span></span>"
);
} else {
item.insertAdjacentHTML(
"beforeend",
"<span class='el-tag el-tag--danger el-tag--dark mylabel mylabel--error'><span class='el-tag__content'>未标注JSON</span></span>"
"<span class='el-tag el-tag--danger el-tag--dark mylabel mylabel--error'><span class='el-tag__content'>未标注</span></span>"
);
}
});
@ -377,8 +377,8 @@ function startUploadFiles() {
let json = uploadJsonList.value.filter((it) => disName(item.name, it.name));
let data = {
image_file_name: item.name,
image_file: item,
label_file: json.length > 0 ? json[0] : null,
image_file: item.raw,
label_file: json.length > 0 ? json[0].raw : null,
};
uploadLoading.value = true;
DataSetApi.rawUpload(form.value.dataset_id, data)
@ -524,6 +524,9 @@ const initData = () => {
ID.value = id;
DataSetApi.dataSetInfo(id).then((res) => {
if (res.data.code == 0) {
let resolution = res.data.data.image_resolution.split("x");
res.data.data.image_width=resolution[0];
res.data.data.image_height=resolution[1];
form.value = res.data.data;
codeHtml.value = JSON.stringify(res.data.data.dataset_parameters);
if (codeHtml.value == "{}") {

View File

@ -11,10 +11,10 @@
</div>
<div>
<el-form ref="queryFormRef" :model="queryParams" :inline="true">
<el-form-item label="数据名称" prop="dataset_name">
<el-form-item label="数据名称" prop="dataset_name">
<el-input
v-model="queryParams.dataset_name"
placeholder="请输入数据名称"
placeholder="请输入数据名称"
clearable
style="width: 200px"
@keyup.enter="handleQuery"
@ -43,10 +43,10 @@
<el-table-column label="版本" align="left" width="80" prop="dataset_version" />
<el-table-column label="数据集描述" align="left" prop="dataset_desc" />
<el-table-column label="适用模型类型" width="120" align="left" prop="modl_sub_type_name" />
<el-table-column label="数据格式" width="120" align="left" prop="dats_dataset_format" />
<el-table-column label="数据格式" width="200" align="left" prop="dats_dataset_format" />
<el-table-column label="图像分辨率" width="150" align="left" prop="image_resolution" />
<el-table-column label="数量" width="80" align="left" prop="frame_count" />
<el-table-column label="标注类型" width="120" align="left" prop="dats_label_type" />
<el-table-column label="标注类型" width="180" align="left" prop="dats_label_type" />
<el-table-column label="操作" align="center" fixed="right" width="200">
<template #default="scope">
<el-button

View File

@ -90,7 +90,7 @@ const rules = reactive({
infomation: [{ required: false, message: "详细信息不能为空", trigger: "blur" }],
});
const queryParams = reactive({
cmpt_interface_type: "net",
cmpt_interface_type: "network",
});
/** 选中未注册设备 */

View File

@ -99,9 +99,9 @@ function initPage() {
loading.value = true;
DeviceApi.devicesInfo(id)
.then((res) => {
let device_info = res.data.data.device_info;
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;

View File

@ -94,7 +94,7 @@
text
type="primary"
size="small"
@click="openDialog('user-form', scope.row.id)"
@click="openUpGrades(scope.row)"
><i-ep-upload />升级</el-button
>
<el-button text type="primary" size="small" @click="handleDelete(scope.row)"
@ -146,7 +146,7 @@ function handleQuery() {
/** 重置查询 */
function resetQuery() {
queryFormRef.value.resetFields();
//queryFormRef.value.resetFields();
//queryParams.page_num = 1;
//queryParams.tool_type = null;
handleQuery();
@ -189,10 +189,15 @@ function handleUpdate(row: { [key: string]: any }) {
}
/** 设备信息详情 */
function handleDetail(type: string, id?: number) {
function handleDetail(row: { [key: string]: any }) {
router.push({ path: "/tester/equipmentDetail", query: { id: row.device_id } });
}
/** 设备升级 */
function openUpGrades(row: { [key: string]: any }) {
ElMessage.error("【error】待提供");
}
onMounted(() => {
handleQuery();
});

View File

@ -114,8 +114,8 @@ function handleQuery() {
loading.value = true;
ToolChainshApi.toolStatusList(queryParams)
.then((res) => {
pageData.value = res.data.data.tool_status_list;
total.value = res.data.data.total;
pageData.value = res.data?.data?.tool_status_list;
total.value = res.data?.data?.total;
})
.finally(() => {
loading.value = false;