diff --git a/src/components/draw-app/properties/RelayProperty.vue b/src/components/draw-app/properties/RelayProperty.vue index 55bcbff..bbf23c4 100644 --- a/src/components/draw-app/properties/RelayProperty.vue +++ b/src/components/draw-app/properties/RelayProperty.vue @@ -10,6 +10,15 @@ label="编号" lazy-rules /> + { return { code: item.code.replace('X', 'S'), model: item.model, + showCode: item.showCode, }; }); }); diff --git a/src/layouts/RelayCabinetLayout/RelayCabinetLayout.vue b/src/layouts/RelayCabinetLayout/RelayCabinetLayout.vue index 29a2491..6e1061a 100644 --- a/src/layouts/RelayCabinetLayout/RelayCabinetLayout.vue +++ b/src/layouts/RelayCabinetLayout/RelayCabinetLayout.vue @@ -197,6 +197,14 @@ label="集中站" :rules="[(val) => val != '' || '集中站不能为空']" > + ({ publishId: '', centralizedStation: 0, generateCJQD: true, generateSectionRelay: false, generateIKCJRelay: false, + showCodeType: ShowCodeType.NO, }); let publishIdOption = ref<{ label: string; value: number }[]>(); @@ -496,6 +507,17 @@ let centralizedStationsOption = ref<{ label: string; value: number }[]>([ { label: '', value: 0 }, ]); +let showCodeTypeOption = [ + { + label: '无', + value: ShowCodeType.NO, + }, + { + label: '众合', + value: ShowCodeType.zhonghe, + }, +]; + async function openGeneraterRelayLayoutDialog() { generaterRelayLayoutDialog.value = true; const response = await pageQuery({ @@ -1054,6 +1076,12 @@ function oneClickGeneraterRelayLayout() { combinationtype.refDeviceCodesAndModel.forEach((relay) => { const id = GraphicIdGenerator.next(); refRelayIds.push(id); + let showCode = undefined; + if ( + generaterRelayLayout.value.showCodeType == ShowCodeType.zhonghe + ) { + showCode = relay.showCode?.zhonghe; + } generateRelays.push({ id, code: relay.code, @@ -1061,6 +1089,7 @@ function oneClickGeneraterRelayLayout() { type: relay.type, deviceCode, combinationCode: combinationtype.code, + showCode, }); if (deviceCode) { generateRelaysMap.set(