diff --git a/deliver-front/vue/src/utils/date.ts b/deliver-front/vue/src/utils/date.ts index 6cbbb5c31a3b53db013f875d1171373a8cb3a58f..92e07fb505868ac406061459b0da9a16ce021b19 100644 --- a/deliver-front/vue/src/utils/date.ts +++ b/deliver-front/vue/src/utils/date.ts @@ -36,7 +36,7 @@ export const getChannelType = (s: string): number => { } export const getUsersType = (s: string): number => { - const usersarr = ['企业账号', '电话', '邮箱', '平台userId'] + const usersarr = ['企业账号', '电话', '邮箱', '平台 UserId'] return usersarr.indexOf(s) } @@ -101,8 +101,46 @@ export const changeTable = (item): any => { // eslint-disable-next-line item.templateStatus = item.templateStatus === 1 ? true : false item.key = item.templateId - // pushrange - const pusharr = ['不限', '企业内部', '企业外部'] - item.pushRange = pusharr[item.pushRange] + // pushRange + const pushArr = ['不限', '企业内部', '企业外部'] + item.pushRange = pushArr[item.pushRange] + // usersType + const userArr = ['', '企业账号', '电话', '邮箱', '平台 UserId'] + item.usersType = userArr[Number(item.usersType)] + // channelType + const channelArr = ['', '电话', '短信', '邮件', '钉钉', '企业微信', '飞书'] + item.channelType = channelArr[item.channelType] + // messageType + const arr = [ + { id: '1', name: 'text 消息' }, + // + { id: '4-1', name: '钉钉图片消息' }, + { id: '4-2', name: '钉钉语音消息' }, + { id: '4-3', name: '钉钉文件消息' }, + { id: '4-4', name: '钉钉链接消息' }, + { id: '4-5', name: '钉钉 OA 消息' }, + { id: '4-6', name: '钉钉 markdown 消息' }, + { id: '4-7', name: '钉钉卡片消息' }, + // + { id: '5-1', name: '企业微信图片消息' }, + { id: '5-2', name: '企业微信语音消息' }, + { id: '5-3', name: '企业微信视频消息' }, + { id: '5-4', name: '企业微信文件消息' }, + { id: '5-5', name: '企业微信文本卡片消息' }, + { id: '5-6', name: '企业微信图文消息(mpnews)' }, + { id: '5-7', name: '企业微信 markdown 消息' }, + { id: '5-8', name: '企业微信小程序通知消息' }, + // + { id: '6-1', name: '富文本 post' }, + { id: '6-2', name: '图片 image' }, + { id: '6-3', name: '消息卡片 interactive' }, + { id: '6-4', name: '分享群名片 share_chat' }, + { id: '6-5', name: '分享个人名片 share_user' }, + { id: '6-6', name: '语音 audio' }, + { id: '6-7', name: '视频 media' }, + { id: '6-8', name: '文件 file' }, + { id: '6-9', name: '表情包 sticker' } + ] + item.messageType = arr.find(it => it.id === item.messageType)?.name return item } diff --git a/deliver-front/vue/src/views/Message/components/sendTest.vue b/deliver-front/vue/src/views/Message/components/sendTest.vue index e183c1f6207e51f9903f38c1812b42763637e371..780780ea25c20fc21f3009b9aab9f6d633b1d386 100644 --- a/deliver-front/vue/src/views/Message/components/sendTest.vue +++ b/deliver-front/vue/src/views/Message/components/sendTest.vue @@ -53,6 +53,7 @@ const showDrawer = (): void => { const onClose = (): void => { open.value = false + clearForm() } const addUserFlag = ref(true) @@ -69,7 +70,6 @@ const addUser = (): void => { } const deleteUserItem = (userItem): void => { - console.log(userItem) // 使用 splice 方法删除指定元素 const indexToDelete = sendTestTable.users.indexOf(userItem) if (indexToDelete !== -1) { @@ -90,27 +90,25 @@ const searchMes = (): void => { ?.validate() .then(() => { iconLoading.value = true + console.log(sendTestTable.users) sendTestMes(sendTestTable) .then(res => { if (res.code === 200) { void message.success('发送成功~ (*^▽^*)') onClose() - } else { - void message.error('发送失败,请检查网络~ (>︿<)') } showTime.value = true const setIntervals = setInterval(() => { timeOut.value = timeOut.value - 1 if (timeOut.value === 0) { - iconLoading.value = false showTime.value = false + iconLoading.value = false clearInterval(setIntervals) + timeOut.value = 3 } }, 1000) }) - .catch(err => { - console.error('An error occurred:', err) - }) + .catch(_ => {}) }) .catch(error => { console.log('error', error) @@ -142,7 +140,7 @@ const rules: Record = { - +