From 6497f987e481697e8055fe7bd45f957d52d43ba9 Mon Sep 17 00:00:00 2001
From: Jay <csj123456>
Date: 星期六, 12 十月 2024 10:42:48 +0800
Subject: [PATCH] 时间限定修改
---
src/views/data/ind/item/DerIndDefineForm.vue | 27 +++++++++++++++++----------
1 files changed, 17 insertions(+), 10 deletions(-)
diff --git a/src/views/data/ind/item/DerIndDefineForm.vue b/src/views/data/ind/item/DerIndDefineForm.vue
index f16a4ea..60a72f1 100644
--- a/src/views/data/ind/item/DerIndDefineForm.vue
+++ b/src/views/data/ind/item/DerIndDefineForm.vue
@@ -7,14 +7,14 @@
:rules="formRules" label-width="100px">
<el-row>
<el-col :span="12">
- <el-form-item label="原子指标" prop="atomItem.id">
- <el-select v-model="selected" clearable placeholder="请选择原子指标"
+ <el-form-item label="原子指标" prop="atomItem.itemId">
+ <el-select v-model="formData.atomItem.itemId" clearable placeholder="请选择原子指标"
@change="handleChange($event)">
<el-option
v-for="item in atomItemList"
:key="item.id"
:label="item.itemNo"
- :value="item.id"
+ :value="item.id + ''"
/>
</el-select>
</el-form-item>
@@ -95,7 +95,7 @@
</el-col>
<el-col :span="6">
<el-form-item label="时间限定" prop="timeLimit">
- <el-select v-model="formData.timeLimit" placeholder="请选择"
+ <el-select v-model="formData.derItem.timeLimit" placeholder="请选择"
@change="handleTimeLimitChange($event)">
<el-option
v-for="dict in getStrDictOptions(DICT_TYPE.IND_TIME_LIMIT)"
@@ -187,6 +187,7 @@
timeGranularity: '',
atomItem: {
id: '',
+ itemId: '',
itemNo: '',
itemName: '',
},
@@ -198,9 +199,6 @@
timeEnd: '',
dimension: ''
}
- })
- const queryParams = ref({
- itemType: 'ATOM'
})
const validateAsNumber = (rule, value, callback) => {
@@ -218,9 +216,7 @@
/*"atomItem.id": [{required: true, message: '原子指标不能为空', trigger: 'blur'}]*/
})
const formRef = ref() // 表单 Ref
- const dataSourceList = ref([] as DataSourceConfigApi.DataSourceConfigVO[])
const atomItemList = ref([] as ItemApi.ItemVO[])
- const selected = ref(null)
const showTimeChange = ref(false)
const dataCategoryList = ref([] as CategoryApi.IndItemCategoryVO[])
const dataSetFieldList = ref([] as DataSetFieldApi.DataSetFieldVO[])
@@ -233,13 +229,21 @@
resetForm()
// 加载数据源列表
dataCategoryList.value = await CategoryApi.getCategoryListAllSimple()
+ const queryParams = reactive({
+ itemType: 'ATOM'
+ })
atomItemList.value = await ItemApi.getItemList(queryParams)
- selected.value = null
// 修改时，设置数据
if (id) {
formLoading.value = true
try {
formData.value = await ItemApi.getItem(id)
+ if(formData.value.derItem.dimension.length > 0){
+ formData.value.derItem.dimension = formData.value.derItem.dimension.split(',')
+ }else {
+ formData.value.derItem.dimension = ""
+ }
+ await handleChange(formData.value.atomItem.itemId)
} finally {
formLoading.value = false
}
@@ -265,6 +269,8 @@
dimension = dimension + formData.value.derItem.dimension[index] + ','
}
formData.value.derItem.dimension = dimension.substring(0, dimension.length - 1)
+ }else{
+ formData.value.derItem.dimension = ''
}
const data = formData.value as ItemApi.ItemVO
if (formType.value === 'create') {
@@ -316,6 +322,7 @@
const itemData = await ItemApi.getItem(event)
formData.value.atomItem.itemName = itemData.itemName
formData.value.atomItem.id = itemData.atomItem.id
+ formData.value.atomItem.itemId = itemData.id
const queryParams = reactive({
dataSetId: itemData.atomItem.dataSet,
})
--
Gitblit v1.9.3