From 3357b5f0f0919f7a52cd32a6d6de0acb14e0daaf Mon Sep 17 00:00:00 2001
From: dengzedong <dengzedong@email>
Date: 星期二, 17 十二月 2024 17:29:01 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/views/data/point/index.vue | 29 ++++++++++++++++++++++++++---
1 files changed, 26 insertions(+), 3 deletions(-)
diff --git a/src/views/data/point/index.vue b/src/views/data/point/index.vue
index 5d63b34..f87cd1a 100644
--- a/src/views/data/point/index.vue
+++ b/src/views/data/point/index.vue
@@ -35,6 +35,21 @@
class="!w-200px"
/>
</el-form-item>
+ <el-form-item label="采集质量" prop="collectQuality">
+ <el-select
+ v-model="queryParams.collectQuality"
+ placeholder="请选择"
+ clearable
+ class="!w-240px"
+ >
+ <el-option
+ v-for="dict in getStrDictOptions(DICT_TYPE.DATA_QUALITY)"
+ :key="dict.value"
+ :label="dict.label"
+ :value="dict.value"
+ />
+ </el-select>
+ </el-form-item>
<el-form-item>
<el-button @click="handleQuery">
<Icon icon="ep:search" class="mr-5px" />
@@ -91,9 +106,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 +131,13 @@
<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="collectQuality" width="100">
+ <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>
@@ -168,7 +190,7 @@
import * as DaPoint from '@/api/data/da/point'
import {ref, reactive} from "vue";
import download from "@/utils/download";
-import {DICT_TYPE, getDictOptions} from "@/utils/dict";
+import {DICT_TYPE, getDictOptions, getIntDictOptions, getStrDictOptions} from "@/utils/dict";
import DaPointForm from './DaPointForm.vue'
import DaPointChart from './DaPointChart.vue'
import * as UserApi from "@/api/system/user";
@@ -188,6 +210,7 @@
pointNo: undefined,
pointName: undefined,
tagNo: undefined,
+ collectQuality: undefined,
})
const queryFormRef = ref() // 搜索的表单
--
Gitblit v1.9.3