From 15ff1c7759d3878615ebbf2e3228068a4ddfa1bf Mon Sep 17 00:00:00 2001 From: jackhoo_98 Date: Fri, 24 Feb 2023 14:18:06 +0800 Subject: [PATCH] =?UTF-8?q?feat:=20=E8=BF=9C=E7=A8=8B=E5=8D=87=E7=BA=A7=20?= =?UTF-8?q?=E5=8D=87=E7=BA=A7=E4=BB=BB=E5=8A=A1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/components/AIcon/index.tsx | 3 +- .../Firmware/Task/Save/SelectDevices.vue | 35 +++- src/views/device/Firmware/Task/Save/index.vue | 170 ++++++------------ src/views/device/Firmware/Task/index.vue | 27 ++- src/views/link/AccessConfig/index.vue | 2 +- src/views/link/Certificate/index.vue | 4 +- src/views/link/Protocol/index.vue | 7 +- src/views/link/Type/index.vue | 2 +- 8 files changed, 101 insertions(+), 149 deletions(-) diff --git a/src/components/AIcon/index.tsx b/src/components/AIcon/index.tsx index 1c119785..366a7b1c 100644 --- a/src/components/AIcon/index.tsx +++ b/src/components/AIcon/index.tsx @@ -55,7 +55,8 @@ const iconKeys = [ 'LikeOutlined', 'ArrowLeftOutlined', 'DownloadOutlined', - 'PauseOutlined' + 'PauseOutlined', + 'ControlOutlined', ] const Icon = (props: {type: string}) => { diff --git a/src/views/device/Firmware/Task/Save/SelectDevices.vue b/src/views/device/Firmware/Task/Save/SelectDevices.vue index e646a6d1..10657f29 100644 --- a/src/views/device/Firmware/Task/Save/SelectDevices.vue +++ b/src/views/device/Firmware/Task/Save/SelectDevices.vue @@ -5,7 +5,11 @@ :disabled="true" > {}, + }, +}); + const route = useRoute(); const params = ref>({}); const visible = ref(false); @@ -212,15 +223,18 @@ const cancelSelect = () => { }; const handleOk = () => { - checkLable.value = _selectedRowKeys.value - .map((item) => checkAllDataMap.has(item) && checkAllDataMap.get(item)) - .toString(); + checkLable.value = updateSelect(_selectedRowKeys.value); emit('update:modelValue', _selectedRowKeys.value); visible.value = false; }; +const updateSelect = (selectedRowKeys: T[]) => + selectedRowKeys + .map((item) => checkAllDataMap.has(item) && checkAllDataMap.get(item)) + .toString(); + const onVisible = () => { - visible.value = true; + !props.data.view && (visible.value = true); }; const handleCancel = () => { @@ -236,6 +250,10 @@ onMounted(() => { checkAllDataMap.set(item.id, item.name); return item.id; }); + if (props.data.id) { + checkLable.value = updateSelect(props.data.deviceId); + emit('update:modelValue', props.data.deviceId); + } } }, ); @@ -264,9 +282,8 @@ const handleSearch = (e: any) => { diff --git a/src/views/device/Firmware/Task/Save/index.vue b/src/views/device/Firmware/Task/Save/index.vue index 433b453e..2a096774 100644 --- a/src/views/device/Firmware/Task/Save/index.vue +++ b/src/views/device/Firmware/Task/Save/index.vue @@ -15,17 +15,20 @@ :model="formData" name="basic" autocomplete="off" + ref="formRef" + :rules="rules" > - + + > + > + > 所有设备 选择设备 - + + - - + - + diff --git a/src/views/link/AccessConfig/index.vue b/src/views/link/AccessConfig/index.vue index d4ddcd8d..851b6a78 100644 --- a/src/views/link/AccessConfig/index.vue +++ b/src/views/link/AccessConfig/index.vue @@ -188,7 +188,7 @@