From e74f8fa7aa9cbdb45f3fd953748d807f4baf6c97 Mon Sep 17 00:00:00 2001 From: jackhoo_98 Date: Fri, 17 Mar 2023 11:16:29 +0800 Subject: [PATCH] =?UTF-8?q?fix:=20=E8=BF=90=E7=BB=B4=E7=AE=A1=E7=90=86=20?= =?UTF-8?q?=E8=BF=9C=E7=A8=8B=E5=8D=87=E7=BA=A7=E4=BF=AE=E5=A4=8D=E9=83=A8?= =?UTF-8?q?=E5=88=86bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/device/Firmware/Save/index.vue | 5 ++++- src/views/device/Firmware/Task/Detail/index.vue | 11 ++++++++--- src/views/device/Firmware/Task/Save/SelectDevices.vue | 10 ++++++++-- src/views/device/Firmware/index.vue | 5 +++-- 4 files changed, 23 insertions(+), 8 deletions(-) diff --git a/src/views/device/Firmware/Save/index.vue b/src/views/device/Firmware/Save/index.vue index 00c7ef33..61ad5ddc 100644 --- a/src/views/device/Firmware/Save/index.vue +++ b/src/views/device/Firmware/Save/index.vue @@ -201,6 +201,7 @@ import { } from '@/api/device/firmware'; import type { FormInstance } from 'ant-design-vue'; import type { Properties } from '../type'; +import { onlyMessage } from '@/utils/comm'; const formRef = ref(); const dynamicValidateForm = reactive<{ properties: Properties[] }>({ @@ -327,7 +328,9 @@ const handleOk = async () => { ? await save(params).catch(() => {}) : await update({ ...props.data, ...params }).catch(() => {}); if (response?.status === 200) { - message.success('操作成功'); + // message.success('操作成功'); + onlyMessage('操作成功', 'success'); + emit('change', true); } loading.value = false; diff --git a/src/views/device/Firmware/Task/Detail/index.vue b/src/views/device/Firmware/Task/Detail/index.vue index 5f198c3a..7eec3d8e 100644 --- a/src/views/device/Firmware/Task/Detail/index.vue +++ b/src/views/device/Firmware/Task/Detail/index.vue @@ -55,7 +55,11 @@ - + >({}); const route = useRoute(); @@ -313,7 +318,7 @@ const handlEye = (data: string) => { const handlTry = async (id: string) => { const res = await startOneTask([id]); if (res.success) { - message.success('操作成功'); + onlyMessage('操作成功', 'success'); tableRef.value.reload(); } }; @@ -324,7 +329,7 @@ const saveChange = (value: boolean) => { const confirm = async (e: MouseEvent) => { const res = await startTask(taskId, ['failed']); if (res.success) { - message.success('操作成功'); + onlyMessage('操作成功', 'success'); handleRefresh('failed'); tableRef.value.reload(); } diff --git a/src/views/device/Firmware/Task/Save/SelectDevices.vue b/src/views/device/Firmware/Task/Save/SelectDevices.vue index 325bb871..141b5250 100644 --- a/src/views/device/Firmware/Task/Save/SelectDevices.vue +++ b/src/views/device/Firmware/Task/Save/SelectDevices.vue @@ -233,10 +233,15 @@ const handleOk = () => { visible.value = false; }; -const updateSelect = (selectedRowKeys: T[]) => - selectedRowKeys +const updateSelect = (selectedRowKeys: T[]) => { + let selectedRowLabel: any = selectedRowKeys .map((item) => checkAllDataMap.has(item) && checkAllDataMap.get(item)) .toString(); + if (selectedRowLabel === 'false') { + selectedRowLabel = selectedRowKeys; + } + return selectedRowLabel; +}; const onVisible = () => { !props.data.view && (visible.value = true); @@ -258,6 +263,7 @@ onMounted(() => { if (props.data.id) { checkLable.value = updateSelect(props.data.deviceId); emit('update:modelValue', props.data.deviceId); + console.log(111, checkLable.value, props.data.deviceId); } } }, diff --git a/src/views/device/Firmware/index.vue b/src/views/device/Firmware/index.vue index 468b175f..8d2f406d 100644 --- a/src/views/device/Firmware/index.vue +++ b/src/views/device/Firmware/index.vue @@ -74,6 +74,7 @@ import _ from 'lodash'; import Save from './Save/index.vue'; import { useMenuStore } from 'store/menu'; import type { FormDataType } from './type'; +import { onlyMessage } from '@/utils/comm'; const menuStory = useMenuStore(); @@ -233,7 +234,7 @@ const saveChange = (value: FormDataType) => { visible.value = false; current.value = {}; if (value) { - message.success('操作成功'); + onlyMessage('操作成功', 'success'); tableRef.value.reload(); } }; @@ -241,7 +242,7 @@ const saveChange = (value: FormDataType) => { const handlDelete = async (id: string) => { const res = await remove(id); if (res.success) { - message.success('操作成功'); + onlyMessage('操作成功', 'success'); tableRef.value.reload(); } };