From fa3d2503f8c34049159058a19e941192e47fb89e Mon Sep 17 00:00:00 2001
From: dongyukun <1208714201@qq.com>
Date: 星期四, 02 一月 2025 14:19:28 +0800
Subject: [PATCH] 调度模型下发数据类型字典
---
src/views/data/point/DaPointForm.vue | 27 ++++++++++++++++++++-------
1 files changed, 20 insertions(+), 7 deletions(-)
diff --git a/src/views/data/point/DaPointForm.vue b/src/views/data/point/DaPointForm.vue
index 195d0e9..5a1682b 100644
--- a/src/views/data/point/DaPointForm.vue
+++ b/src/views/data/point/DaPointForm.vue
@@ -286,13 +286,13 @@
<!--累计点-->
<el-row :gutter="20" v-if="formData.pointType === 'CUMULATE'">
<el-col :span="24">
- <el-form-item label="瞬时测点" prop="cumulatePoint.pointNo">
+ <el-form-item label="瞬时测点" prop="cumulatePoint.momentPoint">
<el-select
- v-model="formData.cumulatePoint.pointNo"
+ v-model="formData.cumulatePoint.momentPoint"
filterable
placeholder="请选择">
<el-option
- v-for="(item, index) in pointList"
+ v-for="(item, index) in pointList2"
:key="index"
:label="item.pointName"
:value="item.pointNo"/>
@@ -326,6 +326,7 @@
import * as DaPoint from '@/api/data/da/point'
import * as TagApi from '@/api/data/channel/tag'
import {DICT_TYPE, getDictOptions, getIntDictOptions} from "@/utils/dict";
+import {getPointSimpleList} from "@/api/data/da/point";
defineOptions({name: 'DataDaPointForm'})
@@ -343,6 +344,13 @@
}])
const queryParams = reactive({
pointTypes: "MEASURE,CONSTANT",
+})
+const pointList2 = ref([{
+ pointName: '',
+ pointNo: ''
+}])
+const queryParams2 = reactive({
+ pointTypes: "MEASURE,CONSTANT,CALCULATE",
})
const operatorList = ref(['+', '-', '*', '/', '&', '|', '!', '>', '<'])
const formData = ref({
@@ -379,7 +387,7 @@
cumulatePoint: {
id: '',
pointId: '',
- pointNo: '',
+ momentPoint: '',
length: '',
divisor: ''
}
@@ -391,7 +399,7 @@
minfreqid: [{required: true, message: '采集频率不能为空', trigger: 'blur'}],
"measurePoint.valueType": [{required: true, message: '值类型不能为空', trigger: 'blur'}],
"measurePoint.dimension": [{required: true, message: '平滑尺度不能为空', trigger: 'blur'}],
- "cumulatePoint.pointNo": [{required: true, message: '累计测点不能为空', trigger: 'blur'}],
+ "cumulatePoint.momentPoint": [{required: true, message: '累计测点不能为空', trigger: 'blur'}],
"cumulatePoint.length": [{required: true, message: '累计长度不能为空', trigger: 'blur'}],
"cumulatePoint.divisor": [{required: true, message: '除数不能为空', trigger: 'blur'}],
})
@@ -405,6 +413,7 @@
resetForm()
getSourceOption()
getPointList()
+ getPointList2()
// 修改时，设置数据
if (id) {
formLoading.value = true
@@ -511,7 +520,7 @@
cumulatePoint: {
id: '',
pointId: '',
- pointNo: '',
+ momentPoint: '',
length: 60,
divisor: 60
}
@@ -574,7 +583,11 @@
}
const getPointList = async () => {
- pointList.value = await DaPoint.getPointList(queryParams)
+ pointList.value = await DaPoint.getPointSimpleList(queryParams)
+}
+
+const getPointList2 = async () => {
+ pointList2.value = await DaPoint.getPointSimpleList(queryParams2)
}
const getInfo = async (id) => {
--
Gitblit v1.9.3