From 4a92d33eb3157e8f31d4429eead1c7dfd3cacc13 Mon Sep 17 00:00:00 2001
From: dongyukun <1208714201@qq.com>
Date: 星期二, 31 十二月 2024 18:45:01 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/views/data/channel/opcda/tag/index.vue | 22 ++++++++++++----------
1 files changed, 12 insertions(+), 10 deletions(-)
diff --git a/src/views/data/channel/opcda/tag/index.vue b/src/views/data/channel/opcda/tag/index.vue
index 181dfa0..fc11b57 100644
--- a/src/views/data/channel/opcda/tag/index.vue
+++ b/src/views/data/channel/opcda/tag/index.vue
@@ -1,7 +1,7 @@
<template>
<el-drawer
v-model="drawer"
- size="50%"
+ size="60%"
title="OpcDA Tag"
:direction="direction"
:before-close="handleClose"
@@ -98,19 +98,22 @@
label="数据值"
header-align="center"
align="center"
+ min-width="100"
:formatter="(row) => {if (row.dataValue === -2.0) {return '--';}return row.dataValue;}"
/>
<el-table-column
- prop="quality"
+ prop="dataTime"
+ label="数据时间"
+ header-align="center"
+ align="center"
+ min-width="150"
+ />
+ <el-table-column
+ prop="dataQuality"
label="数据质量"
header-align="center"
align="center"
- >
- <template #default="scope">
- <el-tag v-if="scope.row.dataValue === Number(-2.0)" type="danger" size="small">bad</el-tag>
- <el-tag v-else size="small">good</el-tag>
- </template>
- </el-table-column>
+ />
<el-table-column label="操作" align="center" min-width="110" fixed="right">
<template #default="scope">
<el-button
@@ -153,7 +156,6 @@
import {ref,reactive} from "vue";
import TagImportForm from '../../common/tag/TagImportForm.vue'
import {onBeforeUnmount, onMounted} from "vue";
- import * as OpcdaTagApi from "@/api/data/channel/opcda/tag";
defineOptions({name: 'ModBusTag'})
@@ -272,7 +274,7 @@
// 创建定时器
intervalId = setInterval(async () => {
if(queryParams.currentValue){
- const page = await OpcdaTagApi.getOpcdaTagPage(queryParams)
+ const page = await OpcDaTagApi.getOpcdaTagPage(queryParams)
list.value = page.list
total.value = page.total
}
--
Gitblit v1.9.3