From 8ca24111bdda68096bc4a5c485f8fb0883ec6ce6 Mon Sep 17 00:00:00 2001 From: fengachen <373943794@qq.com> Date: Fri, 24 Dec 2021 09:26:45 +0800 Subject: [PATCH 1/4] =?UTF-8?q?=E3=80=90bug=E3=80=91=20=E5=A2=9E=E5=8A=A0?= =?UTF-8?q?=E9=85=92=E5=BA=97=E4=BF=A1=E6=81=AF=20=E4=BC=9A=E8=AE=AE?= =?UTF-8?q?=E6=96=87=E4=BB=B6=E4=B8=8B=E8=BD=BD=E6=8E=A5=E5=8F=A3=E5=A2=9E?= =?UTF-8?q?=E5=8A=A0type=E5=8F=82=E6=95=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/components/jero/PreviewFile.vue | 7 ++-- src/views/MessagePage/MeetingDetailModal.vue | 35 ++++++++++++++++++-- src/views/MessagePage/modules/FileTable.vue | 6 ++-- 3 files changed, 39 insertions(+), 9 deletions(-) diff --git a/src/components/jero/PreviewFile.vue b/src/components/jero/PreviewFile.vue index 1d931d0..48e871c 100644 --- a/src/components/jero/PreviewFile.vue +++ b/src/components/jero/PreviewFile.vue @@ -97,14 +97,15 @@ export default { console.log(file) if(this.isMeetingDataBool){ // 会议资料更换了接口 - downloadFile(`sys/common/userDownload/${file.id}`, file.name) + downloadFile(`sys/common/userDownload/${file.id}?type=download`, file.name) + // downloadFile('/meeting/payMeeting/userDownload/{+'file.id'+}/{+'meetingId+}') }else { - downloadFile(`sys/common/download/${file.id}`, file.name) + downloadFile(`sys/common/download/${file.id}?type=download`, file.name) } }, handlePreview(file) { if (file && file.id) { - const fileFullUrl = `${window._CONFIG['domianWebSocketURL']}/sys/common/download/${file.id}?token=${Vue.ls.get(ACCESS_TOKEN)}&fullfilename=${file.name}` + const fileFullUrl = `${window._CONFIG['domianWebSocketURL']}/sys/common/download/${file.id}?token=${Vue.ls.get(ACCESS_TOKEN)}&fullfilename=${file.name}&type=view` let url = `${window._CONFIG['onlinePreviewDomainURL']}?url=${encodeURIComponent(fileFullUrl)}` // let url = `${window._CONFIG['onlinePreviewDomainURL']}?url=${encodeURIComponent(fileFullUrl)}` window.open(url) diff --git a/src/views/MessagePage/MeetingDetailModal.vue b/src/views/MessagePage/MeetingDetailModal.vue index 1b51a9f..6f8b398 100644 --- a/src/views/MessagePage/MeetingDetailModal.vue +++ b/src/views/MessagePage/MeetingDetailModal.vue @@ -41,6 +41,24 @@ + + + {{ model.hotelName }} + + + {{ model.hotelAddress }} + + + + + + + + {{ item.hotelContacts + ':' + item.hotelContactsPhone + ' ' }} + + @@ -522,12 +540,11 @@ - -
+
报名
- + ArriveAndInvoivingList

会议资料

@@ -782,6 +799,18 @@ export default { window.open(`https://www.kuaidi100.com/chaxun?com=${com}&nu=${record.postNo}`) }, /* + * 当前时间是否超过会议报名时间 + * */ + compareCurrentTime(time) { + let date = new Date() + let compareTime = new Date(time) + if (date.getTime() > compareTime.getTime()) { + return true + } else { + return false + } + }, + /* * 通过会议id获取会议性情 * */ queryMeetingInfoById(id) { diff --git a/src/views/MessagePage/modules/FileTable.vue b/src/views/MessagePage/modules/FileTable.vue index 921d46e..5aa401d 100644 --- a/src/views/MessagePage/modules/FileTable.vue +++ b/src/views/MessagePage/modules/FileTable.vue @@ -129,14 +129,14 @@ export default { console.log(file) if(this.hasLimitBool){ // 会议资料更换了接口 - downloadFile(`/meeting/payMeeting/userDownload/${file.id}/${this.meetingId}`, file.name) + downloadFile(`/meeting/payMeeting/userDownload/${file.id}/${this.meetingId}?type=download`, file.name) }else { - downloadFile(`sys/common/download/${file.id}`, file.name) + downloadFile(`sys/common/download/?type=download${file.id}`, file.name) } }, handlePreview(file) { if (file && file.id) { - const fileFullUrl = `${window._CONFIG['domianWebSocketURL']}/sys/common/download/${file.id}?token=${Vue.ls.get(ACCESS_TOKEN)}&fullfilename=${file.name}` + const fileFullUrl = `${window._CONFIG['domianWebSocketURL']}/sys/common/download/${file.id}?token=${Vue.ls.get(ACCESS_TOKEN)}&fullfilename=${file.name}&type=view` let url = `${window._CONFIG['onlinePreviewDomainURL']}?url=${encodeURIComponent(fileFullUrl)}` // let url = `${window._CONFIG['onlinePreviewDomainURL']}?url=${encodeURIComponent(fileFullUrl)}` window.open(url) From 7824bf3d5df79596a6d52e1d4d139284a310a2e8 Mon Sep 17 00:00:00 2001 From: fengachen <373943794@qq.com> Date: Fri, 24 Dec 2021 10:01:31 +0800 Subject: [PATCH 2/4] =?UTF-8?q?=E3=80=90bug=E3=80=91=20=E9=A6=96=E9=A1=B5?= =?UTF-8?q?=E6=B6=88=E6=81=AF=E6=B2=A1=E6=9C=89=E6=8F=90=E9=86=92=E6=97=B6?= =?UTF-8?q?=E9=97=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/dashboard/Analysis.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/views/dashboard/Analysis.vue b/src/views/dashboard/Analysis.vue index 795af04..ef37626 100644 --- a/src/views/dashboard/Analysis.vue +++ b/src/views/dashboard/Analysis.vue @@ -113,7 +113,7 @@ export default { title: '提醒时间', align: 'center', width: 180, - dataIndex: 'createTime', + dataIndex: 'sendTime', scopedSlots: {customRender: 'text'} }, { title: '操作', From 8267d9a88b64df0abc69bbd0afeac2c06fa010d2 Mon Sep 17 00:00:00 2001 From: fengachen <373943794@qq.com> Date: Fri, 24 Dec 2021 11:05:45 +0800 Subject: [PATCH 3/4] =?UTF-8?q?=E3=80=90bug=E3=80=91=20=E4=BC=9A=E8=AE=AE?= =?UTF-8?q?=E5=88=97=E8=A1=A8=E5=8F=AF=E6=8A=A5=E5=90=8D=E6=98=BE=E7=A4=BA?= =?UTF-8?q?=E6=8A=A5=E5=90=8D=E6=8C=89=E9=92=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/MessagePage/MeetingDetailModal.vue | 2 +- src/views/meetingActivity/MeetingActivity.vue | 19 ++++++++++--------- 2 files changed, 11 insertions(+), 10 deletions(-) diff --git a/src/views/MessagePage/MeetingDetailModal.vue b/src/views/MessagePage/MeetingDetailModal.vue index 6f8b398..212fd83 100644 --- a/src/views/MessagePage/MeetingDetailModal.vue +++ b/src/views/MessagePage/MeetingDetailModal.vue @@ -544,7 +544,7 @@ 报名
- ArriveAndInvoivingList +

会议资料

diff --git a/src/views/meetingActivity/MeetingActivity.vue b/src/views/meetingActivity/MeetingActivity.vue index 647a84e..9ac6b10 100644 --- a/src/views/meetingActivity/MeetingActivity.vue +++ b/src/views/meetingActivity/MeetingActivity.vue @@ -109,23 +109,24 @@ 召开时间：{{ item.startTime }}~{{ item.endTime }}

+ -