From 196f7de9b485f82791f0a8399a7d60f36e0f495f Mon Sep 17 00:00:00 2001 From: fks-xuxinyue <2822784518@qq.com> Date: Mon, 19 Aug 2024 17:48:00 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=B5=8B=E8=AF=95=E9=97=AE?= =?UTF-8?q?=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../public/asset/file/emissionSource.xlsx | Bin 9243 -> 9245 bytes .../src/api/carbonEmissionFactorLibrary.ts | 1 + .../carbonEmissionFactorLibrary/config.ts | 87 +++---- .../carbonEmissionFactorLibrary/index.vue | 20 +- .../carbonPlanning/category/categoryDeatil.vue | 251 +++++++++++++++++---- 5 files changed, 272 insertions(+), 87 deletions(-) diff --git a/hx-ai-intelligent/public/asset/file/emissionSource.xlsx b/hx-ai-intelligent/public/asset/file/emissionSource.xlsx index 67e42be5ee243c169b76e7b7bbb078897b8e9858..306414bfd33a03d62aad1f0a182d82e6f8278432 100644 GIT binary patch delta 2424 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 delta 2422 zcmY*b3pCSxAK%7UMROUsH+U!8E>Z&6GVD z1R_B|AW0Ai4bQyJ<~0a&8Fw%~Lf8lyejtcz-$$+uB6YlG z*fb^JPR8^Uy;ghPm`Dp(Uc@z7IvX4U=pouRU*q5JGM00)k|W=|mFCxLTqYBGUn~2G zYfZbsq*blxthCgGl$dmv?l5E|0$H-haRKZ`W0eTOl8bLimA%f2Kx~JJS2%7P^`X>B z*}1{~q0e3_v!U~?O;K;wyeK(sEyl_njJc1?tnEsY zX_re;8G`J2&^;LPoNr-T&_DP26P*Fa7#A|66(+~_;^#7^UL%zh(O)y`wT1+K*;NjM z*qJmgz9lKO!erk6R_+>>xb5J1WfQ-msgups?}*_pO8rn;Zhqd*To(1Lc)lh zpN4_r&Q3th=icxA3P=d4(a3aj3C4Wvmgt`i-{Ouwvk*V0p01*BHHUofx}9*SYsh;} z@k(RpshkXz2)~pTljVgj+h>t7^w5ukD>x!Z6c*;LH}E5L= zA)>uJl>2+>Ku66ScTwqNj+oLT<$V$gA%c>l(TPmFG4l+;qjJ^ZI?baujQK&Mo|B5y zkE7_h?4oTpNAICt8``4=A|VZ11T_86yg+5;|E44j%!7!%<0r3{i&Wb$lKZ4EfL^_FpAc+bVIccYj?V0u*}bC4(Gi3W0seC!62(9KXvP` z(k79N*wsU0&n_d&MFSl;n4x`euX_!_;Bhtt}H zRZkQ%YnHlwp|4vkc2kEeAgDKqybJ1iSjDel1YEKHV3EZ{G=@=rT#%tDI|~xERhqa8 zp5dA4r+vu^Nog$fWdRKGrwb+{xy;-(>;S6HBsMKQKX1P);bJ+9>~b#IjP*0@h?X6J zI+#u~B)Yc>o+leQZ3c9dWyCUOvSx0EOW4a9gwx_*vHS!Nn5Qd4vtMUMrFhX*# zm4`>QIp;2ZAlVKj-6aTWuH6_RntqpOGsY*8IeuRJS$$&WXoZ{3cD4vZpx^ch!kOgG zK=7ir3T-TY{XAqwXQ2ol7apPb^*;G z)n@k&6+hW=1PGw1$x50+aM%50ei9(Vr^(r}_muT@m$B_3cIc6BvQd!%lYZ!rtzO51l-sFQ2yVbc0pJ?gD$u z_o7S~3o|DSOkris+U+tVjoZDan;%Xsmpiw&_S^Rq-jemwyUld8yOr97b0lyD;@;~I z1SM@aTEj%Vk2di9;5eMd9mgkyWuyuvGruXQ;6q?@FSdl*BeD; zz#n1rG09K!LR0izePRB+nCoz>**(SWj?=ZY!5-$&OtGQDDRs^}FRt69(8cNMZiM6PG}Z5*fPy{$S=hgKD-ZYno;QjA~tYdfJ0GBT(N z*CL#-q8T_0xrZV&$Gse(EOX5M%J36=&MW`pM%hrw_x$Ukg8UnL2aFrSzgr zU+J`b6gW}xSmxHZXs^r_W?t#GRb*e{#e3NwS9F1}sJamcbJ9d|%r!bfZppoX_9)NHq@}-RzOevpyIDh>)M$*CIkY(|6B0))Bzw^-4q-N bJXTj#{J$E3Kyv@cssLuy(IQ*>e?9&iMYUi0 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 }} + +
+ + + + + + + + + + + +