Commit 3332f053ed50a81e71527d2f0ca4117ec680e131
1 parent
875167ba
fix: 修复TCP网关子产品新增后,选择了默认脚本,然后编辑时,提示请选择对应脚本
Showing
2 changed files
with
2 additions
and
6 deletions
| ... | ... | @@ -113,7 +113,6 @@ |
| 113 | 113 | setModalProps({ confirmLoading: false }); |
| 114 | 114 | current.value = 0; |
| 115 | 115 | isUpdate.value = data.isUpdate; |
| 116 | - console.log(isUpdate.value, 'isUpdate'); | |
| 117 | 116 | isViewDetail.value = data.isView; |
| 118 | 117 | const res = |
| 119 | 118 | data.record !== undefined |
| ... | ... | @@ -127,6 +126,8 @@ |
| 127 | 126 | const title = unref(isUpdate) ? '编辑产品' : '新增产品'; |
| 128 | 127 | setModalProps({ title, showOkBtn: true, showCancelBtn: true }); |
| 129 | 128 | if (unref(isUpdate)) { |
| 129 | + const { deviceType } = res || {}; | |
| 130 | + deviceTypeStr.value = deviceType; | |
| 130 | 131 | await setDeviceConfEditFormData(res); |
| 131 | 132 | await setTransConfEditFormData(res); |
| 132 | 133 | handleStepNext(false, res); | ... | ... |
| ... | ... | @@ -4,7 +4,6 @@ |
| 4 | 4 | import { BasicDrawer, useDrawerInner } from '/@/components/Drawer'; |
| 5 | 5 | import { BasicTable } from '/@/components/Table'; |
| 6 | 6 | import { useTable } from '/@/components/Table'; |
| 7 | - import { Button } from 'ant-design-vue'; | |
| 8 | 7 | import { ExclamationCircleOutlined } from '@ant-design/icons-vue'; |
| 9 | 8 | import { getModelList } from '/@/api/device/modelOfMatter'; |
| 10 | 9 | |
| ... | ... | @@ -58,7 +57,6 @@ |
| 58 | 57 | transition: 'none', |
| 59 | 58 | }" |
| 60 | 59 | v-bind="$attrs" |
| 61 | - :showFooter="true" | |
| 62 | 60 | destroyOnClose |
| 63 | 61 | @close="handleClose" |
| 64 | 62 | title="物模型" |
| ... | ... | @@ -70,8 +68,5 @@ |
| 70 | 68 | <ExclamationCircleOutlined class="ml-1" /> |
| 71 | 69 | </template> |
| 72 | 70 | </BasicTable> |
| 73 | - <template #footer> | |
| 74 | - <Button @click="handleClose">取消</Button> | |
| 75 | - </template> | |
| 76 | 71 | </BasicDrawer> |
| 77 | 72 | </template> | ... | ... |