From e629a9105b1f8c9920d976a93139dda0150c79a8 Mon Sep 17 00:00:00 2001
From: 潘志宝 <979469083@qq.com>
Date: 星期一, 20 一月 2025 18:03:12 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/views/data/ind/item/AtomIndDefineForm.vue | 15 +++++----------
1 files changed, 5 insertions(+), 10 deletions(-)
diff --git a/src/views/data/ind/item/AtomIndDefineForm.vue b/src/views/data/ind/item/AtomIndDefineForm.vue
index e76346d..b97f092 100644
--- a/src/views/data/ind/item/AtomIndDefineForm.vue
+++ b/src/views/data/ind/item/AtomIndDefineForm.vue
@@ -32,7 +32,7 @@
</el-col>
<el-col :span="12">
<el-form-item label="时间粒度" prop="timeGranularity">
- <el-select v-model="formData.timeGranularity" placeholder="请选择">
+ <el-select v-model="formData.timeGranularity" clearable placeholder="请选择">
<el-option
v-for="dict in getStrDictOptions(DICT_TYPE.TIME_GRANULARITY)"
:key="dict.value"
@@ -88,9 +88,8 @@
</el-form-item>
</el-col>
<el-col :span="6">
- <el-form-item label="统计方式" prop="statFunc">
- <el-select v-model="formData.atomItem.statFunc" filterable
- allow-create clearable placeholder="请选择">
+ <el-form-item label="统计方式" prop="atomItem.statFunc">
+ <el-select v-model="formData.atomItem.statFunc" clearable placeholder="请选择">
<el-option
v-for="dict in getStrDictOptions(DICT_TYPE.DATA_STAT_FUNC)"
:key="dict.value"
@@ -160,12 +159,8 @@
const formRules = reactive({
itemName: [{required: true, message: '指标名称不能为空', trigger: 'blur'}],
itemCategory: [{required: true, message: '指标分类不能为空', trigger: 'blur'}],
- /*precision: [{validator: validateAsNumber, trigger: 'blur' }],
- coefficient: [{validator: validateAsNumber, trigger: 'blur' }],
- statFunc: [{required: true, message: '统计方式不能为空', trigger: 'blur'}],
- timeGranularity: [{required: true, message: '时间粒度不能为空', trigger: 'blur'}],
- "atomItem.dataSet": [{required: true, message: '数据集不能为空', trigger: 'blur'}],
- "atomItem.usingField":[{required: true, message: '使用字段不能为空', trigger: 'blur'}]*/
+ "atomItem.usingField": [{required: true, message: '使用字段不能为空', trigger: 'blur'}],
+ "atomItem.statFunc": [{required: true, message: '统计方式不能为空', trigger: 'blur'}],
})
const formRef = ref() // 表单 Ref
const dataSetList = ref([] as DataSetApi.DataSetVO[])
--
Gitblit v1.9.3