From b451bcdf065ddfdd5c46dce49e19707870cb4fa6 Mon Sep 17 00:00:00 2001
From: dongyukun <1208714201@qq.com>
Date: 星期三, 16 四月 2025 09:57:58 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/views/data/point/DaPointForm.vue | 22 +++++++++++++++++++---
1 files changed, 19 insertions(+), 3 deletions(-)
diff --git a/src/views/data/point/DaPointForm.vue b/src/views/data/point/DaPointForm.vue
index e4136b6..94c85e5 100644
--- a/src/views/data/point/DaPointForm.vue
+++ b/src/views/data/point/DaPointForm.vue
@@ -300,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"
@@ -499,7 +514,7 @@
unittransfactor: 1,
defaultValue: 0,
maxValue: 100000000,
- minValue: 0,
+ minValue: -100000000,
minfreqid: undefined,
remark: undefined,
isEnable: 1,
@@ -523,6 +538,7 @@
pointId: '',
momentPoint: '',
length: 60,
+ cumulateUnit: 'min',
divisor: 60
}
}
--
Gitblit v1.9.3