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 @@