From 0ccd9ca4b3a0ac1474c8cb9445d8b669654c7a81 Mon Sep 17 00:00:00 2001
From: 潘志宝 <979469083@qq.com>
Date: 星期一, 28 十月 2024 17:37:59 +0800
Subject: [PATCH] Merge branch 'master' of http://dlindusit.com:53929/r/iailab-plat-ui-vue3
---
src/views/data/point/DaPointForm.vue | 62 ++++++++++++++++++------------
1 files changed, 37 insertions(+), 25 deletions(-)
diff --git a/src/views/data/point/DaPointForm.vue b/src/views/data/point/DaPointForm.vue
index e5b331f..85758ec 100644
--- a/src/views/data/point/DaPointForm.vue
+++ b/src/views/data/point/DaPointForm.vue
@@ -55,29 +55,6 @@
</el-row>
<el-row>
<el-col :span="12">
- <el-form-item label="值类型" prop="valueType">
- <el-select
- v-model="formData.measurePoint.valueType"
- clearable
- placeholder="请选择值类型"
- >
- <el-option
- v-for="dict in getDictOptions(DICT_TYPE.VALUETYPE)"
- :key="dict.value"
- :label="dict.label"
- :value="dict.value"
- />
- </el-select>
- </el-form-item>
- </el-col>
- <el-col :span="12">
- <el-form-item label="平滑尺度" prop="dimension">
- <el-input-number v-model="formData.measurePoint.dimension" style="width: 100%" :controls="false"/>
- </el-form-item>
- </el-col>
- </el-row>
- <el-row>
- <el-col :span="12">
<el-form-item label="测量单位" prop="unit">
<el-input v-model="formData.unit" placeholder="请输入测量单位"/>
</el-form-item>
@@ -155,6 +132,29 @@
v-model="formData.sourceOption"
:options="sourceOptions"
filterable/>
+ </el-form-item>
+ </el-col>
+ </el-row>
+ <el-row v-if="formData.pointType === 'MEASURE'">
+ <el-col :span="12">
+ <el-form-item label="值类型" prop="valueType">
+ <el-select
+ v-model="formData.measurePoint.valueType"
+ clearable
+ placeholder="请选择值类型"
+ >
+ <el-option
+ v-for="dict in getDictOptions(DICT_TYPE.VALUETYPE)"
+ :key="dict.value"
+ :label="dict.label"
+ :value="dict.value"
+ />
+ </el-select>
+ </el-form-item>
+ </el-col>
+ <el-col :span="12">
+ <el-form-item label="平滑尺度" prop="dimension">
+ <el-input-number v-model="formData.measurePoint.dimension" style="width: 100%" :controls="false"/>
</el-form-item>
</el-col>
</el-row>
@@ -445,8 +445,20 @@
remark: undefined,
isEnable: 1,
sourceOption: [],
- mathPoint: {},
- measurePoint: {},
+ mathPoint: {
+ id: '',
+ pointId: '',
+ expression: ''
+ },
+ measurePoint: {
+ id: '',
+ pointId: '',
+ sourceType: '',
+ sourceId: '',
+ tagNo: '',
+ dimension: '1',
+ valueType: 'SIMULATE',
+ }
}
formRef.value?.resetFields()
}
--
Gitblit v1.9.3