From af4559de5ccd4a14390dacd1e0f36e775abac341 Mon Sep 17 00:00:00 2001
From: dengzedong <dengzedong@email>
Date: 星期一, 07 四月 2025 13:51:38 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/views/data/point/DaPointForm.vue | 28 +++++++++++++++++++++++-----
1 files changed, 23 insertions(+), 5 deletions(-)
diff --git a/src/views/data/point/DaPointForm.vue b/src/views/data/point/DaPointForm.vue
index 5f502a6..94c85e5 100644
--- a/src/views/data/point/DaPointForm.vue
+++ b/src/views/data/point/DaPointForm.vue
@@ -25,6 +25,7 @@
<el-select
v-model="formData.pointType"
clearable
+ :disabled = "formType !== 'create'"
placeholder="请选择测点类型"
>
<el-option
@@ -299,14 +300,29 @@
</el-select>
</el-form-item>
</el-col>
- <el-col :span="12">
+ <el-col :span="8">
<el-form-item label="累计长度" prop="cumulatePoint.length">
<el-input-number v-model="formData.cumulatePoint.length" style="width: 100%"
:min="1" :max="3000"
:controls="false"/>
</el-form-item>
</el-col>
- <el-col :span="12">
+ <el-col :span="8">
+ <el-form-item label="累计单位" prop="cumulatePoint.cumulateUnit">
+ <el-select
+ v-model="formData.cumulatePoint.cumulateUnit"
+ placeholder="请选择累计单位"
+ >
+ <el-option
+ v-for="dict in getDictOptions(DICT_TYPE.CUMULATEUNIT)"
+ :key="dict.value"
+ :label="dict.label"
+ :value="dict.value"
+ />
+ </el-select>
+ </el-form-item>
+ </el-col>
+ <el-col :span="8">
<el-form-item label="除数" prop="cumulatePoint.divisor">
<el-input-number v-model="formData.cumulatePoint.divisor" style="width: 100%"
:min="1" :max="3000"
@@ -326,6 +342,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'})
@@ -497,7 +514,7 @@
unittransfactor: 1,
defaultValue: 0,
maxValue: 100000000,
- minValue: 0,
+ minValue: -100000000,
minfreqid: undefined,
remark: undefined,
isEnable: 1,
@@ -521,6 +538,7 @@
pointId: '',
momentPoint: '',
length: 60,
+ cumulateUnit: 'min',
divisor: 60
}
}
@@ -582,11 +600,11 @@
}
const getPointList = async () => {
- pointList.value = await DaPoint.getPointList(queryParams)
+ pointList.value = await DaPoint.getPointSimpleList(queryParams)
}
const getPointList2 = async () => {
- pointList2.value = await DaPoint.getPointList(queryParams2)
+ pointList2.value = await DaPoint.getPointSimpleList(queryParams2)
}
const getInfo = async (id) => {
--
Gitblit v1.9.3