diff --git a/hx-ai-intelligent/public/asset/file/emissionSource.xlsx b/hx-ai-intelligent/public/asset/file/emissionSource.xlsx index 67e42be..306414b 100644 Binary files a/hx-ai-intelligent/public/asset/file/emissionSource.xlsx and b/hx-ai-intelligent/public/asset/file/emissionSource.xlsx differ diff --git a/hx-ai-intelligent/src/api/carbonEmissionFactorLibrary.ts b/hx-ai-intelligent/src/api/carbonEmissionFactorLibrary.ts index 52e3b68..f874b8c 100644 --- a/hx-ai-intelligent/src/api/carbonEmissionFactorLibrary.ts +++ b/hx-ai-intelligent/src/api/carbonEmissionFactorLibrary.ts @@ -106,5 +106,6 @@ export enum carbonPlanning { batchOrUpdate = '/carbon-smart/api/carbon/planning/batchOrUpdate', addNodes = '/carbon-smart/api/carbon/planning/addNodes', benchmarkSetting = '/carbon-smart/api/carbon/planning/benchmarkSetting', + monthBenchmarkSetting = '/carbon-smart/api/carbon/planning/monthBenchmarkSetting', benchmarkSubmit = '/carbon-smart/api/carbon/planning/benchmarkSubmit', } diff --git a/hx-ai-intelligent/src/view/carbonEmissionManage/carbonEmissionFactorLibrary/config.ts b/hx-ai-intelligent/src/view/carbonEmissionManage/carbonEmissionFactorLibrary/config.ts index c6cf00c..8d88d3c 100644 --- a/hx-ai-intelligent/src/view/carbonEmissionManage/carbonEmissionFactorLibrary/config.ts +++ b/hx-ai-intelligent/src/view/carbonEmissionManage/carbonEmissionFactorLibrary/config.ts @@ -17,12 +17,12 @@ export const formConfig = (disabled) => { placeholder: '请输入排放源', maxLength: 20, }, - // rules: [ - // { - // required: true, - // message: '请输入排放源', - // }, - // ], + rules: [ + { + required: true, + message: '请输入排放源', + }, + ], }, { field: 'emissionType', @@ -38,12 +38,12 @@ export const formConfig = (disabled) => { fieldNames: { label: 'emissionName', value: 'id' }, showSearch: true, }, - // rules: [ - // { - // required: true, - // message: '请选择排放分类', - // }, - // ], + rules: [ + { + required: true, + message: '请选择排放分类', + }, + ], }, { field: 'emissionGas', @@ -79,12 +79,12 @@ export const formConfig = (disabled) => { }, ], }, - // rules: [ - // { - // required: true, - // message: '请选择排放气体', - // }, - // ], + rules: [ + { + required: true, + message: '请选择排放气体', + }, + ], }, { label: '排放环节', @@ -94,12 +94,12 @@ export const formConfig = (disabled) => { placeholder: '请输入排放环节', maxLength: 20, }, - // rules: [ - // { - // required: true, - // message: '请输入排放环节', - // }, - // ], + rules: [ + { + required: true, + message: '请输入排放环节', + }, + ], }, { label: '排放因子', @@ -109,13 +109,13 @@ export const formConfig = (disabled) => { placeholder: '请输入排放因子值', maxLength: 20, }, - // rules: [ - // { - // required: true, - // message: '请输入排放因子值', - // trigger: 'change', - // }, - // ], + rules: [ + { + required: true, + message: '请输入排放因子值', + trigger: 'change', + }, + ], }, { field: 'carbonEmissionPrefix', @@ -141,12 +141,12 @@ export const formConfig = (disabled) => { }, ], }, - // rules: [ - // { - // required: true, - // message: '请选择碳排前缀', - // }, - // ], + rules: [ + { + required: true, + message: '请选择碳排前缀', + }, + ], }, { label: '碳排后缀', @@ -156,17 +156,18 @@ export const formConfig = (disabled) => { placeholder: '请输入碳排后缀', maxLength: 20, }, - // rules: [ - // { - // required: true, - // message: '请输入碳排后缀', - // }, - // ], + rules: [ + { + required: true, + message: '请输入碳排后缀', + }, + ], }, { label: '已引用数', field: 'numberOfReferences', component: 'NsInput', + show:disabled, componentProps: { defaultValue: '', disabled: true, diff --git a/hx-ai-intelligent/src/view/carbonEmissionManage/carbonEmissionFactorLibrary/index.vue b/hx-ai-intelligent/src/view/carbonEmissionManage/carbonEmissionFactorLibrary/index.vue index ce9bb82..ea3515e 100644 --- a/hx-ai-intelligent/src/view/carbonEmissionManage/carbonEmissionFactorLibrary/index.vue +++ b/hx-ai-intelligent/src/view/carbonEmissionManage/carbonEmissionFactorLibrary/index.vue @@ -12,6 +12,7 @@ @@ -274,7 +275,8 @@ watchEffect(() => { disabled.value = opMap.value.type === 'edit'; }); - const formSchema = formConfig(disabled); + const show = ref(true); + const formSchema = formConfig(show); const casData = ref([]); const treeData = ref([]); const userAuthList = ref([]); @@ -634,6 +636,7 @@ NsMessage.success('操作成功'); }); }; + show.value = false; visible.value = true; }, }, @@ -808,6 +811,7 @@ NsMessage.success('操作成功'); }); }; + show.value = true; visible.value = true; }, }, @@ -856,6 +860,7 @@ componentProps: { placeholder: '请选择排放气体', api: carbonEmissionFactorLibrary.gasAndDatabase, + resultField: 'data', params: { orgId: orgId.value, emissionList, @@ -874,6 +879,7 @@ allowClear: true, placeholder: '请选择数据库名称', api: carbonEmissionFactorLibrary.gasAndDatabase, + resultField: 'data', params: { orgId: orgId.value, emissionList, @@ -1181,4 +1187,16 @@ } } } + :deep( + .ant-form-item-label + > label.ant-form-item-required:not(.ant-form-item-required-mark-optional)::before + ) { + display: none !important; + } + :deep(.ant-form-item-label) { + z-index: 20; + text-align: right; + width: 27%; + } +  diff --git a/hx-ai-intelligent/src/view/carbonEmissionManage/carbonPlanning/category/categoryDeatil.vue b/hx-ai-intelligent/src/view/carbonEmissionManage/carbonPlanning/category/categoryDeatil.vue index c1d912d..34b1b3f 100644 --- a/hx-ai-intelligent/src/view/carbonEmissionManage/carbonPlanning/category/categoryDeatil.vue +++ b/hx-ai-intelligent/src/view/carbonEmissionManage/carbonPlanning/category/categoryDeatil.vue @@ -93,7 +93,7 @@ @@ -109,12 +109,6 @@ - @@ -124,40 +118,107 @@ - -
节点:{{ props.nodeName }}
- - - -
+ + + + + +
+ 节点:{{ props.nodeName }} + +
+ + + + + + + + + + + +