From 48175bd363565d32a46fa5b69733d84506e29789 Mon Sep 17 00:00:00 2001
From: houzhongjian <houzhongyi@126.com>
Date: 星期一, 16 十二月 2024 09:31:27 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/views/model/pre/item/MmPredictItemForm.vue | 4 +---
src/views/data/point/index.vue | 12 ++++++++++--
src/utils/dict.ts | 1 +
3 files changed, 12 insertions(+), 5 deletions(-)
diff --git a/src/utils/dict.ts b/src/utils/dict.ts
index 9d424f1..23b41c0 100644
--- a/src/utils/dict.ts
+++ b/src/utils/dict.ts
@@ -187,4 +187,5 @@
CAMERA_BRAND = 'camera_brand',
CAPTURE_TYPE = 'capture_type',
MODEL_RESULT_TYPE = 'model_result_type',
+ DATA_QUALITY = 'data_quality'
}
diff --git a/src/views/data/point/index.vue b/src/views/data/point/index.vue
index 5d63b34..68f4818 100644
--- a/src/views/data/point/index.vue
+++ b/src/views/data/point/index.vue
@@ -91,9 +91,9 @@
<!-- 列表 -->
<ContentWrap>
<el-table border stripe v-loading="loading" :data="list" @selection-change="selectionChangeHandle">
- <el-table-column type="selection" header-align="center" align="center" width="50"/>
+ <el-table-column type="selection" header-align="center" align="center" fixed="left" width="50"/>
<el-table-column fixed label="测点编码" header-align="center" align="left" min-width="130" prop="pointNo" />
- <el-table-column label="测点名称" header-align="center" align="left" min-width="220" prop="pointName" />
+ <el-table-column fixed label="测点名称" header-align="center" align="left" min-width="240" prop="pointName" />
<el-table-column label="测点类型" align="center" prop="pointType" width="100">
<template #default="scope">
<dict-tag :type="DICT_TYPE.DATA_POINT_TYPE" :value="scope.row.pointType" />
@@ -116,6 +116,14 @@
<el-table-column label="数据源类型" align="center" prop="sourceType" min-width="100"/>
<el-table-column label="数据源名称" align="center" prop="sourceName" min-width="100"/>
<el-table-column label="测点Tag" header-align="center" align="left" prop="tagNo" min-width="150"/>
+ <el-table-column label="采集值" header-align="center" align="center" prop="collectValue" min-width="150"/>
+ <el-table-column label="采集质量" header-align="center" align="center" prop="collectQuality" min-width="150">
+ <template #default="scope">
+ <el-tag v-if="scope.row.collectQuality === 'Good'" size="small" type="success">{{scope.row.collectQuality}}</el-tag>
+ <el-tag v-if="scope.row.collectQuality === 'Bad'" size="small" type="danger">{{scope.row.collectQuality}}</el-tag>
+ </template>
+ </el-table-column>
+ <el-table-column label="采集时间" header-align="center" align="center" prop="collectTime" min-width="150"/>
<el-table-column label="是否启用" align="center" prop="isEnable" width="85">
<template #default="scope">
<el-tag v-if="scope.row.isEnable === 1" size="small">是</el-tag>
diff --git a/src/views/model/pre/item/MmPredictItemForm.vue b/src/views/model/pre/item/MmPredictItemForm.vue
index eb370a4..4557b63 100644
--- a/src/views/model/pre/item/MmPredictItemForm.vue
+++ b/src/views/model/pre/item/MmPredictItemForm.vue
@@ -136,9 +136,7 @@
<Icon icon="ep:upload"/>
上传模型
</el-button>
- <el-button
- size="small" type="primary" @click="setReplaceModelOnly(true)"
- v-if="formType.value === 'update'">
+ <el-button type="primary" plain @click="setReplaceModelOnly(true)">
<Icon icon="ep:upload"/>
更新模型
</el-button>
--
Gitblit v1.9.3