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/ind/item/AtomIndDefineForm.vue | 19 ++++++++++++++++++-
1 files changed, 18 insertions(+), 1 deletions(-)
diff --git a/src/views/data/ind/item/AtomIndDefineForm.vue b/src/views/data/ind/item/AtomIndDefineForm.vue
index b97f092..6368c02 100644
--- a/src/views/data/ind/item/AtomIndDefineForm.vue
+++ b/src/views/data/ind/item/AtomIndDefineForm.vue
@@ -59,6 +59,22 @@
<el-input v-model="formData.unit"/>
</el-form-item>
</el-col>
+ <el-col :span="6">
+ <el-form-item label="固化标识" prop="solidifyFlag">
+ <el-select v-model="formData.solidifyFlag"
+ clearable
+ filterable
+ allow-create
+ placeholder="请选择">
+ <el-option
+ v-for="dict in getStrDictOptions(DICT_TYPE.SOLIDIFY_FLAG)"
+ :key="dict.value"
+ :label="dict.label"
+ :value="dict.value"
+ />
+ </el-select>
+ </el-form-item>
+ </el-col>
</el-row>
<el-row>
<el-col :span="12">
@@ -143,6 +159,7 @@
timeRange: '',
timeGranularity: '',
remark: '',
+ solidifyFlag: '',
atomItem:{
dataSource:'',
dataSet: '',
@@ -160,7 +177,7 @@
itemName: [{required: true, message: '指标名称不能为空', trigger: 'blur'}],
itemCategory: [{required: true, message: '指标分类不能为空', trigger: 'blur'}],
"atomItem.usingField": [{required: true, message: '使用字段不能为空', trigger: 'blur'}],
- "atomItem.statFunc": [{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