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 | 9 +++++++--
1 files changed, 7 insertions(+), 2 deletions(-)
diff --git a/src/views/data/point/index.vue b/src/views/data/point/index.vue
index 5934665..a7e20cf 100644
--- a/src/views/data/point/index.vue
+++ b/src/views/data/point/index.vue
@@ -60,7 +60,7 @@
<!-- 列表 -->
<ContentWrap>
<el-table border stripe v-loading="loading" :data="list">
- <el-table-column fixed label="测点编码" header-align="center" align="left" min-width="100" prop="pointNo" />
+ <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">
@@ -70,6 +70,11 @@
<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"/>
@@ -123,7 +128,7 @@
<script lang="ts" setup>
import DaPointForm from './DaPointForm.vue'
import * as DaPoint from '@/api/data/da/point'
-import {DICT_TYPE, getDictOptions} from "@/utils/dict";
+import {DICT_TYPE} from "@/utils/dict";
defineOptions({name: 'DataPoint'})
--
Gitblit v1.9.3