From a9b50ee2cf8a732e67eea4f6265628b7fd1b4504 Mon Sep 17 00:00:00 2001
From: dongyukun <1208714201@qq.com>
Date: 星期三, 28 五月 2025 11:36:28 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/views/data/point/DaPointValue.vue | 13 ++++++++++---
1 files changed, 10 insertions(+), 3 deletions(-)
diff --git a/src/views/data/point/DaPointValue.vue b/src/views/data/point/DaPointValue.vue
index 671ede7..80f73af 100644
--- a/src/views/data/point/DaPointValue.vue
+++ b/src/views/data/point/DaPointValue.vue
@@ -8,7 +8,7 @@
<el-form
:model="dataForm"
v-loading="formLoading"
- label-width="120px"
+ label-width="100px"
>
<el-row>
<el-col :span="12">
@@ -23,12 +23,17 @@
</el-col>
</el-row>
<el-row>
- <el-col :span="12">
+ <el-col :span="8">
<el-form-item label="数据时间" prop="dataTime">
<el-input v-model="dataForm.dataTime" readonly/>
</el-form-item>
</el-col>
- <el-col :span="12">
+ <el-col :span="8">
+ <el-form-item label="单位转换" prop="unittransfactor">
+ <el-input v-model="dataForm.unittransfactor" readonly />
+ </el-form-item>
+ </el-col>
+ <el-col :span="8">
<el-form-item label="数据值" prop="dataValue">
<el-input v-model="dataForm.dataValue" readonly>
<template #append>{{ dataForm.unit }}</template>
@@ -88,6 +93,7 @@
/** 打开弹窗 */
const open = async (row: object) => {
+ console.log(row)
visible.value = true
resetForm()
dataForm.value.id = row.id;
@@ -95,6 +101,7 @@
dataForm.value.pointName = row.pointName;
dataForm.value.pointType = row.pointType;
dataForm.value.unit = row.unit;
+ dataForm.value.unittransfactor = row.unittransfactor;
getCurrentData()
queryParams.pointNo = row.pointNo;
if (dataForm.value.pointType === "CALCULATE") {
--
Gitblit v1.9.3