From eeddc808a8d6428bfd1c2d6e21e4a71f5e9bdbef Mon Sep 17 00:00:00 2001
From: houzhongjian <houzhongyi@126.com>
Date: 星期五, 13 十二月 2024 10:41:25 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/views/data/point/DaPointForm.vue | 17 +++++++++++++++--
1 files changed, 15 insertions(+), 2 deletions(-)
diff --git a/src/views/data/point/DaPointForm.vue b/src/views/data/point/DaPointForm.vue
index 12536e0..5a1682b 100644
--- a/src/views/data/point/DaPointForm.vue
+++ b/src/views/data/point/DaPointForm.vue
@@ -292,7 +292,7 @@
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({
@@ -405,6 +413,7 @@
resetForm()
getSourceOption()
getPointList()
+ getPointList2()
// 修改时，设置数据
if (id) {
formLoading.value = true
@@ -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