Showing
1 changed file
with
9 additions
and
5 deletions
| ... | ... | @@ -120,17 +120,17 @@ |
| 120 | 120 | proxy.$refs.DeviceProfileStep1Ref.editOrAddNameStatus(false); |
| 121 | 121 | } |
| 122 | 122 | noEditObj = { |
| 123 | - id: editData.value.id, | |
| 124 | 123 | name: editData.value?.name, |
| 125 | 124 | createTime: createTime.value, |
| 126 | 125 | transportType: editTransportType.value, |
| 127 | 126 | type: editData.value?.type, |
| 128 | 127 | profileData: editData.value?.profileData, |
| 129 | 128 | defaultQueueName: editData.value.defaultQueueName, |
| 130 | - image: editData.value.image, | |
| 129 | + id: editData.value.id, | |
| 131 | 130 | defaultRuleChainId: editData.value.defaultRuleChainId, |
| 132 | - description: editData.value.description, | |
| 133 | 131 | tenantId: editData.value.tenantId, |
| 132 | + image: editData.value.image, | |
| 133 | + description: editData.value.description, | |
| 134 | 134 | default: editData.value.default, |
| 135 | 135 | }; |
| 136 | 136 | } else if (isUpdate.value == 3) { |
| ... | ... | @@ -171,7 +171,11 @@ |
| 171 | 171 | let getPic = null; |
| 172 | 172 | const getStep1Obj = await proxy.$refs.DeviceProfileStep1Ref?.getStep1Func(); |
| 173 | 173 | getPic = getStep1Obj.icon; |
| 174 | - Object.assign(noEditObj, { image: getPic }, getStep1Obj.key); | |
| 174 | + getStepOneData = { | |
| 175 | + ...getStep1Obj.key, | |
| 176 | + ...{ image: getPic }, | |
| 177 | + }; | |
| 178 | + Object.assign(noEditObj, getStepOneData); | |
| 175 | 179 | }); |
| 176 | 180 | } |
| 177 | 181 | } |
| ... | ... | @@ -206,7 +210,7 @@ |
| 206 | 210 | ...getStep1Obj.key, |
| 207 | 211 | ...{ image: getPic }, |
| 208 | 212 | }; |
| 209 | - Object.assign(noEditObj, { image: getPic }, getStep1Obj.key); | |
| 213 | + Object.assign(noEditObj, getStepOneData); | |
| 210 | 214 | } |
| 211 | 215 | const id = isUpdate.value == 1 ? '' : postEditId.value; |
| 212 | 216 | const postDefaultVal = | ... | ... |