From 8bb7160c9c4fd7ce5893ee673647b13cc35410ae Mon Sep 17 00:00:00 2001
From: liriming <1343021927@qq.com>
Date: 星期一, 03 三月 2025 17:27:07 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/views/data/point/index.vue | 37 ++++++++++++++++++++++++++++++++-----
1 files changed, 32 insertions(+), 5 deletions(-)
diff --git a/src/views/data/point/index.vue b/src/views/data/point/index.vue
index b11294c..1adf9d0 100644
--- a/src/views/data/point/index.vue
+++ b/src/views/data/point/index.vue
@@ -26,6 +26,21 @@
class="!w-200px"
/>
</el-form-item>
+ <el-form-item label="测点类型" prop="pointType">
+ <el-select
+ v-model="queryParams.pointType"
+ placeholder="请选择"
+ clearable
+ class="!w-240px"
+ >
+ <el-option
+ v-for="dict in getStrDictOptions(DICT_TYPE.DATA_POINT_TYPE)"
+ :key="dict.value"
+ :label="dict.label"
+ :value="dict.value"
+ />
+ </el-select>
+ </el-form-item>
<el-form-item label="测点Tag" prop="tagNo">
<el-input
v-model="queryParams.tagNo"
@@ -145,7 +160,7 @@
</template>
</el-table-column>
- <el-table-column label="操作" align="center" min-width="130" fixed="right" width="120">
+ <el-table-column label="操作" align="center" min-width="130" fixed="right" width="140">
<template #default="scope">
<el-button
link
@@ -156,7 +171,7 @@
>
编辑
</el-button>
- <el-button link size="mini" type="primary" @click="chartHandle(scope.row)">数据</el-button>
+ <el-button link size="mini" type="primary" @click="chartHandle(scope.row)">历史值</el-button>
<el-button
link
size="mini"
@@ -166,6 +181,7 @@
>
删除
</el-button>
+ <el-button link size="mini" type="primary" @click="pointValueHandle(scope.row)">当前值</el-button>
</template>
</el-table-column>
</el-table>
@@ -181,9 +197,13 @@
<!-- 表单弹窗：添加/修改 -->
<DaPointForm ref="formRef" @success="getList" />
+ <!-- 历史值 -->
<DaPointChart ref="chartView" />
- <!-- 用户导入对话框 -->
+ <!-- 当前值 -->
+ <DaPointValue ref="pointValue" />
+
+ <!-- 测点导入对话框 -->
<PointImportForm ref="importFormRef" @success="getList" />
</template>
<script lang="ts" setup>
@@ -193,7 +213,7 @@
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";
+import DaPointValue from './DaPointValue.vue'
import PointImportForm from './PointImportForm.vue'
defineOptions({name: 'DataPoint'})
@@ -209,6 +229,7 @@
pageSize: 10,
pointNo: undefined,
pointName: undefined,
+ pointType: undefined,
tagNo: undefined,
collectQuality: undefined,
})
@@ -232,12 +253,18 @@
getList()
}
- /** 查看数据操作 */
+ /** 查看历史值操作 */
const chartView = ref()
const chartHandle = (raw: object) => {
chartView.value.open(raw)
}
+/** 查看当前值操作 */
+const pointValue = ref()
+const pointValueHandle = (raw: object) => {
+ pointValue.value.open(raw)
+}
+
/** 重置按钮操作 */
const resetQuery = () => {
queryFormRef.value.resetFields()
--
Gitblit v1.9.3