From d916dfba2efa2d9359f5b432350a15e5ed1a0af4 Mon Sep 17 00:00:00 2001
From: houzhongjian <houzhongyi@126.com>
Date: 星期五, 18 十月 2024 13:58:31 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/views/data/point/index.vue | 50 ++++++++++++++++++++++++++++++++++++--------------
1 files changed, 36 insertions(+), 14 deletions(-)
diff --git a/src/views/data/point/index.vue b/src/views/data/point/index.vue
index cc9d601..a7e20cf 100644
--- a/src/views/data/point/index.vue
+++ b/src/views/data/point/index.vue
@@ -26,6 +26,15 @@
class="!w-240px"
/>
</el-form-item>
+ <el-form-item label="测点Tag" prop="tagNo">
+ <el-input
+ v-model="queryParams.tagNo"
+ placeholder="请输入测点Tag"
+ clearable
+ @keyup.enter="handleQuery"
+ class="!w-240px"
+ />
+ </el-form-item>
<el-form-item>
<el-button @click="handleQuery">
<Icon icon="ep:search" class="mr-5px" />
@@ -50,28 +59,39 @@
<!-- 列表 -->
<ContentWrap>
- <el-table v-loading="loading" :data="list">
- <el-table-column label="测点编码" header-align="center" align="left" min-width="100" prop="pointNo" />
- <el-table-column label="测点名称" header-align="center" align="left" min-width="100" prop="pointName" />
- <el-table-column label="测点类型" align="center" prop="pointType" />
- <el-table-column label="数据类型" align="center" prop="dataType" />
- <el-table-column label="值类型" align="center" prop="valueType" />
- <el-table-column label="存储类型" align="center" prop="storeType" />
- <el-table-column label="测量单位" align="center" prop="unit" />
+ <el-table border stripe v-loading="loading" :data="list">
+ <el-table-column fixed label="测点编码" header-align="center" align="left" min-width="110" prop="pointNo" />
+ <el-table-column label="测点名称" header-align="center" align="left" min-width="200" 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" />
+ </template>
+ </el-table-column>
+ <el-table-column label="数据类型" align="center" prop="dataType" width="100">
+ <template #default="scope">
+ <dict-tag :type="DICT_TYPE.POINT_DATA_TYPE" :value="scope.row.dataType" />
+ </template>
+ </el-table-column>
+ <el-table-column label="值类型" align="center" prop="valueType" width="120">
+ <template #default="scope">
+ <dict-tag :type="DICT_TYPE.VALUETYPE" :value="scope.row.valueType" />
+ </template>
+ </el-table-column>
+ <el-table-column label="测量单位" align="center" prop="unit" width="100"/>
<el-table-column label="单位转换" align="center" prop="unittransfactor" />
<el-table-column label="默认值" align="center" prop="defaultValue" />
- <el-table-column label="最大值" align="center" prop="maxValue" />
- <el-table-column label="最小值" align="center" prop="minValue" />
- <el-table-column label="采集频率" align="center" prop="minfreqid" />
- <el-table-column label="备注" align="center" prop="remark" />
- <el-table-column label="是否启用" align="center" prop="isEnable">
+ <el-table-column label="采集频率" align="center" prop="minfreqid" width="100"/>
+ <el-table-column label="数据源类型" align="center" prop="sourceType" width="100"/>
+ <el-table-column label="数据源名称" align="center" prop="sourceName" width="100"/>
+ <el-table-column label="测点Tag" header-align="center" align="left" prop="tagNo" min-width="150"/>
+ <el-table-column label="是否启用" align="center" prop="isEnable" width="100">
<template #default="scope">
<el-tag v-if="scope.row.isEnable === 1" size="small">是</el-tag>
<el-tag v-else size="small" type="danger">否</el-tag>
</template>
</el-table-column>
- <el-table-column label="操作" align="center" min-width="110" fixed="right">
+ <el-table-column label="操作" align="center" min-width="110" fixed="right" width="120">
<template #default="scope">
<el-button
link
@@ -108,6 +128,7 @@
<script lang="ts" setup>
import DaPointForm from './DaPointForm.vue'
import * as DaPoint from '@/api/data/da/point'
+import {DICT_TYPE} from "@/utils/dict";
defineOptions({name: 'DataPoint'})
@@ -122,6 +143,7 @@
pageSize: 10,
pointNo: undefined,
pointName: undefined,
+ tagNo: undefined,
})
const queryFormRef = ref() // 搜索的表单
const exportLoading = ref(false) // 导出的加载中
--
Gitblit v1.9.3