From 6b77bf1b01c29954f21c2b287cccbe08aa1373fe Mon Sep 17 00:00:00 2001
From: dongyukun <1208714201@qq.com>
Date: 星期二, 29 四月 2025 08:53:34 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/views/data/ind/item/AtomIndDefineForm.vue | 34 +++++++++++++++++++++++++---------
1 files changed, 25 insertions(+), 9 deletions(-)
diff --git a/src/views/data/ind/item/AtomIndDefineForm.vue b/src/views/data/ind/item/AtomIndDefineForm.vue
index 225d5c1..646654f 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">
@@ -88,9 +104,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"
@@ -144,6 +159,7 @@
timeRange: '',
timeGranularity: '',
remark: '',
+ solidifyFlag: '',
atomItem:{
dataSource:'',
dataSet: '',
@@ -160,12 +176,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[])
@@ -197,6 +209,8 @@
if(formData.value.atomItem.dataSet !== null){
const queryParams = reactive({
dataSetId: formData.value.atomItem.dataSet,
+ pageSize: 1000,
+ pageNo: 1
})
dataSetFieldList.value = (await DataSetFieldApi.getDataSetFieldPage(queryParams)).list
}
@@ -270,6 +284,8 @@
if (event !== null && event !== undefined) {
const queryParams = reactive({
dataSetId: event,
+ pageSize: 1000,
+ pageNo: 1
})
dataSetFieldList.value = (await DataSetFieldApi.getDataSetFieldPage(queryParams)).list
}
--
Gitblit v1.9.3