From cd09bed74c2b40d46f4391b4fe3fcd0c43c725f7 Mon Sep 17 00:00:00 2001
From: 潘志宝 <979469083@qq.com>
Date: 星期二, 10 十二月 2024 11:10:03 +0800
Subject: [PATCH] pointList2
---
src/views/data/point/DaPointForm.vue | 24 ++++++++++++++++++------
1 files changed, 18 insertions(+), 6 deletions(-)
diff --git a/src/views/data/point/DaPointForm.vue b/src/views/data/point/DaPointForm.vue
index 195d0e9..5f502a6 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"/>
@@ -344,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({
id: undefined,
@@ -379,7 +386,7 @@
cumulatePoint: {
id: '',
pointId: '',
- pointNo: '',
+ momentPoint: '',
length: '',
divisor: ''
}
@@ -391,7 +398,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 +412,7 @@
resetForm()
getSourceOption()
getPointList()
+ getPointList2()
// 修改时，设置数据
if (id) {
formLoading.value = true
@@ -511,7 +519,7 @@
cumulatePoint: {
id: '',
pointId: '',
- pointNo: '',
+ momentPoint: '',
length: 60,
divisor: 60
}
@@ -577,6 +585,10 @@
pointList.value = await DaPoint.getPointList(queryParams)
}
+const getPointList2 = async () => {
+ pointList2.value = await DaPoint.getPointList(queryParams2)
+}
+
const getInfo = async (id) => {
formData.value = await DaPoint.getDaPoint(id)
expressionList.value = []
--
Gitblit v1.9.3