From aeaa74110117aab9c82b5d03f96197166e9debde Mon Sep 17 00:00:00 2001
From: 潘志宝 <979469083@qq.com>
Date: 星期二, 03 六月 2025 18:42:12 +0800
Subject: [PATCH] 计算点再次计算
---
src/views/data/point/DaPointForm.vue | 24 ++++++++++++++++++++----
1 files changed, 20 insertions(+), 4 deletions(-)
diff --git a/src/views/data/point/DaPointForm.vue b/src/views/data/point/DaPointForm.vue
index c66caeb..8d81bb5 100644
--- a/src/views/data/point/DaPointForm.vue
+++ b/src/views/data/point/DaPointForm.vue
@@ -301,14 +301,14 @@
</el-select>
</el-form-item>
</el-col>
- <el-col :span="8">
+ <el-col :span="6">
<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="8">
+ <el-col :span="6">
<el-form-item label="累计单位" prop="cumulatePoint.cumulateUnit">
<el-select
v-model="formData.cumulatePoint.cumulateUnit"
@@ -323,11 +323,26 @@
</el-select>
</el-form-item>
</el-col>
- <el-col :span="8">
+ <el-col :span="6">
<el-form-item label="除数" prop="cumulatePoint.divisor">
<el-input-number v-model="formData.cumulatePoint.divisor" style="width: 100%"
:min="1" :max="3000"
:controls="false"/>
+ </el-form-item>
+ </el-col>
+ <el-col :span="6">
+ <el-form-item label="是否累计负数" prop="cumulatePoint.isCumuNeg">
+ <el-select
+ v-model="formData.cumulatePoint.isCumuNeg"
+ placeholder="请选择是否累计负数"
+ >
+ <el-option
+ v-for="dict in getIntDictOptions(DICT_TYPE.COM_IS_INT)"
+ :key="dict.value"
+ :label="dict.label"
+ :value="dict.value"
+ />
+ </el-select>
</el-form-item>
</el-col>
@@ -414,7 +429,7 @@
pointNo: ''
}])
const queryParams = reactive({
- pointTypes: "MEASURE,CONSTANT",
+ pointTypes: "MEASURE,CONSTANT,CALCULATE,CUMULATE,EXTREMAL",
})
const pointList2 = ref([{
pointName: '',
@@ -603,6 +618,7 @@
momentPoint: '',
length: 60,
cumulateUnit: 'min',
+ isCumuNeg: 1,
divisor: 60
},
extremalPoint: {
--
Gitblit v1.9.3