From e74f8fa7aa9cbdb45f3fd953748d807f4baf6c97 Mon Sep 17 00:00:00 2001 From: jackhoo_98 Date: Fri, 17 Mar 2023 11:16:29 +0800 Subject: [PATCH 1/5] =?UTF-8?q?fix:=20=E8=BF=90=E7=BB=B4=E7=AE=A1=E7=90=86?= =?UTF-8?q?=20=E8=BF=9C=E7=A8=8B=E5=8D=87=E7=BA=A7=E4=BF=AE=E5=A4=8D?= =?UTF-8?q?=E9=83=A8=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(); } }; From fb51bda31801d8f14690cc5f804e065a86b871e6 Mon Sep 17 00:00:00 2001 From: jackhoo_98 Date: Fri, 17 Mar 2023 11:42:56 +0800 Subject: [PATCH 2/5] =?UTF-8?q?update:=20=E8=BF=90=E7=BB=B4=E7=AE=A1?= =?UTF-8?q?=E7=90=86=E3=80=81=E6=95=B0=E6=8D=AE=E9=87=87=E9=9B=86=20?= =?UTF-8?q?=E6=9B=B4=E6=8D=A2message=E7=BB=84=E4=BB=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/DataCollect/Channel/index.vue | 8 ++++---- src/views/DataCollect/Collector/Point/index.vue | 10 +++++----- src/views/DataCollect/Collector/Tree/index.vue | 10 +++++----- src/views/device/Firmware/Save/FileUpload.vue | 6 +++--- src/views/device/Firmware/Save/index.vue | 1 - src/views/device/Firmware/Task/index.vue | 8 ++++---- .../link/AccessConfig/components/Channel/index.vue | 4 ++-- .../link/AccessConfig/components/Cloud/Ctwing.vue | 6 +++--- .../link/AccessConfig/components/Cloud/OneNet.vue | 6 +++--- .../link/AccessConfig/components/Edge/index.vue | 6 +++--- .../link/AccessConfig/components/Media/GB28181.vue | 5 +++-- .../link/AccessConfig/components/Media/index.vue | 5 ++--- .../link/AccessConfig/components/Network/index.vue | 10 +++++----- src/views/link/AccessConfig/index.vue | 12 ++++-------- .../link/Certificate/Detail/CertificateFile.vue | 4 ++-- src/views/link/Certificate/Detail/index.vue | 7 ++++--- src/views/link/Certificate/index.vue | 4 ++-- src/views/link/Protocol/Save/FileUpload.vue | 6 +++--- src/views/link/Protocol/Save/index.vue | 4 ++-- src/views/link/Protocol/index.vue | 8 +++----- src/views/link/Type/Detail/index.vue | 4 ++-- src/views/link/Type/index.vue | 6 +++--- src/views/media/Stream/Detail/index.vue | 4 ++-- src/views/media/Stream/index.vue | 6 +++--- 24 files changed, 72 insertions(+), 78 deletions(-) diff --git a/src/views/DataCollect/Channel/index.vue b/src/views/DataCollect/Channel/index.vue index 41d4ab31..5edbe4f6 100644 --- a/src/views/DataCollect/Channel/index.vue +++ b/src/views/DataCollect/Channel/index.vue @@ -125,7 +125,7 @@ import type { ActionsType } from '@/components/Table/index'; import { getImage } from '@/utils/comm'; import { query, remove, update } from '@/api/data-collect/channel'; -import { message } from 'ant-design-vue'; +import { onlyMessage } from '@/utils/comm'; import { TiTlePermissionButtonStyle, StatusColorEnum, @@ -240,7 +240,7 @@ const getActions = ( onConfirm: async () => { const res = await update(data.id, updateStatus[state]); if (res.success) { - message.success('操作成功'); + onlyMessage('操作成功', 'success'); tableRef.value?.reload(); } }, @@ -259,7 +259,7 @@ const getActions = ( onConfirm: async () => { const res = await remove(data.id); if (res.success) { - message.success('操作成功'); + onlyMessage('操作成功', 'success'); tableRef.value.reload(); } }, @@ -286,7 +286,7 @@ const saveChange = (value: object) => { visible.value = false; current.value = {}; if (value) { - message.success('操作成功'); + onlyMessage('操作成功', 'success'); tableRef.value.reload(); } }; diff --git a/src/views/DataCollect/Collector/Point/index.vue b/src/views/DataCollect/Collector/Point/index.vue index a66e5977..bab0527e 100644 --- a/src/views/DataCollect/Collector/Point/index.vue +++ b/src/views/DataCollect/Collector/Point/index.vue @@ -251,7 +251,7 @@ import { removePoint, readPoint, } from '@/api/data-collect/collector'; -import { message } from 'ant-design-vue'; +import { onlyMessage } from '@/utils/comm'; import PointCardBox from './components/PointCardBox/index.vue'; import WritePoint from './components/WritePoint/index.vue'; import BatchUpdate from './components/BatchUpdate/index.vue'; @@ -412,13 +412,13 @@ const handlDelete = async (id: string | undefined = undefined) => { if (res?.status === 200) { cancelSelect(); tableRef.value?.reload(); - message.success('操作成功'); + onlyMessage('操作成功', 'success'); } spinning.value = false; }; const handlBatchUpdate = () => { if (_selectedRowKeys.value.length === 0) { - message.warn('请先选择'); + onlyMessage('请先选择', 'warning'); return; } const dataSet = new Set(_selectedRowKeys.value); @@ -442,7 +442,7 @@ const clickRedo = async (data: any) => { if (res.status === 200) { cancelSelect(); tableRef.value?.reload(); - message.success('操作成功'); + onlyMessage('操作成功', 'success'); } }; @@ -479,7 +479,7 @@ const saveChange = (value: object) => { current.value = {}; if (value) { tableRef.value?.reload(); - message.success('操作成功'); + onlyMessage('操作成功', 'success'); } }; diff --git a/src/views/DataCollect/Collector/Tree/index.vue b/src/views/DataCollect/Collector/Tree/index.vue index f0e87011..7ffab9fc 100644 --- a/src/views/DataCollect/Collector/Tree/index.vue +++ b/src/views/DataCollect/Collector/Tree/index.vue @@ -106,7 +106,7 @@ import { remove, } from '@/api/data-collect/collector'; import Save from './Save/index.vue'; -import { message } from 'ant-design-vue'; +import { onlyMessage } from '@/utils/comm'; import { Store } from 'jetlinks-store'; import _ from 'lodash'; import { colorMap, getState } from '../data.ts'; @@ -173,14 +173,14 @@ const handlUpdate = async (data: any) => { }); if (resp.status === 200) { handleSearch(params.value); - message.success('操作成功'); + onlyMessage('操作成功', 'success'); } }; const handlDelete = async (id: string) => { const resp = await remove(id); if (resp.status === 200) { handleSearch(params.value); - message.success('操作成功'); + onlyMessage('操作成功', 'success'); } }; @@ -189,11 +189,11 @@ const saveChange = (value: object) => { current.value = {}; if (value) { handleSearch(params.value); - message.success('操作成功'); + onlyMessage('操作成功', 'success'); } }; -const handleSearch = async (value: string) => { +const handleSearch = async (value: any) => { if (!searchValue.value && !value) { params.value = _.cloneDeep(defualtParams); } else if (!!searchValue.value) { diff --git a/src/views/device/Firmware/Save/FileUpload.vue b/src/views/device/Firmware/Save/FileUpload.vue index 81b0f0f8..3e7e0bc4 100644 --- a/src/views/device/Firmware/Save/FileUpload.vue +++ b/src/views/device/Firmware/Save/FileUpload.vue @@ -32,8 +32,8 @@ import { LocalStore } from '@/utils/comm'; import { TOKEN_KEY } from '@/utils/variable'; import { FIRMWARE_UPLOAD, querySystemApi } from '@/api/device/firmware'; -import { message } from 'ant-design-vue'; -import type { UploadChangeParam, UploadProps } from 'ant-design-vue'; +import { onlyMessage } from '@/utils/comm'; +import type { UploadChangeParam } from 'ant-design-vue'; import { notification as Notification } from 'ant-design-vue'; const emit = defineEmits(['update:modelValue', 'update:extraValue', 'change']); @@ -58,7 +58,7 @@ const handleChange = async (info: UploadChangeParam) => { ? api.result[0]?.properties['base-path'] : ''; const f = `${path}/file/${result.id}?accessKey=${result.others.accessKey}`; - message.success('上传成功！'); + onlyMessage('上传成功！', 'success'); fileValue.value = f; emit('update:modelValue', f); emit('update:extraValue', result); diff --git a/src/views/device/Firmware/Save/index.vue b/src/views/device/Firmware/Save/index.vue index 61ad5ddc..c7209f7f 100644 --- a/src/views/device/Firmware/Save/index.vue +++ b/src/views/device/Firmware/Save/index.vue @@ -328,7 +328,6 @@ const handleOk = async () => { ? await save(params).catch(() => {}) : await update({ ...props.data, ...params }).catch(() => {}); if (response?.status === 200) { - // message.success('操作成功'); onlyMessage('操作成功', 'success'); emit('change', true); diff --git a/src/views/device/Firmware/Task/index.vue b/src/views/device/Firmware/Task/index.vue index 480966c1..eb733ec0 100644 --- a/src/views/device/Firmware/Task/index.vue +++ b/src/views/device/Firmware/Task/index.vue @@ -54,7 +54,7 @@